From f697dfe170e30439dbecd68a722d69c9db9b9aa6 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 17 Aug 2024 17:15:55 +1000 Subject: [PATCH] Rename all non-ultra functions to snake case --- docs/challenge7bug.md | 24 +- docs/piracychecks.md | 64 +- ld/pd.ld | 8 +- src/game/activemenu.c | 358 +- src/game/activemenutick.c | 64 +- src/game/bg.c | 898 ++-- src/game/body.c | 114 +- src/game/bodyinit.c | 2 +- src/game/bodyreset.c | 6 +- src/game/bondbike.c | 240 +- src/game/bondcutscene.c | 4 +- src/game/bondeyespy.c | 154 +- src/game/bondgrab.c | 178 +- src/game/bondgun.c | 2154 ++++----- src/game/bondgunreset.c | 26 +- src/game/bondgunstop.c | 2 +- src/game/bondhead.c | 74 +- src/game/bondheadreset.c | 30 +- src/game/bondmove.c | 462 +- src/game/bondview.c | 518 +- src/game/bondwalk.c | 310 +- src/game/bossfile.c | 88 +- src/game/bot.c | 818 ++-- src/game/botact.c | 146 +- src/game/botcmd.c | 38 +- src/game/botinv.c | 144 +- src/game/botinvinit.c | 6 +- src/game/botmgr.c | 30 +- src/game/botroom.c | 18 +- src/game/buildtime.c | 2 +- src/game/camdraw.c | 88 +- src/game/camera.c | 88 +- src/game/casingreset.c | 2 +- src/game/casingtick.c | 8 +- src/game/challenge.c | 258 +- src/game/challengeinit.c | 14 +- src/game/cheats.c | 416 +- src/game/chr.c | 966 ++-- src/game/chraction.c | 3876 +++++++-------- src/game/chrai.c | 878 ++-- src/game/chraicommands.c | 2948 ++++++------ src/game/chrmgr.c | 18 +- src/game/chrmgrstop.c | 10 +- src/game/crc.c | 12 +- src/game/credits.c | 244 +- src/game/debug1.c | 30 +- src/game/debug2.c | 156 +- src/game/dlights.c | 196 +- src/game/dyntex.c | 60 +- src/game/endscreen.c | 580 +-- src/game/env.c | 50 +- src/game/explosions.c | 168 +- src/game/explosionsreset.c | 4 +- src/game/explosionsstop.c | 10 +- src/game/file.c | 68 +- src/game/filelist.c | 58 +- src/game/filemgr.c | 780 +-- src/game/fmb.c | 108 +- src/game/footstep.c | 30 +- src/game/game_006900.c | 18 +- src/game/game_00b820.c | 32 +- src/game/game_096360.c | 6 +- src/game/game_0b0fd0.c | 156 +- src/game/game_0b2150.c | 4 +- src/game/game_13c510.c | 74 +- src/game/game_1531a0.c | 260 +- src/game/game_175f90.c | 8 +- src/game/gamefile.c | 434 +- src/game/getitle.c | 10 +- src/game/getitlereset.c | 8 +- src/game/gfxmemory.c | 36 +- src/game/gfxreplace.c | 8 +- src/game/gunfx.c | 218 +- src/game/gunfxreset.c | 4 +- src/game/healthbar.c | 74 +- src/game/hudmsg.c | 254 +- src/game/inv.c | 260 +- src/game/invreset.c | 10 +- src/game/lang.c | 56 +- src/game/langinit.c | 10 +- src/game/langreset.c | 26 +- src/game/langtick.c | 10 +- src/game/lv.c | 878 ++-- src/game/mainmenu.c | 910 ++-- src/game/menu.c | 984 ++-- src/game/menugfx.c | 302 +- src/game/menuitem.c | 1028 ++-- src/game/menustop.c | 4 +- src/game/menutick.c | 162 +- src/game/modeldef.c | 38 +- src/game/modelmgr.c | 46 +- src/game/modelmgrreset.c | 14 +- src/game/mplayer/ingame.c | 184 +- src/game/mplayer/mpaicommands.c | 8 +- src/game/mplayer/mplayer.c | 806 ++-- src/game/mplayer/scenarios.c | 442 +- src/game/mplayer/scenarios/capturethecase.inc | 82 +- src/game/mplayer/scenarios/combat.inc | 18 +- src/game/mplayer/scenarios/hackthatmac.inc | 126 +- .../mplayer/scenarios/holdthebriefcase.inc | 92 +- src/game/mplayer/scenarios/kingofthehill.inc | 120 +- src/game/mplayer/scenarios/popacap.inc | 94 +- src/game/mplayer/setup.c | 1242 ++--- src/game/mpstats.c | 84 +- src/game/mtxf2lbulkasm.s | 2 +- src/game/mtxf2lbulkasm_c.c | 2 +- src/game/music.c | 292 +- src/game/nbomb.c | 154 +- src/game/objectives.c | 164 +- src/game/objectivesreset.c | 16 +- src/game/objectivesstop.c | 2 +- src/game/options.c | 88 +- src/game/pad.c | 40 +- src/game/padhalllv.c | 144 +- src/game/pak.c | 1138 ++--- src/game/pdmode.c | 10 +- src/game/player.c | 1572 +++---- src/game/playermgr.c | 60 +- src/game/playerreset.c | 190 +- src/game/portal.c | 28 +- src/game/portalconv.s | 2 +- src/game/portalconv_c.c | 2 +- src/game/prop.c | 606 +-- src/game/propobj.c | 4184 ++++++++--------- src/game/propobjstop.c | 6 +- src/game/propsnd.c | 174 +- src/game/propsndreset.c | 4 +- src/game/propsndstop.c | 4 +- src/game/propsstop.c | 6 +- src/game/proptick.c | 22 +- src/game/quaternion.c | 20 +- src/game/race.c | 44 +- src/game/raceinit.c | 6 +- src/game/radar.c | 86 +- src/game/rng2.s | 4 +- src/game/rng2_c.c | 2 +- src/game/room.c | 36 +- src/game/roomreset.c | 12 +- src/game/roomtick.c | 4 +- src/game/savebuffer.c | 104 +- src/game/setup.c | 556 +-- src/game/setupcover.c | 28 +- src/game/setuppads.c | 18 +- src/game/setuputils.c | 58 +- src/game/setupwaypoints.c | 10 +- src/game/shards.c | 64 +- src/game/shardsreset.c | 4 +- src/game/shardsstop.c | 2 +- src/game/shardstick.c | 2 +- src/game/sight.c | 246 +- src/game/sky.c | 616 +-- src/game/skyreset.c | 2 +- src/game/skytick.c | 2 +- src/game/smoke.c | 68 +- src/game/smokeinit.c | 2 +- src/game/smokereset.c | 4 +- src/game/smokestop.c | 8 +- src/game/sparks.c | 40 +- src/game/sparksreset.c | 2 +- src/game/sparkstick.c | 2 +- src/game/splat.c | 46 +- src/game/stagemusic.c | 12 +- src/game/stagetable.c | 4 +- src/game/stars.c | 38 +- src/game/surfacereset.c | 2 +- src/game/tex.c | 206 +- src/game/texdecompress.c | 292 +- src/game/texinit.c | 6 +- src/game/texreset.c | 36 +- src/game/texselect.c | 34 +- src/game/tilesreset.c | 12 +- src/game/timing.c | 8 +- src/game/title.c | 872 ++-- src/game/titleclear.c | 6 +- src/game/titleinit.c | 2 +- src/game/titlereset.c | 6 +- src/game/training.c | 1034 ++-- src/game/trainingmenus.c | 696 +-- src/game/utils.c | 10 +- src/game/varsreset.c | 16 +- src/game/vmstats.c | 14 +- src/game/vtxstore.c | 32 +- src/game/vtxstorereset.c | 4 +- src/game/wallhit.c | 124 +- src/game/wallhitreset.c | 4 +- src/game/weather.c | 158 +- src/game/weatherreset.c | 6 +- src/game/weathertick.c | 10 +- src/game/zbuf.c | 56 +- src/include/constants.h | 2 +- src/include/game/activemenu.h | 40 +- src/include/game/bg.h | 192 +- src/include/game/body.h | 18 +- src/include/game/bondbike.h | 20 +- src/include/game/bondcutscene.h | 4 +- src/include/game/bondeyespy.h | 14 +- src/include/game/bondgrab.h | 26 +- src/include/game/bondgun.h | 292 +- src/include/game/bondguninit.h | 2 +- src/include/game/bondhead.h | 22 +- src/include/game/bondmove.h | 70 +- src/include/game/bondview.h | 42 +- src/include/game/bondwalk.h | 36 +- src/include/game/bossfile.h | 10 +- src/include/game/bot.h | 96 +- src/include/game/botact.h | 34 +- src/include/game/botcmd.h | 4 +- src/include/game/botinv.h | 44 +- src/include/game/botinvinit.h | 2 +- src/include/game/botmgr.h | 4 +- src/include/game/camdraw.h | 12 +- src/include/game/camera.h | 58 +- src/include/game/casing.h | 6 +- src/include/game/challenge.h | 78 +- src/include/game/cheats.h | 32 +- src/include/game/chr.h | 128 +- src/include/game/chraction.h | 596 +-- src/include/game/chrai.h | 8 +- src/include/game/chraicommands.h | 842 ++-- src/include/game/chrmgr.h | 6 +- src/include/game/crc.h | 4 +- src/include/game/credits.h | 6 +- src/include/game/debug.h | 68 +- src/include/game/dlights.h | 68 +- src/include/game/dyntex.h | 12 +- src/include/game/endscreen.h | 68 +- src/include/game/env.h | 26 +- src/include/game/explosions.h | 32 +- src/include/game/file.h | 22 +- src/include/game/filelist.h | 10 +- src/include/game/filemgr.h | 144 +- src/include/game/fmb.h | 12 +- src/include/game/footstep.h | 6 +- src/include/game/game_006900.h | 12 +- src/include/game/game_00b320.h | 2 +- src/include/game/game_00b820.h | 4 +- src/include/game/game_0147d0.h | 4 +- src/include/game/game_096360.h | 2 +- src/include/game/game_0b0fd0.h | 64 +- src/include/game/game_13c510.h | 12 +- src/include/game/game_1531a0.h | 44 +- src/include/game/gamefile.h | 18 +- src/include/game/getitle.h | 6 +- src/include/game/gfxmemory.h | 18 +- src/include/game/gfxreplace.h | 4 +- src/include/game/gunfx.h | 50 +- src/include/game/healthbar.h | 2 +- src/include/game/hudmsg.h | 44 +- src/include/game/inv.h | 92 +- src/include/game/lang.h | 28 +- src/include/game/lv.h | 62 +- src/include/game/mainmenu.h | 126 +- src/include/game/menu.h | 132 +- src/include/game/menugfx.h | 48 +- src/include/game/menuitem.h | 110 +- src/include/game/modeldef.h | 6 +- src/include/game/modelmgr.h | 18 +- src/include/game/mplayer/ingame.h | 40 +- src/include/game/mplayer/mplayer.h | 200 +- src/include/game/mplayer/scenarios.h | 26 +- src/include/game/mplayer/setup.h | 322 +- src/include/game/mpstats.h | 26 +- src/include/game/mtxf2lbulk.h | 2 +- src/include/game/music.h | 74 +- src/include/game/nbomb.h | 24 +- src/include/game/objectives.h | 52 +- src/include/game/options.h | 82 +- src/include/game/pad.h | 30 +- src/include/game/padhalllv.h | 46 +- src/include/game/pak.h | 206 +- src/include/game/pdmode.h | 10 +- src/include/game/player.h | 198 +- src/include/game/playermgr.h | 34 +- src/include/game/playerreset.h | 12 +- src/include/game/portal.h | 12 +- src/include/game/portalconv.h | 2 +- src/include/game/prop.h | 98 +- src/include/game/propobj.h | 550 +-- src/include/game/propobjstop.h | 2 +- src/include/game/propsnd.h | 56 +- src/include/game/quaternion.h | 8 +- src/include/game/race.h | 14 +- src/include/game/radar.h | 10 +- src/include/game/room.h | 24 +- src/include/game/savebuffer.h | 18 +- src/include/game/setup.h | 58 +- src/include/game/setuputils.h | 16 +- src/include/game/shards.h | 10 +- src/include/game/sight.h | 38 +- src/include/game/sky.h | 50 +- src/include/game/smoke.h | 30 +- src/include/game/sparks.h | 12 +- src/include/game/splat.h | 10 +- src/include/game/stagemusic.h | 6 +- src/include/game/stagetable.h | 4 +- src/include/game/stars.h | 6 +- src/include/game/tex.h | 32 +- src/include/game/texdecompress.h | 60 +- src/include/game/tiles.h | 2 +- src/include/game/timing.h | 6 +- src/include/game/title.h | 94 +- src/include/game/training.h | 224 +- src/include/game/trainingmenus.h | 98 +- src/include/game/utils.h | 6 +- src/include/game/vtxstore.h | 10 +- src/include/game/wallhit.h | 34 +- src/include/game/weather.h | 28 +- src/include/game/zbuf.h | 14 +- src/include/lib/ailist.h | 2 +- src/include/lib/anim.h | 38 +- src/include/lib/args.h | 10 +- src/include/lib/audiodma.h | 8 +- src/include/lib/audiomgr.h | 12 +- src/include/lib/boot.h | 8 +- src/include/lib/collision.h | 108 +- src/include/lib/crash.h | 32 +- src/include/lib/debughud.h | 20 +- src/include/lib/dma.h | 14 +- src/include/lib/fault.h | 4 +- src/include/lib/joy.h | 80 +- src/include/lib/lib_17ce0.h | 4 +- src/include/lib/lib_3e8c0.h | 10 +- src/include/lib/main.h | 16 +- src/include/lib/mema.h | 20 +- src/include/lib/memp.h | 22 +- src/include/lib/model.h | 194 +- src/include/lib/mp3.h | 6 +- src/include/lib/mtx.h | 48 +- src/include/lib/music.h | 14 +- src/include/lib/path.h | 2 +- src/include/lib/pimgr.h | 2 +- src/include/lib/profile.h | 10 +- src/include/lib/rdp.h | 4 +- src/include/lib/reset.h | 2 +- src/include/lib/rmon.h | 4 +- src/include/lib/rng.h | 2 +- src/include/lib/rzip.h | 8 +- src/include/lib/sched.h | 22 +- src/include/lib/segments.h | 12 +- src/include/lib/snd.h | 66 +- src/include/lib/speaker.h | 2 +- src/include/lib/tlb.h | 10 +- src/include/lib/vars.h | 4 +- src/include/lib/vi.h | 80 +- src/include/lib/videbug.h | 4 +- src/include/lib/vm.h | 2 +- src/include/types.h | 4 +- src/inflate/inflate.c | 2 +- src/lib/ailist.c | 2 +- src/lib/anim.c | 124 +- src/lib/args.c | 24 +- src/lib/audiodma.c | 14 +- src/lib/audiomgr.c | 46 +- src/lib/base.c | 2 +- src/lib/boot.c | 52 +- src/lib/collision.c | 694 +-- src/lib/crash.c | 222 +- src/lib/debughud.c | 56 +- src/lib/dma.c | 40 +- src/lib/fault.c | 8 +- src/lib/getra.s | 6 +- src/lib/joy.c | 166 +- src/lib/lib_17ce0.c | 6 +- src/lib/main.c | 350 +- src/lib/mema.c | 154 +- src/lib/memp.c | 54 +- src/lib/model.c | 666 +-- src/lib/modelasm.s | 132 +- src/lib/modelasm_c.c | 152 +- src/lib/mp3.c | 18 +- src/lib/mp3/decoder.c | 84 +- src/lib/mp3/internal.h | 8 +- src/lib/mp3/main.c | 32 +- src/lib/mp3/mp3.h | 2 +- src/lib/mp3/util.s | 2 +- src/lib/mtx.c | 42 +- src/lib/mtx_c.c | 34 +- src/lib/mtxasm.s | 28 +- src/lib/music.c | 110 +- src/lib/naudio/n_csplayer.c | 4 +- src/lib/naudio/n_sndplayer.c | 4 +- src/lib/path.c | 6 +- src/lib/pimgr.c | 2 +- src/lib/profile.c | 10 +- src/lib/rdp.c | 8 +- src/lib/reset.c | 6 +- src/lib/rmon.c | 10 +- src/lib/rng.s | 8 +- src/lib/rng_c.c | 4 +- src/lib/rzip.s | 60 +- src/lib/sched.c | 96 +- src/lib/segments.s | 12 +- src/lib/snd.c | 214 +- src/lib/speaker.c | 2 +- src/lib/str.c | 4 +- src/lib/ultra/io/pfsinitpak.c | 2 +- src/lib/ultra/os/exceptasm.s | 2 +- src/lib/varsinit.c | 2 +- src/lib/vi.c | 192 +- src/lib/videbug.c | 4 +- src/lib/vm.s | 22 +- src/lib/vminit.c | 34 +- src/preamble/preamble.s | 6 +- tools/mkrom/piracy.c | 26 +- 404 files changed, 27794 insertions(+), 27794 deletions(-) diff --git a/docs/challenge7bug.md b/docs/challenge7bug.md index 524309e15..7404e091c 100644 --- a/docs/challenge7bug.md +++ b/docs/challenge7bug.md @@ -6,35 +6,35 @@ Thanks to the decompilation project we can easily see all the differences betwee ## The Root Cause -The root cause is in a function that the decomp project has named bgReset which can be found in [src/game/bg.c](src/game/bg.c). This function is somewhat complex so we'll just cover the important parts here. +The root cause is in a function that the decomp project has named bg_reset which can be found in [src/game/bg.c](src/game/bg.c). This function is somewhat complex so we'll just cover the important parts here. -bgReset is called while the screen is black after accepting the challenge. It's responsible for loading the background (BG) file for a stage. BG files contain the stage polygon data, room information, a texture list and lighting information among other things. The exact format of the file is not important here, but you just need to know that it contains several sections and some of those sections are compressed, similar to a zip file. +bg_reset is called while the screen is black after accepting the challenge. It's responsible for loading the background (BG) file for a stage. BG files contain the stage polygon data, room information, a texture list and lighting information among other things. The exact format of the file is not important here, but you just need to know that it contains several sections and some of those sections are compressed, similar to a zip file. The problem starts when loading the section 2 data, approximately half way into the function. Section 2 is a section of the BG file that is very simple; it's just a compressed list of texture IDs. Let's start by looking at the fix the developers made: #if VERSION >= VERSION_NTSC_FINAL // Fixed version - section2 = mempAlloc(inflatedsize + 0x8000, MEMPOOL_STAGE); + section2 = memp_alloc(inflatedsize + 0x8000, MEMPOOL_STAGE); scratch = (u32)section2 + 0x8000; #else // Buggy version - section2 = mempAlloc(inflatedsize + 0x800, MEMPOOL_STAGE); + section2 = memp_alloc(inflatedsize + 0x800, MEMPOOL_STAGE); scratch = (u32)section2 + 0x800; #endif This code is allocating space in memory for section 2. It's intentionally overallocating it and setting up a scratch pointer into a later part of that space. We can see that the buggy code was adding an extra 0x800 to the allocation, and their fix was to bump this up to 0x8000. This doesn't give any answers though, so let's see how this allocation is used. // Load compressed data from ROM to scratch - bgLoadFile((u8 *)scratch, section2start + 4, ((section2compsize - 1) | 0xf) + 1); + bg_load_file((u8 *)scratch, section2start + 4, ((section2compsize - 1) | 0xf) + 1); -bgLoadFile's arguments are u8 *destination, u32 bgfileoffset, u32 length. It loads part of a BG file from the ROM and writes it to the destination, in this case the scratch pointer. The + 4 in the second argument is just skipping past a section header so it copies the body of the section only. And the last argument is the compressed size, rounded up to the next 16-byte boundary. This rounding is required because the N64 requires loads from the ROM to be in increments of 16 bytes. To put it simply, this function is copying the compressed data from the ROM to the scratch pointer. +bg_load_file's arguments are u8 *destination, u32 bgfileoffset, u32 length. It loads part of a BG file from the ROM and writes it to the destination, in this case the scratch pointer. The + 4 in the second argument is just skipping past a section header so it copies the body of the section only. And the last argument is the compressed size, rounded up to the next 16-byte boundary. This rounding is required because the N64 requires loads from the ROM to be in increments of 16 bytes. To put it simply, this function is copying the compressed data from the ROM to the scratch pointer. Hold up. Let's do some math. How much space is available in the scratch? For the buggy version the pointer is 0x800 into the allocation, and the allocation is inflatedsize + 0x800, so we know we have inflatedsize available to place the compressed buffer. For the fixed version the pointer is 0x8000 into the allocation, and the allocation is inflatedsize + 0x8000, so we end up with... also just inflatedsize. The exact same amount of space is available in both versions. All it's done is move the scratch further away from the start of the allocation and increased the allocation accordingly. // Inflate section 2 to the start of the buffer - bgInflate((u8 *)scratch, section2, section2compsize); + bg_inflate((u8 *)scratch, section2, section2compsize); -bgInflate's arguments are u8 *source, u8 *destination, u32 compressedlength. It decompresses the source to the destination, which in this case is decompressing it to the start of the allocation. So maybe the buggy code had the two streams too close to each other, and the inflated stream was overwriting the compressed stream while it was still being decompressed? Sounds plausible. For this to happen, the inflated size would have to be at least 0x800 bytes. Maybe the Warehouse stage (used by Challenge 7) is the only file with a section 2 this big? Let's take a look. +bg_inflate's arguments are u8 *source, u8 *destination, u32 compressedlength. It decompresses the source to the destination, which in this case is decompressing it to the start of the allocation. So maybe the buggy code had the two streams too close to each other, and the inflated stream was overwriting the compressed stream while it was still being decompressed? Sounds plausible. For this to happen, the inflated size would have to be at least 0x800 bytes. Maybe the Warehouse stage (used by Challenge 7) is the only file with a section 2 this big? Let's take a look. 0x3c. The inflated size of the texture list is just 0x3c bytes. That's less than 1/30th of the allocation. There's no way this is writing over the compressed stream. @@ -73,7 +73,7 @@ The inflatedsize value in the header is 0x3c, which after alignment becomes 0x40 And the section2compsize value in the header is 0x44, which is bigger than the inflated size. That's not surprising - the data is a list of unique texture IDs. There's no repetition and not much data, so this wouldn't compress very well. - section2 = mempAlloc(inflatedsize + 0x800, MEMPOOL_STAGE); + section2 = memp_alloc(inflatedsize + 0x800, MEMPOOL_STAGE); scratch = (u32)section2 + 0x800; Because inflatedsize is 0x40, the allocation is 0x840. And scratch points at 0x800 into the allocation, which is 0x40 from the end. @@ -86,9 +86,9 @@ Prior to this allocation being made, the memory system's onboard bank has the fo The allocation is made from the onboard bank, which has just the amount of free space that's needed and is now completely full. - bgLoadFile((u8 *)scratch, section2start + 4, ((section2compsize - 1) | 0xf) + 1); + bg_load_file((u8 *)scratch, section2start + 4, ((section2compsize - 1) | 0xf) + 1); -section2compsize is 0x44. But the value being passed to bgLoadFile is after alignment which is 0x50. So it's copying 0x50 bytes into a buffer of size 0x40. This normally wouldn't be an issue because the space to the right is usually unallocated, but because the allocation is flush against the end of the onboard memory bank the space to the right is in use and 0x10 bytes of it is being inadvertently overwritten. +section2compsize is 0x44. But the value being passed to bg_load_file is after alignment which is 0x50. So it's copying 0x50 bytes into a buffer of size 0x40. This normally wouldn't be an issue because the space to the right is usually unallocated, but because the allocation is flush against the end of the onboard memory bank the space to the right is in use and 0x10 bytes of it is being inadvertently overwritten. As stated earlier, the allocations on the right side of the bank are for texture data. The format of this data is not well understood yet, but it contains pointers. The 0x10 overflow is overwriting one of these pointers. Then during gameplay the game is trying to read this value as if it were a pointer, leading to a crash. @@ -102,7 +102,7 @@ A better fix would be to change the allocation size so it's just the aligned inf The one line tl;dr: When loading the background data for a stage, if the background file contained a specific section that decompressed to a smaller size than the compressed data itself, an overflow would occur due to a miscalculated buffer size. For the overflow to cause any problems the allocation had to be made from the first memory bank and be the exact same size as the remaining space in that bank. If this criteria was met, the overflow would overwrite a pointer in texture data which would cause a crash. The fix that was made increases the allocation to point where it can never be made out of the first bank, therefore avoiding the issue. -But what about the requirement of having 3 players? Why does it not happen with 4? Because each additional player causes an additional player structure to be allocated, and these are made prior to bgReset being called which means they affect the amount of free space in the first bank when bgReset is run. With 1 or 2 players there's going to be more memory available so the issue does not occur. And when playing with 4 players the expansion pak bank starts to be used sooner so the issue does not occur there either. Using 3 players on this particular stage made it total to the exact value that was needed for the onboard bank to be full at this point. In contrast, changing other settings like the number of bots or the weapon loadout would have no effect on this because those are allocated after bgReset is called. +But what about the requirement of having 3 players? Why does it not happen with 4? Because each additional player causes an additional player structure to be allocated, and these are made prior to bg_reset being called which means they affect the amount of free space in the first bank when bg_reset is run. With 1 or 2 players there's going to be more memory available so the issue does not occur. And when playing with 4 players the expansion pak bank starts to be used sooner so the issue does not occur there either. Using 3 players on this particular stage made it total to the exact value that was needed for the onboard bank to be full at this point. In contrast, changing other settings like the number of bots or the weapon loadout would have no effect on this because those are allocated after bg_reset is called. Just to be clear, this situation was incredibly unlucky. Adding or deleting a couple of lines of code anywhere else in the game would have made this a non-issue because it would change the heap size (the heap is sized based on what's left over after code and data). And even if the memory system is in the danger territory, there's a 1 in 455 chance that any number of player structure allocations would line it up in a way that can trigger the bug (each player structure is 7280 bytes and there's a 16 byte window where the bug can occur). diff --git a/docs/piracychecks.md b/docs/piracychecks.md index b6c7ffafc..cd8d2466f 100644 --- a/docs/piracychecks.md +++ b/docs/piracychecks.md @@ -24,7 +24,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat **Payload:** Writes 40 bytes of 0xff to 0x80095210. This appears to be related to sound effects but has no obvious effect. -### cheatMenuHandleDialog +### cheat_menu_handle_dialog **When Called:** When the Cheats menu dialog is opened. @@ -34,7 +34,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat --- -### doorFinishClose +### door_finish_close **When Called:** When a door finishes closing. @@ -42,25 +42,25 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat **Payload:** Rewrites the start of `func0f08f968` so it immediately returns false. This makes it impossible to open doors. -### botPickupProp +### bot_pickup_prop **When Called:** When a simulant in multiplayer picks up an item. -**What It Checks:** Checksums `doorFinishClose` to make sure it hasn't been modified. +**What It Checks:** Checksums `door_finish_close` to make sure it hasn't been modified. -**Payload:** Rewrites the start of `chrCheckCanSeeTarget` so it immediately returns true. This makes all guards able to see Jo through walls. +**Payload:** Rewrites the start of `chr_check_can_see_target` so it immediately returns true. This makes all guards able to see Jo through walls. -### chrUncloak +### chr_uncloak **When Called:** When a guard uncloaks. -**What It Checks:** Checksums `botPickupProp` to make sure it hasn't been modified. +**What It Checks:** Checksums `bot_pickup_prop` to make sure it hasn't been modified. -**Payload:** Disables the ability for the player and other characters to go up or down slopes. This is done by nopping the `jr ra` instruction in `cdFindGroundInfoAtCyl`, which causes it to flow into the following function, which unconditionally returns false and only exists for this purpose. +**Payload:** Disables the ability for the player and other characters to go up or down slopes. This is done by nopping the `jr ra` instruction in `cd_find_ground_info_at_cyl`, which causes it to flow into the following function, which unconditionally returns false and only exists for this purpose. --- -### chrsCheckForNoise +### chrs_check_for_noise **When Called:** When a guard hears you. @@ -70,7 +70,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat --- -### lvGetSlowMotionType +### lv_get_slow_motion_type **When Called:** On each tick when unpaused. @@ -78,25 +78,25 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat **Payload:** Corrupts the rspboot microcode, causing a crash. -### lvReset +### lv_reset **When Called:** When loading any stage (including title screen). -**What It Checks:** Checksums `lvGetSlowMotionType` to make sure it hasn't been modified. +**What It Checks:** Checksums `lv_get_slow_motion_type` to make sure it hasn't been modified. **Payload:** Writes a filesystem terminator file to the start of EEPROM. This disables the cartridge's save data, removing the ability to read existing files and create new ones. -### bodyAllocateEyespy +### body_allocate_eyespy **When Called:** When loading any stage that uses the eyespy. -**What It Checks:** Checksums `lvReset` to make sure it hasn't been modified. +**What It Checks:** Checksums `lv_reset` to make sure it hasn't been modified. -**Payload:** Nops `_memaFree` entirely, so any time that function is called it'll flow into the following function, which just returns. The effect this has is that the system is unable to free individual mema allocations which makes it unable to load rooms as you move throughout the level. +**Payload:** Nops `_mema_free` entirely, so any time that function is called it'll flow into the following function, which just returns. The effect this has is that the system is unable to free individual mema allocations which makes it unable to load rooms as you move throughout the level. --- -### bgReset +### bg_reset **When Called:** When loading a normal stage (eg. CI Training). @@ -104,53 +104,53 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat **Payload:** Copies 64 bytes from a random location in ROM to a random location in RAM. -### chrConsiderGrenadeThrow +### chr_consider_grenade_throw **When Called:** When a chr decides to throw a grenade. -**What It Checks:** Checksums `bgReset` to make sure it hasn't been modified. +**What It Checks:** Checksums `bg_reset` to make sure it hasn't been modified. **Payload:** Surrounds the player in infinite explosions. --- -### tagsReset +### tags_reset **When Called:** When loading a normal stage (eg. CI Training). -**What It Checks:** Calls `mtxGetObfuscatedRomBase` to get the value of `osRomBase` then compares it with a known value. +**What It Checks:** Calls `mtx_get_obfuscated_rom_base` to get the value of `osRomBase` then compares it with a known value. **Payload:** Copies 4KB from a random location in ROM to a random location in RAM. -### bgunTickGunLoad +### bgun_tick_gun_load **When Called:** When equipping any weapon. -**What It Checks:** Checksums `tagsReset` to make sure it hasn't been modified. +**What It Checks:** Checksums `tags_reset` to make sure it hasn't been modified. -**Payload:** Corrupts `tagsReset` by writing 4 bytes of 0xff. +**Payload:** Corrupts `tags_reset` by writing 4 bytes of 0xff. --- -### menuTickTimers +### menu_tick_timers **When Called:** On every frame except credits. -**What It Checks:** Checksums `mtxGetObfuscatedRomBase` to make sure it hasn't been modified. +**What It Checks:** Checksums `mtx_get_obfuscated_rom_base` to make sure it hasn't been modified. -**Payload:** Corrupts `bgReset` by writing 16 bytes of 0x12 to a random address within that function. +**Payload:** Corrupts `bg_reset` by writing 16 bytes of 0x12 to a random address within that function. -### bgTickCounter +### bg_tick_counter **When Called:** On every frame. -**What It Checks:** Checksums `menuTickTimers` to make sure it hasn't been modified. +**What It Checks:** Checksums `menu_tick_timers` to make sure it hasn't been modified. -**Payload:** Corrupts `bgBuildTables` by adding a fixed amount to 16 bytes within that function. +**Payload:** Corrupts `bg_build_tables` by adding a fixed amount to 16 bytes within that function. --- -### glassDestroy +### glass_destroy **When Called:** When the player breaks glass. @@ -158,10 +158,10 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat **Payload:** Sets the audio frequency to a high value which makes everyone sound like chipmunks. -### explosionAlertChrs +### explosion_alert_chrs **When Called:** When there's an explosion. -**What It Checks:** Checksums `glassDestroy` to make sure it hasn't been modified. +**What It Checks:** Checksums `glass_destroy` to make sure it hasn't been modified. **Payload:** Makes all explosions huge. diff --git a/ld/pd.ld b/ld/pd.ld index a00183abf..e443eedcd 100644 --- a/ld/pd.ld +++ b/ld/pd.ld @@ -93,8 +93,8 @@ SECTIONS osAppNMIBuffer = 0x8000031c; getitle0f0155f0_hack = getitle0f0155f0; - nbombCreateStorm_hack = nbombCreateStorm; - viGetHeight_hack = viGetHeight; + nbomb_create_storm_hack = nbomb_create_storm; + vi_get_height_hack = vi_get_height; /*************************************************************************** * romheader @@ -145,11 +145,11 @@ SECTIONS END_SEG(preamble) /** - /* vmBoot()'s address is 0x70001050, but preamble calls it by 0x80001050 + /* vm_boot()'s address is 0x70001050, but preamble calls it by 0x80001050 * due to it not being TLB mapped yet. So we set up this variable to allow * this to happen. */ - vmBootFromPreamble = vmBoot + 0x10000000; + vm_boot_from_preamble = vm_boot + 0x10000000; /*************************************************************************** * lib diff --git a/src/game/activemenu.c b/src/game/activemenu.c index 1c98bb432..d50b2ec86 100644 --- a/src/game/activemenu.c +++ b/src/game/activemenu.c @@ -56,25 +56,25 @@ const u8 g_AmMapping[] = { 2, // unused }; -struct chrdata *currentPlayerGetCommandingAibot(void) +struct chrdata *current_player_get_commanding_aibot(void) { return g_Vars.currentplayer->commandingaibot; } -void amOpenPickTarget(void) +void am_open_pick_target(void) { u32 prevplayernum = g_MpPlayerNum; - if (!mpIsPaused()) { + if (!mp_is_paused()) { g_AmMenus[g_AmIndex].prevallbots = g_AmMenus[g_AmIndex].allbots; g_Vars.currentplayer->activemenumode = AMMODE_CLOSED; g_MpPlayerNum = g_Vars.currentplayerstats->mpindex; - menuPushRootDialog(&g_AmPickTargetMenuDialog, MENUROOT_PICKTARGET); + menu_push_root_dialog(&g_AmPickTargetMenuDialog, MENUROOT_PICKTARGET); g_MpPlayerNum = prevplayernum; } } -MenuItemHandlerResult amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult am_pick_target_menu_list(s32 operation, struct menuitem *item, union handlerdata *data) { static u32 teamcolours[] = { 0xff666600, @@ -139,13 +139,13 @@ MenuItemHandlerResult amPickTargetMenuList(s32 operation, struct menuitem *item, g_AmMenus[g_AmIndex].prevallbots = false; for (i = 0; i < g_Vars.currentplayer->numaibuddies; i++) { - botApplyAttack(g_MpAllChrPtrs[g_Vars.currentplayer->aibuddynums[i]], g_MpAllChrPtrs[chrindex]->prop); + bot_apply_attack(g_MpAllChrPtrs[g_Vars.currentplayer->aibuddynums[i]], g_MpAllChrPtrs[chrindex]->prop); } } else { - botApplyAttack(botchr, g_MpAllChrPtrs[chrindex]->prop); + bot_apply_attack(botchr, g_MpAllChrPtrs[chrindex]->prop); } - menuPopDialog(); + menu_pop_dialog(); } break; case MENUOP_GETSELECTEDINDEX: @@ -180,15 +180,15 @@ MenuItemHandlerResult amPickTargetMenuList(s32 operation, struct menuitem *item, colour = teamcolours[g_MpAllChrConfigPtrs[chrindex]->team] | (renderdata->colour & 0xff); if (renderdata->unk10) { - u32 weight = menuGetSinOscFrac(40) * 255; - colour = colourBlend(renderdata->colour | 0xffffff00, colourBlend(colour, colour & 0xff, 0x7f), weight); + u32 weight = menu_get_sin_osc_frac(40) * 255; + colour = colour_blend(renderdata->colour | 0xffffff00, colour_blend(colour, colour & 0xff, 0x7f), weight); } x = renderdata->x + 10; y = renderdata->y + 1; gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, g_MpAllChrConfigPtrs[chrindex]->name, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, g_MpAllChrConfigPtrs[chrindex]->name, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); return (s32)gdl; } @@ -200,7 +200,7 @@ MenuItemHandlerResult amPickTargetMenuList(s32 operation, struct menuitem *item, return 0; } -MenuDialogHandlerResult amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult am_pick_target_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -224,7 +224,7 @@ struct menuitem g_AmPickTargetMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x0000005a, 0, - amPickTargetMenuList, + am_pick_target_menu_list, }, { MENUITEMTYPE_END }, }; @@ -233,12 +233,12 @@ struct menudialogdef g_AmPickTargetMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS_492, // "Pick Target" g_AmPickTargetMenuItems, - amPickTargetMenuDialog, + am_pick_target_menu_dialog, 0, NULL, }; -void amSetAiBuddyTemperament(bool aggressive) +void am_set_ai_buddy_temperament(bool aggressive) { s32 i; @@ -258,7 +258,7 @@ void amSetAiBuddyTemperament(bool aggressive) } #if VERSION >= VERSION_NTSC_1_0 -void amSetAiBuddyStealth(void) +void am_set_ai_buddy_stealth(void) { s32 i; @@ -267,13 +267,13 @@ void amSetAiBuddyStealth(void) struct chrdata *chr = g_Vars.aibuddies[i]->chr; if (chr && chr->prop - && !chrIsDead(chr) - && chr->ailist != ailistFindById(GAILIST_BUDDY_STEALTH) + && !chr_is_dead(chr) + && chr->ailist != ailist_find_by_id(GAILIST_BUDDY_STEALTH) && chr->actiontype != ACT_DRUGGEDDROP && chr->actiontype != ACT_DRUGGEDKO && chr->actiontype != ACT_DRUGGEDCOMINGUP) { - chrStopFiring(chr); - chr->ailist = ailistFindById(GAILIST_BUDDY_STEALTH); + chr_stop_firing(chr); + chr->ailist = ailist_find_by_id(GAILIST_BUDDY_STEALTH); chr->aioffset = 0; } } @@ -281,7 +281,7 @@ void amSetAiBuddyStealth(void) } #endif -s32 amGetFirstBuddyIndex(void) +s32 am_get_first_buddy_index(void) { s32 i; @@ -301,7 +301,7 @@ s32 amGetFirstBuddyIndex(void) return -1; } -void amApply(s32 slot) +void am_apply(s32 slot) { s32 numinvitems; s32 invindex; @@ -317,22 +317,22 @@ void amApply(s32 slot) } invindex = g_AmMenus[g_AmIndex].invindexes[slot]; - numinvitems = invGetCount(); + numinvitems = inv_get_count(); if (invindex < numinvitems) { - weaponnum = invGetWeaponNumByIndex(invindex); + weaponnum = inv_get_weapon_num_by_index(invindex); pass = true; if (weaponnum) { - state = currentPlayerGetDeviceState(weaponnum); + state = current_player_get_device_state(weaponnum); if (state != DEVICESTATE_UNEQUIPPED) { pass = false; if (state == DEVICESTATE_INACTIVE) { - currentPlayerSetDeviceActive(weaponnum, true); + current_player_set_device_active(weaponnum, true); } else { - currentPlayerSetDeviceActive(weaponnum, false); + current_player_set_device_active(weaponnum, false); } } } @@ -341,7 +341,7 @@ void amApply(s32 slot) pass = true; if (g_FrIsValidWeapon) { - s32 weaponnum = frGetWeaponBySlot(frGetSlot()); + s32 weaponnum = fr_get_weapon_by_slot(fr_get_slot()); if (g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponnum == weaponnum) { pass = false; @@ -349,23 +349,23 @@ void amApply(s32 slot) } if (pass) { - invSetCurrentIndex(invindex); + inv_set_current_index(invindex); - if (invHasDoubleWeaponIncAllGuns(weaponnum, weaponnum)) { - if (bgunGetWeaponNum(HAND_RIGHT) != weaponnum) { - bgunEquipWeapon2(HAND_RIGHT, weaponnum); + if (inv_has_double_weapon_inc_all_guns(weaponnum, weaponnum)) { + if (bgun_get_weapon_num(HAND_RIGHT) != weaponnum) { + bgun_equip_weapon2(HAND_RIGHT, weaponnum); } - if (bgunGetWeaponNum(HAND_LEFT) != weaponnum) { - bgunEquipWeapon2(HAND_LEFT, weaponnum); + if (bgun_get_weapon_num(HAND_LEFT) != weaponnum) { + bgun_equip_weapon2(HAND_LEFT, weaponnum); } } else { - if (bgunGetWeaponNum(HAND_RIGHT) != weaponnum) { - bgunEquipWeapon2(HAND_RIGHT, weaponnum); + if (bgun_get_weapon_num(HAND_RIGHT) != weaponnum) { + bgun_equip_weapon2(HAND_RIGHT, weaponnum); } - if (bgunGetWeaponNum(HAND_LEFT) != WEAPON_NONE) { - bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE); + if (bgun_get_weapon_num(HAND_LEFT) != WEAPON_NONE) { + bgun_equip_weapon2(HAND_LEFT, WEAPON_NONE); } } } @@ -387,30 +387,30 @@ void amApply(s32 slot) break; default: if (g_MissionConfig.iscoop) { - if (amGetFirstBuddyIndex() > -1) { + if (am_get_first_buddy_index() > -1) { if (slot == 1) { - amSetAiBuddyTemperament(true); // aggressive + am_set_ai_buddy_temperament(true); // aggressive } else if (slot == 7) { - amSetAiBuddyTemperament(false); // passive + am_set_ai_buddy_temperament(false); // passive #if VERSION >= VERSION_NTSC_1_0 } else if (slot == 3) { - amSetAiBuddyStealth(); + am_set_ai_buddy_stealth(); #endif } } } else if (g_Vars.normmplayerisrunning) { if (g_AmMenus[g_AmIndex].allbots) { for (i = 0; i < g_Vars.currentplayer->numaibuddies; i++) { - botcmdApply(g_MpAllChrPtrs[g_Vars.currentplayer->aibuddynums[i]], g_AmBotCommands[slot]); + botcmd_apply(g_MpAllChrPtrs[g_Vars.currentplayer->aibuddynums[i]], g_AmBotCommands[slot]); } } else { - botcmdApply(g_MpAllChrPtrs[g_Vars.currentplayer->aibuddynums[g_AmMenus[g_AmIndex].screenindex - 2]], g_AmBotCommands[slot]); + botcmd_apply(g_MpAllChrPtrs[g_Vars.currentplayer->aibuddynums[g_AmMenus[g_AmIndex].screenindex - 2]], g_AmBotCommands[slot]); } } } } -void amGetSlotDetails(s32 slot, u32 *flags, char *label) +void am_get_slot_details(s32 slot, u32 *flags, char *label) { u32 weaponnum; s32 qty; @@ -422,7 +422,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) switch (g_AmMenus[g_AmIndex].screenindex) { case 0: // Weapon screen if (slot == 4) { - strcpy(label, langGet(L_MISC_170)); // "Weapon" + strcpy(label, lang_get(L_MISC_170)); // "Weapon" return; } @@ -430,33 +430,33 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) slot--; } - if (invGetCurrentIndex() == g_AmMenus[g_AmIndex].invindexes[slot]) { + if (inv_get_current_index() == g_AmMenus[g_AmIndex].invindexes[slot]) { *flags |= AMSLOTFLAG_CURRENT; } - if (g_AmMenus[g_AmIndex].invindexes[slot] >= invGetCount()) { + if (g_AmMenus[g_AmIndex].invindexes[slot] >= inv_get_count()) { strcpy(label, ""); } else { - if (invGetWeaponNumByIndex(g_AmMenus[g_AmIndex].invindexes[slot]) == WEAPON_CLOAKINGDEVICE) { + if (inv_get_weapon_num_by_index(g_AmMenus[g_AmIndex].invindexes[slot]) == WEAPON_CLOAKINGDEVICE) { // Special case: "Cloak %d" - qty = bgunGetReservedAmmoCount(AMMOTYPE_CLOAK); + qty = bgun_get_reserved_ammo_count(AMMOTYPE_CLOAK); secs = qty / TICKS(60); modulo = (qty - (secs * TICKS(60))) * 100 / TICKS(60); - sprintf(label, langGet(L_OPTIONS_491), secs + (modulo > 0 ? 1 : 0)); // "cloak %d" + sprintf(label, lang_get(L_OPTIONS_491), secs + (modulo > 0 ? 1 : 0)); // "cloak %d" } else { - strcpy(label, invGetShortNameByIndex(g_AmMenus[g_AmIndex].invindexes[slot])); + strcpy(label, inv_get_short_name_by_index(g_AmMenus[g_AmIndex].invindexes[slot])); } } - weaponnum = invGetWeaponNumByIndex(g_AmMenus[g_AmIndex].invindexes[slot]); + weaponnum = inv_get_weapon_num_by_index(g_AmMenus[g_AmIndex].invindexes[slot]); - if (currentPlayerGetDeviceState(weaponnum) == DEVICESTATE_ACTIVE) { + if (current_player_get_device_state(weaponnum) == DEVICESTATE_ACTIVE) { *flags |= AMSLOTFLAG_ACTIVE; } - weaponnum = invGetWeaponNumByIndex(g_AmMenus[g_AmIndex].invindexes[slot]); + weaponnum = inv_get_weapon_num_by_index(g_AmMenus[g_AmIndex].invindexes[slot]); - if (!bgunHasAmmoForWeapon(weaponnum)) { + if (!bgun_has_ammo_for_weapon(weaponnum)) { *flags |= AMSLOTFLAG_NOAMMO; } break; @@ -464,10 +464,10 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) strcpy(label, ""); if (slot == 4) { - strcpy(label, langGet(L_MISC_171)); // "Function" + strcpy(label, lang_get(L_MISC_171)); // "Function" } else if (slot == 1 || slot == 7) { - prifunc = weaponGetFunction(&g_Vars.currentplayer->hands[HAND_RIGHT].gset, FUNC_PRIMARY); - secfunc = weaponGetFunction(&g_Vars.currentplayer->hands[HAND_RIGHT].gset, FUNC_SECONDARY); + prifunc = weapon_get_function(&g_Vars.currentplayer->hands[HAND_RIGHT].gset, FUNC_PRIMARY); + secfunc = weapon_get_function(&g_Vars.currentplayer->hands[HAND_RIGHT].gset, FUNC_SECONDARY); if (slot == 1) { if (!secfunc || !FUNCISSEC()) { @@ -475,7 +475,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) } if (prifunc) { - strcpy(label, langGet(prifunc->name)); + strcpy(label, lang_get(prifunc->name)); } } else { if (!prifunc || FUNCISSEC()) { @@ -483,7 +483,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) } if (secfunc) { - strcpy(label, langGet(secfunc->name)); + strcpy(label, lang_get(secfunc->name)); } } } @@ -493,28 +493,28 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label) if (g_MissionConfig.iscoop) { if (slot == 4) { - strcpy(label, langGet(L_MISC_474)); // "Perfect Buddies" + strcpy(label, lang_get(L_MISC_474)); // "Perfect Buddies" } else if (slot == 1) { - strcpy(label, langGet(L_MISC_472)); // "Aggressive" + strcpy(label, lang_get(L_MISC_472)); // "Aggressive" } else if (slot == 7) { - strcpy(label, langGet(L_MISC_473)); // "Passive" + strcpy(label, lang_get(L_MISC_473)); // "Passive" #if VERSION >= VERSION_NTSC_1_0 } else if (slot == 3) { - strcpy(label, langGet(L_MISC_475)); // "Stealth" + strcpy(label, lang_get(L_MISC_475)); // "Stealth" #endif } } else { if (slot == 4) { - strcpy(label, langGet(L_MISC_172)); // "Orders" + strcpy(label, lang_get(L_MISC_172)); // "Orders" } else { - strcpy(label, botGetCommandName(g_AmBotCommands[slot])); + strcpy(label, bot_get_command_name(g_AmBotCommands[slot])); } } break; } } -void amReset(void) +void am_reset(void) { s32 i; s32 j; @@ -568,7 +568,7 @@ void amReset(void) g_AmIndex = 0; } -s16 amCalculateSlotWidth(void) +s16 am_calculate_slot_width(void) { s32 textheight; s32 textwidth; @@ -578,8 +578,8 @@ s16 amCalculateSlotWidth(void) char text[32]; for (i = 0; i < ARRAYCOUNT(g_AmBotCommands); i++) { - amGetSlotDetails(i, &flags, text); - textMeasure(&textheight, &textwidth, text, g_AmFont1, g_AmFont2, 0); + am_get_slot_details(i, &flags, text); + text_measure(&textheight, &textwidth, text, g_AmFont1, g_AmFont2, 0); if (textwidth > max) { max = textwidth; @@ -599,7 +599,7 @@ s16 amCalculateSlotWidth(void) return max; } -void amChangeScreen(s32 step) +void am_change_screen(s32 step) { s32 maxscreenindex; @@ -624,7 +624,7 @@ void amChangeScreen(s32 step) } } else { // Solo missions, or MP with no teams - if (g_MissionConfig.iscoop && amGetFirstBuddyIndex() >= 0) { + if (g_MissionConfig.iscoop && am_get_first_buddy_index() >= 0) { // Weapon selection, second function and AI buddy commands maxscreenindex = 2; } else { @@ -647,12 +647,12 @@ void amChangeScreen(s32 step) g_AmMenus[g_AmIndex].returntimer = 0; g_AmMenus[g_AmIndex].cornertimer = 0; g_AmMenus[g_AmIndex].alphafrac = 0; - g_AmMenus[g_AmIndex].slotwidth = amCalculateSlotWidth(); + g_AmMenus[g_AmIndex].slotwidth = am_calculate_slot_width(); } -void amAssignWeaponSlots(void) +void am_assign_weapon_slots(void) { - s32 numitems = invGetCount(); + s32 numitems = inv_get_count(); u8 weaponnum; s32 i; s32 j; @@ -667,7 +667,7 @@ void amAssignWeaponSlots(void) // Assign favourites for (i = 0; i < numitems; i++) { - weaponnum = invGetWeaponNumByIndex(i); + weaponnum = inv_get_weapon_num_by_index(i); if ((weaponnum >= WEAPON_UNARMED && weaponnum <= WEAPON_DISGUISE41) || weaponnum == WEAPON_SUICIDEPILL @@ -698,7 +698,7 @@ void amAssignWeaponSlots(void) } if (!isfavourited) { - weaponnum = invGetWeaponNumByIndex(i); + weaponnum = inv_get_weapon_num_by_index(i); if ((weaponnum >= WEAPON_UNARMED && weaponnum <= WEAPON_DISGUISE41) || weaponnum == WEAPON_SUICIDEPILL @@ -739,7 +739,7 @@ void amAssignWeaponSlots(void) } } -void amOpen(void) +void am_open(void) { if (g_Vars.currentplayer->gunctrl.passivemode == false) { g_AmIndex = g_Vars.currentplayernum; @@ -747,8 +747,8 @@ void amOpen(void) g_PlayersWithControl[g_Vars.currentplayernum] = false; g_AmMenus[g_AmIndex].screenindex = 0; g_AmMenus[g_AmIndex].selpulse = 0; - amAssignWeaponSlots(); - amChangeScreen(0); + am_assign_weapon_slots(); + am_change_screen(0); g_AmMenus[g_AmIndex].xradius = g_AmMenus[g_AmIndex].slotwidth + 5; g_AmMenus[g_AmIndex].alphafrac = 0.3; g_AmMenus[g_AmIndex].origscreennum = 0; @@ -757,10 +757,10 @@ void amOpen(void) } } -void amClose(void) +void am_close(void) { if (g_AmMenus[g_AmIndex].slotnum != 4) { - amApply(g_AmMenus[g_AmIndex].slotnum); + am_apply(g_AmMenus[g_AmIndex].slotnum); } g_Vars.currentplayer->activemenumode = AMMODE_CLOSED; @@ -768,7 +768,7 @@ void amClose(void) g_PlayersWithControl[g_Vars.currentplayernum] = 1; } -bool amIsCramped(void) +bool am_is_cramped(void) { #if VERSION == VERSION_JPN_FINAL if (PLAYERCOUNT() >= 3 && g_AmMenus[g_AmIndex].screenindex != 1) { @@ -779,7 +779,7 @@ bool amIsCramped(void) return true; } - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL + if (options_get_screen_split() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() == 2 && g_AmMenus[g_AmIndex].screenindex != 1) { return true; @@ -789,11 +789,11 @@ bool amIsCramped(void) #else return (g_AmMenus[g_AmIndex].screenindex == 0 && PLAYERCOUNT() >= 3) || (IS4MB() && PLAYERCOUNT() == 2) - || (PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL); + || (PLAYERCOUNT() == 2 && options_get_screen_split() == SCREENSPLIT_VERTICAL); #endif } -void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) +void am_calculate_slot_position(s16 column, s16 row, s16 *x, s16 *y) { #if VERSION == VERSION_JPN_FINAL s32 playercount = PLAYERCOUNT(); @@ -806,7 +806,7 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) *y = *y / 2; } - if (amIsCramped()) { + if (am_is_cramped()) { s32 offset = 1; if (row == 1) { @@ -820,11 +820,11 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) } } else { if (playercount >= 2) { - if (row == 1 && !amIsCramped()) { + if (row == 1 && !am_is_cramped()) { *x = (*x * 6) / 7; } } else { - if (playercount >= 3 && row == 1 && !amIsCramped()) { + if (playercount >= 3 && row == 1 && !am_is_cramped()) { *x = (*x * 6) / 14; } } @@ -834,14 +834,14 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) *y = (*y * 7) / 10; } - *x += viGetViewLeft() / g_ScaleX + viGetViewWidth() / (g_ScaleX * 2); - *y += viGetViewTop() + viGetViewHeight() / 2; + *x += vi_get_view_left() / g_ScaleX + vi_get_view_width() / (g_ScaleX * 2); + *y += vi_get_view_top() + vi_get_view_height() / 2; if (playercount >= 2) { *y += 4; } - if ((playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) + if ((playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())) || playercount >= 3) { if ((g_Vars.currentplayernum % 2) == 0) { *x += 8; @@ -860,7 +860,7 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) *y = *y / 2; } - if (amIsCramped()) { + if (am_is_cramped()) { s32 offset = 1; if (row == 1) { @@ -874,11 +874,11 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) } } else { if (playercount >= 2) { - if (row == 1 && !amIsCramped()) { + if (row == 1 && !am_is_cramped()) { *x = (*x * 6) / 7; } } else { - if (playercount >= 3 && row == 1 && !amIsCramped()) { + if (playercount >= 3 && row == 1 && !am_is_cramped()) { *x = (*x * 6) / 14; } } @@ -890,10 +890,10 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) *y = (*y * 3) / 5; } - *x += viGetViewLeft() / g_ScaleX + viGetViewWidth() / (g_ScaleX * 2); - *y += viGetViewTop() + viGetViewHeight() / 2; + *x += vi_get_view_left() / g_ScaleX + vi_get_view_width() / (g_ScaleX * 2); + *y += vi_get_view_top() + vi_get_view_height() / 2; - if ((playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) + if ((playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())) || playercount >= 3) { if ((g_Vars.currentplayernum % 2) == 0) { *x += 8; @@ -914,7 +914,7 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) if (1); } - if (row == 1 && amIsCramped() && column != 1) { + if (row == 1 && am_is_cramped() && column != 1) { *x = *x / 2; if (*x < 0) { @@ -925,23 +925,23 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) } if (playercount >= 2) { - if (row == 1 && !amIsCramped()) { + if (row == 1 && !am_is_cramped()) { *x = (*x * 6) / 7; } *y = (*y * 3) / 5; } else if (playercount >= 3) { - if (row == 1 && !amIsCramped()) { + if (row == 1 && !am_is_cramped()) { *x = (*x * 6) / 14; } *y = (*y * 3) / 5; } - *x += viGetViewLeft() / g_ScaleX + viGetViewWidth() / (g_ScaleX * 2); - *y += viGetViewTop() + viGetViewHeight() / 2; + *x += vi_get_view_left() / g_ScaleX + vi_get_view_width() / (g_ScaleX * 2); + *y += vi_get_view_top() + vi_get_view_height() / 2; - if ((playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) || playercount >= 3) { + if ((playercount == 2 && options_get_screen_split() == SCREENSPLIT_VERTICAL) || playercount >= 3) { if ((g_Vars.currentplayernum % 2) == 0) { *x += 8; } else { @@ -951,23 +951,23 @@ void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y) #endif } -Gfx *amRenderText(Gfx *gdl, char *text, u32 colour, s16 left, s16 top) +Gfx *am_render_text(Gfx *gdl, char *text, u32 colour, s16 left, s16 top) { s32 x; s32 y; s32 textwidth; s32 textheight; - textMeasure(&textheight, &textwidth, text, g_AmFont1, g_AmFont2, 0); + text_measure(&textheight, &textwidth, text, g_AmFont1, g_AmFont2, 0); x = left - (textwidth / 2); y = top - 4; - gdl = textRenderProjected(gdl, &x, &y, text, g_AmFont1, g_AmFont2, colour, SCREEN_320, SCREEN_240, 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_AmFont1, g_AmFont2, colour, SCREEN_320, SCREEN_240, 0, 0); return gdl; } -Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) +Gfx *am_render_aibot_info(Gfx *gdl, s32 buddynum) { s32 x; s32 y; @@ -982,15 +982,15 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) #endif #if VERSION >= VERSION_NTSC_1_0 - if (PLAYERCOUNT() == 1 && optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { + if (PLAYERCOUNT() == 1 && options_get_effective_screen_size() != SCREENSIZE_FULL) { wide = true; } #endif #if VERSION >= VERSION_NTSC_1_0 - if ((PLAYERCOUNT() == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) || PLAYERCOUNT() >= 3) + if ((PLAYERCOUNT() == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())) || PLAYERCOUNT() >= 3) #else - if ((PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) || PLAYERCOUNT() >= 3) + if ((PLAYERCOUNT() == 2 && options_get_screen_split() == SCREENSPLIT_VERTICAL) || PLAYERCOUNT() >= 3) #endif { if ((g_Vars.currentplayernum % 2) == 0) { @@ -1011,27 +1011,27 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) } if (weaponnum < WEAPON_FALCON2 || weaponnum > WEAPON_HORIZONSCANNER) { - weaponname = langGet(L_MISC_173); // "No Weapon" + weaponname = lang_get(L_MISC_173); // "No Weapon" } else { - weaponname = bgunGetShortName(weaponnum); + weaponname = bgun_get_short_name(weaponnum); } - textMeasure(&textheight, &textwidth, aibotname, g_AmFont1, g_AmFont2, 0); + text_measure(&textheight, &textwidth, aibotname, g_AmFont1, g_AmFont2, 0); - x = viGetViewLeft() / g_ScaleX - + (s32)(viGetViewWidth() / g_ScaleX * 0.5f) + x = vi_get_view_left() / g_ScaleX + + (s32)(vi_get_view_width() / g_ScaleX * 0.5f) - (s32)(textwidth * 0.5f) + offset; if (PLAYERCOUNT() >= 2) { - y = viGetViewTop() + 5; + y = vi_get_view_top() + 5; } else { - y = viGetViewTop() + 10; + y = vi_get_view_top() + 10; } #if VERSION >= VERSION_NTSC_1_0 if (wide) { - x = viGetViewLeft() / g_ScaleX + 32; + x = vi_get_view_left() / g_ScaleX + 32; } #endif @@ -1041,47 +1041,47 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) y += (PLAYERCOUNT() >= 2) ? 0 : (s32)(textheight * 1.1f); #else - gdl = textRender(gdl, &x, &y, aibotname, g_AmFont1, g_AmFont2, -1, + gdl = text_render(gdl, &x, &y, aibotname, g_AmFont1, g_AmFont2, -1, 0x000000ff, SCREEN_320, SCREEN_240, 0, 0); y += (PLAYERCOUNT() >= 2) ? 0 : (s32)(textheight * 1.1f); - textMeasure(&textheight, &textwidth, weaponname, g_AmFont1, g_AmFont2, 0); + text_measure(&textheight, &textwidth, weaponname, g_AmFont1, g_AmFont2, 0); - x = viGetViewLeft() / g_ScaleX - + (s32)(viGetViewWidth() / g_ScaleX * 0.5f) + x = vi_get_view_left() / g_ScaleX + + (s32)(vi_get_view_width() / g_ScaleX * 0.5f) - (s32)(textwidth * 0.5f) + offset; #if VERSION >= VERSION_NTSC_1_0 if (wide) { - x = viGetViewLeft() / g_ScaleX + 32; + x = vi_get_view_left() / g_ScaleX + 32; } #endif - gdl = textRender(gdl, &x, &y, weaponname, g_AmFont1, g_AmFont2, -1, + gdl = text_render(gdl, &x, &y, weaponname, g_AmFont1, g_AmFont2, -1, 0x000000ff, SCREEN_320, SCREEN_240, 0, 0); #endif g_Vars.currentplayer->commandingaibot = g_MpAllChrPtrs[buddynum]; } else { - char *title = langGet(L_MISC_215); // "All Simulants" + char *title = lang_get(L_MISC_215); // "All Simulants" - textMeasure(&textheight, &textwidth, title, g_AmFont1, g_AmFont2, 0); + text_measure(&textheight, &textwidth, title, g_AmFont1, g_AmFont2, 0); - x = viGetViewLeft() / g_ScaleX - + (s32)(viGetViewWidth() / g_ScaleX * 0.5f) + x = vi_get_view_left() / g_ScaleX + + (s32)(vi_get_view_width() / g_ScaleX * 0.5f) - (s32)(textwidth * 0.5f) + offset; if (PLAYERCOUNT() >= 2) { - y = viGetViewTop() + 5; + y = vi_get_view_top() + 5; } else { - y = viGetViewTop() + 10; + y = vi_get_view_top() + 10; } #if VERSION >= VERSION_NTSC_1_0 if (wide) { - x = viGetViewLeft() / g_ScaleX + 32; + x = vi_get_view_left() / g_ScaleX + 32; } #endif @@ -1089,7 +1089,7 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum) gdl = func0f1574d0jf(gdl, &x, &y, title, g_AmFont1, g_AmFont2, -1, 0x000000ff, SCREEN_320, SCREEN_240, 0, 0); #else - gdl = textRender(gdl, &x, &y, title, g_AmFont1, g_AmFont2, -1, + gdl = text_render(gdl, &x, &y, title, g_AmFont1, g_AmFont2, -1, 0x000000ff, SCREEN_320, SCREEN_240, 0, 0); #endif } @@ -1112,7 +1112,7 @@ const char var7f1b2c34[] = "FAV: Added gun %d to slot %d\n"; u8 var800719a0[][3] = { {0, 1, 2}, {3, 4, 5}, {6, 7, 8} }; -Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) +Gfx *am_render_slot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) { static u32 obcol = 0xff00004f; // outer border static u32 ibcol = VERSION >= VERSION_NTSC_1_0 ? 0x3f00008f : 0x3f00006f; // inner background @@ -1142,12 +1142,12 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) return gdl; } - mainOverrideVariable("obcol", &obcol); - mainOverrideVariable("ibcol", &ibcol); - mainOverrideVariable("defcol", &defcol); - mainOverrideVariable("favcol", &favcol); - mainOverrideVariable("pickcol", &pickcol); - mainOverrideVariable("pickcol2", &pickcol2); + main_override_variable("obcol", &obcol); + main_override_variable("ibcol", &ibcol); + main_override_variable("defcol", &defcol); + main_override_variable("favcol", &favcol); + main_override_variable("pickcol", &pickcol); + main_override_variable("pickcol2", &pickcol2); // Render background colour colour = (u32)(g_AmMenus[g_AmIndex].alphafrac * (ibcol & 0xff)) | (ibcol & 0xffffff00); @@ -1168,7 +1168,7 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) colour = 0x0000006f; } - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); gDPFillRectangleScaled(gdl++, x - g_AmMenus[g_AmIndex].slotwidth / 2 + 1, @@ -1195,7 +1195,7 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) colour = 0x4f4f4f7f; } - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); // Top border gDPFillRectangleScaled(gdl++, @@ -1235,7 +1235,7 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) } if (flags & AMSLOTFLAG_ACTIVE) { - colour = colourBlend(0xffaf8fff, colour, menuGetCosOscFrac(10) * 255.0f); + colour = colour_blend(0xffaf8fff, colour, menu_get_cos_osc_frac(10) * 255.0f); } colour = (u32)(g_AmMenus[g_AmIndex].alphafrac * (colour & 0xff)) | (colour & 0xffffff00); @@ -1244,12 +1244,12 @@ Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags) colour = 0x4f4f4f7f; } - gdl = amRenderText(gdl, text, colour, x, y); + gdl = am_render_text(gdl, text, colour, x, y); return gdl; } -Gfx *amRender(Gfx *gdl) +Gfx *am_render(Gfx *gdl) { struct chrdata *chr; u32 flags; @@ -1283,7 +1283,7 @@ Gfx *amRender(Gfx *gdl) } if (g_AmMenus[g_AmIndex].dstx == -123) { - amCalculateSlotPosition( + am_calculate_slot_position( g_AmMenus[g_AmIndex].slotnum % 3, g_AmMenus[g_AmIndex].slotnum / 3, &g_AmMenus[g_AmIndex].selx, @@ -1291,7 +1291,7 @@ Gfx *amRender(Gfx *gdl) g_AmMenus[g_AmIndex].dstx = g_AmMenus[g_AmIndex].selx; g_AmMenus[g_AmIndex].dsty = g_AmMenus[g_AmIndex].sely; } else { - amCalculateSlotPosition( + am_calculate_slot_position( g_AmMenus[g_AmIndex].slotnum % 3, g_AmMenus[g_AmIndex].slotnum / 3, &g_AmMenus[g_AmIndex].dstx, @@ -1300,8 +1300,8 @@ Gfx *amRender(Gfx *gdl) gdl = func0f0d479c(gdl); - colours = gfxAllocateColours(2); - vertices = gfxAllocateVertices(8); + colours = gfx_allocate_colours(2); + vertices = gfx_allocate_vertices(8); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -1310,33 +1310,33 @@ Gfx *amRender(Gfx *gdl) gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI); gSPClearGeometryMode(gdl++, G_CULL_BOTH); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); // Top - amCalculateSlotPosition(1, 0, &slotx, &sloty); + am_calculate_slot_position(1, 0, &slotx, &sloty); vertices[0].x = slotx * 10; vertices[0].y = sloty * 10; vertices[0].z = -10; // Right - amCalculateSlotPosition(2, 1, &slotx, &sloty); + am_calculate_slot_position(2, 1, &slotx, &sloty); vertices[1].x = slotx * 10; vertices[1].y = sloty * 10; vertices[1].z = -10; // Bottom - amCalculateSlotPosition(1, 2, &slotx, &sloty); + am_calculate_slot_position(1, 2, &slotx, &sloty); vertices[2].x = slotx * 10; vertices[2].y = sloty * 10; vertices[2].z = -10; // Left - amCalculateSlotPosition(0, 1, &slotx, &sloty); + am_calculate_slot_position(0, 1, &slotx, &sloty); vertices[3].x = slotx * 10; vertices[3].y = sloty * 10; @@ -1390,14 +1390,14 @@ Gfx *amRender(Gfx *gdl) s32 buddynum; mode = AMSLOTMODE_DEFAULT; - amCalculateSlotPosition(column, row, &slotx, &sloty); + am_calculate_slot_position(column, row, &slotx, &sloty); flags = 0; if (column + row * 3 == g_AmMenus[g_AmIndex].slotnum) { mode = AMSLOTMODE_FOCUSED; } - if (g_MissionConfig.iscoop && (buddynum = amGetFirstBuddyIndex(), buddynum >= 0)) { + if (g_MissionConfig.iscoop && (buddynum = am_get_first_buddy_index(), buddynum >= 0)) { if (mode == AMSLOTMODE_DEFAULT && g_AmMenus[g_AmIndex].screenindex >= 2) { struct chrdata *chr = g_Vars.aibuddies[buddynum]->chr; @@ -1442,14 +1442,14 @@ Gfx *amRender(Gfx *gdl) colour = 0x4f4f4f7f; } - amGetSlotDetails(column + row * 3, &flags, text); + am_get_slot_details(column + row * 3, &flags, text); if (column == 1 && row == 1) { - if (!amIsCramped()) { - gdl = amRenderText(gdl, text, colour, slotx, sloty); + if (!am_is_cramped()) { + gdl = am_render_text(gdl, text, colour, slotx, sloty); } } else { - gdl = amRenderSlot(gdl, text, slotx, sloty, mode, flags); + gdl = am_render_slot(gdl, text, slotx, sloty, mode, flags); } } } @@ -1459,16 +1459,16 @@ Gfx *amRender(Gfx *gdl) struct g_vars *vars = &g_Vars; #if VERSION >= VERSION_JPN_FINAL - if (!(g_MissionConfig.iscoop && amGetFirstBuddyIndex() >= 0) + if (!(g_MissionConfig.iscoop && am_get_first_buddy_index() >= 0) && g_Vars.normmplayerisrunning && g_AmMenus[g_AmIndex].screenindex >= 2) { - gdl = amRenderAibotInfo(gdl, g_AmMenus[g_AmIndex].screenindex - 2); + gdl = am_render_aibot_info(gdl, g_AmMenus[g_AmIndex].screenindex - 2); } #else - if (!(g_MissionConfig.iscoop && amGetFirstBuddyIndex() >= 0) + if (!(g_MissionConfig.iscoop && am_get_first_buddy_index() >= 0) && vars->normmplayerisrunning && g_AmMenus[g_AmIndex].screenindex >= 2) { - gdl = amRenderAibotInfo(gdl, g_AmMenus[g_AmIndex].screenindex - 2); + gdl = am_render_aibot_info(gdl, g_AmMenus[g_AmIndex].screenindex - 2); } #endif } @@ -1502,13 +1502,13 @@ Gfx *amRender(Gfx *gdl) colour = 0x4f4f4f7f; } - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); halfwidth = g_AmMenus[g_AmIndex].slotwidth / 2; #if VERSION >= VERSION_NTSC_1_0 if (g_AmMenus[g_AmIndex].slotnum == 4) { - if (amIsCramped()) { + if (am_is_cramped()) { halfwidth = 1; above = 2; below = 0; @@ -1518,14 +1518,14 @@ Gfx *amRender(Gfx *gdl) char text[32]; u32 flags; - amGetSlotDetails(4, &flags, text); - textMeasure(&textheight, &textwidth, text, g_AmFont1, g_AmFont2, 0); + am_get_slot_details(4, &flags, text); + text_measure(&textheight, &textwidth, text, g_AmFont1, g_AmFont2, 0); halfwidth = textwidth / 2 + 2; } } #else - if (g_AmMenus[g_AmIndex].slotnum == 4 && amIsCramped()) { + if (g_AmMenus[g_AmIndex].slotnum == 4 && am_is_cramped()) { halfwidth = 4; } #endif @@ -1599,25 +1599,25 @@ Gfx *amRender(Gfx *gdl) xoffset = 0; #if VERSION >= VERSION_NTSC_1_0 - if ((PLAYERCOUNT() == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) || PLAYERCOUNT() >= 3) { + if ((PLAYERCOUNT() == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())) || PLAYERCOUNT() >= 3) { xoffset = (g_Vars.currentplayernum & 1) == 0 ? 8 : -8; } - if (PLAYERCOUNT() == 1 && optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { - part1left = viGetViewLeft() / g_ScaleX + 32; + if (PLAYERCOUNT() == 1 && options_get_effective_screen_size() != SCREENSIZE_FULL) { + part1left = vi_get_view_left() / g_ScaleX + 32; } else { - part1left = (s32) ((viGetViewWidth() / g_ScaleX) * 0.5f) - + (s32) (viGetViewLeft() / g_ScaleX) + part1left = (s32) ((vi_get_view_width() / g_ScaleX) * 0.5f) + + (s32) (vi_get_view_left() / g_ScaleX) - (s32) (barwidth * 0.5f) + xoffset; } #else - if ((PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) || PLAYERCOUNT() >= 3) { + if ((PLAYERCOUNT() == 2 && options_get_screen_split() == SCREENSPLIT_VERTICAL) || PLAYERCOUNT() >= 3) { xoffset = (g_Vars.currentplayernum & 1) == 0 ? 8 : -8; } - part1left = (s32) ((viGetViewWidth() / g_ScaleX) * 0.5f) - + (s32) (viGetViewLeft() / g_ScaleX) + part1left = (s32) ((vi_get_view_width() / g_ScaleX) * 0.5f) + + (s32) (vi_get_view_left() / g_ScaleX) - (s32) (barwidth * 0.5f) + xoffset; #endif @@ -1638,7 +1638,7 @@ Gfx *amRender(Gfx *gdl) gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); gDPSetCombineMode(gdl++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - y = viGetViewTop() + viGetViewHeight() - (PLAYERCOUNT() >= 2 ? 19 : 34); + y = vi_get_view_top() + vi_get_view_height() - (PLAYERCOUNT() >= 2 ? 19 : 34); // NTSC beta doesn't scale the health bar when hi-res is on, // and it only matches if part2left is an inline expression diff --git a/src/game/activemenutick.c b/src/game/activemenutick.c index de1a0cd6e..fb61a3d54 100644 --- a/src/game/activemenutick.c +++ b/src/game/activemenutick.c @@ -13,17 +13,17 @@ #include "data.h" #include "types.h" -void amTick(void) +void am_tick(void) { s32 prevplayernum = g_Vars.currentplayernum; s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); g_AmIndex = g_Vars.currentplayernum; if (g_AmMenus[g_AmIndex].togglefunc) { - if (bgunConsiderToggleGunFunction(60, false, true) > 0) { + if (bgun_consider_toggle_gun_function(60, false, true) > 0) { g_AmMenus[g_AmIndex].togglefunc = false; } } else { @@ -31,24 +31,24 @@ void amTick(void) } if (g_Vars.normmplayerisrunning == false - && invGetCount() != g_AmMenus[g_AmIndex].numitems) { - amAssignWeaponSlots(); + && inv_get_count() != g_AmMenus[g_AmIndex].numitems) { + am_assign_weapon_slots(); } if (g_Vars.currentplayer->activemenumode != AMMODE_CLOSED) { - s32 controlmode = optionsGetControlMode(g_Vars.currentplayerstats->mpindex); - s8 contpadnum = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); - s32 numsamples = joyGetNumSamples(); + s32 controlmode = options_get_control_mode(g_Vars.currentplayerstats->mpindex); + s8 contpadnum = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); + s32 numsamples = joy_get_num_samples(); s32 j; for (j = 0; j < numsamples; j++) { s8 gotonextscreen = false; - s8 cstickx = joyGetStickXOnSample(j, contpadnum); - s8 csticky = joyGetStickYOnSample(j, contpadnum); + s8 cstickx = joy_get_stick_x_on_sample(j, contpadnum); + s8 csticky = joy_get_stick_y_on_sample(j, contpadnum); s8 absstickx; s8 abssticky; - u16 buttonsstate = joyGetButtonsOnSample(j, contpadnum, 0xffff); - u16 buttonspressed = joyGetButtonsPressedOnSample(j, contpadnum, 0xffff); + u16 buttonsstate = joy_get_buttons_on_sample(j, contpadnum, 0xffff); + u16 buttonspressed = joy_get_buttons_pressed_on_sample(j, contpadnum, 0xffff); bool stickpushed = false; s32 slotnum; bool stayopen; @@ -70,7 +70,7 @@ void amTick(void) buttonspressed = 0; } - // JPN fixes the bug that's documented in amChangeScreen + // JPN fixes the bug that's documented in am_change_screen if (controlmode == CONTROLMODE_13 || controlmode == CONTROLMODE_14) { if ((buttonsstate & R_TRIG) || (buttonsstate & L_TRIG)) { stayopen = true; @@ -107,7 +107,7 @@ void amTick(void) && g_AmMenus[g_AmIndex].origscreennum == 0) { g_AmMenus[g_AmIndex].origscreennum = g_AmMenus[g_AmIndex].screenindex; g_AmMenus[g_AmIndex].screenindex = 2; - amChangeScreen(0); + am_change_screen(0); } // If exiting allbots mode, return to original screen @@ -115,7 +115,7 @@ void amTick(void) && g_AmMenus[g_AmIndex].origscreennum) { g_AmMenus[g_AmIndex].screenindex = g_AmMenus[g_AmIndex].origscreennum; g_AmMenus[g_AmIndex].origscreennum = 0; - amChangeScreen(0); + am_change_screen(0); } if (buttonsstate & U_CBUTTONS) { @@ -154,11 +154,11 @@ void amTick(void) || controlmode == CONTROLMODE_24 || controlmode == CONTROLMODE_22 || controlmode == CONTROLMODE_21) { - s8 contpadnum2 = optionsGetContpadNum2(g_Vars.currentplayerstats->mpindex); - s8 cstickx2 = joyGetStickXOnSample(j, contpadnum2); - s8 csticky2 = joyGetStickYOnSample(j, contpadnum2); - u16 buttonsstate2 = joyGetButtonsOnSample(j, contpadnum2, 0xffff); - u16 buttonspressed2 = joyGetButtonsPressedOnSample(j, contpadnum2, 0xffff); + s8 contpadnum2 = options_get_contpad_num2(g_Vars.currentplayerstats->mpindex); + s8 cstickx2 = joy_get_stick_x_on_sample(j, contpadnum2); + s8 csticky2 = joy_get_stick_y_on_sample(j, contpadnum2); + u16 buttonsstate2 = joy_get_buttons_on_sample(j, contpadnum2, 0xffff); + u16 buttonspressed2 = joy_get_buttons_pressed_on_sample(j, contpadnum2, 0xffff); if (g_Vars.currentplayer->activemenumode == AMMODE_EDIT) { buttonsstate2 = buttonsstate2 & A_BUTTON; @@ -256,7 +256,7 @@ void amTick(void) if (!stayopen && (g_Vars.currentplayer->activemenumode != AMMODE_EDIT || g_Menus[g_MpPlayerNum].curdialog == NULL)) { - amClose(); + am_close(); break; } @@ -271,24 +271,24 @@ void amTick(void) if (g_AmMenus[g_AmIndex].slotnum == 4) { gotonextscreen = true; } else { - amApply(g_AmMenus[g_AmIndex].slotnum); + am_apply(g_AmMenus[g_AmIndex].slotnum); } } else { // Bot command screen, in multiplayer if (g_AmBotCommands[g_AmMenus[g_AmIndex].slotnum] == AIBOTCMD_ATTACK) { - amOpenPickTarget(); + am_open_pick_target(); } else if (g_AmMenus[g_AmIndex].allbots == false) { gotonextscreen = true; #if VERSION < VERSION_NTSC_1_0 if (g_AmMenus[g_AmIndex].slotnum != 4) { - amApply(g_AmMenus[g_AmIndex].slotnum); + am_apply(g_AmMenus[g_AmIndex].slotnum); } #endif } #if VERSION >= VERSION_NTSC_1_0 if (g_AmMenus[g_AmIndex].slotnum != 4) { - amApply(g_AmMenus[g_AmIndex].slotnum); + am_apply(g_AmMenus[g_AmIndex].slotnum); } #endif } @@ -297,21 +297,21 @@ void amTick(void) if (g_AmMenus[g_AmIndex].slotnum == 4) { gotonextscreen = true; } else { - amApply(g_AmMenus[g_AmIndex].slotnum); + am_apply(g_AmMenus[g_AmIndex].slotnum); } } } if (gotonextscreen) { - amChangeScreen(gotonextscreen); + am_change_screen(gotonextscreen); // If weapon has no functions, skip past function screen if (g_AmMenus[g_AmIndex].screenindex == 1) { - struct weaponfunc *pri = weaponGetFunction(&g_Vars.currentplayer->hands[0].gset, FUNC_PRIMARY); - struct weaponfunc *sec = weaponGetFunction(&g_Vars.currentplayer->hands[0].gset, FUNC_SECONDARY); + struct weaponfunc *pri = weapon_get_function(&g_Vars.currentplayer->hands[0].gset, FUNC_PRIMARY); + struct weaponfunc *sec = weapon_get_function(&g_Vars.currentplayer->hands[0].gset, FUNC_SECONDARY); if (!pri && !sec) { - amChangeScreen(gotonextscreen); + am_change_screen(gotonextscreen); } } } @@ -331,7 +331,7 @@ void amTick(void) char text[28]; u32 flags; - amGetSlotDetails(slotnum, &flags, text); + am_get_slot_details(slotnum, &flags, text); if (strcmp(text, "") == 0) { gotoslot = false; @@ -423,5 +423,5 @@ void amTick(void) } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } diff --git a/src/game/bg.c b/src/game/bg.c index b2a0f99e4..2bdff2b6c 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -130,7 +130,7 @@ s32 g_BgNumRoomLoadCandidates = 0; u16 g_BgFrameCount = 0xfffe; s32 g_BgNumPortalCameraCacheItems = 0; -void bgUnpausePropsInRoom(u32 roomnum, bool tintedglassonly) +void bg_unpause_props_in_room(u32 roomnum, bool tintedglassonly) { struct prop *prop; struct defaultobj *obj; @@ -141,7 +141,7 @@ void bgUnpausePropsInRoom(u32 roomnum, bool tintedglassonly) rooms[0] = roomnum; rooms[1] = -1; - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; @@ -158,10 +158,10 @@ void bgUnpausePropsInRoom(u32 roomnum, bool tintedglassonly) obj = prop->obj; if (obj->type == OBJTYPE_TINTEDGLASS) { - propUnpause(prop); + prop_unpause(prop); } } else { - propUnpause(prop); + prop_unpause(prop); } } @@ -169,7 +169,7 @@ void bgUnpausePropsInRoom(u32 roomnum, bool tintedglassonly) } } -void bgSetRoomOnscreen(s32 roomnum, s32 draworder, struct screenbox *box) +void bg_set_room_onscreen(s32 roomnum, s32 draworder, struct screenbox *box) { s32 index; @@ -204,7 +204,7 @@ void bgSetRoomOnscreen(s32 roomnum, s32 draworder, struct screenbox *box) } } - bgExpandBox(&g_BgDrawSlots[index].box, box); + bg_expand_box(&g_BgDrawSlots[index].box, box); } else { index = g_BgNumDrawSlots; @@ -237,11 +237,11 @@ void bgSetRoomOnscreen(s32 roomnum, s32 draworder, struct screenbox *box) g_BgNumDrawSlots = g_BgNumAttemptedDrawSlots; } - bgUnpausePropsInRoom(roomnum, false); + bg_unpause_props_in_room(roomnum, false); if (g_Rooms[roomnum].loaded240 == 0 && var8007fc10 > 0) { var8007fc10--; - bgLoadRoom(roomnum); + bg_load_room(roomnum); } else if (g_Rooms[roomnum].loaded240 == 0) { var8007fc10--; } @@ -249,13 +249,13 @@ void bgSetRoomOnscreen(s32 roomnum, s32 draworder, struct screenbox *box) } } -void bgGetRoomBrightnessRange(s32 roomnum, u8 *min, u8 *max) +void bg_get_room_brightness_range(s32 roomnum, u8 *min, u8 *max) { *min = g_BgRooms[roomnum].br_light_min; *max = g_BgRooms[roomnum].br_light_max; } -struct drawslot *bgGetRoomDrawSlot(s32 roomnum) +struct drawslot *bg_get_room_draw_slot(s32 roomnum) { s32 index = 60; @@ -266,7 +266,7 @@ struct drawslot *bgGetRoomDrawSlot(s32 roomnum) return &g_BgDrawSlots[index]; } -Gfx *bgRenderXrayData(Gfx *gdl, struct xraydata *xraydata) +Gfx *bg_render_xray_data(Gfx *gdl, struct xraydata *xraydata) { Vtx *vertices; Col *colours; @@ -275,8 +275,8 @@ Gfx *bgRenderXrayData(Gfx *gdl, struct xraydata *xraydata) s32 count; if (xraydata->numtris > 0) { - vertices = gfxAllocateVertices(xraydata->numvertices); - colours = gfxAllocateColours(xraydata->numvertices); + vertices = gfx_allocate_vertices(xraydata->numvertices); + colours = gfx_allocate_colours(xraydata->numvertices); for (i = 0; i < xraydata->numvertices; i++) { vertices[i].x = xraydata->vertices[i][0]; @@ -322,14 +322,14 @@ Gfx *bgRenderXrayData(Gfx *gdl, struct xraydata *xraydata) return gdl; } -Gfx *bgAddXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 vertices1[3], s16 vertices2[3], s16 vertices3[3], u32 colour1, u32 colour2, u32 colour3) +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) { s16 sp30[3] = {-1, -1, -1}; s32 count = 0; s16 i; if (xraydata->numtris >= 64) { - gdl = bgRenderXrayData(gdl, xraydata); + gdl = bg_render_xray_data(gdl, xraydata); } for (i = 0; i < xraydata->numvertices && sp30[0] == -1; i++) { @@ -361,7 +361,7 @@ Gfx *bgAddXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 vertices1[3], s16 ver if (count < 3) { if (xraydata->numvertices - count + 3 > 16) { - gdl = bgRenderXrayData(gdl, xraydata); + gdl = bg_render_xray_data(gdl, xraydata); xraydata->vertices[0][0] = vertices1[0]; xraydata->vertices[0][1] = vertices1[1]; @@ -427,7 +427,7 @@ Gfx *bgAddXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 vertices1[3], s16 ver return gdl; } -void bgChooseXrayVtxColour(bool *inrange, s16 vertex[3], u32 *colour, struct xraydata *xraydata) +void bg_choose_xray_vtx_colour(bool *inrange, s16 vertex[3], u32 *colour, struct xraydata *xraydata) { f32 sp2c[3]; f32 f12; @@ -496,7 +496,7 @@ void bgChooseXrayVtxColour(bool *inrange, s16 vertex[3], u32 *colour, struct xra } } -Gfx *bgProcessXrayTri(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_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) { s32 spa4[3]; s16 sp9c[3] = {0, 0, 0}; @@ -523,7 +523,7 @@ Gfx *bgProcessXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 arg2[3], s16 arg3 sp64++; sp68 = 0; - bgChooseXrayVtxColour(&inrange[0], sp84[0], &colours[0], xraydata); + bg_choose_xray_vtx_colour(&inrange[0], sp84[0], &colours[0], xraydata); } spa4[0] = arg4[0] - arg3[0]; @@ -541,7 +541,7 @@ Gfx *bgProcessXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 arg2[3], s16 arg3 sp64++; sp68 = 1; - bgChooseXrayVtxColour(&inrange[1], sp84[1], &colours[1], xraydata); + bg_choose_xray_vtx_colour(&inrange[1], sp84[1], &colours[1], xraydata); } spa4[0] = arg2[0] - arg4[0]; @@ -559,13 +559,13 @@ Gfx *bgProcessXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 arg2[3], s16 arg3 sp64++; sp68 = 2; - bgChooseXrayVtxColour(&inrange[2], sp84[2], &colours[2], xraydata); + bg_choose_xray_vtx_colour(&inrange[2], sp84[2], &colours[2], xraydata); } } if (sp64 == 0) { if (arg8 || arg9 || arg10) { - return bgAddXrayTri(gdl, xraydata, arg2, arg3, arg4, arg5, arg6, arg7); + return bg_add_xray_tri(gdl, xraydata, arg2, arg3, arg4, arg5, arg6, arg7); } } else { bool render; @@ -618,14 +618,14 @@ Gfx *bgProcessXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 arg2[3], s16 arg3 if (render) { if (sp64 == 1) { if (sp68 == 0) { - gdl = bgProcessXrayTri(gdl, xraydata, arg2, sp84[0], arg4, arg5, colours[0], arg7, arg8, inrange[0], arg10); - gdl = bgProcessXrayTri(gdl, xraydata, arg4, sp84[0], arg3, arg7, colours[0], arg6, arg10, inrange[0], arg9); + gdl = bg_process_xray_tri(gdl, xraydata, arg2, sp84[0], arg4, arg5, colours[0], arg7, arg8, inrange[0], arg10); + gdl = bg_process_xray_tri(gdl, xraydata, arg4, sp84[0], arg3, arg7, colours[0], arg6, arg10, inrange[0], arg9); } else if (sp68 == 1) { - gdl = bgProcessXrayTri(gdl, xraydata, arg3, sp84[1], arg2, arg6, colours[1], arg5, arg9, inrange[1], arg8); - gdl = bgProcessXrayTri(gdl, xraydata, arg2, sp84[1], arg4, arg5, colours[1], arg7, arg8, inrange[1], arg10); + gdl = bg_process_xray_tri(gdl, xraydata, arg3, sp84[1], arg2, arg6, colours[1], arg5, arg9, inrange[1], arg8); + gdl = bg_process_xray_tri(gdl, xraydata, arg2, sp84[1], arg4, arg5, colours[1], arg7, arg8, inrange[1], arg10); } else if (sp68 == 2) { - gdl = bgProcessXrayTri(gdl, xraydata, arg4, sp84[2], arg3, arg7, colours[2], arg6, arg10, inrange[2], arg9); - gdl = bgProcessXrayTri(gdl, xraydata, arg3, sp84[2], arg2, arg6, colours[2], arg5, arg9, inrange[2], arg8); + gdl = bg_process_xray_tri(gdl, xraydata, arg4, sp84[2], arg3, arg7, colours[2], arg6, arg10, inrange[2], arg9); + gdl = bg_process_xray_tri(gdl, xraydata, arg3, sp84[2], arg2, arg6, colours[2], arg5, arg9, inrange[2], arg8); } } else if (sp64 == 2) { s32 v0 = 0; @@ -639,23 +639,23 @@ Gfx *bgProcessXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 arg2[3], s16 arg3 } if (v0 == 0) { - gdl = bgProcessXrayTri(gdl, xraydata, arg4, sp84[2], sp84[1], arg7, colours[2], colours[1], arg10, inrange[2], inrange[1]); - gdl = bgProcessXrayTri(gdl, xraydata, arg3, sp84[1], sp84[2], arg6, colours[1], colours[2], arg9, inrange[1], inrange[2]); - gdl = bgProcessXrayTri(gdl, xraydata, arg2, arg3, sp84[2], arg5, arg6, colours[2], arg8, arg9, inrange[2]); + gdl = bg_process_xray_tri(gdl, xraydata, arg4, sp84[2], sp84[1], arg7, colours[2], colours[1], arg10, inrange[2], inrange[1]); + gdl = bg_process_xray_tri(gdl, xraydata, arg3, sp84[1], sp84[2], arg6, colours[1], colours[2], arg9, inrange[1], inrange[2]); + gdl = bg_process_xray_tri(gdl, xraydata, arg2, arg3, sp84[2], arg5, arg6, colours[2], arg8, arg9, inrange[2]); } else if (v0 == 1) { - gdl = bgProcessXrayTri(gdl, xraydata, arg2, sp84[0], sp84[2], arg5, colours[0], colours[2], arg8, inrange[0], inrange[2]); - gdl = bgProcessXrayTri(gdl, xraydata, arg4, sp84[2], sp84[0], arg7, colours[2], colours[0], arg10, inrange[2], inrange[0]); - gdl = bgProcessXrayTri(gdl, xraydata, arg3, arg4, sp84[0], arg6, arg7, colours[0], arg9, arg10, inrange[0]); + gdl = bg_process_xray_tri(gdl, xraydata, arg2, sp84[0], sp84[2], arg5, colours[0], colours[2], arg8, inrange[0], inrange[2]); + gdl = bg_process_xray_tri(gdl, xraydata, arg4, sp84[2], sp84[0], arg7, colours[2], colours[0], arg10, inrange[2], inrange[0]); + gdl = bg_process_xray_tri(gdl, xraydata, arg3, arg4, sp84[0], arg6, arg7, colours[0], arg9, arg10, inrange[0]); } else { - gdl = bgProcessXrayTri(gdl, xraydata, arg3, sp84[1], sp84[0], arg6, colours[1], colours[0], arg9, inrange[1], inrange[0]); - gdl = bgProcessXrayTri(gdl, xraydata, arg2, sp84[0], sp84[1], arg5, colours[0], colours[1], arg8, inrange[0], inrange[1]); - gdl = bgProcessXrayTri(gdl, xraydata, arg4, arg2, sp84[1], arg7, arg5, colours[1], arg10, arg8, inrange[1]); + gdl = bg_process_xray_tri(gdl, xraydata, arg3, sp84[1], sp84[0], arg6, colours[1], colours[0], arg9, inrange[1], inrange[0]); + gdl = bg_process_xray_tri(gdl, xraydata, arg2, sp84[0], sp84[1], arg5, colours[0], colours[1], arg8, inrange[0], inrange[1]); + gdl = bg_process_xray_tri(gdl, xraydata, arg4, arg2, sp84[1], arg7, arg5, colours[1], arg10, arg8, inrange[1]); } } else if (sp64 == 3) { - gdl = bgProcessXrayTri(gdl, xraydata, arg2, sp84[0], sp84[2], arg5, colours[0], colours[2], arg8, inrange[0], inrange[2]); - gdl = bgProcessXrayTri(gdl, xraydata, arg3, sp84[1], sp84[0], arg6, colours[1], colours[0], arg9, inrange[1], inrange[0]); - gdl = bgProcessXrayTri(gdl, xraydata, arg4, sp84[2], sp84[1], arg7, colours[2], colours[1], arg10, inrange[2], inrange[1]); - gdl = bgProcessXrayTri(gdl, xraydata, sp84[0], sp84[1], sp84[2], colours[0], colours[1], colours[2], inrange[0], inrange[1], inrange[2]); + gdl = bg_process_xray_tri(gdl, xraydata, arg2, sp84[0], sp84[2], arg5, colours[0], colours[2], arg8, inrange[0], inrange[2]); + gdl = bg_process_xray_tri(gdl, xraydata, arg3, sp84[1], sp84[0], arg6, colours[1], colours[0], arg9, inrange[1], inrange[0]); + gdl = bg_process_xray_tri(gdl, xraydata, arg4, sp84[2], sp84[1], arg7, colours[2], colours[1], arg10, inrange[2], inrange[1]); + gdl = bg_process_xray_tri(gdl, xraydata, sp84[0], sp84[1], sp84[2], colours[0], colours[1], colours[2], inrange[0], inrange[1], inrange[2]); } } } @@ -668,12 +668,12 @@ bool g_BgCmdStack[20] = {0}; s32 g_BgCmdStackIndex = 0; u32 g_BgCmdResult = BGRESULT_TRUE; -Gfx *bgRenderGdlInXray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3]) +Gfx *bg_render_gdl_in_xray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3]) { s32 i; u8 *verticesu8 = (u8 *) vertices; struct xraydata xraydata; - struct stagetableentry *stage = stageGetCurrent(); + struct stagetableentry *stage = stage_get_current(); s16 dmemvertices[16][3]; u32 dmemcolours[16]; bool inrange[16]; @@ -716,7 +716,7 @@ Gfx *bgRenderGdlInXray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3]) dmemvertices[dmemindex + i][1] = vtx->y; dmemvertices[dmemindex + i][2] = vtx->z; - bgChooseXrayVtxColour(&inrange[i], dmemvertices[dmemindex + i], &dmemcolours[dmemindex + i], &xraydata); + bg_choose_xray_vtx_colour(&inrange[i], dmemvertices[dmemindex + i], &dmemcolours[dmemindex + i], &xraydata); offset += sizeof(Vtx); } @@ -726,7 +726,7 @@ Gfx *bgRenderGdlInXray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3]) s16 y = cmd->tri.tri.v[1] / 10; s16 z = cmd->tri.tri.v[2] / 10; - gdl = bgProcessXrayTri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); + gdl = bg_process_xray_tri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); } else if (readgdl[0] == G_TRI4) { Gfx *cmd = (Gfx *) readgdl; s16 x; @@ -737,36 +737,36 @@ Gfx *bgRenderGdlInXray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3]) y = cmd->tri4.y1; z = cmd->tri4.z1; - gdl = bgProcessXrayTri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); + gdl = bg_process_xray_tri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); x = cmd->tri4.x2; y = cmd->tri4.y2; z = cmd->tri4.z2; - gdl = bgProcessXrayTri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); + gdl = bg_process_xray_tri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); x = cmd->tri4.x3; y = cmd->tri4.y3; z = cmd->tri4.z3; - gdl = bgProcessXrayTri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); + gdl = bg_process_xray_tri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); x = cmd->tri4.x4; y = cmd->tri4.y4; z = cmd->tri4.z4; - gdl = bgProcessXrayTri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); + gdl = bg_process_xray_tri(gdl, &xraydata, dmemvertices[x], dmemvertices[y], dmemvertices[z], dmemcolours[x], dmemcolours[y], dmemcolours[z], inrange[x], inrange[y], inrange[z]); } readgdl += 8; } - gdl = bgRenderXrayData(gdl, &xraydata); + gdl = bg_render_xray_data(gdl, &xraydata); return gdl; } -Gfx *bgRenderRoomXrayPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool recurse, s16 arg4[3]) +Gfx *bg_render_room_xray_pass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool recurse, s16 arg4[3]) { struct player *player = g_Vars.currentplayer; @@ -776,10 +776,10 @@ Gfx *bgRenderRoomXrayPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool r switch (block->type) { case ROOMBLOCKTYPE_LEAF: - gdl = bgRenderGdlInXray(gdl, (s8 *) block->gdl, block->vertices, arg4); + gdl = bg_render_gdl_in_xray(gdl, (s8 *) block->gdl, block->vertices, arg4); if (recurse) { - gdl = bgRenderRoomXrayPass(gdl, roomnum, block->next, true, arg4); + gdl = bg_render_room_xray_pass(gdl, roomnum, block->next, true, arg4); } break; case ROOMBLOCKTYPE_PARENT: @@ -802,15 +802,15 @@ Gfx *bgRenderRoomXrayPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool r sum = sp34.f[0] * sp28.f[0] + sp34.f[1] * sp28.f[1] + sp34.f[2] * sp28.f[2]; if (sum < 0.0f) { - gdl = bgRenderRoomXrayPass(gdl, roomnum, child1, false, arg4); - gdl = bgRenderRoomXrayPass(gdl, roomnum, child2, false, arg4); + gdl = bg_render_room_xray_pass(gdl, roomnum, child1, false, arg4); + gdl = bg_render_room_xray_pass(gdl, roomnum, child2, false, arg4); } else { - gdl = bgRenderRoomXrayPass(gdl, roomnum, child2, false, arg4); - gdl = bgRenderRoomXrayPass(gdl, roomnum, child1, false, arg4); + gdl = bg_render_room_xray_pass(gdl, roomnum, child2, false, arg4); + gdl = bg_render_room_xray_pass(gdl, roomnum, child1, false, arg4); } if (recurse) { - gdl = bgRenderRoomXrayPass(gdl, roomnum, block->next, true, arg4); + gdl = bg_render_room_xray_pass(gdl, roomnum, block->next, true, arg4); } } break; @@ -822,7 +822,7 @@ Gfx *bgRenderRoomXrayPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool r /** * Render the given room for the purpose of the FarSight or xray scanner. */ -Gfx *bgRenderRoomInXray(Gfx *gdl, s32 roomnum) +Gfx *bg_render_room_in_xray(Gfx *gdl, s32 roomnum) { struct coord sp54; struct coord globaldrawworldoffset; @@ -836,7 +836,7 @@ Gfx *bgRenderRoomInXray(Gfx *gdl, s32 roomnum) if (g_Rooms[roomnum].loaded240 == 0) { if (var8007fc10 > 0) { var8007fc10--; - bgLoadRoom(roomnum); + bg_load_room(roomnum); } } @@ -848,7 +848,7 @@ Gfx *bgRenderRoomInXray(Gfx *gdl, s32 roomnum) return gdl; } - roomGetPos(roomnum, &globaldrawworldoffset); + room_get_pos(roomnum, &globaldrawworldoffset); sp54.x = player->eraserpos.x - globaldrawworldoffset.x; sp54.y = player->eraserpos.y - globaldrawworldoffset.y; @@ -858,16 +858,16 @@ Gfx *bgRenderRoomInXray(Gfx *gdl, s32 roomnum) sp40[1] = sp54.f[1]; sp40[2] = sp54.f[2]; - gdl = roomApplyMtx(gdl, roomnum); - gdl = bgRenderRoomXrayPass(gdl, roomnum, g_Rooms[roomnum].gfxdata->opablocks, true, sp40); - gdl = bgRenderRoomXrayPass(gdl, roomnum, g_Rooms[roomnum].gfxdata->xlublocks, true, sp40); + gdl = room_apply_mtx(gdl, roomnum); + gdl = bg_render_room_xray_pass(gdl, roomnum, g_Rooms[roomnum].gfxdata->opablocks, true, sp40); + gdl = bg_render_room_xray_pass(gdl, roomnum, g_Rooms[roomnum].gfxdata->xlublocks, true, sp40); g_Rooms[roomnum].loaded240 = 1; return gdl; } -Gfx *bgRenderSceneInXray(Gfx *gdl) +Gfx *bg_render_scene_in_xray(Gfx *gdl) { RoomNum *roomnumptr; RoomNum *room; @@ -900,7 +900,7 @@ Gfx *bgRenderSceneInXray(Gfx *gdl) roomnumptr++; } - gdl = envStopFog(gdl); + gdl = env_stop_fog(gdl); gSPClearGeometryMode(gdl++, G_CULL_BOTH); gSPSetGeometryMode(gdl++, G_SHADE | G_SHADING_SMOOTH); @@ -908,29 +908,29 @@ Gfx *bgRenderSceneInXray(Gfx *gdl) gDPSetTextureFilter(gdl++, G_TF_BILERP); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); // Render BG - gdl = bgScissorToViewport(gdl); + gdl = bg_scissor_to_viewport(gdl); for (i = g_BgMinDrawOrder; i <= g_BgMaxDrawOrder; i++) { for (j = 0; j < g_BgNumDrawSlots; j++) { struct drawslot *thing = &g_BgDrawSlots[j]; if (thing->draworder == i) { - gdl = bgRenderRoomInXray(gdl, thing->roomnum); + gdl = bg_render_room_in_xray(gdl, thing->roomnum); } } } // Render props - gdl = bgScissorToViewport(gdl); + gdl = bg_scissor_to_viewport(gdl); - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); if (g_BgMinDrawOrder); \ if (g_BgNumDrawSlots); \ @@ -939,18 +939,18 @@ Gfx *bgRenderSceneInXray(Gfx *gdl) struct drawslot *thing = &g_BgDrawSlots[k]; if (thing->draworder == i) { - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = bgScissorWithinViewportF(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax); + gdl = bg_scissor_within_viewport_f(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax); - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - if (debugIsPropRenderingEnabled() && getVar80084040()) { + if (debug_is_prop_rendering_enabled() && get_var80084040()) { if (thing->roomnum == -1) { - gdl = propsRender(gdl, 0, RENDERPASS_XLU, roomnumsbyprop); + gdl = props_render(gdl, 0, RENDERPASS_XLU, roomnumsbyprop); } - gdl = propsRender(gdl, thing->roomnum, RENDERPASS_XLU, roomnumsbyprop); + gdl = props_render(gdl, thing->roomnum, RENDERPASS_XLU, roomnumsbyprop); } if (1); @@ -958,12 +958,12 @@ Gfx *bgRenderSceneInXray(Gfx *gdl) } } - gdl = skyRenderSuns(gdl, true); + gdl = sky_render_suns(gdl, true); return gdl; } -Gfx *bgRenderScene(Gfx *gdl) +Gfx *bg_render_scene(Gfx *gdl) { s32 stagenum = g_Vars.stagenum; s32 firstroomnum = -1; @@ -982,7 +982,7 @@ Gfx *bgRenderScene(Gfx *gdl) g_NumRoomsWithGlares = 0; if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { - gdl = bgRenderSceneInXray(gdl); + gdl = bg_render_scene_in_xray(gdl); return gdl; } @@ -1014,7 +1014,7 @@ Gfx *bgRenderScene(Gfx *gdl) } while (i); } - gdl = bgScissorToViewport(gdl); + gdl = bg_scissor_to_viewport(gdl); // Render special "always on" rooms, such as the Defection moon, // Attack Ship planet, and other sky tricks that are implemented as rooms @@ -1030,7 +1030,7 @@ Gfx *bgRenderScene(Gfx *gdl) || stagenum == g_Stages[STAGEINDEX_MBR].id || stagenum == g_Stages[STAGEINDEX_TEST_OLD].id || stagenum == g_Stages[STAGEINDEX_ATTACKSHIP].id)) { - gdl = envStopFog(gdl); + gdl = env_stop_fog(gdl); gdl = vi0000ab78(gdl); roomnum = -1; @@ -1062,27 +1062,27 @@ Gfx *bgRenderScene(Gfx *gdl) || stagenum == STAGE_ATTACKSHIP)) { gdl = text0f153628(gdl); - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = playerLoadMatrix(gdl); - gdl = envStopFog(gdl); - gdl = starsRender(gdl); + gdl = player_load_matrix(gdl); + gdl = env_stop_fog(gdl); + gdl = stars_render(gdl); gdl = text0f153780(gdl); gdl = vi0000ab78(gdl); } if (roomnum != -1) { if (!g_Rooms[roomnum].loaded240) { - bgLoadRoom(roomnum); + bg_load_room(roomnum); } - gdl = bgRenderRoomOpaque(gdl, roomnum); + gdl = bg_render_room_opaque(gdl, roomnum); } - gSPPerspNormalize(gdl++, viGetPerspScale()); + gSPPerspNormalize(gdl++, vi_get_persp_scale()); } - gdl = skyRenderSuns(gdl, false); + gdl = sky_render_suns(gdl, false); // Build an array of room numbers per onscreen prop. // For each onscreen prop there is exactly one entry in the roomnumsbyprop array. @@ -1121,53 +1121,53 @@ Gfx *bgRenderScene(Gfx *gdl) thing = &g_BgDrawSlots[roomnum]; // Render prop opaque components - pre BG pass - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = envStopFog(gdl); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gdl = env_stop_fog(gdl); - if (debugIsPropRenderingEnabled() && getVar80084040()) { + if (debug_is_prop_rendering_enabled() && get_var80084040()) { if (firstroomnum == thing->roomnum) { - gdl = propsRender(gdl, 0, RENDERPASS_OPA_PREBG, roomnumsbyprop); + gdl = props_render(gdl, 0, RENDERPASS_OPA_PREBG, roomnumsbyprop); } - gdl = propsRender(gdl, thing->roomnum, RENDERPASS_OPA_PREBG, roomnumsbyprop); + gdl = props_render(gdl, thing->roomnum, RENDERPASS_OPA_PREBG, roomnumsbyprop); } // Render BG opaque components - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = bgScissorWithinViewportF(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax); - gdl = envStartFog(gdl, false); + gdl = bg_scissor_within_viewport_f(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax); + gdl = env_start_fog(gdl, false); - if (debugIsBgRenderingEnabled() && getVar80084040()) { + if (debug_is_bg_rendering_enabled() && get_var80084040()) { if (g_StageIndex != STAGEINDEX_TEST_OLD) { - gdl = bgRenderRoomOpaque(gdl, thing->roomnum); + gdl = bg_render_room_opaque(gdl, thing->roomnum); } } // Render prop opaque components - post BG pass - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = envStopFog(gdl); + gdl = env_stop_fog(gdl); - if (debugIsPropRenderingEnabled() && getVar80084040()) { + if (debug_is_prop_rendering_enabled() && get_var80084040()) { if (firstroomnum == thing->roomnum) { - gdl = propsRender(gdl, 0, RENDERPASS_OPA_POSTBG, roomnumsbyprop); + gdl = props_render(gdl, 0, RENDERPASS_OPA_POSTBG, roomnumsbyprop); } - gdl = propsRender(gdl, thing->roomnum, RENDERPASS_OPA_POSTBG, roomnumsbyprop); + gdl = props_render(gdl, thing->roomnum, RENDERPASS_OPA_POSTBG, roomnumsbyprop); } } - gdl = envStopFog(gdl); - gdl = bgScissorToViewport(gdl); + gdl = env_stop_fog(gdl); + gdl = bg_scissor_to_viewport(gdl); // Render wall hits - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - if (getVar80084040() && g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) { + if (get_var80084040() && g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) { for (i = 0; i < g_BgNumDrawSlots; i++) { roomnum = roomnums[i]; - gdl = wallhitRenderBgHits(g_BgDrawSlots[roomnum].roomnum, gdl); + gdl = wallhit_render_bg_hits(g_BgDrawSlots[roomnum].roomnum, gdl); } } @@ -1176,33 +1176,33 @@ Gfx *bgRenderScene(Gfx *gdl) for (i = g_BgNumDrawSlots - 1; i >= 0; i--) { roomnum = roomnums[i]; - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); thing = &g_BgDrawSlots[roomnum]; // Render BG translucent components - gdl = bgScissorWithinViewportF(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax); - gdl = envStartFog(gdl, true); + gdl = bg_scissor_within_viewport_f(gdl, thing->box.xmin, thing->box.ymin, thing->box.xmax, thing->box.ymax); + gdl = env_start_fog(gdl, true); - if (debugIsBgRenderingEnabled() && getVar80084040()) { - gdl = bgRenderRoomXlu(gdl, thing->roomnum); + if (debug_is_bg_rendering_enabled() && get_var80084040()) { + gdl = bg_render_room_xlu(gdl, thing->roomnum); } - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = envStopFog(gdl); + gdl = env_stop_fog(gdl); // Render prop translucent components - if (debugIsPropRenderingEnabled() && getVar80084040()) { + if (debug_is_prop_rendering_enabled() && get_var80084040()) { if (firstroomnum == thing->roomnum) { - gdl = propsRender(gdl, 0, RENDERPASS_XLU, roomnumsbyprop); + gdl = props_render(gdl, 0, RENDERPASS_XLU, roomnumsbyprop); } - gdl = propsRender(gdl, thing->roomnum, RENDERPASS_XLU, roomnumsbyprop); + gdl = props_render(gdl, thing->roomnum, RENDERPASS_XLU, roomnumsbyprop); } if (!g_Vars.mplayerisrunning) { - artifactsCalculateGlaresForRoom(thing->roomnum); + artifacts_calculate_glares_for_room(thing->roomnum); if (g_NumRoomsWithGlares < 100) { g_GlareRooms[g_NumRoomsWithGlares++] = thing->roomnum; @@ -1219,35 +1219,35 @@ Gfx *bgRenderScene(Gfx *gdl) return gdl; } -Gfx *bgRenderArtifacts(Gfx *gdl) +Gfx *bg_render_artifacts(Gfx *gdl) { s32 i; if (g_Vars.mplayerisrunning == false && g_NumRoomsWithGlares > 0) { - gdl = artifactsConfigureForGlares(gdl); + gdl = artifacts_configure_for_glares(gdl); for (i = 0; i < g_NumRoomsWithGlares; i++) { - gdl = artifactsRenderGlaresForRoom(gdl, g_GlareRooms[i]); + gdl = artifacts_render_glares_for_room(gdl, g_GlareRooms[i]); } - gdl = artifactsUnconfigureForGlares(gdl); + gdl = artifacts_unconfigure_for_glares(gdl); } - gdl = skyRenderArtifacts(gdl); + gdl = sky_render_artifacts(gdl); return gdl; } -void bgLoadFile(void *memaddr, u32 offset, u32 len) +void bg_load_file(void *memaddr, u32 offset, u32 len) { if (var8007fc04) { bcopy(var8007fc08 + offset, memaddr, len); } else { - fileLoadPartToAddr(g_Stages[g_StageIndex].bgfileid, memaddr, offset, len); + file_load_part_to_addr(g_Stages[g_StageIndex].bgfileid, memaddr, offset, len); } } -s32 bgGetStageIndex(s32 stagenum) +s32 bg_get_stage_index(s32 stagenum) { s32 index = -1; s32 i; @@ -1261,7 +1261,7 @@ s32 bgGetStageIndex(s32 stagenum) return index; } -f32 bgCalculatePortalSurfaceArea(s32 portalnum) +f32 bg_calculate_portal_surface_area(s32 portalnum) { struct portalvertices *pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); s32 count = pvertices->count; @@ -1288,7 +1288,7 @@ f32 bgCalculatePortalSurfaceArea(s32 portalnum) return sum; } -void bgGetPortalVtxInfo(s32 portalnum, struct coord *a, struct coord *b, struct coord *c, struct coord *normal) +void bg_get_portal_vtx_info(s32 portalnum, struct coord *a, struct coord *b, struct coord *c, struct coord *normal) { struct portalvertices *pvertices; pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); @@ -1318,9 +1318,9 @@ void bgGetPortalVtxInfo(s32 portalnum, struct coord *a, struct coord *b, struct * A 1 metre square portal would have alpha of 1. * A 1596 metre square portal would have alpha of 255. */ -u8 bgCalculatePortalAlpha(s32 portal) +u8 bg_calculate_portal_alpha(s32 portal) { - s32 alpha = bgCalculatePortalSurfaceArea(portal) / 10000.0f; + s32 alpha = bg_calculate_portal_surface_area(portal) / 10000.0f; if (alpha > 0xff) { alpha = 0xff; @@ -1329,18 +1329,18 @@ u8 bgCalculatePortalAlpha(s32 portal) return alpha; } -u8 bgGetPortalAlpha(s32 portalnum) +u8 bg_get_portal_alpha(s32 portalnum) { return g_BgPortalAlphas[portalnum]; } #if PIRACYCHECKS -u32 bgNot(u32 arg) +u32 bg_not(u32 arg) { return ~arg; } -u32 bgXorBabebabe(u32 value) +u32 bg_xor_babebabe(u32 value) { return value ^ 0xbabebabe; } @@ -1356,7 +1356,7 @@ u32 bgXorBabebabe(u32 value) * The second function runs on every tick, re-sums them and induces a crash if * they've changed. */ -void bgBuildReferenceLightSums(void) +void bg_build_reference_light_sums(void) { s32 i; @@ -1373,7 +1373,7 @@ void bgBuildReferenceLightSums(void) } } -void bgVerifyLightSums(char *file, s32 line) +void bg_verify_light_sums(char *file, s32 line) { s32 i; s32 sum; @@ -1388,7 +1388,7 @@ void bgVerifyLightSums(char *file, s32 line) if (sum != g_BgNumLightsChecksum) { sprintf(message, "NumLightsChecksum failed %s %d", file, line); - crashSetMessage(message); + crash_set_message(message); CRASH(); } @@ -1400,7 +1400,7 @@ void bgVerifyLightSums(char *file, s32 line) if (sum != g_BgLightsOffsetChecksum) { sprintf(message, "LightsOffsetChecksum failed %s %d", file, line); - crashSetMessage(message); + crash_set_message(message); CRASH(); } } @@ -1446,7 +1446,7 @@ void bgVerifyLightSums(char *file, s32 line) * - 4 bytes pointer to light table * - 4 bytes null */ -void bgReset(s32 stagenum) +void bg_reset(s32 stagenum) { u8 *header; u8 headerbuffer[0x50]; @@ -1483,7 +1483,7 @@ void bgReset(s32 stagenum) var800a4bf4 = 0; #endif - g_StageIndex = bgGetStageIndex(stagenum); + g_StageIndex = bg_get_stage_index(stagenum); if (g_StageIndex < 0) { g_StageIndex = 0; @@ -1491,7 +1491,7 @@ void bgReset(s32 stagenum) // Copy section 1 header to stack and parse into variables header = (u8 *)ALIGN16((uintptr_t)headerbuffer); - bgLoadFile(header, 0, 0x40); + bg_load_file(header, 0, 0x40); inflatedsize = *(u32 *)&header[0]; section1compsize = *(u32 *)&header[4]; primcompsize = *(u32 *)&header[8]; @@ -1501,7 +1501,7 @@ void bgReset(s32 stagenum) // Allocate space for the primary bg data // An extra 0x8000 or so is given as temporary scratch space - g_BgPrimaryData = mempAlloc(ALIGN16(inflatedsize + 0x8010), MEMPOOL_STAGE); + g_BgPrimaryData = memp_alloc(ALIGN16(inflatedsize + 0x8010), MEMPOOL_STAGE); // Set up pointer to scratch space scratch = (uintptr_t) g_BgPrimaryData + inflatedsize - primcompsize; @@ -1510,19 +1510,19 @@ void bgReset(s32 stagenum) g_LoadType = LOADTYPE_BG; // Copy section 1 header + compressed primary to scratch space - bgLoadFile((u8 *) scratch, 0, ALIGN16(primcompsize + 15)); + bg_load_file((u8 *) scratch, 0, ALIGN16(primcompsize + 15)); // Inflate primary data to the start of the buffer scratch += 0xc; - bgInflate((u8 *) scratch, g_BgPrimaryData, primcompsize); + bg_inflate((u8 *) scratch, g_BgPrimaryData, primcompsize); // Shrink the allocation (ie. free the scratch space) - mempRealloc(g_BgPrimaryData, inflatedsize, MEMPOOL_STAGE); + memp_realloc(g_BgPrimaryData, inflatedsize, MEMPOOL_STAGE); // Load the section 2 header section2start = section1compsize + 0xc; - bgLoadFile(header, section2start, 0x40); + bg_load_file(header, section2start, 0x40); inflatedsize = (*(u16 *) &header[0] & 0x7fff) - 1; section2compsize = *(u16 *) &header[2]; @@ -1533,49 +1533,49 @@ void bgReset(s32 stagenum) // NTSC 1.0. A full writeup about the bug and how the fix works can be found // in the docs folder of this project. #ifdef AVOID_UB - section2 = mempAlloc(inflatedsize + section2compsize, MEMPOOL_STAGE); + section2 = memp_alloc(inflatedsize + section2compsize, MEMPOOL_STAGE); scratch = (uintptr_t) section2 + inflatedsize; #elif VERSION >= VERSION_NTSC_FINAL - section2 = mempAlloc(inflatedsize + 0x8000, MEMPOOL_STAGE); + section2 = memp_alloc(inflatedsize + 0x8000, MEMPOOL_STAGE); scratch = (uintptr_t) section2 + 0x8000; #else - section2 = mempAlloc(inflatedsize + 0x800, MEMPOOL_STAGE); + section2 = memp_alloc(inflatedsize + 0x800, MEMPOOL_STAGE); scratch = (uintptr_t) section2 + 0x800; #endif // Load compressed data from ROM to scratch - bgLoadFile((u8 *) scratch, section2start + 4, ((section2compsize - 1) | 0xf) + 1); + bg_load_file((u8 *) scratch, section2start + 4, ((section2compsize - 1) | 0xf) + 1); // Inflate section 2 to the start of the buffer - bgInflate((u8 *) scratch, (u8 *) section2, section2compsize); + bg_inflate((u8 *) scratch, (u8 *) section2, section2compsize); // Iterate texture IDs and ensure they're loaded inflatedsize = (*(u16 *) &header[0] & 0x7fff) >> 1; for (i = 0; i ^ inflatedsize; i++) { - texLoadFromTextureNum(section2[i] & 0xffff & 0xffff & 0xffff & 0xffff & 0xffff & 0xffff & 0xffff & 0xffff, NULL); + tex_load_from_texture_num(section2[i] & 0xffff & 0xffff & 0xffff & 0xffff & 0xffff & 0xffff & 0xffff & 0xffff, NULL); } if (1); // Free section 2 - mempRealloc(section2, 0, MEMPOOL_STAGE); + memp_realloc(section2, 0, MEMPOOL_STAGE); g_BgSection3 = section2start + section2compsize + 4; #if PIRACYCHECKS { - u32 addr = bgNot(PAL ? ~0xb0000340 : ~0xb0000454); + u32 addr = bg_not(PAL ? ~0xb0000340 : ~0xb0000454); u32 actualvalue; - u32 expectedvalue = bgXorBabebabe((PAL ? 0x0330c820 : 0x0109082b) ^ 0xbabebabe); + u32 expectedvalue = bg_xor_babebabe((PAL ? 0x0330c820 : 0x0109082b) ^ 0xbabebabe); osPiReadIo(addr, &actualvalue); if (actualvalue != expectedvalue) { // Copy 0x40 bytes from a random location in ROM to a random // location in RAM. The write address can be anywhere in the - // boot segment or in the lib segment up to modelRenderNodeDl. - dmaExec((void *)(PHYS_TO_K0(0x1000) + (random() & 0x1fff8)), random() & 0x1fffe, 0x40); + // boot segment or in the lib segment up to model_render_node_dl. + dma_exec((void *)(PHYS_TO_K0(0x1000) + (random() & 0x1fff8)), random() & 0x1fffe, 0x40); } } #endif @@ -1614,7 +1614,7 @@ void bgReset(s32 stagenum) } } -void bgBuildTables(s32 stagenum) +void bg_build_tables(s32 stagenum) { s32 i; s32 j; @@ -1643,8 +1643,8 @@ void bgBuildTables(s32 stagenum) u16 *datalenptr; u8 *numlightsptr; - g_Rooms = mempAlloc(ALIGN16(g_Vars.roomcount * sizeof(struct room)), MEMPOOL_STAGE); - g_BgDrawSlotsByRoom = mempAlloc(ALIGN16(g_Vars.roomcount * sizeof(struct drawslotpointer)), MEMPOOL_STAGE); + g_Rooms = memp_alloc(ALIGN16(g_Vars.roomcount * sizeof(struct room)), MEMPOOL_STAGE); + g_BgDrawSlotsByRoom = memp_alloc(ALIGN16(g_Vars.roomcount * sizeof(struct drawslotpointer)), MEMPOOL_STAGE); for (i = 0; i < g_Vars.roomcount; i++) { g_BgDrawSlotsByRoom[i].updatedframe = 0xffff; @@ -1652,7 +1652,7 @@ void bgBuildTables(s32 stagenum) } if (g_Vars.mplayerisrunning) { - g_MpRoomVisibility = mempAlloc(ALIGN16(g_Vars.roomcount), MEMPOOL_STAGE); + g_MpRoomVisibility = memp_alloc(ALIGN16(g_Vars.roomcount), MEMPOOL_STAGE); for (i = 0; i < g_Vars.roomcount; i++) { g_MpRoomVisibility[i] = 0; @@ -1669,7 +1669,7 @@ void bgBuildTables(s32 stagenum) g_Rooms[i].unk4e_04 = 0; } - bgSetStageTranslationThing(g_Stages[g_StageIndex].unk14); + bg_set_stage_translation_thing(g_Stages[g_StageIndex].unk14); chr0f028490(g_Stages[g_StageIndex].unk14); for (i = 0; i < MAX_PLAYERS; i++) { @@ -1686,7 +1686,7 @@ void bgBuildTables(s32 stagenum) } g_BgNumPortalCameraCacheItems = numportals; - g_PortalCameraCache = mempAlloc(ALIGN16(g_BgNumPortalCameraCacheItems * sizeof(struct portalcamcacheitem)), MEMPOOL_STAGE); + g_PortalCameraCache = memp_alloc(ALIGN16(g_BgNumPortalCameraCacheItems * sizeof(struct portalcamcacheitem)), MEMPOOL_STAGE); // Iterate the portals and update their verticesoffset value. In // storage, the g_BgPortals array is followed by vertice data, and each @@ -1722,7 +1722,7 @@ void bgBuildTables(s32 stagenum) // number ascending. Each room struct contains an index into this array // where its portal numbers start. index = 0; - g_RoomPortals = mempAlloc(ALIGN16((numportals == 0 ? 1 : numportals) * sizeof(s16 *)), MEMPOOL_STAGE); + g_RoomPortals = memp_alloc(ALIGN16((numportals == 0 ? 1 : numportals) * sizeof(s16 *)), MEMPOOL_STAGE); g_Vars.roomportalrecursionlimit = 0; @@ -1796,13 +1796,13 @@ void bgBuildTables(s32 stagenum) } } - g_BgPortalAlphas = mempAlloc(ALIGN16(numportals == 0 ? 1 : numportals), MEMPOOL_STAGE); + g_BgPortalAlphas = memp_alloc(ALIGN16(numportals == 0 ? 1 : numportals), MEMPOOL_STAGE); for (i = 0; i < numportals; i++) { - g_BgPortalAlphas[i] = bgCalculatePortalAlpha(i); + g_BgPortalAlphas[i] = bg_calculate_portal_alpha(i); } - g_PortalMetrics = mempAlloc(ALIGN16(numportals * sizeof(struct portalmetric)), MEMPOOL_STAGE); + g_PortalMetrics = memp_alloc(ALIGN16(numportals * sizeof(struct portalmetric)), MEMPOOL_STAGE); for (i = 0; i < numportals; i++) { // Clockwise vertices will cause the normal to point towards the viewer @@ -1856,7 +1856,7 @@ void bgBuildTables(s32 stagenum) if (g_BgCommands != NULL) { for (i = 0; g_BgCommands[i].type != BGCMD_END; i++) { if (g_BgCommands[i].type == BGCMD_PORTALARG) { - g_BgCommands[i].param = bgFindPortalByVertices((void *)((intptr_t)g_BgPrimaryData - 0x0f000000 + g_BgCommands[i].param)); + g_BgCommands[i].param = bg_find_portal_by_vertices((void *)((intptr_t)g_BgPrimaryData - 0x0f000000 + g_BgCommands[i].param)); } } } @@ -1872,7 +1872,7 @@ void bgBuildTables(s32 stagenum) g_Rooms[i].xluwallhits = NULL; } - roomsReset(); + rooms_reset(); g_Rooms[0].bbmin[0] = 0.0f; g_Rooms[0].bbmin[1] = 0.0f; @@ -1881,7 +1881,7 @@ void bgBuildTables(s32 stagenum) g_Rooms[0].bbmax[1] = 0.0f; g_Rooms[0].bbmax[2] = 0.0f; - dyntexReset(); + dyntex_reset(); // Load section 3 of the BG file. To do this, the header of the BG file // must be loaded first as it contains the offset to section 3. Then @@ -1890,25 +1890,25 @@ void bgBuildTables(s32 stagenum) // Load and read the header header = (u8 *)ALIGN16((uintptr_t)headerbuffer); - bgLoadFile(header, g_BgSection3, 0x40); + bg_load_file(header, g_BgSection3, 0x40); inflatedsize = (*(u16 *)&header[0] & 0x7fff) - 1; section3compsize = *(u16 *)&header[2]; inflatedsize = (inflatedsize | 0xf) + 1; // Load and inflate section 3 #ifdef AVOID_UB - section3 = mempAlloc(inflatedsize + section3compsize, MEMPOOL_STAGE); + section3 = memp_alloc(inflatedsize + section3compsize, MEMPOOL_STAGE); scratch = section3 + inflatedsize; #elif VERSION >= VERSION_NTSC_FINAL - section3 = mempAlloc(inflatedsize + 0x8000, MEMPOOL_STAGE); + section3 = memp_alloc(inflatedsize + 0x8000, MEMPOOL_STAGE); scratch = section3 + 0x8000; #else - section3 = mempAlloc(inflatedsize + 0x1000, MEMPOOL_STAGE); + section3 = memp_alloc(inflatedsize + 0x1000, MEMPOOL_STAGE); scratch = section3 + 0x1000; #endif - bgLoadFile(scratch, g_BgSection3 + 4, ((section3compsize - 1) | 0xf) + 1); - bgInflate(scratch, section3, section3compsize); + bg_load_file(scratch, g_BgSection3 + 4, ((section3compsize - 1) | 0xf) + 1); + bg_inflate(scratch, section3, section3compsize); // Section 3 starts with a table of room bounding boxes bboxptr = (s16 *) section3; @@ -1967,10 +1967,10 @@ void bgBuildTables(s32 stagenum) } // Free the section 3 allocation - mempRealloc(section3, 0, MEMPOOL_STAGE); + memp_realloc(section3, 0, MEMPOOL_STAGE); for (i = 1; i < g_Vars.roomcount; i++) { - roomInitLights(i); + room_init_lights(i); } // Initialise a table related to lights. @@ -1982,7 +1982,7 @@ void bgBuildTables(s32 stagenum) } if (j) { - var800a41a0 = mempAlloc(ALIGN16(j * 3), MEMPOOL_STAGE); + var800a41a0 = memp_alloc(ALIGN16(j * 3), MEMPOOL_STAGE); for (i = 0; i < j; i++) { var800a41a0[i * 3 + 0] = 0; @@ -1994,15 +1994,15 @@ void bgBuildTables(s32 stagenum) } for (i = 0; g_BgPortals[i].verticesoffset != 0; i++) { - bgInitPortal(i); + bg_init_portal(i); } for (i = 1; i < g_Vars.roomcount; i++) { - bgInitRoom(i); + bg_init_room(i); } for (i = 1; i < g_Vars.roomcount; i++) { - bgExpandRoomToPortals(i); + bg_expand_room_to_portals(i); } for (i = 0; g_BgPortals[i].verticesoffset != 0; i++) { @@ -2010,41 +2010,41 @@ void bgBuildTables(s32 stagenum) } } - envSetStageNum(stagenum); + env_set_stage_num(stagenum); var8007fc10 = 200; - wallhitReset(); + wallhit_reset(); func0f002a98(); func0f001c0c(); #if VERSION < VERSION_NTSC_1_0 - bgBuildReferenceLightSums(); + bg_build_reference_light_sums(); #endif } -void bgStop(void) +void bg_stop(void) { - bgUnloadAllRooms(); + bg_unload_all_rooms(); mtx00016748(1); } -void bgSetStageTranslationThing(f32 arg0) +void bg_set_stage_translation_thing(f32 arg0) { // empty } -f32 bgGetStageTranslationThing(void) +f32 bg_get_stage_translation_thing(void) { return g_Stages[g_StageIndex].unk1c / g_Stages[g_StageIndex].unk14; } -f32 bgGetScaleBg2Gfx(void) +f32 bg_get_scale_bg2gfx(void) { return g_Vars.currentplayerstats->scale_bg2gfx; } -void bgSetScaleBg2Gfx(f32 scale) +void bg_set_scale_bg2gfx(f32 scale) { g_Vars.currentplayerstats->scale_bg2gfx = g_Stages[g_StageIndex].unk18 * scale; mtx00016748(g_Vars.currentplayerstats->scale_bg2gfx); @@ -2060,21 +2060,21 @@ void bgSetScaleBg2Gfx(f32 scale) * When the counter rolls over, all portal camera cache is cleared to avoid any * potential issues with reusing the timestamps. */ -void bgTickCounter(void) +void bg_tick_counter(void) { g_BgFrameCount++; if (g_BgFrameCount == 0xffff) { g_BgFrameCount = 1; - bgClearPortalCameraCache(); + bg_clear_portal_camera_cache(); } #if PIRACYCHECKS if ((g_BgFrameCount & 0xff) == 0xff) { u32 checksum = 0; - s32 *ptr = (s32 *)&menuTickTimers; - s32 *end = (s32 *)&menuGetSinOscFrac; + s32 *ptr = (s32 *)&menu_tick_timers; + s32 *end = (s32 *)&menu_get_sin_osc_frac; while (ptr < end) { checksum ^= ~*ptr; @@ -2084,7 +2084,7 @@ void bgTickCounter(void) } if (checksum != CHECKSUM_PLACEHOLDER) { - ptr = (s32 *)&bgBuildTables + 20; + ptr = (s32 *)&bg_build_tables + 20; if (1) { end = &ptr[4]; @@ -2099,20 +2099,20 @@ void bgTickCounter(void) #endif } -void bgTick(void) +void bg_tick(void) { s32 tickmode; g_BgNumForceOnscreenRooms = 0; #if VERSION < VERSION_NTSC_1_0 - bgVerifyLightSums("bg.c", 5761); + bg_verify_light_sums("bg.c", 5761); #endif - bgTickCounter(); + bg_tick_counter(); if (g_Vars.currentplayerindex == 0) { - bgTickRooms(); + bg_tick_rooms(); } tickmode = g_Vars.tickmode; @@ -2141,28 +2141,28 @@ void bgTick(void) g_CamRoom = g_Vars.currentplayer->cam_room; #if VERSION >= VERSION_NTSC_1_0 - bgTickPortals(); + bg_tick_portals(); #else - bgVerifyLightSums("bg.c", 5834); - bgTickPortals(); - bgVerifyLightSums("bg.c", 5846); + bg_verify_light_sums("bg.c", 5834); + bg_tick_portals(); + bg_verify_light_sums("bg.c", 5846); #endif } -Gfx *bgRender(Gfx *gdl) +Gfx *bg_render(Gfx *gdl) { - gdl = lightsSetDefault(gdl); + gdl = lights_set_default(gdl); gSPSegment(gdl++, SPSEGMENT_BG_DL, g_BgPrimaryData); - gdl = envStartFog(gdl, false); - gdl = bgRenderSceneAndLoadCandidate(gdl); - gdl = bgScissorToViewport(gdl); - gdl = envStopFog(gdl); + gdl = env_start_fog(gdl, false); + gdl = bg_render_scene_and_load_candidate(gdl); + gdl = bg_scissor_to_viewport(gdl); + gdl = env_stop_fog(gdl); gSPMatrix(gdl++, var80092870, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = playerLoadMatrix(gdl); + gdl = player_load_matrix(gdl); return gdl; } @@ -2170,28 +2170,28 @@ Gfx *bgRender(Gfx *gdl) /** * Leftover from GE. */ -f32 bgGetStanThing(s32 roomnum) +f32 bg_get_stan_thing(s32 roomnum) { return g_BgStanThings[roomnum + 1]; } -Gfx *bgScissorToViewport(Gfx *gdl) +Gfx *bg_scissor_to_viewport(Gfx *gdl) { - return bgScissorWithinViewport(gdl, + return bg_scissor_within_viewport(gdl, g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop, g_Vars.currentplayer->viewleft + g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewtop + g_Vars.currentplayer->viewheight); } -Gfx *bgScissorWithinViewportF(Gfx *gdl, f32 viewleft, f32 viewtop, f32 viewright, f32 viewbottom) +Gfx *bg_scissor_within_viewport_f(Gfx *gdl, f32 viewleft, f32 viewtop, f32 viewright, f32 viewbottom) { - gdl = bgScissorWithinViewport(gdl, viewleft, viewtop, ceil(viewright), ceil(viewbottom)); + gdl = bg_scissor_within_viewport(gdl, viewleft, viewtop, ceil(viewright), ceil(viewbottom)); return gdl; } -Gfx *bgScissorWithinViewport(Gfx *gdl, s32 viewleft, s32 viewtop, s32 viewright, s32 viewbottom) +Gfx *bg_scissor_within_viewport(Gfx *gdl, s32 viewleft, s32 viewtop, s32 viewright, s32 viewbottom) { if (viewleft < g_Vars.currentplayer->viewleft) { viewleft = g_Vars.currentplayer->viewleft; @@ -2214,7 +2214,7 @@ Gfx *bgScissorWithinViewport(Gfx *gdl, s32 viewleft, s32 viewtop, s32 viewright, return gdl; } -void bgClearPortalCameraCache(void) +void bg_clear_portal_camera_cache(void) { s32 i; @@ -2225,7 +2225,7 @@ void bgClearPortalCameraCache(void) } } -bool bgRoomIntersectsScreenBox(s32 room, struct screenbox *screen) +bool bg_room_intersects_screen_box(s32 room, struct screenbox *screen) { s32 i; struct coord roomscreenpos; @@ -2256,7 +2256,7 @@ bool bgRoomIntersectsScreenBox(s32 room, struct screenbox *screen) corner.z = g_Rooms[room].bbmax[2]; } - if (bg3dPosTo2dPos(&corner, &roomscreenpos) == 0) { + if (bg_3d_pos_to_2d_pos(&corner, &roomscreenpos) == 0) { // Corner is behind the camera if (g_BgSnake.zrange.far <= -roomscreenpos.z) { numfar++; @@ -2311,15 +2311,15 @@ bool bgRoomIntersectsScreenBox(s32 room, struct screenbox *screen) return true; } -bool bg3dPosTo2dPos(struct coord *cornerpos, struct coord *screenpos) +bool bg_3d_pos_to_2d_pos(struct coord *cornerpos, struct coord *screenpos) { - Mtxf *matrix = camGetWorldToScreenMtxf(); + Mtxf *matrix = cam_get_world_to_screen_mtxf(); screenpos->x = cornerpos->x; screenpos->y = cornerpos->y; screenpos->z = cornerpos->z; - mtx4TransformVecInPlace(matrix, screenpos); + mtx4_transform_vec_in_place(matrix, screenpos); cam0f0b4d68(screenpos, screenpos->f); if (screenpos->z > 0) { @@ -2329,7 +2329,7 @@ bool bg3dPosTo2dPos(struct coord *cornerpos, struct coord *screenpos) return true; } -bool bgGetPortalScreenBbox(s32 portalnum, struct screenbox *box) +bool bg_get_portal_screen_bbox(s32 portalnum, struct screenbox *box) { s32 i; s32 j; @@ -2350,7 +2350,7 @@ bool bgGetPortalScreenBbox(s32 portalnum, struct screenbox *box) return g_PortalCameraCache[portalnum].bboxisvalid; } - len = portalConvertCoordinates(portalnum, &start, things); + len = portal_convert_coordinates(portalnum, &start, things); numvalid = 0; thing = &things[start]; @@ -2432,24 +2432,24 @@ bool bgGetPortalScreenBbox(s32 portalnum, struct screenbox *box) return numvalid; } -Gfx *bgDrawBoxEdge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) +Gfx *bg_draw_box_edge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) { gDPFillRectangle(gdl++, x1, y1, x2 + 1, y2 + 1); return gdl; } -Gfx *bgDrawBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) +Gfx *bg_draw_box(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) { - gdl = bgDrawBoxEdge(gdl, x1, y1, x2, y1); // top - gdl = bgDrawBoxEdge(gdl, x2, y1, x2, y2); // right - gdl = bgDrawBoxEdge(gdl, x1, y2, x2, y2); // bottom - gdl = bgDrawBoxEdge(gdl, x1, y1, x1, y2); // left + gdl = bg_draw_box_edge(gdl, x1, y1, x2, y1); // top + gdl = bg_draw_box_edge(gdl, x2, y1, x2, y2); // right + gdl = bg_draw_box_edge(gdl, x1, y2, x2, y2); // bottom + gdl = bg_draw_box_edge(gdl, x1, y1, x1, y2); // left return gdl; } -bool bgGetBoxIntersection(struct screenbox *a, struct screenbox *b) +bool bg_get_box_intersection(struct screenbox *a, struct screenbox *b) { a->xmin = a->xmin > b->xmin ? a->xmin : b->xmin; a->ymin = a->ymin > b->ymin ? a->ymin : b->ymin; @@ -2469,7 +2469,7 @@ bool bgGetBoxIntersection(struct screenbox *a, struct screenbox *b) return true; } -void bgExpandBox(struct screenbox *a, struct screenbox *b) +void bg_expand_box(struct screenbox *a, struct screenbox *b) { a->xmin = a->xmin < b->xmin ? a->xmin : b->xmin; a->ymin = a->ymin < b->ymin ? a->ymin : b->ymin; @@ -2477,7 +2477,7 @@ void bgExpandBox(struct screenbox *a, struct screenbox *b) a->ymax = a->ymax > b->ymax ? a->ymax : b->ymax; } -void bgCopyBox(struct screenbox *dst, struct screenbox *src) +void bg_copy_box(struct screenbox *dst, struct screenbox *src) { dst->xmin = src->xmin; dst->ymin = src->ymin; @@ -2485,7 +2485,7 @@ void bgCopyBox(struct screenbox *dst, struct screenbox *src) dst->ymax = src->ymax; } -bool bgRoomIsOnscreen(s32 room) +bool bg_room_is_onscreen(s32 room) { if (g_Vars.mplayerisrunning) { return (g_MpRoomVisibility[room] & 0xf) != 0; @@ -2494,7 +2494,7 @@ bool bgRoomIsOnscreen(s32 room) } } -bool bgRoomIsStandby(s32 room) +bool bg_room_is_standby(s32 room) { if (g_Vars.mplayerisrunning) { return (g_MpRoomVisibility[room] & 0xf0) != 0; @@ -2503,7 +2503,7 @@ bool bgRoomIsStandby(s32 room) return g_Rooms[room].flags & ROOMFLAG_STANDBY; } -bool bgRoomIsOnPlayerScreen(s32 room, u32 playernum) +bool bg_room_is_on_player_screen(s32 room, u32 playernum) { if (g_Vars.mplayerisrunning) { return (g_MpRoomVisibility[room] & (1 << playernum)) != 0; @@ -2512,7 +2512,7 @@ bool bgRoomIsOnPlayerScreen(s32 room, u32 playernum) } } -bool bgRoomIsOnPlayerStandby(s32 room, u32 playernum) +bool bg_room_is_on_player_standby(s32 room, u32 playernum) { if (g_Vars.mplayerisrunning) { return (g_MpRoomVisibility[room] & (0x10 << playernum)) != 0; @@ -2521,7 +2521,7 @@ bool bgRoomIsOnPlayerStandby(s32 room, u32 playernum) } } -s32 bgFindPortalByVertices(struct portalvertices *target) +s32 bg_find_portal_by_vertices(struct portalvertices *target) { s32 i; struct bgportal *portal = g_BgPortals; @@ -2546,9 +2546,9 @@ s32 bgFindPortalByVertices(struct portalvertices *target) * Nothing is done with the string though. It's likely that debug versions of * the game would send the string to the host computer or display it on the HUD. */ -void bgPrintLoadedRooms(void) +void bg_print_loaded_rooms(void) { - if (debugIsRoomStateDebugEnabled()) { + if (debug_is_room_state_debug_enabled()) { u8 string[704]; s32 len = 0; s32 i; @@ -2574,7 +2574,7 @@ void bgPrintLoadedRooms(void) } } -u32 bgInflate(u8 *src, u8 *dst, u32 len) +u32 bg_inflate(u8 *src, u8 *dst, u32 len) { u32 result; u8 scratch[5120]; @@ -2582,8 +2582,8 @@ u32 bgInflate(u8 *src, u8 *dst, u32 len) char message[128]; #endif - if (rzipIs1173(src)) { - result = rzipInflate(src, dst, &scratch); + if (rzip_is_1173(src)) { + result = rzip_inflate(src, dst, &scratch); #if VERSION < VERSION_NTSC_1_0 if (!result) { @@ -2594,7 +2594,7 @@ u32 bgInflate(u8 *src, u8 *dst, u32 len) src[8], src[9], src[10], src[11], src[12], src[13], src[14], src[15]); - crashSetMessage(message); + crash_set_message(message); CRASH(); } #endif @@ -2606,7 +2606,7 @@ u32 bgInflate(u8 *src, u8 *dst, u32 len) return result; } -Gfx *bgGetNextGdlInBlock(struct roomblock *block, Gfx *start, Gfx *end) +Gfx *bg_get_next_gdl_in_block(struct roomblock *block, Gfx *start, Gfx *end) { \ Gfx *tmp; \ while (true) { @@ -2627,7 +2627,7 @@ Gfx *bgGetNextGdlInBlock(struct roomblock *block, Gfx *start, Gfx *end) block = block->next; break; case ROOMBLOCKTYPE_PARENT: - tmp = bgGetNextGdlInBlock(block->child, start, end); + tmp = bg_get_next_gdl_in_block(block->child, start, end); block = block->next; end = tmp; break; @@ -2639,7 +2639,7 @@ Gfx *bgGetNextGdlInBlock(struct roomblock *block, Gfx *start, Gfx *end) return end; } -Gfx *bgGetNextGdlInLayer(s32 roomnum, Gfx *start, u32 types) +Gfx *bg_get_next_gdl_in_layer(s32 roomnum, Gfx *start, u32 types) { struct roomblock *opablocks = g_Rooms[roomnum].gfxdata->opablocks; struct roomblock *xlublocks = g_Rooms[roomnum].gfxdata->xlublocks; @@ -2647,7 +2647,7 @@ Gfx *bgGetNextGdlInLayer(s32 roomnum, Gfx *start, u32 types) Gfx *xlugdl = NULL; if ((types & VTXBATCHTYPE_OPA) && opablocks) { - opagdl = bgGetNextGdlInBlock(opablocks, start, NULL); + opagdl = bg_get_next_gdl_in_block(opablocks, start, NULL); if (types == VTXBATCHTYPE_OPA) { return opagdl; @@ -2655,7 +2655,7 @@ Gfx *bgGetNextGdlInLayer(s32 roomnum, Gfx *start, u32 types) } if ((types & VTXBATCHTYPE_XLU) && xlublocks) { - xlugdl = bgGetNextGdlInBlock(xlublocks, start, NULL); + xlugdl = bg_get_next_gdl_in_block(xlublocks, start, NULL); if (types == VTXBATCHTYPE_XLU) { return xlugdl; @@ -2673,7 +2673,7 @@ Gfx *bgGetNextGdlInLayer(s32 roomnum, Gfx *start, u32 types) return xlugdl; } -Vtx *bgFindVerticesForGdl(s32 roomnum, Gfx *gdl) +Vtx *bg_find_vertices_for_gdl(s32 roomnum, Gfx *gdl) { struct roomblock *block = g_Rooms[roomnum].gfxdata->blocks; uintptr_t end = (uintptr_t)g_Rooms[roomnum].gfxdata->vertices; @@ -2714,7 +2714,7 @@ Vtx *bgFindVerticesForGdl(s32 roomnum, Gfx *gdl) * - Find each batch of vertices and build a bbox for each batch. * These are used for hit detection. */ -void bgLoadRoom(s32 roomnum) +void bg_load_room(s32 roomnum) { s32 alloclen; s32 inflatedlen; @@ -2740,7 +2740,7 @@ void bgLoadRoom(s32 roomnum) s32 prev; #if VERSION < VERSION_NTSC_1_0 - bgVerifyLightSums("bg.c", 7076); + bg_verify_light_sums("bg.c", 7076); #endif if (roomnum == 0 || roomnum >= g_Vars.roomcount) { @@ -2758,19 +2758,19 @@ void bgLoadRoom(s32 roomnum) if (g_Rooms[roomnum].gfxdatalen > 0) { alloclen = g_Rooms[roomnum].gfxdatalen; - if (debugIsRoomGfxExtraMemEnabled()) { + if (debug_is_room_gfx_extra_mem_enabled()) { alloclen += 1024; } } else { - alloclen = memaGetLongestFree(); + alloclen = mema_get_longest_free(); } - bgGarbageCollectRooms(alloclen, false); + bg_garbage_collect_rooms(alloclen, false); - allocation = memaAlloc(alloclen); + allocation = mema_alloc(alloclen); if (allocation != NULL) { - dyntexSetCurrentRoom(roomnum); + dyntex_set_current_room(roomnum); // Calculate the file offset and read length // of the compressed room data in the BG file @@ -2779,22 +2779,22 @@ void bgLoadRoom(s32 roomnum) fileoffset -= var8007fc54; if (readlen > alloclen) { - dyntexSetCurrentRoom(-1); + dyntex_set_current_room(-1); return; } // Load the compressed data to the right side of the allocation memaddr = allocation + (alloclen - readlen); - bgLoadFile(memaddr, fileoffset, readlen); + bg_load_file(memaddr, fileoffset, readlen); - if (rzipIs1173(memaddr) && readlen + 0x20 > alloclen) { - dyntexSetCurrentRoom(-1); + if (rzip_is_1173(memaddr) && readlen + 0x20 > alloclen) { + dyntex_set_current_room(-1); return; } // Inflate the data to the left side of the allocation - inflatedlen = bgInflate(memaddr, allocation, g_BgRooms[roomnum + 1].unk00 - g_BgRooms[roomnum].unk00); + inflatedlen = bg_inflate(memaddr, allocation, g_BgRooms[roomnum + 1].unk00 - g_BgRooms[roomnum].unk00); g_Rooms[roomnum].gfxdata = (struct roomgfxdata *)allocation; @@ -2856,32 +2856,32 @@ void bgLoadRoom(s32 roomnum) // Calculate the number of vertices and colours g_Rooms[roomnum].gfxdata->numvertices = ((uintptr_t) g_Rooms[roomnum].gfxdata->colours - (uintptr_t) g_Rooms[roomnum].gfxdata->vertices) / sizeof(Vtx); - g_Rooms[roomnum].gfxdata->numcolours = ((uintptr_t) bgGetNextGdlInLayer(roomnum, 0, VTXBATCHTYPE_OPA | VTXBATCHTYPE_XLU) - (uintptr_t) g_Rooms[roomnum].gfxdata->colours) / sizeof(Col); + g_Rooms[roomnum].gfxdata->numcolours = ((uintptr_t) bg_get_next_gdl_in_layer(roomnum, 0, VTXBATCHTYPE_OPA | VTXBATCHTYPE_XLU) - (uintptr_t) g_Rooms[roomnum].gfxdata->colours) / sizeof(Col); // Build arrays of pointers to gfx blocks and vtx blocks numgdls = 0; - itergdl1 = (u8 *) bgGetNextGdlInLayer(roomnum, NULL, VTXBATCHTYPE_OPA | VTXBATCHTYPE_XLU); + itergdl1 = (u8 *) bg_get_next_gdl_in_layer(roomnum, NULL, VTXBATCHTYPE_OPA | VTXBATCHTYPE_XLU); while (itergdl1) { gfxblocks[numgdls] = (u8 *) itergdl1; - vtxblocks[numgdls] = (u8 *) bgFindVerticesForGdl(roomnum, (Gfx *) itergdl1); + vtxblocks[numgdls] = (u8 *) bg_find_vertices_for_gdl(roomnum, (Gfx *) itergdl1); numgdls++; - itergdl1 = (u8 *) bgGetNextGdlInLayer(roomnum, (Gfx *) itergdl1, VTXBATCHTYPE_OPA | VTXBATCHTYPE_XLU); + itergdl1 = (u8 *) bg_get_next_gdl_in_layer(roomnum, (Gfx *) itergdl1, VTXBATCHTYPE_OPA | VTXBATCHTYPE_XLU); } gfxblocks[numgdls] = allocation + inflatedlen; // Copy gdls to the right-side of the allocation // and build a pointer array to them - texCopyGdls((void *) gfxblocks[0], (void *) (allocation + alloclen - (gfxblocks[numgdls] - gfxblocks[0])), (u32) (gfxblocks[numgdls] - gfxblocks[0])); + tex_copy_gdls((void *) gfxblocks[0], (void *) (allocation + alloclen - (gfxblocks[numgdls] - gfxblocks[0])), (u32) (gfxblocks[numgdls] - gfxblocks[0])); for (i = 0; i < numgdls + 1; i++) { gdlpointers[i] = gfxblocks[i] + (allocation + alloclen - gfxblocks[numgdls]); } // Load textures by scanning the right-side gdls. - // texLoadFromGdl is reading from gdlpointers and writing new GBI commands + // tex_load_from_gdl is reading from gdlpointers and writing new GBI commands // to itergdl2, overwriting the GBI commands that were loaded from the // BG file. As these are being processed the gdlpointers pointers are // changed to point to the written GBI. @@ -2890,7 +2890,7 @@ void bgLoadRoom(s32 roomnum) for (i = 0; i < numgdls; i++) { s32 byteswritten; len = gfxblocks[i + 1] - gfxblocks[i]; - byteswritten = texLoadFromGdl((void *) gdlpointers[i], len, (void *) itergdl2, NULL, vtxblocks[i]); + byteswritten = tex_load_from_gdl((void *) gdlpointers[i], len, (void *) itergdl2, NULL, vtxblocks[i]); gdlpointers[i] = itergdl2; if (len); @@ -2906,7 +2906,7 @@ void bgLoadRoom(s32 roomnum) if (g_Rooms[roomnum].gfxdatalen > prev) { #if VERSION < VERSION_NTSC_1_0 - crashSetMessage("bg.c: roominf[room].allocsize > calculated!"); + crash_set_message("bg.c: roominf[room].allocsize > calculated!"); CRASH(); #endif } @@ -2914,7 +2914,7 @@ void bgLoadRoom(s32 roomnum) g_Rooms[roomnum].loaded240 = 1; if (g_Rooms[roomnum].gfxdatalen != alloclen) { - memaRealloc((intptr_t) allocation, alloclen, g_Rooms[roomnum].gfxdatalen); + mema_realloc((intptr_t) allocation, alloclen, g_Rooms[roomnum].gfxdatalen); } // Update gdl pointers in the gfxdata so they point to the ones @@ -2948,25 +2948,25 @@ void bgLoadRoom(s32 roomnum) // Do some find/replaces in the gdls based on environment configuration if (g_FogEnabled) { - gfxReplaceGbiCommandsRecursively(g_Rooms[roomnum].gfxdata->opablocks, 1); - gfxReplaceGbiCommandsRecursively(g_Rooms[roomnum].gfxdata->xlublocks, 5); + gfx_replace_gbi_commands_recursively(g_Rooms[roomnum].gfxdata->opablocks, 1); + gfx_replace_gbi_commands_recursively(g_Rooms[roomnum].gfxdata->xlublocks, 5); } else if (!g_EnvHasTransparency) { - gfxReplaceGbiCommandsRecursively(g_Rooms[roomnum].gfxdata->opablocks, 6); - gfxReplaceGbiCommandsRecursively(g_Rooms[roomnum].gfxdata->xlublocks, 7); + gfx_replace_gbi_commands_recursively(g_Rooms[roomnum].gfxdata->opablocks, 6); + gfx_replace_gbi_commands_recursively(g_Rooms[roomnum].gfxdata->xlublocks, 7); } // Create vertex batches - these are used for hit detection - bgFindRoomVtxBatches(roomnum); + bg_find_room_vtx_batches(roomnum); g_Rooms[roomnum].flags |= ROOMFLAG_LIGHTS_DIRTY; g_Rooms[roomnum].flags |= ROOMFLAG_BRIGHTNESS_DIRTY_PERM; g_Rooms[roomnum].colours = NULL; - dyntexSetCurrentRoom(-1); + dyntex_set_current_room(-1); #if VERSION < VERSION_NTSC_1_0 - bgVerifyLightSums("bg.c", 7474); + bg_verify_light_sums("bg.c", 7474); #endif } } @@ -2995,32 +2995,32 @@ const char var7f1b7564[] = " Failed 2 - Crossed portal %d"; const char var7f1b7584[] = " Failed 1 - Crossed portal %d"; const char var7f1b75a4[] = " Passed"; -void bgUnloadRoom(s32 roomnum) +void bg_unload_room(s32 roomnum) { u32 size; if (g_Rooms[roomnum].vtxbatches) { size = ((g_Rooms[roomnum].numvtxbatches) * sizeof(struct vtxbatch) + 0xf) & ~0xf; - memaFree(g_Rooms[roomnum].vtxbatches, size); + mema_free(g_Rooms[roomnum].vtxbatches, size); g_Rooms[roomnum].vtxbatches = NULL; } if (g_Rooms[roomnum].gfxdatalen > 0) { size = g_Rooms[roomnum].gfxdatalen; - memaFree(g_Rooms[roomnum].gfxdata, size); + mema_free(g_Rooms[roomnum].gfxdata, size); g_Rooms[roomnum].gfxdata = NULL; } g_Rooms[roomnum].loaded240 = 0; } -void bgUnloadAllRooms(void) +void bg_unload_all_rooms(void) { s32 i; for (i = 1; i < g_Vars.roomcount; i++) { if (g_Rooms[i].loaded240) { - bgUnloadRoom(i); + bg_unload_room(i); } } } @@ -3035,9 +3035,9 @@ void bgUnloadAllRooms(void) * is true, do a final iteration through all the rooms and free everything * that's not visible. */ -void bgGarbageCollectRooms(s32 bytesneeded, bool desparate) +void bg_garbage_collect_rooms(s32 bytesneeded, bool desparate) { - s32 bytesfree = memaGetLongestFree(); + s32 bytesfree = mema_get_longest_free(); s32 oldestroom; s32 oldesttimer; s32 count = 0; @@ -3055,11 +3055,11 @@ void bgGarbageCollectRooms(s32 bytesneeded, bool desparate) } if (oldestroom != 0) { - bgUnloadRoom(oldestroom); - memaDefrag(); + bg_unload_room(oldestroom); + mema_defrag(); } - bytesfree = memaGetLongestFree(); + bytesfree = mema_get_longest_free(); count++; if (count == 30) { @@ -3071,10 +3071,10 @@ void bgGarbageCollectRooms(s32 bytesneeded, bool desparate) if (g_Rooms[i].loaded240) #endif { - bgUnloadRoom(i); - memaDefrag(); + bg_unload_room(i); + mema_defrag(); - if (memaGetLongestFree() >= bytesneeded) { + if (mema_get_longest_free() >= bytesneeded) { return; } } @@ -3091,7 +3091,7 @@ void bgGarbageCollectRooms(s32 bytesneeded, bool desparate) * If any rooms have reached the timer limit then unload them, but don't unload * more than 2 rooms per frame. */ -void bgTickRooms(void) +void bg_tick_rooms(void) { s32 numunloaded = 0; s32 i; @@ -3113,9 +3113,9 @@ void bgTickRooms(void) } if (numunloaded < 2 && g_Rooms[i].loaded240 == g_BgUnloadDelay240_2) { - bgUnloadRoom(i); + bg_unload_room(i); #if VERSION >= VERSION_NTSC_1_0 - memaDefrag(); + mema_defrag(); #endif numunloaded++; } @@ -3123,7 +3123,7 @@ void bgTickRooms(void) } } -Gfx *bgRenderRoomPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool arg3) +Gfx *bg_render_room_pass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool arg3) { uintptr_t v0; @@ -3134,12 +3134,12 @@ Gfx *bgRenderRoomPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool arg3) switch (block->type) { case ROOMBLOCKTYPE_LEAF: if (g_Rooms[roomnum].flags & ROOMFLAG_HASDYNTEX) { - dyntexTickRoom(roomnum, block->vertices); + dyntex_tick_room(roomnum, block->vertices); } gSPSegment(gdl++, SPSEGMENT_BG_VTX, OS_PHYSICAL_TO_K0(block->vertices)); - roomHighlight(roomnum); + room_highlight(roomnum); v0 = (uintptr_t)g_Rooms[roomnum].colours; @@ -3155,7 +3155,7 @@ Gfx *bgRenderRoomPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool arg3) gSPDisplayList(gdl++, OS_PHYSICAL_TO_K0(block->gdl)); if (arg3) { - gdl = bgRenderRoomPass(gdl, roomnum, block->next, true); + gdl = bg_render_room_pass(gdl, roomnum, block->next, true); } break; case ROOMBLOCKTYPE_PARENT: @@ -3182,15 +3182,15 @@ Gfx *bgRenderRoomPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool arg3) sum = sp40[0] * sp34[0] + sp40[1] * sp34[1] + sp40[2] * sp34[2]; if (sum < 0.0f) { - gdl = bgRenderRoomPass(gdl, roomnum, sp58, false); - gdl = bgRenderRoomPass(gdl, roomnum, sp54, false); + gdl = bg_render_room_pass(gdl, roomnum, sp58, false); + gdl = bg_render_room_pass(gdl, roomnum, sp54, false); } else { - gdl = bgRenderRoomPass(gdl, roomnum, sp54, false); - gdl = bgRenderRoomPass(gdl, roomnum, sp58, false); + gdl = bg_render_room_pass(gdl, roomnum, sp54, false); + gdl = bg_render_room_pass(gdl, roomnum, sp58, false); } if (arg3) { - gdl = bgRenderRoomPass(gdl, roomnum, block->next, true); + gdl = bg_render_room_pass(gdl, roomnum, block->next, true); } } break; @@ -3202,17 +3202,17 @@ Gfx *bgRenderRoomPass(Gfx *gdl, s32 roomnum, struct roomblock *block, bool arg3) /** * Render the opaque layer of the room. */ -Gfx *bgRenderRoomOpaque(Gfx *gdl, s32 roomnum) +Gfx *bg_render_room_opaque(Gfx *gdl, s32 roomnum) { if (g_Rooms[roomnum].loaded240 == 0) { return gdl; } - gdl = roomApplyMtx(gdl, roomnum); + gdl = room_apply_mtx(gdl, roomnum); - gdl = lightsSetForRoom(gdl, roomnum); - gdl = bgRenderRoomPass(gdl, roomnum, g_Rooms[roomnum].gfxdata->opablocks, true); - gdl = lightsSetDefault(gdl); + gdl = lights_set_for_room(gdl, roomnum); + gdl = bg_render_room_pass(gdl, roomnum, g_Rooms[roomnum].gfxdata->opablocks, true); + gdl = lights_set_default(gdl); g_Rooms[roomnum].loaded240 = 1; @@ -3222,7 +3222,7 @@ Gfx *bgRenderRoomOpaque(Gfx *gdl, s32 roomnum) /** * Render the transparency layer of the room. */ -Gfx *bgRenderRoomXlu(Gfx *gdl, s32 roomnum) +Gfx *bg_render_room_xlu(Gfx *gdl, s32 roomnum) { u32 stack; @@ -3235,23 +3235,23 @@ Gfx *bgRenderRoomXlu(Gfx *gdl, s32 roomnum) return gdl; } - roomHighlight(roomnum); + room_highlight(roomnum); if (g_Rooms[roomnum].gfxdata); if (g_Rooms[roomnum].gfxdata); - gdl = roomApplyMtx(gdl, roomnum); - gdl = bgRenderRoomPass(gdl, roomnum, g_Rooms[roomnum].gfxdata->xlublocks, true); + gdl = room_apply_mtx(gdl, roomnum); + gdl = bg_render_room_pass(gdl, roomnum, g_Rooms[roomnum].gfxdata->xlublocks, true); g_Rooms[roomnum].loaded240 = 1; } else { - bgLoadRoom(roomnum); + bg_load_room(roomnum); } return gdl; } -s32 bgPopulateVtxBatchType(s32 roomnum, struct vtxbatch *batches, Gfx *gdl, s32 batchindex, Vtx *vertices, s32 type) +s32 bg_populate_vtx_batch_type(s32 roomnum, struct vtxbatch *batches, Gfx *gdl, s32 batchindex, Vtx *vertices, s32 type) { s32 i; s32 j; @@ -3329,7 +3329,7 @@ s32 bgPopulateVtxBatchType(s32 roomnum, struct vtxbatch *batches, Gfx *gdl, s32 return batchindex; } -void bgFindRoomVtxBatches(s32 roomnum) +void bg_find_room_vtx_batches(s32 roomnum) { s32 i; s32 batchindex = 0; @@ -3338,7 +3338,7 @@ void bgFindRoomVtxBatches(s32 roomnum) struct vtxbatch *batches; if (g_Rooms[roomnum].vtxbatches == NULL) { - gdl = bgGetNextGdlInLayer(roomnum, NULL, VTXBATCHTYPE_OPA); + gdl = bg_get_next_gdl_in_layer(roomnum, NULL, VTXBATCHTYPE_OPA); if (gdl != NULL) { while (gdl) { @@ -3349,12 +3349,12 @@ void bgFindRoomVtxBatches(s32 roomnum) } } - gdl = bgGetNextGdlInLayer(roomnum, gdl, VTXBATCHTYPE_OPA); + gdl = bg_get_next_gdl_in_layer(roomnum, gdl, VTXBATCHTYPE_OPA); } xlucount = 0; - gdl = bgGetNextGdlInLayer(roomnum, NULL, VTXBATCHTYPE_XLU); + gdl = bg_get_next_gdl_in_layer(roomnum, NULL, VTXBATCHTYPE_XLU); while (gdl) { for (i = 0; gdl[i].dma.cmd != G_ENDDL; i++) { @@ -3364,32 +3364,32 @@ void bgFindRoomVtxBatches(s32 roomnum) } } - gdl = bgGetNextGdlInLayer(roomnum, gdl, VTXBATCHTYPE_XLU); + gdl = bg_get_next_gdl_in_layer(roomnum, gdl, VTXBATCHTYPE_XLU); } batchindex += xlucount; - batches = memaAlloc((batchindex * sizeof(struct vtxbatch) + 0xf) & ~0xf); + batches = mema_alloc((batchindex * sizeof(struct vtxbatch) + 0xf) & ~0xf); if (batches != NULL) { - gdl = bgGetNextGdlInLayer(roomnum, NULL, VTXBATCHTYPE_OPA); + gdl = bg_get_next_gdl_in_layer(roomnum, NULL, VTXBATCHTYPE_OPA); batchindex = 0; g_Rooms[roomnum].vtxbatches = batches; while (gdl) { - Vtx *vertices = bgFindVerticesForGdl(roomnum, gdl); - batchindex = bgPopulateVtxBatchType(roomnum, batches, gdl, batchindex, vertices, VTXBATCHTYPE_OPA); - gdl = bgGetNextGdlInLayer(roomnum, gdl, VTXBATCHTYPE_OPA); + Vtx *vertices = bg_find_vertices_for_gdl(roomnum, gdl); + batchindex = bg_populate_vtx_batch_type(roomnum, batches, gdl, batchindex, vertices, VTXBATCHTYPE_OPA); + gdl = bg_get_next_gdl_in_layer(roomnum, gdl, VTXBATCHTYPE_OPA); } if (xlucount) { - gdl = bgGetNextGdlInLayer(roomnum, NULL, VTXBATCHTYPE_XLU); + gdl = bg_get_next_gdl_in_layer(roomnum, NULL, VTXBATCHTYPE_XLU); while (gdl) { - Vtx *vertices = bgFindVerticesForGdl(roomnum, gdl); - batchindex = bgPopulateVtxBatchType(roomnum, batches, gdl, batchindex, vertices, VTXBATCHTYPE_XLU); - gdl = bgGetNextGdlInLayer(roomnum, gdl, VTXBATCHTYPE_XLU); + Vtx *vertices = bg_find_vertices_for_gdl(roomnum, gdl); + batchindex = bg_populate_vtx_batch_type(roomnum, batches, gdl, batchindex, vertices, VTXBATCHTYPE_XLU); + gdl = bg_get_next_gdl_in_layer(roomnum, gdl, VTXBATCHTYPE_XLU); } } @@ -3399,7 +3399,7 @@ void bgFindRoomVtxBatches(s32 roomnum) } } -bool bgTestLineIntersectsIntBbox(struct coord *arg0, struct coord *arg1, s32 *arg2, s32 *arg3) +bool bg_test_line_intersects_int_bbox(struct coord *arg0, struct coord *arg1, s32 *arg2, s32 *arg3) { struct coord arg2f; struct coord arg3f; @@ -3412,10 +3412,10 @@ bool bgTestLineIntersectsIntBbox(struct coord *arg0, struct coord *arg1, s32 *ar arg3f.y = arg3[1]; arg3f.z = arg3[2]; - return bgTestLineIntersectsBbox(arg0, arg1, &arg2f, &arg3f); + return bg_test_line_intersects_bbox(arg0, arg1, &arg2f, &arg3f); } -bool bgTestLineIntersectsBbox(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3) +bool bg_test_line_intersects_bbox(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3) { u32 stack[4]; f32 f0; @@ -3538,7 +3538,7 @@ bool bgTestLineIntersectsBbox(struct coord *arg0, struct coord *arg1, struct coo return true; } -bool bgTestHitOnObj(struct coord *arg0, struct coord *arg1, struct coord *arg2, Gfx *gdl, +bool bg_test_hit_on_obj(struct coord *arg0, struct coord *arg1, struct coord *arg2, Gfx *gdl, Gfx *gdl2, Vtx *vertices, struct hitthing *hitthing) { s16 stack; @@ -3666,7 +3666,7 @@ bool bgTestHitOnObj(struct coord *arg0, struct coord *arg1, struct coord *arg2, } if (intersectsbbox) { - intersectsbbox = bgTestLineIntersectsBbox(arg0, arg2, &min, &max); + intersectsbbox = bg_test_line_intersects_bbox(arg0, arg2, &min, &max); } } else if (gdl->dma.cmd == (s8)G_SETTIMG) { imggdl = gdl; @@ -3765,7 +3765,7 @@ bool bgTestHitOnObj(struct coord *arg0, struct coord *arg1, struct coord *arg2, } if (!(arg0->y < min.y && arg1->y < min.y) && !(arg0->y > max.y && arg1->y > max.y)) { - if (bgTestLineIntersectsBbox(arg0, arg2, &min, &max) + if (bg_test_line_intersects_bbox(arg0, arg2, &min, &max) && func0002f560(point1, point2, point3, NULL, arg0, arg1, arg2, &sp8c, &sp80)) { tmp = sp8c.x - arg0->x; sqdist = tmp * tmp; @@ -3835,7 +3835,7 @@ bool bgTestHitOnObj(struct coord *arg0, struct coord *arg1, struct coord *arg2, return hit; } -bool bgTestHitOnChr(struct model *model, struct coord *arg1, struct coord *arg2, struct coord *arg3, +bool bg_test_hit_on_chr(struct model *model, struct coord *arg1, struct coord *arg2, struct coord *arg3, Gfx *gdl, Gfx *gdl2, Vtx *vertices, f32 *sqdistptr, struct hitthing *hitthing) { s16 triref; @@ -3901,7 +3901,7 @@ bool bgTestHitOnChr(struct model *model, struct coord *arg1, struct coord *arg2, ptr[1] = vtx->y; ptr[2] = vtx->z; - mtx4TransformVecInPlace(mtx, (struct coord *) ptr); + mtx4_transform_vec_in_place(mtx, (struct coord *) ptr); numvertices--; ptr += 3; @@ -3955,7 +3955,7 @@ bool bgTestHitOnChr(struct model *model, struct coord *arg1, struct coord *arg2, || (arg1->z > max.z && arg2->z > max.z)) { intersectsbbox = false; } else { - intersectsbbox = bgTestLineIntersectsBbox(arg1, arg3, &min, &max); + intersectsbbox = bg_test_line_intersects_bbox(arg1, arg3, &min, &max); } } else { if (!intersectsbbox) { @@ -4052,7 +4052,7 @@ bool bgTestHitOnChr(struct model *model, struct coord *arg1, struct coord *arg2, } if (!(arg1->y < min.y && arg2->y < min.y) && !(arg1->y > max.y && arg2->y > max.y)) { - if (bgTestLineIntersectsBbox(arg1, arg3, &min, &max) + if (bg_test_line_intersects_bbox(arg1, arg3, &min, &max) && func0002f560(point1, point2, point3, NULL, arg1, arg2, arg3, &sp84, &sp78)) { tmp = sp84.x - arg1->x; sqdist = tmp * tmp; @@ -4113,7 +4113,7 @@ bool bgTestHitOnChr(struct model *model, struct coord *arg1, struct coord *arg2, return hit; } -bool bgTestHitInVtxBatch(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct vtxbatch *batch, s32 roomnum, struct hitthing *hitthing) +bool bg_test_hit_in_vtx_batch(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct vtxbatch *batch, s32 roomnum, struct hitthing *hitthing) { s16 stack; s16 triref; @@ -4139,7 +4139,7 @@ bool bgTestHitInVtxBatch(struct coord *arg0, struct coord *arg1, struct coord *a Gfx *tmpgdl; Gfx *tri4gdl; - vtx = bgFindVerticesForGdl(roomnum, gdl); + vtx = bg_find_vertices_for_gdl(roomnum, gdl); iter = &gdl[batch->gbicmdindex]; vtx = (Vtx *)((iter->words.w1 & 0xffffff) + (s32)vtx); numvertices = (((u32)iter->bytes[1] >> 4) & 0xf) + 1; @@ -4256,7 +4256,7 @@ bool bgTestHitInVtxBatch(struct coord *arg0, struct coord *arg1, struct coord *a } if (!(arg0->y > max.y && arg1->y > max.y)) { - if (bgTestLineIntersectsBbox(arg0, arg2, &min, &max) + if (bg_test_line_intersects_bbox(arg0, arg2, &min, &max) && func0002f560(point1, point2, point3, NULL, arg0, arg1, arg2, &spb0, &spa4)) { f32 tmp; @@ -4419,7 +4419,7 @@ s32 bg0f1612e4(struct coord *bbmin, struct coord *bbmax, struct coord *frompos, * Room vertices are already grouped into batches, where each batch has a * precomputed bounding box. */ -bool bgTestHitInRoom(struct coord *frompos, struct coord *topos, s32 roomnum, struct hitthing *hitthing) +bool bg_test_hit_in_room(struct coord *frompos, struct coord *topos, s32 roomnum, struct hitthing *hitthing) { s32 i; s32 count; @@ -4511,7 +4511,7 @@ bool bgTestHitInRoom(struct coord *frompos, struct coord *topos, s32 roomnum, st count = 0; for (j = 0; j < ARRAYCOUNT(var800a6538); j++) { - if (bgTestHitInVtxBatch(&from, &to, &dist, &g_Rooms[roomnum].vtxbatches[var800a6538[j].vtxbatchindex], roomnum, hitthing)) { + if (bg_test_hit_in_vtx_batch(&from, &to, &dist, &g_Rooms[roomnum].vtxbatches[var800a6538[j].vtxbatchindex], roomnum, hitthing)) { f0 = from.x - hitthing->pos.x; f2 = f0 * f0; @@ -4560,7 +4560,7 @@ bool bgTestHitInRoom(struct coord *frompos, struct coord *topos, s32 roomnum, st batch = g_Rooms[roomnum].vtxbatches; for (i = 0; i < count; i++) { - if (bgTestHitInVtxBatch(&from, &to, &dist, &batch[var800a6538[i].vtxbatchindex], roomnum, hitthing)) { + if (bg_test_hit_in_vtx_batch(&from, &to, &dist, &batch[var800a6538[i].vtxbatchindex], roomnum, hitthing)) { i++; if (i < count) { @@ -4575,7 +4575,7 @@ bool bgTestHitInRoom(struct coord *frompos, struct coord *topos, s32 roomnum, st for (; i < count; i++) { if (var800a6538[i].unk04 <= spc8) { - if (bgTestHitInVtxBatch(&from, &to, &dist, &batch[var800a6538[i].vtxbatchindex], roomnum, &sp60)) { + if (bg_test_hit_in_vtx_batch(&from, &to, &dist, &batch[var800a6538[i].vtxbatchindex], roomnum, &sp60)) { f0 = from.f[0] - sp60.pos.f[0]; f20 = f0 * f0; @@ -4614,12 +4614,12 @@ bool bgTestHitInRoom(struct coord *frompos, struct coord *topos, s32 roomnum, st return false; } -bool bgRoomIsLoaded(s32 room) +bool bg_room_is_loaded(s32 room) { return g_Rooms[room].loaded240; } -bool bgRoomContainsCoord(struct coord *pos, RoomNum roomnum) +bool bg_room_contains_coord(struct coord *pos, RoomNum roomnum) { struct coord copy; copy.x = pos->x; @@ -4646,7 +4646,7 @@ bool bgRoomContainsCoord(struct coord *pos, RoomNum roomnum) * - The normal points towards the front of the portal. * - The room on the front side is roomnum2. */ -bool bgTestPosInRoomCheap(struct coord *pos, RoomNum roomnum) +bool bg_test_pos_in_room_cheap(struct coord *pos, RoomNum roomnum) { s32 i; @@ -4672,7 +4672,7 @@ bool bgTestPosInRoomCheap(struct coord *pos, RoomNum roomnum) return true; } -bool bgTestPosInRoomExpensive(struct coord *pos, RoomNum roomnum) +bool bg_test_pos_in_room_expensive(struct coord *pos, RoomNum roomnum) { s32 t5; struct coord *next; @@ -4780,12 +4780,12 @@ bool bgTestPosInRoomExpensive(struct coord *pos, RoomNum roomnum) return true; } -bool bgTestPosInRoom(struct coord *pos, RoomNum roomnum) +bool bg_test_pos_in_room(struct coord *pos, RoomNum roomnum) { if (g_Rooms[roomnum].flags & ROOMFLAG_COMPLICATEDPORTALS) { - return bgTestPosInRoomExpensive(pos, roomnum); + return bg_test_pos_in_room_expensive(pos, roomnum); } else { - return bgTestPosInRoomCheap(pos, roomnum); + return bg_test_pos_in_room_cheap(pos, roomnum); } } @@ -4809,7 +4809,7 @@ bool bgTestPosInRoom(struct coord *pos, RoomNum roomnum) * to pos and writes the room number to the bestroom pointer. The bestroom * pointer is a pointer to a single s16 rather than an array. */ -void bgFindRoomsByPos(struct coord *posarg, RoomNum *inrooms, RoomNum *aboverooms, s32 max, RoomNum *bestroom) +void bg_find_rooms_by_pos(struct coord *posarg, RoomNum *inrooms, RoomNum *aboverooms, s32 max, RoomNum *bestroom) { s32 inlen = 0; s32 abovelen = 0; @@ -4909,7 +4909,7 @@ void bgFindRoomsByPos(struct coord *posarg, RoomNum *inrooms, RoomNum *aboveroom } } -bool bgCmdPushValue(bool value) +bool bg_cmd_push_value(bool value) { g_BgCmdStack[g_BgCmdStackIndex] = value; g_BgCmdStackIndex = (g_BgCmdStackIndex + 1) % 20; @@ -4917,13 +4917,13 @@ bool bgCmdPushValue(bool value) return value; } -bool bgCmdPopValue(void) +bool bg_cmd_pop_value(void) { bool val = g_BgCmdStack[g_BgCmdStackIndex = (g_BgCmdStackIndex + 19) % 20]; return val; } -bool bgCmdGetNthValueFromEnd(s32 n) +bool bg_cmd_get_nth_value_from_end(s32 n) { return g_BgCmdStack[((g_BgCmdStackIndex - n) + 19) % 20]; } @@ -4949,7 +4949,7 @@ bool bgCmdGetNthValueFromEnd(s32 n) * these statements should be executed, or whether the condition failed and * it's just passing over them to get to the endif command. */ -struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) +struct bgcmd *bg_cmd_execute_branch(struct bgcmd *cmd, bool execute) { s32 i; @@ -4965,43 +4965,43 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) return cmd; case BGCMD_PUSH: if (execute) { - bgCmdPushValue(cmd->param); + bg_cmd_push_value(cmd->param); } cmd += cmd->len; break; case BGCMD_POP: if (execute) { - bgCmdPopValue(); + bg_cmd_pop_value(); } cmd += cmd->len; break; case BGCMD_AND: if (execute) { - bgCmdPushValue(bgCmdPopValue() & bgCmdPopValue()); + bg_cmd_push_value(bg_cmd_pop_value() & bg_cmd_pop_value()); } cmd += cmd->len; break; case BGCMD_OR: if (execute) { - bgCmdPushValue(bgCmdPopValue() | bgCmdPopValue()); + bg_cmd_push_value(bg_cmd_pop_value() | bg_cmd_pop_value()); } cmd += cmd->len; break; case BGCMD_NOT: if (execute) { - bgCmdPushValue(bgCmdPopValue() == 0); + bg_cmd_push_value(bg_cmd_pop_value() == 0); } cmd += cmd->len; break; case BGCMD_XOR: if (execute) { - bgCmdPushValue(bgCmdPopValue() ^ bgCmdPopValue()); + bg_cmd_push_value(bg_cmd_pop_value() ^ bg_cmd_pop_value()); } cmd += cmd->len; break; case BGCMD_PUSH_CAMINROOMRANGE: if (execute) { - bgCmdPushValue(g_CamRoom >= cmd[1].param && g_CamRoom <= cmd[2].param); + bg_cmd_push_value(g_CamRoom >= cmd[1].param && g_CamRoom <= cmd[2].param); } cmd += cmd->len; break; @@ -5018,9 +5018,9 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) case BGCMD_SETRESULT_IFPORTALINFOV: if (execute) { if (!PORTAL_IS_CLOSED(cmd[1].param)) { - if (!bgGetPortalScreenBbox(cmd[1].param, &g_PortalScreenBbox)) { + if (!bg_get_portal_screen_bbox(cmd[1].param, &g_PortalScreenBbox)) { g_BgCmdResult = BGRESULT_FALSE; - } else if (bgGetBoxIntersection(&g_BgCmdScreenBox, &g_PortalScreenBbox) == 0) { + } else if (bg_get_box_intersection(&g_BgCmdScreenBox, &g_PortalScreenBbox) == 0) { g_BgCmdResult = BGRESULT_FALSE; } else { g_BgCmdResult = BGRESULT_TRUE; @@ -5034,12 +5034,12 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) struct screenbox portalbox; if (!PORTAL_IS_CLOSED(cmd[1].param)) { - if (bgGetPortalScreenBbox(cmd[1].param, &portalbox) && bgGetBoxIntersection(&g_BgCmdScreenBox, &portalbox)) { + if (bg_get_portal_screen_bbox(cmd[1].param, &portalbox) && bg_get_box_intersection(&g_BgCmdScreenBox, &portalbox)) { if (g_BgCmdResult != BGRESULT_TRUE) { - bgCopyBox(&g_BgCmdScreenBox, &portalbox); + bg_copy_box(&g_BgCmdScreenBox, &portalbox); g_BgCmdResult = BGRESULT_TRUE; } else { - bgExpandBox(&g_BgCmdScreenBox, &portalbox); + bg_expand_box(&g_BgCmdScreenBox, &portalbox); } } } @@ -5053,11 +5053,11 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) if (PORTAL_IS_CLOSED(cmd[1].param)) { g_BgCmdResult = BGRESULT_FALSE; - } else if (!bgGetPortalScreenBbox(cmd[1].param, &portalbox)) { + } else if (!bg_get_portal_screen_bbox(cmd[1].param, &portalbox)) { g_BgCmdResult = BGRESULT_FALSE; - } else if (bgGetBoxIntersection(&portalbox, (struct screenbox *)&g_Vars.currentplayer->screenxminf) == 0) { + } else if (bg_get_box_intersection(&portalbox, (struct screenbox *)&g_Vars.currentplayer->screenxminf) == 0) { g_BgCmdResult = BGRESULT_FALSE; - } else if (bgGetBoxIntersection(&g_PortalScreenBbox, &portalbox) == 0) { + } else if (bg_get_box_intersection(&g_PortalScreenBbox, &portalbox) == 0) { g_BgCmdResult = BGRESULT_FALSE; } } @@ -5066,8 +5066,8 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) break; case BGCMD_IFRESULT_SHOWROOM: if (execute) { - if (g_BgCmdResult == BGRESULT_TRUE && bgRoomIntersectsScreenBox(cmd[1].param, &g_BgCmdScreenBox)) { - bgSetRoomOnscreen(cmd[1].param, 0, &g_BgCmdScreenBox); + if (g_BgCmdResult == BGRESULT_TRUE && bg_room_intersects_screen_box(cmd[1].param, &g_BgCmdScreenBox)) { + bg_set_room_onscreen(cmd[1].param, 0, &g_BgCmdScreenBox); g_BgForceOnscreenRooms[g_BgNumForceOnscreenRooms++] = cmd[1].param; } } @@ -5101,7 +5101,7 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) break; case BGCMD_PUSH_PORTALISOPEN: if (execute) { - bgCmdPushValue(!PORTAL_IS_CLOSED(cmd[1].param)); + bg_cmd_push_value(!PORTAL_IS_CLOSED(cmd[1].param)); } cmd += cmd->len; break; @@ -5118,7 +5118,7 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) cmd += cmd->len; break; case BGCMD_BRANCH: - cmd = bgCmdExecuteBranch(cmd + cmd->len, execute); + cmd = bg_cmd_execute_branch(cmd + cmd->len, execute); cmd += cmd->len; break; case BGCMD_CATCH: @@ -5133,7 +5133,7 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) execute = false; break; case BGCMD_IF: - cmd = bgCmdExecuteBranch(cmd + cmd->len, bgCmdPopValue() & execute); + cmd = bg_cmd_execute_branch(cmd + cmd->len, bg_cmd_pop_value() & execute); if (g_BgCmdThrowing) { execute = false; } @@ -5179,7 +5179,7 @@ struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool execute) return cmd; } -struct bgcmd *bgCmdExecute(struct bgcmd *cmd) +struct bgcmd *bg_cmd_execute(struct bgcmd *cmd) { struct player *player = g_Vars.currentplayer; g_BgCmdResult = BGRESULT_TRUE; @@ -5189,17 +5189,17 @@ struct bgcmd *bgCmdExecute(struct bgcmd *cmd) } // This may have been used in an osSyncPrintf call - bgCmdGetNthValueFromEnd(0); + bg_cmd_get_nth_value_from_end(0); g_BgCmdScreenBox.xmin = player->screenxminf; g_BgCmdScreenBox.ymin = player->screenyminf; g_BgCmdScreenBox.xmax = player->screenxmaxf; g_BgCmdScreenBox.ymax = player->screenymaxf; - return bgCmdExecuteBranch(cmd, true); + return bg_cmd_execute_branch(cmd, true); } -void bgTickPortalsXray(void) +void bg_tick_portals_xray(void) { struct coord vismax; struct coord vismin; @@ -5216,7 +5216,7 @@ void bgTickPortalsXray(void) static u32 edist = 400; - bgCalculateScreenProperties(); + bg_calculate_screen_properties(); if (g_BgDrawSlots); @@ -5229,8 +5229,8 @@ void bgTickPortalsXray(void) xmax = player->screenxmaxf; ymax = player->screenymaxf; - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT && player->gunsightoff == 0) { - player->eraserdepth = -500.0f / camGetLodScaleZ(); + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_FARSIGHT && player->gunsightoff == 0) { + player->eraserdepth = -500.0f / cam_get_lod_scale_z(); } else { player->eraserdepth = -500.0f; } @@ -5239,15 +5239,15 @@ void bgTickPortalsXray(void) eraserpos.f[1] = 0.0f; eraserpos.f[2] = player->eraserdepth; - mtx4TransformVecInPlace(camGetProjectionMtxF(), &eraserpos); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &eraserpos); player->eraserpos.f[0] = eraserpos.f[0]; player->eraserpos.f[1] = eraserpos.f[1]; player->eraserpos.f[2] = eraserpos.f[2]; - mainOverrideVariable("edist", &edist); + main_override_variable("edist", &edist); - stage = stageGetCurrent(); + stage = stage_get_current(); player->eraserpropdist = stage->eraserpropdist; player->eraserbgdist = (f32) stage->eraserpropdist + stage->unk30; @@ -5298,7 +5298,7 @@ void bgTickPortalsXray(void) g_BgDrawSlots[index].roomnum = i; - bgUnpausePropsInRoom(i, false); + bg_unpause_props_in_room(i, false); x = (g_Rooms[i].bbmin[0] + g_Rooms[i].bbmax[0]) / 2.0f - vismid.f[0]; y = (g_Rooms[i].bbmin[1] + g_Rooms[i].bbmax[1]) / 2.0f - vismid.f[1]; @@ -5329,10 +5329,10 @@ void bgTickPortalsXray(void) } } - bgChooseRoomsToLoad(); + bg_choose_rooms_to_load(); } -void bgAddToSnake(RoomNum fromroomnum, RoomNum roomnum, s16 depth, struct screenbox *box) +void bg_add_to_snake(RoomNum fromroomnum, RoomNum roomnum, s16 depth, struct screenbox *box) { struct bgsnakeitem *item; s32 i; @@ -5360,7 +5360,7 @@ void bgAddToSnake(RoomNum fromroomnum, RoomNum roomnum, s16 depth, struct screen if (item->roomnum == roomnum) { for (j = 0; j < ARRAYCOUNT(item->fromroomnums); j++) { if (item->fromroomnums[j] == -1) { - bgExpandBox(&item->screenbox, box); + bg_expand_box(&item->screenbox, box); item->fromroomnums[j] = fromroomnum; return; } @@ -5413,7 +5413,7 @@ void bgAddToSnake(RoomNum fromroomnum, RoomNum roomnum, s16 depth, struct screen * Those that should be onscreen are added to the draw list and appended to the * snake so its neighbours will be processed recursively. */ -void bgConsumeSnakeItem(struct bgsnakeitem *item) +void bg_consume_snake_item(struct bgsnakeitem *item) { struct coord *campos; s32 i; @@ -5483,8 +5483,8 @@ void bgConsumeSnakeItem(struct bgsnakeitem *item) // multiple portals between the same two rooms. if (prevfoundroom != newfoundroom) { if (prevvalidcount) { - bgSetRoomOnscreen(prevfoundroom, item->depth, &prevbox); - bgAddToSnake(item->roomnum, prevfoundroom, item->depth + 1, &prevbox); + bg_set_room_onscreen(prevfoundroom, item->depth, &prevbox); + bg_add_to_snake(item->roomnum, prevfoundroom, item->depth + 1, &prevbox); } prevvalidcount = 0; @@ -5514,11 +5514,11 @@ void bgConsumeSnakeItem(struct bgsnakeitem *item) newbox.ymax = item->screenbox.ymax; side = true; } else { - side = bgGetPortalScreenBbox(portalnum, &newbox); + side = bg_get_portal_screen_bbox(portalnum, &newbox); } if (side) { - bgGetBoxIntersection(&newbox, &item->screenbox); + bg_get_box_intersection(&newbox, &item->screenbox); if (newbox.xmin < newbox.xmax && newbox.ymin < newbox.ymax) { if (prevvalidcount == 0) { @@ -5527,7 +5527,7 @@ void bgConsumeSnakeItem(struct bgsnakeitem *item) prevbox.xmax = newbox.xmax; prevbox.ymax = newbox.ymax; } else { - bgExpandBox(&prevbox, &newbox); + bg_expand_box(&prevbox, &newbox); } prevvalidcount++; @@ -5536,8 +5536,8 @@ void bgConsumeSnakeItem(struct bgsnakeitem *item) } if (prevvalidcount != 0) { - bgSetRoomOnscreen(prevfoundroom, item->depth, &prevbox); - bgAddToSnake(item->roomnum, prevfoundroom, item->depth + 1, &prevbox); + bg_set_room_onscreen(prevfoundroom, item->depth, &prevbox); + bg_add_to_snake(item->roomnum, prevfoundroom, item->depth + 1, &prevbox); } } @@ -5549,13 +5549,13 @@ void bgConsumeSnakeItem(struct bgsnakeitem *item) * * The structure is used for discovering onscreen rooms. */ -bool bgTryConsumeSnake(void) +bool bg_try_consume_snake(void) { if (g_BgSnake.tailindex == g_BgSnake.headindex) { return false; } - bgConsumeSnakeItem(&g_BgSnake.items[g_BgSnake.tailindex]); + bg_consume_snake_item(&g_BgSnake.items[g_BgSnake.tailindex]); g_BgSnake.tailindex++; @@ -5579,7 +5579,7 @@ bool bgTryConsumeSnake(void) * destroying the glass may make many rooms visible at once, and only one room * is loaded per tick. */ -void bgChooseRoomsToLoad(void) +void bg_choose_rooms_to_load(void) { s32 i; s32 j; @@ -5602,7 +5602,7 @@ void bgChooseRoomsToLoad(void) g_BgNumRoomLoadCandidates++; } - bgUnpausePropsInRoom(roomnum2, true); + bg_unpause_props_in_room(roomnum2, true); if (PORTAL_IS_CLOSED(i)) { for (j = 0; j < g_Rooms[roomnum2].numportals; j++) { @@ -5631,7 +5631,7 @@ void bgChooseRoomsToLoad(void) g_BgNumRoomLoadCandidates++; } - bgUnpausePropsInRoom(roomnum1, true); + bg_unpause_props_in_room(roomnum1, true); if (PORTAL_IS_CLOSED(i)) { for (j = 0; j < g_Rooms[roomnum1].numportals; j++) { @@ -5675,21 +5675,21 @@ void bgChooseRoomsToLoad(void) } } -void bgTickPortals(void) +void bg_tick_portals(void) { s32 i; s32 room; struct screenbox box; struct player *player = g_Vars.currentplayer; - bgCalculateScreenProperties(); + bg_calculate_screen_properties(); box.xmin = player->screenxminf; box.ymin = player->screenyminf; box.xmax = player->screenxmaxf; box.ymax = player->screenymaxf; - viGetZRange(&g_BgSnake.zrange); + vi_get_z_range(&g_BgSnake.zrange); g_BgSnake.zrange.far = g_BgSnake.zrange.far / g_Vars.currentplayerstats->scale_bg2gfx; for (i = 0; i < g_Vars.roomcount; i++) { @@ -5700,7 +5700,7 @@ void bgTickPortals(void) } if (player->visionmode == VISIONMODE_XRAY) { - bgTickPortalsXray(); + bg_tick_portals_xray(); } else { if (g_BgNumAttemptedDrawSlots > g_BgMostAttemptedDrawSlots) { g_BgMostAttemptedDrawSlots = g_BgNumAttemptedDrawSlots; @@ -5721,40 +5721,40 @@ void bgTickPortals(void) g_BgDrawSlots[60].box.xmax = box.xmax; g_BgDrawSlots[60].box.ymax = box.ymax; - bgCmdExecute(g_BgCommands); + bg_cmd_execute(g_BgCommands); if (!g_BgRoomTestsDisabled) { if (g_BgPortals[0].verticesoffset == 0) { for (room = 1; room < g_Vars.roomcount; room++) { - if (bgRoomIntersectsScreenBox(room, &box) + if (bg_room_intersects_screen_box(room, &box) && ((g_StageIndex != STAGEINDEX_INFILTRATION && g_StageIndex != STAGEINDEX_RESCUE && g_StageIndex != STAGEINDEX_ESCAPE) || room != 0xf) && (g_StageIndex != STAGEINDEX_SKEDARRUINS || room != 0x02) && ((g_StageIndex != STAGEINDEX_DEFECTION && g_StageIndex != STAGEINDEX_EXTRACTION) || room != 0x01) && (g_StageIndex != STAGEINDEX_ATTACKSHIP || room != 0x71)) { - bgSetRoomOnscreen(room, 0, &box); + bg_set_room_onscreen(room, 0, &box); } } } else { - bgSetRoomOnscreen(g_CamRoom, 0, &box); + bg_set_room_onscreen(g_CamRoom, 0, &box); g_BgSnake.count = 0; g_BgSnake.headindex = 0; g_BgSnake.tailindex = 0; - bgAddToSnake(g_CamRoom, g_CamRoom, 1, &box); + bg_add_to_snake(g_CamRoom, g_CamRoom, 1, &box); - while (bgTryConsumeSnake()); + while (bg_try_consume_snake()); } } - bgChooseRoomsToLoad(); + bg_choose_rooms_to_load(); } } -Gfx *bgRenderSceneAndLoadCandidate(Gfx *gdl) +Gfx *bg_render_scene_and_load_candidate(Gfx *gdl) { - gdl = bgRenderScene(gdl); - gdl = bgScissorToViewport(gdl); + gdl = bg_render_scene(gdl); + gdl = bg_scissor_to_viewport(gdl); if (g_Vars.currentplayerindex == 0) { g_BgLoadCandidateTimer240 -= g_Vars.lvupdate240; @@ -5824,7 +5824,7 @@ Gfx *bgRenderSceneAndLoadCandidate(Gfx *gdl) } if (bestroomnum != 0) { - bgLoadRoom(bestroomnum); + bg_load_room(bestroomnum); g_BgLoadCandidateTimer240 = 64; } } @@ -5832,7 +5832,7 @@ Gfx *bgRenderSceneAndLoadCandidate(Gfx *gdl) return gdl; } -s32 bgGetForceOnscreenRooms(RoomNum *rooms, s32 len) +s32 bg_get_force_onscreen_rooms(RoomNum *rooms, s32 len) { s32 i; @@ -5845,7 +5845,7 @@ s32 bgGetForceOnscreenRooms(RoomNum *rooms, s32 len) return i; } -s32 bgRoomGetNeighbours(s32 roomnum, RoomNum *dstrooms, s32 len) +s32 bg_room_get_neighbours(s32 roomnum, RoomNum *dstrooms, s32 len) { s32 count = 0; s32 i; @@ -5881,7 +5881,7 @@ end: return count; } -bool bgRoomsAreNeighbours(s32 roomnum1, s32 roomnum2) +bool bg_rooms_are_neighbours(s32 roomnum1, s32 roomnum2) { s32 i; @@ -5896,15 +5896,15 @@ bool bgRoomsAreNeighbours(s32 roomnum1, s32 roomnum2) return false; } -void bgCalculateScreenProperties(void) +void bg_calculate_screen_properties(void) { struct player *player = g_Vars.currentplayer; - f32 width = viGetWidth(); + f32 width = vi_get_width(); u32 stack; - f32 height = viGetHeight(); + f32 height = vi_get_height(); u32 stack2; - player->screenxminf = viGetViewLeft(); + player->screenxminf = vi_get_view_left(); if (player->screenxminf < 0) { player->screenxminf = 0; @@ -5914,7 +5914,7 @@ void bgCalculateScreenProperties(void) player->screenxminf = width; } - player->screenyminf = viGetViewTop(); + player->screenyminf = vi_get_view_top(); if (player->screenyminf < 0) { player->screenyminf = 0; @@ -5924,7 +5924,7 @@ void bgCalculateScreenProperties(void) player->screenyminf = height; } - player->screenxmaxf = viGetViewLeft() + viGetViewWidth(); + player->screenxmaxf = vi_get_view_left() + vi_get_view_width(); if (player->screenxmaxf < 0) { player->screenxmaxf = 0; @@ -5934,7 +5934,7 @@ void bgCalculateScreenProperties(void) player->screenxmaxf = width; } - player->screenymaxf = viGetViewTop() + viGetViewHeight(); + player->screenymaxf = vi_get_view_top() + vi_get_view_height(); if (player->screenymaxf < 0) { player->screenymaxf = 0; @@ -5945,7 +5945,7 @@ void bgCalculateScreenProperties(void) } } -void bgExpandRoomToPortals(s32 roomnum) +void bg_expand_room_to_portals(s32 roomnum) { s32 i; s32 j; @@ -5976,7 +5976,7 @@ void bgExpandRoomToPortals(s32 roomnum) if (count); } -bool bgPortalExists(s32 portalnum) +bool bg_portal_exists(s32 portalnum) { s32 i; @@ -5989,14 +5989,14 @@ bool bgPortalExists(s32 portalnum) return false; } -void bgPortalSwapRooms(s32 portal) +void bg_portal_swap_rooms(s32 portal) { RoomNum tmp = g_BgPortals[portal].roomnum1; g_BgPortals[portal].roomnum1 = g_BgPortals[portal].roomnum2; g_BgPortals[portal].roomnum2 = tmp; } -void bgInitPortal(s32 portalnum) +void bg_init_portal(s32 portalnum) { struct coord room1centre; struct coord room2centre; @@ -6036,7 +6036,7 @@ void bgInitPortal(s32 portalnum) if (tmp1 > sp28.max) { sp18 = 1; - bgPortalSwapRooms(portalnum); + bg_portal_swap_rooms(portalnum); sp28.normal.x = -sp28.normal.x; sp28.normal.y = -sp28.normal.y; @@ -6050,7 +6050,7 @@ void bgInitPortal(s32 portalnum) tmp2 = sp28.normal.f[0] * room2centre.f[0] + sp28.normal.f[1] * room2centre.f[1] + sp28.normal.f[2] * room2centre.f[2]; if (tmp2 <= sp28.min && sp18) { - bgPortalSwapRooms(portalnum); + bg_portal_swap_rooms(portalnum); } if (sp18); @@ -6067,7 +6067,7 @@ void bgInitPortal(s32 portalnum) * a portal (door) on the inside wall of the L. It means you can be inside the * room but your position is on the opposite side of the door's plane. */ -void bgInitRoom(s32 roomnum) +void bg_init_room(s32 roomnum) { struct portalvertices *pvertices; s32 i; @@ -6120,12 +6120,12 @@ void bgInitRoom(s32 roomnum) } } -void bgSetPortalOpenState(s32 portal, bool open) +void bg_set_portal_open_state(s32 portal, bool open) { g_BgPortals[portal].flags = (g_BgPortals[portal].flags | PORTALFLAG_CLOSED) ^ (open != false); } -Gfx *bgRenderPortals(Gfx *gdl, s32 arg1, s32 arg2) +Gfx *bg_render_portals(Gfx *gdl, s32 arg1, s32 arg2) { return gdl; } @@ -6137,7 +6137,7 @@ void bg0f164e80(s32 arg0, s32 arg1) f32 var8007fcb4 = 0; -s32 bgFindPortalBetweenPositions(struct coord *pos1, struct coord *pos2) +s32 bg_find_portal_between_positions(struct coord *pos1, struct coord *pos2) { s32 bestportalnum = -1; s32 count = 0; @@ -6146,7 +6146,7 @@ s32 bgFindPortalBetweenPositions(struct coord *pos1, struct coord *pos2) s32 i; for (i = 0; g_BgPortals[i].verticesoffset; i++) { - if (portalCalculateIntersection(i, pos1, pos2) != PORTALINTERSECTION_NONE) { + if (portal_calculate_intersection(i, pos1, pos2) != PORTALINTERSECTION_NONE) { thisthing = var8007fcb4; if (thisthing < 0) { @@ -6166,7 +6166,7 @@ s32 bgFindPortalBetweenPositions(struct coord *pos1, struct coord *pos2) return bestportalnum; } -bool bgIsBboxOverlapping(struct coord *portalbbmin, struct coord *portalbbmax, struct coord *propbbmin, struct coord *propbbmax) +bool bg_is_bbox_overlapping(struct coord *portalbbmin, struct coord *portalbbmax, struct coord *propbbmin, struct coord *propbbmax) { s32 i; @@ -6179,7 +6179,7 @@ bool bgIsBboxOverlapping(struct coord *portalbbmin, struct coord *portalbbmax, s return true; } -void bgCalculatePortalBbox(s32 portalnum, struct coord *bbmin, struct coord *bbmax) +void bg_calculate_portal_bbox(s32 portalnum, struct coord *bbmin, struct coord *bbmax) { struct portalvertices *pvertices; s32 i; @@ -6210,7 +6210,7 @@ void bgCalculatePortalBbox(s32 portalnum, struct coord *bbmin, struct coord *bbm } } -void bgFindEnteredRooms(struct coord *bbmin, struct coord *bbmax, RoomNum *rooms, s32 maxlen, bool arg4) +void bg_find_entered_rooms(struct coord *bbmin, struct coord *bbmax, RoomNum *rooms, s32 maxlen, bool arg4) { RoomNum room; RoomNum otherroom; @@ -6250,9 +6250,9 @@ void bgFindEnteredRooms(struct coord *bbmin, struct coord *bbmax, RoomNum *rooms continue; } - bgCalculatePortalBbox(portalnum, &portalbbmin, &portalbbmax); + bg_calculate_portal_bbox(portalnum, &portalbbmin, &portalbbmax); - if (bgIsBboxOverlapping(&portalbbmin, &portalbbmax, &propbbmin, &propbbmax)) { + if (bg_is_bbox_overlapping(&portalbbmin, &portalbbmax, &propbbmin, &propbbmax)) { if (room == g_BgPortals[portalnum].roomnum1) { otherroom = g_BgPortals[portalnum].roomnum2; } else { diff --git a/src/game/body.c b/src/game/body.c index 5d272d3d7..b9895cf53 100644 --- a/src/game/body.c +++ b/src/game/body.c @@ -137,7 +137,7 @@ s32 g_FemGuardHeads[3] = { HEAD_LAURA, }; -u32 bodyGetRace(s32 bodynum) +u32 body_get_race(s32 bodynum) { switch (bodynum) { case BODY_SKEDAR: @@ -155,10 +155,10 @@ u32 bodyGetRace(s32 bodynum) return RACE_HUMAN; } -bool bodyLoad(s32 bodynum) +bool body_load(s32 bodynum) { if (!g_HeadsAndBodies[bodynum].modeldef) { - g_HeadsAndBodies[bodynum].modeldef = modeldefLoadToNew(g_HeadsAndBodies[bodynum].filenum); + g_HeadsAndBodies[bodynum].modeldef = modeldef_load_to_new(g_HeadsAndBodies[bodynum].filenum); return true; } @@ -172,23 +172,23 @@ struct model *body0f02ce8c(s32 bodynum, s32 headnum, struct modeldef *bodymodeld struct modelnode *node = NULL; u32 stack[2]; - if (cheatIsActive(CHEAT_DKMODE)) { + if (cheat_is_active(CHEAT_DKMODE)) { scale *= 0.8f; } if (bodymodeldef == NULL) { if (g_HeadsAndBodies[bodynum].modeldef == NULL) { - g_HeadsAndBodies[bodynum].modeldef = modeldefLoadToNew(g_HeadsAndBodies[bodynum].filenum); + g_HeadsAndBodies[bodynum].modeldef = modeldef_load_to_new(g_HeadsAndBodies[bodynum].filenum); } bodymodeldef = g_HeadsAndBodies[bodynum].modeldef; } - modelAllocateRwData(bodymodeldef); + model_allocate_rw_data(bodymodeldef); if (!g_HeadsAndBodies[bodynum].unk00_01) { if (bodymodeldef->skel == &g_SkelChr) { - node = modelGetPart(bodymodeldef, MODELPART_CHR_HEADSPOT); + node = model_get_part(bodymodeldef, MODELPART_CHR_HEADSPOT); if (node != NULL) { if (headnum < 0) { @@ -197,20 +197,20 @@ struct model *body0f02ce8c(s32 bodynum, s32 headnum, struct modeldef *bodymodeld } else if (headnum > 0) { if (headmodeldef == NULL) { if (g_Vars.normmplayerisrunning && !IS4MB()) { - headmodeldef = modeldefLoadToNew(g_HeadsAndBodies[headnum].filenum); + headmodeldef = modeldef_load_to_new(g_HeadsAndBodies[headnum].filenum); g_HeadsAndBodies[headnum].modeldef = headmodeldef; g_FileInfo[g_HeadsAndBodies[headnum].filenum].loadedsize = 0; - bodyCalculateHeadOffset(headmodeldef, headnum, bodynum); + body_calculate_head_offset(headmodeldef, headnum, bodynum); } else { if (g_HeadsAndBodies[headnum].modeldef == NULL) { - g_HeadsAndBodies[headnum].modeldef = modeldefLoadToNew(g_HeadsAndBodies[headnum].filenum); + g_HeadsAndBodies[headnum].modeldef = modeldef_load_to_new(g_HeadsAndBodies[headnum].filenum); } headmodeldef = g_HeadsAndBodies[headnum].modeldef; } } - modelAllocateRwData(headmodeldef); + model_allocate_rw_data(headmodeldef); bodymodeldef->rwdatalen += headmodeldef->rwdatalen; @@ -222,15 +222,15 @@ struct model *body0f02ce8c(s32 bodynum, s32 headnum, struct modeldef *bodymodeld } if (!isplayer) { - if (cheatIsActive(CHEAT_SMALLCHARACTERS)) { + if (cheat_is_active(CHEAT_SMALLCHARACTERS)) { scale *= 0.4f; } - if (cheatIsActive(CHEAT_DKMODE)) { + if (cheat_is_active(CHEAT_DKMODE)) { scale *= 1.25f; } } else { - if (cheatIsActive(CHEAT_SMALLJO)) { + if (cheat_is_active(CHEAT_SMALLJO)) { scale *= 0.4f; } } @@ -249,34 +249,34 @@ struct model *body0f02ce8c(s32 bodynum, s32 headnum, struct modeldef *bodymodeld if (model) { if (model->rwdatalen < bodymodeldef->rwdatalen); } else { - model = modelmgrInstantiateModelWithAnim(bodymodeldef); + model = modelmgr_instantiate_model_with_anim(bodymodeldef); } if (model) { - modelSetScale(model, scale); - modelSetAnimScale(model, animscale); + model_set_scale(model, scale); + model_set_anim_scale(model, animscale); if (headmodeldef && !g_HeadsAndBodies[bodynum].unk00_01) { bodymodeldef->rwdatalen -= headmodeldef->rwdatalen; - modelmgrAttachHead(model, node, headmodeldef); + modelmgr_attach_head(model, node, headmodeldef); if ((s16)*(s32 *)&headmodeldef->skel == SKEL_HEAD) { struct modelnode *node2; if (!sunglasses) { - node2 = modelGetPart(headmodeldef, MODELPART_HEAD_SUNGLASSES); + node2 = model_get_part(headmodeldef, MODELPART_HEAD_SUNGLASSES); if (node2) { - union modelrwdata *rwdata = modelGetNodeRwData(model, node2); + union modelrwdata *rwdata = model_get_node_rw_data(model, node2); rwdata->toggle.visible = false; } } - node2 = modelGetPart(headmodeldef, MODELPART_HEAD_HUDPIECE); + node2 = model_get_part(headmodeldef, MODELPART_HEAD_HUDPIECE); if (node2) { - union modelrwdata *rwdata = modelGetNodeRwData(model, node2); + union modelrwdata *rwdata = model_get_node_rw_data(model, node2); rwdata->toggle.visible = false; } } @@ -291,7 +291,7 @@ struct model *body0f02d338(s32 bodynum, s32 headnum, struct modeldef *bodymodeld return body0f02ce8c(bodynum, headnum, bodymodeldef, headmodeldef, sunglasses, NULL, false, varyheight); } -struct model *bodyAllocateModel(s32 bodynum, s32 headnum, u32 spawnflags) +struct model *body_allocate_model(s32 bodynum, s32 headnum, u32 spawnflags) { bool sunglasses = false; u8 varyheight = true; @@ -314,7 +314,7 @@ s32 body0f02d3f8(void) return g_BondBodies[var80062c80]; } -s32 bodyChooseHead(s32 bodynum) +s32 body_choose_head(s32 bodynum) { s32 head; @@ -343,7 +343,7 @@ s32 bodyChooseHead(s32 bodynum) * Chr definitions are stored in a packed format in each stage's setup file. * The packed format is used for space saving reasons. */ -void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex) +void body_allocate_chr(s32 stagenum, struct packedchr *packed, s32 cmdindex) { struct pad pad; RoomNum rooms[2]; @@ -356,12 +356,12 @@ void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex) f32 angle; s32 index; - padUnpack(packed->padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); + pad_unpack(packed->padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); rooms[0] = pad.room; rooms[1] = -1; - if (cdTestVolume(&pad.pos, 20, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, 200, -200) == CDRESULT_COLLISION + if (cd_test_volume(&pad.pos, 20, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, 200, -200) == CDRESULT_COLLISION && packed->chair == -1 && (packed->spawnflags & SPAWNFLAG_IGNORECOLLISION) == 0) { return; @@ -372,9 +372,9 @@ void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex) return; } - if (((packed->spawnflags & SPAWNFLAG_ONLYONA) && lvGetDifficulty() == DIFF_A) - || ((packed->spawnflags & SPAWNFLAG_ONLYONSA) && lvGetDifficulty() == DIFF_SA) - || ((packed->spawnflags & SPAWNFLAG_ONLYONPA) && lvGetDifficulty() == DIFF_PA)) { + if (((packed->spawnflags & SPAWNFLAG_ONLYONA) && lv_get_difficulty() == DIFF_A) + || ((packed->spawnflags & SPAWNFLAG_ONLYONSA) && lv_get_difficulty() == DIFF_SA) + || ((packed->spawnflags & SPAWNFLAG_ONLYONPA) && lv_get_difficulty() == DIFF_PA)) { // ok } else { return; @@ -394,7 +394,7 @@ void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex) if (packed->headnum >= 0) { headnum = packed->headnum; } else if (headnum == -55555) { - headnum = bodyChooseHead(bodynum); + headnum = body_choose_head(bodynum); } } @@ -407,26 +407,26 @@ void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex) model = body0f02ce8c(bodynum, headnum, NULL, headmodeldef, false, NULL, false, false); } else { - model = bodyAllocateModel(bodynum, headnum, packed->spawnflags); + model = body_allocate_model(bodynum, headnum, packed->spawnflags); } if (model != NULL) { angle = atan2f(pad.look.x, pad.look.z); - prop = chrAllocate(model, &pad.pos, rooms, angle, ailistFindById(packed->ailistnum)); + prop = chr_allocate(model, &pad.pos, rooms, angle, ailist_find_by_id(packed->ailistnum)); if (prop != NULL) { - propActivate(prop); - propEnable(prop); + prop_activate(prop); + prop_enable(prop); chr = prop->chr; - chrSetChrnum(chr, packed->chrnum); + chr_set_chrnum(chr, packed->chrnum); chr->hearingscale = packed->hearscale / 1000.0f; chr->visionrange = packed->viewdist; chr->padpreset1 = packed->padpreset; chr->chrpreset1 = packed->chrpreset; chr->headnum = headnum; chr->bodynum = bodynum; - chr->race = bodyGetRace(chr->bodynum); + chr->race = body_get_race(chr->bodynum); chr->rtracked = false; @@ -436,10 +436,10 @@ void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex) chr->height = 185; chr->radius = 30; } else if (bodynum == BODY_CHICROB) { - chr->unk348[0] = mempAlloc(sizeof(struct fireslotthing), MEMPOOL_STAGE); - chr->unk348[1] = mempAlloc(sizeof(struct fireslotthing), MEMPOOL_STAGE); - chr->unk348[0]->beam = mempAlloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE); - chr->unk348[1]->beam = mempAlloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE); + chr->unk348[0] = memp_alloc(sizeof(struct fireslotthing), MEMPOOL_STAGE); + chr->unk348[1] = memp_alloc(sizeof(struct fireslotthing), MEMPOOL_STAGE); + chr->unk348[0]->beam = memp_alloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE); + chr->unk348[1]->beam = memp_alloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE); chr->unk348[0]->beam->age = -1; chr->unk348[1]->beam->age = -1; chr->height = 200; @@ -481,7 +481,7 @@ void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex) chr->flags = packed->flags; chr->flags2 = packed->flags2; - if (cheatIsActive(CHEAT_MARQUIS)) { + if (cheat_is_active(CHEAT_MARQUIS)) { chr->flags2 &= ~CHRFLAG1_NOHANDCOMBAT; chr->flags2 |= CHRFLAG1_HANDCOMBATONLY; } @@ -531,7 +531,7 @@ void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex) } } -struct prop *bodyAllocateEyespy(struct pad *pad, RoomNum room) +struct prop *body_allocate_eyespy(struct pad *pad, RoomNum room) { RoomNum rooms[2]; struct prop *prop; @@ -548,8 +548,8 @@ struct prop *bodyAllocateEyespy(struct pad *pad, RoomNum room) { u32 stack[2]; u32 checksum = 0; - s32 *ptr = (s32 *)&lvReset; - s32 *end = (s32 *)&lvConfigureFade; + s32 *ptr = (s32 *)&lv_reset; + s32 *end = (s32 *)&lv_configure_fade; while (ptr < end) { checksum <<= 1; @@ -558,8 +558,8 @@ struct prop *bodyAllocateEyespy(struct pad *pad, RoomNum room) } if (checksum != CHECKSUM_PLACEHOLDER) { - s32 *ptr2 = (s32 *)_memaFree; - s32 *end2 = (s32 *)memaInit; + s32 *ptr2 = (s32 *)_mema_free; + s32 *end2 = (s32 *)mema_init; while (ptr2 < end2) { ptr2[0] = 0; @@ -569,25 +569,25 @@ struct prop *bodyAllocateEyespy(struct pad *pad, RoomNum room) } #endif - model = bodyAllocateModel(BODY_EYESPY, 0, 0); + model = body_allocate_model(BODY_EYESPY, 0, 0); if (model) { - prop = chrAllocate(model, &pad->pos, rooms, 0, ailistFindById(GAILIST_IDLE)); + prop = chr_allocate(model, &pad->pos, rooms, 0, ailist_find_by_id(GAILIST_IDLE)); if (prop) { - propActivate(prop); - propEnable(prop); + prop_activate(prop); + prop_enable(prop); chr = prop->chr; - chrSetChrnum(chr, chrsGetNextUnusedChrnum()); + chr_set_chrnum(chr, chrs_get_next_unused_chrnum()); chr->bodynum = BODY_EYESPY; chr->padpreset1 = 0; chr->chrpreset1 = 0; chr->headnum = 0; chr->hearingscale = 0; chr->visionrange = 0; - chr->race = bodyGetRace(chr->bodynum); + chr->race = body_get_race(chr->bodynum); - ground = cdFindGroundInfoAtCyl(&pad->pos, 30, rooms, NULL, NULL, NULL, NULL, &inlift, &lift); + ground = cd_find_ground_info_at_cyl(&pad->pos, 30, rooms, NULL, NULL, NULL, NULL, &inlift, &lift); chr->ground = ground; chr->manground = ground; @@ -633,7 +633,7 @@ void body0f02ddbf(void) * any tweaking. This function is used in multiplayer where players can put any * heads on any bodies. */ -void bodyCalculateHeadOffset(struct modeldef *headmodeldef, s32 headnum, s32 bodynum) +void body_calculate_head_offset(struct modeldef *headmodeldef, s32 headnum, s32 bodynum) { struct modelnode *node; struct modelnode *prev; @@ -769,7 +769,7 @@ void bodyCalculateHeadOffset(struct modeldef *headmodeldef, s32 headnum, s32 bod do { prev = node; - modelIterateDisplayLists(headmodeldef, &node, &gdl); + model_iterate_display_lists(headmodeldef, &node, &gdl); if (node && node != prev && node->type == MODELNODETYPE_DL) { struct modelrodata_dl *rodata = &node->rodata->dl; @@ -780,7 +780,7 @@ void bodyCalculateHeadOffset(struct modeldef *headmodeldef, s32 headnum, s32 bod } } while (node); - bbox = modeldefFindBboxRodata(headmodeldef); + bbox = modeldef_find_bbox_rodata(headmodeldef); if (bbox != NULL) { bbox->ymin += offset; diff --git a/src/game/bodyinit.c b/src/game/bodyinit.c index ee74fdf8d..a3a005ed9 100644 --- a/src/game/bodyinit.c +++ b/src/game/bodyinit.c @@ -7,7 +7,7 @@ #include "data.h" #include "types.h" -void bodiesInit(void) +void bodies_init(void) { g_NumBondBodies = 0; diff --git a/src/game/bodyreset.c b/src/game/bodyreset.c index 18b0a9973..0e877bfc6 100644 --- a/src/game/bodyreset.c +++ b/src/game/bodyreset.c @@ -12,7 +12,7 @@ #include "data.h" #include "types.h" -void bodiesReset(s32 stagenum) +void bodies_reset(s32 stagenum) { s32 *headsavailablelist; s32 headsavailablelen; @@ -51,7 +51,7 @@ void bodiesReset(s32 stagenum) } // Male heads - if (cheatIsActive(CHEAT_TEAMHEADSONLY)) { + if (cheat_is_active(CHEAT_TEAMHEADSONLY)) { if (whichteamlist) { headsavailablelist = g_MaleGuardTeamHeads; headsavailablelen = g_NumMaleGuardTeamHeads; @@ -81,7 +81,7 @@ void bodiesReset(s32 stagenum) } // Female heads - if (cheatIsActive(CHEAT_TEAMHEADSONLY)) { + if (cheat_is_active(CHEAT_TEAMHEADSONLY)) { if (whichteamlist) { headsavailablelist = g_FemaleGuardTeamHeads; headsavailablelen = g_NumFemaleGuardTeamHeads; diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 3fafa1acf..2568ad234 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -25,7 +25,7 @@ #include "data.h" #include "types.h" -void bbikeInit(void) +void bbike_init(void) { struct hoverbikeobj *hoverbike = (struct hoverbikeobj *)g_Vars.currentplayer->hoverbike->obj; Mtxf matrix; @@ -36,7 +36,7 @@ void bbikeInit(void) g_Vars.currentplayer->gunextraaimx = 0; g_Vars.currentplayer->gunextraaimy = 0; - bbikeUpdateVehicleOffset(); + bbike_update_vehicle_offset(); g_Vars.currentplayer->bondentert = 0; g_Vars.currentplayer->bondentert2 = 1; @@ -44,9 +44,9 @@ void bbikeInit(void) g_Vars.currentplayer->bondenterpos.y = g_Vars.currentplayer->prop->pos.y; g_Vars.currentplayer->bondenterpos.z = g_Vars.currentplayer->prop->pos.z; - mtx3ToMtx4(hoverbike->base.realrot, &matrix); - mtx4SetTranslation(&hoverbike->base.prop->pos, &matrix); - mtx4TransformVec(&matrix, &g_Vars.currentplayer->bondvehicleoffset, &g_Vars.currentplayer->bondenteraim); + mtx3_to_mtx4(hoverbike->base.realrot, &matrix); + mtx4_set_translation(&hoverbike->base.prop->pos, &matrix); + mtx4_transform_vec(&matrix, &g_Vars.currentplayer->bondvehicleoffset, &g_Vars.currentplayer->bondenteraim); mtx00016b58(&g_Vars.currentplayer->bondentermtx, 0, 0, 0, -g_Vars.currentplayer->bond2.unk1c.x, -g_Vars.currentplayer->bond2.unk1c.y, -g_Vars.currentplayer->bond2.unk1c.z, @@ -64,12 +64,12 @@ void bbikeInit(void) hoverbike->w = projectile->unk0dc; } - objFreeEmbedmentOrProjectile(g_Vars.currentplayer->hoverbike); + obj_free_embedment_or_projectile(g_Vars.currentplayer->hoverbike); hoverbike->base.hidden |= OBJHFLAG_MOUNTED; } -void bbikeExit(void) +void bbike_exit(void) { struct defaultobj *obj = g_Vars.currentplayer->hoverbike->obj; struct hoverbikeobj *bikeobj = (struct hoverbikeobj *)g_Vars.currentplayer->hoverbike->obj; @@ -83,16 +83,16 @@ void bbikeExit(void) speed.z = bikeobj->speed[1]; rotation = bikeobj->w; - objApplyMomentum(obj, &speed, rotation, false, false); - psStopSound(g_Vars.currentplayer->hoverbike, PSTYPE_GENERAL, 0xffff); - psStopSound(g_Vars.currentplayer->prop, PSTYPE_GENERAL, 0xffff); - psCreate(NULL, g_Vars.currentplayer->hoverbike, SFX_BIKE_PULSE, -1, + obj_apply_momentum(obj, &speed, rotation, false, false); + ps_stop_sound(g_Vars.currentplayer->hoverbike, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(g_Vars.currentplayer->prop, PSTYPE_GENERAL, 0xffff); + ps_create(NULL, g_Vars.currentplayer->hoverbike, SFX_BIKE_PULSE, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); obj->flags |= OBJFLAG_HOVERBIKE_MOVINGWHILEEMPTY; } -void bbikeUpdateVehicleOffset(void) +void bbike_update_vehicle_offset(void) { struct defaultobj *hoverbike = g_Vars.currentplayer->hoverbike->obj; @@ -101,7 +101,7 @@ void bbikeUpdateVehicleOffset(void) g_Vars.currentplayer->bondvehicleoffset.z = -50.0f / hoverbike->model->scale; } -void bbikeTryDismountAngle(f32 relativeangle, f32 distance) +void bbike_try_dismount_angle(f32 relativeangle, f32 distance) { u32 stack; struct hoverbikeobj *bike; @@ -115,9 +115,9 @@ void bbikeTryDismountAngle(f32 relativeangle, f32 distance) if (g_Vars.currentplayer->walkinitmove == 0) { bike = (struct hoverbikeobj *)g_Vars.currentplayer->hoverbike->obj; - angle = hoverpropGetTurnAngle(&bike->base); + angle = hoverprop_get_turn_angle(&bike->base); - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); distance += radius + 10; @@ -131,21 +131,21 @@ void bbikeTryDismountAngle(f32 relativeangle, f32 distance) pos.y = g_Vars.currentplayer->hoverbike->pos.y; pos.z = g_Vars.currentplayer->hoverbike->pos.z + cosf(angle) * distance; - propSetPerimEnabled(g_Vars.currentplayer->hoverbike, false); - propSetPerimEnabled(g_Vars.currentplayer->prop, false); + prop_set_perim_enabled(g_Vars.currentplayer->hoverbike, false); + prop_set_perim_enabled(g_Vars.currentplayer->prop, false); func0f065e74(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &pos, rooms); - bmoveFindEnteredRoomsByPos(g_Vars.currentplayer, &pos, rooms); + bmove_find_entered_rooms_by_pos(g_Vars.currentplayer, &pos, rooms); - result = cdTestCylMove02(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, + result = cd_test_cyl_move02(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &pos, rooms, CDTYPE_ALL, true, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); - propSetPerimEnabled(g_Vars.currentplayer->hoverbike, true); + prop_set_perim_enabled(g_Vars.currentplayer->hoverbike, true); if (result == CDRESULT_NOCOLLISION) { - result = cdTestVolume(&pos, radius, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, + result = cd_test_volume(&pos, radius, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); } @@ -162,16 +162,16 @@ void bbikeTryDismountAngle(f32 relativeangle, f32 distance) g_Vars.currentplayer->moveinitspeed.z = bike->speed[1]; } - propSetPerimEnabled(g_Vars.currentplayer->prop, true); + prop_set_perim_enabled(g_Vars.currentplayer->prop, true); } } -void bbikeHandleActivate(void) +void bbike_handle_activate(void) { if (g_Vars.currentplayer->bondvehiclemode == VEHICLEMODE_RUNNING && g_Vars.lvframe60 - g_Vars.currentplayer->activatetimelast < TICKS(25)) { struct hoverbikeobj *bike = (struct hoverbikeobj *)g_Vars.currentplayer->hoverbike->obj; - struct modelrodata_bbox *bbox = objFindBboxRodata(&bike->base); + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(&bike->base); f32 sidedist = bbox->xmax * bike->base.model->scale; f32 frontdist = bbox->zmax * bike->base.model->scale; @@ -179,37 +179,37 @@ void bbikeHandleActivate(void) g_Vars.currentplayer->walkinitmove = false; - bbikeTryDismountAngle(RAD(90, 1.5705462694168f), sidedist); // left - bbikeTryDismountAngle(RAD(270, 4.7116389274597f), sidedist); // right - bbikeTryDismountAngle(RAD(45, 0.7852731347084f), diagdist); // front left - bbikeTryDismountAngle(RAD(315, 5.4969120025635f), diagdist); // front right - bbikeTryDismountAngle(RAD(135, 2.3558194637299f), diagdist); // back left - bbikeTryDismountAngle(RAD(225, 3.9263656139374f), diagdist); // back right - bbikeTryDismountAngle(RAD(0, 0), frontdist); // front - bbikeTryDismountAngle(RAD(180, 3.1410925388336f), frontdist); // back + bbike_try_dismount_angle(RAD(90, 1.5705462694168f), sidedist); // left + bbike_try_dismount_angle(RAD(270, 4.7116389274597f), sidedist); // right + bbike_try_dismount_angle(RAD(45, 0.7852731347084f), diagdist); // front left + bbike_try_dismount_angle(RAD(315, 5.4969120025635f), diagdist); // front right + bbike_try_dismount_angle(RAD(135, 2.3558194637299f), diagdist); // back left + bbike_try_dismount_angle(RAD(225, 3.9263656139374f), diagdist); // back right + bbike_try_dismount_angle(RAD(0, 0), frontdist); // front + bbike_try_dismount_angle(RAD(180, 3.1410925388336f), frontdist); // back if (g_Vars.currentplayer->walkinitmove) { - bmoveSetMode(MOVEMODE_WALK); + bmove_set_mode(MOVEMODE_WALK); } g_Vars.currentplayer->bondactivateorreload = 0; } } -void bbikeApplyMoveData(struct movedata *data) +void bbike_apply_move_data(struct movedata *data) { struct hoverbikeobj *bike = (struct hoverbikeobj *)g_Vars.currentplayer->hoverbike->obj; - s8 contnum = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); + s8 contnum = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); f32 value1; f32 tmp; - if ((optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_12 - || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_14 - || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_13 - || optionsGetControlMode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_11) - && !lvIsPaused()) { - data->digitalstepleft = joyCountButtonsOnSpecificSamples(0, contnum, L_JPAD | L_CBUTTONS); - data->digitalstepright = joyCountButtonsOnSpecificSamples(0, contnum, R_JPAD | R_CBUTTONS); + if ((options_get_control_mode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_12 + || options_get_control_mode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_14 + || options_get_control_mode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_13 + || options_get_control_mode(g_Vars.currentplayerstats->mpindex) == CONTROLMODE_11) + && !lv_is_paused()) { + data->digitalstepleft = joy_count_buttons_on_specific_samples(0, contnum, L_JPAD | L_CBUTTONS); + data->digitalstepright = joy_count_buttons_on_specific_samples(0, contnum, R_JPAD | R_CBUTTONS); } // Forward/back @@ -299,7 +299,7 @@ void bbikeApplyMoveData(struct movedata *data) cam0f0b4d04(&sp30, sp28); - g_Vars.currentplayer->gunextraaimy = -((sp28[1] - camGetScreenTop()) * 2.0f / camGetScreenHeight() - 1.0f) * 0.75f; + g_Vars.currentplayer->gunextraaimy = -((sp28[1] - cam_get_screen_top()) * 2.0f / cam_get_screen_height() - 1.0f) * 0.75f; } } @@ -313,7 +313,7 @@ void bbike0f0d2b40(struct defaultobj *bike, struct coord *arg1, f32 arg2, struct struct coord sp60; struct coord sp54; - cdGetEdge(&sp78, &sp6c, 333, "bondbike.c"); + cd_get_edge(&sp78, &sp6c, 333, "bondbike.c"); sp60.x = bike->prop->pos.x; sp60.y = bike->prop->pos.y; @@ -363,11 +363,11 @@ void bbike0f0d2b40(struct defaultobj *bike, struct coord *arg1, f32 arg2, struct rotation += arg2 * 0.1f; - objApplyMomentum(obstacle, &speed, rotation, true, true); + obj_apply_momentum(obstacle, &speed, rotation, true, true); } } -s32 bbikeCalculateNewPosition(struct coord *vel, f32 angledelta) +s32 bbike_calculate_new_position(struct coord *vel, f32 angledelta) { s32 result = CDRESULT_NOCOLLISION; struct coord dstpos; @@ -388,13 +388,13 @@ s32 bbikeCalculateNewPosition(struct coord *vel, f32 angledelta) dstpos.z = g_Vars.currentplayer->hoverbike->pos.z; if (vel->x || vel->y || vel->z) { - propSetPerimEnabled(g_Vars.currentplayer->prop, false); - propSetPerimEnabled(g_Vars.currentplayer->hoverbike, false); + prop_set_perim_enabled(g_Vars.currentplayer->prop, false); + prop_set_perim_enabled(g_Vars.currentplayer->hoverbike, false); dstpos.x += vel->x; dstpos.z += vel->z; - objGetBbox(g_Vars.currentplayer->hoverbike, &radius, &ymax, &ymin); + obj_get_bbox(g_Vars.currentplayer->hoverbike, &radius, &ymax, &ymin); func0f065dfc(&g_Vars.currentplayer->hoverbike->pos, g_Vars.currentplayer->hoverbike->rooms, &dstpos, dstrooms, spa8, 20); @@ -405,7 +405,7 @@ s32 bbikeCalculateNewPosition(struct coord *vel, f32 angledelta) hov = bike->hov; - hovUpdateGround(&bike->base, &hov, &dstpos, dstrooms, bike->base.realrot); + hov_update_ground(&bike->base, &hov, &dstpos, dstrooms, bike->base.realrot); dstpos.y += hov.ground - bike->hov.ground; @@ -414,32 +414,32 @@ s32 bbikeCalculateNewPosition(struct coord *vel, f32 angledelta) zdiff = dstpos.z - g_Vars.currentplayer->hoverbike->pos.z; if (xdiff > halfradius || zdiff > halfradius || xdiff < -halfradius || zdiff < -halfradius) { - result = cdExamCylMove06(&g_Vars.currentplayer->hoverbike->pos, + result = cd_exam_cyl_move06(&g_Vars.currentplayer->hoverbike->pos, g_Vars.currentplayer->hoverbike->rooms, &dstpos, dstrooms, radius, CDTYPE_ALL, 1, ymax - g_Vars.currentplayer->hoverbike->pos.y, ymin - g_Vars.currentplayer->hoverbike->pos.y); if (result == CDRESULT_NOCOLLISION) { - result = cdExamCylMove02(&g_Vars.currentplayer->hoverbike->pos, + result = cd_exam_cyl_move02(&g_Vars.currentplayer->hoverbike->pos, &dstpos, radius, dstrooms, CDTYPE_ALL, true, ymax - g_Vars.currentplayer->hoverbike->pos.y, ymin - g_Vars.currentplayer->hoverbike->pos.y); } } else { - result = cdExamCylMove02(&g_Vars.currentplayer->hoverbike->pos, + result = cd_exam_cyl_move02(&g_Vars.currentplayer->hoverbike->pos, &dstpos, radius, spa8, CDTYPE_ALL, true, ymax - g_Vars.currentplayer->hoverbike->pos.y, ymin - g_Vars.currentplayer->hoverbike->pos.y); } - propSetPerimEnabled(g_Vars.currentplayer->prop, true); - propSetPerimEnabled(g_Vars.currentplayer->hoverbike, true); + prop_set_perim_enabled(g_Vars.currentplayer->prop, true); + prop_set_perim_enabled(g_Vars.currentplayer->hoverbike, true); } if (angledelta) { u32 stack[2]; - f32 newangle = hoverpropGetTurnAngle(&bike->base) - angledelta; + f32 newangle = hoverprop_get_turn_angle(&bike->base) - angledelta; Mtxf sp44; if (newangle >= M_BADTAU) { @@ -448,19 +448,19 @@ s32 bbikeCalculateNewPosition(struct coord *vel, f32 angledelta) newangle += M_BADTAU; } - hoverpropSetTurnAngle(&bike->base, newangle); + hoverprop_set_turn_angle(&bike->base, newangle); - mtx4LoadYRotation(newangle, &sp44); + mtx4_load_y_rotation(newangle, &sp44); mtx00015f04(bike->base.model->scale, &sp44); - mtx4ToMtx3(&sp44, bike->base.realrot); + mtx4_to_mtx3(&sp44, bike->base.realrot); } if (result == CDRESULT_NOCOLLISION && hasvel) { g_Vars.currentplayer->hoverbike->pos.x = dstpos.x; g_Vars.currentplayer->hoverbike->pos.z = dstpos.z; - propDeregisterRooms(g_Vars.currentplayer->hoverbike); - roomsCopy(dstrooms, g_Vars.currentplayer->hoverbike->rooms); + prop_deregister_rooms(g_Vars.currentplayer->hoverbike); + rooms_copy(dstrooms, g_Vars.currentplayer->hoverbike->rooms); bike->hov = hov; } @@ -468,12 +468,12 @@ s32 bbikeCalculateNewPosition(struct coord *vel, f32 angledelta) return result; } -s32 bbikeCalculateNewPositionWithPush(struct coord *arg0, f32 arg1) +s32 bbike_calculate_new_position_with_push(struct coord *arg0, f32 arg1) { - s32 result = bbikeCalculateNewPosition(arg0, arg1); + s32 result = bbike_calculate_new_position(arg0, arg1); if (result != CDRESULT_NOCOLLISION) { - struct prop *obstacle = cdGetObstacleProp(); + struct prop *obstacle = cd_get_obstacle_prop(); if (obstacle && g_Vars.lvupdate240 > 0) { if (obstacle->type == PROPTYPE_CHR) { @@ -501,7 +501,7 @@ s32 bbikeCalculateNewPositionWithPush(struct coord *arg0, f32 arg1) && (obj->projectile->flags & PROJECTILEFLAG_SLIDING)) { s32 somevalue; bool embedded = false; - somevalue = projectileTick(obj, &embedded); + somevalue = projectile_tick(obj, &embedded); if (obj->hidden & OBJHFLAG_PROJECTILE) { obj->projectile->flags |= PROJECTILEFLAG_00001000; @@ -514,7 +514,7 @@ s32 bbikeCalculateNewPositionWithPush(struct coord *arg0, f32 arg1) } if (somevalue) { - result = bbikeCalculateNewPosition(arg0, arg1); + result = bbike_calculate_new_position(arg0, arg1); } } } @@ -526,7 +526,7 @@ s32 bbikeCalculateNewPositionWithPush(struct coord *arg0, f32 arg1) return result; } -void bbikeUpdateVertical(struct coord *pos) +void bbike_update_vertical(struct coord *pos) { struct defaultobj *bike = g_Vars.currentplayer->hoverbike->obj; f32 angle; @@ -535,7 +535,7 @@ void bbikeUpdateVertical(struct coord *pos) struct prop *lift = NULL; f32 ground; - angle = hoverpropGetTurnAngle(bike); + angle = hoverprop_get_turn_angle(bike); func0f065e74(&bike->prop->pos, bike->prop->rooms, pos, newrooms); @@ -553,9 +553,9 @@ void bbikeUpdateVertical(struct coord *pos) } #endif - bmoveFindEnteredRoomsByPos(g_Vars.currentplayer, pos, newrooms); - propDeregisterRooms(g_Vars.currentplayer->prop); - roomsCopy(newrooms, g_Vars.currentplayer->prop->rooms); + bmove_find_entered_rooms_by_pos(g_Vars.currentplayer, pos, newrooms); + prop_deregister_rooms(g_Vars.currentplayer->prop); + rooms_copy(newrooms, g_Vars.currentplayer->prop->rooms); g_Vars.currentplayer->vv_theta = (M_BADTAU - angle) * 360.0f / M_BADTAU; @@ -563,7 +563,7 @@ void bbikeUpdateVertical(struct coord *pos) g_Vars.currentplayer->prop->pos.y = pos->y; g_Vars.currentplayer->prop->pos.z = pos->z; - ground = cdFindGroundInfoAtCyl(&g_Vars.currentplayer->prop->pos, + ground = cd_find_ground_info_at_cyl(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->bond2.radius, g_Vars.currentplayer->prop->rooms, &g_Vars.currentplayer->floorcol, @@ -599,28 +599,28 @@ void bbikeUpdateVertical(struct coord *pos) g_Vars.currentplayer->vv_manground = g_Vars.currentplayer->prop->pos.y - g_Vars.currentplayer->vv_height; if (g_Vars.currentplayer->floorflags & GEOFLAG_DIE) { - playerDie(true); + player_die(true); } - bmoveUpdateVerta(); + bmove_update_verta(); } s32 bbike0f0d363c(f32 arg0) { struct coord coord = {0, 0, 0}; - return bbikeCalculateNewPositionWithPush(&coord, arg0); + return bbike_calculate_new_position_with_push(&coord, arg0); } s32 bbike0f0d3680(struct coord *arg0, struct coord *arg1, struct coord *arg2) { - s32 result = bbikeCalculateNewPositionWithPush(arg0, 0); + s32 result = bbike_calculate_new_position_with_push(arg0, 0); if (!result) { #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(arg1, arg2, 659, "bondbike.c"); + cd_get_edge(arg1, arg2, 659, "bondbike.c"); #else - cdGetEdge(arg1, arg2, 656, "bondbike.c"); + cd_get_edge(arg1, arg2, 656, "bondbike.c"); #endif } @@ -629,16 +629,16 @@ 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) { - if (cd00024ea4()) { + if (cd_00024ea4()) { struct coord sp24; - f32 somefloat = cd00024e98(); + f32 somefloat = cd_00024e98(); s32 someint; sp24.x = arg0->x * somefloat * 0.25f; sp24.y = arg0->y * somefloat * 0.25f; sp24.z = arg0->z * somefloat * 0.25f; - someint = bbikeCalculateNewPositionWithPush(&sp24, 0); + someint = bbike_calculate_new_position_with_push(&sp24, 0); if (someint == 1) { return 1; @@ -646,9 +646,9 @@ s32 bbike0f0d36d4(struct coord *arg0, struct coord *arg1, struct coord *arg2, st if (someint == 0) { #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(arg3, arg4, 685, "bondbike.c"); + cd_get_edge(arg3, arg4, 685, "bondbike.c"); #else - cdGetEdge(arg3, arg4, 682, "bondbike.c"); + cd_get_edge(arg3, arg4, 682, "bondbike.c"); #endif if (arg3->f[0] != arg1->f[0] @@ -688,7 +688,7 @@ s32 bbike0f0d3840(struct coord *arg0, struct coord *arg1, struct coord *arg2) sp24.y = 0; sp24.z = sp30.z * tmp; - result = bbikeCalculateNewPositionWithPush(&sp24, 0); + result = bbike_calculate_new_position_with_push(&sp24, 0); } else { result = -1; } @@ -705,7 +705,7 @@ s32 bbike0f0d3940(struct coord *arg0, struct coord *arg1, struct coord *arg2) f32 tmp; f32 radius; - objGetBbox(g_Vars.currentplayer->hoverbike, &radius, &ymax, &ymin); + obj_get_bbox(g_Vars.currentplayer->hoverbike, &radius, &ymax, &ymin); sp34.x = arg1->x - (g_Vars.currentplayer->hoverbike->pos.x + arg0->f[0]); sp34.z = arg1->z - (g_Vars.currentplayer->hoverbike->pos.z + arg0->f[2]); @@ -730,7 +730,7 @@ s32 bbike0f0d3940(struct coord *arg0, struct coord *arg1, struct coord *arg2) sp28.y = 0; sp28.z = sp34.z; - if (bbikeCalculateNewPositionWithPush(&sp28, 0) == CDRESULT_NOCOLLISION) { + if (bbike_calculate_new_position_with_push(&sp28, 0) == CDRESULT_NOCOLLISION) { return true; } } @@ -758,7 +758,7 @@ s32 bbike0f0d3940(struct coord *arg0, struct coord *arg1, struct coord *arg2) sp28.y = 0; sp28.z = sp34.z; - if (bbikeCalculateNewPositionWithPush(&sp28, 0) == CDRESULT_NOCOLLISION) { + if (bbike_calculate_new_position_with_push(&sp28, 0) == CDRESULT_NOCOLLISION) { return true; } } @@ -799,7 +799,7 @@ void bbike0f0d3c60(struct coord *arg0) } } -void bbikeTick(void) +void bbike_tick(void) { struct defaultobj *obj = g_Vars.currentplayer->hoverbike->obj; struct hoverbikeobj *bike = (struct hoverbikeobj *) g_Vars.currentplayer->hoverbike->obj; @@ -843,7 +843,7 @@ void bbikeTick(void) } if (g_Vars.currentplayer->bondvehiclemode == VEHICLEMODE_OFF) { - hoverbikeUpdateMovement(bike, + hoverbike_update_movement(bike, g_Vars.currentplayer->speedforwards, g_Vars.currentplayer->speedsideways, g_Vars.currentplayer->speedtheta); @@ -852,7 +852,7 @@ void bbikeTick(void) g_Vars.currentplayer->bondvehiclemode = VEHICLEMODE_RUNNING; } - hoverbikeUpdateMovement(bike, + hoverbike_update_movement(bike, g_Vars.currentplayer->speedforwards, g_Vars.currentplayer->speedsideways, g_Vars.currentplayer->speedtheta); @@ -878,9 +878,9 @@ void bbikeTick(void) sp200 *= 300.0f; - psSetPitch(g_Vars.currentplayer->hoverbike, var80070f04, -1); - psSetVolume(g_Vars.currentplayer->hoverbike, var80070f04 * 300.0f); - psSetVolume(g_Vars.currentplayer->prop, sp200); + ps_set_pitch(g_Vars.currentplayer->hoverbike, var80070f04, -1); + ps_set_volume(g_Vars.currentplayer->hoverbike, var80070f04 * 300.0f); + ps_set_volume(g_Vars.currentplayer->prop, sp200); } if (1); @@ -915,20 +915,20 @@ void bbikeTick(void) bike->speed[0] = sp1f8; bike->speed[1] = sp1f4; - hovTick(obj, &bike->hov); + hov_tick(obj, &bike->hov); func0f069c70(obj, true, true); - mtx3ToMtx4(obj->realrot, &sp1a8); - mtx4SetTranslation(&obj->prop->pos, &sp1a8); - mtx4TransformVec(&sp1a8, &g_Vars.currentplayer->bondvehicleoffset, &sp1e8); + mtx3_to_mtx4(obj->realrot, &sp1a8); + mtx4_set_translation(&obj->prop->pos, &sp1a8); + mtx4_transform_vec(&sp1a8, &g_Vars.currentplayer->bondvehicleoffset, &sp1e8); - bbikeUpdateVertical(&sp1e8); + bbike_update_vertical(&sp1e8); prop = g_Vars.currentplayer->prop; #if VERSION >= VERSION_NTSC_1_0 for (j = 0; prop->rooms[j] != -1; j++) { if (prop->rooms[j] == g_Vars.currentplayer->floorroom) { - propDeregisterRooms(prop); + prop_deregister_rooms(prop); g_Vars.currentplayer->prop->rooms[0] = g_Vars.currentplayer->floorroom; g_Vars.currentplayer->prop->rooms[1] = -1; break; @@ -937,24 +937,24 @@ void bbikeTick(void) #endif } - bheadAdjustAnimation(0); - bheadUpdate(0, 0); - mtx4LoadXRotation((360.0f - g_Vars.currentplayer->vv_verta360) * 0.017450513318181f, &sp164); + bhead_adjust_animation(0); + bhead_update(0, 0); + mtx4_load_x_rotation((360.0f - g_Vars.currentplayer->vv_verta360) * 0.017450513318181f, &sp164); mtx00016d58(&sp124, 0.0f, 0.0f, 0.0f, -g_Vars.currentplayer->headlook.x, -g_Vars.currentplayer->headlook.y, -g_Vars.currentplayer->headlook.z, g_Vars.currentplayer->headup.x, g_Vars.currentplayer->headup.y, g_Vars.currentplayer->headup.z); - mtx4MultMtx4InPlace(&sp124, &sp164); - mtx3ToMtx4(obj->realrot, &sp124); + mtx4_mult_mtx4_in_place(&sp124, &sp164); + mtx3_to_mtx4(obj->realrot, &sp124); mtx00015f04(1.0f / obj->model->scale, &sp124); - mtx4LoadYRotation(hoverpropGetTurnAngle(obj), &spe4); + mtx4_load_y_rotation(hoverprop_get_turn_angle(obj), &spe4); quaternion0f097044(&spe4, spd4); quaternion0f097044(&sp124, spc4); quaternion0f0976c0(spc4, spd4); - quaternionSlerp(spd4, spc4, 0.8f, spb4); - quaternionToMtx(spb4, &sp124); - mtx4MultMtx4InPlace(&sp124, &sp164); + quaternion_slerp(spd4, spc4, 0.8f, spb4); + quaternion_to_mtx(spb4, &sp124); + mtx4_mult_mtx4_in_place(&sp124, &sp164); if (g_Vars.currentplayer->bondvehiclemode == VEHICLEMODE_OFF) { g_Vars.currentplayer->bondentert += g_Vars.lvupdate60freal / 60.0f; @@ -968,23 +968,23 @@ void bbikeTick(void) if (g_Vars.currentplayer->bondentert >= 1.0f) { g_Vars.currentplayer->bondvehiclemode = VEHICLEMODE_ENGINESTART; - psStopSound(g_Vars.currentplayer->hoverbike, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(g_Vars.currentplayer->hoverbike, PSTYPE_GENERAL, 0xffff); - psCreate(NULL, g_Vars.currentplayer->prop, SFX_BIKE_TAKEOFF, -1, + ps_create(NULL, g_Vars.currentplayer->prop, SFX_BIKE_TAKEOFF, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); - psCreate(NULL, g_Vars.currentplayer->prop, SFX_BIKE_PULSE, -1, + ps_create(NULL, g_Vars.currentplayer->prop, SFX_BIKE_PULSE, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); - psCreate(NULL, g_Vars.currentplayer->hoverbike, SFX_BIKE_ENGINE, -1, + ps_create(NULL, g_Vars.currentplayer->hoverbike, SFX_BIKE_ENGINE, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); } quaternion0f097044(&g_Vars.currentplayer->bondentermtx, spa4); quaternion0f097044(&sp164, sp94); quaternion0f0976c0(sp94, spa4); - quaternionSlerp(spa4, sp94, 1.0f - g_Vars.currentplayer->bondentert2, sp84); - quaternionToMtx(sp84, &sp164); + quaternion_slerp(spa4, sp94, 1.0f - g_Vars.currentplayer->bondentert2, sp84); + quaternion_to_mtx(sp84, &sp164); } g_Vars.currentplayer->bond2.unk1c.x = sp164.m[2][0]; @@ -1005,7 +1005,7 @@ void bbikeTick(void) } sp70 = g_Vars.currentplayer->speedverta / 0.7f; - breathing = bheadGetBreathingValue(); + breathing = bhead_get_breathing_value(); if (sp70 > 1.0f) { sp70 = 1.0f; @@ -1014,9 +1014,9 @@ void bbikeTick(void) } bgun0f09d8dc(breathing, 0, sp70, 0.0f, g_Vars.currentplayer->speedsideways); - bgunSetAdjustPos(g_Vars.currentplayer->vv_verta360 * 0.017450513318181f); - playerUpdatePerimInfo(); - bmoveUpdateRooms(g_Vars.currentplayer); - objectiveCheckRoomEntered(g_Vars.currentplayer->prop->rooms[0]); - doorsCheckAutomatic(); + bgun_set_adjust_pos(g_Vars.currentplayer->vv_verta360 * 0.017450513318181f); + player_update_perim_info(); + bmove_update_rooms(g_Vars.currentplayer); + objective_check_room_entered(g_Vars.currentplayer->prop->rooms[0]); + doors_check_automatic(); } diff --git a/src/game/bondcutscene.c b/src/game/bondcutscene.c index e07aefb9a..acf1f3959 100644 --- a/src/game/bondcutscene.c +++ b/src/game/bondcutscene.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void bcutsceneInit(void) +void bcutscene_init(void) { s32 i; s32 j; @@ -29,7 +29,7 @@ void bcutsceneInit(void) } } -void bcutsceneTick(void) +void bcutscene_tick(void) { // empty } diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 9dd2b7f43..f61097383 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -39,7 +39,7 @@ u32 g_EyespyMaxFallSpeed = 3000; * position 50 units above the current position, or less if the eyespy is near * the top of its height range. */ -f32 eyespyFindGround(RoomNum *floorroom) +f32 eyespy_find_ground(RoomNum *floorroom) { struct prop *prop = g_Vars.currentplayer->eyespy->prop; s32 inlift; @@ -60,7 +60,7 @@ f32 eyespyFindGround(RoomNum *floorroom) pos.y = prop->pos.y + yoffset; pos.z = prop->pos.z; - ground = cdFindGroundInfoAtCyl(&pos, 26, prop->rooms, NULL, NULL, NULL, floorroom, &inlift, &lift); + ground = cd_find_ground_info_at_cyl(&pos, 26, prop->rooms, NULL, NULL, NULL, floorroom, &inlift, &lift); if (ground < -30000) { ground = -30000; @@ -69,7 +69,7 @@ f32 eyespyFindGround(RoomNum *floorroom) return ground; } -s32 eyespyTryMoveUpwards(f32 yvel) +s32 eyespy_try_move_upwards(f32 yvel) { s32 result; struct prop *prop = g_Vars.currentplayer->eyespy->prop; @@ -96,23 +96,23 @@ s32 eyespyTryMoveUpwards(f32 yvel) func0f065e74(&prop->pos, prop->rooms, &dstpos, dstrooms); chr0f021fa8(prop->chr, &dstpos, dstrooms); - propSetPerimEnabled(prop, false); + prop_set_perim_enabled(prop, false); f0 -= 0.1f; - result = cdTestVolume(&dstpos, 26, dstrooms, types, CHECKVERTICAL_YES, 15, f0); - propSetPerimEnabled(prop, true); + result = cd_test_volume(&dstpos, 26, dstrooms, types, CHECKVERTICAL_YES, 15, f0); + prop_set_perim_enabled(prop, true); if (result == CDRESULT_NOCOLLISION) { prop->pos.y = dstpos.y; - propDeregisterRooms(prop); - roomsCopy(dstrooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(dstrooms, prop->rooms); } return result; } -s32 eyespyCalculateNewPosition(struct coord *vel) +s32 eyespy_calculate_new_position(struct coord *vel) { bool result = true; struct prop *eyespyprop = g_Vars.currentplayer->eyespy->prop; @@ -133,10 +133,10 @@ s32 eyespyCalculateNewPosition(struct coord *vel) s32 playernum; u32 stack2; - eyespyFindGround(&floorroom); + eyespy_find_ground(&floorroom); if (vel->x || vel->y || vel->z) { - propSetPerimEnabled(eyespyprop, false); + prop_set_perim_enabled(eyespyprop, false); dstpos.x = vel->x + eyespyprop->pos.x; dstpos.y = vel->y + eyespyprop->pos.y; @@ -176,28 +176,28 @@ s32 eyespyCalculateNewPosition(struct coord *vel) halfradius = radius * 0.5f; if (xdiff > halfradius || zdiff > halfradius || xdiff < -halfradius || zdiff < -halfradius) { - result = cdExamCylMove06(&eyespyprop->pos, eyespyprop->rooms, &dstpos, dstrooms, radius, types, 1, 15, ymin); + result = cd_exam_cyl_move06(&eyespyprop->pos, eyespyprop->rooms, &dstpos, dstrooms, radius, types, 1, 15, ymin); if (result == CDRESULT_NOCOLLISION) { - result = cdExamCylMove02(&eyespyprop->pos, &dstpos, radius, dstrooms, types, true, 15, ymin); + result = cd_exam_cyl_move02(&eyespyprop->pos, &dstpos, radius, dstrooms, types, true, 15, ymin); } } else { - result = cdExamCylMove02(&eyespyprop->pos, &dstpos, radius, sp74, types, true, 15, ymin); + result = cd_exam_cyl_move02(&eyespyprop->pos, &dstpos, radius, sp74, types, true, 15, ymin); } if (result == CDRESULT_COLLISION) { - prop = cdGetObstacleProp(); + prop = cd_get_obstacle_prop(); if (prop && prop->type == PROPTYPE_PLAYER) { playernum = g_Vars.currentplayernum; - if (playernum == playermgrGetPlayerNumByProp(prop)) { + if (playernum == playermgr_get_player_num_by_prop(prop)) { g_EyespyPickup = true; } } } - propSetPerimEnabled(eyespyprop, true); + prop_set_perim_enabled(eyespyprop, true); if (result == CDRESULT_NOCOLLISION) { // Apply the destination @@ -205,24 +205,24 @@ s32 eyespyCalculateNewPosition(struct coord *vel) eyespyprop->pos.y = dstpos.y; eyespyprop->pos.z = dstpos.z; - propDeregisterRooms(eyespyprop); + prop_deregister_rooms(eyespyprop); - roomsCopy(dstrooms, eyespyprop->rooms); + rooms_copy(dstrooms, eyespyprop->rooms); } } return result; } -bool eyespyCalculateNewPositionWithPush(struct coord *vel) +bool eyespy_calculate_new_position_with_push(struct coord *vel) { - s32 result = eyespyCalculateNewPosition(vel); + s32 result = eyespy_calculate_new_position(vel); struct prop *prop; if (result != CDRESULT_NOCOLLISION) { g_EyespyHit = EYESPYHIT_BG; - prop = cdGetObstacleProp(); + prop = cd_get_obstacle_prop(); if (prop && g_Vars.lvupdate240 > 0) { if (prop->type == PROPTYPE_DOOR) { @@ -235,7 +235,7 @@ bool eyespyCalculateNewPositionWithPush(struct coord *vel) struct coord sp2c; struct coord sp20; - cdGetEdge(&sp2c, &sp20, 286, "bondeyespy.c"); + cd_get_edge(&sp2c, &sp20, 286, "bondeyespy.c"); // Nothing is actually done with these coordinates... // This code was likely copied from bondwalk then the bounce @@ -271,22 +271,22 @@ bool eyespyCalculateNewPositionWithPush(struct coord *vel) s32 eyespy0f0cf890(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4) { - if (cd00024ea4()) { + if (cd_00024ea4()) { struct coord sp24; s32 someint; - f32 somefloat = cd00024e98(); + f32 somefloat = cd_00024e98(); sp24.x = arg0->x * somefloat * 0.25f; sp24.y = arg0->y * somefloat * 0.25f; sp24.z = arg0->z * somefloat * 0.25f; - someint = eyespyCalculateNewPositionWithPush(&sp24); + someint = eyespy_calculate_new_position_with_push(&sp24); if (someint == 1) { return 1; } if (someint == 0) { - cdGetEdge(arg3, arg4, 350, "bondeyespy.c"); + cd_get_edge(arg3, arg4, 350, "bondeyespy.c"); if (arg3->f[0] != arg1->f[0] || arg3->f[1] != arg1->f[1] @@ -325,7 +325,7 @@ s32 eyespy0f0cf9f8(struct coord *arg0, struct coord *arg1, struct coord *arg2) sp24.y = 0; sp24.z = sp30.z * tmp; - return eyespyCalculateNewPositionWithPush(&sp24); + return eyespy_calculate_new_position_with_push(&sp24); } return -1; @@ -362,7 +362,7 @@ s32 eyespy0f0cfafc(struct coord *arg0, struct coord *arg1, struct coord *arg2) sp28.y = 0; sp28.z = sp34.z; - if (eyespyCalculateNewPositionWithPush(&sp28) == 1) { + if (eyespy_calculate_new_position_with_push(&sp28) == 1) { return true; } } @@ -390,7 +390,7 @@ s32 eyespy0f0cfafc(struct coord *arg0, struct coord *arg1, struct coord *arg2) sp28.y = 0; sp28.z = sp34.z; - if (eyespyCalculateNewPositionWithPush(&sp28) == 1) { + if (eyespy_calculate_new_position_with_push(&sp28) == 1) { return true; } } @@ -402,16 +402,16 @@ s32 eyespy0f0cfafc(struct coord *arg0, struct coord *arg1, struct coord *arg2) s32 eyespy0f0cfdd0(struct coord *vel, struct coord *arg1, struct coord *arg2) { - bool result = eyespyCalculateNewPositionWithPush(vel); + bool result = eyespy_calculate_new_position_with_push(vel); if (result != CDRESULT_NOCOLLISION) { - cdGetEdge(arg1, arg2, 473, "bondeyespy.c"); + cd_get_edge(arg1, arg2, 473, "bondeyespy.c"); } return result; } -void eyespyUpdateVertical(void) +void eyespy_update_vertical(void) { struct coord spac; struct coord spa0; @@ -455,14 +455,14 @@ void eyespyUpdateVertical(void) } // Handle gravity - mainOverrideVariable("g", &g_EyespyFallAccel); - mainOverrideVariable("l", &g_EyespyMaxFallSpeed); + main_override_variable("g", &g_EyespyFallAccel); + main_override_variable("l", &g_EyespyMaxFallSpeed); accel = g_EyespyFallAccel * 0.01; // always 1 maxfallspeed = g_EyespyMaxFallSpeed * 0.01f; // always 30 newy = chr->manground; - newground = eyespyFindGround(NULL); + newground = eyespy_find_ground(NULL); if (newground != chr->manground) { if (newground < chr->manground) { @@ -500,7 +500,7 @@ void eyespyUpdateVertical(void) } } - if (eyespyTryMoveUpwards(newy - chr->manground)) { + if (eyespy_try_move_upwards(newy - chr->manground)) { chr->manground = newy; } else { g_Vars.currentplayer->eyespy->gravity = 0; @@ -523,7 +523,7 @@ void eyespyUpdateVertical(void) rebound = true; } - if (eyespyTryMoveUpwards(newheight - g_Vars.currentplayer->eyespy->height)) { + if (eyespy_try_move_upwards(newheight - g_Vars.currentplayer->eyespy->height)) { g_Vars.currentplayer->eyespy->height = newheight; } else { rebound = true; @@ -551,7 +551,7 @@ void eyespyUpdateVertical(void) dist.f[2] * dist.f[2]; } -bool eyespyTryLaunch(void) +bool eyespy_try_launch(void) { struct coord playerpos; struct coord testfrompos; @@ -560,7 +560,7 @@ bool eyespyTryLaunch(void) bool insafe; char text[48]; - insafe = stageGetIndex(g_Vars.stagenum) == STAGEINDEX_G5BUILDING + insafe = stage_get_index(g_Vars.stagenum) == STAGEINDEX_G5BUILDING && g_Vars.currentplayer->prop->rooms[0] == 0x53; playerpos.x = g_Vars.currentplayer->prop->pos.x; @@ -575,8 +575,8 @@ bool eyespyTryLaunch(void) g_Vars.currentplayer->eyespy->up.z = 0; g_Vars.currentplayer->eyespy->startuptimer60 = 0; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_G5BUILDING - || stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CITRAINING) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_G5BUILDING + || stage_get_index(g_Vars.stagenum) == STAGEINDEX_CITRAINING) { g_EyespyMinHeight = 30; } else { g_EyespyMinHeight = 80; @@ -633,9 +633,9 @@ bool eyespyTryLaunch(void) g_Vars.currentplayer->eyespy->vels[1] = 0; g_Vars.currentplayer->eyespy->pitch = 0; - playerSetPerimEnabled(g_Vars.currentplayer->prop, false); + player_set_perim_enabled(g_Vars.currentplayer->prop, false); - if (insafe || !cdExamLos08(&testfrompos, g_Vars.currentplayer->prop->rooms, + if (insafe || !cd_exam_los08(&testfrompos, g_Vars.currentplayer->prop->rooms, &g_Vars.currentplayer->eyespy->prop->pos, CDTYPE_ALL, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2 | GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT)) { @@ -646,17 +646,17 @@ bool eyespyTryLaunch(void) chr->prevpos.y = g_Vars.currentplayer->eyespy->prop->pos.y = g_Vars.currentplayer->eyespy->oldground + g_Vars.currentplayer->eyespy->height; chr->prevpos.z = g_Vars.currentplayer->eyespy->prop->pos.z = playerpos.f[2]; - propSetPerimEnabled(g_Vars.currentplayer->eyespy->prop, false); + prop_set_perim_enabled(g_Vars.currentplayer->eyespy->prop, false); // "Not enough room to launch " - sprintf(text, "%s%s", langGet(L_MISC_218), bgunGetName(WEAPON_EYESPY)); - hudmsgCreate(text, HUDMSGTYPE_DEFAULT); + sprintf(text, "%s%s", lang_get(L_MISC_218), bgun_get_name(WEAPON_EYESPY)); + hudmsg_create(text, HUDMSGTYPE_DEFAULT); launched = false; } else { // Launch successful g_Vars.currentplayer->eyespy->deployed = true; - sndStart(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1); launched = true; @@ -664,16 +664,16 @@ bool eyespyTryLaunch(void) chr->chrflags &= ~CHRCFLAG_INVINCIBLE; #if VERSION >= VERSION_NTSC_1_0 - psCreate(NULL, g_Vars.currentplayer->eyespy->prop, SFX_EYESPY_RUNNING, -1, + ps_create(NULL, g_Vars.currentplayer->eyespy->prop, SFX_EYESPY_RUNNING, -1, -1, PSFLAG_REPEATING, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); #else - psCreate(NULL, g_Vars.currentplayer->eyespy->prop, SFX_EYESPY_RUNNING, -1, + ps_create(NULL, g_Vars.currentplayer->eyespy->prop, SFX_EYESPY_RUNNING, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); #endif } - playerSetPerimEnabled(g_Vars.currentplayer->prop, true); - propDeregisterRooms(g_Vars.currentplayer->eyespy->prop); + player_set_perim_enabled(g_Vars.currentplayer->prop, true); + prop_deregister_rooms(g_Vars.currentplayer->eyespy->prop); func0f065e74(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &g_Vars.currentplayer->eyespy->prop->pos, g_Vars.currentplayer->eyespy->prop->rooms); @@ -682,7 +682,7 @@ bool eyespyTryLaunch(void) return launched; } -void eyespyProcessInput(bool allowbuttons) +void eyespy_process_input(bool allowbuttons) { struct chrdata *chr = g_Vars.currentplayer->eyespy->prop->chr; f32 spe0 = PAL ? 0.952f : 0.96f; @@ -693,15 +693,15 @@ void eyespyProcessInput(bool allowbuttons) f32 spcc; f32 spc8; f32 spc4; - s8 contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); - s8 c1stickx = joyGetStickX(contpad1); + s8 contpad1 = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); + s8 c1stickx = joy_get_stick_x(contpad1); s8 c2stickx; - s8 c1sticky = joyGetStickY(contpad1); + s8 c1sticky = joy_get_stick_y(contpad1); s8 c2sticky; - u16 c1buttons = allowbuttons ? joyGetButtons(contpad1, 0xffff) : 0; + u16 c1buttons = allowbuttons ? joy_get_buttons(contpad1, 0xffff) : 0; u16 c2buttons; bool domovecentre = true; - s32 controlmode = optionsGetControlMode(g_Vars.currentplayerstats->mpindex); + s32 controlmode = options_get_control_mode(g_Vars.currentplayerstats->mpindex); bool aimpressed; bool shootpressed; @@ -719,11 +719,11 @@ void eyespyProcessInput(bool allowbuttons) f32 tmp; if (controlmode >= CONTROLMODE_21) { - contpad2 = (s8) optionsGetContpadNum2(g_Vars.currentplayerstats->mpindex); - c2stickx = joyGetStickX(contpad2); - c2sticky = joyGetStickY(contpad2); + contpad2 = (s8) options_get_contpad_num2(g_Vars.currentplayerstats->mpindex); + c2stickx = joy_get_stick_x(contpad2); + c2sticky = joy_get_stick_y(contpad2); - c2buttons = allowbuttons ? joyGetButtons(contpad2, 0xffff) : 0; + c2buttons = allowbuttons ? joy_get_buttons(contpad2, 0xffff) : 0; } else { c2stickx = c1stickx; c2sticky = c1sticky; @@ -871,16 +871,16 @@ void eyespyProcessInput(bool allowbuttons) chr->prevpos.y = g_Vars.currentplayer->eyespy->prop->pos.y; chr->prevpos.z = g_Vars.currentplayer->eyespy->prop->pos.z; - roomsCopy(g_Vars.currentplayer->eyespy->prop->rooms, prevrooms); + rooms_copy(g_Vars.currentplayer->eyespy->prop->rooms, prevrooms); - if (!invHasSingleWeaponIncAllGuns(WEAPON_EYESPY)) { + if (!inv_has_single_weapon_inc_all_guns(WEAPON_EYESPY)) { g_Vars.currentplayer->eyespy->deployed = false; g_Vars.currentplayer->eyespy->held = true; g_Vars.currentplayer->eyespy->active = false; chr->chrflags |= CHRCFLAG_HIDDEN; - chrClearReferences(g_Vars.currentplayer->eyespy->prop - g_Vars.props); + chr_clear_references(g_Vars.currentplayer->eyespy->prop - g_Vars.props); } if (g_Vars.currentplayer->eyespy->active && g_PlayersWithControl[g_Vars.currentplayernum]) { @@ -891,9 +891,9 @@ void eyespyProcessInput(bool allowbuttons) && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED && (c1buttons & START_BUTTON)) { if (!g_Vars.mplayerisrunning) { - playerPause(MENUROOT_MAINMENU); + player_pause(MENUROOT_MAINMENU); } else { - mpPushPauseDialog(); + mp_push_pause_dialog(); } } #endif @@ -1048,7 +1048,7 @@ void eyespyProcessInput(bool allowbuttons) g_EyespyHit = EYESPYHIT_NONE; var80070ecc = 0; - eyespyUpdateVertical(); + eyespy_update_vertical(); // Consider playing the tap sound when the eyespy is driven into a wall or object if (g_Vars.currentplayer->eyespy->active @@ -1071,7 +1071,7 @@ void eyespyProcessInput(bool allowbuttons) snd00010718(NULL, 0, 16000, AL_PAN_CENTER, SFX_EYESPYHIT, 1, 1, -1, 1); break; case EYESPYHIT_DAMAGE: - sndStart(var80095200, SFX_PICKUP_LASER, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_LASER, NULL, -1, -1, -1, -1, -1); break; default: break; @@ -1084,7 +1084,7 @@ void eyespyProcessInput(bool allowbuttons) } tmp = g_Vars.currentplayer->eyespy->speed / 1600.0f; - psSetVolume(g_Vars.currentplayer->eyespy->prop, tmp * 400.0f); + ps_set_volume(g_Vars.currentplayer->eyespy->prop, tmp * 400.0f); angle = 180 - g_Vars.currentplayer->eyespy->theta; @@ -1094,7 +1094,7 @@ void eyespyProcessInput(bool allowbuttons) angle = angle / 360.0f * M_BADTAU; - chrSetLookAngle(chr, angle); + chr_set_look_angle(chr, angle); if (g_Vars.currentplayer->eyespy->startuptimer60 < TICKS(50)) { return; @@ -1144,7 +1144,7 @@ void eyespyProcessInput(bool allowbuttons) g_EyespyPickup = false; } - cdresult = cdTestLos05(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, + cdresult = cd_test_los05(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &g_Vars.currentplayer->eyespy->prop->pos, g_Vars.currentplayer->eyespy->prop->rooms, CDTYPE_DOORS | CDTYPE_BG, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); @@ -1169,11 +1169,11 @@ void eyespyProcessInput(bool allowbuttons) chr->chrflags |= CHRCFLAG_HIDDEN; chr->chrflags |= CHRCFLAG_INVINCIBLE; - weaponPlayPickupSound(WEAPON_EYESPY); - currentPlayerQueuePickupWeaponHudmsg(WEAPON_EYESPY, false); - psStopSound(g_Vars.currentplayer->eyespy->prop, PSTYPE_GENERAL, 0xffff); - chrClearReferences(g_Vars.currentplayer->eyespy->prop - g_Vars.props); + weapon_play_pickup_sound(WEAPON_EYESPY); + current_player_queue_pickup_weapon_hudmsg(WEAPON_EYESPY, false); + ps_stop_sound(g_Vars.currentplayer->eyespy->prop, PSTYPE_GENERAL, 0xffff); + chr_clear_references(g_Vars.currentplayer->eyespy->prop - g_Vars.props); } - coordTriggerProxies(&chr->prop->pos, true); + coord_trigger_proxies(&chr->prop->pos, true); } diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index cfca0b60f..dd9570204 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -27,7 +27,7 @@ u32 var8009de8c; bool var80070e80 = false; -void bgrabInit(void) +void bgrab_init(void) { s32 prevmode = g_Vars.currentplayer->bondmovemode; Mtxf matrix; @@ -57,8 +57,8 @@ void bgrabInit(void) g_Vars.currentplayer->gunextraaimx = 0; g_Vars.currentplayer->gunextraaimy = 0; - mtx4LoadYRotation((g_Vars.currentplayer->vv_theta * M_BADTAU) / 360.0f, &matrix); - mtx4RotateVecInPlace(&matrix, &g_Vars.currentplayer->grabbedposoffset); + mtx4_load_y_rotation((g_Vars.currentplayer->vv_theta * M_BADTAU) / 360.0f, &matrix); + mtx4_rotate_vec_in_place(&matrix, &g_Vars.currentplayer->grabbedposoffset); g_Vars.currentplayer->bondprevtheta = g_Vars.currentplayer->vv_theta; @@ -71,7 +71,7 @@ void bgrabInit(void) struct projectile *projectile = obj->projectile; g_Vars.currentplayer->bondshotspeed.x += projectile->speed.x * 0.2f; g_Vars.currentplayer->bondshotspeed.z += projectile->speed.z * 0.2f; - objFreeProjectile(obj); + obj_free_projectile(obj); } if (obj->type == OBJTYPE_HOVERPROP) { @@ -96,12 +96,12 @@ void bgrabInit(void) obj->hidden |= OBJHFLAG_GRABBED; if (obj->flags3 & OBJFLAG3_GEOCYL) { - cdresult = cd000276c8Cyl(obj->geocyl, + cdresult = cd_000276c8_cyl(obj->geocyl, g_Vars.currentplayer->prop->pos.x, g_Vars.currentplayer->prop->pos.z, VERSION >= VERSION_NTSC_1_0 ? 45 : 40, 0, 0); } else { - cdresult = cd000274e0Block(obj->geoblock, + cdresult = cd_000274e0_block(obj->geoblock, g_Vars.currentplayer->prop->pos.x, g_Vars.currentplayer->prop->pos.z, VERSION >= VERSION_NTSC_1_0 ? 45 : 40, 0, 0); @@ -135,7 +135,7 @@ void bgrabInit(void) g_Vars.currentplayer->grabstarttime = g_Vars.lvframe60; } -void bgrabExit(void) +void bgrab_exit(void) { struct coord moveamount; struct defaultobj *obj; @@ -161,7 +161,7 @@ void bgrabExit(void) rotateamount /= g_Vars.lvupdate60freal; - objApplyMomentum(g_Vars.currentplayer->grabbedprop->obj, &moveamount, + obj_apply_momentum(g_Vars.currentplayer->grabbedprop->obj, &moveamount, rotateamount, 0, 0); } @@ -185,9 +185,9 @@ void bgrab0f0ccbf0(struct coord *delta, f32 angle, struct defaultobj *obj) sp98.z = delta->z + g_Vars.currentplayer->prop->pos.z; #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&spb0, &spa4, 201, "bondgrab.c"); + cd_get_edge(&spb0, &spa4, 201, "bondgrab.c"); #else - cdGetEdge(&spb0, &spa4, 200, "bondgrab.c"); + cd_get_edge(&spb0, &spa4, 200, "bondgrab.c"); #endif spc8.x = spa4.z - spb0.z; @@ -217,12 +217,12 @@ void bgrab0f0ccbf0(struct coord *delta, f32 angle, struct defaultobj *obj) struct coord sp44; #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp68, &sp5c, 228, "bondgrab.c"); + cd_get_edge(&sp68, &sp5c, 228, "bondgrab.c"); #else - cdGetEdge(&sp68, &sp5c, 227, "bondgrab.c"); + cd_get_edge(&sp68, &sp5c, 227, "bondgrab.c"); #endif - if (cdGetSavedPos(&sp50, &sp44)) { + if (cd_get_saved_pos(&sp50, &sp44)) { sp44.x -= sp50.x; sp44.y -= sp50.y; sp44.z -= sp50.z; @@ -274,13 +274,13 @@ void bgrab0f0ccbf0(struct coord *delta, f32 angle, struct defaultobj *obj) rotation += angle * 0.1f; - objApplyMomentum(obj, &sp2c, rotation, true, true); + obj_apply_momentum(obj, &sp2c, rotation, true, true); } } } } -bool bgrabTryMoveUpwards(f32 y) +bool bgrab_try_move_upwards(f32 y) { bool result; struct coord newpos; @@ -293,29 +293,29 @@ bool bgrabTryMoveUpwards(f32 y) newpos.y = g_Vars.currentplayer->prop->pos.y + y; newpos.z = g_Vars.currentplayer->prop->pos.z; - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); func0f065e74(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &newpos, rooms); - bmoveFindEnteredRoomsByPos(g_Vars.currentplayer, &newpos, rooms); - propSetPerimEnabled(g_Vars.currentplayer->prop, false); + bmove_find_entered_rooms_by_pos(g_Vars.currentplayer, &newpos, rooms); + prop_set_perim_enabled(g_Vars.currentplayer->prop, false); ymin -= 0.1f; - result = cdTestVolume(&newpos, radius, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, + result = cd_test_volume(&newpos, radius, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); - propSetPerimEnabled(g_Vars.currentplayer->prop, true); + prop_set_perim_enabled(g_Vars.currentplayer->prop, true); if (result == CDRESULT_NOCOLLISION) { g_Vars.currentplayer->prop->pos.y = newpos.y; - propDeregisterRooms(g_Vars.currentplayer->prop); - roomsCopy(rooms, g_Vars.currentplayer->prop->rooms); + prop_deregister_rooms(g_Vars.currentplayer->prop); + rooms_copy(rooms, g_Vars.currentplayer->prop->rooms); } return result; } -s32 bgrabCalculateNewPosition(struct coord *delta, f32 angle, bool arg2) +s32 bgrab_calculate_new_position(struct coord *delta, f32 angle, bool arg2) { s32 cdresult = CDRESULT_NOCOLLISION; s32 i; @@ -335,10 +335,10 @@ s32 bgrabCalculateNewPosition(struct coord *delta, f32 angle, bool arg2) var80070e80 = 0; - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); - propSetPerimEnabled(g_Vars.currentplayer->prop, false); - propSetPerimEnabled(g_Vars.currentplayer->grabbedprop, false); + prop_set_perim_enabled(g_Vars.currentplayer->prop, false); + prop_set_perim_enabled(g_Vars.currentplayer->grabbedprop, false); pos.x = g_Vars.currentplayer->prop->pos.x; pos.y = g_Vars.currentplayer->prop->pos.y; @@ -365,17 +365,17 @@ s32 bgrabCalculateNewPosition(struct coord *delta, f32 angle, bool arg2) } #endif - bmoveFindEnteredRoomsByPos(g_Vars.currentplayer, &pos, rooms); + bmove_find_entered_rooms_by_pos(g_Vars.currentplayer, &pos, rooms); ismoving = true; - cdresult = cdExamCylMove05(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, + cdresult = cd_exam_cyl_move05(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &pos, rooms, CDTYPE_ALL, true, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); if (cdresult == CDRESULT_NOCOLLISION) { - cdresult = cdExamCylMove01(&g_Vars.currentplayer->prop->pos, &pos, radius, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, + cdresult = cd_exam_cyl_move01(&g_Vars.currentplayer->prop->pos, &pos, radius, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); } @@ -385,7 +385,7 @@ s32 bgrabCalculateNewPosition(struct coord *delta, f32 angle, bool arg2) } } - propSetPerimEnabled(g_Vars.currentplayer->grabbedprop, true); + prop_set_perim_enabled(g_Vars.currentplayer->grabbedprop, true); if (cdresult == CDRESULT_NOCOLLISION) { struct coord sp7c; @@ -495,7 +495,7 @@ s32 bgrabCalculateNewPosition(struct coord *delta, f32 angle, bool arg2) } } - propSetPerimEnabled(g_Vars.currentplayer->prop, true); + prop_set_perim_enabled(g_Vars.currentplayer->prop, true); if (cdresult == CDRESULT_NOCOLLISION) { var8009de70 = NULL; @@ -518,8 +518,8 @@ s32 bgrabCalculateNewPosition(struct coord *delta, f32 angle, bool arg2) g_Vars.currentplayer->prop->pos.z = pos.z; if (ismoving) { - propDeregisterRooms(g_Vars.currentplayer->prop); - roomsCopy(rooms, g_Vars.currentplayer->prop->rooms); + prop_deregister_rooms(g_Vars.currentplayer->prop); + rooms_copy(rooms, g_Vars.currentplayer->prop->rooms); } if (g_Vars.currentplayer->grabbeddoextra) { @@ -538,12 +538,12 @@ s32 bgrabCalculateNewPosition(struct coord *delta, f32 angle, bool arg2) return cdresult; } -bool bgrabCalculateNewPositiontWithPush(struct coord *delta, f32 angle, bool arg2) +bool bgrab_calculate_new_positiont_with_push(struct coord *delta, f32 angle, bool arg2) { - s32 result = bgrabCalculateNewPosition(delta, angle, arg2); + s32 result = bgrab_calculate_new_position(delta, angle, arg2); if (result != CDRESULT_NOCOLLISION) { - struct prop *obstacle = cdGetObstacleProp(); + struct prop *obstacle = cd_get_obstacle_prop(); if (obstacle && g_Vars.lvupdate240 > 0) { if (obstacle->type == PROPTYPE_CHR) { @@ -572,7 +572,7 @@ bool bgrabCalculateNewPositiontWithPush(struct coord *delta, f32 angle, bool arg && (obj->projectile->flags & PROJECTILEFLAG_SLIDING)) { s32 someint; bool embedded = false; - someint = projectileTick(obj, &embedded); + someint = projectile_tick(obj, &embedded); if ((obj->hidden & OBJHFLAG_PROJECTILE)) { obj->projectile->flags |= PROJECTILEFLAG_00001000; @@ -585,7 +585,7 @@ bool bgrabCalculateNewPositiontWithPush(struct coord *delta, f32 angle, bool arg } if (someint) { - result = bgrabCalculateNewPosition(delta, angle, arg2); + result = bgrab_calculate_new_position(delta, angle, arg2); } } } @@ -603,7 +603,7 @@ bool bgrab0f0cdb04(f32 angle, bool arg2) bool result; g_Vars.currentplayer->grabbeddoextra = true; - result = bgrabCalculateNewPositiontWithPush(&coord, angle, arg2); + result = bgrab_calculate_new_positiont_with_push(&coord, angle, arg2); g_Vars.currentplayer->grabbeddoextra = false; return result; @@ -630,9 +630,9 @@ bool bgrab0f0cdb68(f32 angle) f32 ymin; #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&spa4, &sp98, 678, "bondgrab.c"); + cd_get_edge(&spa4, &sp98, 678, "bondgrab.c"); #else - cdGetEdge(&spa4, &sp98, 674, "bondgrab.c"); + cd_get_edge(&spa4, &sp98, 674, "bondgrab.c"); #endif sp7c = sp98.f[0] - spa4.f[0]; @@ -667,7 +667,7 @@ bool bgrab0f0cdb68(f32 angle) } } } else { - if (cdGetSavedPos(&sp8c, &sp80)) { + if (cd_get_saved_pos(&sp8c, &sp80)) { f32 f0 = (sp8c.f[0] - spa4.f[0]) * f20 + f22 * (sp8c.f[2] - spa4.f[2]); f32 f16 = (sp80.f[0] - spa4.f[0]) * f20 + f22 * (sp80.f[2] - spa4.f[2]); @@ -681,7 +681,7 @@ bool bgrab0f0cdb68(f32 angle) } else if (var80070e80 != 0) { if (g_Vars.currentplayer->grabbedprop->type == PROPTYPE_OBJ) { if (g_Vars.currentplayer->grabbedprop->obj->flags3 & OBJFLAG3_GEOCYL) { - objGetBbox(g_Vars.currentplayer->grabbedprop, &radius, &ymax, &ymin); + obj_get_bbox(g_Vars.currentplayer->grabbedprop, &radius, &ymax, &ymin); f0 = (var8009de78.f[0] - spa4.f[0]) * f20 + (var8009de78.f[2] - spa4.f[2]) * f22; f0 -= radius; @@ -730,13 +730,13 @@ void bgrab0f0cdef0(void) bool bgrab0f0cdf64(struct coord *delta, struct coord *arg1, struct coord *arg2) { - bool result = bgrabCalculateNewPositiontWithPush(delta, 0, true); + bool result = bgrab_calculate_new_positiont_with_push(delta, 0, true); if (!result) { #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(arg1, arg2, 815, "bondgrab.c"); + cd_get_edge(arg1, arg2, 815, "bondgrab.c"); #else - cdGetEdge(arg1, arg2, 811, "bondgrab.c"); + cd_get_edge(arg1, arg2, 811, "bondgrab.c"); #endif } @@ -764,7 +764,7 @@ s32 bgrab0f0cdfbc(struct coord *delta, struct coord *arg1, struct coord *arg2) sp24.y = 0; sp24.z = sp30.z * tmp; - return bgrabCalculateNewPositiontWithPush(&sp24, 0, true); + return bgrab_calculate_new_positiont_with_push(&sp24, 0, true); } return -1; @@ -789,7 +789,7 @@ void bgrab0f0ce0bc(struct coord *arg0) } } -void bgrabUpdatePrevPos(void) +void bgrab_update_prev_pos(void) { g_Vars.currentplayer->bondprevpos.x = g_Vars.currentplayer->prop->pos.x; g_Vars.currentplayer->bondprevpos.y = g_Vars.currentplayer->prop->pos.y; @@ -807,7 +807,7 @@ void bgrab0f0ce178(void) func0f069c70(g_Vars.currentplayer->grabbedprop->obj, 0, 1); } -void bgrabUpdateVertical(void) +void bgrab_update_vertical(void) { f32 stack; s32 i; @@ -819,7 +819,7 @@ void bgrabUpdateVertical(void) f32 fVar3; f32 f0; - f14 = cdFindGroundInfoAtCyl(&g_Vars.currentplayer->prop->pos, + f14 = cd_find_ground_info_at_cyl(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->bond2.radius, g_Vars.currentplayer->prop->rooms, &g_Vars.currentplayer->floorcol, @@ -877,28 +877,28 @@ void bgrabUpdateVertical(void) } #endif - if (bgrabTryMoveUpwards(tmp)) { + if (bgrab_try_move_upwards(tmp)) { g_Vars.currentplayer->sumground = fVar3; g_Vars.currentplayer->vv_manground = fVar3 * (PAL ? 0.054400026798248f : 0.045499980449677f); } if ((g_Vars.currentplayer->floorflags & GEOFLAG_DIE) && g_Vars.currentplayer->vv_manground - 20.0f < g_Vars.currentplayer->vv_ground) { - playerDie(true); + player_die(true); } } -void bgrabHandleActivate(void) +void bgrab_handle_activate(void) { - if (currentPlayerTryMountHoverbike(g_Vars.currentplayer->grabbedprop)) { + if (current_player_try_mount_hoverbike(g_Vars.currentplayer->grabbedprop)) { g_Vars.currentplayer->bondactivateorreload = 0; } else { g_Vars.currentplayer->bondactivateorreload = 0; - bmoveSetMode(MOVEMODE_WALK); + bmove_set_mode(MOVEMODE_WALK); } } -void bgrabUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult) +void bgrab_update_speed_sideways(f32 targetspeed, f32 accelspeed, s32 mult) { if (targetspeed < g_Vars.currentplayer->speedstrafe) { g_Vars.currentplayer->speedstrafe -= PALUPF(accelspeed * mult); @@ -917,7 +917,7 @@ void bgrabUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult) g_Vars.currentplayer->speedsideways = g_Vars.currentplayer->speedstrafe; } -void bgrabUpdateSpeedForwards(f32 target, f32 speed) +void bgrab_update_speed_forwards(f32 target, f32 speed) { if (g_Vars.currentplayer->speedgo < target) { g_Vars.currentplayer->speedgo += speed * g_Vars.lvupdate60freal; @@ -936,33 +936,33 @@ void bgrabUpdateSpeedForwards(f32 target, f32 speed) g_Vars.currentplayer->speedforwards = g_Vars.currentplayer->speedgo; } -void bgrabApplyMoveData(struct movedata *data) +void bgrab_apply_move_data(struct movedata *data) { // Sideways if (data->digitalstepleft) { - bgrabUpdateSpeedSideways(-1, 0.2f / 3.0f, data->digitalstepleft); + bgrab_update_speed_sideways(-1, 0.2f / 3.0f, data->digitalstepleft); } else if (data->digitalstepright) { - bgrabUpdateSpeedSideways(1, 0.2f / 3.0f, data->digitalstepright); + bgrab_update_speed_sideways(1, 0.2f / 3.0f, data->digitalstepright); } else if (data->unk14 == 0) { - bgrabUpdateSpeedSideways(0, 0.2f / 3.0f, g_Vars.lvupdate60); + bgrab_update_speed_sideways(0, 0.2f / 3.0f, g_Vars.lvupdate60); } if (data->unk14) { - bgrabUpdateSpeedSideways(data->analogstrafe * 0.014285714365542f, 0.2f / 3.0f, g_Vars.lvupdate60); + bgrab_update_speed_sideways(data->analogstrafe * 0.014285714365542f, 0.2f / 3.0f, g_Vars.lvupdate60); } // Forward/back if (data->digitalstepforward) { - bgrabUpdateSpeedForwards(1, 0.2f / 3.0f); + bgrab_update_speed_forwards(1, 0.2f / 3.0f); g_Vars.currentplayer->speedmaxtime60 += g_Vars.lvupdate60; } else if (data->digitalstepback) { - bgrabUpdateSpeedForwards(-1, 0.2f / 3.0f); + bgrab_update_speed_forwards(-1, 0.2f / 3.0f); } else if (data->canlookahead == false) { - bgrabUpdateSpeedForwards(0, 0.2f / 3.0f); + bgrab_update_speed_forwards(0, 0.2f / 3.0f); } if (data->canlookahead) { - bgrabUpdateSpeedForwards(data->analogwalk * 0.014285714365542f, 0.2f / 3.0f); + bgrab_update_speed_forwards(data->analogwalk * 0.014285714365542f, 0.2f / 3.0f); if (data->analogwalk > 60) { g_Vars.currentplayer->speedmaxtime60 += g_Vars.lvupdate60; @@ -995,7 +995,7 @@ void bgrabApplyMoveData(struct movedata *data) } } -void bgrabUpdateSpeedTheta(void) +void bgrab_update_speed_theta(void) { f32 mult = (PAL ? 0.97519999742508f : 0.98470002412796f); f32 speedtheta = g_Vars.currentplayer->speedtheta * 0.75f; @@ -1087,7 +1087,7 @@ void bgrab0f0ce924(void) sp80 = g_Vars.currentplayer->headpos.z; #if VERSION >= VERSION_NTSC_1_0 - if (cheatIsActive(CHEAT_SMALLJO)) { + if (cheat_is_active(CHEAT_SMALLJO)) { sp84 *= 0.4f; sp80 *= 0.4f; } @@ -1096,9 +1096,9 @@ void bgrab0f0ce924(void) sp74.x += (sp80 * g_Vars.currentplayer->bond2.unk00.f[0] - sp84 * g_Vars.currentplayer->bond2.unk00.f[2]) * g_Vars.lvupdate60freal; sp74.z += (sp80 * g_Vars.currentplayer->bond2.unk00.f[2] + sp84 * g_Vars.currentplayer->bond2.unk00.f[0]) * g_Vars.lvupdate60freal; - bmoveUpdateMoveInitSpeed(&sp74); + bmove_update_move_init_speed(&sp74); - if (debugIsTurboModeEnabled()) { + if (debug_is_turbo_mode_enabled()) { sp74.x += (g_Vars.currentplayer->bond2.unk00.f[0] * g_Vars.currentplayer->speedforwards - (g_Vars.currentplayer->bond2.unk00.f[2] * g_Vars.currentplayer->speedsideways)) * g_Vars.lvupdate60freal * 10.0f; sp74.z += (g_Vars.currentplayer->bond2.unk00.f[2] * g_Vars.currentplayer->speedforwards + (g_Vars.currentplayer->bond2.unk00.f[0] * g_Vars.currentplayer->speedsideways)) * g_Vars.lvupdate60freal * 10.0f; } @@ -1141,7 +1141,7 @@ void bgrab0f0ce924(void) sp3c = g_Vars.currentplayer->speedverta / 0.7f; sp38 = g_Vars.currentplayer->gunspeed; - breathing = bheadGetBreathingValue(); + breathing = bhead_get_breathing_value(); if (sp3c > 1.0f) { sp3c = 1.0f; @@ -1154,18 +1154,18 @@ void bgrab0f0ce924(void) } bgun0f09d8dc(breathing, sp38, sp3c, sp40, 0.0f); - bgunSetAdjustPos(g_Vars.currentplayer->vv_verta360 * 0.017450513f); + bgun_set_adjust_pos(g_Vars.currentplayer->vv_verta360 * 0.017450513f); } } -void bgrabTick(void) +void bgrab_tick(void) { - bgrabUpdatePrevPos(); + bgrab_update_prev_pos(); bgrab0f0cdef0(); - bmoveUpdateVerta(); + bmove_update_verta(); bgrab0f0ce924(); bgrab0f0ce178(); - bgrabUpdateVertical(); + bgrab_update_vertical(); #if VERSION >= VERSION_NTSC_1_0 { @@ -1173,7 +1173,7 @@ void bgrabTick(void) for (i = 0; g_Vars.currentplayer->prop->rooms[i] != -1; i++) { if (g_Vars.currentplayer->prop->rooms[i] == g_Vars.currentplayer->floorroom) { - propDeregisterRooms(g_Vars.currentplayer->prop); + prop_deregister_rooms(g_Vars.currentplayer->prop); g_Vars.currentplayer->prop->rooms[0] = g_Vars.currentplayer->floorroom; g_Vars.currentplayer->prop->rooms[1] = -1; break; @@ -1195,38 +1195,38 @@ void bgrabTick(void) } if (hov) { - hovTick(obj, hov); + hov_tick(obj, hov); } - bmoveUpdateRooms(g_Vars.currentplayer); - objectiveCheckRoomEntered(g_Vars.currentplayer->prop->rooms[0]); + bmove_update_rooms(g_Vars.currentplayer); + objective_check_room_entered(g_Vars.currentplayer->prop->rooms[0]); bmove0f0cc19c(&g_Vars.currentplayer->prop->pos); - playerUpdatePerimInfo(); - doorsCheckAutomatic(); + player_update_perim_info(); + doors_check_automatic(); if (g_Vars.currentplayer->grabbedprop) { // Determine if the grabbed prop should be force released f32 ydiff = g_Vars.currentplayer->grabbedprop->pos.y - - objGetHovBobOffsetY(g_Vars.currentplayer->grabbedprop->obj) + - obj_get_hov_bob_offset_y(g_Vars.currentplayer->grabbedprop->obj) - g_Vars.currentplayer->vv_manground; struct prop *grabbedprop = g_Vars.currentplayer->grabbedprop; - propSetPerimEnabled(g_Vars.currentplayer->prop, false); - propSetPerimEnabled(grabbedprop, false); + prop_set_perim_enabled(g_Vars.currentplayer->prop, false); + prop_set_perim_enabled(grabbedprop, false); if (g_Vars.currentplayer->vv_ground <= -30000 || ydiff < -100 || ydiff > 100 || g_Vars.currentplayer->vv_ground < g_Vars.currentplayer->vv_manground - 50 - || !cdTestLos05(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, + || !cd_test_los05(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &g_Vars.currentplayer->grabbedprop->pos, g_Vars.currentplayer->grabbedprop->rooms, CDTYPE_ALL, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT)) { - bmoveSetMode(MOVEMODE_WALK); + bmove_set_mode(MOVEMODE_WALK); } - propSetPerimEnabled(g_Vars.currentplayer->prop, true); - propSetPerimEnabled(grabbedprop, true); + prop_set_perim_enabled(g_Vars.currentplayer->prop, true); + prop_set_perim_enabled(grabbedprop, true); } } } diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 373889e65..683286bce 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -187,7 +187,7 @@ char var800700bc[][10] = { }; #if !MATCHING || VERSION >= VERSION_NTSC_1_0 -void bgunRumble(s32 handnum, s32 weaponnum) +void bgun_rumble(s32 handnum, s32 weaponnum) { #if VERSION >= VERSION_NTSC_1_0 u32 stack; @@ -199,21 +199,21 @@ void bgunRumble(s32 handnum, s32 weaponnum) s32 contpad1hasrumble; s32 contpad2hasrumble; - joyGetContpadNumsForPlayer(g_Vars.currentplayernum, &contpad1, &contpad2); + joy_get_contpad_nums_for_player(g_Vars.currentplayernum, &contpad1, &contpad2); - if (optionsGetControlMode(g_Vars.currentplayerstats->mpindex) >= CONTROLMODE_21 + if (options_get_control_mode(g_Vars.currentplayerstats->mpindex) >= CONTROLMODE_21 && contpad1 >= 0 && contpad2 >= 0) { - contpad1hasrumble = pakGetType(contpad1) == PAKTYPE_RUMBLE; - contpad2hasrumble = pakGetType(contpad2) == PAKTYPE_RUMBLE; + contpad1hasrumble = pak_get_type(contpad1) == PAKTYPE_RUMBLE; + contpad2hasrumble = pak_get_type(contpad2) == PAKTYPE_RUMBLE; - if (!weaponHasFlag(weaponnum, WEAPONFLAG_DUALWIELD)) { + if (!weapon_has_flag(weaponnum, WEAPONFLAG_DUALWIELD)) { singlewield = true; } if (contpad1hasrumble && contpad2hasrumble) { if (singlewield) { - pakRumble(contpad1, 0.2f, 2, 4); - pakRumble(contpad2, 0.2f, 2, 4); + pak_rumble(contpad1, 0.2f, 2, 4); + pak_rumble(contpad2, 0.2f, 2, 4); } else { s32 contpadtouse1 = contpad1; @@ -221,7 +221,7 @@ void bgunRumble(s32 handnum, s32 weaponnum) contpadtouse1 = contpad2; } - pakRumble(contpadtouse1, 0.2f, 2, 4); + pak_rumble(contpadtouse1, 0.2f, 2, 4); } } else { s32 contpadtouse2 = contpad1; @@ -230,11 +230,11 @@ void bgunRumble(s32 handnum, s32 weaponnum) contpadtouse2 = contpad2; } - pakRumble(contpadtouse2, 0.2f, 2, 4); + pak_rumble(contpadtouse2, 0.2f, 2, 4); } } else { if (contpad1 >= 0) { - pakRumble(contpad1, 0.2f, 2, 4); + pak_rumble(contpad1, 0.2f, 2, 4); } } #else @@ -247,9 +247,9 @@ void bgunRumble(s32 handnum, s32 weaponnum) s32 contpadtouse1; s32 contpadtouse2; - if (optionsGetControlMode(g_Vars.currentplayerstats->mpindex) >= CONTROLMODE_21) { - contpad1hasrumble = pakGetType(g_Vars.currentplayernum) == PAKTYPE_RUMBLE; - contpad2hasrumble = pakGetType(g_Vars.currentplayernum + PLAYERCOUNT()) == PAKTYPE_RUMBLE; + if (options_get_control_mode(g_Vars.currentplayerstats->mpindex) >= CONTROLMODE_21) { + contpad1hasrumble = pak_get_type(g_Vars.currentplayernum) == PAKTYPE_RUMBLE; + contpad2hasrumble = pak_get_type(g_Vars.currentplayernum + PLAYERCOUNT()) == PAKTYPE_RUMBLE; if (contpad1hasrumble && contpad2hasrumble) { contpadtouse1 = g_Vars.currentplayernum; @@ -258,7 +258,7 @@ void bgunRumble(s32 handnum, s32 weaponnum) contpadtouse1 += PLAYERCOUNT(); } - pakRumble(contpadtouse1, 0.2f, 2, 4); + pak_rumble(contpadtouse1, 0.2f, 2, 4); } else { contpadtouse2 = g_Vars.currentplayernum; @@ -266,16 +266,16 @@ void bgunRumble(s32 handnum, s32 weaponnum) contpadtouse2 += PLAYERCOUNT(); } - pakRumble(contpadtouse2, 0.2f, 2, 4); + pak_rumble(contpadtouse2, 0.2f, 2, 4); } } else { - pakRumble(g_Vars.currentplayernum, 0.2f, 2, 4); + pak_rumble(g_Vars.currentplayernum, 0.2f, 2, 4); } #endif } #else GLOBAL_ASM( -glabel bgunRumble +glabel bgun_rumble /* f095b30: 27bdffd0 */ addiu $sp,$sp,-48 /* f095b34: 3c08800a */ lui $t0,%hi(g_Vars) /* f095b38: 2508e6c0 */ addiu $t0,$t0,%lo(g_Vars) @@ -283,13 +283,13 @@ glabel bgunRumble /* f095b40: afbf0014 */ sw $ra,0x14($sp) /* f095b44: afa40030 */ sw $a0,0x30($sp) /* f095b48: afa50034 */ sw $a1,0x34($sp) -/* f095b4c: 0fc53380 */ jal optionsGetControlMode +/* f095b4c: 0fc53380 */ jal options_get_control_mode /* f095b50: 8dc40070 */ lw $a0,0x70($t6) /* f095b54: 3c08800a */ lui $t0,%hi(g_Vars) /* f095b58: 28410004 */ slti $at,$v0,0x4 /* f095b5c: 1420007c */ bnez $at,.NB0f095d50 /* f095b60: 2508e6c0 */ addiu $t0,$t0,%lo(g_Vars) -/* f095b64: 0fc44336 */ jal pakGetType +/* f095b64: 0fc44336 */ jal pak_get_type /* f095b68: 8104028f */ lb $a0,0x28f($t0) /* f095b6c: 3c08800a */ lui $t0,%hi(g_Vars) /* f095b70: 2508e6c0 */ addiu $t0,$t0,%lo(g_Vars) @@ -330,7 +330,7 @@ glabel bgunRumble /* f095be8: 01f82021 */ addu $a0,$t7,$t8 /* f095bec: 0004ce00 */ sll $t9,$a0,0x18 /* f095bf0: 00192603 */ sra $a0,$t9,0x18 -/* f095bf4: 0fc44336 */ jal pakGetType +/* f095bf4: 0fc44336 */ jal pak_get_type /* f095bf8: afa6001c */ sw $a2,0x1c($sp) /* f095bfc: 8fa6001c */ lw $a2,0x1c($sp) /* f095c00: 3c08800a */ lui $t0,%hi(g_Vars) @@ -379,7 +379,7 @@ glabel bgunRumble /* f095c98: 34a5cccd */ ori $a1,$a1,0xcccd /* f095c9c: 03002025 */ or $a0,$t8,$zero /* f095ca0: 24060002 */ addiu $a2,$zero,0x2 -/* f095ca4: 0fc45e2f */ jal pakRumble +/* f095ca4: 0fc45e2f */ jal pak_rumble /* f095ca8: 24070004 */ addiu $a3,$zero,0x4 /* f095cac: 1000002f */ beqz $zero,.NB0f095d6c /* f095cb0: 8fbf0014 */ lw $ra,0x14($sp) @@ -424,7 +424,7 @@ glabel bgunRumble /* f095d34: 34a5cccd */ ori $a1,$a1,0xcccd /* f095d38: 01a02025 */ or $a0,$t5,$zero /* f095d3c: 24060002 */ addiu $a2,$zero,0x2 -/* f095d40: 0fc45e2f */ jal pakRumble +/* f095d40: 0fc45e2f */ jal pak_rumble /* f095d44: 24070004 */ addiu $a3,$zero,0x4 /* f095d48: 10000008 */ beqz $zero,.NB0f095d6c /* f095d4c: 8fbf0014 */ lw $ra,0x14($sp) @@ -433,7 +433,7 @@ glabel bgunRumble /* f095d54: 34a5cccd */ ori $a1,$a1,0xcccd /* f095d58: 8104028f */ lb $a0,0x28f($t0) /* f095d5c: 24060002 */ addiu $a2,$zero,0x2 -/* f095d60: 0fc45e2f */ jal pakRumble +/* f095d60: 0fc45e2f */ jal pak_rumble /* f095d64: 24070004 */ addiu $a3,$zero,0x4 /* f095d68: 8fbf0014 */ lw $ra,0x14($sp) .NB0f095d6c: @@ -443,7 +443,7 @@ glabel bgunRumble ); #endif -s32 bgunGetUnequippedReloadIndex(s32 weaponnum) +s32 bgun_get_unequipped_reload_index(s32 weaponnum) { if (weaponnum == WEAPON_CROSSBOW) { return 0; @@ -473,7 +473,7 @@ s32 bgunGetUnequippedReloadIndex(s32 weaponnum) * The gunroundsspent value is actually a countdown timer, * not the number of rounds as the name suggests. */ -void bgunTickUnequippedReload(void) +void bgun_tick_unequipped_reload(void) { s32 i; s32 j; @@ -493,7 +493,7 @@ void bgunTickUnequippedReload(void) } } -bool bgunTestGunVisCommand(struct gunviscmd *cmd, struct hand *hand) +bool bgun_test_gun_vis_command(struct gunviscmd *cmd, struct hand *hand) { bool result = true; @@ -518,13 +518,13 @@ bool bgunTestGunVisCommand(struct gunviscmd *cmd, struct hand *hand) return result; } -void bgunSetPartVisible(s16 partnum, bool visible, struct hand *hand, struct modeldef *modeldef) +void bgun_set_part_visible(s16 partnum, bool visible, struct hand *hand, struct modeldef *modeldef) { struct modelnode *node; if (partnum == MODELPART_HAND_LEFT || partnum == MODELPART_HAND_RIGHT) { if (g_Vars.currentplayer->gunctrl.handmodeldef) { - node = modelGetPart(g_Vars.currentplayer->gunctrl.handmodeldef, partnum); + node = model_get_part(g_Vars.currentplayer->gunctrl.handmodeldef, partnum); if (node) { struct modelrodata_toggle *rodata = &node->rodata->toggle; @@ -533,7 +533,7 @@ void bgunSetPartVisible(s16 partnum, bool visible, struct hand *hand, struct mod } } } else { - node = modelGetPart(modeldef, partnum); + node = model_get_part(modeldef, partnum); if (node) { struct modelrodata_toggle *rodata = &node->rodata->toggle; @@ -543,7 +543,7 @@ void bgunSetPartVisible(s16 partnum, bool visible, struct hand *hand, struct mod } } -void bgunExecuteGunVisCommands(struct hand *hand, struct modeldef *modeldef, struct gunviscmd *commands) +void bgun_execute_gun_vis_commands(struct hand *hand, struct modeldef *modeldef, struct gunviscmd *commands) { struct gunviscmd *cmd = commands; bool done = false; @@ -553,21 +553,21 @@ void bgunExecuteGunVisCommands(struct hand *hand, struct modeldef *modeldef, str } while (!done) { - if (bgunTestGunVisCommand(cmd, hand)) { + if (bgun_test_gun_vis_command(cmd, hand)) { if (cmd->op == GUNVISOP_IFTRUE_SETVISIBLE) { - bgunSetPartVisible(cmd->partnum, true, hand, modeldef); + bgun_set_part_visible(cmd->partnum, true, hand, modeldef); } if (cmd->op == GUNVISOP_IFTRUE_SETHIDDEN) { - bgunSetPartVisible(cmd->partnum, false, hand, modeldef); + bgun_set_part_visible(cmd->partnum, false, hand, modeldef); } if (cmd->op == GUNVISOP_SETVISIBILITY) { - bgunSetPartVisible(cmd->partnum, true, hand, modeldef); + bgun_set_part_visible(cmd->partnum, true, hand, modeldef); } } else { if (cmd->op == GUNVISOP_SETVISIBILITY) { - bgunSetPartVisible(cmd->partnum, false, hand, modeldef); + bgun_set_part_visible(cmd->partnum, false, hand, modeldef); } } @@ -581,20 +581,20 @@ void bgunExecuteGunVisCommands(struct hand *hand, struct modeldef *modeldef, str void bgun0f098030(struct hand *hand, struct modeldef *modeldef) { - struct weapon *weapon = weaponFindById(hand->gset.weaponnum); + struct weapon *weapon = weapon_find_by_id(hand->gset.weaponnum); s32 i; s32 j; - bgunExecuteGunVisCommands(hand, modeldef, weapon->gunviscmds); - bgunSetPartVisible(MODELPART_0042, false, hand, modeldef); + bgun_execute_gun_vis_commands(hand, modeldef, weapon->gunviscmds); + bgun_set_part_visible(MODELPART_0042, false, hand, modeldef); for (i = 0; i < 2; i++) { if (weapon->ammos[i] && (weapon->ammos[i]->flags & AMMOFLAG_QTYAFFECTSPARTVIS)) { for (j = 0; j < hand->clipsizes[i]; j++) { if (j >= hand->loadedammo[i]) { - bgunSetPartVisible(j + 100, false, hand, modeldef); + bgun_set_part_visible(j + 100, false, hand, modeldef); } else { - bgunSetPartVisible(j + 100, true, hand, modeldef); + bgun_set_part_visible(j + 100, true, hand, modeldef); } } } @@ -605,10 +605,10 @@ f32 bgun0f09815c(struct hand *hand) { if (hand->animmode == HANDANIMMODE_BUSY && hand->unk0ce8 != NULL) { if (hand->unk0ce8->unk04 < 0) { - return modelGetNumAnimFrames(&hand->gunmodel) - modelGetCurAnimFrame(&hand->gunmodel); + return model_get_num_anim_frames(&hand->gunmodel) - model_get_cur_anim_frame(&hand->gunmodel); } - return modelGetCurAnimFrame(&hand->gunmodel); + return model_get_cur_anim_frame(&hand->gunmodel); } return 0; @@ -635,7 +635,7 @@ void bgun0f0981e8(struct hand *hand, struct modeldef *modeldef) hand->unk0cc8_04 = false; - if (hand->animmode == HANDANIMMODE_BUSY && bgun0f09815c(hand) >= modelGetNumAnimFrames(&hand->gunmodel) - 1) { + if (hand->animmode == HANDANIMMODE_BUSY && bgun0f09815c(hand) >= model_get_num_anim_frames(&hand->gunmodel) - 1) { hand->animmode = HANDANIMMODE_IDLE; } @@ -658,16 +658,16 @@ void bgun0f0981e8(struct hand *hand, struct modeldef *modeldef) } if (hand->unk0ce8 && animspeed < 0.0f) { - modelSetAnimation(&hand->gunmodel, hand->animload, false, 0.0f, animspeedmult * animspeed, 0.0f); - modelSetAnimFrame(&hand->gunmodel, modelGetNumAnimFrames(&hand->gunmodel)); + model_set_animation(&hand->gunmodel, hand->animload, false, 0.0f, animspeedmult * animspeed, 0.0f); + model_set_anim_frame(&hand->gunmodel, model_get_num_anim_frames(&hand->gunmodel)); } else { - modelSetAnimation(&hand->gunmodel, hand->animload, false, 0.0f, animspeedmult * animspeed, 0.0f); + model_set_animation(&hand->gunmodel, hand->animload, false, 0.0f, animspeedmult * animspeed, 0.0f); } hand->animload = -1; hand->animmode = HANDANIMMODE_BUSY; #if VERSION >= VERSION_PAL_BETA - hand->animframeincfreal = modelGetAbsAnimSpeed(&hand->gunmodel) * PALUPF(hand->animframeinc); + hand->animframeincfreal = model_get_abs_anim_speed(&hand->gunmodel) * PALUPF(hand->animframeinc); #endif } @@ -737,11 +737,11 @@ void bgun0f0981e8(struct hand *hand, struct modeldef *modeldef) if (hand->animframeincfreal > tmp) { #if PAL - hand->animframeinc = tmp * 0.83333333f / modelGetAbsAnimSpeed(&hand->gunmodel); + hand->animframeinc = tmp * 0.83333333f / model_get_abs_anim_speed(&hand->gunmodel); #else - hand->animframeinc = tmp / modelGetAbsAnimSpeed(&hand->gunmodel); + hand->animframeinc = tmp / model_get_abs_anim_speed(&hand->gunmodel); #endif - hand->animframeincfreal = modelGetAbsAnimSpeed(&hand->gunmodel) * PALUPF(hand->animframeinc); + hand->animframeincfreal = model_get_abs_anim_speed(&hand->gunmodel) * PALUPF(hand->animframeinc); } s2 = hand->animframeincfreal + s4; @@ -776,7 +776,7 @@ void bgun0f0981e8(struct hand *hand, struct modeldef *modeldef) hand->animframeinc = 0; #endif - modelSetAnimFrame(&hand->gunmodel, sp78); + model_set_anim_frame(&hand->gunmodel, sp78); hand->animloopcount++; s2 = sp78; } @@ -791,17 +791,17 @@ void bgun0f0981e8(struct hand *hand, struct modeldef *modeldef) s32 i; for (i = 0; i < s0; i++) { - bgunSetPartVisible(partnums[i], partsvisible[i], hand, modeldef); + bgun_set_part_visible(partnums[i], partsvisible[i], hand, modeldef); } } } } #if VERSION >= VERSION_PAL_BETA - modelSetAnimPlaySpeed(&hand->gunmodel, PALUPF(4.0f), 0); - modelTickAnimQuarterSpeed(&hand->gunmodel, hand->animframeinc, true); + model_set_anim_play_speed(&hand->gunmodel, PALUPF(4.0f), 0); + model_tick_anim_quarter_speed(&hand->gunmodel, hand->animframeinc, true); #else - modelTickAnim(&hand->gunmodel, hand->animframeinc, true); + model_tick_anim(&hand->gunmodel, hand->animframeinc, true); #endif s2 = bgun0f09815c(hand); @@ -831,7 +831,7 @@ void bgun0f0981e8(struct hand *hand, struct modeldef *modeldef) snd00010718(0, 0, AL_VOL_FULL, AL_PAN_CENTER, cmd->unk04, 1.0f, 1, -1, 1); } #else - audiohandle = sndStart(var80095200, cmd->unk04, NULL, -1, -1, -1, -1, -1); + audiohandle = snd_start(var80095200, cmd->unk04, NULL, -1, -1, -1, -1, -1); if (hasspeed && audiohandle) { hasspeed = false; @@ -876,7 +876,7 @@ bool bgun0f098884(struct guncmd *cmd, struct gset *gset) return result; } -void bgunStartAnimation(struct guncmd *cmd, s32 handnum, struct hand *hand) +void bgun_start_animation(struct guncmd *cmd, s32 handnum, struct hand *hand) { if (cmd->type != GUNCMD_PLAYANIMATION) { struct guncmd *loopcmd = cmd; @@ -887,11 +887,11 @@ void bgunStartAnimation(struct guncmd *cmd, s32 handnum, struct hand *hand) if (bgun0f098884(loopcmd, &hand->gset) && !done) { if (loopcmd->type == GUNCMD_INCLUDE) { done = true; - bgunStartAnimation((struct guncmd *)loopcmd->unk04, handnum, hand); + bgun_start_animation((struct guncmd *)loopcmd->unk04, handnum, hand); } else if (loopcmd->type == GUNCMD_RANDOM) { if ((struct guncmd *)loopcmd->unk04 != hand->unk0d80 && loopcmd->unk02 > rand) { done = true; - bgunStartAnimation((struct guncmd *)loopcmd->unk04, handnum, hand); + bgun_start_animation((struct guncmd *)loopcmd->unk04, handnum, hand); } } } @@ -978,12 +978,12 @@ s32 bgun0f098b80(struct hand *hand, s32 arg1) return keyframe; } -bool bgunIsAnimBusy(struct hand *hand) +bool bgun_is_anim_busy(struct hand *hand) { return hand->animmode != HANDANIMMODE_IDLE; } -void bgunResetAnim(struct hand *hand) +void bgun_reset_anim(struct hand *hand) { hand->animload = -1; hand->animmode = HANDANIMMODE_IDLE; @@ -995,9 +995,9 @@ void bgunResetAnim(struct hand *hand) hand->unk0d0e_07 = false; } -void bgunGetWeaponInfo(struct handweaponinfo *info, s32 handnum) +void bgun_get_weapon_info(struct handweaponinfo *info, s32 handnum) { - s32 weaponnum = bgunGetWeaponNum2(handnum); + s32 weaponnum = bgun_get_weapon_num2(handnum); info->weaponnum = weaponnum; info->definition = g_Weapons[weaponnum]; @@ -1015,7 +1015,7 @@ void bgunGetWeaponInfo(struct handweaponinfo *info, s32 handnum) s32 bgun0f098ca0(s32 funcnum, struct handweaponinfo *info, struct hand *hand) { s32 result = 3; - struct weaponfunc *func = weaponGetFunction(&hand->gset, funcnum); + struct weaponfunc *func = weapon_get_function(&hand->gset, funcnum); if (!func) { return -1; @@ -1033,7 +1033,7 @@ s32 bgun0f098ca0(s32 funcnum, struct handweaponinfo *info, struct hand *hand) } if (info->weaponnum == WEAPON_TRANQUILIZER && funcnum == FUNC_SECONDARY) { - minqty = bgunGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); + minqty = bgun_get_min_clip_qty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); } result = 1; @@ -1057,7 +1057,7 @@ s32 bgun0f098ca0(s32 funcnum, struct handweaponinfo *info, struct hand *hand) void bgun0f098df8(s32 weaponfunc, struct handweaponinfo *info, struct hand *hand, u8 onebullet, u8 checkunequipped) { - struct weaponfunc *func = weaponGetFunction(&hand->gset, weaponfunc); + struct weaponfunc *func = weapon_get_function(&hand->gset, weaponfunc); if (func && func->ammoindex != -1) { s32 ammoindex = func->ammoindex; @@ -1065,7 +1065,7 @@ void bgun0f098df8(s32 weaponfunc, struct handweaponinfo *info, struct hand *hand if (info->gunctrl->ammotypes[ammoindex] >= 0) { s32 amount = hand->clipsizes[ammoindex] - hand->loadedammo[ammoindex]; - s32 reloadindex = bgunGetUnequippedReloadIndex(info->weaponnum); + s32 reloadindex = bgun_get_unequipped_reload_index(info->weaponnum); if (g_FrIsValidWeapon) { reloadindex = -1; @@ -1113,7 +1113,7 @@ void bgun0f098f8c(struct handweaponinfo *info, struct hand *hand) s32 i; for (i = 0; i < 2; i++) { - if (weaponGetFunction(&hand->gset, i)) { + if (weapon_get_function(&hand->gset, i)) { bgun0f098df8(i, info, hand, 0, 1); } } @@ -1123,7 +1123,7 @@ bool bgun0f099008(s32 handnum) { struct handweaponinfo info; - bgunGetWeaponInfo(&info, handnum); + bgun_get_weapon_info(&info, handnum); if (bgun0f098ca0(0, &info, &g_Vars.currentplayer->hands[handnum]) > 0) { return true; @@ -1168,7 +1168,7 @@ bool bgun0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon) if (basefunc->ammoindex >= 0 && weapon->ammos[basefunc->ammoindex] - && bgunGetAmmoCount(weapon->ammos[basefunc->ammoindex]->type) <= 0) { + && bgun_get_ammo_count(weapon->ammos[basefunc->ammoindex]->type) <= 0) { return true; } @@ -1177,20 +1177,20 @@ bool bgun0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon) bool bgun0f099188(struct hand *hand, s32 gunfunc) { - struct weaponfunc *func = weaponGetFunction(&hand->gset, gunfunc); - struct weapon *weapon = weaponFindById(hand->gset.weaponnum); + struct weaponfunc *func = weapon_get_function(&hand->gset, gunfunc); + struct weapon *weapon = weapon_find_by_id(hand->gset.weaponnum); - if (bgunIsUsingSecondaryFunction() == gunfunc) { + if (bgun_is_using_secondary_function() == gunfunc) { return false; } return bgun0f0990b0(func, weapon); } -s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgun_tick_inc_idle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { bool usesec; - s32 gunfunc = bgunIsUsingSecondaryFunction(); + s32 gunfunc = bgun_is_using_secondary_function(); s32 sp34; s32 sp30; bool changefunc; @@ -1206,7 +1206,7 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, hand->shotremainder = 0; // If ready to change gun due to manual switch, just do that - if (bgunIsReadyToSwitch(handnum) && bgunSetState(handnum, HANDSTATE_CHANGEGUN)) { + if (bgun_is_ready_to_switch(handnum) && bgun_set_state(handnum, HANDSTATE_CHANGEGUN)) { return lvupdate; } @@ -1233,7 +1233,7 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, hand->count = 0; hand->gset.weaponfunc = gunfunc; - if (bgunSetState(handnum, HANDSTATE_RELOAD)) { + if (bgun_set_state(handnum, HANDSTATE_RELOAD)) { return lvupdate; } } else { @@ -1246,7 +1246,7 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, if (changefunc) { hand->unk0cc8_07 = false; - if (bgunSetState(handnum, HANDSTATE_CHANGEFUNC)) { + if (bgun_set_state(handnum, HANDSTATE_CHANGEFUNC)) { return lvupdate; } } @@ -1256,9 +1256,9 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, // Attempted to shoot with no ammo // Consider switching to another weapon - if (weaponHasFlag(info->weaponnum, WEAPONFLAG_THROWABLE) + if (weapon_has_flag(info->weaponnum, WEAPONFLAG_THROWABLE) && (info->weaponnum != WEAPON_REMOTEMINE || handnum != HAND_LEFT) - && bgunSetState(handnum, HANDSTATE_AUTOSWITCH)) { + && bgun_set_state(handnum, HANDSTATE_AUTOSWITCH)) { return lvupdate; } @@ -1271,7 +1271,7 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, if (bgun0f099188(hand, 1 - hand->gset.weaponfunc) && info->weaponnum != WEAPON_REAPER) { if (info->gunctrl->wantammo) { - func = weaponGetFunction(&hand->gset, 1 - hand->gset.weaponfunc); + func = weapon_get_function(&hand->gset, 1 - hand->gset.weaponfunc); if ((func->type & 0xff) != INVENTORYFUNCTYPE_MELEE) { sp30 = -1; @@ -1284,11 +1284,11 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, if (sp30 < 0) { hand->unk0cc8_08 = true; } else { - if (!weaponHasFlag(info->weaponnum, WEAPONFLAG_04000000) + if (!weapon_has_flag(info->weaponnum, WEAPONFLAG_04000000) || hand->gset.weaponfunc == FUNC_SECONDARY) { hand->unk0cc8_07 = true; - if (bgunSetState(handnum, HANDSTATE_CHANGEFUNC)) { + if (bgun_set_state(handnum, HANDSTATE_CHANGEFUNC)) { return lvupdate; } } @@ -1299,14 +1299,14 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, if (hand->triggeron && info->weaponnum != WEAPON_NONE) { hand->unk0cc8_01 = false; - if (bgunSetState(handnum, HANDSTATE_ATTACKEMPTY)) { + if (bgun_set_state(handnum, HANDSTATE_ATTACKEMPTY)) { return lvupdate; } } else { hand->count60 = 0; hand->count = 0; - if (bgunSetState(handnum, HANDSTATE_RELOAD)) { + if (bgun_set_state(handnum, HANDSTATE_RELOAD)) { return lvupdate; } } @@ -1322,7 +1322,7 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, hand->triggerreleased = false; hand->activatesecondary = false; - if (bgunSetState(handnum, HANDSTATE_ATTACK)) { + if (bgun_set_state(handnum, HANDSTATE_ATTACK)) { return lvupdate; } } @@ -1339,7 +1339,7 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, hand->modenext = HANDMODE_NONE; if (next == HANDMODE_RELOAD && sp34 < 2 && sp34 >= 0) { - if (bgunSetState(handnum, HANDSTATE_RELOAD)) { + if (bgun_set_state(handnum, HANDSTATE_RELOAD)) { if (handnum && handnum && handnum); return lvupdate; } @@ -1350,14 +1350,14 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, if (handnum == HAND_RIGHT) { if (info->gunctrl->wantammo) { - bgunAutoSwitchWeapon(); + bgun_auto_switch_weapon(); } else { lhand = &g_Vars.currentplayer->hands[1] - handnum; if ((hand->unk0cc8_08 || !hand->inuse) && (lhand->unk0cc8_08 || !lhand->inuse) && (hand->triggeron || lhand->triggeron)) { - bgunAutoSwitchWeapon(); + bgun_auto_switch_weapon(); } hand->unk0cc8_08 = lhand->unk0cc8_08 = false; @@ -1367,24 +1367,24 @@ s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, return 0; } -void bgunSetArmPitch(struct hand *hand, f32 angle) +void bgun_set_arm_pitch(struct hand *hand, f32 angle) { hand->useposrot = true; - mtx4LoadXRotation(angle, &hand->posrotmtx); + mtx4_load_x_rotation(angle, &hand->posrotmtx); hand->posrotmtx.m[3][0] = 0; hand->posrotmtx.m[3][1] = (1.0f - cosf(angle)) * -80.0f; hand->posrotmtx.m[3][2] = sinf(angle) * 15.0f; } -s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgun_tick_inc_auto_switch(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { u32 stack; s32 someval; - s32 gunfunc = bgunIsUsingSecondaryFunction(); + s32 gunfunc = bgun_is_using_secondary_function(); - if (!hand->inuse && bgunSetState(handnum, HANDSTATE_IDLE)) { + if (!hand->inuse && bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } @@ -1398,7 +1398,7 @@ s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand if (hand->stateframes >= delay) { hand->stateminor++; // to HANDSTATEMINOR_AUTOSWITCH_DELETE } else { - bgunSetArmPitch(hand, hand->stateframes * MAX_PITCH / delay); + bgun_set_arm_pitch(hand, hand->stateframes * MAX_PITCH / delay); } } @@ -1409,12 +1409,12 @@ s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand #endif hand->shotremainder = 0; - if (bgunIsReadyToSwitch(handnum) && bgunSetState(handnum, HANDSTATE_CHANGEGUN)) { + if (bgun_is_ready_to_switch(handnum) && bgun_set_state(handnum, HANDSTATE_CHANGEGUN)) { if (g_Vars.mplayerisrunning && (IS8MB() || PLAYERCOUNT() != 1)) { - playermgrDeleteWeapon(handnum); + playermgr_delete_weapon(handnum); } - bgunFreeHeldRocket(handnum); + bgun_free_held_rocket(handnum); hand->mode = HANDMODE_6; hand->stateminor = HANDSTATEMINOR_AUTOSWITCH_2; @@ -1431,7 +1431,7 @@ s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand if (info->weaponnum == WEAPON_REMOTEMINE && gunfunc != hand->gset.weaponfunc - && bgunSetState(handnum, HANDSTATE_CHANGEFUNC)) { + && bgun_set_state(handnum, HANDSTATE_CHANGEFUNC)) { return lvupdate; } @@ -1440,7 +1440,7 @@ s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand struct handweaponinfo otherinfo; bool ready = true; - bgunGetWeaponInfo(&otherinfo, 1 - handnum); + bgun_get_weapon_info(&otherinfo, 1 - handnum); if (otherhand->inuse) { if (bgun0f098ca0(0, &otherinfo, otherhand) >= 0) { @@ -1461,7 +1461,7 @@ s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand } if (ready) { - bgunAutoSwitchWeapon(); + bgun_auto_switch_weapon(); } } @@ -1470,7 +1470,7 @@ s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand hand->count60 = 0; hand->count = 0; - if (bgunSetState(handnum, HANDSTATE_RELOAD)) { + if (bgun_set_state(handnum, HANDSTATE_RELOAD)) { if (info->weaponnum == WEAPON_COMBATKNIFE) { hand->mode = HANDMODE_11; hand->pausetime60 = TICKS(17); @@ -1492,13 +1492,13 @@ s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand } } - bgunSetArmPitch(hand, MAX_PITCH); + bgun_set_arm_pitch(hand, MAX_PITCH); } return 0; } -bool bgunIsReloading(struct hand *hand) +bool bgun_is_reloading(struct hand *hand) { if (hand->state == HANDSTATE_RELOAD) { return true; @@ -1507,16 +1507,16 @@ bool bgunIsReloading(struct hand *hand) return false; } -s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgun_tick_inc_reload(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { u32 stack; - struct weaponfunc *func = gsetGetWeaponFunction(&hand->gset); + struct weaponfunc *func = gset_get_weapon_function(&hand->gset); if (g_Vars.currentplayer->isdead) { hand->animmode = HANDANIMMODE_IDLE; hand->animload = -1; - if (bgunSetState(handnum, HANDSTATE_IDLE)) { + if (bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } } @@ -1550,7 +1550,7 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han if (func && (func->ammoindex == 0 || func->ammoindex == 1)) { if (info->definition->ammos[func->ammoindex]->reload_animation && info->weaponnum != WEAPON_COMBATKNIFE) { - bgunStartAnimation(info->definition->ammos[func->ammoindex]->reload_animation, handnum, hand); + bgun_start_animation(info->definition->ammos[func->ammoindex]->reload_animation, handnum, hand); hand->unk0d0e_07 = true; @@ -1565,7 +1565,7 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han hand->stateminor++; // to HANDSTATEMINOR_RELOAD_LOWER } } else { - if (bgunSetState(handnum, HANDSTATE_IDLE)) { + if (bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } } @@ -1610,7 +1610,7 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han } if (hand->animmode != HANDANIMMODE_BUSY) { - if (bgunSetState(handnum, HANDSTATE_IDLE)) { + if (bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } } @@ -1627,7 +1627,7 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han hand->count60 = 0; hand->count = 0; } else { - bgunSetArmPitch(hand, hand->count60 * MAX_PITCH / TICKS(16)); + bgun_set_arm_pitch(hand, hand->count60 * MAX_PITCH / TICKS(16)); } } @@ -1636,7 +1636,7 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han if (info->weaponnum == WEAPON_COMBATKNIFE && func->ammoindex >= 0 && info->definition->ammos[func->ammoindex]->reload_animation) { - bgunStartAnimation(info->definition->ammos[func->ammoindex]->reload_animation, handnum, hand); + bgun_start_animation(info->definition->ammos[func->ammoindex]->reload_animation, handnum, hand); hand->unk0cc8_02 = true; } @@ -1646,7 +1646,7 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han if (g_Vars.lvupdate240 > 0 && g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON - && bgunIsLoaded() + && bgun_is_loaded() && !g_PlayerInvincible && !g_Vars.currentplayer->isdead) { switch (info->weaponnum) { @@ -1666,7 +1666,7 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han // No reload sound break; default: - sndStart(var80095200, SFX_RELOAD_DEFAULT, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_RELOAD_DEFAULT, 0, -1, -1, -1, -1, -1); break; } } @@ -1678,7 +1678,7 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han hand->count60 = 0; hand->count = 0; } else { - bgunSetArmPitch(hand, MAX_PITCH); + bgun_set_arm_pitch(hand, MAX_PITCH); } } @@ -1692,42 +1692,42 @@ s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *han } if (hand->count60 >= TICKS(23) - || !weaponGetFileNum2(info->weaponnum) - || !weaponHasFlag(info->weaponnum, WEAPONFLAG_00000040) - || weaponHasFlag(info->weaponnum, WEAPONFLAG_00000080)) { + || !weapon_get_file_num2(info->weaponnum) + || !weapon_has_flag(info->weaponnum, WEAPONFLAG_00000040) + || weapon_has_flag(info->weaponnum, WEAPONFLAG_00000080)) { hand->mode = HANDMODE_NONE; hand->count60 = 0; hand->count = 0; - if (bgunSetState(handnum, HANDSTATE_IDLE)) { + if (bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } } else { - bgunSetArmPitch(hand, (TICKS(23) - hand->count60) * MAX_PITCH / TICKS(23)); + bgun_set_arm_pitch(hand, (TICKS(23) - hand->count60) * MAX_PITCH / TICKS(23)); } } return 0; } -s32 bgunTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgun_tick_inc_change_func(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { struct guncmd *cmd; bool more = false; if (hand->statecycles == 0) { if (hand->gset.weaponfunc == FUNC_PRIMARY) { - cmd = gsetGetPriToSecAnim(&hand->gset); + cmd = gset_get_pri_to_sec_anim(&hand->gset); hand->gset.weaponfunc = FUNC_SECONDARY; } else { - cmd = gsetGetSecToPriAnim(&hand->gset); + cmd = gset_get_sec_to_pri_anim(&hand->gset); hand->gset.weaponfunc = FUNC_PRIMARY; } more = false; if (cmd != NULL) { - bgunStartAnimation(cmd, handnum, hand); + bgun_start_animation(cmd, handnum, hand); more = true; g_Vars.currentplayer->hands[HAND_RIGHT].unk0dd4 = -1; } @@ -1737,7 +1737,7 @@ s32 bgunTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand } } - if (!more && bgunSetState(handnum, HANDSTATE_IDLE)) { + if (!more && bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } @@ -1869,8 +1869,8 @@ void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, s static u32 rontime = 2; static u32 rofftime = 4; - mainOverrideVariable("rontime", &rontime); - mainOverrideVariable("rofftime", &rofftime); + main_override_variable("rontime", &rontime); + main_override_variable("rofftime", &rofftime); hand->firing = true; @@ -1908,7 +1908,7 @@ void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, s hand->flashon = true; } - bgunStartSlide(handnum); + bgun_start_slide(handnum); hand->loadslide = 0; @@ -1917,7 +1917,7 @@ void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, s hand->stateflags |= HANDSTATEFLAG_FIRED; hand->stateflags |= HANDSTATEFLAG_BUSY; - bgunRumble(handnum, info->weaponnum); + bgun_rumble(handnum, info->weaponnum); if (usesammo && func->ammoindex >= 0) { hand->loadedammo[func->ammoindex] -= hand->shotstotake; @@ -1943,10 +1943,10 @@ void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, s if (hand->firing) { bool playsound = false; - if (gsetGetFireslotDuration(&hand->gset) > 0) { + if (gset_get_fireslot_duration(&hand->gset) > 0) { if (g_Vars.lvframe60 != g_Vars.currentplayer->hands[1 - handnum].lastshootframe60 && g_Vars.lvframe60 > hand->allowshootframe) { - hand->allowshootframe = g_Vars.lvframe60 + gsetGetFireslotDuration(&hand->gset); + hand->allowshootframe = g_Vars.lvframe60 + gset_get_fireslot_duration(&hand->gset); playsound = true; } } else { @@ -1969,13 +1969,13 @@ void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, s audioStop(hand->audiohandle3); } - if (gsetGetSingleShootSound(&hand->gset)) { + if (gset_get_single_shoot_sound(&hand->gset)) { struct sndstate *handle = NULL; if (hand->audiohandle2 == NULL) { - handle = sndStart(var80095200, gsetGetSingleShootSound(&hand->gset), &hand->audiohandle2, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, gset_get_single_shoot_sound(&hand->gset), &hand->audiohandle2, -1, -1, -1, -1, -1); } else if (hand->audiohandle3 == NULL) { - handle = sndStart(var80095200, gsetGetSingleShootSound(&hand->gset), &hand->audiohandle3, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, gset_get_single_shoot_sound(&hand->gset), &hand->audiohandle3, -1, -1, -1, -1, -1); } hand->lastshootframe60 = g_Vars.lvframe60; @@ -2003,7 +2003,7 @@ void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, s } } -bool bgunTickRecoil(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc_shoot *func) +bool bgun_tick_recoil(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc_shoot *func) { s32 unk24; s32 unk25; @@ -2098,17 +2098,17 @@ bool bgunTickRecoil(struct hand *hand, struct handweaponinfo *info, s32 handnum, if (curframe - hand->statevar1 < unk27) { mult1 = cosf((f32)(unk27 - curframe + hand->statevar1) * RAD(90, 1.5707963705063f) / (f32)unk27) * 0.5f + 0.5f; - hand->rotxoffset = modelTweenRotAxis(hand->rotxstart, hand->rotxend, mult1); + hand->rotxoffset = model_tween_rot_axis(hand->rotxstart, hand->rotxend, mult1); hand->useposrot = true; hand->posoffset.x = (hand->posend.x - hand->posstart.x) * mult1 + hand->posstart.x; hand->posoffset.y = (hand->posend.y - hand->posstart.y) * mult1 + hand->posstart.y; hand->posoffset.z = (hand->posend.z - hand->posstart.z) * mult1 + hand->posstart.z; - mtx4LoadXRotation(hand->rotxoffset, &hand->posrotmtx); - mtx4SetTranslation(&hand->posoffset, &hand->posrotmtx); + mtx4_load_x_rotation(hand->rotxoffset, &hand->posrotmtx); + mtx4_set_translation(&hand->posoffset, &hand->posrotmtx); } else { - mtx4LoadIdentity(&hand->posrotmtx); + mtx4_load_identity(&hand->posrotmtx); hand->useposrot = false; return true; } @@ -2138,15 +2138,15 @@ bool bgunTickRecoil(struct hand *hand, struct handweaponinfo *info, s32 handnum, mult2 = cosf((f32)(curframe - unk24) * M_PI / (f32)unk25) * 0.5f + 0.5f; } - hand->rotxoffset = modelTweenRotAxis(hand->rotxstart, hand->rotxend, mult2); + hand->rotxoffset = model_tween_rot_axis(hand->rotxstart, hand->rotxend, mult2); hand->useposrot = true; hand->posoffset.x = (hand->posend.x - hand->posstart.x) * mult2 + hand->posstart.x; hand->posoffset.y = (hand->posend.y - hand->posstart.y) * mult2 + hand->posstart.y; hand->posoffset.z = (hand->posend.z - hand->posstart.z) * mult2 + hand->posstart.z; - mtx4LoadXRotation(hand->rotxoffset, &hand->posrotmtx); - mtx4SetTranslation(&hand->posoffset, &hand->posrotmtx); + mtx4_load_x_rotation(hand->rotxoffset, &hand->posrotmtx); + mtx4_set_translation(&hand->posoffset, &hand->posrotmtx); } } @@ -2161,11 +2161,11 @@ bool bgunTickRecoil(struct hand *hand, struct handweaponinfo *info, s32 handnum, return false; } -bool bgunTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct hand *hand) +bool bgun_tick_inc_attacking_shoot(struct handweaponinfo *info, s32 handnum, struct hand *hand) { static u32 var80070128 = 99; - struct weaponfunc *func = gsetGetWeaponFunction(&hand->gset); + struct weaponfunc *func = gset_get_weapon_function(&hand->gset); bool canfireagain; s32 sp64; s32 sp60; @@ -2177,13 +2177,13 @@ bool bgunTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct if (hand->stateminor == HANDSTATEMINOR_ATTACK_SHOOT_0) { sp64 = 1; - mainOverrideVariable("gkef", &var80070128); + main_override_variable("gkef", &var80070128); if (hand->statecycles == 0) { hand->gs_float1 = 0; if (func->fire_animation) { - bgunStartAnimation(func->fire_animation, handnum, hand); + bgun_start_animation(func->fire_animation, handnum, hand); hand->unk0cc8_01 = true; } @@ -2237,7 +2237,7 @@ bool bgunTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct if (hand->stateminor == HANDSTATEMINOR_ATTACK_SHOOT_2) { if (hand->stateflags & HANDSTATEFLAG_FIRED) { - canfireagain = bgunTickRecoil(hand, info, handnum, (struct weaponfunc_shoot *) func); + canfireagain = bgun_tick_recoil(hand, info, handnum, (struct weaponfunc_shoot *) func); } else { canfireagain = true; } @@ -2262,9 +2262,9 @@ bool bgunTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct return false; } -bool bgunTickIncAttackingThrow(s32 handnum, struct hand *hand) +bool bgun_tick_inc_attacking_throw(s32 handnum, struct hand *hand) { - struct weaponfunc_throw *func = (struct weaponfunc_throw *) gsetGetWeaponFunction(&hand->gset); + struct weaponfunc_throw *func = (struct weaponfunc_throw *) gset_get_weapon_function(&hand->gset); if (func == NULL) { return true; @@ -2273,19 +2273,19 @@ bool bgunTickIncAttackingThrow(s32 handnum, struct hand *hand) if (hand->stateminor == HANDSTATEMINOR_ATTACK_THROW_0) { if (hand->statecycles == 0) { if (func->base.flags & FUNCFLAG_DISCARDWEAPON) { - invRemoveItemByNum(hand->gset.weaponnum); + inv_remove_item_by_num(hand->gset.weaponnum); g_Vars.currentplayer->gunctrl.throwing = true; #if VERSION >= VERSION_NTSC_1_0 - bgunSwitchToPrevious(); + bgun_switch_to_previous(); #else - bgunAutoSwitchWeapon(); + bgun_auto_switch_weapon(); #endif hand->primetimer60 = 0; return true; } if (func->base.fire_animation) { - bgunStartAnimation(func->base.fire_animation, handnum, hand); + bgun_start_animation(func->base.fire_animation, handnum, hand); hand->unk0cc8_01 = true; } } @@ -2318,7 +2318,7 @@ bool bgunTickIncAttackingThrow(s32 handnum, struct hand *hand) } if (hand->gset.weaponnum == WEAPON_REMOTEMINE - && bgunIsUsingSecondaryFunction() == true + && bgun_is_using_secondary_function() == true && hand->triggerreleased && hand->triggeron) { return true; @@ -2331,7 +2331,7 @@ bool bgunTickIncAttackingThrow(s32 handnum, struct hand *hand) // hand. It waits 4 seconds before finishing, which means the player won't // pull out another grenade until the flames have cleared. if (hand->stateminor == HANDSTATEMINOR_ATTACK_THROW_GRENADEWAIT) { - bgunResetAnim(hand); + bgun_reset_anim(hand); if (hand->stateframes > TICKS(func->activatetime60 + 240)) { return true; @@ -2357,7 +2357,7 @@ bool bgunTickIncAttackingThrow(s32 handnum, struct hand *hand) return false; } -s32 bgunGetMinClipQty(s32 weaponnum, s32 funcnum) +s32 bgun_get_min_clip_qty(s32 weaponnum, s32 funcnum) { if (weaponnum == WEAPON_TRANQUILIZER && funcnum == FUNC_SECONDARY) { return 4; @@ -2374,9 +2374,9 @@ const char var7f1ab938[] = "GiveMem: %d\n"; u32 var8007012c = 0x00000000; u32 var80070130 = 0x00000000; -bool bgunTickIncAttackingMelee(s32 handnum, struct hand *hand) +bool bgun_tick_inc_attacking_melee(s32 handnum, struct hand *hand) { - struct weaponfunc *func = gsetGetWeaponFunction(&hand->gset); + struct weaponfunc *func = gset_get_weapon_function(&hand->gset); if (func == NULL) { return true; @@ -2412,7 +2412,7 @@ bool bgunTickIncAttackingMelee(s32 handnum, struct hand *hand) hand->attacktype = HANDATTACKTYPE_MELEENOUNCLOAK; if (func->fire_animation) { - bgunStartAnimation(func->fire_animation, handnum, hand); + bgun_start_animation(func->fire_animation, handnum, hand); hand->unk0cc8_01 = true; } } @@ -2441,8 +2441,8 @@ bool bgunTickIncAttackingMelee(s32 handnum, struct hand *hand) hand->attacktype = HANDATTACKTYPE_MELEE; if (hand->gset.weaponnum == WEAPON_TRANQUILIZER && func->ammoindex >= 0) { - if (hand->loadedammo[func->ammoindex] > bgunGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY)) { - hand->loadedammo[func->ammoindex] -= bgunGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); + if (hand->loadedammo[func->ammoindex] > bgun_get_min_clip_qty(WEAPON_TRANQUILIZER, FUNC_SECONDARY)) { + hand->loadedammo[func->ammoindex] -= bgun_get_min_clip_qty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); } else { hand->loadedammo[func->ammoindex] = 0; } @@ -2456,7 +2456,7 @@ bool bgunTickIncAttackingMelee(s32 handnum, struct hand *hand) } } - if (cheatIsActive(CHEAT_HURRICANEFISTS)) { + if (cheat_is_active(CHEAT_HURRICANEFISTS)) { hand->stateminor = HANDSTATEMINOR_ATTACK_MELEE_2; } @@ -2464,11 +2464,11 @@ bool bgunTickIncAttackingMelee(s32 handnum, struct hand *hand) } if (hand->stateminor == HANDSTATEMINOR_ATTACK_MELEE_2) { - if (!bgunIsAnimBusy(hand)) { + if (!bgun_is_anim_busy(hand)) { return true; } - if (cheatIsActive(CHEAT_HURRICANEFISTS) && hand->gset.weaponnum == WEAPON_UNARMED) { + if (cheat_is_active(CHEAT_HURRICANEFISTS) && hand->gset.weaponnum == WEAPON_UNARMED) { return true; } @@ -2482,9 +2482,9 @@ bool bgunTickIncAttackingMelee(s32 handnum, struct hand *hand) return false; } -bool bgunTickIncAttackingSpecial(struct hand *hand) +bool bgun_tick_inc_attacking_special(struct hand *hand) { - struct weaponfunc_special *func = (struct weaponfunc_special *) gsetGetWeaponFunction(&hand->gset); + struct weaponfunc_special *func = (struct weaponfunc_special *) gset_get_weapon_function(&hand->gset); if (!func) { return true; @@ -2517,7 +2517,7 @@ bool bgunTickIncAttackingSpecial(struct hand *hand) return false; } -s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgun_tick_inc_attack_empty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { u32 stack; bool playsound = false; @@ -2545,7 +2545,7 @@ s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand hand->stateframes -= TICKS(25); hand->stateflags = 0; - bgunResetAnim(hand); + bgun_reset_anim(hand); } if (hand->animmode != HANDANIMMODE_BUSY) { @@ -2555,11 +2555,11 @@ s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand struct weaponfunc *func = NULL; if (info->definition) { - func = gsetGetWeaponFunction(&hand->gset); + func = gset_get_weapon_function(&hand->gset); } if (func && func->fire_animation) { - bgunStartAnimation(func->fire_animation, handnum, hand); + bgun_start_animation(func->fire_animation, handnum, hand); restartedanim = true; } } @@ -2580,7 +2580,7 @@ s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand hand->stateframes -= TICKS(25); hand->stateflags = 0; - bgunResetAnim(hand); + bgun_reset_anim(hand); } } @@ -2607,7 +2607,7 @@ s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand struct sndstate *handle; #endif - handle = sndStart(var80095200, SFX_HIT_WATER, NULL, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, SFX_HIT_WATER, NULL, -1, -1, -1, -1, -1); if (handle) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(s32 *)&speed); @@ -2633,7 +2633,7 @@ s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand struct sndstate *handle; #endif - handle = sndStart(var80095200, SFX_FIREEMPTY, NULL, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, SFX_FIREEMPTY, NULL, -1, -1, -1, -1, -1); if (handle) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(s32 *)&speed); @@ -2656,7 +2656,7 @@ s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand break; default: // Default click sound effect - sndStart(var80095200, SFX_FIREEMPTY, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_FIREEMPTY, NULL, -1, -1, -1, -1, -1); break; } } @@ -2667,17 +2667,17 @@ s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand hand->count60 = 0; hand->count = 0; - if (bgunSetState(handnum, HANDSTATE_IDLE)) { + if (bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } - bgunResetAnim(hand); + bgun_reset_anim(hand); } return 0; } -s32 bgunTickIncAttack(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) { u32 stack; struct weaponfunc *func = NULL; @@ -2685,22 +2685,22 @@ s32 bgunTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *han u32 stack2; if (info->definition) { - func = gsetGetWeaponFunction(&hand->gset); + func = gset_get_weapon_function(&hand->gset); } if (func != NULL) { switch (func->type & 0xff) { case INVENTORYFUNCTYPE_SHOOT: - finished = bgunTickIncAttackingShoot(info, handnum, hand); + finished = bgun_tick_inc_attacking_shoot(info, handnum, hand); break; case INVENTORYFUNCTYPE_THROW: - finished = bgunTickIncAttackingThrow(handnum, hand); + finished = bgun_tick_inc_attacking_throw(handnum, hand); break; case INVENTORYFUNCTYPE_MELEE: - finished = bgunTickIncAttackingMelee(handnum, hand); + finished = bgun_tick_inc_attacking_melee(handnum, hand); break; case INVENTORYFUNCTYPE_SPECIAL: - finished = bgunTickIncAttackingSpecial(hand); + finished = bgun_tick_inc_attacking_special(hand); break; } } @@ -2711,7 +2711,7 @@ s32 bgunTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *han finished = false; } - if (finished && bgunSetState(handnum, HANDSTATE_IDLE)) { + if (finished && bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } } @@ -2722,13 +2722,13 @@ s32 bgunTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *han return 0; } -bool bgunIsReadyToSwitch(s32 handnum) +bool bgun_is_ready_to_switch(s32 handnum) { struct player *player = g_Vars.currentplayer; // Dont switch if... something firing range related if (g_FrIsValidWeapon - && frGetWeaponBySlot(frGetSlot()) == player->hands[HAND_RIGHT].gset.weaponnum + && fr_get_weapon_by_slot(fr_get_slot()) == player->hands[HAND_RIGHT].gset.weaponnum && g_Vars.currentplayer->gunctrl.throwing == false) { return false; } @@ -2772,7 +2772,7 @@ bool bgunIsReadyToSwitch(s32 handnum) return false; } -bool bgunCanFreeWeapon(s32 handnum) +bool bgun_can_free_weapon(s32 handnum) { struct player *player = g_Vars.currentplayer; @@ -2791,7 +2791,7 @@ bool bgun0f09bf44(s32 handnum) bool result = true; struct player *player = g_Vars.currentplayer; - if (!bgunIsLoaded()) { + if (!bgun_is_loaded()) { result = false; } @@ -2814,7 +2814,7 @@ bool bgun0f09bf44(s32 handnum) return result; } -s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgun_tick_inc_change_gun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { u32 stack; struct weapon *weapon = info->definition; @@ -2832,7 +2832,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (hand->stateminor == HANDSTATEMINOR_CHANGEGUN_UNEQUIP) { bool skipanim = false; - if (weaponHasFlag(info->weaponnum, WEAPONFLAG_THROWABLE) + if (weapon_has_flag(info->weaponnum, WEAPONFLAG_THROWABLE) && !(info->weaponnum == WEAPON_REMOTEMINE && handnum == HAND_LEFT) && bgun0f098ca0(0, info, hand) < 0) { skipanim = true; @@ -2845,7 +2845,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * && hand->inuse == true && !(hand->ejectstate != EJECTSTATE_INACTIVE && hand->ejecttype == EJECTTYPE_GUN)) { if (hand->statecycles == 0) { - bgunStartAnimation(weapon->unequip_animation, handnum, hand); + bgun_start_animation(weapon->unequip_animation, handnum, hand); } else if (hand->animmode == HANDANIMMODE_IDLE) { hand->stateminor++; // to HANDSTATEMINOR_CHANGEGUN_LOWER } @@ -2900,14 +2900,14 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (hand->stateframes >= delay) { if (!throwing) { if (g_Vars.mplayerisrunning && (IS8MB() || PLAYERCOUNT() != 1)) { - playermgrDeleteWeapon(handnum); + playermgr_delete_weapon(handnum); } - bgunFreeHeldRocket(handnum); + bgun_free_held_rocket(handnum); hand->mode = HANDMODE_6; hand->stateminor++; // to HANDSTATEMINOR_CHANGEGUN_LOAD } else { - bgunSetArmPitch(hand, MAX_PITCH); + bgun_set_arm_pitch(hand, MAX_PITCH); if (g_Vars.currentplayer->gunctrl.throwing == true && hand->inuse) { hand->firing = true; @@ -2916,7 +2916,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * } } } else { - bgunSetArmPitch(hand, hand->stateframes * MAX_PITCH / delay); + bgun_set_arm_pitch(hand, hand->stateframes * MAX_PITCH / delay); } } @@ -2930,14 +2930,14 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (bgun0f09bf44(handnum)) { hand->mode = HANDMODE_7; - if (!hand->inuse && bgunSetState(handnum, HANDSTATE_IDLE)) { + if (!hand->inuse && bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } } } else { - if (bgunIsLoaded()) { + if (bgun_is_loaded()) { if (info->definition->equip_animation) { - bgunStartAnimation(info->definition->equip_animation, handnum, hand); + bgun_start_animation(info->definition->equip_animation, handnum, hand); hand->unk0cc8_02 = true; } @@ -2950,7 +2950,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * } if (hand->mode == HANDMODE_6 || hand->mode == HANDMODE_7) { - bgunSetArmPitch(hand, MAX_PITCH); + bgun_set_arm_pitch(hand, MAX_PITCH); } } @@ -2962,7 +2962,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * delay = TICKS(12); } - if (weaponHasFlag(hand->gset.weaponnum, WEAPONFLAG_00004000)) { + if (weapon_has_flag(hand->gset.weaponnum, WEAPONFLAG_00004000)) { hand->animmode = HANDANIMMODE_IDLE; } else if (weapon->equip_animation) { delay = 1; @@ -2970,15 +2970,15 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (hand->count == 0) { if (g_Vars.mplayerisrunning && (IS8MB() || PLAYERCOUNT() != 1)) { - playermgrCreateWeapon(handnum); + playermgr_create_weapon(handnum); } bgun0f098f8c(info, hand); - if (weaponHasFlag(info->weaponnum, WEAPONFLAG_THROWABLE) + if (weapon_has_flag(info->weaponnum, WEAPONFLAG_THROWABLE) && (info->weaponnum != WEAPON_REMOTEMINE || handnum != HAND_LEFT) && bgun0f098ca0(0, info, hand) < 0 - && bgunSetState(handnum, HANDSTATE_AUTOSWITCH)) { + && bgun_set_state(handnum, HANDSTATE_AUTOSWITCH)) { hand->stateminor = HANDSTATEMINOR_AUTOSWITCH_DELETE; return lvupdate; } @@ -2987,7 +2987,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (g_Vars.lvupdate240 > 0 && g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON - && bgunIsLoaded() + && bgun_is_loaded() && !g_PlayerInvincible && !g_Vars.currentplayer->isdead) { #if VERSION >= VERSION_NTSC_1_0 @@ -3017,7 +3017,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * prevpri1 = osGetThreadPri(0); osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); #endif - handle1 = sndStart(var80095200, SFX_EQUIP_HORIZONSCANNER, 0, -1, -1, -1, -1, -1); + handle1 = snd_start(var80095200, SFX_EQUIP_HORIZONSCANNER, 0, -1, -1, -1, -1, -1); if (handle1) { audioPostEvent(handle1, AL_SNDP_PITCH_EVT, *(s32 *)&speed1); @@ -3028,14 +3028,14 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * #endif break; case WEAPON_LASER: - sndStart(var80095200, SFX_PICKUP_LASER, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_LASER, 0, -1, -1, -1, -1, -1); break; case WEAPON_COMBATKNIFE: - sndStart(var80095200, SFX_PICKUP_KNIFE, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_KNIFE, 0, -1, -1, -1, -1, -1); break; case WEAPON_REMOTEMINE: if (handnum == HAND_RIGHT) { - sndStart(var80095200, SFX_PICKUP_MINE, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_MINE, 0, -1, -1, -1, -1, -1); } break; case WEAPON_TIMEDMINE: @@ -3049,7 +3049,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * case WEAPON_COMMSRIDER: case WEAPON_TRACERBUG: case WEAPON_TARGETAMPLIFIER: - sndStart(var80095200, SFX_PICKUP_MINE, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_MINE, 0, -1, -1, -1, -1, -1); break; case WEAPON_TRANQUILIZER: case WEAPON_PSYCHOSISGUN: @@ -3060,7 +3060,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); #endif - handle2 = sndStart(var80095200, SFX_PICKUP_GUN, 0, -1, -1, -1, -1, -1); + handle2 = snd_start(var80095200, SFX_PICKUP_GUN, 0, -1, -1, -1, -1, -1); if (handle2) { audioPostEvent(handle2, AL_SNDP_PITCH_EVT, *(s32 *)&speed2); @@ -3078,7 +3078,7 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); #endif - handle3 = sndStart(var80095200, SFX_PICKUP_GUN, 0, -1, -1, -1, -1, -1); + handle3 = snd_start(var80095200, SFX_PICKUP_GUN, 0, -1, -1, -1, -1, -1); if (handle3) { audioPostEvent(handle3, AL_SNDP_PITCH_EVT, *(s32 *)&speed3); @@ -3118,40 +3118,40 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * // No equip sound break; default: - sndStart(var80095200, SFX_PICKUP_GUN, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_GUN, 0, -1, -1, -1, -1, -1); break; } } } if (hand->count60 >= delay - || !weaponGetFileNum2(info->weaponnum) - || !weaponHasFlag(info->weaponnum, WEAPONFLAG_00000040) - || weaponHasFlag(info->weaponnum, WEAPONFLAG_00000080)) { + || !weapon_get_file_num2(info->weaponnum) + || !weapon_has_flag(info->weaponnum, WEAPONFLAG_00000040) + || weapon_has_flag(info->weaponnum, WEAPONFLAG_00000080)) { hand->mode = HANDMODE_NONE; hand->stateminor++; // to HANDSTATEMINOR_CHANGEGUN_EQUIP - if (weaponHasFlag(hand->gset.weaponnum, WEAPONFLAG_00004000) == 0) { + if (weapon_has_flag(hand->gset.weaponnum, WEAPONFLAG_00004000) == 0) { hand->unk0cc8_02 = false; } hand->count60 = 0; hand->count = 0; } else { - bgunSetArmPitch(hand, (delay - hand->count60) * MAX_PITCH / delay); + bgun_set_arm_pitch(hand, (delay - hand->count60) * MAX_PITCH / delay); } } // Wait for equip animation to finish then go to idle state if (hand->stateminor == HANDSTATEMINOR_CHANGEGUN_EQUIP) { - if (info->definition->equip_animation && !weaponHasFlag(hand->gset.weaponnum, WEAPONFLAG_00004000)) { + if (info->definition->equip_animation && !weapon_has_flag(hand->gset.weaponnum, WEAPONFLAG_00004000)) { if (hand->animmode == HANDANIMMODE_IDLE) { - if (bgunSetState(handnum, HANDSTATE_IDLE)) { + if (bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } } } else { - if (bgunSetState(handnum, HANDSTATE_IDLE)) { + if (bgun_set_state(handnum, HANDSTATE_IDLE)) { return lvupdate; } } @@ -3165,12 +3165,12 @@ s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * * be held at the side of the screen, pointed upwards. The feature was shown in * a demo video but doesn't exist in any public version of the game. */ -s32 bgunTickIncState2(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) { return 0; } -s32 bgunTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate) +s32 bgun_tick_inc(struct handweaponinfo *info, s32 handnum, s32 lvupdate) { s32 result = 0; struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -3189,28 +3189,28 @@ s32 bgunTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate) switch (hand->state) { case HANDSTATE_IDLE: - result = bgunTickIncIdle(info, handnum, hand, lvupdate); + result = bgun_tick_inc_idle(info, handnum, hand, lvupdate); break; case HANDSTATE_RELOAD: - result = bgunTickIncReload(info, handnum, hand, lvupdate); + result = bgun_tick_inc_reload(info, handnum, hand, lvupdate); break; case HANDSTATE_ATTACK: - result = bgunTickIncAttack(info, handnum, hand, lvupdate); + result = bgun_tick_inc_attack(info, handnum, hand, lvupdate); break; case HANDSTATE_2: - result = bgunTickIncState2(info, handnum, hand, lvupdate); + result = bgun_tick_inc_state2(info, handnum, hand, lvupdate); break; case HANDSTATE_CHANGEGUN: - result = bgunTickIncChangeGun(info, handnum, hand, lvupdate); + result = bgun_tick_inc_change_gun(info, handnum, hand, lvupdate); break; case HANDSTATE_ATTACKEMPTY: - result = bgunTickIncAttackEmpty(info, handnum, hand, lvupdate); + result = bgun_tick_inc_attack_empty(info, handnum, hand, lvupdate); break; case HANDSTATE_AUTOSWITCH: - result = bgunTickIncAutoSwitch(info, handnum, hand, lvupdate); + result = bgun_tick_inc_auto_switch(info, handnum, hand, lvupdate); break; case HANDSTATE_CHANGEFUNC: - result = bgunTickIncChangeFunc(info, handnum, hand, lvupdate); + result = bgun_tick_inc_change_func(info, handnum, hand, lvupdate); break; } @@ -3226,13 +3226,13 @@ s32 bgunTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate) return result; } -bool bgunSetState(s32 handnum, s32 state) +bool bgun_set_state(s32 handnum, s32 state) { bool valid = true; struct hand *hand = &g_Vars.currentplayer->hands[handnum]; // Sanity check - don't allow changing function if there is no other - if (state == HANDSTATE_CHANGEFUNC && weaponGetFunction(&hand->gset, 1 - hand->gset.weaponfunc) == NULL) { + if (state == HANDSTATE_CHANGEFUNC && weapon_get_function(&hand->gset, 1 - hand->gset.weaponfunc) == NULL) { valid = false; } @@ -3248,7 +3248,7 @@ bool bgunSetState(s32 handnum, s32 state) return valid; } -void bgunTickHand(s32 handnum) +void bgun_tick_hand(s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; struct handweaponinfo info; @@ -3264,19 +3264,19 @@ void bgunTickHand(s32 handnum) if (handnum); #endif - bgunGetWeaponInfo(&info, handnum); + bgun_get_weapon_info(&info, handnum); lvupdate = g_Vars.lvupdate60; hand->animframeinc = g_Vars.lvupdate60; #if VERSION >= VERSION_PAL_BETA - hand->animframeincfreal = modelGetAbsAnimSpeed(&hand->gunmodel) * PALUPF(hand->animframeinc); + hand->animframeincfreal = model_get_abs_anim_speed(&hand->gunmodel) * PALUPF(hand->animframeinc); #else hand->animframeincfreal += PALUPF(g_Vars.lvupdate60); #endif while (i >= 0) { - lvupdate = bgunTickInc(&info, handnum, lvupdate); + lvupdate = bgun_tick_inc(&info, handnum, lvupdate); i--; if (lvupdate <= 0) { @@ -3285,12 +3285,12 @@ void bgunTickHand(s32 handnum) } } -void bgunTickSwitch(void) +void bgun_tick_switch(void) { - bgunTickSwitch2(); + bgun_tick_switch2(); } -void bgunInitHandAnims(void) +void bgun_init_hand_anims(void) { struct hand *hand; s32 i; @@ -3307,19 +3307,19 @@ void bgunInitHandAnims(void) hand->animload = -1; hand->animmode = HANDANIMMODE_IDLE; - animInit(&hand->anim); + anim_init(&hand->anim); hand->gunmodel.anim = &hand->anim; hand->handmodel.anim = &hand->anim; } } -f32 bgunGetNoiseRadius(s32 handnum) +f32 bgun_get_noise_radius(s32 handnum) { return g_Vars.currentplayer->hands[handnum].noiseradius; } -void bgunDecreaseNoiseRadius(void) +void bgun_decrease_noise_radius(void) { struct player *player = g_Vars.currentplayer; f32 consideramount; @@ -3329,14 +3329,14 @@ void bgunDecreaseNoiseRadius(void) struct noisesettings noisesettingsright; f32 subamount; - gsetPopulateFromCurrentPlayer(HAND_LEFT, &gsetleft); - gsetPopulateFromCurrentPlayer(HAND_RIGHT, &gsetright); + gset_populate_from_current_player(HAND_LEFT, &gsetleft); + gset_populate_from_current_player(HAND_RIGHT, &gsetright); - gsetGetNoiseSettings(&gsetleft, &noisesettingsleft); - gsetGetNoiseSettings(&gsetright, &noisesettingsright); + gset_get_noise_settings(&gsetleft, &noisesettingsleft); + gset_get_noise_settings(&gsetright, &noisesettingsright); // Right hand - if (bgunIsFiring(HAND_RIGHT)) { + if (bgun_is_firing(HAND_RIGHT)) { player->hands[HAND_RIGHT].noiseradius += noisesettingsright.incradius; if (player->hands[HAND_RIGHT].noiseradius > noisesettingsright.maxradius) { @@ -3358,7 +3358,7 @@ void bgunDecreaseNoiseRadius(void) } // Left hand - if (bgunIsFiring(HAND_LEFT)) { + if (bgun_is_firing(HAND_LEFT)) { player->hands[HAND_LEFT].noiseradius += noisesettingsleft.incradius; if (player->hands[HAND_LEFT].noiseradius > noisesettingsleft.maxradius) { @@ -3380,11 +3380,11 @@ void bgunDecreaseNoiseRadius(void) } } -void bgunCalculateBlend(s32 handnum) +void bgun_calculate_blend(s32 handnum) { s32 sp60[2]; s32 sp58[2]; - struct weapon *weapon = weaponFindById(bgunGetWeaponNum(handnum)); + struct weapon *weapon = weapon_find_by_id(bgun_get_weapon_num(handnum)); f32 sway = weapon->sway; struct player *player = g_Vars.currentplayer; @@ -3423,7 +3423,7 @@ void bgunCalculateBlend(s32 handnum) player->hands[handnum].blendscale1 = -player->hands[handnum].blendscale1; } -void bgunUpdateBlend(struct hand *hand, s32 handnum) +void bgun_update_blend(struct hand *hand, s32 handnum) { u32 stack[3]; s32 i; @@ -3444,7 +3444,7 @@ void bgunUpdateBlend(struct hand *hand, s32 handnum) sp5c.x += hand->adjustdamp.x; sp5c.y += hand->adjustdamp.y; - sp5c.x += handGetXShift(handnum); + sp5c.x += hand_get_x_shift(handnum); for (i = 0; i < g_Vars.lvupdate240; i++) { hand->damppossum.x = (PAL ? 0.9847f : 0.9872f) * hand->damppossum.x + sp5c.f[0]; @@ -3520,7 +3520,7 @@ void bgun0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) } } - if (bmoveGetCrouchPos() != CROUCHPOS_SQUAT) { + if (bmove_get_crouch_pos() != CROUCHPOS_SQUAT) { if (player->gunposamplitude < 0.3f * g_Vars.currentplayer->bondbreathing) { player->gunposamplitude = 0.3f * g_Vars.currentplayer->bondbreathing; } @@ -3549,7 +3549,7 @@ void bgun0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) dampt[0] = player->hands[0].dampt + sp4c; while (dampt[0] >= 1.0f) { - bgunCalculateBlend(HAND_RIGHT); + bgun_calculate_blend(HAND_RIGHT); dampt[0] -= 1.0f; player->syncoffset++; } @@ -3580,7 +3580,7 @@ void bgun0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) dampt[1] = dampt[0] + player->syncoffset + player->gunsync; while (dampt[1] >= 1.0f) { - bgunCalculateBlend(HAND_LEFT); + bgun_calculate_blend(HAND_LEFT); dampt[1] -= 1.0f; player->syncoffset--; } @@ -3592,7 +3592,7 @@ void bgun0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) } } -bool bgunIsLoaded(void) +bool bgun_is_loaded(void) { if (g_Vars.currentplayer->gunctrl.gunmemowner != GUNMEMOWNER_BONDGUN) { return false; @@ -3603,22 +3603,22 @@ bool bgunIsLoaded(void) && g_Vars.currentplayer->gunctrl.masterloadstate == MASTERLOADSTATE_LOADED); } -u32 bgunGetGunMemType(void) +u32 bgun_get_gun_mem_type(void) { return g_Vars.currentplayer->gunctrl.gunmemtype; } -struct modeldef *bgunGetGunModeldef(void) +struct modeldef *bgun_get_gun_modeldef(void) { return g_Vars.currentplayer->gunctrl.gunmodeldef; } -u8 *bgunGetGunMem(void) +u8 *bgun_get_gun_mem(void) { return g_Vars.currentplayer->gunctrl.gunmem; } -u32 bgunCalculateGunMemCapacity(void) +u32 bgun_calculate_gun_mem_capacity(void) { if (IS4MB() && PLAYERCOUNT() == 2) { return g_BgunGunMemBaseSize4Mb2P; @@ -3638,12 +3638,12 @@ u32 bgunCalculateGunMemCapacity(void) return g_BgunGunMemBaseSizeDefault; } -void bgunFreeGunMem(void) +void bgun_free_gun_mem(void) { g_Vars.currentplayer->gunctrl.gunmemowner = GUNMEMOWNER_FREE; } -void bgunSetGunMemWeapon(s32 weaponnum) +void bgun_set_gun_mem_weapon(s32 weaponnum) { struct player *player = g_Vars.currentplayer; @@ -3657,7 +3657,7 @@ void bgunSetGunMemWeapon(s32 weaponnum) } } -void bgunEnterFlux(void) +void bgun_enter_flux(void) { s32 i; struct casing *end; @@ -3681,7 +3681,7 @@ void bgunEnterFlux(void) g_CasingsActive = false; } -bool bgunChangeGunMem(s32 newowner) +bool bgun_change_gun_mem(s32 newowner) { struct player *player = g_Vars.currentplayer; @@ -3707,7 +3707,7 @@ bool bgunChangeGunMem(s32 newowner) } player->gunctrl.gunmemtype = -1; - bgunEnterFlux(); + bgun_enter_flux(); player->gunctrl.loadall = true; unlock = true; break; @@ -3722,7 +3722,7 @@ bool bgunChangeGunMem(s32 newowner) if (newowner == GUNMEMOWNER_INVMENU && var8009dfc0 != 0) { unlock = true; - playerRemoveChrBody(); + player_remove_chr_body(); } break; case GUNMEMOWNER_3: @@ -3762,7 +3762,7 @@ bool bgunChangeGunMem(s32 newowner) * Although the name contains "Gun", it's used for more than just the gun model. * It's used for the hand model, the gun model and the cartridge model. */ -void bgunTickGunLoad(void) +void bgun_tick_gun_load(void) { s32 i; s32 numthistick; @@ -3798,7 +3798,7 @@ void bgunTickGunLoad(void) *player->gunctrl.loadmemptr = ptr; *player->gunctrl.loadmemremaining = remaining; - loadsize = ALIGN64(fileGetInflatedSize(player->gunctrl.loadfilenum)) + 0x8000; + loadsize = ALIGN64(file_get_inflated_size(player->gunctrl.loadfilenum)) + 0x8000; osSyncPrintf("BriGun: Loading - %s, pMem 0x%08x Size %d\n"); @@ -3812,17 +3812,17 @@ void bgunTickGunLoad(void) osSyncPrintf("BriGun: obLoadto at 0x%08x, size %d\n", ptr, loadsize); - modeldef = fileLoadToAddr(player->gunctrl.loadfilenum, FILELOADMETHOD_EXTRAMEM, (u8 *)ptr, loadsize); + modeldef = file_load_to_addr(player->gunctrl.loadfilenum, FILELOADMETHOD_EXTRAMEM, (u8 *)ptr, loadsize); // Reserve some space for textures - allocsize = fileGetLoadedSize(player->gunctrl.loadfilenum) + 0xe00; + allocsize = file_get_loaded_size(player->gunctrl.loadfilenum) + 0xe00; osSyncPrintf("BriGun: Used size %d (Ob Size %d)\n"); osSyncPrintf("BriGun: block len %d usedsize %d\n"); osSyncPrintf("BriGun: obln ram_len %d block_len %d\n"); osSyncPrintf("BriGun: new used size %d\n"); - fileGetLoadedSize(player->gunctrl.loadfilenum); + file_get_loaded_size(player->gunctrl.loadfilenum); fileinfo = &g_FileInfo[player->gunctrl.loadfilenum]; fileinfo->allocsize = allocsize; @@ -3833,11 +3833,11 @@ void bgunTickGunLoad(void) osSyncPrintf("BriGun: Texture Block at 0x%08x size %d, endp 0x%08x\n"); - texInitPool(&player->gunctrl.texpool, (u8 *)end, remaining); + tex_init_pool(&player->gunctrl.texpool, (u8 *)end, remaining); // Tidy up the model - modelPromoteTypeToPointer(modeldef); - modelPromoteOffsetsToPointers(modeldef, 0x05000000, (uintptr_t)modeldef); + model_promote_type_to_pointer(modeldef); + model_promote_offsets_to_pointers(modeldef, 0x05000000, (uintptr_t)modeldef); *player->gunctrl.loadtomodeldef = modeldef; @@ -3865,7 +3865,7 @@ void bgunTickGunLoad(void) if (modeldef->texconfigs[i].texturenum < NUM_TEXTURES) { osSyncPrintf("BriGun: Uncompress %d of %d\n", i, modeldef->numtexconfigs); - texLoad(&modeldef->texconfigs[i].texturenum, &player->gunctrl.texpool, true); + tex_load(&modeldef->texconfigs[i].texturenum, &player->gunctrl.texpool, true); modeldef->texconfigs[i].unk0b = 1; } @@ -3897,18 +3897,18 @@ void bgunTickGunLoad(void) modeldef0f1a7560(modeldef, player->gunctrl.loadfilenum, 0x05000000, modeldef, &player->gunctrl.texpool, false); - fileGetInflatedSize(player->gunctrl.loadfilenum); - fileGetLoadedSize(player->gunctrl.loadfilenum); - fileGetLoadedSize(player->gunctrl.loadfilenum); - fileGetLoadedSize(player->gunctrl.loadfilenum); + file_get_inflated_size(player->gunctrl.loadfilenum); + file_get_loaded_size(player->gunctrl.loadfilenum); + file_get_loaded_size(player->gunctrl.loadfilenum); + file_get_loaded_size(player->gunctrl.loadfilenum); - modelAllocateRwData(modeldef); + model_allocate_rw_data(modeldef); osSyncPrintf("BriGun: propgfx_decompress 0x%08x\n"); osSyncPrintf("BriGun: DL waste space %d from %d (Used %d, Ramlen %d, ObSize %d)\n"); osSyncPrintf("Increase GUNSAVESIZE to %d!!!\n"); - newvalue = ALIGN64(texGetPoolLeftPos(&player->gunctrl.texpool)); + newvalue = ALIGN64(tex_get_pool_left_pos(&player->gunctrl.texpool)); remaining = *player->gunctrl.loadmemremaining; remaining -= (s32)(newvalue - *player->gunctrl.loadmemptr); @@ -3920,8 +3920,8 @@ void bgunTickGunLoad(void) #if PIRACYCHECKS { - s32 *ptr = (s32 *)&tagsReset; - s32 *end = (s32 *)&tagFindById; + s32 *ptr = (s32 *)&tags_reset; + s32 *end = (s32 *)&tag_find_by_id; u32 checksum = 0; while (ptr < end) { @@ -3930,7 +3930,7 @@ void bgunTickGunLoad(void) } if (checksum != CHECKSUM_PLACEHOLDER) { - ptr = (s32 *)&tagsReset + 3; + ptr = (s32 *)&tags_reset + 3; if (1); end = &ptr[7]; @@ -3975,7 +3975,7 @@ const char var7f1ac0ec[] = "Gun : TotalUsed %d, Free %d\n"; const char var7f1ac10c[] = "BriGun: Set Master State: MASTER_GUN_LOADSTATE_LOADED\n"; const char var7f1ac144[] = "GunLockTimer: %d\n"; -void bgunTickMasterLoad(void) +void bgun_tick_master_load(void) { s32 newweaponnum; struct player *player = g_Vars.currentplayer; @@ -3995,11 +3995,11 @@ void bgunTickMasterLoad(void) s32 bodynum; s32 headnum; - if ((player->gunctrl.gunmemowner == GUNMEMOWNER_BONDGUN || bgunChangeGunMem(GUNMEMOWNER_BONDGUN)) && player->gunctrl.gunmemnew >= 0) { + if ((player->gunctrl.gunmemowner == GUNMEMOWNER_BONDGUN || bgun_change_gun_mem(GUNMEMOWNER_BONDGUN)) && player->gunctrl.gunmemnew >= 0) { if (player->gunctrl.gunlocktimer == 0) { newweaponnum = player->gunctrl.gunmemnew; - playerChooseBodyAndHead(&bodynum, &headnum, NULL); + player_choose_body_and_head(&bodynum, &headnum, NULL); handfilenum = g_HeadsAndBodies[bodynum].handfilenum; @@ -4007,13 +4007,13 @@ void bgunTickMasterLoad(void) handfilenum = FILE_GCOMBATHANDSLOD; } - filenum = weaponGetFileNum(newweaponnum); + filenum = weapon_get_file_num(newweaponnum); if (player->gunctrl.masterloadstate != MASTERLOADSTATE_LOADED || newweaponnum != player->gunctrl.gunmemtype) { if (filenum) { hashands = false; - if (weaponHasFlag(newweaponnum, WEAPONFLAG_HASHANDS)) { + if (weapon_has_flag(newweaponnum, WEAPONFLAG_HASHANDS)) { hashands = true; } @@ -4054,8 +4054,8 @@ void bgunTickMasterLoad(void) if (hashands) { if (handfilenum != player->gunctrl.handfilenum) { if (player->gunctrl.gunloadstate == GUNLOADSTATE_FLUX) { - player->gunctrl.handmemloadptr = bgunGetGunMem(); - player->gunctrl.handmemloadremaining = bgunCalculateGunMemCapacity(); + player->gunctrl.handmemloadptr = bgun_get_gun_mem(); + player->gunctrl.handmemloadremaining = bgun_calculate_gun_mem_capacity(); player->gunctrl.gunloadstate = GUNLOADSTATE_MODEL; player->gunctrl.loadfilenum = handfilenum; player->gunctrl.loadtomodeldef = &player->gunctrl.handmodeldef; @@ -4063,7 +4063,7 @@ void bgunTickMasterLoad(void) player->gunctrl.loadmemremaining = (u32 *) &player->gunctrl.handmemloadremaining; } - bgunTickGunLoad(); + bgun_tick_gun_load(); if (player->gunctrl.gunloadstate == GUNLOADSTATE_LOADED) { player->gunctrl.handfilenum = handfilenum; @@ -4074,8 +4074,8 @@ void bgunTickMasterLoad(void) } else { player->gunctrl.handfilenum = 0; player->gunctrl.handmodeldef = NULL; - player->gunctrl.handmemloadptr = bgunGetGunMem(); - player->gunctrl.handmemloadremaining = bgunCalculateGunMemCapacity(); + player->gunctrl.handmemloadptr = bgun_get_gun_mem(); + player->gunctrl.handmemloadremaining = bgun_calculate_gun_mem_capacity(); } player->gunctrl.masterloadstate = MASTERLOADSTATE_GUN; @@ -4091,7 +4091,7 @@ void bgunTickMasterLoad(void) player->gunctrl.loadmemremaining = (u32 *) &player->gunctrl.memloadremaining; } - bgunTickGunLoad(); + bgun_tick_gun_load(); if (player->gunctrl.gunloadstate == GUNLOADSTATE_LOADED) { player->gunctrl.masterloadstate = MASTERLOADSTATE_CARTS; @@ -4105,9 +4105,9 @@ void bgunTickMasterLoad(void) if (player->gunctrl.gunloadstate == GUNLOADSTATE_FLUX && player->gunctrl.cartmodeldef == NULL && PLAYERCOUNT() == 1) { for (i = 0; i < 2; i++) { hand = player->hands + i; - func = gsetGetWeaponFunction2(&hand->gset); + func = gset_get_weapon_function2(&hand->gset); shootfunc = NULL; - weapondef = weaponFindById(player->gunctrl.weaponnum); + weapondef = weapon_find_by_id(player->gunctrl.weaponnum); casingindex = -1; if (func != NULL) { @@ -4141,7 +4141,7 @@ void bgunTickMasterLoad(void) } if (player->gunctrl.gunloadstate != GUNLOADSTATE_FLUX) { - bgunTickGunLoad(); + bgun_tick_gun_load(); return; } @@ -4150,15 +4150,15 @@ void bgunTickMasterLoad(void) for (i = 0; i < 2; i++) { hand = &player->hands[i]; - modelInit(&hand->gunmodel, player->gunctrl.gunmodeldef, hand->unk0a6c, 0); + model_init(&hand->gunmodel, player->gunctrl.gunmodeldef, hand->unk0a6c, 0); if (player->gunctrl.handmodeldef != 0) { - modelInit(&hand->handmodel, player->gunctrl.handmodeldef, hand->handsavedata, false); + model_init(&hand->handmodel, player->gunctrl.handmodeldef, hand->handsavedata, false); } hand->unk0dcc = (s32 *) player->gunctrl.memloadptr; - value = bgunCreateModelCmdList(&hand->gunmodel, player->gunctrl.gunmodeldef->rootnode, (s32 *) player->gunctrl.memloadptr); + value = bgun_create_model_cmd_list(&hand->gunmodel, player->gunctrl.gunmodeldef->rootnode, (s32 *) player->gunctrl.memloadptr); sum += value; player->gunctrl.memloadptr += value; @@ -4167,7 +4167,7 @@ void bgunTickMasterLoad(void) if (player->gunctrl.handmodeldef != 0) { hand->unk0dd0 = (s32 *) player->gunctrl.memloadptr; - value = bgunCreateModelCmdList(&hand->handmodel, player->gunctrl.handmodeldef->rootnode, (s32 *) player->gunctrl.memloadptr); + value = bgun_create_model_cmd_list(&hand->handmodel, player->gunctrl.handmodeldef->rootnode, (s32 *) player->gunctrl.memloadptr); sum += value; player->gunctrl.memloadptr += value; @@ -4186,7 +4186,7 @@ void bgunTickMasterLoad(void) hand->unk0dd8 = NULL; } - bgunCalculateGunMemCapacity(); + bgun_calculate_gun_mem_capacity(); player->gunctrl.masterloadstate = MASTERLOADSTATE_LOADED; player->gunctrl.gunmemtype = newweaponnum; @@ -4211,12 +4211,12 @@ void bgunTickMasterLoad(void) } } -void bgunTickLoad(void) +void bgun_tick_load(void) { s32 i; for (i = 0; i < g_Vars.lvupdate240; i += 8) { - bgunTickMasterLoad(); + bgun_tick_master_load(); } } @@ -4234,7 +4234,7 @@ void bgunTickLoad(void) * Return false on success, or true if the load all should be retried on the * next frame. */ -bool bgunLoadAll(void) +bool bgun_load_all(void) { // PAL adds a check for the eyespy being used #if VERSION >= VERSION_PAL_BETA @@ -4244,7 +4244,7 @@ bool bgunLoadAll(void) } #endif - bgunEnterFlux(); + bgun_enter_flux(); if (g_Vars.currentplayer->gunctrl.weaponnum != WEAPON_NONE) { g_Vars.currentplayer->gunctrl.gunmemnew = g_Vars.currentplayer->gunctrl.weaponnum; @@ -4257,7 +4257,7 @@ bool bgunLoadAll(void) } if (g_Vars.currentplayer->gunctrl.gunmemowner != GUNMEMOWNER_BONDGUN) { - bgunChangeGunMem(GUNMEMOWNER_BONDGUN); + bgun_change_gun_mem(GUNMEMOWNER_BONDGUN); if (g_Vars.currentplayer->gunctrl.gunmemowner != GUNMEMOWNER_BONDGUN) { g_Vars.lockscreen = true; @@ -4265,18 +4265,18 @@ bool bgunLoadAll(void) } } - bgunEnterFlux(); + bgun_enter_flux(); do { - bgunTickMasterLoad(); - } while (!bgunIsLoaded()); + bgun_tick_master_load(); + } while (!bgun_is_loaded()); g_Vars.currentplayer->gunctrl.loadall = false; return false; } -struct modeldef *bgunGetCartModeldef(void) +struct modeldef *bgun_get_cart_modeldef(void) { return g_Vars.currentplayer->gunctrl.cartmodeldef; } @@ -4286,21 +4286,21 @@ void bgun0f09ebcc(struct defaultobj *obj, struct coord *coord, RoomNum *rooms, M struct prop *objprop = obj->prop; if (objprop) { - propActivate(objprop); - propEnable(objprop); + prop_activate(objprop); + prop_enable(objprop); mtx00015f04(obj->model->scale, matrix1); func0f06a580(obj, coord, matrix1, rooms); if (obj->type == OBJTYPE_WEAPON && ((struct weaponobj *) obj)->weaponnum == WEAPON_BOLT) { - s32 beamnum = boltbeamFindByProp(objprop); + s32 beamnum = boltbeam_find_by_prop(objprop); if (beamnum == -1) { - beamnum = boltbeamCreate(objprop); + beamnum = boltbeam_create(objprop); } if (beamnum != -1) { - boltbeamSetHeadPos(beamnum, pos); - boltbeamSetTailPos(beamnum, pos); + boltbeam_set_head_pos(beamnum, pos); + boltbeam_set_tail_pos(beamnum, pos); } } @@ -4310,8 +4310,8 @@ void bgun0f09ebcc(struct defaultobj *obj, struct coord *coord, RoomNum *rooms, M obj->projectile->flags |= PROJECTILEFLAG_AIRBORNE; obj->projectile->ownerprop = prop; - projectileSetSticky(objprop); - mtx4Copy(matrix2, (Mtxf *)&obj->projectile->mtx); + projectile_set_sticky(objprop); + mtx4_copy(matrix2, (Mtxf *)&obj->projectile->mtx); obj->projectile->speed.x = velocity->x; obj->projectile->speed.y = velocity->y; @@ -4335,7 +4335,7 @@ void bgun0f09ed2c(struct defaultobj *obj, struct coord *newpos, Mtxf *arg2, stru pos.y = playerprop->pos.y; pos.z = playerprop->pos.z; - roomsCopy(playerprop->rooms, rooms); + rooms_copy(playerprop->rooms, rooms); bgun0f09ebcc(obj, &pos, rooms, arg2, velocity, arg4, playerprop, newpos); @@ -4349,12 +4349,12 @@ void bgun0f09ed2c(struct defaultobj *obj, struct coord *newpos, Mtxf *arg2, stru } } -struct defaultobj *bgunCreateThrownProjectile2(struct chrdata *chr, struct gset *gset, struct coord *pos, RoomNum *rooms, Mtxf *arg4, struct coord *velocity) +struct defaultobj *bgun_create_thrown_projectile2(struct chrdata *chr, struct gset *gset, struct coord *pos, RoomNum *rooms, Mtxf *arg4, struct coord *velocity) { struct defaultobj *obj = NULL; struct weaponfunc *basefunc; struct weaponfunc_throw *func; - struct weapon *weapon = weaponFindById(gset->weaponnum); + struct weapon *weapon = weapon_find_by_id(gset->weaponnum); struct weaponobj *weaponobj; struct autogunobj *autogun; Mtxf mtx; @@ -4375,17 +4375,17 @@ struct defaultobj *bgunCreateThrownProjectile2(struct chrdata *chr, struct gset guRotateF(mtx.m, 90.0f / (RANDOMFRAC() + 12.1f), arg4->m[1][0], arg4->m[1][1], arg4->m[1][2]); } else { - mtxLoadRandomRotation(&mtx); + mtx_load_random_rotation(&mtx); } if (gset->weaponnum == WEAPON_LAPTOPGUN) { - autogun = laptopDeploy(func->projectilemodelnum, gset, chr); + autogun = laptop_deploy(func->projectilemodelnum, gset, chr); if (autogun != NULL) { obj = &autogun->base; } } else { - weaponobj = weaponCreateProjectileFromGset(func->projectilemodelnum, gset, chr); + weaponobj = weapon_create_projectile_from_gset(func->projectilemodelnum, gset, chr); if (weaponobj != NULL) { obj = &weaponobj->base; @@ -4398,7 +4398,7 @@ struct defaultobj *bgunCreateThrownProjectile2(struct chrdata *chr, struct gset } if (weaponobj->weaponnum == WEAPON_GRENADE || weaponobj->weaponnum == WEAPON_NBOMB) { - propSetDangerous(weaponobj->base.prop); + prop_set_dangerous(weaponobj->base.prop); } if (func->projectilemodelnum == MODEL_CHRREMOTEMINE @@ -4416,9 +4416,9 @@ struct defaultobj *bgunCreateThrownProjectile2(struct chrdata *chr, struct gset obj->hidden &= 0x0fffffff; if (g_Vars.normmplayerisrunning) { - playernum = mpPlayerGetIndex(chr); + playernum = mp_player_get_index(chr); } else { - playernum = playermgrGetPlayerNumByProp(chr->prop); + playernum = playermgr_get_player_num_by_prop(chr->prop); } obj->hidden |= playernum << 28; @@ -4428,7 +4428,7 @@ struct defaultobj *bgunCreateThrownProjectile2(struct chrdata *chr, struct gset obj->projectile->unk08c = 0.1f; obj->projectile->pickuptimer240 = TICKS(240); - psCreate(NULL, obj->prop, SFX_THROW, -1, + ps_create(NULL, obj->prop, SFX_THROW, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); } } @@ -4444,7 +4444,7 @@ struct defaultobj *bgunCreateThrownProjectile2(struct chrdata *chr, struct gset * 2 = fumbling grenade from right hand (due to nbomb) * 3 = fumbling grenade from left hand (actually not possible) */ -void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) +void bgun_create_thrown_projectile(s32 handnum, struct gset *gset) { struct coord velocity = {0, 0, 0}; Mtxf sp1f4; @@ -4485,15 +4485,15 @@ void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) muzzlepos.y = g_Vars.currentplayer->hands[handnum].muzzlepos.y; muzzlepos.z = g_Vars.currentplayer->hands[handnum].muzzlepos.z; - mtx4LoadIdentity(&sp1f4); + mtx4_load_identity(&sp1f4); if (gset->weaponnum == WEAPON_COMBATKNIFE) { - mtx4LoadZRotation(RAD(270, 4.711639f), &sp1f4); - mtx4LoadXRotation(RAD(180, 3.1410925f), &sp190); - mtx4MultMtx4InPlace(&sp190, &sp1f4); + mtx4_load_z_rotation(RAD(270, 4.711639f), &sp1f4); + mtx4_load_x_rotation(RAD(180, 3.1410925f), &sp190); + mtx4_mult_mtx4_in_place(&sp190, &sp1f4); } - mtx4Copy(&g_Vars.currentplayer->hands[handnum].muzzlemat, &sp190); + mtx4_copy(&g_Vars.currentplayer->hands[handnum].muzzlemat, &sp190); guNormalize(&sp190.m[0][0], &sp190.m[0][1], &sp190.m[0][2]); guNormalize(&sp190.m[1][0], &sp190.m[1][1], &sp190.m[1][2]); @@ -4503,11 +4503,11 @@ void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) sp190.m[3][1] = 0.0f; sp190.m[3][2] = 0.0f; - mtx4MultMtx4InPlace(&sp190, &sp1f4); + mtx4_mult_mtx4_in_place(&sp190, &sp1f4); - playerSetPerimEnabled(playerprop, false); + player_set_perim_enabled(playerprop, false); - if (cdTestLos11(&playerprop->pos, playerprop->rooms, &muzzlepos, spawnrooms, CDTYPE_ALL) != CDRESULT_COLLISION) { + if (cd_test_los11(&playerprop->pos, playerprop->rooms, &muzzlepos, spawnrooms, CDTYPE_ALL) != CDRESULT_COLLISION) { spawnpos.x = muzzlepos.x; spawnpos.y = muzzlepos.y; spawnpos.z = muzzlepos.z; @@ -4516,29 +4516,29 @@ void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) spawnpos.y = playerprop->pos.y; spawnpos.z = playerprop->pos.z; - roomsCopy(playerprop->rooms, spawnrooms); + rooms_copy(playerprop->rooms, spawnrooms); } - playerSetPerimEnabled(playerprop, true); + player_set_perim_enabled(playerprop, true); - bgunCalculatePlayerShotSpread(&gunpos, &gundir, handnum, true); - mtx4RotateVecInPlace(camGetProjectionMtxF(), &gundir); + bgun_calculate_player_shot_spread(&gunpos, &gundir, handnum, true); + mtx4_rotate_vec_in_place(cam_get_projection_mtxf(), &gundir); if (droppinggrenade) { // Dropping a grenade because player is in an nbomb storm velocity.x = gundir.x * 1.6666666f; velocity.y = gundir.y * 1.6666666f; velocity.z = gundir.z * 1.6666666f; - } else if (gsetHasFunctionFlags(&hand->gset, FUNCFLAG_CALCULATETRAJECTORY)) { + } else if (gset_has_function_flags(&hand->gset, FUNCFLAG_CALCULATETRAJECTORY)) { // Calculate the velocity based on the trajectory to the aimpos - propFindAimingAt(HAND_RIGHT, false, FINDPROPCONTEXT_QUERY); + prop_find_aiming_at(HAND_RIGHT, false, FINDPROPCONTEXT_QUERY); if (hand->hasdotinfo) { aimpos.x = hand->dotpos.x; aimpos.y = hand->dotpos.y; aimpos.z = hand->dotpos.z; - chrCalculateTrajectory(&spawnpos, 21.666666f, &aimpos, &sp140); + chr_calculate_trajectory(&spawnpos, 21.666666f, &aimpos, &sp140); radians = acosf(gundir.f[0] * sp140.f[0] + gundir.f[1] * sp140.f[1] + gundir.f[2] * sp140.f[2]); @@ -4556,8 +4556,8 @@ void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) frac = -frac; } - quaternionSlerp(sp68, sp58, frac, sp48); - quaternionToMtx(sp48, &sp78); + quaternion_slerp(sp68, sp58, frac, sp48); + quaternion_to_mtx(sp48, &sp78); gundir.x = -sp78.m[2][0]; gundir.y = -sp78.m[2][1]; @@ -4586,7 +4586,7 @@ void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) } if (gset->weaponnum == WEAPON_LAPTOPGUN) { - bgunFreeWeapon(handnum); + bgun_free_weapon(handnum); } // Add player movement to velocity @@ -4596,7 +4596,7 @@ void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) velocity.z += (playerprop->pos.z - prevpos->z + extrapos->z) / g_Vars.lvupdate60freal; } - obj = bgunCreateThrownProjectile2(g_Vars.currentplayer->prop->chr, gset, &spawnpos, spawnrooms, &sp1f4, &velocity); + obj = bgun_create_thrown_projectile2(g_Vars.currentplayer->prop->chr, gset, &spawnpos, spawnrooms, &sp1f4, &velocity); if (obj) { if (obj->type == OBJTYPE_WEAPON) { @@ -4611,7 +4611,7 @@ void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) weapon->gunfunc = gset->weaponfunc; } else if (gset->weaponnum == WEAPON_ECMMINE && g_Vars.stagenum == STAGE_CITRAINING) { - data = dtGetData(); + data = dt_get_data(); if (data->intraining) { data->obj = obj; @@ -4641,7 +4641,7 @@ void bgunCreateThrownProjectile(s32 handnum, struct gset *gset) } } -void bgunUpdateHeldRocket(s32 handnum) +void bgun_update_held_rocket(s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; struct defaultobj *obj = &hand->rocket->base; @@ -4655,7 +4655,7 @@ void bgunUpdateHeldRocket(s32 handnum) struct model *model = obj->model; if (!hand->firedrocket) { - mtx4Copy(&hand->posmtx, &mtx); + mtx4_copy(&hand->posmtx, &mtx); mtx.m[3][0] = 0; mtx.m[3][1] = 0; @@ -4663,13 +4663,13 @@ void bgunUpdateHeldRocket(s32 handnum) mtx00015f04(obj->model->scale, &mtx); func0f06a580(obj, &hand->muzzlepos, &mtx, playerprop->rooms); - propDeregisterRooms(objprop); + prop_deregister_rooms(objprop); } - model->matrices = gfxAllocate(model->definition->nummatrices * sizeof(Mtxf)); + model->matrices = gfx_allocate(model->definition->nummatrices * sizeof(Mtxf)); - mtx4Copy(&hand->muzzlemat, &model->matrices[0]); - modelUpdateRelationsQuick(model, model->definition->rootnode); + mtx4_copy(&hand->muzzlemat, &model->matrices[0]); + model_update_relations_quick(model, model->definition->rootnode); objprop->flags |= PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONTHISSCREENTHISTICK; objprop->z = -model->matrices[0].m[3][2]; @@ -4677,7 +4677,7 @@ void bgunUpdateHeldRocket(s32 handnum) } } -void bgunCreateHeldRocket(s32 handnum, struct weaponfunc_shootprojectile *func) +void bgun_create_held_rocket(s32 handnum, struct weaponfunc_shootprojectile *func) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; struct weaponobj *obj; @@ -4687,7 +4687,7 @@ void bgunCreateHeldRocket(s32 handnum, struct weaponfunc_shootprojectile *func) hand->firedrocket = false; #endif - obj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, WEAPON_ROCKET, g_Vars.currentplayer->prop->chr); + obj = weapon_create_projectile_from_weapon_num(func->projectilemodelnum, WEAPON_ROCKET, g_Vars.currentplayer->prop->chr); if (obj != NULL) { hand->rocket = obj; @@ -4702,17 +4702,17 @@ void bgunCreateHeldRocket(s32 handnum, struct weaponfunc_shootprojectile *func) } } -void bgunFreeHeldRocket(s32 handnum) +void bgun_free_held_rocket(s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; if (hand->rocket) { - objFreePermanently(&hand->rocket->base, true); + obj_free_permanently(&hand->rocket->base, true); hand->rocket = NULL; } } -void bgunCreateFiredProjectile(s32 handnum) +void bgun_create_fired_projectile(s32 handnum) { struct weapon *weapondef; struct hand *hand; @@ -4748,7 +4748,7 @@ void bgunCreateFiredProjectile(s32 handnum) prevpos = &g_Vars.currentplayer->bondprevpos; extrapos = &g_Vars.currentplayer->bondextrapos; - weapondef = weaponFindById(hand->gset.weaponnum); + weapondef = weapon_find_by_id(hand->gset.weaponnum); if (weapondef) { tmp = weapondef->functions[hand->gset.weaponfunc]; @@ -4756,9 +4756,9 @@ void bgunCreateFiredProjectile(s32 handnum) if (tmp && tmp->type == INVENTORYFUNCTYPE_SHOOT_PROJECTILE) { funcdef = (struct weaponfunc_shootprojectile *)tmp; - mtx4LoadIdentity(&sp270); - bgunCalculatePlayerShotSpread(&gunpos, &gundir, handnum, true); - mtx4RotateVecInPlace(camGetProjectionMtxF(), &gundir); + mtx4_load_identity(&sp270); + bgun_calculate_player_shot_spread(&gunpos, &gundir, handnum, true); + mtx4_rotate_vec_in_place(cam_get_projection_mtxf(), &gundir); spawnpos.x = hand->muzzlepos.x; spawnpos.y = hand->muzzlepos.y; @@ -4773,15 +4773,15 @@ void bgunCreateFiredProjectile(s32 handnum) sp260 = funcdef->speed * 1.6666666f / 60.0f; sp25c = funcdef->traveldist * 1.6666666f; - if (gsetHasFunctionFlags(&hand->gset, FUNCFLAG_CALCULATETRAJECTORY)) { - propFindAimingAt(HAND_RIGHT, false, FINDPROPCONTEXT_QUERY); + if (gset_has_function_flags(&hand->gset, FUNCFLAG_CALCULATETRAJECTORY)) { + prop_find_aiming_at(HAND_RIGHT, false, FINDPROPCONTEXT_QUERY); if (hand->hasdotinfo) { aimpos.x = hand->dotpos.x; aimpos.y = hand->dotpos.y; aimpos.z = hand->dotpos.z; - chrCalculateTrajectory(&spawnpos, sp25c, &aimpos, &sp1bc); + chr_calculate_trajectory(&spawnpos, sp25c, &aimpos, &sp1bc); radians = acosf(gundir.f[0] * sp1bc.f[0] + gundir.f[1] * sp1bc.f[1] + gundir.f[2] * sp1bc.f[2]); @@ -4799,8 +4799,8 @@ void bgunCreateFiredProjectile(s32 handnum) frac = -frac; } - quaternionSlerp(spe4, spd4, frac, spc4); - quaternionToMtx(spc4, &spf4); + quaternion_slerp(spe4, spd4, frac, spc4); + quaternion_to_mtx(spc4, &spf4); gundir.x = -spf4.m[2][0]; gundir.y = -spf4.m[2][1]; @@ -4827,7 +4827,7 @@ void bgunCreateFiredProjectile(s32 handnum) sp264.z += (playerprop->pos.z - prevpos->z + extrapos->z) / g_Vars.lvupdate60freal; } - mtx4Copy(&g_Vars.currentplayer->hands[handnum].posmtx, &sp210); + mtx4_copy(&g_Vars.currentplayer->hands[handnum].posmtx, &sp210); sp210.m[3][0] = 0.0f; sp210.m[3][1] = 0.0f; @@ -4853,27 +4853,27 @@ void bgunCreateFiredProjectile(s32 handnum) weaponnum = WEAPON_HOMINGROCKET; } - weapon = weaponCreateProjectileFromWeaponNum(funcdef->projectilemodelnum, weaponnum, g_Vars.currentplayer->prop->chr); + weapon = weapon_create_projectile_from_weapon_num(funcdef->projectilemodelnum, weaponnum, g_Vars.currentplayer->prop->chr); } else if (hand->gset.weaponnum == WEAPON_CROSSBOW) { - weapon = weaponCreateProjectileFromWeaponNum(funcdef->projectilemodelnum, WEAPON_BOLT, g_Vars.currentplayer->prop->chr); + weapon = weapon_create_projectile_from_weapon_num(funcdef->projectilemodelnum, WEAPON_BOLT, g_Vars.currentplayer->prop->chr); if (weapon) { weapon->gunfunc = hand->gset.weaponfunc; } } else if (hand->gset.weaponnum == WEAPON_DEVASTATOR) { - weapon = weaponCreateProjectileFromWeaponNum(funcdef->projectilemodelnum, WEAPON_GRENADEROUND, g_Vars.currentplayer->prop->chr); + weapon = weapon_create_projectile_from_weapon_num(funcdef->projectilemodelnum, WEAPON_GRENADEROUND, g_Vars.currentplayer->prop->chr); if (weapon) { weapon->gunfunc = hand->gset.weaponfunc; } } else if (hand->gset.weaponnum == WEAPON_SUPERDRAGON) { - weapon = weaponCreateProjectileFromWeaponNum(funcdef->projectilemodelnum, WEAPON_GRENADEROUND, g_Vars.currentplayer->prop->chr); + weapon = weapon_create_projectile_from_weapon_num(funcdef->projectilemodelnum, WEAPON_GRENADEROUND, g_Vars.currentplayer->prop->chr); if (weapon) { weapon->gunfunc = FUNC_2; } } else { - weapon = weaponCreateProjectileFromGset(funcdef->projectilemodelnum, &hand->gset, g_Vars.currentplayer->prop->chr); + weapon = weapon_create_projectile_from_gset(funcdef->projectilemodelnum, &hand->gset, g_Vars.currentplayer->prop->chr); } if (weapon) { @@ -4907,9 +4907,9 @@ void bgunCreateFiredProjectile(s32 handnum) if (funcdef->scale != 1.0f) { weapon->base.model->scale *= funcdef->scale; - mtx3ToMtx4(weapon->base.realrot, &sp78); + mtx3_to_mtx4(weapon->base.realrot, &sp78); mtx00015f04(funcdef->scale, &sp78); - mtx4ToMtx3(&sp78, weapon->base.realrot); + mtx4_to_mtx3(&sp78, weapon->base.realrot); } weapon->base.projectile->powerlimit240 = TICKS(1200); @@ -4923,15 +4923,15 @@ void bgunCreateFiredProjectile(s32 handnum) weapon->base.projectile->unk098 = funcdef->unk50 * 1.6666666f; if (funcdef->soundnum > 0) { - psCreate(NULL, weapon->base.prop, funcdef->soundnum, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(NULL, weapon->base.prop, funcdef->soundnum, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } if (funcdef->base.base.flags & FUNCFLAG_FLYBYWIRE) { - playerLaunchSlayerRocket(weapon); + player_launch_slayer_rocket(weapon); } if (weapon->base.projectile->flags & PROJECTILEFLAG_LAUNCHING) { - projectileLaunch(&weapon->base, weapon->base.projectile, &sp6c, &sp60); + projectile_launch(&weapon->base, weapon->base.projectile, &sp6c, &sp60); } } else { failed = true; @@ -4944,11 +4944,11 @@ void bgunCreateFiredProjectile(s32 handnum) weapon->timer240 = -1; if (weapon->base.prop) { - propFree(weapon->base.prop); + prop_free(weapon->base.prop); } if (weapon->base.model) { - modelmgrFreeModel(weapon->base.model); + modelmgr_free_model(weapon->base.model); } weapon->base.prop = NULL; @@ -4983,9 +4983,9 @@ void bgunCreateFiredProjectile(s32 handnum) if (funcdef->scale != 1.0f) { weapon->base.model->scale *= funcdef->scale; - mtx3ToMtx4(weapon->base.realrot, &sp78); + mtx3_to_mtx4(weapon->base.realrot, &sp78); mtx00015f04(funcdef->scale, &sp78); - mtx4ToMtx3(&sp78, weapon->base.realrot); + mtx4_to_mtx3(&sp78, weapon->base.realrot); } weapon->base.projectile->powerlimit240 = TICKS(1200); @@ -4999,15 +4999,15 @@ void bgunCreateFiredProjectile(s32 handnum) weapon->base.projectile->unk098 = funcdef->unk50 * 1.6666666f; if (funcdef->soundnum > 0) { - psCreate(NULL, weapon->base.prop, funcdef->soundnum, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(NULL, weapon->base.prop, funcdef->soundnum, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } if (funcdef->base.base.flags & FUNCFLAG_FLYBYWIRE) { - playerLaunchSlayerRocket(weapon); + player_launch_slayer_rocket(weapon); } if (weapon->base.projectile->flags & PROJECTILEFLAG_LAUNCHING) { - projectileLaunch(&weapon->base, weapon->base.projectile, &sp6c, &sp60); + projectile_launch(&weapon->base, weapon->base.projectile, &sp6c, &sp60); } } #endif @@ -5016,10 +5016,10 @@ void bgunCreateFiredProjectile(s32 handnum) } } -void bgunSwivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) +void bgun_swivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) { - f32 screenwidth = camGetScreenWidth(); - f32 screenheight = camGetScreenHeight(); + f32 screenwidth = cam_get_screen_width(); + f32 screenheight = cam_get_screen_height(); struct player *player = g_Vars.currentplayer; struct coord aimpos; s32 l; @@ -5049,7 +5049,7 @@ void bgunSwivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) numframes = 5; } - if ((s32)bgun0f09815c(&player->hands[HAND_RIGHT]) < modelGetNumAnimFrames(&player->hands[HAND_RIGHT].gunmodel) - numframes) { + if ((s32)bgun0f09815c(&player->hands[HAND_RIGHT]) < model_get_num_anim_frames(&player->hands[HAND_RIGHT].gunmodel) - numframes) { x[HAND_RIGHT] = 0.0f; y[HAND_RIGHT] = 0.0f; ignore[HAND_RIGHT] = true; @@ -5082,7 +5082,7 @@ void bgunSwivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) sp94.y = hand->dotpos.y; sp94.z = hand->dotpos.z; - mtx4TransformVecInPlace(camGetWorldToScreenMtxf(), &sp94); + mtx4_transform_vec_in_place(cam_get_world_to_screen_mtxf(), &sp94); if (!(sp94.z < 0.0000001f) || !(sp94.z > -0.0000001f)) { if (sp94.z > -6000.0f) { @@ -5091,8 +5091,8 @@ void bgunSwivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) x[h] = sp8c[0]; y[h] = sp8c[1]; - x[h] = 2.0f * (x[h] / viGetViewWidth()) - 1.0f; - y[h] = 2.0f * (y[h] / viGetViewHeight()) - 1.0f; + x[h] = 2.0f * (x[h] / vi_get_view_width()) - 1.0f; + y[h] = 2.0f * (y[h] / vi_get_view_height()) - 1.0f; } } } @@ -5140,8 +5140,8 @@ void bgunSwivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) player->crosspos[1] = screenheight - 4.0f; } - player->crosspos[0] += camGetScreenLeft(); - player->crosspos[1] += camGetScreenTop(); + player->crosspos[0] += cam_get_screen_left(); + player->crosspos[1] += cam_get_screen_top(); for (h = 0; h < 2; h++) { player->hands[h].crosspos[0] = player->hands[h].guncrosspossum[0] * (PAL ? 0.08700001f : 0.07303029f) * screenwidth * 0.5f + screenwidth * 0.5f; @@ -5159,8 +5159,8 @@ void bgunSwivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) player->hands[h].crosspos[1] = screenheight - 4.0f; } - player->hands[h].crosspos[0] += camGetScreenLeft(); - player->hands[h].crosspos[1] += camGetScreenTop(); + player->hands[h].crosspos[0] += cam_get_screen_left(); + player->hands[h].crosspos[1] += cam_get_screen_top(); } for (l = 0; l < g_Vars.lvupdate240; l++) { @@ -5170,12 +5170,12 @@ void bgunSwivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) player->crosspos2[0] = player->crosssum2[0] * (1.0f - aimdamp) * screenwidth * 0.5f + screenwidth * 0.5f; player->crosspos2[1] = player->crosssum2[1] * (1.0f - aimdamp) * screenheight * 0.5f + screenheight * 0.5f; - player->crosspos2[0] += camGetScreenLeft(); - player->crosspos2[1] += camGetScreenTop(); + player->crosspos2[0] += cam_get_screen_left(); + player->crosspos2[1] += cam_get_screen_top(); cam0f0b4c3c(player->crosspos2, &aimpos, 1000); - bgunSetAimPos(&aimpos); + bgun_set_aim_pos(&aimpos); } /** @@ -5184,16 +5184,16 @@ void bgunSwivel(f32 screenx, f32 screeny, f32 crossdamp, f32 aimdamp) * * This is used for auto aim, the CMP's follow lock-on, and general turning. */ -void bgunSwivelWithDamp(f32 screenx, f32 screeny, f32 crossdamp) +void bgun_swivel_with_damp(f32 screenx, f32 screeny, f32 crossdamp) { - struct weapon *weapon = weaponFindById(bgunGetWeaponNum(HAND_RIGHT)); + struct weapon *weapon = weapon_find_by_id(bgun_get_weapon_num(HAND_RIGHT)); f32 aimdamp = PAL ? weapon->aimsettings->aimdamppal : weapon->aimsettings->aimdamp; if (aimdamp < crossdamp) { aimdamp = crossdamp; } - bgunSwivel(screenx, screeny, crossdamp, aimdamp); + bgun_swivel(screenx, screeny, crossdamp, aimdamp); } /** @@ -5202,15 +5202,15 @@ void bgunSwivelWithDamp(f32 screenx, f32 screeny, f32 crossdamp) * * This is used when manual aiming. */ -void bgunSwivelWithoutDamp(f32 screenx, f32 screeny) +void bgun_swivel_without_damp(f32 screenx, f32 screeny) { - struct weapon *weapon = weaponFindById(bgunGetWeaponNum(HAND_RIGHT)); + struct weapon *weapon = weapon_find_by_id(bgun_get_weapon_num(HAND_RIGHT)); f32 aimdamp = PAL ? weapon->aimsettings->aimdamppal : weapon->aimsettings->aimdamp; - bgunSwivel(screenx, screeny, PAL ? 0.935f : 0.945f, aimdamp); + bgun_swivel(screenx, screeny, PAL ? 0.935f : 0.945f, aimdamp); } -void bgunGetCrossPos(f32 *x, f32 *y) +void bgun_get_cross_pos(f32 *x, f32 *y) { struct player *player = g_Vars.currentplayer; @@ -5236,13 +5236,13 @@ void bgun0f0a0c44(s32 handnum, struct coord *arg1, struct coord *arg2) cam0f0b4c3c(g_Vars.currentplayer->hands[handnum].crosspos, arg2, 1); } -void bgunCalculatePlayerShotSpread(struct coord *gunpos2d, struct coord *gundir2d, s32 handnum, bool dorandom) +void bgun_calculate_player_shot_spread(struct coord *gunpos2d, struct coord *gundir2d, s32 handnum, bool dorandom) { f32 crosspos[2]; f32 spread = 0; f32 scaledspread; f32 randfactor; - struct weaponfunc *func = currentPlayerGetWeaponFunction(handnum); + struct weaponfunc *func = current_player_get_weapon_function(handnum); struct player *player = g_Vars.currentplayer; if (func != NULL && (func->type & 0xff) == INVENTORYFUNCTYPE_SHOOT) { @@ -5250,13 +5250,13 @@ void bgunCalculatePlayerShotSpread(struct coord *gunpos2d, struct coord *gundir2 spread = shootfunc->spread; } - if (weaponHasAimFlag(bgunGetWeaponNum2(handnum), INVAIMFLAG_ACCURATESINGLESHOT) + if (weapon_has_aim_flag(bgun_get_weapon_num2(handnum), INVAIMFLAG_ACCURATESINGLESHOT) && player->hands[handnum].burstbullets == 1) { spread *= 0.25f; } // Decrease spread if double crouched - if (bmoveGetCrouchPos() == CROUCHPOS_SQUAT) { + if (bmove_get_crouch_pos() == CROUCHPOS_SQUAT) { spread *= 0.5f; } @@ -5265,7 +5265,7 @@ void bgunCalculatePlayerShotSpread(struct coord *gunpos2d, struct coord *gundir2 spread *= 1.5f; } - scaledspread = 120.0f * spread / viGetFovY(); + scaledspread = 120.0f * spread / vi_get_fov_y(); if (dorandom) { randfactor = (RANDOMFRAC() - 0.5f) * RANDOMFRAC(); @@ -5273,8 +5273,8 @@ void bgunCalculatePlayerShotSpread(struct coord *gunpos2d, struct coord *gundir2 randfactor = 0; } - crosspos[0] = player->crosspos[0] + randfactor * scaledspread * camGetScreenWidth() - / (viGetHeight() * camGetPerspAspect()); + crosspos[0] = player->crosspos[0] + randfactor * scaledspread * cam_get_screen_width() + / (vi_get_height() * cam_get_persp_aspect()); if (dorandom) { randfactor = (RANDOMFRAC() - 0.5f) * RANDOMFRAC(); @@ -5282,8 +5282,8 @@ void bgunCalculatePlayerShotSpread(struct coord *gunpos2d, struct coord *gundir2 randfactor = 0; } - crosspos[1] = player->crosspos[1] + (randfactor * scaledspread * camGetScreenHeight()) - / viGetHeight(); + crosspos[1] = player->crosspos[1] + (randfactor * scaledspread * cam_get_screen_height()) + / vi_get_height(); gunpos2d->x = 0; gunpos2d->y = 0; @@ -5292,11 +5292,11 @@ void bgunCalculatePlayerShotSpread(struct coord *gunpos2d, struct coord *gundir2 cam0f0b4c3c(crosspos, gundir2d, 1); } -void bgunCalculateBotShotSpread(struct coord *arg0, s32 weaponnum, s32 funcnum, bool arg3, s32 crouchpos, bool dual) +void bgun_calculate_bot_shot_spread(struct coord *arg0, s32 weaponnum, s32 funcnum, bool arg3, s32 crouchpos, bool dual) { f32 spread = 0.0f; f32 radius; - struct weapon *weapondef = weaponFindById(weaponnum); + struct weapon *weapondef = weapon_find_by_id(weaponnum); f32 x; f32 y; Mtxf mtx; @@ -5312,7 +5312,7 @@ void bgunCalculateBotShotSpread(struct coord *arg0, s32 weaponnum, s32 funcnum, } } - if (arg3 && weaponHasAimFlag(weaponnum, INVAIMFLAG_ACCURATESINGLESHOT)) { + if (arg3 && weapon_has_aim_flag(weaponnum, INVAIMFLAG_ACCURATESINGLESHOT)) { spread *= 0.25f; } @@ -5324,7 +5324,7 @@ void bgunCalculateBotShotSpread(struct coord *arg0, s32 weaponnum, s32 funcnum, spread *= 1.5f; } - radius = 120.0f * spread / viGetFovY(); + radius = 120.0f * spread / vi_get_fov_y(); x = (RANDOMFRAC() - 0.5f) * RANDOMFRAC() * radius; y = (RANDOMFRAC() - 0.5f) * RANDOMFRAC() * radius; @@ -5334,10 +5334,10 @@ void bgunCalculateBotShotSpread(struct coord *arg0, s32 weaponnum, s32 funcnum, guNormalize(&sp48.x, &sp48.y, &sp48.z); mtx00016b58(&mtx, 0.0f, 0.0f, 0.0f, arg0->x, arg0->y, arg0->z, 0.0f, -1.0f, 0.0f); - mtx4RotateVec(&mtx, &sp48, arg0); + mtx4_rotate_vec(&mtx, &sp48, arg0); } -bool bgunGetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum) +bool bgun_get_last_shoot_info(struct coord *pos, struct coord *dir, s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -5356,7 +5356,7 @@ bool bgunGetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum) return true; } -void bgunSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum) +void bgun_set_last_shoot_info(struct coord *pos, struct coord *dir, s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -5371,14 +5371,14 @@ void bgunSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum) hand->lastshootdir.z = dir->z; } -s32 bgunGetShotsToTake(s32 handnum) +s32 bgun_get_shots_to_take(s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; return hand->shotstotake; } -void bgunFreeWeapon(s32 handnum) +void bgun_free_weapon(s32 handnum) { struct player *player = g_Vars.currentplayer; s32 i; @@ -5387,7 +5387,7 @@ void bgunFreeWeapon(s32 handnum) for (i = 0; i < 2; i++) { if (player->gunctrl.ammotypes[i] >= 0) { s32 spaceinclip = player->hands[handnum].clipsizes[i] - player->hands[handnum].loadedammo[i]; - s32 index = bgunGetUnequippedReloadIndex(player->gunctrl.weaponnum); + s32 index = bgun_get_unequipped_reload_index(player->gunctrl.weaponnum); if (index != -1) { #if VERSION >= VERSION_JPN_FINAL @@ -5409,26 +5409,26 @@ void bgunFreeWeapon(s32 handnum) } if (g_Vars.mplayerisrunning && (IS8MB() || PLAYERCOUNT() != 1)) { - playermgrDeleteWeapon(handnum); + playermgr_delete_weapon(handnum); } - bgunFreeHeldRocket(handnum); + bgun_free_held_rocket(handnum); } -void bgunTickSwitch2(void) +void bgun_tick_switch2(void) { struct player *player = g_Vars.currentplayer; struct gunctrl *ctrl = &g_Vars.currentplayer->gunctrl; s32 i; if (ctrl->switchtoweaponnum >= 0) { - if (bgunCanFreeWeapon(HAND_RIGHT) && bgunCanFreeWeapon(HAND_LEFT)) { + if (bgun_can_free_weapon(HAND_RIGHT) && bgun_can_free_weapon(HAND_LEFT)) { s32 weaponnum = player->gunctrl.weaponnum; s32 previnuse = player->hands[HAND_LEFT].inuse; struct hand *lefthand; struct hand *righthand; - if (currentPlayerGetDeviceState(ctrl->switchtoweaponnum) != DEVICESTATE_UNEQUIPPED) { + if (current_player_get_device_state(ctrl->switchtoweaponnum) != DEVICESTATE_UNEQUIPPED) { ctrl->switchtoweaponnum = WEAPON_UNARMED; } @@ -5438,14 +5438,14 @@ void bgunTickSwitch2(void) } #endif - if (ctrl->dualwielding && !invHasDoubleWeaponIncAllGuns(ctrl->switchtoweaponnum, ctrl->switchtoweaponnum)) { + if (ctrl->dualwielding && !inv_has_double_weapon_inc_all_guns(ctrl->switchtoweaponnum, ctrl->switchtoweaponnum)) { ctrl->dualwielding = false; } func0f0d7364(); - bgunFreeWeapon(HAND_LEFT); - bgunFreeWeapon(HAND_RIGHT); + bgun_free_weapon(HAND_LEFT); + bgun_free_weapon(HAND_RIGHT); if (weaponnum == WEAPON_HORIZONSCANNER) { g_Vars.currentplayer->insightaimmode = false; @@ -5476,7 +5476,7 @@ void bgunTickSwitch2(void) righthand->inuse = false; ctrl->weaponnum = WEAPON_NONE; } else { - bgunSetGunMemWeapon(ctrl->switchtoweaponnum); + bgun_set_gun_mem_weapon(ctrl->switchtoweaponnum); ctrl->weaponnum = ctrl->switchtoweaponnum; lefthand->inuse = true; righthand->inuse = true; @@ -5525,14 +5525,14 @@ void bgunTickSwitch2(void) bgun0f0abd30(i); - animInit(&player->hands[i].anim); + anim_init(&player->hands[i].anim); if (player->hands[i].audiohandle && sndGetState(player->hands[i].audiohandle) != AL_STOPPED) { audioStop(player->hands[i].audiohandle); } } - invCalculateCurrentIndex(); + inv_calculate_current_index(); ctrl->switchtoweaponnum = -1; ctrl->fnfader = 0; @@ -5540,7 +5540,7 @@ void bgunTickSwitch2(void) if (ctrl->weaponnum == WEAPON_DISGUISE40 || ctrl->weaponnum == WEAPON_DISGUISE41) { struct chrdata *chr = player->prop->chr; - sndStart(var80095200, SFX_DISGUISE_ON, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_DISGUISE_ON, 0, -1, -1, -1, -1, -1); g_Vars.currentplayer->disguised = true; @@ -5550,8 +5550,8 @@ void bgunTickSwitch2(void) chr->hidden |= CHRHFLAG_UNTARGETABLE; } - invRemoveItemByNum(ctrl->weaponnum); - bgunCycleBack(); + inv_remove_item_by_num(ctrl->weaponnum); + bgun_cycle_back(); } ctrl->curfnstr = 0; @@ -5561,14 +5561,14 @@ void bgunTickSwitch2(void) } else { if (((player->hands[HAND_LEFT].inuse && !player->gunctrl.dualwielding) || (!player->hands[HAND_LEFT].inuse && player->gunctrl.dualwielding)) - && bgunCanFreeWeapon(HAND_LEFT)) { - bgunFreeWeapon(HAND_LEFT); + && bgun_can_free_weapon(HAND_LEFT)) { + bgun_free_weapon(HAND_LEFT); player->hands[HAND_LEFT].inuse = player->gunctrl.dualwielding; } } } -void bgunEquipWeapon(s32 weaponnum) +void bgun_equip_weapon(s32 weaponnum) { struct player *player = g_Vars.currentplayer; @@ -5580,7 +5580,7 @@ void bgunEquipWeapon(s32 weaponnum) player->gunctrl.wantammo = false; } -s32 bgunGetWeaponNum(s32 handnum) +s32 bgun_get_weapon_num(s32 handnum) { if (!g_Vars.currentplayer->hands[handnum].inuse) { return WEAPON_NONE; @@ -5589,22 +5589,22 @@ s32 bgunGetWeaponNum(s32 handnum) return g_Vars.currentplayer->gunctrl.weaponnum; } -s32 bgunGetWeaponNum2(s32 handnum) +s32 bgun_get_weapon_num2(s32 handnum) { - return bgunGetWeaponNum(handnum); + return bgun_get_weapon_num(handnum); } bool bgun0f0a1a10(s32 weaponnum) { - if (weaponHasFlag(weaponnum, WEAPONFLAG_00000400) - && (bgunGetAmmoTypeForWeapon(weaponnum, FUNC_PRIMARY) == 0 || bgunGetAmmoQtyForWeapon(weaponnum, FUNC_PRIMARY) > 0)) { + if (weapon_has_flag(weaponnum, WEAPONFLAG_00000400) + && (bgun_get_ammo_type_for_weapon(weaponnum, FUNC_PRIMARY) == 0 || bgun_get_ammo_qty_for_weapon(weaponnum, FUNC_PRIMARY) > 0)) { return true; } return false; } -s32 bgunGetSwitchToWeapon(s32 handnum) +s32 bgun_get_switch_to_weapon(s32 handnum) { s32 weaponnum; @@ -5621,44 +5621,44 @@ s32 bgunGetSwitchToWeapon(s32 handnum) return weaponnum; } -void bgunSwitchToPrevious(void) +void bgun_switch_to_previous(void) { if (g_Vars.tickmode != TICKMODE_CUTSCENE) { struct player *player = g_Vars.currentplayer; s32 dualweaponnum; #if VERSION >= VERSION_NTSC_1_0 - if (invHasSingleWeaponIncAllGuns(player->gunctrl.prevweaponnum)) { - bgunEquipWeapon2(HAND_RIGHT, player->gunctrl.prevweaponnum); + if (inv_has_single_weapon_inc_all_guns(player->gunctrl.prevweaponnum)) { + bgun_equip_weapon2(HAND_RIGHT, player->gunctrl.prevweaponnum); - dualweaponnum = invHasDoubleWeaponIncAllGuns(player->gunctrl.prevweaponnum, player->gunctrl.prevweaponnum) + dualweaponnum = inv_has_double_weapon_inc_all_guns(player->gunctrl.prevweaponnum, player->gunctrl.prevweaponnum) * player->gunctrl.prevweaponnum * player->gunctrl.prevwasdualwielding; - bgunEquipWeapon2(HAND_LEFT, dualweaponnum); + bgun_equip_weapon2(HAND_LEFT, dualweaponnum); } else { - bgunAutoSwitchWeapon(); + bgun_auto_switch_weapon(); } #else - bgunEquipWeapon2(HAND_RIGHT, player->gunctrl.prevweaponnum); - bgunEquipWeapon2(HAND_LEFT, player->gunctrl.prevweaponnum * player->gunctrl.prevwasdualwielding); + bgun_equip_weapon2(HAND_RIGHT, player->gunctrl.prevweaponnum); + bgun_equip_weapon2(HAND_LEFT, player->gunctrl.prevweaponnum * player->gunctrl.prevwasdualwielding); #endif } } -void bgunCycleForward(void) +void bgun_cycle_forward(void) { s32 weaponnum1; s32 weaponnum2; struct player *player = g_Vars.currentplayer; if (g_Vars.tickmode != TICKMODE_CUTSCENE) { - weaponnum1 = bgunGetSwitchToWeapon(HAND_RIGHT); - weaponnum2 = bgunGetSwitchToWeapon(HAND_LEFT); + weaponnum1 = bgun_get_switch_to_weapon(HAND_RIGHT); + weaponnum2 = bgun_get_switch_to_weapon(HAND_LEFT); if (weaponnum1 > WEAPON_PSYCHOSISGUN || weaponnum2 > WEAPON_PSYCHOSISGUN) { weaponnum1 = player->gunctrl.prevweaponnum; weaponnum2 = player->gunctrl.prevweaponnum * player->gunctrl.prevwasdualwielding; } else { - invChooseCycleForwardWeapon(&weaponnum1, &weaponnum2, false); + inv_choose_cycle_forward_weapon(&weaponnum1, &weaponnum2, false); } if (weaponnum2 != weaponnum1) { @@ -5667,19 +5667,19 @@ void bgunCycleForward(void) player->gunctrl.dualwielding = true; } - bgunEquipWeapon(weaponnum1); + bgun_equip_weapon(weaponnum1); } } -void bgunCycleBack(void) +void bgun_cycle_back(void) { s32 weaponnum1; s32 weaponnum2; struct player *player = g_Vars.currentplayer; if (g_Vars.tickmode != TICKMODE_CUTSCENE) { - weaponnum1 = bgunGetSwitchToWeapon(HAND_RIGHT); - weaponnum2 = bgunGetSwitchToWeapon(HAND_LEFT); + weaponnum1 = bgun_get_switch_to_weapon(HAND_RIGHT); + weaponnum2 = bgun_get_switch_to_weapon(HAND_LEFT); if (weaponnum2 == WEAPON_REMOTEMINE) { weaponnum2 = WEAPON_NONE; @@ -5689,7 +5689,7 @@ void bgunCycleBack(void) weaponnum1 = player->gunctrl.prevweaponnum; weaponnum2 = player->gunctrl.prevweaponnum * player->gunctrl.prevwasdualwielding; } else { - invChooseCycleBackWeapon(&weaponnum1, &weaponnum2, false); + inv_choose_cycle_back_weapon(&weaponnum1, &weaponnum2, false); } if (weaponnum2 == WEAPON_NONE) { @@ -5698,7 +5698,7 @@ void bgunCycleBack(void) player->gunctrl.dualwielding = true; } - bgunEquipWeapon(weaponnum1); + bgun_equip_weapon(weaponnum1); } } @@ -5708,11 +5708,11 @@ void bgunCycleBack(void) * * Used by the active menu to colour the slots. */ -bool bgunHasAmmoForWeapon(s32 weaponnum) +bool bgun_has_ammo_for_weapon(s32 weaponnum) { bool ammodefexists = false; bool hasammo = false; - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); s32 i; if (weapon == NULL) { @@ -5720,7 +5720,7 @@ bool bgunHasAmmoForWeapon(s32 weaponnum) } for (i = 0; i < 2; i++) { - struct weaponfunc *func = weaponGetFunctionById(weaponnum, i); + struct weaponfunc *func = weapon_get_function_by_id(weaponnum, i); if (func && func->ammoindex >= 0) { struct inventory_ammo *ammo = weapon->ammos[func->ammoindex]; @@ -5728,7 +5728,7 @@ bool bgunHasAmmoForWeapon(s32 weaponnum) if (ammo) { ammodefexists = true; - if (bgunGetAmmoCount(ammo->type) > 0) { + if (bgun_get_ammo_count(ammo->type) > 0) { hasammo = true; } } @@ -5819,7 +5819,7 @@ u8 g_AutoSwitchWeaponsSecondary[] = { * array. The first available weapon is selected. The player's "wantammo" flag * will be set which will force the weapon onto the second function. */ -void bgunAutoSwitchWeapon(void) +void bgun_auto_switch_weapon(void) { s32 i; struct weapon *weapon; @@ -5845,10 +5845,10 @@ void bgunAutoSwitchWeapon(void) do { bool usable = false; - if (invHasSingleWeaponIncAllGuns(g_AutoSwitchWeaponsPrimary[i])) { + if (inv_has_single_weapon_inc_all_guns(g_AutoSwitchWeaponsPrimary[i])) { weaponnum = g_AutoSwitchWeaponsPrimary[i]; - weapon = weaponFindById(weaponnum); - func = weaponGetFunctionById(weaponnum, FUNC_PRIMARY); + weapon = weapon_find_by_id(weaponnum); + func = weapon_get_function_by_id(weaponnum, FUNC_PRIMARY); if (!bgun0f0990b0(func, weapon) && (func->flags & FUNCFLAG_AUTOSWITCHUNSELECTABLE) == 0) { usable = true; @@ -5857,7 +5857,7 @@ void bgunAutoSwitchWeapon(void) if (weaponnum == WEAPON_SUPERDRAGON && !foundsuperdragon) { foundsuperdragon++; } else { - func = weaponGetFunctionById(weaponnum, FUNC_SECONDARY); + func = weapon_get_function_by_id(weaponnum, FUNC_SECONDARY); if (!bgun0f0990b0(func, weapon) && (func->flags & FUNCFLAG_AUTOSWITCHUNSELECTABLE) == 0) { usable = true; @@ -5898,7 +5898,7 @@ void bgunAutoSwitchWeapon(void) for (i = 0; i < ARRAYCOUNT(g_AutoSwitchWeaponsSecondary); i++) { weaponnum = g_AutoSwitchWeaponsSecondary[i]; - if (invHasSingleWeaponIncAllGuns(weaponnum)) { + if (inv_has_single_weapon_inc_all_guns(weaponnum)) { if (weaponnum == curweaponnum) { foundcurrent = true; } @@ -5924,13 +5924,13 @@ void bgunAutoSwitchWeapon(void) // Switch to newweaponnum if (newweaponnum >= 0 && newweaponnum != curweaponnum) { - if (invHasDoubleWeaponIncAllGuns(newweaponnum, newweaponnum)) { + if (inv_has_double_weapon_inc_all_guns(newweaponnum, newweaponnum)) { g_Vars.currentplayer->gunctrl.dualwielding = true; } else { g_Vars.currentplayer->gunctrl.dualwielding = false; } - bgunEquipWeapon(newweaponnum); + bgun_equip_weapon(newweaponnum); if (wantammo) { g_Vars.currentplayer->gunctrl.wantammo = true; @@ -5938,7 +5938,7 @@ void bgunAutoSwitchWeapon(void) } } -void bgunEquipWeapon2(s32 handnum, s32 weaponnum) +void bgun_equip_weapon2(s32 handnum, s32 weaponnum) { if (handnum == HAND_LEFT) { if (weaponnum == WEAPON_NONE) { @@ -5951,32 +5951,32 @@ void bgunEquipWeapon2(s32 handnum, s32 weaponnum) weaponnum = WEAPON_UNARMED; } - bgunEquipWeapon(weaponnum); + bgun_equip_weapon(weaponnum); } } -s32 bgunIsFiring(s32 handnum) +s32 bgun_is_firing(s32 handnum) { return g_Vars.currentplayer->hands[handnum].firing; } -s32 bgunGetAttackType(s32 handnum) +s32 bgun_get_attack_type(s32 handnum) { return g_Vars.currentplayer->hands[handnum].attacktype; } -char *bgunGetName(s32 weaponnum) +char *bgun_get_name(s32 weaponnum) { struct weapon *weapon = g_Weapons[weaponnum]; if (weapon) { - return langGet(weapon->name); + return lang_get(weapon->name); } return "** error\n"; } -u16 bgunGetNameId(s32 weaponnum) +u16 bgun_get_name_id(s32 weaponnum) { struct weapon *weapon = g_Weapons[weaponnum]; @@ -5987,12 +5987,12 @@ u16 bgunGetNameId(s32 weaponnum) return 0; } -char *bgunGetShortName(s32 weaponnum) +char *bgun_get_short_name(s32 weaponnum) { struct weapon *weapon = g_Weapons[weaponnum]; if (weapon) { - return langGet(weapon->shortname); + return lang_get(weapon->shortname); } return "** error\n"; @@ -6000,17 +6000,17 @@ char *bgunGetShortName(s32 weaponnum) const char var7f1ac170[] = "wantedfn %d tiggle %d\n"; -void bgunReloadIfPossible(s32 handnum) +void bgun_reload_if_possible(s32 handnum) { struct player *player = g_Vars.currentplayer; - if (bgunGetAmmoTypeForWeapon(bgunGetWeaponNum(handnum), FUNC_PRIMARY) + if (bgun_get_ammo_type_for_weapon(bgun_get_weapon_num(handnum), FUNC_PRIMARY) && player->hands[handnum].modenext == HANDMODE_NONE) { player->hands[handnum].modenext = HANDMODE_RELOAD; } } -void bgunSetAdjustPos(f32 angle) +void bgun_set_adjust_pos(f32 angle) { struct player *player = g_Vars.currentplayer; @@ -6018,7 +6018,7 @@ void bgunSetAdjustPos(f32 angle) player->hands[1].adjustpos.z = (1 - cosf(angle)) * 5; } -void bgunStartSlide(s32 handnum) +void bgun_start_slide(s32 handnum) { g_Vars.currentplayer->hands[handnum].slideinc = true; } @@ -6029,10 +6029,10 @@ void bgunStartSlide(s32 handnum) * The slide moves back and then forward when firing. If the gun no longer has * any ammo loaded in it, the slide moves back and remains in the back position. */ -void bgunUpdateSlide(s32 handnum) +void bgun_update_slide(s32 handnum) { f32 slidemax = 0.0f; - struct weaponfunc *funcdef = currentPlayerGetWeaponFunction(handnum); + struct weaponfunc *funcdef = current_player_get_weapon_function(handnum); struct player *player = g_Vars.currentplayer; if (funcdef && ((funcdef->type & 0xff) == INVENTORYFUNCTYPE_SHOOT)) { @@ -6133,10 +6133,10 @@ void bgun0f0a256c(s32 mtxindex, Mtxf *mtx) rot.y = 0.0f; rot.z = var8009d140; - mtx4LoadIdentity(&sp78); - mtx4LoadRotation(&rot, &sp78); - mtx4MultMtx4(mtx, &sp78, &sp38); - mtx4Copy(&sp38, mtx); + mtx4_load_identity(&sp78); + mtx4_load_rotation(&rot, &sp78); + mtx4_mult_mtx4(mtx, &sp78, &sp38); + mtx4_copy(&sp38, mtx); } if (mtxindex == var8009d0f0[0] || mtxindex == var8009d0f0[1] || mtxindex == var8009d0f0[2]) { @@ -6144,10 +6144,10 @@ void bgun0f0a256c(s32 mtxindex, Mtxf *mtx) rot.y = 0.0f; rot.z = 2.0f * -var8009d140; - mtx4LoadIdentity(&sp78); - mtx4LoadRotation(&rot, &sp78); - mtx4MultMtx4(mtx, &sp78, &sp38); - mtx4Copy(&sp38, mtx); + mtx4_load_identity(&sp78); + mtx4_load_rotation(&rot, &sp78); + mtx4_mult_mtx4(mtx, &sp78, &sp38); + mtx4_copy(&sp38, mtx); } } @@ -6157,7 +6157,7 @@ bool bgun0f0a27c8(void) struct weaponfunc *func; hand = &g_Vars.currentplayer->hands[HAND_RIGHT]; - func = gsetGetWeaponFunction2(&hand->gset); + func = gset_get_weapon_function2(&hand->gset); if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_MELEE @@ -6171,7 +6171,7 @@ bool bgun0f0a27c8(void) hand = &g_Vars.currentplayer->hands[HAND_LEFT]; if (hand->inuse) { - func = gsetGetWeaponFunction2(&hand->gset); + func = gset_get_weapon_function2(&hand->gset); if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_MELEE @@ -6197,7 +6197,7 @@ bool bgun0f0a28d8(void) struct weaponfunc *func; hand = &g_Vars.currentplayer->hands[HAND_RIGHT]; - func = gsetGetWeaponFunction2(&hand->gset); + func = gset_get_weapon_function2(&hand->gset); if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_MELEE @@ -6210,7 +6210,7 @@ bool bgun0f0a28d8(void) hand = &g_Vars.currentplayer->hands[HAND_LEFT]; if (hand->inuse) { - func = gsetGetWeaponFunction2(&hand->gset); + func = gset_get_weapon_function2(&hand->gset); if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_MELEE @@ -6224,7 +6224,7 @@ bool bgun0f0a28d8(void) return false; } -void bgunHandlePlayerDead(void) +void bgun_handle_player_dead(void) { struct player *player = g_Vars.currentplayer; s32 i; @@ -6246,16 +6246,16 @@ void bgunHandlePlayerDead(void) player->hands[i].matmot2 = 0; player->hands[i].matmot3 = 0; - bgunSetState(i, HANDSTATE_IDLE); + bgun_set_state(i, HANDSTATE_IDLE); } - bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE); - bgunEquipWeapon2(HAND_RIGHT, WEAPON_NONE); + bgun_equip_weapon2(HAND_LEFT, WEAPON_NONE); + bgun_equip_weapon2(HAND_RIGHT, WEAPON_NONE); } } #if VERSION >= VERSION_NTSC_1_0 -bool bgunIsMissionCritical(s32 weaponnum) +bool bgun_is_mission_critical(s32 weaponnum) { if (weaponnum == WEAPON_TIMEDMINE || weaponnum == WEAPON_REMOTEMINE @@ -6268,7 +6268,7 @@ bool bgunIsMissionCritical(s32 weaponnum) } #endif -void bgunDisarm(struct prop *attackerprop) +void bgun_disarm(struct prop *attackerprop) { struct player *player = g_Vars.currentplayer; s32 weaponnum = player->hands[0].gset.weaponnum; @@ -6277,14 +6277,14 @@ void bgunDisarm(struct prop *attackerprop) s32 i; bool drop; - if (!weaponHasFlag(weaponnum, WEAPONFLAG_UNDROPPABLE) && weaponnum <= WEAPON_RCP45) { + if (!weapon_has_flag(weaponnum, WEAPONFLAG_UNDROPPABLE) && weaponnum <= WEAPON_RCP45) { #if VERSION >= VERSION_NTSC_1_0 // Coop must not allow player to drop a mission critical weapon // because AI lists can fail the mission if the player has zero // quantity. if (g_Vars.coopplayernum >= 0 && (attackerprop == g_Vars.bond->prop || attackerprop == g_Vars.coop->prop) - && bgunIsMissionCritical(weaponnum)) { + && bgun_is_mission_critical(weaponnum)) { return; } #endif @@ -6309,40 +6309,40 @@ void bgunDisarm(struct prop *attackerprop) // Or drop it at player's feet with the pin pulled maybe... if (weaponnum == WEAPON_GRENADE || weaponnum == WEAPON_NBOMB) { for (i = 0; i < 2; i++) { - struct weaponfunc *func = gsetGetWeaponFunction(&player->hands[i].gset); + struct weaponfunc *func = gset_get_weapon_function(&player->hands[i].gset); if ((func->type & 0xff) == INVENTORYFUNCTYPE_THROW && player->hands[i].state == HANDSTATE_ATTACK && player->hands[i].stateminor == HANDSTATEMINOR_ATTACK_THROW_0) { drop = false; - bgunCreateThrownProjectile(i + 2, &player->hands[i].gset); + bgun_create_thrown_projectile(i + 2, &player->hands[i].gset); } } } - weaponDeleteFromChr(chr, HAND_RIGHT); - weaponDeleteFromChr(chr, HAND_LEFT); + weapon_delete_from_chr(chr, HAND_RIGHT); + weapon_delete_from_chr(chr, HAND_LEFT); // Actually drop the weapon - modelnum = playermgrGetModelOfWeapon(weaponnum); + modelnum = playermgr_get_model_of_weapon(weaponnum); if (modelnum >= 0 && drop) { - struct prop *prop2 = weaponCreateForChr(chr, modelnum, weaponnum, OBJFLAG_WEAPON_AICANNOTUSE, NULL, NULL); + struct prop *prop2 = weapon_create_for_chr(chr, modelnum, weaponnum, OBJFLAG_WEAPON_AICANNOTUSE, NULL, NULL); if (prop2 && prop2->obj) { struct defaultobj *obj = prop2->obj; - objSetDropped(prop2, DROPTYPE_DEFAULT); + obj_set_dropped(prop2, DROPTYPE_DEFAULT); if (obj->hidden & OBJHFLAG_PROJECTILE) { obj->projectile->pickuptimer240 = TICKS(240); obj->projectile->pickupby = attackerprop; } - objDrop(prop2, true); + obj_drop(prop2, true); } } - invRemoveItemByNum(weaponnum); + inv_remove_item_by_num(weaponnum); player->hands[1].state = HANDSTATE_IDLE; player->hands[1].ejectstate = EJECTSTATE_INIT; @@ -6362,8 +6362,8 @@ void bgunDisarm(struct prop *attackerprop) player->visionmode = VISIONMODE_NORMAL; } - bgunEquipWeapon2(HAND_RIGHT, WEAPON_UNARMED); - bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE); + bgun_equip_weapon2(HAND_RIGHT, WEAPON_UNARMED); + bgun_equip_weapon2(HAND_LEFT, WEAPON_NONE); } } @@ -6372,7 +6372,7 @@ void bgunDisarm(struct prop *attackerprop) * * With this function stubbed, part of the CMP150 model does not render. */ -void bgunExecuteModelCmdList(s32 *ptr) +void bgun_execute_model_cmd_list(s32 *ptr) { union modelrwdata *rwdata; struct modelnode *node; @@ -6429,7 +6429,7 @@ void bgunExecuteModelCmdList(s32 *ptr) * iterate the command list to update part visibility rather than iterate the * full model tree. */ -s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 *ptr) +s32 bgun_create_model_cmd_list(struct model *model, struct modelnode *nodearg, s32 *ptr) { s32 len = 0; struct modelnode *node = nodearg; @@ -6442,7 +6442,7 @@ s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 * switch ((u8)type) { case MODELNODETYPE_DISTANCE: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->distance.visible = false; node->child = rodata->distance.target; ptr[0] = 0; @@ -6454,7 +6454,7 @@ s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 * break; case MODELNODETYPE_TOGGLE: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->toggle.visible = true; node->child = rodata->toggle.target; ptr[0] = 1; @@ -6465,7 +6465,7 @@ s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 * len += 16; break; case MODELNODETYPE_HEADSPOT: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->headspot.headmodeldef = NULL; rwdata->headspot.rwdatas = NULL; ptr[0] = 2; @@ -6474,7 +6474,7 @@ s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 * len += 8; break; case MODELNODETYPE_0B: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->type0b.unk00 = 0; ptr[0] = 3; ptr[1] = (s32)rwdata; @@ -6482,7 +6482,7 @@ s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 * len += 8; break; case MODELNODETYPE_CHRGUNFIRE: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->chrgunfire.visible = false; ptr[0] = 4; ptr[1] = (s32)rwdata; @@ -6491,7 +6491,7 @@ s32 bgunCreateModelCmdList(struct model *model, struct modelnode *nodearg, s32 * break; case MODELNODETYPE_DL: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->dl.vertices = rodata->dl.vertices; rwdata->dl.gdl = rodata->dl.opagdl; rwdata->dl.colours = (void *)ALIGN8((uintptr_t)&rodata->dl.vertices[rodata->dl.numvertices]); @@ -6541,16 +6541,16 @@ struct guncmd var80070200[2] = { { GUNCMD_END }, }; -void bgunStartDetonateAnimation(s32 playernum) +void bgun_start_detonate_animation(s32 playernum) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); if (g_Vars.currentplayer->hands[HAND_LEFT].gset.weaponnum == WEAPON_REMOTEMINE) { - bgunStartAnimation(var80070200, 1, &g_Vars.currentplayer->hands[HAND_LEFT]); + bgun_start_animation(var80070200, 1, &g_Vars.currentplayer->hands[HAND_LEFT]); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } /** @@ -6561,12 +6561,12 @@ void bgunStartDetonateAnimation(s32 playernum) * sets the gunctrl's gangsta property to true or false based on whether this * criteria is met on the current (or previous?) frame. * - * bgunUpdateGangsta uses this property and increments the rotation of the gun + * bgun_update_gangsta uses this property and increments the rotation of the gun * accordingly. It also checks that the gun is in a state that allows gangsta * rotation (reloading and equip/unequip do not). It also implements a delay on * reverting to the normal rotation. */ -void bgunUpdateGangsta(struct hand *hand, s32 handnum, struct coord *arg2, struct weaponfunc *funcdef, Mtxf *arg4, Mtxf *arg5) +void bgun_update_gangsta(struct hand *hand, s32 handnum, struct coord *arg2, struct weaponfunc *funcdef, Mtxf *arg4, Mtxf *arg5) { f32 tmp; struct coord sp38 = {0, 0, 0}; @@ -6643,7 +6643,7 @@ void bgunUpdateGangsta(struct hand *hand, s32 handnum, struct coord *arg2, struc tmp = -cosf(hand->gangstarot * M_PI) * 0.5f + 0.50f; sp38.z = (tmp * 66.6f * 0.017453292f) * (handnum != HAND_RIGHT ? 1.0f : -1.0f); - mtx4LoadRotation(&sp38, arg4); + mtx4_load_rotation(&sp38, arg4); mtx00015be0(arg4, arg5); arg2->y += 4.0f * hand->gangstarot; @@ -6662,7 +6662,7 @@ void bgunUpdateGangsta(struct hand *hand, s32 handnum, struct coord *arg2, struc * forcecreatesmoke controls whether smoke should be created while the gun is * still firing. */ -void bgunUpdateSmoke(struct hand *hand, s32 handnum, s32 weaponnum, struct weaponfunc *funcdef) +void bgun_update_smoke(struct hand *hand, s32 handnum, s32 weaponnum, struct weaponfunc *funcdef) { if (hand->firing) { if (weaponnum == WEAPON_DY357MAGNUM || weaponnum == WEAPON_DY357LX) { @@ -6776,7 +6776,7 @@ void bgunUpdateSmoke(struct hand *hand, s32 handnum, s32 weaponnum, struct weapo hand->gunsmokepoint = 0.0f; - if (smokeCreateForHand(&smokepos, smokerooms, smoketype, handnum)) { + if (smoke_create_for_hand(&smokepos, smokerooms, smoketype, handnum)) { hand->createsmoke = false; } } @@ -6785,7 +6785,7 @@ void bgunUpdateSmoke(struct hand *hand, s32 handnum, s32 weaponnum, struct weapo /** * Update the red beam and dot (used by the Falcon 2 and its variants). */ -void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 handnum, u8 *allocation) +void bgun_update_lasersight(struct hand *hand, struct modeldef *modeldef, s32 handnum, u8 *allocation) { struct modelnode *node; struct coord beamfar; @@ -6799,16 +6799,16 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand struct coord sp30; bool busy; - node = modelGetPart(modeldef, MODELPART_GUN_LASERSIGHT); + node = model_get_part(modeldef, MODELPART_GUN_LASERSIGHT); if (node) { - mtxindex = modelFindNodeMtxIndex(node, 0); + mtxindex = model_find_node_mtx_index(node, 0); beamnear.x = ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][0]; beamnear.y = ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][1]; beamnear.z = ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][2]; - mtx4TransformVecInPlace(camGetProjectionMtxF(), &beamnear); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &beamnear); if (hand->useposrot || (g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit & DEVICE_XRAYSCANNER)) { @@ -6816,7 +6816,7 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand beamfar.y = 0.0f; beamfar.z = 1.0f; - mtx4RotateVecInPlace(&hand->cammtx, &beamfar); + mtx4_rotate_vec_in_place(&hand->cammtx, &beamfar); sp48.x = beamfar.x; sp48.y = beamfar.y; @@ -6826,20 +6826,20 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand sp3c.y = beamnear.y; sp3c.z = beamnear.z; - mtx4TransformVec(camGetWorldToScreenMtxf(), &sp3c, &sp54); - mtx4RotateVec(camGetProjectionMtxF(), &sp48, &sp30); + mtx4_transform_vec(cam_get_world_to_screen_mtxf(), &sp3c, &sp54); + mtx4_rotate_vec(cam_get_projection_mtxf(), &sp48, &sp30); beamfar.x *= 500.0f; beamfar.y *= 500.0f; beamfar.z *= 500.0f; - mtx4RotateVecInPlace(camGetProjectionMtxF(), &beamfar); + mtx4_rotate_vec_in_place(cam_get_projection_mtxf(), &beamfar); beamfar.x += beamnear.x; beamfar.y += beamnear.y; beamfar.z += beamnear.z; - lasersightSetBeam(handnum, 1, &beamnear, &beamfar); + lasersight_set_beam(handnum, 1, &beamnear, &beamfar); return; } @@ -6850,13 +6850,13 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand } if (busy) { - mtxindex = modelFindNodeMtxIndex(node, 0); + mtxindex = model_find_node_mtx_index(node, 0); beamfar.x = 0.0f; beamfar.y = 0.0f; beamfar.z = 500.0f; - mtx4TransformVecInPlace((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &beamfar); + mtx4_transform_vec_in_place((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &beamfar); } else { cam0f0b4c3c(g_Vars.currentplayer->crosspos, &beamfar, 1); @@ -6865,8 +6865,8 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand beamfar.z *= 500.0f; } - mtx4TransformVecInPlace(camGetProjectionMtxF(), &beamfar); - lasersightSetBeam(handnum, 1, &beamnear, &beamfar); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &beamfar); + lasersight_set_beam(handnum, 1, &beamnear, &beamfar); if (handnum == HAND_RIGHT && hand->hasdotinfo && !busy) { dotpos.x = hand->dotpos.x; @@ -6877,7 +6877,7 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand dotrot.y = hand->dotrot.y; dotrot.z = hand->dotrot.z; - lasersightSetDot(handnum, &dotpos, &dotrot); + lasersight_set_dot(handnum, &dotpos, &dotrot); } } } @@ -6885,14 +6885,14 @@ void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 hand /** * Increment the main barrel spinning, play sounds and (probably) fire shots. */ -void bgunUpdateReaper(struct hand *hand, struct modeldef *modeldef) +void bgun_update_reaper(struct hand *hand, struct modeldef *modeldef) { struct modelnode *node; f32 f2; f32 f12; s32 tmp; - node = modelGetPart(modeldef, MODELPART_REAPER_002C); + node = model_get_part(modeldef, MODELPART_REAPER_002C); if (hand->matmot3 <= hand->matmot2) { if (hand->matmot2 < 0.0f) { @@ -6935,7 +6935,7 @@ void bgunUpdateReaper(struct hand *hand, struct modeldef *modeldef) var8009d140 = hand->matmot1; if (hand->audiohandle == NULL && hand->matmot3 > 0.1f && g_Vars.lvupdate240 != 0) { - sndStart(var80095200, SFX_805E, &hand->audiohandle, -1, -1, -1.0f, -1, -1); + snd_start(var80095200, SFX_805E, &hand->audiohandle, -1, -1, -1.0f, -1, -1); } if (hand->audiohandle != NULL) { @@ -6955,34 +6955,34 @@ void bgunUpdateReaper(struct hand *hand, struct modeldef *modeldef) } if (node) { - var8009d0dc = modelFindNodeMtxIndex(node, 0); + var8009d0dc = model_find_node_mtx_index(node, 0); g_ModelJointPositionedFunc = bgun0f0a256c; var8009d0f0[0] = var8009d0f0[1] = var8009d0f0[2] = -1; } - node = modelGetPart(modeldef, MODELPART_REAPER_002D); + node = model_get_part(modeldef, MODELPART_REAPER_002D); if (node) { - var8009d0f0[0] = modelFindNodeMtxIndex(node, 0); + var8009d0f0[0] = model_find_node_mtx_index(node, 0); } - node = modelGetPart(modeldef, MODELPART_REAPER_002E); + node = model_get_part(modeldef, MODELPART_REAPER_002E); if (node) { - var8009d0f0[1] = modelFindNodeMtxIndex(node, 0); + var8009d0f0[1] = model_find_node_mtx_index(node, 0); } - node = modelGetPart(modeldef, MODELPART_REAPER_002F); + node = model_get_part(modeldef, MODELPART_REAPER_002F); if (node) { - var8009d0f0[2] = modelFindNodeMtxIndex(node, 0); + var8009d0f0[2] = model_find_node_mtx_index(node, 0); } } /** * Move/extend the scope on the gun model when the zoom function is used. */ -void bgunUpdateSniperRifle(struct modeldef *modeldef, u8 *allocation) +void bgun_update_sniper_rifle(struct modeldef *modeldef, u8 *allocation) { struct modelnode *nodes[4]; f32 sp88[4] = {0, 0, 0, 0}; @@ -6991,17 +6991,17 @@ void bgunUpdateSniperRifle(struct modeldef *modeldef, u8 *allocation) s32 mtxindex; struct coord sp70; - f26 = 1.0f - (currentPlayerGetGunZoomFov() - 2.0f) / 58.0f; + f26 = 1.0f - (current_player_get_gun_zoom_fov() - 2.0f) / 58.0f; - nodes[0] = modelGetPart(modeldef, MODELPART_SNIPERRIFLE_SCOPE1); - nodes[1] = modelGetPart(modeldef, MODELPART_SNIPERRIFLE_SCOPE2); - nodes[2] = modelGetPart(modeldef, MODELPART_SNIPERRIFLE_SCOPE3); - nodes[3] = modelGetPart(modeldef, MODELPART_SNIPERRIFLE_SCOPE4); + nodes[0] = model_get_part(modeldef, MODELPART_SNIPERRIFLE_SCOPE1); + nodes[1] = model_get_part(modeldef, MODELPART_SNIPERRIFLE_SCOPE2); + nodes[2] = model_get_part(modeldef, MODELPART_SNIPERRIFLE_SCOPE3); + nodes[3] = model_get_part(modeldef, MODELPART_SNIPERRIFLE_SCOPE4); for (i = 0; i < ARRAYCOUNT(nodes); i++) { if (nodes[i]) { f32 f20 = f26 * 4.0f; - mtxindex = modelFindNodeMtxIndex(nodes[i], 0); + mtxindex = model_find_node_mtx_index(nodes[i], 0); sp88[i] = f20 - i; if (f20 < i) { @@ -7014,7 +7014,7 @@ void bgunUpdateSniperRifle(struct modeldef *modeldef, u8 *allocation) sp70.y = 0.0f; sp70.z = sp88[i]; - mtx4RotateVecInPlace((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &sp70); + mtx4_rotate_vec_in_place((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &sp70); ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][0] += sp70.x; ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][1] += sp70.y; @@ -7026,12 +7026,12 @@ void bgunUpdateSniperRifle(struct modeldef *modeldef, u8 *allocation) /** * Animate the cartridge slider thing in the Devastator model. */ -void bgunUpdateDevastator(struct hand *hand, u8 *allocation, struct modeldef *modeldef) +void bgun_update_devastator(struct hand *hand, u8 *allocation, struct modeldef *modeldef) { - struct modelnode *node = modelGetPart(modeldef, MODELPART_DEVASTATOR_0028); + struct modelnode *node = model_get_part(modeldef, MODELPART_DEVASTATOR_0028); if (node) { - s32 mtxindex = modelFindNodeMtxIndex(node, 0); + s32 mtxindex = model_find_node_mtx_index(node, 0); struct coord sp24; hand->loadslide += 0.01f * LVUPDATE60FREAL(); @@ -7044,7 +7044,7 @@ void bgunUpdateDevastator(struct hand *hand, u8 *allocation, struct modeldef *mo sp24.y = 0.0f; sp24.z = 0.0f; - mtx4RotateVecInPlace((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &sp24); + mtx4_rotate_vec_in_place((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)), &sp24); ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][0] += sp24.x; ((Mtxf *)((uintptr_t)allocation + mtxindex * sizeof(Mtxf)))->m[3][1] += sp24.y; @@ -7059,7 +7059,7 @@ void bgunUpdateDevastator(struct hand *hand, u8 *allocation, struct modeldef *mo * starburst when the trigger is pressed while the shotgun has the double blast * function. */ -void bgunUpdateShotgun(struct hand *hand, u8 *allocation, bool *arg2, struct modeldef *modeldef) +void bgun_update_shotgun(struct hand *hand, u8 *allocation, bool *arg2, struct modeldef *modeldef) { if (hand->flashon) { hand->matmot1 = 1.0f; @@ -7076,12 +7076,12 @@ void bgunUpdateShotgun(struct hand *hand, u8 *allocation, bool *arg2, struct mod if (hand->matmot1 > 0.0f) { s32 sp34; s32 sp28[3] = {0, 0, 0}; - struct modelnode *node = modelGetPart(modeldef, MODELPART_SHOTGUN_0050); + struct modelnode *node = model_get_part(modeldef, MODELPART_SHOTGUN_0050); *arg2 = true; if (node) { - sp34 = modelFindNodeMtxIndex(node, 0); + sp34 = model_find_node_mtx_index(node, 0); mtx00015ea8((1.0f - hand->matmot1) * 8.0f + 0.5f, (Mtxf *)((uintptr_t)allocation + sp34 * sizeof(Mtxf))); mtx00015df0((1.0f - hand->matmot1) * 3.0f + 1.0f, (Mtxf *)((uintptr_t)allocation + sp34 * sizeof(Mtxf))); @@ -7090,11 +7090,11 @@ void bgunUpdateShotgun(struct hand *hand, u8 *allocation, bool *arg2, struct mod } } -void bgunUpdateLaser(struct hand *hand) +void bgun_update_laser(struct hand *hand) { if (hand->firing && hand->gset.weaponfunc == FUNC_SECONDARY) { if (hand->audiohandle == NULL && g_Vars.lvupdate240 != 0) { - sndStart(var80095200, SFX_LASER_STREAM, &hand->audiohandle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_LASER_STREAM, &hand->audiohandle, -1, -1, -1, -1, -1); } hand->matmot1 = 1; @@ -7111,27 +7111,27 @@ void bgunUpdateLaser(struct hand *hand) /** * Create ammo casing so they can be ejected during reload. */ -void bgunUpdateMagnum(struct hand *hand, s32 handnum, struct modeldef *modeldef, Mtxf *mtx) +void bgun_update_magnum(struct hand *hand, s32 handnum, struct modeldef *modeldef, Mtxf *mtx) { f32 ground = g_Vars.currentplayer->vv_ground; s32 i; if (modeldef != NULL) { for (i = 0; i < hand->unk0cc8_04; i++) { - struct modelnode *node = modelGetPart(modeldef, 0x0a + random() % 6); + struct modelnode *node = model_get_part(modeldef, 0x0a + random() % 6); if (node) { - s32 index = modelFindNodeMtxIndex(node, 0); + s32 index = model_find_node_mtx_index(node, 0); Mtxf *tmp = mtx; Mtxf sp4c; tmp += index; - mtx4Copy(tmp, &sp4c); + mtx4_copy(tmp, &sp4c); mtx00015f04(9.999999f, &sp4c); - mtx4MultMtx4InPlace(camGetProjectionMtxF(), &sp4c); + mtx4_mult_mtx4_in_place(cam_get_projection_mtxf(), &sp4c); - casingCreateForHand(handnum, ground, &sp4c); + casing_create_for_hand(handnum, ground, &sp4c); } } } @@ -7140,14 +7140,14 @@ void bgunUpdateMagnum(struct hand *hand, s32 handnum, struct modeldef *modeldef, /** * Create and/or update the rocket prop that sits inside the rocket launcher. */ -void bgunUpdateRocketLauncher(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func) +void bgun_update_rocket_launcher(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func) { if (hand->rocket == NULL && hand->loadedammo[0] > 0) { - bgunCreateHeldRocket(handnum, func); + bgun_create_held_rocket(handnum, func); } if (hand->rocket) { - bgunUpdateHeldRocket(handnum); + bgun_update_held_rocket(handnum); } } @@ -7158,21 +7158,21 @@ void bgun0f0a45d0(struct hand *hand, struct modeldef *modeldef, bool isdetonator switch (hand->ejecttype) { case EJECTTYPE_GUN: if (isdetonator) { - node = modelGetPart(modeldef, 0x2a); + node = model_get_part(modeldef, 0x2a); } else { - node = modelGetPart(modeldef, 0x37); + node = model_get_part(modeldef, 0x37); } break; case EJECTTYPE_GRENADEPIN: - node = modelGetPart(modeldef, 0x2b); + node = model_get_part(modeldef, 0x2b); break; case EJECTTYPE_TRANQCASE: - node = modelGetPart(modeldef, 0x2b); + node = model_get_part(modeldef, 0x2b); break; } if (node) { - var8009d148 = modelFindNodeMtxIndex(node, 0); + var8009d148 = model_find_node_mtx_index(node, 0); g_ModelJointPositionedFunc = bgun0f0a256c; } else { var8009d148 = -1; @@ -7184,7 +7184,7 @@ void bgun0f0a45d0(struct hand *hand, struct modeldef *modeldef, bool isdetonator * when reloading, and the pulled pin on grenades and nbombs appears to move * with the model rather than detaching properly. */ -void bgunTickEject(struct hand *hand, struct modeldef *modeldef, bool isdetonator) +void bgun_tick_eject(struct hand *hand, struct modeldef *modeldef, bool isdetonator) { f32 lvupdate; struct coord spd0; @@ -7242,8 +7242,8 @@ void bgunTickEject(struct hand *hand, struct modeldef *modeldef, bool isdetonato hand->unk0d10 = hand->unk0d14 - 200.0f; - mtx4LoadRotation(&spd0, &sp90); - mtx4ToMtx3(&sp90, hand->unk0d50); + mtx4_load_rotation(&spd0, &sp90); + mtx4_to_mtx3(&sp90, hand->unk0d50); if (g_Vars.lvupdate240 > 0 && hand->ejecttype != EJECTTYPE_GUN) { sp84.f[0] = (hand->posmtx.m[3][0] - hand->prevmtx.m[3][0]) / g_Vars.lvupdate60freal; @@ -7251,7 +7251,7 @@ void bgunTickEject(struct hand *hand, struct modeldef *modeldef, bool isdetonato sp84.f[2] = (hand->posmtx.m[3][2] - hand->prevmtx.m[3][2]) / g_Vars.lvupdate60freal; mtx00017588(hand->posmtx.m, sp44.m); - mtx4RotateVecInPlace(&sp44, &sp84); + mtx4_rotate_vec_in_place(&sp44, &sp84); hand->unk0d20.f[0] += sp84.f[0] * 0.3f; hand->unk0d20.f[1] += sp84.f[1] * 0.3f; @@ -7309,21 +7309,21 @@ void bgun0f0a4e44(struct hand *hand, struct weapon *weapondef, struct modeldef * spb4 = RANDOMFRAC() * 0.25f + 1.0f; muzzlez = weapondef->muzzlez; - mtx4LoadIdentity(&spd8); + mtx4_load_identity(&spd8); if (funcdef && (funcdef->flags & FUNCFLAG_00000001)) { - mtx4LoadZRotation(RANDOMFRAC() * M_BADTAU, &spd8); + mtx4_load_z_rotation(RANDOMFRAC() * M_BADTAU, &spd8); } - mtx4LoadZRotation((RANDOMFRAC() * 0.3 - 0.15), &spd8); + mtx4_load_z_rotation((RANDOMFRAC() * 0.3 - 0.15), &spd8); mtx = (Mtxf *)allocation; mtx += mtxindex; - mtx4MultMtx4InPlace(mtx, &spd8); + mtx4_mult_mtx4_in_place(mtx, &spd8); mtx00015f04(spb4, &spd8); mtx00015ea8(muzzlez, &spd8); - mtx4Copy(&spd8, mtx); + mtx4_copy(&spd8, mtx); if (shotstotake == 0 && weaponnum != WEAPON_REAPER) { shotstotake++; @@ -7345,33 +7345,33 @@ void bgun0f0a4e44(struct hand *hand, struct weapon *weapondef, struct modeldef * } for (partnum = 0x50; partnum <= 0x52; partnum++) { - struct modelnode *node = modelGetPart(modeldef, partnum); + struct modelnode *node = model_get_part(modeldef, partnum); struct coord sp60; if (node && weaponnum != WEAPON_REAPER && weaponnum != WEAPON_SHOTGUN) { struct modelrodata_position *rodata = &node->rodata->position; - s32 mtxindex = modelFindNodeMtxIndex(node, 0); + s32 mtxindex = model_find_node_mtx_index(node, 0); sp60.x = rodata->pos.x * spd8.m[0][0] + rodata->pos.y * spd8.m[1][0] + rodata->pos.z * spd8.m[2][0] + spd8.m[3][0]; sp60.y = rodata->pos.x * spd8.m[0][1] + rodata->pos.y * spd8.m[1][1] + rodata->pos.z * spd8.m[2][1] + spd8.m[3][1]; sp60.z = rodata->pos.x * spd8.m[0][2] + rodata->pos.y * spd8.m[1][2] + rodata->pos.z * spd8.m[2][2] + spd8.m[3][2]; - mtx4LoadIdentity(&sp70); - mtx4Align(sp70.m, RANDOMFRAC() * M_BADTAU, -sp60.x, -sp60.y, -sp60.z); + mtx4_load_identity(&sp70); + mtx4_align(sp70.m, RANDOMFRAC() * M_BADTAU, -sp60.x, -sp60.y, -sp60.z); mtx00015f04(0.10000001f * spb4, &sp70); mtx = (Mtxf *)allocation; mtx00016e98(arg10->m, 0, mtx->m[3][0] - hand->aimpos.x, mtx->m[3][1] - hand->aimpos.y, mtx->m[3][2] - hand->aimpos.z); - mtx4MultMtx4InPlace(arg10, &sp70); + mtx4_mult_mtx4_in_place(arg10, &sp70); mtx00016710(muzzlez, sp70.m); - mtx4MultMtx4InPlace(arg9, &sp70); - mtx4SetTranslation(&sp60, &sp70); + mtx4_mult_mtx4_in_place(arg9, &sp70); + mtx4_set_translation(&sp60, &sp70); mtx = (Mtxf *)allocation; mtx += mtxindex; - mtx4Copy(&sp70, mtx); + mtx4_copy(&sp70, mtx); } } } @@ -7380,7 +7380,7 @@ void bgun0f0a4e44(struct hand *hand, struct weapon *weapondef, struct modeldef * * Create casing and beam for a fired weapon, * and uncloak if the weapon is a throwable or fired projectile. */ -void bgunCreateFx(struct hand *hand, s32 handnum, struct weaponfunc *funcdef, s32 weaponnum, struct modeldef *modeldef, u8 *allocation) +void bgun_create_fx(struct hand *hand, s32 handnum, struct weaponfunc *funcdef, s32 weaponnum, struct modeldef *modeldef, u8 *allocation) { f32 ground; bool createbeam = true; @@ -7398,31 +7398,31 @@ void bgunCreateFx(struct hand *hand, s32 handnum, struct weaponfunc *funcdef, s3 partnum = (hand->burstbullets & 1) == 1 ? MODELPART_REAPER_CARTEJECTPOS1 : MODELPART_REAPER_CARTEJECTPOS2; } - node = modelGetPart(modeldef, partnum); + node = model_get_part(modeldef, partnum); if (node) { Mtxf *mtx = (Mtxf *)allocation; Mtxf sp24; - mtx += modelFindNodeMtxIndex(node, 0); + mtx += model_find_node_mtx_index(node, 0); - mtx4Copy(mtx, &sp24); + mtx4_copy(mtx, &sp24); mtx00015f04(9.999999f, &sp24); - mtx4MultMtx4InPlace(camGetProjectionMtxF(), &sp24); + mtx4_mult_mtx4_in_place(cam_get_projection_mtxf(), &sp24); - casingCreateForHand(handnum, ground, &sp24); + casing_create_for_hand(handnum, ground, &sp24); } else { - casingCreateForHand(handnum, ground, &hand->posmtx); + casing_create_for_hand(handnum, ground, &hand->posmtx); } - bgunSetPartVisible(MODELPART_GUN_CARTFLAPCLOSED, false, hand, modeldef); - bgunSetPartVisible(MODELPART_GUN_CARTFLAPOPEN, true, hand, modeldef); + bgun_set_part_visible(MODELPART_GUN_CARTFLAPCLOSED, false, hand, modeldef); + bgun_set_part_visible(MODELPART_GUN_CARTFLAPOPEN, true, hand, modeldef); } if (funcdef->type == INVENTORYFUNCTYPE_SHOOT_PROJECTILE) { - chrUncloakTemporarily(g_Vars.currentplayer->prop->chr); + chr_uncloak_temporarily(g_Vars.currentplayer->prop->chr); } else if ((funcdef->type & 0xff) == INVENTORYFUNCTYPE_THROW) { - chrUncloakTemporarily(g_Vars.currentplayer->prop->chr); + chr_uncloak_temporarily(g_Vars.currentplayer->prop->chr); } } @@ -7471,12 +7471,12 @@ void bgunCreateFx(struct hand *hand, s32 handnum, struct weaponfunc *funcdef, s3 case WEAPON_DMC: case WEAPON_AR53: case WEAPON_RCP45: - beamCreateForHand(handnum); + beam_create_for_hand(handnum); hand->numfires++; return; case WEAPON_LASER: hand->numfires++; - beamCreateForHand(handnum); + beam_create_for_hand(handnum); break; } } @@ -7500,7 +7500,7 @@ void bgun0f0a5550(s32 handnum) struct weaponfunc *funcdef; struct weaponfunc_shoot *shootfunc = NULL; s32 i; - s32 weaponnum = bgunGetWeaponNum2(handnum); + s32 weaponnum = bgun_get_weapon_num2(handnum); struct weapon *weapondef; Mtxf *mtx; bool isdetonator = false; @@ -7512,22 +7512,22 @@ void bgun0f0a5550(s32 handnum) struct coord sp118; s32 j; - weapondef = weaponFindById(weaponnum); + weapondef = weapon_find_by_id(weaponnum); if (handnum == HAND_LEFT && weaponnum == WEAPON_REMOTEMINE) { isdetonator = true; } - funcdef = gsetGetWeaponFunction2(&hand->gset); + funcdef = gset_get_weapon_function2(&hand->gset); if (funcdef && (funcdef->type & 0xff) == INVENTORYFUNCTYPE_SHOOT) { shootfunc = (struct weaponfunc_shoot *)funcdef; } - bgunUpdateBlend(hand, handnum); + bgun_update_blend(hand, handnum); if (handnum == HAND_RIGHT) { - if (weaponHasFlag(bgunGetWeaponNum2(HAND_LEFT), WEAPONFLAG_00000040)) { + if (weapon_has_flag(bgun_get_weapon_num2(HAND_LEFT), WEAPONFLAG_00000040)) { hand->xshift += 2.0f * g_Vars.lvupdate60freal / 240.0f; if (hand->xshift > 2.0f) { @@ -7541,7 +7541,7 @@ void bgun0f0a5550(s32 handnum) } } } else { - if (weaponHasFlag(bgunGetWeaponNum2(HAND_RIGHT), WEAPONFLAG_00000040)) { + if (weapon_has_flag(bgun_get_weapon_num2(HAND_RIGHT), WEAPONFLAG_00000040)) { hand->xshift -= 2.0f * g_Vars.lvupdate60freal / 240.0f; if (hand->xshift < -2.0f) { @@ -7579,12 +7579,12 @@ void bgun0f0a5550(s32 handnum) sp274.z += (RANDOMFRAC() - 0.5f) * shootfunc->recoilsettings->zrange * hand->finalmult[0]; } - hand->fspare1 = (player->crosspos2[0] - camGetScreenLeft() - camGetScreenWidth() * 0.5f) * weapondef->aimsettings->guntransside / (camGetScreenWidth() * 0.5f); + hand->fspare1 = (player->crosspos2[0] - cam_get_screen_left() - cam_get_screen_width() * 0.5f) * weapondef->aimsettings->guntransside / (cam_get_screen_width() * 0.5f); - if (player->crosspos2[1] - camGetScreenTop() > camGetScreenHeight() * 0.5f) { - hand->fspare2 = (player->crosspos2[1] - camGetScreenTop() - camGetScreenHeight() * 0.5f) * weapondef->aimsettings->guntransdown / (camGetScreenHeight() * 0.5f); + if (player->crosspos2[1] - cam_get_screen_top() > cam_get_screen_height() * 0.5f) { + hand->fspare2 = (player->crosspos2[1] - cam_get_screen_top() - cam_get_screen_height() * 0.5f) * weapondef->aimsettings->guntransdown / (cam_get_screen_height() * 0.5f); } else { - hand->fspare2 = (player->crosspos2[1] - camGetScreenTop() - camGetScreenHeight() * 0.5f) * weapondef->aimsettings->guntransup / (camGetScreenHeight() * 0.5f); + hand->fspare2 = (player->crosspos2[1] - cam_get_screen_top() - cam_get_screen_height() * 0.5f) * weapondef->aimsettings->guntransup / (cam_get_screen_height() * 0.5f); } fspare1 = hand->fspare1; @@ -7595,44 +7595,44 @@ void bgun0f0a5550(s32 handnum) hand->visible = true; - if (!weaponHasFlag(weaponnum, WEAPONFLAG_00000040) - || weaponHasFlag(weaponnum, WEAPONFLAG_00000080) + if (!weapon_has_flag(weaponnum, WEAPONFLAG_00000040) + || weapon_has_flag(weaponnum, WEAPONFLAG_00000080) || hand->mode == HANDMODE_6 || hand->mode == HANDMODE_7 - || !bgunIsLoaded() + || !bgun_is_loaded() || hand->inuse == false - || bgunGetGunMemType() == 0) { + || bgun_get_gun_mem_type() == 0) { hand->visible = false; } if (hand->visible) { modeldef = player->gunctrl.gunmodeldef; - mtxallocation = gfxAllocate(modeldef->nummatrices * sizeof(Mtxf)); + mtxallocation = gfx_allocate(modeldef->nummatrices * sizeof(Mtxf)); - if (weaponHasFlag(weaponnum, WEAPONFLAG_02000000)) { + if (weapon_has_flag(weaponnum, WEAPONFLAG_02000000)) { for (i = 0; i < modeldef->nummatrices; i++) { mtx = (Mtxf *)(mtxallocation + i * sizeof(Mtxf)); - mtx4LoadIdentity(mtx); + mtx4_load_identity(mtx); } } - bgunExecuteModelCmdList(hand->unk0dcc); + bgun_execute_model_cmd_list(hand->unk0dcc); if (player->gunctrl.handmodeldef != NULL) { - bgunExecuteModelCmdList(hand->unk0dd0); + bgun_execute_model_cmd_list(hand->unk0dd0); } bgun0f098030(hand, modeldef); - if (weaponHasFlag(weaponnum, WEAPONFLAG_00002000)) { + if (weapon_has_flag(weaponnum, WEAPONFLAG_00002000)) { bgun0f0981e8(hand, modeldef); } } - mtx4LoadIdentity(&sp234); + mtx4_load_identity(&sp234); - if (PLAYERCOUNT() == 1 && IS8MB() && weaponHasFlag(weaponnum, WEAPONFLAG_GANGSTA)) { - bgunUpdateGangsta(hand, handnum, &sp274, funcdef, &sp284, &sp234); + if (PLAYERCOUNT() == 1 && IS8MB() && weapon_has_flag(weaponnum, WEAPONFLAG_GANGSTA)) { + bgun_update_gangsta(hand, handnum, &sp274, funcdef, &sp284, &sp234); } if (hand->useposrot) { @@ -7662,7 +7662,7 @@ void bgun0f0a5550(s32 handnum) sp1a4.y = M_PI; sp1a4.z = 0.0f; - mtx4LoadRotation(&sp1a4, &sp164); + mtx4_load_rotation(&sp1a4, &sp164); sp1a4.y = 0.0f; @@ -7674,20 +7674,20 @@ void bgun0f0a5550(s32 handnum) hand->lastrotangx = sp1a4.f[0]; hand->lastrotangy = sp1a4.f[1]; - mtx4LoadRotation(&sp1a4, &sp124); - mtx4MultMtx4(&sp124, &sp164, &sp284); - mtx4MultMtx4InPlace(&sp284, &sp234); - mtx4Copy(&sp234, &sp2c4); - mtx4SetTranslation(&sp274, &sp2c4); + mtx4_load_rotation(&sp1a4, &sp124); + mtx4_mult_mtx4(&sp124, &sp164, &sp284); + mtx4_mult_mtx4_in_place(&sp284, &sp234); + mtx4_copy(&sp234, &sp2c4); + mtx4_set_translation(&sp274, &sp2c4); - mtx4Copy(&sp2c4, &hand->cammtx); - mtx4Copy(&hand->posmtx, &hand->prevmtx); + mtx4_copy(&sp2c4, &hand->cammtx); + mtx4_copy(&hand->posmtx, &hand->prevmtx); - mtx00015be4(camGetProjectionMtxF(), &hand->cammtx, &hand->posmtx); + mtx00015be4(cam_get_projection_mtxf(), &hand->cammtx, &hand->posmtx); if (hand->visible) { for (j = 0x5a; j < 0x5d; j++) { - node = modelGetPart(modeldef, j); + node = model_get_part(modeldef, j); if (node) { rodata = node->rodata; @@ -7699,13 +7699,13 @@ void bgun0f0a5550(s32 handnum) hand->gunmodel.matrices = (Mtxf *)mtxallocation; hand->handmodel.matrices = (Mtxf *)mtxallocation; - if (weaponHasFlag(weaponnum, WEAPONFLAG_DUALFLIP) && handnum == HAND_LEFT) { + if (weapon_has_flag(weaponnum, WEAPONFLAG_DUALFLIP) && handnum == HAND_LEFT) { mtx00015e24(-1, &sp2c4); } mtx00015f04(0.10000001f, &sp2c4); - mtx4Copy(&sp2c4, (Mtxf *)mtxallocation); + mtx4_copy(&sp2c4, (Mtxf *)mtxallocation); if (hand->unk0cc8_04 > 0) { switch (weaponnum) { @@ -7732,10 +7732,10 @@ void bgun0f0a5550(s32 handnum) switch (weaponnum) { case WEAPON_LASER: - bgunUpdateLaser(hand); + bgun_update_laser(hand); break; case WEAPON_REAPER: - bgunUpdateReaper(hand, modeldef); + bgun_update_reaper(hand, modeldef); break; } @@ -7801,7 +7801,7 @@ void bgun0f0a5550(s32 handnum) } #if VERSION >= VERSION_PAL_BETA - switch (modelGetAnimNum(&hand->gunmodel)) { + switch (model_get_anim_num(&hand->gunmodel)) { case ANIM_GUN_CROSSBOW_EQUIP: case ANIM_GUN_LAPTOP_EQUIP: case ANIM_GUN_LAPTOP_UNEQUIP: @@ -7824,7 +7824,7 @@ void bgun0f0a5550(s32 handnum) if (a0) { if (player->hands[HAND_RIGHT].unk0dd4 == -1) { - mtx4LoadIdentity(&sp84); + mtx4_load_identity(&sp84); spc4 = hand->gunmodel.matrices; @@ -7838,7 +7838,7 @@ void bgun0f0a5550(s32 handnum) var8005efb0_2 = true; } - modelSetMatricesWithAnim(&renderdata, &hand->gunmodel); + model_set_matrices_with_anim(&renderdata, &hand->gunmodel); var8005efd8_2 = false; @@ -7846,7 +7846,7 @@ void bgun0f0a5550(s32 handnum) var8005efb0_2 = false; } #else - modelSetMatricesWithAnim(&renderdata, &hand->gunmodel); + model_set_matrices_with_anim(&renderdata, &hand->gunmodel); #endif player->hands[HAND_RIGHT].unk0dd4 = 1; @@ -7870,7 +7870,7 @@ void bgun0f0a5550(s32 handnum) var8005efb0_2 = true; } - modelSetMatricesWithAnim(&renderdata, &hand->gunmodel); + model_set_matrices_with_anim(&renderdata, &hand->gunmodel); var8005efd8_2 = false; @@ -7878,18 +7878,18 @@ void bgun0f0a5550(s32 handnum) var8005efb0_2 = false; } #else - modelSetMatricesWithAnim(&renderdata, &hand->gunmodel); + model_set_matrices_with_anim(&renderdata, &hand->gunmodel); #endif } g_ModelJointPositionedFunc = 0; - node = modelGetPart(modeldef, MODELPART_GUN_SLIDE); + node = model_get_part(modeldef, MODELPART_GUN_SLIDE); if (node) { - sp80 = modelFindNodeMtxIndex(node, 0); + sp80 = model_find_node_mtx_index(node, 0); - bgunUpdateSlide(handnum); + bgun_update_slide(handnum); sp74.f[0] = 0.0f; sp74.f[1] = 0.0f; @@ -7898,7 +7898,7 @@ void bgun0f0a5550(s32 handnum) mtx = (Mtxf *)mtxallocation; mtx += sp80; - mtx4RotateVecInPlace(mtx, &sp74); + mtx4_rotate_vec_in_place(mtx, &sp74); mtx->m[3][0] += sp74.f[0]; mtx->m[3][1] += sp74.f[1]; @@ -7919,28 +7919,28 @@ void bgun0f0a5550(s32 handnum) switch (weaponnum) { case WEAPON_SNIPERRIFLE: - bgunUpdateSniperRifle(modeldef, mtxallocation); + bgun_update_sniper_rifle(modeldef, mtxallocation); break; case WEAPON_DEVASTATOR: - bgunUpdateDevastator(hand, mtxallocation, modeldef); + bgun_update_devastator(hand, mtxallocation, modeldef); break; case WEAPON_SHOTGUN: - bgunUpdateShotgun(hand, mtxallocation, sp1e4[0], modeldef); + bgun_update_shotgun(hand, mtxallocation, sp1e4[0], modeldef); break; } - node = modelGetPart(modeldef, MODELPART_GUN_MUZZLEPOS); + node = model_get_part(modeldef, MODELPART_GUN_MUZZLEPOS); if (weaponnum == WEAPON_REAPER) { if (hand->flashon || hand->firing) { - node = modelGetPart(modeldef, MODELPART_REAPER_001E + (hand->burstbullets % 3)); + node = model_get_part(modeldef, MODELPART_REAPER_001E + (hand->burstbullets % 3)); } else { - node = modelGetPart(modeldef, MODELPART_REAPER_001E + (g_Vars.lvframenum % 3)); + node = model_get_part(modeldef, MODELPART_REAPER_001E + (g_Vars.lvframenum % 3)); } } if (node) { - sp6c = modelFindNodeMtxIndex(node, 0); + sp6c = model_find_node_mtx_index(node, 0); mtx = (Mtxf *)mtxallocation; mtx += sp6c; @@ -7949,8 +7949,8 @@ void bgun0f0a5550(s32 handnum) hand->muzzlepos.f[1] = mtx->m[3][1]; hand->muzzlepos.f[2] = mtx->m[3][2]; - mtx4Copy(mtx, &hand->muzzlemat); - mtx4TransformVecInPlace(camGetProjectionMtxF(), &hand->muzzlepos); + mtx4_copy(mtx, &hand->muzzlemat); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &hand->muzzlepos); hand->muzzlez = -((Mtxf *)((uintptr_t)mtxallocation + sp6c * sizeof(Mtxf)))->m[3][2]; @@ -7962,7 +7962,7 @@ void bgun0f0a5550(s32 handnum) || weaponnum == WEAPON_REMOTEMINE || weaponnum == WEAPON_PROXIMITYMINE || weaponnum == WEAPON_NBOMB) { - sp6c = modelFindNodeMtxIndex(modelGetPart(modeldef, MODELPART_GUN_HOLDPOS), 0); + sp6c = model_find_node_mtx_index(model_get_part(modeldef, MODELPART_GUN_HOLDPOS), 0); mtx = (Mtxf *)mtxallocation; mtx += sp6c; @@ -7971,8 +7971,8 @@ void bgun0f0a5550(s32 handnum) hand->muzzlepos.y = mtx->m[3][1]; hand->muzzlepos.z = mtx->m[3][2]; - mtx4Copy(mtx, &hand->muzzlemat); - mtx4TransformVecInPlace(camGetProjectionMtxF(), &hand->muzzlepos); + mtx4_copy(mtx, &hand->muzzlemat); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &hand->muzzlepos); hand->muzzlez = -((Mtxf *)((uintptr_t)mtxallocation + sp6c * sizeof(Mtxf)))->m[3][2]; } else { @@ -7980,7 +7980,7 @@ void bgun0f0a5550(s32 handnum) hand->muzzlepos.y = hand->posmtx.m[3][1]; hand->muzzlepos.z = hand->posmtx.m[3][2]; - mtx4Copy(&hand->posmtx, &hand->muzzlemat); + mtx4_copy(&hand->posmtx, &hand->muzzlemat); hand->muzzlez = -hand->cammtx.m[3][2]; } @@ -7990,40 +7990,40 @@ void bgun0f0a5550(s32 handnum) hand->muzzlepos.y = hand->posmtx.m[3][1]; hand->muzzlepos.z = hand->posmtx.m[3][2]; - mtx4Copy(&hand->posmtx, &hand->muzzlemat); + mtx4_copy(&hand->posmtx, &hand->muzzlemat); hand->muzzlez = -hand->cammtx.m[3][2]; } switch (weaponnum) { case WEAPON_ROCKETLAUNCHER: - bgunUpdateRocketLauncher(hand, handnum, (struct weaponfunc_shootprojectile *)funcdef); + bgun_update_rocket_launcher(hand, handnum, (struct weaponfunc_shootprojectile *)funcdef); break; case WEAPON_DY357MAGNUM: case WEAPON_DY357LX: if (hand->unk0cc8_04 > 0) { - bgunUpdateMagnum(hand, handnum, modeldef, (Mtxf *)mtxallocation); + bgun_update_magnum(hand, handnum, modeldef, (Mtxf *)mtxallocation); } break; } if (hand->firing && g_Vars.lvupdate240 != 0) { - bgunCreateFx(hand, handnum, funcdef, weaponnum, modeldef, mtxallocation); + bgun_create_fx(hand, handnum, funcdef, weaponnum, modeldef, mtxallocation); } if (PLAYERCOUNT() == 1 && IS8MB() && g_Vars.lvupdate240 != 0) { - bgunUpdateSmoke(hand, handnum, weaponnum, funcdef); + bgun_update_smoke(hand, handnum, weaponnum, funcdef); } if (hand->ejectstate > EJECTSTATE_INACTIVE) { - bgunTickEject(hand, modeldef, isdetonator); + bgun_tick_eject(hand, modeldef, isdetonator); } if (PLAYERCOUNT() == 1 && IS8MB() && hand->visible && weaponnum >= WEAPON_FALCON2 && weaponnum <= WEAPON_FALCON2_SCOPE) { - bgunUpdateLasersight(hand, modeldef, handnum, mtxallocation); + bgun_update_lasersight(hand, modeldef, handnum, mtxallocation); } else { - lasersightFree(handnum); + lasersight_free(handnum); } hand->animframeinc = 0; @@ -8033,7 +8033,7 @@ void bgun0f0a5550(s32 handnum) #endif } -void bgunTickMaulerCharge(void) +void bgun_tick_mauler_charge(void) { struct player *player = g_Vars.currentplayer; s32 i; @@ -8043,7 +8043,7 @@ void bgunTickMaulerCharge(void) u32 charging = false; if (hand->inuse) { - if (bgunIsReloading(hand)) { + if (bgun_is_reloading(hand)) { // Reloading - reset charge amount hand->matmot1 = 0; } else if (hand->gset.weaponfunc == FUNC_SECONDARY) { @@ -8079,7 +8079,7 @@ void bgunTickMaulerCharge(void) * its speed is adjusted, the game raises the priority of the main * thread (this thread) to above the audio thread's priority so that * the audio thread cannot execute and start playing the audio - * between the calls to sndStart and audioPostEvent. But this pattern + * between the calls to snd_start and audioPostEvent. But this pattern * is not done here. * * There is a known issue where the Mauler charge sound is played @@ -8094,7 +8094,7 @@ void bgunTickMaulerCharge(void) && hand->matmot1 > 0.1f && charging && g_Vars.lvupdate240 != 0) { - sndStart(var80095200, SFX_MAULER_CHARGE, &hand->audiohandle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_MAULER_CHARGE, &hand->audiohandle, -1, -1, -1, -1, -1); } if (hand->audiohandle) { @@ -8110,7 +8110,7 @@ void bgunTickMaulerCharge(void) } } -void bgunTickGameplay2(void) +void bgun_tick_gameplay2(void) { struct player *player = g_Vars.currentplayer; struct hand *hand; @@ -8119,14 +8119,14 @@ void bgunTickGameplay2(void) #if VERSION >= VERSION_NTSC_1_0 if (g_Vars.currentplayernum == 0) { - projectilesDebug(); + projectiles_debug(); } #endif if (player->gunctrl.loadall) { // empty } else { - bgunTickLoad(); + bgun_tick_load(); } // Return control to Jo if eyespy has been deselected @@ -8136,7 +8136,7 @@ void bgunTickGameplay2(void) } if ((g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit & DEVICE_XRAYSCANNER) - && (bgunGetWeaponNum(HAND_RIGHT) != WEAPON_FARSIGHT || player->gunsightoff)) { + && (bgun_get_weapon_num(HAND_RIGHT) != WEAPON_FARSIGHT || player->gunsightoff)) { // Using normal xray scanner (not Farsight zoom) if (player->visionmode != VISIONMODE_XRAY) { player->erasertime = 0; @@ -8183,7 +8183,7 @@ void bgunTickGameplay2(void) } if (player->gunctrl.weaponnum == WEAPON_MAULER) { - bgunTickMaulerCharge(); + bgun_tick_mauler_charge(); } if (g_Vars.lvupdate240 == 0) { @@ -8259,7 +8259,7 @@ void bgunTickGameplay2(void) } } - bgunTickUnequippedReload(); + bgun_tick_unequipped_reload(); bgun0f0a5550(HAND_RIGHT); if (player->hands[HAND_LEFT].inuse) { @@ -8268,10 +8268,10 @@ void bgunTickGameplay2(void) player->hands[HAND_LEFT].ejectstate = EJECTSTATE_INACTIVE; } - bgunIsUsingSecondaryFunction(); + bgun_is_using_secondary_function(); } -s8 bgunFreeFireslotWrapper(s32 slotnum) +s8 bgun_free_fireslot_wrapper(s32 slotnum) { #if VERSION < VERSION_NTSC_1_0 if (slotnum >= 0) { @@ -8285,10 +8285,10 @@ s8 bgunFreeFireslotWrapper(s32 slotnum) } #endif - return bgunFreeFireslot(slotnum); + return bgun_free_fireslot(slotnum); } -s8 bgunFreeFireslot(s32 fireslot_id) +s8 bgun_free_fireslot(s32 fireslot_id) { #if VERSION >= VERSION_NTSC_1_0 if (fireslot_id >= 0 && fireslot_id < ARRAYCOUNT(g_Fireslots)) { @@ -8303,7 +8303,7 @@ s8 bgunFreeFireslot(s32 fireslot_id) return -1; } -s32 bgunAllocateFireslot(void) +s32 bgun_allocate_fireslot(void) { s32 index = -1; s32 i; @@ -8347,7 +8347,7 @@ u32 var800702dc = 0x00000001; #if MATCHING #if PAL GLOBAL_ASM( -glabel bgunRender +glabel bgun_render .late_rodata glabel var7f1aca8c .word 0x3faaaaab @@ -8403,21 +8403,21 @@ glabel var7f1aca90 /* f0a71e4: 100002d5 */ b .L0f0a7d3c /* f0a71e8: 8fbf0034 */ lw $ra,0x34($sp) .L0f0a71ec: -/* f0a71ec: 0fc5d9ad */ jal zbufDrawArtifactsOffscreen +/* f0a71ec: 0fc5d9ad */ jal zbuf_draw_artifacts_offscreen /* f0a71f0: 8fa4014c */ lw $a0,0x14c($sp) /* f0a71f4: afa2014c */ sw $v0,0x14c($sp) -/* f0a71f8: 0c002ca0 */ jal viPrepareZbuf +/* f0a71f8: 0c002ca0 */ jal vi_prepare_zbuf /* f0a71fc: 00402025 */ or $a0,$v0,$zero /* f0a7200: afa2014c */ sw $v0,0x14c($sp) /* f0a7204: 0c002c74 */ jal vi0000b1d0 /* f0a7208: 00402025 */ or $a0,$v0,$zero /* f0a720c: 244e0008 */ addiu $t6,$v0,0x8 /* f0a7210: afae014c */ sw $t6,0x14c($sp) -/* f0a7214: 0c002f40 */ jal viGetViewLeft +/* f0a7214: 0c002f40 */ jal vi_get_view_left /* f0a7218: 0040a825 */ or $s5,$v0,$zero /* f0a721c: 00028400 */ sll $s0,$v0,0x10 /* f0a7220: 00107c03 */ sra $t7,$s0,0x10 -/* f0a7224: 0c002f44 */ jal viGetViewTop +/* f0a7224: 0c002f44 */ jal vi_get_view_top /* f0a7228: 01e08025 */ or $s0,$t7,$zero /* f0a722c: 44822000 */ mtc1 $v0,$f4 /* f0a7230: 44908000 */ mtc1 $s0,$f16 @@ -8438,19 +8438,19 @@ glabel var7f1aca90 /* f0a726c: 316c0fff */ andi $t4,$t3,0xfff /* f0a7270: 000c6b00 */ sll $t5,$t4,0xc /* f0a7274: 032d7025 */ or $t6,$t9,$t5 -/* f0a7278: 0c002f22 */ jal viGetViewWidth +/* f0a7278: 0c002f22 */ jal vi_get_view_width /* f0a727c: aeae0000 */ sw $t6,0x0($s5) /* f0a7280: 00029400 */ sll $s2,$v0,0x10 /* f0a7284: 00127c03 */ sra $t7,$s2,0x10 -/* f0a7288: 0c002f40 */ jal viGetViewLeft +/* f0a7288: 0c002f40 */ jal vi_get_view_left /* f0a728c: 01e09025 */ or $s2,$t7,$zero /* f0a7290: 0002a400 */ sll $s4,$v0,0x10 /* f0a7294: 00144c03 */ sra $t1,$s4,0x10 -/* f0a7298: 0c002f44 */ jal viGetViewTop +/* f0a7298: 0c002f44 */ jal vi_get_view_top /* f0a729c: 0120a025 */ or $s4,$t1,$zero /* f0a72a0: 00028400 */ sll $s0,$v0,0x10 /* f0a72a4: 00104403 */ sra $t0,$s0,0x10 -/* f0a72a8: 0c002f26 */ jal viGetViewHeight +/* f0a72a8: 0c002f26 */ jal vi_get_view_height /* f0a72ac: 01008025 */ or $s0,$t0,$zero /* f0a72b0: 00505021 */ addu $t2,$v0,$s0 /* f0a72b4: 448a4000 */ mtc1 $t2,$f8 @@ -8481,12 +8481,12 @@ glabel var7f1aca90 /* f0a7318: 91581bfc */ lbu $t8,0x1bfc($t2) /* f0a731c: 53000016 */ beqzl $t8,.L0f0a7378 /* f0a7320: 8e2b006c */ lw $t3,0x6c($s1) -/* f0a7324: 0fc54bc7 */ jal optionsGetScreenRatio +/* f0a7324: 0fc54bc7 */ jal options_get_screen_ratio /* f0a7328: 00000000 */ nop /* f0a732c: 24010001 */ addiu $at,$zero,0x1 /* f0a7330: 14410008 */ bne $v0,$at,.L0f0a7354 /* f0a7334: 00000000 */ nop -/* f0a7338: 0fc2f4d6 */ jal playerGetAspectRatio +/* f0a7338: 0fc2f4d6 */ jal player_get_aspect_ratio /* f0a733c: 00000000 */ nop /* f0a7340: 3c017f1b */ lui $at,%hi(var7f1aca8c) /* f0a7344: c430ca8c */ lwc1 $f16,%lo(var7f1aca8c)($at) @@ -8494,7 +8494,7 @@ glabel var7f1aca90 /* f0a734c: 10000005 */ b .L0f0a7364 /* f0a7350: 44061000 */ mfc1 $a2,$f2 .L0f0a7354: -/* f0a7354: 0fc2f4d6 */ jal playerGetAspectRatio +/* f0a7354: 0fc2f4d6 */ jal player_get_aspect_ratio /* f0a7358: 00000000 */ nop /* f0a735c: 46000086 */ mov.s $f2,$f0 /* f0a7360: 44061000 */ mfc1 $a2,$f2 @@ -8542,7 +8542,7 @@ glabel var7f1aca90 /* f0a73f0: 24010001 */ addiu $at,$zero,0x1 /* f0a73f4: 51010005 */ beql $t0,$at,.L0f0a740c /* f0a73f8: 0000a025 */ or $s4,$zero,$zero -/* f0a73fc: 0fc2be93 */ jal lasersightRenderBeam +/* f0a73fc: 0fc2be93 */ jal lasersight_render_beam /* f0a7400: 8fa4014c */ lw $a0,0x14c($sp) /* f0a7404: afa2014c */ sw $v0,0x14c($sp) .L0f0a7408: @@ -8552,7 +8552,7 @@ glabel var7f1aca90 /* f0a7410: 8fb500e4 */ lw $s5,0xe4($sp) /* f0a7414: 24120019 */ addiu $s2,$zero,0x1e .L0f0a7418: -/* f0a7418: 0fc2867c */ jal bgunGetWeaponNum2 +/* f0a7418: 0fc2867c */ jal bgun_get_weapon_num2 /* f0a741c: 02802025 */ or $a0,$s4,$zero /* f0a7420: afa200ec */ sw $v0,0xec($sp) /* f0a7424: 820a0007 */ lb $t2,0x7($s0) @@ -8562,11 +8562,11 @@ glabel var7f1aca90 /* f0a7434: 00003025 */ or $a2,$zero,$zero /* f0a7438: 26180384 */ addiu $t8,$s0,0x384 /* f0a743c: afb8003c */ sw $t8,0x3c($sp) -/* f0a7440: 0fc2b2e4 */ jal beamRender +/* f0a7440: 0fc2b2e4 */ jal beam_render /* f0a7444: 00003825 */ or $a3,$zero,$zero /* f0a7448: afa2014c */ sw $v0,0x14c($sp) /* f0a744c: 92040000 */ lbu $a0,0x0($s0) -/* f0a7450: 0fc2c5f0 */ jal weaponHasFlag +/* f0a7450: 0fc2c5f0 */ jal weapon_has_flag /* f0a7454: 34058000 */ dli $a1,0x8000 /* f0a7458: 10400030 */ beqz $v0,.L0f0a751c /* f0a745c: 8fab014c */ lw $t3,0x14c($sp) @@ -8602,7 +8602,7 @@ glabel var7f1aca90 /* f0a74d4: 25ae0008 */ addiu $t6,$t5,0x8 /* f0a74d8: afae014c */ sw $t6,0x14c($sp) /* f0a74dc: adaf0000 */ sw $t7,0x0($t5) -/* f0a74e0: 0fc2d5ea */ jal camGetLookAt +/* f0a74e0: 0fc2d5ea */ jal cam_get_look_at /* f0a74e4: afad00d4 */ sw $t5,0xd4($sp) /* f0a74e8: 8fa500d4 */ lw $a1,0xd4($sp) /* f0a74ec: 3c080382 */ lui $t0,0x382 @@ -8612,7 +8612,7 @@ glabel var7f1aca90 /* f0a74fc: 25890008 */ addiu $t1,$t4,0x8 /* f0a7500: afa9014c */ sw $t1,0x14c($sp) /* f0a7504: ad880000 */ sw $t0,0x0($t4) -/* f0a7508: 0fc2d5ea */ jal camGetLookAt +/* f0a7508: 0fc2d5ea */ jal cam_get_look_at /* f0a750c: afac00d0 */ sw $t4,0xd0($sp) /* f0a7510: 8fa300d0 */ lw $v1,0xd0($sp) /* f0a7514: 244a0010 */ addiu $t2,$v0,0x10 @@ -8632,15 +8632,15 @@ glabel var7f1aca90 /* f0a7548: 8fa300cc */ lw $v1,0xcc($sp) /* f0a754c: 24050010 */ addiu $a1,$zero,0x10 /* f0a7550: ac620004 */ sw $v0,0x4($v1) -/* f0a7554: 0c006a47 */ jal modelGetPart +/* f0a7554: 0c006a47 */ jal model_get_part /* f0a7558: 8e04038c */ lw $a0,0x38c($s0) /* f0a755c: 10400014 */ beqz $v0,.L0f0a75b0 /* f0a7560: afa200e8 */ sw $v0,0xe8($sp) /* f0a7564: 8e04038c */ lw $a0,0x38c($s0) -/* f0a7568: 0c006a47 */ jal modelGetPart +/* f0a7568: 0c006a47 */ jal model_get_part /* f0a756c: 24050011 */ addiu $a1,$zero,0x11 /* f0a7570: 8fa4003c */ lw $a0,0x3c($sp) -/* f0a7574: 0c006a87 */ jal modelGetNodeRwData +/* f0a7574: 0c006a87 */ jal model_get_node_rw_data /* f0a7578: 00402825 */ or $a1,$v0,$zero /* f0a757c: 10400003 */ beqz $v0,.L0f0a758c /* f0a7580: 3c06800a */ lui $a2,%hi(var8009cf88) @@ -8653,7 +8653,7 @@ glabel var7f1aca90 /* f0a7598: 8fa500e8 */ lw $a1,0xe8($sp) /* f0a759c: 24c6cf88 */ addiu $a2,$a2,%lo(var8009cf88) /* f0a75a0: 8fa7014c */ lw $a3,0x14c($sp) -/* f0a75a4: 0fc1fefe */ jal tvscreenRender +/* f0a75a4: 0fc1fefe */ jal tvscreen_render /* f0a75a8: afa00010 */ sw $zero,0x10($sp) /* f0a75ac: afa2014c */ sw $v0,0x14c($sp) .L0f0a75b0: @@ -8876,13 +8876,13 @@ glabel var7f1aca90 /* f0a78d0: 00000000 */ nop .L0f0a78d4: /* f0a78d4: 44d8f800 */ ctc1 $t8,$31 -/* f0a78d8: 0fc01a40 */ jal colourBlend +/* f0a78d8: 0fc01a40 */ jal colour_blend /* f0a78dc: 03202825 */ or $a1,$t9,$zero /* f0a78e0: afa20140 */ sw $v0,0x140($sp) .L0f0a78e4: /* f0a78e4: 8e6f00bc */ lw $t7,0xbc($s3) .L0f0a78e8: -/* f0a78e8: 0fc08af9 */ jal chrGetCloakAlpha +/* f0a78e8: 0fc08af9 */ jal chr_get_cloak_alpha /* f0a78ec: 8de40004 */ lw $a0,0x4($t7) /* f0a78f0: 284100ff */ slti $at,$v0,0xff /* f0a78f4: 1020000f */ beqz $at,.L0f0a7934 @@ -8917,12 +8917,12 @@ glabel var7f1aca90 /* f0a7964: 1100000d */ beqz $t0,.L0f0a799c /* f0a7968: 00c02825 */ or $a1,$a2,$zero /* f0a796c: afaa0094 */ sw $t2,0x94($sp) -/* f0a7970: 0c0087bd */ jal modelRender +/* f0a7970: 0c0087bd */ jal model_render /* f0a7974: afa60098 */ sw $a2,0x98($sp) /* f0a7978: 8fa60098 */ lw $a2,0x98($sp) /* f0a797c: 8ccb0008 */ lw $t3,0x8($a2) /* f0a7980: 8cc4000c */ lw $a0,0xc($a2) -/* f0a7984: 0fc30cfc */ jal mtxF2LBulk +/* f0a7984: 0fc30cfc */ jal mtx_f2l_bulk /* f0a7988: 8565000e */ lh $a1,0xe($t3) /* f0a798c: 8e0d021c */ lw $t5,0x21c($s0) /* f0a7990: 51a00003 */ beqzl $t5,.L0f0a79a0 @@ -8931,7 +8931,7 @@ glabel var7f1aca90 .L0f0a799c: /* f0a799c: 8fa400ec */ lw $a0,0xec($sp) .L0f0a79a0: -/* f0a79a0: 0fc2c5f0 */ jal weaponHasFlag +/* f0a79a0: 0fc2c5f0 */ jal weapon_has_flag /* f0a79a4: 24050020 */ addiu $a1,$zero,0x20 /* f0a79a8: 1040000e */ beqz $v0,.L0f0a79e4 /* f0a79ac: 24010001 */ addiu $at,$zero,0x1 @@ -8982,7 +8982,7 @@ glabel var7f1aca90 /* f0a7a48: 03257821 */ addu $t7,$t9,$a1 /* f0a7a4c: 15e10036 */ bne $t7,$at,.L0f0a7b28 /* f0a7a50: 24050041 */ addiu $a1,$zero,0x41 -/* f0a7a54: 0c006a47 */ jal modelGetPart +/* f0a7a54: 0c006a47 */ jal model_get_part /* f0a7a58: 8e04038c */ lw $a0,0x38c($s0) /* f0a7a5c: 50400033 */ beqzl $v0,.L0f0a7b2c /* f0a7a60: 27a4010c */ addiu $a0,$sp,0x10c @@ -9041,7 +9041,7 @@ glabel var7f1aca90 .L0f0a7b28: /* f0a7b28: 27a4010c */ addiu $a0,$sp,0x10c .L0f0a7b2c: -/* f0a7b2c: 0c0087bd */ jal modelRender +/* f0a7b2c: 0c0087bd */ jal model_render /* f0a7b30: 8fa5003c */ lw $a1,0x3c($sp) /* f0a7b34: 8e791594 */ lw $t9,0x1594($s3) /* f0a7b38: 3c0f8007 */ lui $t7,%hi(var800702dc) @@ -9056,11 +9056,11 @@ glabel var7f1aca90 /* f0a7b5c: 26050534 */ addiu $a1,$s0,0x534 /* f0a7b60: 00a02025 */ or $a0,$a1,$zero /* f0a7b64: ae0e0540 */ sw $t6,0x540($s0) -/* f0a7b68: 0c007308 */ jal modelUpdateRelations +/* f0a7b68: 0c007308 */ jal model_update_relations /* f0a7b6c: afa50054 */ sw $a1,0x54($sp) /* f0a7b70: 8fa50054 */ lw $a1,0x54($sp) /* f0a7b74: afb50140 */ sw $s5,0x140($sp) -/* f0a7b78: 0c0087bd */ jal modelRender +/* f0a7b78: 0c0087bd */ jal model_render /* f0a7b7c: 27a4010c */ addiu $a0,$sp,0x10c /* f0a7b80: 8fa4007c */ lw $a0,0x7c($sp) /* f0a7b84: afa40140 */ sw $a0,0x140($sp) @@ -9068,7 +9068,7 @@ glabel var7f1aca90 .L0f0a7b8c: /* f0a7b8c: 8fa400ec */ lw $a0,0xec($sp) /* f0a7b90: 24050020 */ addiu $a1,$zero,0x20 -/* f0a7b94: 0fc2c5f0 */ jal weaponHasFlag +/* f0a7b94: 0fc2c5f0 */ jal weapon_has_flag /* f0a7b98: afac014c */ sw $t4,0x14c($sp) /* f0a7b9c: 10400007 */ beqz $v0,.L0f0a7bbc /* f0a7ba0: 8faa014c */ lw $t2,0x14c($sp) @@ -9081,7 +9081,7 @@ glabel var7f1aca90 .L0f0a7bbc: /* f0a7bbc: 8e18038c */ lw $t8,0x38c($s0) /* f0a7bc0: 8e040390 */ lw $a0,0x390($s0) -/* f0a7bc4: 0fc30cfc */ jal mtxF2LBulk +/* f0a7bc4: 0fc30cfc */ jal mtx_f2l_bulk /* f0a7bc8: 8705000e */ lh $a1,0xe($t8) /* f0a7bcc: 0c0059e1 */ jal mtx00016784 /* f0a7bd0: 00000000 */ nop @@ -9091,7 +9091,7 @@ glabel var7f1aca90 /* f0a7be0: 272f0008 */ addiu $t7,$t9,0x8 /* f0a7be4: afaf014c */ sw $t7,0x14c($sp) /* f0a7be8: af290000 */ sw $t1,0x0($t9) -/* f0a7bec: 0c002adb */ jal viGetPerspScale +/* f0a7bec: 0c002adb */ jal vi_get_persp_scale /* f0a7bf0: afb90074 */ sw $t9,0x74($sp) /* f0a7bf4: 8fa30074 */ lw $v1,0x74($sp) /* f0a7bf8: ac620004 */ sw $v0,0x4($v1) @@ -9101,22 +9101,22 @@ glabel var7f1aca90 /* f0a7c04: 1681fe04 */ bne $s4,$at,.L0f0a7418 /* f0a7c08: 261007a4 */ addiu $s0,$s0,0x7a4 /* f0a7c0c: afb500e4 */ sw $s5,0xe4($sp) -/* f0a7c10: 0fc2baf8 */ jal casingsRender +/* f0a7c10: 0fc2baf8 */ jal casings_render /* f0a7c14: 27a4014c */ addiu $a0,$sp,0x14c -/* f0a7c18: 0fc5d8a6 */ jal zbufSwap +/* f0a7c18: 0fc5d8a6 */ jal zbuf_swap /* f0a7c1c: 00000000 */ nop -/* f0a7c20: 0fc5d8ab */ jal zbufConfigureRdp +/* f0a7c20: 0fc5d8ab */ jal zbuf_configure_rdp /* f0a7c24: 8fa4014c */ lw $a0,0x14c($sp) /* f0a7c28: afa2014c */ sw $v0,0x14c($sp) /* f0a7c2c: 0c002c74 */ jal vi0000b1d0 /* f0a7c30: 00402025 */ or $a0,$v0,$zero /* f0a7c34: 244e0008 */ addiu $t6,$v0,0x8 /* f0a7c38: afae014c */ sw $t6,0x14c($sp) -/* f0a7c3c: 0c002f40 */ jal viGetViewLeft +/* f0a7c3c: 0c002f40 */ jal vi_get_view_left /* f0a7c40: 00408825 */ or $s1,$v0,$zero /* f0a7c44: 00028400 */ sll $s0,$v0,0x10 /* f0a7c48: 00106403 */ sra $t4,$s0,0x10 -/* f0a7c4c: 0c002f44 */ jal viGetViewTop +/* f0a7c4c: 0c002f44 */ jal vi_get_view_top /* f0a7c50: 01808025 */ or $s0,$t4,$zero /* f0a7c54: 44824000 */ mtc1 $v0,$f8 /* f0a7c58: 44902000 */ mtc1 $s0,$f4 @@ -9137,19 +9137,19 @@ glabel var7f1aca90 /* f0a7c94: 332f0fff */ andi $t7,$t9,0xfff /* f0a7c98: 000f4b00 */ sll $t1,$t7,0xc /* f0a7c9c: 01a97025 */ or $t6,$t5,$t1 -/* f0a7ca0: 0c002f22 */ jal viGetViewWidth +/* f0a7ca0: 0c002f22 */ jal vi_get_view_width /* f0a7ca4: ae2e0000 */ sw $t6,0x0($s1) /* f0a7ca8: 00029400 */ sll $s2,$v0,0x10 /* f0a7cac: 00126403 */ sra $t4,$s2,0x10 -/* f0a7cb0: 0c002f40 */ jal viGetViewLeft +/* f0a7cb0: 0c002f40 */ jal vi_get_view_left /* f0a7cb4: 01809025 */ or $s2,$t4,$zero /* f0a7cb8: 0002a400 */ sll $s4,$v0,0x10 /* f0a7cbc: 00145403 */ sra $t2,$s4,0x10 -/* f0a7cc0: 0c002f44 */ jal viGetViewTop +/* f0a7cc0: 0c002f44 */ jal vi_get_view_top /* f0a7cc4: 0140a025 */ or $s4,$t2,$zero /* f0a7cc8: 00028400 */ sll $s0,$v0,0x10 /* f0a7ccc: 00104403 */ sra $t0,$s0,0x10 -/* f0a7cd0: 0c002f26 */ jal viGetViewHeight +/* f0a7cd0: 0c002f26 */ jal vi_get_view_height /* f0a7cd4: 01008025 */ or $s0,$t0,$zero /* f0a7cd8: 00505821 */ addu $t3,$v0,$s0 /* f0a7cdc: 448b8000 */ mtc1 $t3,$f16 @@ -9188,7 +9188,7 @@ glabel var7f1aca90 ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel bgunRender +glabel bgun_render .late_rodata glabel var7f1aca8c .word 0x3faaaaab @@ -9244,21 +9244,21 @@ glabel var7f1aca90 /* f0a71e4: 100002d5 */ b .L0f0a7d3c /* f0a71e8: 8fbf0034 */ lw $ra,0x34($sp) .L0f0a71ec: -/* f0a71ec: 0fc5d9ad */ jal zbufDrawArtifactsOffscreen +/* f0a71ec: 0fc5d9ad */ jal zbuf_draw_artifacts_offscreen /* f0a71f0: 8fa4014c */ lw $a0,0x14c($sp) /* f0a71f4: afa2014c */ sw $v0,0x14c($sp) -/* f0a71f8: 0c002ca0 */ jal viPrepareZbuf +/* f0a71f8: 0c002ca0 */ jal vi_prepare_zbuf /* f0a71fc: 00402025 */ or $a0,$v0,$zero /* f0a7200: afa2014c */ sw $v0,0x14c($sp) /* f0a7204: 0c002c74 */ jal vi0000b1d0 /* f0a7208: 00402025 */ or $a0,$v0,$zero /* f0a720c: 244e0008 */ addiu $t6,$v0,0x8 /* f0a7210: afae014c */ sw $t6,0x14c($sp) -/* f0a7214: 0c002f40 */ jal viGetViewLeft +/* f0a7214: 0c002f40 */ jal vi_get_view_left /* f0a7218: 0040a825 */ or $s5,$v0,$zero /* f0a721c: 00028400 */ sll $s0,$v0,0x10 /* f0a7220: 00107c03 */ sra $t7,$s0,0x10 -/* f0a7224: 0c002f44 */ jal viGetViewTop +/* f0a7224: 0c002f44 */ jal vi_get_view_top /* f0a7228: 01e08025 */ or $s0,$t7,$zero /* f0a722c: 44822000 */ mtc1 $v0,$f4 /* f0a7230: 44908000 */ mtc1 $s0,$f16 @@ -9279,19 +9279,19 @@ glabel var7f1aca90 /* f0a726c: 316c0fff */ andi $t4,$t3,0xfff /* f0a7270: 000c6b00 */ sll $t5,$t4,0xc /* f0a7274: 032d7025 */ or $t6,$t9,$t5 -/* f0a7278: 0c002f22 */ jal viGetViewWidth +/* f0a7278: 0c002f22 */ jal vi_get_view_width /* f0a727c: aeae0000 */ sw $t6,0x0($s5) /* f0a7280: 00029400 */ sll $s2,$v0,0x10 /* f0a7284: 00127c03 */ sra $t7,$s2,0x10 -/* f0a7288: 0c002f40 */ jal viGetViewLeft +/* f0a7288: 0c002f40 */ jal vi_get_view_left /* f0a728c: 01e09025 */ or $s2,$t7,$zero /* f0a7290: 0002a400 */ sll $s4,$v0,0x10 /* f0a7294: 00144c03 */ sra $t1,$s4,0x10 -/* f0a7298: 0c002f44 */ jal viGetViewTop +/* f0a7298: 0c002f44 */ jal vi_get_view_top /* f0a729c: 0120a025 */ or $s4,$t1,$zero /* f0a72a0: 00028400 */ sll $s0,$v0,0x10 /* f0a72a4: 00104403 */ sra $t0,$s0,0x10 -/* f0a72a8: 0c002f26 */ jal viGetViewHeight +/* f0a72a8: 0c002f26 */ jal vi_get_view_height /* f0a72ac: 01008025 */ or $s0,$t0,$zero /* f0a72b0: 00505021 */ addu $t2,$v0,$s0 /* f0a72b4: 448a4000 */ mtc1 $t2,$f8 @@ -9322,12 +9322,12 @@ glabel var7f1aca90 /* f0a7318: 91581bfc */ lbu $t8,0x1bfc($t2) /* f0a731c: 53000016 */ beqzl $t8,.L0f0a7378 /* f0a7320: 8e2b006c */ lw $t3,0x6c($s1) -/* f0a7324: 0fc54bc7 */ jal optionsGetScreenRatio +/* f0a7324: 0fc54bc7 */ jal options_get_screen_ratio /* f0a7328: 00000000 */ nop /* f0a732c: 24010001 */ addiu $at,$zero,0x1 /* f0a7330: 14410008 */ bne $v0,$at,.L0f0a7354 /* f0a7334: 00000000 */ nop -/* f0a7338: 0fc2f4d6 */ jal playerGetAspectRatio +/* f0a7338: 0fc2f4d6 */ jal player_get_aspect_ratio /* f0a733c: 00000000 */ nop /* f0a7340: 3c017f1b */ lui $at,%hi(var7f1aca8c) /* f0a7344: c430ca8c */ lwc1 $f16,%lo(var7f1aca8c)($at) @@ -9335,7 +9335,7 @@ glabel var7f1aca90 /* f0a734c: 10000005 */ b .L0f0a7364 /* f0a7350: 44061000 */ mfc1 $a2,$f2 .L0f0a7354: -/* f0a7354: 0fc2f4d6 */ jal playerGetAspectRatio +/* f0a7354: 0fc2f4d6 */ jal player_get_aspect_ratio /* f0a7358: 00000000 */ nop /* f0a735c: 46000086 */ mov.s $f2,$f0 /* f0a7360: 44061000 */ mfc1 $a2,$f2 @@ -9383,7 +9383,7 @@ glabel var7f1aca90 /* f0a73f0: 24010001 */ addiu $at,$zero,0x1 /* f0a73f4: 51010005 */ beql $t0,$at,.L0f0a740c /* f0a73f8: 0000a025 */ or $s4,$zero,$zero -/* f0a73fc: 0fc2be93 */ jal lasersightRenderBeam +/* f0a73fc: 0fc2be93 */ jal lasersight_render_beam /* f0a7400: 8fa4014c */ lw $a0,0x14c($sp) /* f0a7404: afa2014c */ sw $v0,0x14c($sp) .L0f0a7408: @@ -9393,7 +9393,7 @@ glabel var7f1aca90 /* f0a7410: 8fb500e4 */ lw $s5,0xe4($sp) /* f0a7414: 24120019 */ addiu $s2,$zero,0x19 .L0f0a7418: -/* f0a7418: 0fc2867c */ jal bgunGetWeaponNum2 +/* f0a7418: 0fc2867c */ jal bgun_get_weapon_num2 /* f0a741c: 02802025 */ or $a0,$s4,$zero /* f0a7420: afa200ec */ sw $v0,0xec($sp) /* f0a7424: 820a0007 */ lb $t2,0x7($s0) @@ -9403,11 +9403,11 @@ glabel var7f1aca90 /* f0a7434: 00003025 */ or $a2,$zero,$zero /* f0a7438: 26180384 */ addiu $t8,$s0,0x384 /* f0a743c: afb8003c */ sw $t8,0x3c($sp) -/* f0a7440: 0fc2b2e4 */ jal beamRender +/* f0a7440: 0fc2b2e4 */ jal beam_render /* f0a7444: 00003825 */ or $a3,$zero,$zero /* f0a7448: afa2014c */ sw $v0,0x14c($sp) /* f0a744c: 92040000 */ lbu $a0,0x0($s0) -/* f0a7450: 0fc2c5f0 */ jal weaponHasFlag +/* f0a7450: 0fc2c5f0 */ jal weapon_has_flag /* f0a7454: 34058000 */ dli $a1,0x8000 /* f0a7458: 10400030 */ beqz $v0,.L0f0a751c /* f0a745c: 8fab014c */ lw $t3,0x14c($sp) @@ -9443,7 +9443,7 @@ glabel var7f1aca90 /* f0a74d4: 25ae0008 */ addiu $t6,$t5,0x8 /* f0a74d8: afae014c */ sw $t6,0x14c($sp) /* f0a74dc: adaf0000 */ sw $t7,0x0($t5) -/* f0a74e0: 0fc2d5ea */ jal camGetLookAt +/* f0a74e0: 0fc2d5ea */ jal cam_get_look_at /* f0a74e4: afad00d4 */ sw $t5,0xd4($sp) /* f0a74e8: 8fa500d4 */ lw $a1,0xd4($sp) /* f0a74ec: 3c080382 */ lui $t0,0x382 @@ -9453,7 +9453,7 @@ glabel var7f1aca90 /* f0a74fc: 25890008 */ addiu $t1,$t4,0x8 /* f0a7500: afa9014c */ sw $t1,0x14c($sp) /* f0a7504: ad880000 */ sw $t0,0x0($t4) -/* f0a7508: 0fc2d5ea */ jal camGetLookAt +/* f0a7508: 0fc2d5ea */ jal cam_get_look_at /* f0a750c: afac00d0 */ sw $t4,0xd0($sp) /* f0a7510: 8fa300d0 */ lw $v1,0xd0($sp) /* f0a7514: 244a0010 */ addiu $t2,$v0,0x10 @@ -9473,15 +9473,15 @@ glabel var7f1aca90 /* f0a7548: 8fa300cc */ lw $v1,0xcc($sp) /* f0a754c: 24050010 */ addiu $a1,$zero,0x10 /* f0a7550: ac620004 */ sw $v0,0x4($v1) -/* f0a7554: 0c006a47 */ jal modelGetPart +/* f0a7554: 0c006a47 */ jal model_get_part /* f0a7558: 8e04038c */ lw $a0,0x38c($s0) /* f0a755c: 10400014 */ beqz $v0,.L0f0a75b0 /* f0a7560: afa200e8 */ sw $v0,0xe8($sp) /* f0a7564: 8e04038c */ lw $a0,0x38c($s0) -/* f0a7568: 0c006a47 */ jal modelGetPart +/* f0a7568: 0c006a47 */ jal model_get_part /* f0a756c: 24050011 */ addiu $a1,$zero,0x11 /* f0a7570: 8fa4003c */ lw $a0,0x3c($sp) -/* f0a7574: 0c006a87 */ jal modelGetNodeRwData +/* f0a7574: 0c006a87 */ jal model_get_node_rw_data /* f0a7578: 00402825 */ or $a1,$v0,$zero /* f0a757c: 10400003 */ beqz $v0,.L0f0a758c /* f0a7580: 3c06800a */ lui $a2,%hi(var8009cf88) @@ -9494,7 +9494,7 @@ glabel var7f1aca90 /* f0a7598: 8fa500e8 */ lw $a1,0xe8($sp) /* f0a759c: 24c6cf88 */ addiu $a2,$a2,%lo(var8009cf88) /* f0a75a0: 8fa7014c */ lw $a3,0x14c($sp) -/* f0a75a4: 0fc1fefe */ jal tvscreenRender +/* f0a75a4: 0fc1fefe */ jal tvscreen_render /* f0a75a8: afa00010 */ sw $zero,0x10($sp) /* f0a75ac: afa2014c */ sw $v0,0x14c($sp) .L0f0a75b0: @@ -9717,13 +9717,13 @@ glabel var7f1aca90 /* f0a78d0: 00000000 */ nop .L0f0a78d4: /* f0a78d4: 44d8f800 */ ctc1 $t8,$31 -/* f0a78d8: 0fc01a40 */ jal colourBlend +/* f0a78d8: 0fc01a40 */ jal colour_blend /* f0a78dc: 03202825 */ or $a1,$t9,$zero /* f0a78e0: afa20140 */ sw $v0,0x140($sp) .L0f0a78e4: /* f0a78e4: 8e6f00bc */ lw $t7,0xbc($s3) .L0f0a78e8: -/* f0a78e8: 0fc08af9 */ jal chrGetCloakAlpha +/* f0a78e8: 0fc08af9 */ jal chr_get_cloak_alpha /* f0a78ec: 8de40004 */ lw $a0,0x4($t7) /* f0a78f0: 284100ff */ slti $at,$v0,0xff /* f0a78f4: 1020000f */ beqz $at,.L0f0a7934 @@ -9758,12 +9758,12 @@ glabel var7f1aca90 /* f0a7964: 1100000d */ beqz $t0,.L0f0a799c /* f0a7968: 00c02825 */ or $a1,$a2,$zero /* f0a796c: afaa0094 */ sw $t2,0x94($sp) -/* f0a7970: 0c0087bd */ jal modelRender +/* f0a7970: 0c0087bd */ jal model_render /* f0a7974: afa60098 */ sw $a2,0x98($sp) /* f0a7978: 8fa60098 */ lw $a2,0x98($sp) /* f0a797c: 8ccb0008 */ lw $t3,0x8($a2) /* f0a7980: 8cc4000c */ lw $a0,0xc($a2) -/* f0a7984: 0fc30cfc */ jal mtxF2LBulk +/* f0a7984: 0fc30cfc */ jal mtx_f2l_bulk /* f0a7988: 8565000e */ lh $a1,0xe($t3) /* f0a798c: 8e0d021c */ lw $t5,0x21c($s0) /* f0a7990: 51a00003 */ beqzl $t5,.L0f0a79a0 @@ -9772,7 +9772,7 @@ glabel var7f1aca90 .L0f0a799c: /* f0a799c: 8fa400ec */ lw $a0,0xec($sp) .L0f0a79a0: -/* f0a79a0: 0fc2c5f0 */ jal weaponHasFlag +/* f0a79a0: 0fc2c5f0 */ jal weapon_has_flag /* f0a79a4: 24050020 */ addiu $a1,$zero,0x20 /* f0a79a8: 1040000e */ beqz $v0,.L0f0a79e4 /* f0a79ac: 24010001 */ addiu $at,$zero,0x1 @@ -9823,7 +9823,7 @@ glabel var7f1aca90 /* f0a7a48: 03257821 */ addu $t7,$t9,$a1 /* f0a7a4c: 15e10036 */ bne $t7,$at,.L0f0a7b28 /* f0a7a50: 24050041 */ addiu $a1,$zero,0x41 -/* f0a7a54: 0c006a47 */ jal modelGetPart +/* f0a7a54: 0c006a47 */ jal model_get_part /* f0a7a58: 8e04038c */ lw $a0,0x38c($s0) /* f0a7a5c: 50400033 */ beqzl $v0,.L0f0a7b2c /* f0a7a60: 27a4010c */ addiu $a0,$sp,0x10c @@ -9882,7 +9882,7 @@ glabel var7f1aca90 .L0f0a7b28: /* f0a7b28: 27a4010c */ addiu $a0,$sp,0x10c .L0f0a7b2c: -/* f0a7b2c: 0c0087bd */ jal modelRender +/* f0a7b2c: 0c0087bd */ jal model_render /* f0a7b30: 8fa5003c */ lw $a1,0x3c($sp) /* f0a7b34: 8e791594 */ lw $t9,0x1594($s3) /* f0a7b38: 3c0f8007 */ lui $t7,%hi(var800702dc) @@ -9897,11 +9897,11 @@ glabel var7f1aca90 /* f0a7b5c: 26050534 */ addiu $a1,$s0,0x534 /* f0a7b60: 00a02025 */ or $a0,$a1,$zero /* f0a7b64: ae0e0540 */ sw $t6,0x540($s0) -/* f0a7b68: 0c007308 */ jal modelUpdateRelations +/* f0a7b68: 0c007308 */ jal model_update_relations /* f0a7b6c: afa50054 */ sw $a1,0x54($sp) /* f0a7b70: 8fa50054 */ lw $a1,0x54($sp) /* f0a7b74: afb50140 */ sw $s5,0x140($sp) -/* f0a7b78: 0c0087bd */ jal modelRender +/* f0a7b78: 0c0087bd */ jal model_render /* f0a7b7c: 27a4010c */ addiu $a0,$sp,0x10c /* f0a7b80: 8fa4007c */ lw $a0,0x7c($sp) /* f0a7b84: afa40140 */ sw $a0,0x140($sp) @@ -9909,7 +9909,7 @@ glabel var7f1aca90 .L0f0a7b8c: /* f0a7b8c: 8fa400ec */ lw $a0,0xec($sp) /* f0a7b90: 24050020 */ addiu $a1,$zero,0x20 -/* f0a7b94: 0fc2c5f0 */ jal weaponHasFlag +/* f0a7b94: 0fc2c5f0 */ jal weapon_has_flag /* f0a7b98: afac014c */ sw $t4,0x14c($sp) /* f0a7b9c: 10400007 */ beqz $v0,.L0f0a7bbc /* f0a7ba0: 8faa014c */ lw $t2,0x14c($sp) @@ -9922,7 +9922,7 @@ glabel var7f1aca90 .L0f0a7bbc: /* f0a7bbc: 8e18038c */ lw $t8,0x38c($s0) /* f0a7bc0: 8e040390 */ lw $a0,0x390($s0) -/* f0a7bc4: 0fc30cfc */ jal mtxF2LBulk +/* f0a7bc4: 0fc30cfc */ jal mtx_f2l_bulk /* f0a7bc8: 8705000e */ lh $a1,0xe($t8) /* f0a7bcc: 0c0059e1 */ jal mtx00016784 /* f0a7bd0: 00000000 */ nop @@ -9932,7 +9932,7 @@ glabel var7f1aca90 /* f0a7be0: 272f0008 */ addiu $t7,$t9,0x8 /* f0a7be4: afaf014c */ sw $t7,0x14c($sp) /* f0a7be8: af290000 */ sw $t1,0x0($t9) -/* f0a7bec: 0c002adb */ jal viGetPerspScale +/* f0a7bec: 0c002adb */ jal vi_get_persp_scale /* f0a7bf0: afb90074 */ sw $t9,0x74($sp) /* f0a7bf4: 8fa30074 */ lw $v1,0x74($sp) /* f0a7bf8: ac620004 */ sw $v0,0x4($v1) @@ -9942,22 +9942,22 @@ glabel var7f1aca90 /* f0a7c04: 1681fe04 */ bne $s4,$at,.L0f0a7418 /* f0a7c08: 261007a4 */ addiu $s0,$s0,0x7a4 /* f0a7c0c: afb500e4 */ sw $s5,0xe4($sp) -/* f0a7c10: 0fc2baf8 */ jal casingsRender +/* f0a7c10: 0fc2baf8 */ jal casings_render /* f0a7c14: 27a4014c */ addiu $a0,$sp,0x14c -/* f0a7c18: 0fc5d8a6 */ jal zbufSwap +/* f0a7c18: 0fc5d8a6 */ jal zbuf_swap /* f0a7c1c: 00000000 */ nop -/* f0a7c20: 0fc5d8ab */ jal zbufConfigureRdp +/* f0a7c20: 0fc5d8ab */ jal zbuf_configure_rdp /* f0a7c24: 8fa4014c */ lw $a0,0x14c($sp) /* f0a7c28: afa2014c */ sw $v0,0x14c($sp) /* f0a7c2c: 0c002c74 */ jal vi0000b1d0 /* f0a7c30: 00402025 */ or $a0,$v0,$zero /* f0a7c34: 244e0008 */ addiu $t6,$v0,0x8 /* f0a7c38: afae014c */ sw $t6,0x14c($sp) -/* f0a7c3c: 0c002f40 */ jal viGetViewLeft +/* f0a7c3c: 0c002f40 */ jal vi_get_view_left /* f0a7c40: 00408825 */ or $s1,$v0,$zero /* f0a7c44: 00028400 */ sll $s0,$v0,0x10 /* f0a7c48: 00106403 */ sra $t4,$s0,0x10 -/* f0a7c4c: 0c002f44 */ jal viGetViewTop +/* f0a7c4c: 0c002f44 */ jal vi_get_view_top /* f0a7c50: 01808025 */ or $s0,$t4,$zero /* f0a7c54: 44824000 */ mtc1 $v0,$f8 /* f0a7c58: 44902000 */ mtc1 $s0,$f4 @@ -9978,19 +9978,19 @@ glabel var7f1aca90 /* f0a7c94: 332f0fff */ andi $t7,$t9,0xfff /* f0a7c98: 000f4b00 */ sll $t1,$t7,0xc /* f0a7c9c: 01a97025 */ or $t6,$t5,$t1 -/* f0a7ca0: 0c002f22 */ jal viGetViewWidth +/* f0a7ca0: 0c002f22 */ jal vi_get_view_width /* f0a7ca4: ae2e0000 */ sw $t6,0x0($s1) /* f0a7ca8: 00029400 */ sll $s2,$v0,0x10 /* f0a7cac: 00126403 */ sra $t4,$s2,0x10 -/* f0a7cb0: 0c002f40 */ jal viGetViewLeft +/* f0a7cb0: 0c002f40 */ jal vi_get_view_left /* f0a7cb4: 01809025 */ or $s2,$t4,$zero /* f0a7cb8: 0002a400 */ sll $s4,$v0,0x10 /* f0a7cbc: 00145403 */ sra $t2,$s4,0x10 -/* f0a7cc0: 0c002f44 */ jal viGetViewTop +/* f0a7cc0: 0c002f44 */ jal vi_get_view_top /* f0a7cc4: 0140a025 */ or $s4,$t2,$zero /* f0a7cc8: 00028400 */ sll $s0,$v0,0x10 /* f0a7ccc: 00104403 */ sra $t0,$s0,0x10 -/* f0a7cd0: 0c002f26 */ jal viGetViewHeight +/* f0a7cd0: 0c002f26 */ jal vi_get_view_height /* f0a7cd4: 01008025 */ or $s0,$t0,$zero /* f0a7cd8: 00505821 */ addu $t3,$v0,$s0 /* f0a7cdc: 448b8000 */ mtc1 $t3,$f16 @@ -10029,7 +10029,7 @@ glabel var7f1aca90 ); #else GLOBAL_ASM( -glabel bgunRender +glabel bgun_render .late_rodata glabel var7f1aca8c .word 0x3faaaaab @@ -10085,21 +10085,21 @@ glabel var7f1aca90 /* f0a4f30: 100002cd */ beqz $zero,.NB0f0a5a68 /* f0a4f34: 8fbf0034 */ lw $ra,0x34($sp) .NB0f0a4f38: -/* f0a4f38: 0fc5c4d5 */ jal zbufDrawArtifactsOffscreen +/* f0a4f38: 0fc5c4d5 */ jal zbuf_draw_artifacts_offscreen /* f0a4f3c: 8fa40144 */ lw $a0,0x144($sp) /* f0a4f40: afa20144 */ sw $v0,0x144($sp) -/* f0a4f44: 0c002d00 */ jal viPrepareZbuf +/* f0a4f44: 0c002d00 */ jal vi_prepare_zbuf /* f0a4f48: 00402025 */ or $a0,$v0,$zero /* f0a4f4c: afa20144 */ sw $v0,0x144($sp) /* f0a4f50: 0c002cd4 */ jal vi0000b1d0 /* f0a4f54: 00402025 */ or $a0,$v0,$zero /* f0a4f58: 244e0008 */ addiu $t6,$v0,0x8 /* f0a4f5c: afae0144 */ sw $t6,0x144($sp) -/* f0a4f60: 0c002fb5 */ jal viGetViewLeft +/* f0a4f60: 0c002fb5 */ jal vi_get_view_left /* f0a4f64: 0040a825 */ or $s5,$v0,$zero /* f0a4f68: 00028400 */ sll $s0,$v0,0x10 /* f0a4f6c: 00107c03 */ sra $t7,$s0,0x10 -/* f0a4f70: 0c002fb9 */ jal viGetViewTop +/* f0a4f70: 0c002fb9 */ jal vi_get_view_top /* f0a4f74: 01e08025 */ or $s0,$t7,$zero /* f0a4f78: 44822000 */ mtc1 $v0,$f4 /* f0a4f7c: 44908000 */ mtc1 $s0,$f16 @@ -10120,19 +10120,19 @@ glabel var7f1aca90 /* f0a4fb8: 316c0fff */ andi $t4,$t3,0xfff /* f0a4fbc: 000c6b00 */ sll $t5,$t4,0xc /* f0a4fc0: 032d7025 */ or $t6,$t9,$t5 -/* f0a4fc4: 0c002f97 */ jal viGetViewWidth +/* f0a4fc4: 0c002f97 */ jal vi_get_view_width /* f0a4fc8: aeae0000 */ sw $t6,0x0($s5) /* f0a4fcc: 00029400 */ sll $s2,$v0,0x10 /* f0a4fd0: 00127c03 */ sra $t7,$s2,0x10 -/* f0a4fd4: 0c002fb5 */ jal viGetViewLeft +/* f0a4fd4: 0c002fb5 */ jal vi_get_view_left /* f0a4fd8: 01e09025 */ or $s2,$t7,$zero /* f0a4fdc: 0002a400 */ sll $s4,$v0,0x10 /* f0a4fe0: 00144c03 */ sra $t1,$s4,0x10 -/* f0a4fe4: 0c002fb9 */ jal viGetViewTop +/* f0a4fe4: 0c002fb9 */ jal vi_get_view_top /* f0a4fe8: 0120a025 */ or $s4,$t1,$zero /* f0a4fec: 00028400 */ sll $s0,$v0,0x10 /* f0a4ff0: 00104403 */ sra $t0,$s0,0x10 -/* f0a4ff4: 0c002f9b */ jal viGetViewHeight +/* f0a4ff4: 0c002f9b */ jal vi_get_view_height /* f0a4ff8: 01008025 */ or $s0,$t0,$zero /* f0a4ffc: 00505021 */ addu $t2,$v0,$s0 /* f0a5000: 448a4000 */ mtc1 $t2,$f8 @@ -10163,12 +10163,12 @@ glabel var7f1aca90 /* f0a5064: 91581bfc */ lbu $t8,0x1bfc($t2) /* f0a5068: 53000016 */ beqzl $t8,.NB0f0a50c4 /* f0a506c: 8e2b006c */ lw $t3,0x6c($s1) -/* f0a5070: 0fc53582 */ jal optionsGetScreenRatio +/* f0a5070: 0fc53582 */ jal options_get_screen_ratio /* f0a5074: 00000000 */ sll $zero,$zero,0x0 /* f0a5078: 24010001 */ addiu $at,$zero,0x1 /* f0a507c: 14410008 */ bne $v0,$at,.NB0f0a50a0 /* f0a5080: 00000000 */ sll $zero,$zero,0x0 -/* f0a5084: 0fc2ebf0 */ jal playerGetAspectRatio +/* f0a5084: 0fc2ebf0 */ jal player_get_aspect_ratio /* f0a5088: 00000000 */ sll $zero,$zero,0x0 /* f0a508c: 3c017f1a */ lui $at,%hi(var7f1aca8c) /* f0a5090: c4306dd4 */ lwc1 $f16,%lo(var7f1aca8c)($at) @@ -10176,7 +10176,7 @@ glabel var7f1aca90 /* f0a5098: 10000005 */ beqz $zero,.NB0f0a50b0 /* f0a509c: 44061000 */ mfc1 $a2,$f2 .NB0f0a50a0: -/* f0a50a0: 0fc2ebf0 */ jal playerGetAspectRatio +/* f0a50a0: 0fc2ebf0 */ jal player_get_aspect_ratio /* f0a50a4: 00000000 */ sll $zero,$zero,0x0 /* f0a50a8: 46000086 */ mov.s $f2,$f0 /* f0a50ac: 44061000 */ mfc1 $a2,$f2 @@ -10224,7 +10224,7 @@ glabel var7f1aca90 /* f0a513c: 24010001 */ addiu $at,$zero,0x1 /* f0a5140: 51010005 */ beql $t0,$at,.NB0f0a5158 /* f0a5144: 0000a025 */ or $s4,$zero,$zero -/* f0a5148: 0fc2b5eb */ jal lasersightRenderBeam +/* f0a5148: 0fc2b5eb */ jal lasersight_render_beam /* f0a514c: 8fa40144 */ lw $a0,0x144($sp) /* f0a5150: afa20144 */ sw $v0,0x144($sp) .NB0f0a5154: @@ -10234,7 +10234,7 @@ glabel var7f1aca90 /* f0a515c: 8fb500dc */ lw $s5,0xdc($sp) /* f0a5160: 24120019 */ addiu $s2,$zero,0x19 .NB0f0a5164: -/* f0a5164: 0fc27de9 */ jal bgunGetWeaponNum2 +/* f0a5164: 0fc27de9 */ jal bgun_get_weapon_num2 /* f0a5168: 02802025 */ or $a0,$s4,$zero /* f0a516c: afa200e4 */ sw $v0,0xe4($sp) /* f0a5170: 820a0007 */ lb $t2,0x7($s0) @@ -10244,11 +10244,11 @@ glabel var7f1aca90 /* f0a5180: 00003025 */ or $a2,$zero,$zero /* f0a5184: 26180384 */ addiu $t8,$s0,0x384 /* f0a5188: afb80038 */ sw $t8,0x38($sp) -/* f0a518c: 0fc2aa3c */ jal beamRender +/* f0a518c: 0fc2aa3c */ jal beam_render /* f0a5190: 00003825 */ or $a3,$zero,$zero /* f0a5194: afa20144 */ sw $v0,0x144($sp) /* f0a5198: 92040000 */ lbu $a0,0x0($s0) -/* f0a519c: 0fc2bd48 */ jal weaponHasFlag +/* f0a519c: 0fc2bd48 */ jal weapon_has_flag /* f0a51a0: 34058000 */ dli $a1,0x8000 /* f0a51a4: 10400030 */ beqz $v0,.NB0f0a5268 /* f0a51a8: 8fab0144 */ lw $t3,0x144($sp) @@ -10284,7 +10284,7 @@ glabel var7f1aca90 /* f0a5220: 25ae0008 */ addiu $t6,$t5,0x8 /* f0a5224: afae0144 */ sw $t6,0x144($sp) /* f0a5228: adaf0000 */ sw $t7,0x0($t5) -/* f0a522c: 0fc2cd42 */ jal camGetLookAt +/* f0a522c: 0fc2cd42 */ jal cam_get_look_at /* f0a5230: afad00cc */ sw $t5,0xcc($sp) /* f0a5234: 8fa500cc */ lw $a1,0xcc($sp) /* f0a5238: 3c080382 */ lui $t0,0x382 @@ -10294,7 +10294,7 @@ glabel var7f1aca90 /* f0a5248: 25890008 */ addiu $t1,$t4,0x8 /* f0a524c: afa90144 */ sw $t1,0x144($sp) /* f0a5250: ad880000 */ sw $t0,0x0($t4) -/* f0a5254: 0fc2cd42 */ jal camGetLookAt +/* f0a5254: 0fc2cd42 */ jal cam_get_look_at /* f0a5258: afac00c8 */ sw $t4,0xc8($sp) /* f0a525c: 8fa300c8 */ lw $v1,0xc8($sp) /* f0a5260: 244a0010 */ addiu $t2,$v0,0x10 @@ -10314,15 +10314,15 @@ glabel var7f1aca90 /* f0a5294: 8fa300c4 */ lw $v1,0xc4($sp) /* f0a5298: 24050010 */ addiu $a1,$zero,0x10 /* f0a529c: ac620004 */ sw $v0,0x4($v1) -/* f0a52a0: 0c006ea3 */ jal modelGetPart +/* f0a52a0: 0c006ea3 */ jal model_get_part /* f0a52a4: 8e04038c */ lw $a0,0x38c($s0) /* f0a52a8: 10400014 */ beqz $v0,.NB0f0a52fc /* f0a52ac: afa200e0 */ sw $v0,0xe0($sp) /* f0a52b0: 8e04038c */ lw $a0,0x38c($s0) -/* f0a52b4: 0c006ea3 */ jal modelGetPart +/* f0a52b4: 0c006ea3 */ jal model_get_part /* f0a52b8: 24050011 */ addiu $a1,$zero,0x11 /* f0a52bc: 8fa40038 */ lw $a0,0x38($sp) -/* f0a52c0: 0c006bab */ jal modelGetNodeRwData +/* f0a52c0: 0c006bab */ jal model_get_node_rw_data /* f0a52c4: 00402825 */ or $a1,$v0,$zero /* f0a52c8: 10400003 */ beqz $v0,.NB0f0a52d8 /* f0a52cc: 3c06800a */ lui $a2,%hi(var8009cf88) @@ -10335,7 +10335,7 @@ glabel var7f1aca90 /* f0a52e4: 8fa500e0 */ lw $a1,0xe0($sp) /* f0a52e8: 24c616b8 */ addiu $a2,$a2,%lo(var8009cf88) /* f0a52ec: 8fa70144 */ lw $a3,0x144($sp) -/* f0a52f0: 0fc1f99c */ jal tvscreenRender +/* f0a52f0: 0fc1f99c */ jal tvscreen_render /* f0a52f4: afa00010 */ sw $zero,0x10($sp) /* f0a52f8: afa20144 */ sw $v0,0x144($sp) .NB0f0a52fc: @@ -10558,13 +10558,13 @@ glabel var7f1aca90 /* f0a561c: 00000000 */ sll $zero,$zero,0x0 .NB0f0a5620: /* f0a5620: 44d8f800 */ ctc1 $t8,$31 -/* f0a5624: 0fc01990 */ jal colourBlend +/* f0a5624: 0fc01990 */ jal colour_blend /* f0a5628: 03202825 */ or $a1,$t9,$zero /* f0a562c: afa20138 */ sw $v0,0x138($sp) .NB0f0a5630: /* f0a5630: 8e6f00bc */ lw $t7,0xbc($s3) .NB0f0a5634: -/* f0a5634: 0fc089b4 */ jal chrGetCloakAlpha +/* f0a5634: 0fc089b4 */ jal chr_get_cloak_alpha /* f0a5638: 8de40004 */ lw $a0,0x4($t7) /* f0a563c: 284100ff */ slti $at,$v0,0xff /* f0a5640: 1020000f */ beqz $at,.NB0f0a5680 @@ -10591,12 +10591,12 @@ glabel var7f1aca90 /* f0a5690: 8fa400e4 */ lw $a0,0xe4($sp) /* f0a5694: 8c450018 */ lw $a1,0x18($v0) /* f0a5698: 27a40104 */ addiu $a0,$sp,0x104 -/* f0a569c: 0c008be3 */ jal modelRender +/* f0a569c: 0c008be3 */ jal model_render /* f0a56a0: afa50090 */ sw $a1,0x90($sp) /* f0a56a4: 8fa60090 */ lw $a2,0x90($sp) /* f0a56a8: 8cc80008 */ lw $t0,0x8($a2) /* f0a56ac: 8cc4000c */ lw $a0,0xc($a2) -/* f0a56b0: 0fc303f0 */ jal mtxF2LBulk +/* f0a56b0: 0fc303f0 */ jal mtx_f2l_bulk /* f0a56b4: 8505000e */ lh $a1,0xe($t0) /* f0a56b8: 8e0a021c */ lw $t2,0x21c($s0) /* f0a56bc: 51400003 */ beqzl $t2,.NB0f0a56cc @@ -10604,7 +10604,7 @@ glabel var7f1aca90 /* f0a56c4: ae000218 */ sw $zero,0x218($s0) /* f0a56c8: 8fa400e4 */ lw $a0,0xe4($sp) .NB0f0a56cc: -/* f0a56cc: 0fc2bd48 */ jal weaponHasFlag +/* f0a56cc: 0fc2bd48 */ jal weapon_has_flag /* f0a56d0: 24050020 */ addiu $a1,$zero,0x20 /* f0a56d4: 1040000e */ beqz $v0,.NB0f0a5710 /* f0a56d8: 24010001 */ addiu $at,$zero,0x1 @@ -10655,7 +10655,7 @@ glabel var7f1aca90 /* f0a5774: 01a5c021 */ addu $t8,$t5,$a1 /* f0a5778: 17010036 */ bne $t8,$at,.NB0f0a5854 /* f0a577c: 24050041 */ addiu $a1,$zero,0x41 -/* f0a5780: 0c006ea3 */ jal modelGetPart +/* f0a5780: 0c006ea3 */ jal model_get_part /* f0a5784: 8e04038c */ lw $a0,0x38c($s0) /* f0a5788: 50400033 */ beqzl $v0,.NB0f0a5858 /* f0a578c: 27a40104 */ addiu $a0,$sp,0x104 @@ -10714,7 +10714,7 @@ glabel var7f1aca90 .NB0f0a5854: /* f0a5854: 27a40104 */ addiu $a0,$sp,0x104 .NB0f0a5858: -/* f0a5858: 0c008be3 */ jal modelRender +/* f0a5858: 0c008be3 */ jal model_render /* f0a585c: 8fa50038 */ lw $a1,0x38($sp) /* f0a5860: 8e6d1594 */ lw $t5,0x1594($s3) /* f0a5864: 3c188007 */ lui $t8,%hi(var800702dc) @@ -10729,11 +10729,11 @@ glabel var7f1aca90 /* f0a5888: 26050534 */ addiu $a1,$s0,0x534 /* f0a588c: 00a02025 */ or $a0,$a1,$zero /* f0a5890: ae0f0540 */ sw $t7,0x540($s0) -/* f0a5894: 0c007728 */ jal modelUpdateRelations +/* f0a5894: 0c007728 */ jal model_update_relations /* f0a5898: afa50050 */ sw $a1,0x50($sp) /* f0a589c: 8fa50050 */ lw $a1,0x50($sp) /* f0a58a0: afb50138 */ sw $s5,0x138($sp) -/* f0a58a4: 0c008be3 */ jal modelRender +/* f0a58a4: 0c008be3 */ jal model_render /* f0a58a8: 27a40104 */ addiu $a0,$sp,0x104 /* f0a58ac: 8fa40078 */ lw $a0,0x78($sp) /* f0a58b0: afa40138 */ sw $a0,0x138($sp) @@ -10741,7 +10741,7 @@ glabel var7f1aca90 .NB0f0a58b8: /* f0a58b8: 8fa400e4 */ lw $a0,0xe4($sp) /* f0a58bc: 24050020 */ addiu $a1,$zero,0x20 -/* f0a58c0: 0fc2bd48 */ jal weaponHasFlag +/* f0a58c0: 0fc2bd48 */ jal weapon_has_flag /* f0a58c4: afa90144 */ sw $t1,0x144($sp) /* f0a58c8: 10400007 */ beqz $v0,.NB0f0a58e8 /* f0a58cc: 8fac0144 */ lw $t4,0x144($sp) @@ -10754,7 +10754,7 @@ glabel var7f1aca90 .NB0f0a58e8: /* f0a58e8: 8e0b038c */ lw $t3,0x38c($s0) /* f0a58ec: 8e040390 */ lw $a0,0x390($s0) -/* f0a58f0: 0fc303f0 */ jal mtxF2LBulk +/* f0a58f0: 0fc303f0 */ jal mtx_f2l_bulk /* f0a58f4: 8565000e */ lh $a1,0xe($t3) /* f0a58f8: 0c005dc5 */ jal mtx00016784 /* f0a58fc: 00000000 */ sll $zero,$zero,0x0 @@ -10764,7 +10764,7 @@ glabel var7f1aca90 /* f0a590c: 25b80008 */ addiu $t8,$t5,0x8 /* f0a5910: afb80144 */ sw $t8,0x144($sp) /* f0a5914: adb90000 */ sw $t9,0x0($t5) -/* f0a5918: 0c002b3b */ jal viGetPerspScale +/* f0a5918: 0c002b3b */ jal vi_get_persp_scale /* f0a591c: afad0070 */ sw $t5,0x70($sp) /* f0a5920: 8fa30070 */ lw $v1,0x70($sp) /* f0a5924: ac620004 */ sw $v0,0x4($v1) @@ -10774,22 +10774,22 @@ glabel var7f1aca90 /* f0a5930: 1681fe0c */ bne $s4,$at,.NB0f0a5164 /* f0a5934: 261007a4 */ addiu $s0,$s0,0x7a4 /* f0a5938: afb500dc */ sw $s5,0xdc($sp) -/* f0a593c: 0fc2b250 */ jal casingsRender +/* f0a593c: 0fc2b250 */ jal casings_render /* f0a5940: 27a40144 */ addiu $a0,$sp,0x144 -/* f0a5944: 0fc5c3ce */ jal zbufSwap +/* f0a5944: 0fc5c3ce */ jal zbuf_swap /* f0a5948: 00000000 */ sll $zero,$zero,0x0 -/* f0a594c: 0fc5c3d3 */ jal zbufConfigureRdp +/* f0a594c: 0fc5c3d3 */ jal zbuf_configure_rdp /* f0a5950: 8fa40144 */ lw $a0,0x144($sp) /* f0a5954: afa20144 */ sw $v0,0x144($sp) /* f0a5958: 0c002cd4 */ jal vi0000b1d0 /* f0a595c: 00402025 */ or $a0,$v0,$zero /* f0a5960: 244f0008 */ addiu $t7,$v0,0x8 /* f0a5964: afaf0144 */ sw $t7,0x144($sp) -/* f0a5968: 0c002fb5 */ jal viGetViewLeft +/* f0a5968: 0c002fb5 */ jal vi_get_view_left /* f0a596c: 00408825 */ or $s1,$v0,$zero /* f0a5970: 00028400 */ sll $s0,$v0,0x10 /* f0a5974: 00104c03 */ sra $t1,$s0,0x10 -/* f0a5978: 0c002fb9 */ jal viGetViewTop +/* f0a5978: 0c002fb9 */ jal vi_get_view_top /* f0a597c: 01208025 */ or $s0,$t1,$zero /* f0a5980: 44824000 */ mtc1 $v0,$f8 /* f0a5984: 44902000 */ mtc1 $s0,$f4 @@ -10810,19 +10810,19 @@ glabel var7f1aca90 /* f0a59c0: 31b80fff */ andi $t8,$t5,0xfff /* f0a59c4: 0018cb00 */ sll $t9,$t8,0xc /* f0a59c8: 01597825 */ or $t7,$t2,$t9 -/* f0a59cc: 0c002f97 */ jal viGetViewWidth +/* f0a59cc: 0c002f97 */ jal vi_get_view_width /* f0a59d0: ae2f0000 */ sw $t7,0x0($s1) /* f0a59d4: 00029400 */ sll $s2,$v0,0x10 /* f0a59d8: 00124c03 */ sra $t1,$s2,0x10 -/* f0a59dc: 0c002fb5 */ jal viGetViewLeft +/* f0a59dc: 0c002fb5 */ jal vi_get_view_left /* f0a59e0: 01209025 */ or $s2,$t1,$zero /* f0a59e4: 0002a400 */ sll $s4,$v0,0x10 /* f0a59e8: 00146403 */ sra $t4,$s4,0x10 -/* f0a59ec: 0c002fb9 */ jal viGetViewTop +/* f0a59ec: 0c002fb9 */ jal vi_get_view_top /* f0a59f0: 0180a025 */ or $s4,$t4,$zero /* f0a59f4: 00028400 */ sll $s0,$v0,0x10 /* f0a59f8: 00107403 */ sra $t6,$s0,0x10 -/* f0a59fc: 0c002f9b */ jal viGetViewHeight +/* f0a59fc: 0c002f9b */ jal vi_get_view_height /* f0a5a00: 01c08025 */ or $s0,$t6,$zero /* f0a5a04: 00504021 */ addu $t0,$v0,$s0 /* f0a5a08: 44888000 */ mtc1 $t0,$f16 @@ -10862,7 +10862,7 @@ glabel var7f1aca90 #endif #else // Mismatch: Goal uses different codegen for accessing vertices -void bgunRender(Gfx **gdlptr) +void bgun_render(Gfx **gdlptr) { Gfx *gdl = *gdlptr; struct modelrenderdata renderdata = {NULL, true, 3}; // 10c @@ -10882,29 +10882,29 @@ void bgunRender(Gfx **gdlptr) return; } - gdl = zbufDrawArtifactsOffscreen(gdl); - gdl = viPrepareZbuf(gdl); + gdl = zbuf_draw_artifacts_offscreen(gdl); + gdl = vi_prepare_zbuf(gdl); gdl = vi0000b1d0(gdl); - gDPSetScissor(gdl++, G_SC_NON_INTERLACE, viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), viGetViewTop() + viGetViewHeight()); + gDPSetScissor(gdl++, G_SC_NON_INTERLACE, vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), vi_get_view_top() + vi_get_view_height()); gdl = vi0000aca4(gdl, 1.5, 1000); if (g_Vars.currentplayer->teleportstate != TELEPORTSTATE_INACTIVE) { f32 f2; - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { - f2 = playerGetAspectRatio() * 1.3333334f; + if (options_get_screen_ratio() == SCREENRATIO_16_9) { + f2 = player_get_aspect_ratio() * 1.3333334f; } else { - f2 = playerGetAspectRatio(); + f2 = player_get_aspect_ratio(); } gdl = vi0000b0e8(gdl, 60, f2); } if (PLAYERCOUNT() == 1 && IS8MB()) { - gdl = lasersightRenderBeam(gdl); + gdl = lasersight_render_beam(gdl); } for (i = 0; i < 2; i++) { @@ -10917,30 +10917,30 @@ void bgunRender(Gfx **gdlptr) hand = player->hands + i; - weaponnum = bgunGetWeaponNum2(i); + weaponnum = bgun_get_weapon_num2(i); if (hand->visible) { - gdl = beamRender(gdl, &hand->beam, 0, 0); + gdl = beam_render(gdl, &hand->beam, 0, 0); - if (weaponHasFlag(hand->gset.weaponnum, WEAPONFLAG_00008000)) { + if (weapon_has_flag(hand->gset.weaponnum, WEAPONFLAG_00008000)) { gSPSetLights1(gdl++, var80070090); - gSPLookAt(gdl++, camGetLookAt()); + gSPLookAt(gdl++, cam_get_look_at()); } gSPPerspNormalize(gdl++, mtx00016dcc(0, 300)); // There is support for guns having a TV screen on them // but no guns have this model part so it's not used. - node = modelGetPart(hand->gunmodel.definition, MODELPART_0010); + node = model_get_part(hand->gunmodel.definition, MODELPART_0010); if (node) { - union modelrwdata *rwdata = modelGetNodeRwData(&hand->gunmodel, modelGetPart(hand->gunmodel.definition, MODELPART_0011)); + union modelrwdata *rwdata = model_get_node_rw_data(&hand->gunmodel, model_get_part(hand->gunmodel.definition, MODELPART_0011)); if (rwdata) { rwdata->toggle.visible = true; } - gdl = tvscreenRender(&hand->gunmodel, node, &var8009cf88, gdl, 0, 1); + gdl = tvscreen_render(&hand->gunmodel, node, &var8009cf88, gdl, 0, 1); } renderdata.gdl = gdl; @@ -10989,12 +10989,12 @@ void bgunRender(Gfx **gdlptr) // 838 if (hand->gset.weaponnum == WEAPON_MAULER) { u32 weight = hand->matmot1 * 50.0f; - renderdata.envcolour = colourBlend(0xff00007f, renderdata.envcolour, weight); + renderdata.envcolour = colour_blend(0xff00007f, renderdata.envcolour, weight); } } // Apply transparency based on player's cloak - alpha = chrGetCloakAlpha(player->prop->chr); + alpha = chr_get_cloak_alpha(player->prop->chr); if (alpha < 255) { colour = (s32) (alpha * 0.74509805f) + 0x41; @@ -11016,9 +11016,9 @@ void bgunRender(Gfx **gdlptr) if (rocketmodel && rocketmodel->definition) { sp94 = true; - modelRender(&renderdata, rocketmodel); + model_render(&renderdata, rocketmodel); - mtxF2LBulk(rocketmodel->matrices, rocketmodel->definition->nummatrices); + mtx_f2l_bulk(rocketmodel->matrices, rocketmodel->definition->nummatrices); if (hand->firedrocket) { hand->rocket = NULL; @@ -11027,9 +11027,9 @@ void bgunRender(Gfx **gdlptr) if (sp94); #else - modelRender(&renderdata, rocketmodel); + model_render(&renderdata, rocketmodel); - mtxF2LBulk(rocketmodel->matrices, rocketmodel->definition->nummatrices); + mtx_f2l_bulk(rocketmodel->matrices, rocketmodel->definition->nummatrices); if (hand->firedrocket) { hand->rocket = NULL; @@ -11037,7 +11037,7 @@ void bgunRender(Gfx **gdlptr) #endif } - if (weaponHasFlag(weaponnum, WEAPONFLAG_DUALFLIP)) { + if (weapon_has_flag(weaponnum, WEAPONFLAG_DUALFLIP)) { gSPClearGeometryMode(renderdata.gdl++, G_CULL_BOTH); if (i == HAND_RIGHT) { @@ -11049,7 +11049,7 @@ void bgunRender(Gfx **gdlptr) // Slide the laser's liquid texture if (PLAYERCOUNT() == 1) { - node = modelGetPart(hand->gunmodel.definition, MODELPART_GUN_LASERLIQUID); + node = model_get_part(hand->gunmodel.definition, MODELPART_GUN_LASERLIQUID); // a5c if (node) { @@ -11073,7 +11073,7 @@ void bgunRender(Gfx **gdlptr) } // Render the gun - modelRender(&renderdata, &hand->gunmodel); + model_render(&renderdata, &hand->gunmodel); // Render the hand if (player->gunctrl.handmodeldef && renderhand) { @@ -11081,35 +11081,35 @@ void bgunRender(Gfx **gdlptr) hand->handmodel.matrices = hand->gunmodel.matrices; - modelUpdateRelations(&hand->handmodel); + model_update_relations(&hand->handmodel); renderdata.envcolour = colour; - modelRender(&renderdata, &hand->handmodel); + model_render(&renderdata, &hand->handmodel); renderdata.envcolour = prevcolour; } // Clean up gdl = renderdata.gdl; - if (weaponHasFlag(weaponnum, WEAPONFLAG_DUALFLIP)) { + if (weapon_has_flag(weaponnum, WEAPONFLAG_DUALFLIP)) { gSPClearGeometryMode(gdl++, G_CULL_BOTH); } - mtxF2LBulk(hand->gunmodel.matrices, hand->gunmodel.definition->nummatrices); + mtx_f2l_bulk(hand->gunmodel.matrices, hand->gunmodel.definition->nummatrices); mtx00016784(); - gSPPerspNormalize(gdl++, viGetPerspScale()); + gSPPerspNormalize(gdl++, vi_get_persp_scale()); } } - casingsRender(&gdl); - zbufSwap(); + casings_render(&gdl); + zbuf_swap(); - gdl = zbufConfigureRdp(gdl); + gdl = zbuf_configure_rdp(gdl); gdl = vi0000b1d0(gdl); - gDPSetScissor(gdl++, G_SC_NON_INTERLACE, viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), viGetViewTop() + viGetViewHeight()); + gDPSetScissor(gdl++, G_SC_NON_INTERLACE, vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), vi_get_view_top() + vi_get_view_height()); *gdlptr = gdl; } @@ -11118,7 +11118,7 @@ void bgunRender(Gfx **gdlptr) /** * Find and return an available audio handle out of a pool of four. */ -struct sndstate **bgunAllocateAudioHandle(void) +struct sndstate **bgun_allocate_audio_handle(void) { s32 i; @@ -11131,7 +11131,7 @@ struct sndstate **bgunAllocateAudioHandle(void) return NULL; } -void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) +void bgun_play_prop_hit_sound(struct gset *gset, struct prop *prop, s32 texturenum) { #if VERSION >= VERSION_NTSC_1_0 u32 rand1 = random(); @@ -11154,11 +11154,11 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) || gset->weaponnum == WEAPON_TRACERBUG || gset->weaponnum == WEAPON_TARGETAMPLIFIER || gset->weaponnum == WEAPON_ECMMINE) { - psCreate(NULL, prop, SFX_80AA, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); + ps_create(NULL, prop, SFX_80AA, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); return; } - handle = bgunAllocateAudioHandle(); + handle = bgun_allocate_audio_handle(); if (handle) { if (prop->type == PROPTYPE_CHR || prop->type == PROPTYPE_PLAYER) { @@ -11168,7 +11168,7 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) s32 vol; s32 pan; - if (chrGetShield(chr) > 0) { + if (chr_get_shield(chr) > 0) { soundnum = SFX_SHIELD_DAMAGE; } else if (gset->weaponnum == WEAPON_COMBATKNIFE || gset->weaponnum == WEAPON_COMBATKNIFE // duplicate @@ -11190,13 +11190,13 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) } if (soundnum != -1) { - psGetTheoreticalVolPan(&prop->pos, prop->rooms, soundnum, &vol, &pan); + ps_get_theoretical_vol_pan(&prop->pos, prop->rooms, soundnum, &vol, &pan); if (vol) { - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); if (*handle) { - sndAdjust(handle, 0, vol, pan, soundnum, 1, 1, -1, 1); + snd_adjust(handle, 0, vol, pan, soundnum, 1, 1, -1, 1); } } } @@ -11241,13 +11241,13 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) } if (soundnum != -1) { - psGetTheoreticalVolPan(&prop->pos, prop->rooms, soundnum, &vol, &pan); + ps_get_theoretical_vol_pan(&prop->pos, prop->rooms, soundnum, &vol, &pan); if (vol) { - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); if (*handle) { - sndAdjust(handle, 0, vol, pan, soundnum, 1, 1, -1, 1); + snd_adjust(handle, 0, vol, pan, soundnum, 1, 1, -1, 1); } } } @@ -11261,7 +11261,7 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) if (texturenum >= 0 && texturenum < NUM_TEXTURES && g_SurfaceTypes[g_Textures[texturenum].soundsurfacetype]) { s16 soundnum = -1; - handle = bgunAllocateAudioHandle(); + handle = bgun_allocate_audio_handle(); if (handle) { if (g_SurfaceTypes[g_Textures[texturenum].soundsurfacetype]->numsounds > 0) { @@ -11269,12 +11269,12 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) soundnum = g_SurfaceTypes[g_Textures[texturenum].soundsurfacetype]->sounds[index]; if (soundnum != -1) { - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); } } if (*handle && soundnum != -1) { - psApplyVolPan(*handle, &prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, &prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0); } } } @@ -11299,11 +11299,11 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) || gset->weaponnum == WEAPON_TRACERBUG || gset->weaponnum == WEAPON_TARGETAMPLIFIER || gset->weaponnum == WEAPON_ECMMINE) { - psCreate(NULL, prop, SFX_80AA, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); + ps_create(NULL, prop, SFX_80AA, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); return; } - handle = bgunAllocateAudioHandle(); + handle = bgun_allocate_audio_handle(); if (handle) { if (prop->type == PROPTYPE_CHR || prop->type == PROPTYPE_PLAYER) { @@ -11311,13 +11311,13 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) s16 soundnum; bool overridden = false; - if (chrGetShield(chr) > 0) { - sndStart(var80095200, SFX_SHIELD_DAMAGE, handle, -1, -1, -1, -1, -1); + if (chr_get_shield(chr) > 0) { + snd_start(var80095200, SFX_SHIELD_DAMAGE, handle, -1, -1, -1, -1, -1); soundnum = SFX_SHIELD_DAMAGE; } else if (gset->weaponnum == WEAPON_COMBATKNIFE || gset->weaponnum == WEAPON_COMBATKNIFE // duplicate || gset->weaponnum == WEAPON_BOLT) { - sndStart(var80095200, SFX_05F6, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_05F6, handle, -1, -1, -1, -1, -1); soundnum = SFX_05F6; overridden = true; } else if (gset->weaponnum == WEAPON_UNARMED @@ -11329,15 +11329,15 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) || gset->weaponnum == WEAPON_DY357LX))) { s16 sounds[] = { SFX_002F, SFX_0030, SFX_0031 }; soundnum = sounds[rand1 % ARRAYCOUNT(sounds)]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); } else { s16 sounds[] = { SFX_HIT_CHR, SFX_HIT_CHR }; soundnum = sounds[rand1 % ARRAYCOUNT(sounds)]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); } if (*handle) { - psApplyVolPan(*handle, &prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, &prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0); } if (overridden) { @@ -11349,7 +11349,7 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) u32 stack; if (texturenum == 10000) { - sndStart(var80095200, SFX_SHIELD_DAMAGE, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_SHIELD_DAMAGE, handle, -1, -1, -1, -1, -1); soundnum = SFX_SHIELD_DAMAGE; } else if (gset->weaponnum == WEAPON_LASER) { if (gset->weaponfunc == FUNC_PRIMARY || (gset->unk063a % 8) == 0) { @@ -11359,13 +11359,13 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) soundnum = SFX_CLOAK_OFF; } - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = true; } } else { if (gset->weaponnum == WEAPON_COMBATKNIFE || gset->weaponnum == WEAPON_BOLT) { soundnum = SFX_HIT_METAL_8079; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = true; } else { s16 sounds[] = { @@ -11377,12 +11377,12 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) }; soundnum = sounds[rand1 % ARRAYCOUNT(sounds)]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); } } if (*handle) { - psApplyVolPan(*handle, &prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, &prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0); } if (overridden) { @@ -11394,40 +11394,40 @@ void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum) if (texturenum >= 0 && texturenum < NUM_TEXTURES && g_SurfaceTypes[g_Textures[texturenum].soundsurfacetype]) { s16 soundnum = -1; - handle = bgunAllocateAudioHandle(); + handle = bgun_allocate_audio_handle(); if (handle) { if (g_SurfaceTypes[g_Textures[texturenum].soundsurfacetype]->numsounds > 0) { s32 index = rand2 % g_SurfaceTypes[g_Textures[texturenum].soundsurfacetype]->numsounds; soundnum = g_SurfaceTypes[g_Textures[texturenum].soundsurfacetype]->sounds[index]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); } if (*handle) { - psApplyVolPan(*handle, &prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, &prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0); } } } #endif } -void bgunPlayGlassHitSound(struct coord *pos, RoomNum *rooms, s32 texturenum) +void bgun_play_glass_hit_sound(struct coord *pos, RoomNum *rooms, s32 texturenum) { if (g_Vars.lvupdate240 > 0) { - struct sndstate **handle = bgunAllocateAudioHandle(); + struct sndstate **handle = bgun_allocate_audio_handle(); if (handle) { - sndStart(var80095200, SFX_HIT_GLASS, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_HIT_GLASS, handle, -1, -1, -1, -1, -1); if (*handle) { - psApplyVolPan(*handle, pos, 400, 2500, 3000, rooms, SFX_HIT_GLASS, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, pos, 400, 2500, 3000, rooms, SFX_HIT_GLASS, AL_VOL_FULL, 0); } } } } -void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, RoomNum *rooms) +void bgun_play_bg_hit_sound(struct gset *gset, struct coord *hitpos, s32 texturenum, RoomNum *rooms) { #if VERSION >= VERSION_NTSC_1_0 struct sndstate **handle; @@ -11446,7 +11446,7 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, } playdefault = true; - handle = bgunAllocateAudioHandle(); + handle = bgun_allocate_audio_handle(); if (handle) { soundnum = -1; @@ -11459,13 +11459,13 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, // Laser sounds s16 sounds[] = {SFX_CLOAK_ON, SFX_CLOAK_OFF}; soundnum = sounds[rand1 % ARRAYCOUNT(sounds)]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = true; } } else if (gset->weaponnum == WEAPON_COMBATKNIFE || gset->weaponnum == WEAPON_BOLT) { // Knives and bolts make a metal sound soundnum = SFX_HIT_METAL_8079; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = true; } else if (gset->weaponnum == WEAPON_REMOTEMINE || gset->weaponnum == WEAPON_PROXIMITYMINE @@ -11476,7 +11476,7 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, || gset->weaponnum == WEAPON_ECMMINE) { // Mine landing/activation sound soundnum = SFX_80AA; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = true; } else { // Ricochet sounds @@ -11493,12 +11493,12 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, }; soundnum = sounds[rand1 % ARRAYCOUNT(sounds)]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = false; } if (*handle != NULL) { - psApplyVolPan(*handle, hitpos, 400, 2500, 3000, rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, hitpos, 400, 2500, 3000, rooms, soundnum, AL_VOL_FULL, 0); } if (overridden) { @@ -11507,7 +11507,7 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, } if (playdefault) { - handle = bgunAllocateAudioHandle(); + handle = bgun_allocate_audio_handle(); if (handle != NULL && texturenum >= 0 && texturenum < NUM_TEXTURES) { s16 soundnum; @@ -11519,11 +11519,11 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, if (type != NULL) { s32 index = rand2 % type->numsounds; soundnum = type->sounds[index]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); } if (*handle != NULL) { - psApplyVolPan(*handle, hitpos, 400, 2500, 3000, rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, hitpos, 400, 2500, 3000, rooms, soundnum, AL_VOL_FULL, 0); } } } @@ -11543,7 +11543,7 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, return; } - handle = bgunAllocateAudioHandle(); + handle = bgun_allocate_audio_handle(); if (handle) { overridden = false; @@ -11553,13 +11553,13 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, // Laser sounds s16 sounds[] = {SFX_CLOAK_ON, SFX_CLOAK_OFF}; soundnum = sounds[rand1 % ARRAYCOUNT(sounds)]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = true; } } else if (gset->weaponnum == WEAPON_COMBATKNIFE || gset->weaponnum == WEAPON_BOLT) { // Knives and bolts make a metal sound soundnum = SFX_HIT_METAL_8079; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = true; } else if (gset->weaponnum == WEAPON_REMOTEMINE || gset->weaponnum == WEAPON_PROXIMITYMINE @@ -11569,7 +11569,7 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, || gset->weaponnum == WEAPON_TARGETAMPLIFIER || gset->weaponnum == WEAPON_ECMMINE) { // Mine landing/activation sound - sndStart(var80095200, SFX_80AA, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_80AA, handle, -1, -1, -1, -1, -1); overridden = true; } else { // Ricochet sounds @@ -11586,12 +11586,12 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, }; soundnum = sounds[rand1 % ARRAYCOUNT(sounds)]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); overridden = false; } if (*handle != NULL) { - psApplyVolPan(*handle, hitpos, 400, 2500, 3000, rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, hitpos, 400, 2500, 3000, rooms, soundnum, AL_VOL_FULL, 0); } if (overridden) { @@ -11600,7 +11600,7 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, } // Play default surface hit sound - handle = bgunAllocateAudioHandle(); + handle = bgun_allocate_audio_handle(); if (handle != NULL && texturenum >= 0 && texturenum < NUM_TEXTURES) { s16 soundnum; @@ -11612,18 +11612,18 @@ void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, if (type != NULL) { s32 index = rand2 % type->numsounds; soundnum = type->sounds[index]; - sndStart(var80095200, soundnum, handle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, handle, -1, -1, -1, -1, -1); } if (*handle != NULL) { - psApplyVolPan(*handle, hitpos, 400, 2500, 3000, rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(*handle, hitpos, 400, 2500, 3000, rooms, soundnum, AL_VOL_FULL, 0); } } } #endif } -void bgunSetTriggerOn(s32 handnum, bool on) +void bgun_set_trigger_on(s32 handnum, bool on) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -11649,9 +11649,9 @@ void bgunSetTriggerOn(s32 handnum, bool on) * - USETIMER_STOP if the B button timer should stop (ie. the B press is consumed) * - USETIMER_REPEAT if this function should be called again on each frame until B is released. */ -s32 bgunConsiderToggleGunFunction(s32 usedowntime, bool trigpressed, bool fromactivemenu) +s32 bgun_consider_toggle_gun_function(s32 usedowntime, bool trigpressed, bool fromactivemenu) { - switch (bgunGetWeaponNum(HAND_RIGHT)) { + switch (bgun_get_weapon_num(HAND_RIGHT)) { case WEAPON_SNIPERRIFLE: // At 25 ticks (or B+Z), start showing the new function g_Vars.currentplayer->gunctrl.invertgunfunc = true; @@ -11680,7 +11680,7 @@ s32 bgunConsiderToggleGunFunction(s32 usedowntime, bool trigpressed, bool fromac // These weapons use temporary alt functions g_Vars.currentplayer->gunctrl.invertgunfunc = true; - if (fromactivemenu && bgunIsUsingSecondaryFunction() == true) { + if (fromactivemenu && bgun_is_using_secondary_function() == true) { g_Vars.currentplayer->hands[HAND_RIGHT].activatesecondary = true; } @@ -11729,7 +11729,7 @@ void bgun0f0a8c50(void) } } -bool bgunIsUsingSecondaryFunction(void) +bool bgun_is_using_secondary_function(void) { struct player *player = g_Vars.currentplayer; s32 weaponnum = player->gunctrl.weaponnum; @@ -11759,7 +11759,7 @@ bool bgunIsUsingSecondaryFunction(void) * * This function is not called during cutscenes. */ -void bgunTickGameplay(bool triggeron) +void bgun_tick_gameplay(bool triggeron) { s32 gunsfiring[2] = {false, false}; struct player *player = g_Vars.currentplayer; @@ -11770,14 +11770,14 @@ void bgunTickGameplay(bool triggeron) struct chrdata *chr = g_Vars.currentplayer->prop->chr; triggeron = false; - if (invGetCount() > 1) { - invClear(); - invGiveSingleWeapon(WEAPON_UNARMED); + if (inv_get_count() > 1) { + inv_clear(); + inv_give_single_weapon(WEAPON_UNARMED); } if (g_Vars.currentplayer->gunctrl.weaponnum != WEAPON_UNARMED && g_Vars.currentplayer->gunctrl.switchtoweaponnum != WEAPON_UNARMED) { - bgunEquipWeapon(WEAPON_UNARMED); + bgun_equip_weapon(WEAPON_UNARMED); } g_Vars.currentplayer->gunctrl.dualwielding = false; @@ -11790,9 +11790,9 @@ void bgunTickGameplay(bool triggeron) } // Remove throwable items from inventory if there's no more left - for (i = 0; i < invGetCount(); i++) { + for (i = 0; i < inv_get_count(); i++) { struct weapon *weapon; - s32 weaponnum = invGetWeaponNumByIndex(i); + s32 weaponnum = inv_get_weapon_num_by_index(i); s32 equippedweaponnum; switch (weaponnum) { @@ -11805,16 +11805,16 @@ void bgunTickGameplay(bool triggeron) case WEAPON_COMMSRIDER: case WEAPON_TRACERBUG: case WEAPON_TARGETAMPLIFIER: - weapon = weaponFindById(weaponnum); + weapon = weapon_find_by_id(weaponnum); if (weapon && weapon->ammos[0] - && bgunGetAmmoCount(weapon->ammos[0]->type) == 0) { - equippedweaponnum = bgunGetWeaponNum(HAND_RIGHT); - invRemoveItemByNum(weaponnum); + && bgun_get_ammo_count(weapon->ammos[0]->type) == 0) { + equippedweaponnum = bgun_get_weapon_num(HAND_RIGHT); + inv_remove_item_by_num(weaponnum); - if (weaponnum == equippedweaponnum && !invHasSingleWeaponIncAllGuns(weaponnum)) { - invCalculateCurrentIndex(); - bgunEquipWeapon(invGetWeaponNumByIndex(g_Vars.currentplayer->equipcuritem)); + if (weaponnum == equippedweaponnum && !inv_has_single_weapon_inc_all_guns(weaponnum)) { + inv_calculate_current_index(); + bgun_equip_weapon(inv_get_weapon_num_by_index(g_Vars.currentplayer->equipcuritem)); } } } @@ -11875,51 +11875,51 @@ void bgunTickGameplay(bool triggeron) player->playertrigtime240 = 0; } - bgunSetTriggerOn(HAND_RIGHT, gunsfiring[0]); - bgunSetTriggerOn(HAND_LEFT, gunsfiring[1]); + bgun_set_trigger_on(HAND_RIGHT, gunsfiring[0]); + bgun_set_trigger_on(HAND_LEFT, gunsfiring[1]); if (g_Vars.tickmode == TICKMODE_NORMAL && g_Vars.lvupdate240 > 0) { - bgunTickHand(HAND_RIGHT); - bgunTickHand(HAND_LEFT); - bgunTickSwitch(); + bgun_tick_hand(HAND_RIGHT); + bgun_tick_hand(HAND_LEFT); + bgun_tick_switch(); - if (cheatIsActive(CHEAT_UNLIMITEDAMMONORELOADS)) { + if (cheat_is_active(CHEAT_UNLIMITEDAMMONORELOADS)) { s32 i; struct weapon *weapon; struct hand *lhand = &g_Vars.currentplayer->hands[HAND_LEFT]; struct hand *rhand = &g_Vars.currentplayer->hands[HAND_RIGHT]; - weapon = weaponFindById(rhand->gset.weaponnum); + weapon = weapon_find_by_id(rhand->gset.weaponnum); for (i = 0; i != 2; i++) { if (weapon && weapon->ammos[i] && - bgunAmmotypeAllowsUnlimitedAmmo(weapon->ammos[i]->type)) { + bgun_ammotype_allows_unlimited_ammo(weapon->ammos[i]->type)) { rhand->loadedammo[i] = rhand->clipsizes[i]; lhand->loadedammo[i] = lhand->clipsizes[i]; } } - bgunGiveMaxAmmo(false); - } else if (cheatIsActive(CHEAT_UNLIMITEDAMMO)) { - bgunGiveMaxAmmo(false); + bgun_give_max_ammo(false); + } else if (cheat_is_active(CHEAT_UNLIMITEDAMMO)) { + bgun_give_max_ammo(false); } } - bgunDecreaseNoiseRadius(); + bgun_decrease_noise_radius(); if (player->resetshadecol) { - propCalculateShadeColour(g_Vars.currentplayer->prop, player->gunshadecol, player->floorcol); + prop_calculate_shade_colour(g_Vars.currentplayer->prop, player->gunshadecol, player->floorcol); player->resetshadecol = 0; } else { u8 shadecol[4]; - propCalculateShadeColour(g_Vars.currentplayer->prop, shadecol, player->floorcol); - colourTween(player->gunshadecol, shadecol); + prop_calculate_shade_colour(g_Vars.currentplayer->prop, shadecol, player->floorcol); + colour_tween(player->gunshadecol, shadecol); } - invIncrementHeldTime(bgunGetWeaponNum(HAND_RIGHT), bgunGetWeaponNum(HAND_LEFT)); + inv_increment_held_time(bgun_get_weapon_num(HAND_RIGHT), bgun_get_weapon_num(HAND_LEFT)); } -void bgunSetPassiveMode(bool enable) +void bgun_set_passive_mode(bool enable) { s32 i; @@ -11928,25 +11928,25 @@ void bgunSetPassiveMode(bool enable) } } -void bgunSetAimType(u32 aimtype) +void bgun_set_aim_type(u32 aimtype) { g_Vars.currentplayer->aimtype = aimtype; } -void bgunSetAimPos(struct coord *coord) +void bgun_set_aim_pos(struct coord *coord) { struct player *player = g_Vars.currentplayer; - player->hands[HAND_RIGHT].aimpos.x = handGetXShift(HAND_RIGHT) + coord->x; + player->hands[HAND_RIGHT].aimpos.x = hand_get_x_shift(HAND_RIGHT) + coord->x; player->hands[HAND_RIGHT].aimpos.y = coord->y; player->hands[HAND_RIGHT].aimpos.z = coord->z; - player->hands[HAND_LEFT].aimpos.x = handGetXShift(HAND_LEFT) + coord->x; + player->hands[HAND_LEFT].aimpos.x = hand_get_x_shift(HAND_LEFT) + coord->x; player->hands[HAND_LEFT].aimpos.y = coord->y; player->hands[HAND_LEFT].aimpos.z = coord->z; } -void bgunSetHitPos(struct coord *coord) +void bgun_set_hit_pos(struct coord *coord) { struct player *player = g_Vars.currentplayer; @@ -11989,12 +11989,12 @@ void bgun0f0a94d0(u32 operation, struct coord *pos, struct coord *rot) break; case 1: case 2: - lasersightSetDot(operation - 1, pos, rot); + lasersight_set_dot(operation - 1, pos, rot); break; } } -void bgunSetGunAmmoVisible(u32 reason, bool enable) +void bgun_set_gun_ammo_visible(u32 reason, bool enable) { if (enable) { g_Vars.currentplayer->gunammooff &= ~reason; @@ -12039,23 +12039,23 @@ struct ammotype g_AmmoTypes[] = { { 10, 0, 0 }, // AMMOTYPE_ECM_MINE }; -void bgunSetAmmoQuantity(s32 ammotype, s32 quantity) +void bgun_set_ammo_quantity(s32 ammotype, s32 quantity) { struct player *player = g_Vars.currentplayer; - s32 weaponnum = bgunGetWeaponNum(HAND_RIGHT); + s32 weaponnum = bgun_get_weapon_num(HAND_RIGHT); s32 funcnum = -1; s32 magamount; // Check if this ammo type applies to the player's equipped weapon - if (bgunGetAmmoTypeForWeapon(weaponnum, FUNC_PRIMARY) == ammotype) { + if (bgun_get_ammo_type_for_weapon(weaponnum, FUNC_PRIMARY) == ammotype) { funcnum = FUNC_PRIMARY; } - if (bgunGetAmmoTypeForWeapon(weaponnum, FUNC_SECONDARY) == ammotype) { + if (bgun_get_ammo_type_for_weapon(weaponnum, FUNC_SECONDARY) == ammotype) { funcnum = FUNC_SECONDARY; } - if (funcnum != -1 && weaponHasAmmoFlag(weaponnum, funcnum, AMMOFLAG_NORESERVE)) { + if (funcnum != -1 && weapon_has_ammo_flag(weaponnum, funcnum, AMMOFLAG_NORESERVE)) { // For cloak and combat boost, ammo cannot be held outside of the weapon. // So just add it to the loaded clip. player->hands[0].loadedammo[funcnum] += quantity; @@ -12071,7 +12071,7 @@ void bgunSetAmmoQuantity(s32 ammotype, s32 quantity) magamount = 0; // For throwable items, the capacity applies to reserve + loaded - if (funcnum != -1 && weaponHasAmmoFlag(weaponnum, funcnum, AMMOFLAG_EQUIPPEDISRESERVE)) { + if (funcnum != -1 && weapon_has_ammo_flag(weaponnum, funcnum, AMMOFLAG_EQUIPPEDISRESERVE)) { magamount = player->hands[0].loadedammo[funcnum] + player->hands[1].loadedammo[funcnum]; } @@ -12082,7 +12082,7 @@ void bgunSetAmmoQuantity(s32 ammotype, s32 quantity) } } -s32 bgunGetReservedAmmoCount(s32 ammotype) +s32 bgun_get_reserved_ammo_count(s32 ammotype) { s32 i; s32 j; @@ -12092,7 +12092,7 @@ s32 bgunGetReservedAmmoCount(s32 ammotype) for (i = 0; i < 2; i++) { if (player->hands[i].inuse) { for (j = 0; j < 2; j++) { - if (player->gunctrl.ammotypes[j] == ammotype && weaponHasAmmoFlag(player->hands[i].gset.weaponnum, j, AMMOFLAG_NORESERVE)) { + if (player->gunctrl.ammotypes[j] == ammotype && weapon_has_ammo_flag(player->hands[i].gset.weaponnum, j, AMMOFLAG_NORESERVE)) { total = total + player->hands[i].loadedammo[j]; } } @@ -12102,7 +12102,7 @@ s32 bgunGetReservedAmmoCount(s32 ammotype) return total; } -s32 bgunGetAmmoCount(s32 ammotype) +s32 bgun_get_ammo_count(s32 ammotype) { s32 i; s32 j; @@ -12122,12 +12122,12 @@ s32 bgunGetAmmoCount(s32 ammotype) return total; } -s32 bgunGetCapacityByAmmotype(s32 ammotype) +s32 bgun_get_capacity_by_ammotype(s32 ammotype) { return g_AmmoTypes[ammotype].capacity; } -bool bgunAmmotypeAllowsUnlimitedAmmo(u32 ammotype) +bool bgun_ammotype_allows_unlimited_ammo(u32 ammotype) { switch (ammotype) { case AMMOTYPE_REMOTE_MINE: @@ -12157,7 +12157,7 @@ bool bgunAmmotypeAllowsUnlimitedAmmo(u32 ammotype) return true; } -void bgunGiveMaxAmmo(bool force) +void bgun_give_max_ammo(bool force) { s32 i; @@ -12165,18 +12165,18 @@ void bgunGiveMaxAmmo(bool force) bool give = true; if (!force) { - give = bgunAmmotypeAllowsUnlimitedAmmo(i); + give = bgun_ammotype_allows_unlimited_ammo(i); } if (give) { - bgunSetAmmoQuantity(i, g_AmmoTypes[i].capacity); + bgun_set_ammo_quantity(i, g_AmmoTypes[i].capacity); } } } -u32 bgunGetAmmoTypeForWeapon(u32 weaponnum, u32 func) +u32 bgun_get_ammo_type_for_weapon(u32 weaponnum, u32 func) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); if (!weapon) { return 0; @@ -12189,37 +12189,37 @@ u32 bgunGetAmmoTypeForWeapon(u32 weaponnum, u32 func) return weapon->ammos[func]->type; } -s32 bgunGetAmmoQtyForWeapon(u32 weaponnum, u32 func) +s32 bgun_get_ammo_qty_for_weapon(u32 weaponnum, u32 func) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); if (weapon) { struct inventory_ammo *ammo = weapon->ammos[func]; if (ammo) { - return bgunGetReservedAmmoCount(ammo->type); + return bgun_get_reserved_ammo_count(ammo->type); } } return 0; } -void bgunSetAmmoQtyForWeapon(u32 weaponnum, u32 func, u32 quantity) +void bgun_set_ammo_qty_for_weapon(u32 weaponnum, u32 func, u32 quantity) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); if (weapon) { struct inventory_ammo *ammo = weapon->ammos[func]; if (ammo) { - bgunSetAmmoQuantity(ammo->type, quantity); + bgun_set_ammo_quantity(ammo->type, quantity); } } } -s32 bgunGetAmmoCapacityForWeapon(s32 weaponnum, s32 func) +s32 bgun_get_ammo_capacity_for_weapon(s32 weaponnum, s32 func) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); struct inventory_ammo *ammo = weapon->ammos[func]; if (ammo) { @@ -12229,7 +12229,7 @@ s32 bgunGetAmmoCapacityForWeapon(s32 weaponnum, s32 func) return 0; } -Gfx *bgunDrawHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 valign, u32 colour) +Gfx *bgun_draw_hud_string(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 valign, u32 colour) { s32 x1 = 0; s32 y1 = 0; @@ -12242,9 +12242,9 @@ Gfx *bgunDrawHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 vali textheight = 0; #if VERSION >= VERSION_JPN_FINAL - textMeasure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, -1); + text_measure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, -1); #else - textMeasure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0); + text_measure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0); #endif if (halign == HUDHALIGN_LEFT) { // left @@ -12270,22 +12270,22 @@ Gfx *bgunDrawHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 vali } gdl = text0f153858(gdl, &x1, &y1, &x2, &y2); - gdl = textRender(gdl, &x1, &y1, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x1, &y1, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, vi_get_width(), vi_get_height(), 0, 0); return gdl; } -Gfx *bgunDrawHudInteger(Gfx *gdl, s32 value, 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) { char buffer[12]; sprintf(buffer, "%d\n", value); - gdl = bgunDrawHudString(gdl, buffer, x, halign, y, valign, colour); + gdl = bgun_draw_hud_string(gdl, buffer, x, halign, y, valign, colour); return gdl; } -void bgunResetAbmag(struct abmag *abmag) +void bgun_reset_abmag(struct abmag *abmag) { abmag->loadedammo = 0; abmag->change = 0; @@ -12380,7 +12380,7 @@ void bgun0f0a9da8(struct abmag *mag, s32 remaining, s32 capacity, s32 height) * For the separated mode, a unit refers to a single bullet/block. * For the merged mode, a unit refers to a single 1px high line in the gauge. */ -Gfx *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *abmag, s32 remaining, s32 capacity, u32 emptycolour, u32 filledcolour, bool flip) +Gfx *bgun_draw_hud_gauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *abmag, s32 remaining, s32 capacity, u32 emptycolour, u32 filledcolour, bool flip) { s32 gaugeheight = y2 - y1; s32 unitheight; @@ -12446,7 +12446,7 @@ Gfx *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *ab if (partitiony > gaugetop) { // Render empty partition - gdl = textSetPrimColour(gdl, emptycolour); + gdl = text_set_prim_colour(gdl, emptycolour); if (flip) { gDPFillRectangleScaled(gdl++, x1, y2 - partitiony + y1, x2, gaugeheight + y1); @@ -12458,7 +12458,7 @@ Gfx *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *ab } // Render filled partition - gdl = textSetPrimColour(gdl, filledcolour); + gdl = text_set_prim_colour(gdl, filledcolour); if (flip) { gDPFillRectangleScaled(gdl++, x1, y2 - tmp + y1, x2, y2 - partitiony + y1); @@ -12470,7 +12470,7 @@ Gfx *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *ab s32 unittop; s32 unitbottom; - gdl = textSetPrimColour(gdl, emptycolour); + gdl = text_set_prim_colour(gdl, emptycolour); unittop = gaugetop; unitbottom = -1; @@ -12501,7 +12501,7 @@ Gfx *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *ab weight = 255; } - colour = colourBlend(filledcolour, 0xffffffbf, weight); + colour = colour_blend(filledcolour, 0xffffffbf, weight); } else { // Unit is bright and has not started transitioning to filled yet weight = fadeamount * 4; @@ -12513,7 +12513,7 @@ Gfx *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *ab } #endif - colour = colourBlend(0xffffffbf, emptycolour, weight); + colour = colour_blend(0xffffffbf, emptycolour, weight); } newstate = true; @@ -12531,7 +12531,7 @@ Gfx *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *ab colour = emptycolour; } else { // Unit was recently emptied - colour = colourBlend(emptycolour, filledcolour | 0xff, weight); + colour = colour_blend(emptycolour, filledcolour | 0xff, weight); } newstate = true; @@ -12617,10 +12617,10 @@ Gfx *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *ab return gdl; } -Gfx *bgunDrawHud(Gfx *gdl) +Gfx *bgun_draw_hud(Gfx *gdl) { struct player *player = g_Vars.currentplayer; - s32 bottom = viGetViewTop() + viGetViewHeight() - 13; + s32 bottom = vi_get_view_top() + vi_get_view_height() - 13; s32 playercount = PLAYERCOUNT(); s32 playernum = g_Vars.currentplayernum; struct gunctrl *ctrl; @@ -12631,7 +12631,7 @@ Gfx *bgunDrawHud(Gfx *gdl) s32 reserveheight = 36; s32 clipheight = 57; s32 xpos; - struct weapon *weapon = weaponFindById(player->gunctrl.weaponnum); + struct weapon *weapon = weapon_find_by_id(player->gunctrl.weaponnum); u32 alpha; u32 fncolour; s32 funcnum; @@ -12679,7 +12679,7 @@ Gfx *bgunDrawHud(Gfx *gdl) clipheight = 47; if (playercount == 2) { - if (IS4MB() || (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && playernum == 0)) { + if (IS4MB() || (options_get_screen_split() != SCREENSPLIT_VERTICAL && playernum == 0)) { bottom += 10; } else { bottom += 2; @@ -12691,7 +12691,7 @@ Gfx *bgunDrawHud(Gfx *gdl) bottom += 2; } } - } else if (optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { + } else if (options_get_effective_screen_size() != SCREENSIZE_FULL) { bottom += 8; } @@ -12700,17 +12700,17 @@ Gfx *bgunDrawHud(Gfx *gdl) fnfaderinc = PALUP(g_Vars.lvupdate240 * 2); #if VERSION >= VERSION_NTSC_1_0 - bgunGetWeaponInfo(&info, HAND_RIGHT); - tmpfuncnum = bgunIsUsingSecondaryFunction(); + bgun_get_weapon_info(&info, HAND_RIGHT); + tmpfuncnum = bgun_is_using_secondary_function(); if (bgun0f098ca0(tmpfuncnum, &info, hand) >= 0) { funcnum = tmpfuncnum; } #endif - xpos = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX - barwidth - 24; + xpos = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX - barwidth - 24; - if (playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB()) && playernum == 0) { + if (playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB()) && playernum == 0) { xpos += 15; } else if (playercount >= 3 && (playernum % 2) == 0) { xpos += 15; @@ -12741,21 +12741,21 @@ Gfx *bgunDrawHud(Gfx *gdl) fncolour = ((ctrl->fnfader * 2) - 256) << 16 | 0xff000040; } - gdl = textSetPrimColour(gdl, fncolour); + gdl = text_set_prim_colour(gdl, fncolour); gDPFillRectangleScaled(gdl++, xpos - 13, bottom - 11, xpos - 2, bottom); gdl = text0f153838(gdl); // Draw weapon name and function name - if (optionsGetShowGunFunction(g_Vars.currentplayerstats->mpindex)) { + if (options_get_show_gun_function(g_Vars.currentplayerstats->mpindex)) { #if VERSION >= VERSION_NTSC_1_0 - func = weaponGetFunctionById(hand->gset.weaponnum, funcnum); + func = weapon_get_function_by_id(hand->gset.weaponnum, funcnum); #else - func = weaponGetFunctionById(hand->gset.weaponnum, hand->gset.weaponfunc); + func = weapon_get_function_by_id(hand->gset.weaponnum, hand->gset.weaponfunc); #endif - nameid = invGetNameIdByIndex(invGetCurrentIndex()); - str = langGet(nameid); + nameid = inv_get_name_id_by_index(inv_get_current_index()); + str = lang_get(nameid); if (ctrl->curgunstr != nameid) { ctrl->guntypetimer = 0; @@ -12773,7 +12773,7 @@ Gfx *bgunDrawHud(Gfx *gdl) ctrl->guntypetimer += (u16) g_Vars.lvupdate60; } - textMeasure(&textheight, &textwidth, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); textwidth += 2; if (textwidth > ctrl->guntypetimer * 3) { @@ -12798,19 +12798,19 @@ Gfx *bgunDrawHud(Gfx *gdl) if (0xffffff00); } - gdl = textSetPrimColour(gdl, 0); + gdl = text_set_prim_colour(gdl, 0); gDPFillRectangleScaled(gdl++, x - 1, y - 1, xpos - 11, bottom); gdl = text0f153838(gdl); - textSetWaveBlend(g_20SecIntervalFrac * 50.0f, 0, 50); - textSetWaveColours(0xffffffff, 0xffffffff); - gdl = textRenderProjected(gdl, &x, &y, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, textwidth, 1000, 0, 0); - textResetBlends(); + text_set_wave_blend(g_20SecIntervalFrac * 50.0f, 0, 50); + text_set_wave_colours(0xffffffff, 0xffffffff); + gdl = text_render_projected(gdl, &x, &y, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, textwidth, 1000, 0, 0); + text_reset_blends(); } if (func) { - langGet(func->name); + lang_get(func->name); colour = 0xff5555ff; @@ -12819,7 +12819,7 @@ Gfx *bgunDrawHud(Gfx *gdl) ctrl->curfnstr = func->name; } - str = langGet(ctrl->curfnstr); + str = lang_get(ctrl->curfnstr); if (ctrl->fnstrtimer < 255) { if (ctrl->fnstrtimer + g_Vars.lvupdate60 > 255) { @@ -12846,7 +12846,7 @@ Gfx *bgunDrawHud(Gfx *gdl) } #endif - textMeasure(&textheight, &textwidth, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); textwidth += 2; if (textwidth > ctrl->fnstrtimer * 3) { @@ -12865,20 +12865,20 @@ Gfx *bgunDrawHud(Gfx *gdl) colour = (colour & 0xffffff00) | alpha; } - gdl = textSetPrimColour(gdl, 0); + gdl = text_set_prim_colour(gdl, 0); gDPFillRectangleScaled(gdl++, x - 1, y - 1, xpos - 11, bottom + 3); gdl = text0f153838(gdl); - textSetWaveBlend(g_20SecIntervalFrac * 50.0f, 0, 50); - textSetWaveColours(0xffffffff, 0xffffffff); + text_set_wave_blend(g_20SecIntervalFrac * 50.0f, 0, 50); + text_set_wave_colours(0xffffffff, 0xffffffff); - gdl = textRenderProjected(gdl, &x, &y, str, + gdl = text_render_projected(gdl, &x, &y, str, g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, textwidth, 1000, 0, 0); - textResetBlends(); + text_reset_blends(); } } } @@ -12900,9 +12900,9 @@ Gfx *bgunDrawHud(Gfx *gdl) } if (ammoindex != ctrl->lastmag) { - bgunResetAbmag(&player->hands[HAND_LEFT].abmag); - bgunResetAbmag(&hand->abmag); - bgunResetAbmag(&ctrl->abmag); + bgun_reset_abmag(&player->hands[HAND_LEFT].abmag); + bgun_reset_abmag(&hand->abmag); + bgun_reset_abmag(&ctrl->abmag); ctrl->lastmag = ammoindex; } @@ -12910,20 +12910,20 @@ Gfx *bgunDrawHud(Gfx *gdl) if (lefthand->inuse && weapon->ammos[ammoindex] != NULL && lefthand->gset.weaponnum != WEAPON_REMOTEMINE) { - xpos = viGetViewLeft() / g_ScaleX + 24; + xpos = vi_get_view_left() / g_ScaleX + 24; - if (playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB()) && playernum == 1) { + if (playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB()) && playernum == 1) { xpos -= 14; } else if (playercount >= 3 && (playernum & 1) == 1) { xpos -= 14; } if (lefthand->clipsizes[ammoindex] > 0 && (weapon->ammos[ammoindex]->flags & AMMOFLAG_EQUIPPEDISRESERVE) == 0) { - gdl = bgunDrawHudGauge(gdl, + gdl = bgun_draw_hud_gauge(gdl, xpos, bottom - reserveheight - clipheight - 3, xpos + barwidth, bottom - reserveheight - 3, &lefthand->abmag, lefthand->loadedammo[ammoindex], lefthand->clipsizes[ammoindex], 0x00300080, 0x00ff0040, false); - gdl = bgunDrawHudInteger(gdl, lefthand->loadedammo[ammoindex], xpos + barwidth + 2, true, + gdl = bgun_draw_hud_integer(gdl, lefthand->loadedammo[ammoindex], xpos + barwidth + 2, true, bottom - reserveheight - 8, 0, 0x00ff00a0); } } @@ -12937,16 +12937,16 @@ Gfx *bgunDrawHud(Gfx *gdl) ammotype = player->gunctrl.ammotypes[ammoindex]; #if VERSION >= VERSION_NTSC_1_0 - xpos = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX - barwidth - 24; + xpos = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX - barwidth - 24; #else // NTSC Beta omits the brackets here. This would normally cause the // ammo info to be misaligned for players on the right side of the // screen and when using hi-res, but I'm not sure if hi-res can even be // active when using multiple players... - xpos = viGetViewLeft() + viGetViewWidth() / g_ScaleX - barwidth - 24; + xpos = vi_get_view_left() + vi_get_view_width() / g_ScaleX - barwidth - 24; #endif - if (playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB()) && playernum == 0) { + if (playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB()) && playernum == 0) { xpos += 15; } else if (playercount >= 3 && (playernum % 2) == 0) { xpos += 15; @@ -12958,10 +12958,10 @@ Gfx *bgunDrawHud(Gfx *gdl) if (hand->clipsizes[ammoindex] > 0 && weapon->ammos[ammoindex] != NULL && (weapon->ammos[ammoindex]->flags & AMMOFLAG_EQUIPPEDISRESERVE) == 0) { - gdl = bgunDrawHudGauge(gdl, xpos, bottom - reserveheight - clipheight - 3, xpos + barwidth, + gdl = bgun_draw_hud_gauge(gdl, xpos, bottom - reserveheight - clipheight - 3, xpos + barwidth, bottom - reserveheight - 3, &hand->abmag, hand->loadedammo[ammoindex], hand->clipsizes[ammoindex], 0x00300080, 0x00ff0040, false); - gdl = bgunDrawHudInteger(gdl, hand->loadedammo[ammoindex], xpos - 2, false, + gdl = bgun_draw_hud_integer(gdl, hand->loadedammo[ammoindex], xpos - 2, false, bottom - reserveheight - 8, 0, 0x00ff00a0); } @@ -12980,10 +12980,10 @@ Gfx *bgunDrawHud(Gfx *gdl) } } - gdl = bgunDrawHudGauge(gdl, xpos, bottom - reserveheight, xpos + barwidth, + gdl = bgun_draw_hud_gauge(gdl, xpos, bottom - reserveheight, xpos + barwidth, bottom, &ctrl->abmag, ammototal, g_AmmoTypes[ammotype].capacity, 0x00403080, 0x00ffc040, true); - gdl = bgunDrawHudInteger(gdl, ammototal, xpos - 2, false, bottom - reserveheight + 1, 0, 0x00ffc0a0); + gdl = bgun_draw_hud_integer(gdl, ammototal, xpos - 2, false, bottom - reserveheight + 1, 0, 0x00ffc0a0); } // Combat boost timer @@ -13001,7 +13001,7 @@ Gfx *bgunDrawHud(Gfx *gdl) sprintf(text, "%02d:%02d\n", secs60 / TICKS(60), (secs60 - (secs60 / TICKS(60)) * TICKS(60)) * 100 / TICKS(60)); } - gdl = bgunDrawHudString(gdl, text, xpos + barwidth - 2, false, bottom - reserveheight + 1, 0, 0x00ffc0a0); + gdl = bgun_draw_hud_string(gdl, text, xpos + barwidth - 2, false, bottom - reserveheight + 1, 0, 0x00ffc0a0); } } @@ -13012,7 +13012,7 @@ Gfx *bgunDrawHud(Gfx *gdl) return gdl; } -void bgunAddBoost(s32 amount) +void bgun_add_boost(s32 amount) { g_Vars.speedpilltime += amount; @@ -13021,15 +13021,15 @@ void bgunAddBoost(s32 amount) } if (!g_Vars.speedpillwant) { - u32 sound = lvGetSlowMotionType() ? SFX_ARGH_JO_02AD : SFX_JO_BOOST_ACTIVATE; + u32 sound = lv_get_slow_motion_type() ? SFX_ARGH_JO_02AD : SFX_JO_BOOST_ACTIVATE; - sndStart(var80095200, sound, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, sound, 0, -1, -1, -1, -1, -1); } g_Vars.speedpillwant = true; } -void bgunSubtractBoost(s32 amount) +void bgun_subtract_boost(s32 amount) { g_Vars.speedpilltime -= amount; @@ -13039,32 +13039,32 @@ void bgunSubtractBoost(s32 amount) } } -void bgunApplyBoost(void) +void bgun_apply_boost(void) { - if (lvGetSlowMotionType() != SLOWMOTION_OFF) { - bgunSubtractBoost(TICKS(1200)); + if (lv_get_slow_motion_type() != SLOWMOTION_OFF) { + bgun_subtract_boost(TICKS(1200)); } else { - bgunAddBoost(TICKS(600)); + bgun_add_boost(TICKS(600)); } } -void bgunRevertBoost(void) +void bgun_revert_boost(void) { - if (lvGetSlowMotionType() != SLOWMOTION_OFF) { - bgunAddBoost(TICKS(1200)); + if (lv_get_slow_motion_type() != SLOWMOTION_OFF) { + bgun_add_boost(TICKS(1200)); } else { - bgunSubtractBoost(TICKS(600)); + bgun_subtract_boost(TICKS(600)); } } /** - * The main tick function as called from lvTick. + * The main tick function as called from lv_tick. * * This function doesn't do much because it's called during both cutscenes and * gameplay, while most gun tick operations happen during gameplay only. - * See bgunTickGameplay for that. + * See bgun_tick_gameplay for that. */ -void bgunTickBoost(void) +void bgun_tick_boost(void) { if (g_Vars.speedpillon && g_Vars.speedpilltime > 0 && !g_Vars.in_cutscene) { g_Vars.speedpilltime -= g_Vars.lvupdate60; @@ -13085,7 +13085,7 @@ void bgunTickBoost(void) * If the visible argument is true, it removes the reason from the field, thus * making the sight visible if there are no other reasons. */ -void bgunSetSightVisible(u32 reason, bool visible) +void bgun_set_sight_visible(u32 reason, bool visible) { if (visible) { g_Vars.currentplayer->gunsightoff &= ~reason; @@ -13095,13 +13095,13 @@ void bgunSetSightVisible(u32 reason, bool visible) g_Vars.currentplayer->gunsightoff |= reason; } -Gfx *bgunDrawSight(Gfx *gdl) +Gfx *bgun_draw_sight(Gfx *gdl) { if (g_Vars.currentplayer->gunsightoff == 0 && !g_Vars.currentplayer->mpmenuon) { // Player is aiming with R - gdl = sightDraw(gdl, true, currentPlayerGetSight()); + gdl = sight_draw(gdl, true, current_player_get_sight()); } else { - gdl = sightDraw(gdl, false, currentPlayerGetSight()); + gdl = sight_draw(gdl, false, current_player_get_sight()); } return gdl; @@ -13112,7 +13112,7 @@ void bgun0f0abd30(s32 handnum) struct player *player = g_Vars.currentplayer; struct hand *hand = &player->hands[handnum]; struct gunctrl *gunctrl = &player->gunctrl; - struct weapon *weapon = weaponFindById(hand->gset.weaponnum); + struct weapon *weapon = weapon_find_by_id(hand->gset.weaponnum); s32 i; for (i = 0; i < 2; i++) { @@ -13141,10 +13141,10 @@ void bgun0f0abd30(s32 handnum) hand->finalmult[1] = 1; if (gunctrl->ammotypes[0] >= 0) { - bgunResetAbmag(&hand->abmag); + bgun_reset_abmag(&hand->abmag); if (handnum == HAND_RIGHT) { - bgunResetAbmag(&gunctrl->abmag); + bgun_reset_abmag(&gunctrl->abmag); } gunctrl->lastmag = false; diff --git a/src/game/bondgunreset.c b/src/game/bondgunreset.c index eb30682d8..8a48b2742 100644 --- a/src/game/bondgunreset.c +++ b/src/game/bondgunreset.c @@ -10,7 +10,7 @@ extern u32 g_BgunGunMemBaseSize4Mb2P; -void bgunReset(void) +void bgun_reset(void) { s32 i; @@ -144,10 +144,10 @@ void bgunReset(void) if (IS4MB() && PLAYERCOUNT() == 2) { i = ALIGN16(g_BgunGunMemBaseSize4Mb2P); } else { - i = ALIGN16(bgunCalculateGunMemCapacity()); + i = ALIGN16(bgun_calculate_gun_mem_capacity()); } - g_Vars.currentplayer->gunctrl.gunmem = mempAlloc(i, MEMPOOL_STAGE); + g_Vars.currentplayer->gunctrl.gunmem = memp_alloc(i, MEMPOOL_STAGE); g_Vars.currentplayer->gunctrl.handfilenum = 0; g_Vars.currentplayer->gunctrl.handmemloadptr = 0; g_Vars.currentplayer->gunctrl.handmemloadremaining = 0; @@ -230,12 +230,12 @@ void bgunReset(void) g_Vars.currentplayer->cyclesum = 0; g_Vars.currentplayer->gunampsum = 0; - bgunCalculateBlend(HAND_RIGHT); - bgunCalculateBlend(HAND_RIGHT); - bgunCalculateBlend(HAND_RIGHT); - bgunCalculateBlend(HAND_LEFT); - bgunCalculateBlend(HAND_LEFT); - bgunCalculateBlend(HAND_LEFT); + bgun_calculate_blend(HAND_RIGHT); + bgun_calculate_blend(HAND_RIGHT); + bgun_calculate_blend(HAND_RIGHT); + bgun_calculate_blend(HAND_LEFT); + bgun_calculate_blend(HAND_LEFT); + bgun_calculate_blend(HAND_LEFT); g_Vars.currentplayer->gunammooff = 0; g_Vars.currentplayer->gunsightoff = GUNSIGHTREASON_NOTAIMING; @@ -243,12 +243,12 @@ void bgunReset(void) g_Vars.currentplayer->gunzoomfovs[1] = 60; g_Vars.currentplayer->gunzoomfovs[2] = 30; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { g_Weapons[WEAPON_EYESPY]->name = L_GUN_061; // "DrugSpy" g_Weapons[WEAPON_EYESPY]->shortname = L_GUN_061; // "DrugSpy" g_Weapons[WEAPON_EYESPY]->flags &= ~(WEAPONFLAG_DETERMINER_S_AN | WEAPONFLAG_DETERMINER_F_AN); - } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO - || (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR)) { + } else if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_CHICAGO + || (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR)) { g_Weapons[WEAPON_EYESPY]->name = L_GUN_062; // "BombSpy" g_Weapons[WEAPON_EYESPY]->shortname = L_GUN_062; // "BombSpy" g_Weapons[WEAPON_EYESPY]->flags &= ~(WEAPONFLAG_DETERMINER_S_AN | WEAPONFLAG_DETERMINER_F_AN); @@ -262,5 +262,5 @@ void bgunReset(void) g_Weapons[WEAPON_EYESPY]->flags |= (WEAPONFLAG_DETERMINER_S_AN | WEAPONFLAG_DETERMINER_F_AN); } - bgunInitHandAnims(); + bgun_init_hand_anims(); } diff --git a/src/game/bondgunstop.c b/src/game/bondgunstop.c index bc9f248f4..cd3073081 100644 --- a/src/game/bondgunstop.c +++ b/src/game/bondgunstop.c @@ -7,7 +7,7 @@ #include "data.h" #include "types.h" -void bgunStop(void) +void bgun_stop(void) { s32 i; s32 j; diff --git a/src/game/bondhead.c b/src/game/bondhead.c index 75c2b4b15..9aae75f88 100644 --- a/src/game/bondhead.c +++ b/src/game/bondhead.c @@ -16,12 +16,12 @@ struct headanim g_HeadAnims[] = { { ANIM_0029, 7.5, 17, 0, 1.5, 100 }, }; -void bheadFlipAnimation(void) +void bhead_flip_animation(void) { g_Vars.currentplayer->model.anim->flip = !g_Vars.currentplayer->model.anim->flip; } -void bheadUpdateIdleRoll(void) +void bhead_update_idle_roll(void) { g_Vars.currentplayer->standlook[g_Vars.currentplayer->standcnt].x = (RANDOMFRAC() - 0.5f) * 0.02f; g_Vars.currentplayer->standlook[g_Vars.currentplayer->standcnt].z = 1; @@ -39,7 +39,7 @@ void bheadUpdateIdleRoll(void) g_Vars.currentplayer->standcnt = 1 - g_Vars.currentplayer->standcnt; } -void bheadUpdatePos(struct coord *vel) +void bhead_update_pos(struct coord *vel) { s32 i; @@ -62,7 +62,7 @@ void bheadUpdatePos(struct coord *vel) g_Vars.currentplayer->headpos.z = g_Vars.currentplayer->headpossum.z * (PAL ? 0.021499991416931f : 0.018000006f); } -void bheadUpdateRot(struct coord *lookvel, struct coord *upvel) +void bhead_update_rot(struct coord *lookvel, struct coord *upvel) { s32 i; @@ -94,7 +94,7 @@ void bheadUpdateRot(struct coord *lookvel, struct coord *upvel) g_Vars.currentplayer->headup.z = g_Vars.currentplayer->headupsum.z * (1.0f - g_Vars.currentplayer->headdamp); } -void bheadSetDamp(f32 headdamp) +void bhead_set_damp(f32 headdamp) { if (headdamp != g_Vars.currentplayer->headdamp) { f32 divisor = 1.0f - headdamp; @@ -108,15 +108,15 @@ void bheadSetDamp(f32 headdamp) } } -void bheadUpdate(f32 arg0, f32 arg1) +void bhead_update(f32 arg0, f32 arg1) { struct coord headpos = {0, 0, 0}; struct coord lookvel = {0, 0, 1}; struct coord upvel = {0, 1, 0}; f32 animspeed = 0; - if (animHasFrames(g_Vars.currentplayer->model.anim->animnum)) { - animspeed = modelGetAbsAnimSpeed(&g_Vars.currentplayer->model); + if (anim_has_frames(g_Vars.currentplayer->model.anim->animnum)) { + animspeed = model_get_abs_anim_speed(&g_Vars.currentplayer->model); if (g_Vars.currentplayer->headanim == HEADANIM_RESTING) { if (animspeed > 0.69999998807907f) { @@ -142,30 +142,30 @@ void bheadUpdate(f32 arg0, f32 arg1) struct modelrenderdata sp80 = {NULL, 1, 3}; Mtxf sp40; struct coord modelpos = {0, 0, 0}; - bool mergeenabled = modelIsAnimMergingEnabled(); + bool mergeenabled = model_is_anim_merging_enabled(); g_Vars.currentplayer->resetheadtick = false; - modelSetAnimMergingEnabled(false); - modelTickAnimQuarterSpeed(&g_Vars.currentplayer->model, g_Vars.lvupdate240, true); - modelSetAnimMergingEnabled(mergeenabled); - modelUpdateInfo(&g_Vars.currentplayer->model); - mtx4LoadIdentity(&sp40); + model_set_anim_merging_enabled(false); + model_tick_anim_quarter_speed(&g_Vars.currentplayer->model, g_Vars.lvupdate240, true); + model_set_anim_merging_enabled(mergeenabled); + model_update_info(&g_Vars.currentplayer->model); + mtx4_load_identity(&sp40); sp80.unk00 = &sp40; sp80.unk10 = g_Vars.currentplayer->bondheadmatrices; - modelSetMatricesWithAnim(&sp80, &g_Vars.currentplayer->model); + model_set_matrices_with_anim(&sp80, &g_Vars.currentplayer->model); g_Vars.currentplayer->headbodyoffset.x = g_Vars.currentplayer->standbodyoffset.x; g_Vars.currentplayer->headbodyoffset.y = g_Vars.currentplayer->standbodyoffset.y; g_Vars.currentplayer->headbodyoffset.z = g_Vars.currentplayer->standbodyoffset.z; - modelGetRootPosition(&g_Vars.currentplayer->model, &modelpos); + model_get_root_position(&g_Vars.currentplayer->model, &modelpos); modelpos.x -= g_Vars.currentplayer->bondheadmatrices[0].m[3][0]; modelpos.z -= g_Vars.currentplayer->bondheadmatrices[0].m[3][2]; - modelSetRootPosition(&g_Vars.currentplayer->model, &modelpos); + model_set_root_position(&g_Vars.currentplayer->model, &modelpos); } } @@ -195,9 +195,9 @@ void bheadUpdate(f32 arg0, f32 arg1) g_Vars.currentplayer->headwalkingtime60 += g_Vars.lvupdate60; if (g_Vars.currentplayer->headwalkingtime60 > TICKS(60)) { - bheadSetDamp(PAL ? 0.9785f : 0.982f); + bhead_set_damp(PAL ? 0.9785f : 0.982f); } else { - bheadSetDamp(PAL ? 0.99699f : 0.99748998880386f); + bhead_set_damp(PAL ? 0.99699f : 0.99748998880386f); } } else { lookvel.x = g_Vars.currentplayer->bondheadmatrices[0].m[2][0]; @@ -208,7 +208,7 @@ void bheadUpdate(f32 arg0, f32 arg1) upvel.y = g_Vars.currentplayer->bondheadmatrices[0].m[1][1]; upvel.z = g_Vars.currentplayer->bondheadmatrices[0].m[1][2]; - bheadSetDamp(PAL ? 0.952f : 0.96f); + bhead_set_damp(PAL ? 0.952f : 0.96f); } } else { g_Vars.currentplayer->headbodyoffset.x = g_Vars.currentplayer->standbodyoffset.x; @@ -220,15 +220,15 @@ void bheadUpdate(f32 arg0, f32 arg1) headpos.z = 0; g_Vars.currentplayer->headwalkingtime60 = 0; - bheadSetDamp(PAL ? 0.99699f : 0.99748998880386f); + bhead_set_damp(PAL ? 0.99699f : 0.99748998880386f); - if (bmoveGetCrouchPos() != CROUCHPOS_SQUAT) { + if (bmove_get_crouch_pos() != CROUCHPOS_SQUAT) { g_Vars.currentplayer->standfrac += (0.0083333337679505f + 0.025000002235174f * g_Vars.currentplayer->bondbreathing) * g_Vars.lvupdate60freal; if (g_Vars.currentplayer->standfrac >= 1) { - bheadUpdateIdleRoll(); + bhead_update_idle_roll(); g_Vars.currentplayer->standfrac -= 1; } @@ -250,11 +250,11 @@ void bheadUpdate(f32 arg0, f32 arg1) } } - bheadUpdatePos(&headpos); - bheadUpdateRot(&lookvel, &upvel); + bhead_update_pos(&headpos); + bhead_update_rot(&lookvel, &upvel); } -void bheadAdjustAnimation(f32 speed) +void bhead_adjust_animation(f32 speed) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; s32 i; @@ -274,18 +274,18 @@ void bheadAdjustAnimation(f32 speed) startframe = g_HeadAnims[i].loopframe + (g_HeadAnims[i].endframe - g_HeadAnims[i].loopframe) * startframe; } - modelSetAnimation(&g_Vars.currentplayer->model, g_HeadAnims[i].animnum, + model_set_animation(&g_Vars.currentplayer->model, g_HeadAnims[i].animnum, g_Vars.currentplayer->model.anim->flip, startframe, 0.5f, 12); - modelSetAnimLooping(&g_Vars.currentplayer->model, g_HeadAnims[i].loopframe, false); - modelSetAnimEndFrame(&g_Vars.currentplayer->model, g_HeadAnims[i].endframe); + model_set_anim_looping(&g_Vars.currentplayer->model, g_HeadAnims[i].loopframe, false); + model_set_anim_end_frame(&g_Vars.currentplayer->model, g_HeadAnims[i].endframe); - modelSetAnimFlipFunction(&g_Vars.currentplayer->model, bheadFlipAnimation); + model_set_anim_flip_function(&g_Vars.currentplayer->model, bhead_flip_animation); g_Vars.currentplayer->headanim = i; } speed = speed / g_HeadAnims[i].translateperframe; - modelSetAnimSpeed(&g_Vars.currentplayer->model, speed * 0.5f, 0); + model_set_anim_speed(&g_Vars.currentplayer->model, speed * 0.5f, 0); break; } } @@ -293,22 +293,22 @@ void bheadAdjustAnimation(f32 speed) chr->oldframe = g_Vars.currentplayer->model.anim->frame; } -void bheadStartDeathAnimation(s16 animnum, u32 flip, f32 fstarttime, f32 speed) +void bhead_start_death_animation(s16 animnum, u32 flip, f32 fstarttime, f32 speed) { - modelSetAnimation(&g_Vars.currentplayer->model, animnum, flip, fstarttime, speed * 0.5f, 12); + model_set_animation(&g_Vars.currentplayer->model, animnum, flip, fstarttime, speed * 0.5f, 12); g_Vars.currentplayer->headanim = -1; } -void bheadSetSpeed(f32 speed) +void bhead_set_speed(f32 speed) { - modelSetAnimSpeed(&g_Vars.currentplayer->model, speed * 0.5f, 0); + model_set_anim_speed(&g_Vars.currentplayer->model, speed * 0.5f, 0); } -f32 bheadGetBreathingValue(void) +f32 bhead_get_breathing_value(void) { if (g_Vars.currentplayer->headanim >= 0) { f32 a = g_Vars.currentplayer->bondbreathing * 0.012500001f + (1.0f / 240.0f); - f32 b = modelGetAbsAnimSpeed(&g_Vars.currentplayer->model); + f32 b = model_get_abs_anim_speed(&g_Vars.currentplayer->model); if (b > 0) { f32 c = b / (g_HeadAnims[g_Vars.currentplayer->headanim].endframe - g_HeadAnims[g_Vars.currentplayer->headanim].loopframe); diff --git a/src/game/bondheadreset.c b/src/game/bondheadreset.c index 2d75461f4..c84c6d399 100644 --- a/src/game/bondheadreset.c +++ b/src/game/bondheadreset.c @@ -20,7 +20,7 @@ void func0f0125a0(s16 animnum, s32 frame, s32 endframe, s32 totalinttranslate[3] totalinttranslate[2] = 0; while (frame < endframe) { - animGetPosAngleAsInt(0, false, &g_SkelChr, animnum, frame, inttranslate, false); + anim_get_pos_angle_as_int(0, false, &g_SkelChr, animnum, frame, inttranslate, false); totalinttranslate[0] += inttranslate[0]; totalinttranslate[1] += inttranslate[1]; @@ -30,14 +30,14 @@ void func0f0125a0(s16 animnum, s32 frame, s32 endframe, s32 totalinttranslate[3] } } -void bheadReset(void) +void bhead_reset(void) { s32 i; - modelInit(&g_Vars.currentplayer->model, &g_PlayerModeldef, g_Vars.currentplayer->bondheadsave, false); - animInit(g_Vars.currentplayer->model.anim); - modelSetScale(&g_Vars.currentplayer->model, 0.1000000089407f); - modelSetAnimPlaySpeed(&g_Vars.currentplayer->model, (PAL ? 1.2f : 1), 0); + model_init(&g_Vars.currentplayer->model, &g_PlayerModeldef, g_Vars.currentplayer->bondheadsave, false); + anim_init(g_Vars.currentplayer->model.anim); + model_set_scale(&g_Vars.currentplayer->model, 0.1000000089407f); + model_set_anim_play_speed(&g_Vars.currentplayer->model, (PAL ? 1.2f : 1), 0); g_Vars.currentplayer->headanim = HEADANIM_RESTING; g_Vars.currentplayer->headdamp = (PAL ? 0.9166f : 0.93f); @@ -97,13 +97,13 @@ void bheadReset(void) struct modelrenderdata renderdata = {NULL, 1, 3}; Mtxf sp48; - modelSetAnimation(&g_Vars.currentplayer->model, ANIM_TWO_GUN_HOLD, 0, 0, 0.5f, 0); + model_set_animation(&g_Vars.currentplayer->model, ANIM_TWO_GUN_HOLD, 0, 0, 0.5f, 0); - modelUpdateInfo(&g_Vars.currentplayer->model); - mtx4LoadIdentity(&sp48); + model_update_info(&g_Vars.currentplayer->model); + mtx4_load_identity(&sp48); renderdata.unk00 = &sp48; renderdata.unk10 = g_Vars.currentplayer->bondheadmatrices; - modelSetMatricesWithAnim(&renderdata, &g_Vars.currentplayer->model); + model_set_matrices_with_anim(&renderdata, &g_Vars.currentplayer->model); g_Vars.currentplayer->standheight = g_Vars.currentplayer->bondheadmatrices[0].m[3][1]; @@ -111,16 +111,16 @@ void bheadReset(void) g_Vars.currentplayer->standbodyoffset.y = g_Vars.currentplayer->bondheadmatrices[1].m[3][1] - g_Vars.currentplayer->bondheadmatrices[0].m[3][1]; g_Vars.currentplayer->standbodyoffset.z = g_Vars.currentplayer->bondheadmatrices[1].m[3][2] - g_Vars.currentplayer->bondheadmatrices[0].m[3][2]; - modelSetAnimation(&g_Vars.currentplayer->model, + model_set_animation(&g_Vars.currentplayer->model, g_HeadAnims[g_Vars.currentplayer->headanim].animnum, 0, g_HeadAnims[g_Vars.currentplayer->headanim].loopframe, 0.5f, 0); - modelSetAnimLooping(&g_Vars.currentplayer->model, g_HeadAnims[g_Vars.currentplayer->headanim].loopframe, 0); - modelSetAnimEndFrame(&g_Vars.currentplayer->model, g_HeadAnims[g_Vars.currentplayer->headanim].endframe); - modelSetAnimFlipFunction(&g_Vars.currentplayer->model, bheadFlipAnimation); + model_set_anim_looping(&g_Vars.currentplayer->model, g_HeadAnims[g_Vars.currentplayer->headanim].loopframe, 0); + model_set_anim_end_frame(&g_Vars.currentplayer->model, g_HeadAnims[g_Vars.currentplayer->headanim].endframe); + model_set_anim_flip_function(&g_Vars.currentplayer->model, bhead_flip_animation); - bheadUpdateIdleRoll(); + bhead_update_idle_roll(); } } diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 2b8890203..775040104 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -39,27 +39,27 @@ #include "data.h" #include "types.h" -void bmoveSetControlDef(u32 controldef) +void bmove_set_control_def(u32 controldef) { g_Vars.currentplayer->controldef = controldef; } -void bmoveSetAutoMoveCentreEnabled(bool enabled) +void bmove_set_auto_move_centre_enabled(bool enabled) { g_Vars.currentplayer->automovecentreenabled = enabled; } -bool bmoveIsAutoMoveCentreEnabled(void) +bool bmove_is_auto_move_centre_enabled(void) { return g_Vars.currentplayer->automovecentreenabled; } -void bmoveSetAutoAimY(bool enabled) +void bmove_set_auto_aim_y(bool enabled) { g_Vars.currentplayer->autoyaimenabled = enabled; } -bool bmoveIsAutoAimYEnabled(void) +bool bmove_is_auto_aim_y_enabled(void) { if (!g_Vars.normmplayerisrunning) { return g_Vars.currentplayer->autoyaimenabled; @@ -69,12 +69,12 @@ bool bmoveIsAutoAimYEnabled(void) return false; } - return optionsGetAutoAim(g_Vars.currentplayerstats->mpindex); + return options_get_auto_aim(g_Vars.currentplayerstats->mpindex); } -bool bmoveIsAutoAimYEnabledForCurrentWeapon(void) +bool bmove_is_auto_aim_y_enabled_for_current_weapon(void) { - struct weaponfunc *func = currentPlayerGetWeaponFunction(0); + struct weaponfunc *func = current_player_get_weapon_function(0); if (func) { if (func->flags & FUNCFLAG_NOAUTOAIM) { @@ -86,15 +86,15 @@ bool bmoveIsAutoAimYEnabledForCurrentWeapon(void) } } - return bmoveIsAutoAimYEnabled(); + return bmove_is_auto_aim_y_enabled(); } -bool bmoveIsInSightAimMode(void) +bool bmove_is_in_sight_aim_mode(void) { return g_Vars.currentplayer->insightaimmode; } -void bmoveUpdateAutoAimYProp(struct prop *prop, f32 autoaimy) +void bmove_update_auto_aim_y_prop(struct prop *prop, f32 autoaimy) { if (g_Vars.currentplayer->autoyaimtime60 >= 0) { g_Vars.currentplayer->autoyaimtime60 -= g_Vars.lvupdate60; @@ -112,12 +112,12 @@ void bmoveUpdateAutoAimYProp(struct prop *prop, f32 autoaimy) g_Vars.currentplayer->autoaimy = autoaimy; } -void bmoveSetAutoAimX(bool enabled) +void bmove_set_auto_aim_x(bool enabled) { g_Vars.currentplayer->autoxaimenabled = enabled; } -bool bmoveIsAutoAimXEnabled(void) +bool bmove_is_auto_aim_x_enabled(void) { if (!g_Vars.normmplayerisrunning) { return g_Vars.currentplayer->autoxaimenabled; @@ -127,12 +127,12 @@ bool bmoveIsAutoAimXEnabled(void) return false; } - return optionsGetAutoAim(g_Vars.currentplayerstats->mpindex); + return options_get_auto_aim(g_Vars.currentplayerstats->mpindex); } -bool bmoveIsAutoAimXEnabledForCurrentWeapon(void) +bool bmove_is_auto_aim_x_enabled_for_current_weapon(void) { - struct weaponfunc *func = currentPlayerGetWeaponFunction(0); + struct weaponfunc *func = current_player_get_weapon_function(0); if (func) { if (func->flags & FUNCFLAG_NOAUTOAIM) { @@ -144,10 +144,10 @@ bool bmoveIsAutoAimXEnabledForCurrentWeapon(void) } } - return bmoveIsAutoAimXEnabled(); + return bmove_is_auto_aim_x_enabled(); } -void bmoveUpdateAutoAimXProp(struct prop *prop, f32 autoaimx) +void bmove_update_auto_aim_x_prop(struct prop *prop, f32 autoaimx) { if (g_Vars.currentplayer->autoxaimtime60 >= 0) { g_Vars.currentplayer->autoxaimtime60 -= g_Vars.lvupdate60; @@ -165,7 +165,7 @@ void bmoveUpdateAutoAimXProp(struct prop *prop, f32 autoaimx) g_Vars.currentplayer->autoaimx = autoaimx; } -struct prop *bmoveGetHoverbike(void) +struct prop *bmove_get_hoverbike(void) { if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { return g_Vars.currentplayer->hoverbike; @@ -174,7 +174,7 @@ struct prop *bmoveGetHoverbike(void) return NULL; } -struct prop *bmoveGetGrabbedProp(void) +struct prop *bmove_get_grabbed_prop(void) { if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) { return g_Vars.currentplayer->grabbedprop; @@ -183,98 +183,98 @@ struct prop *bmoveGetGrabbedProp(void) return NULL; } -void bmoveGrabProp(struct prop *prop) +void bmove_grab_prop(struct prop *prop) { struct defaultobj *obj = prop->obj; if ((obj->hidden & OBJHFLAG_MOUNTED) == 0 && (obj->hidden & OBJHFLAG_GRABBED) == 0) { g_Vars.currentplayer->grabbedprop = prop; - bgrabInit(); + bgrab_init(); } } -void bmoveSetMode(u32 movemode) +void bmove_set_mode(u32 movemode) { if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) { - bgrabExit(); + bgrab_exit(); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { - bbikeExit(); + bbike_exit(); } if (movemode == MOVEMODE_BIKE) { - bbikeInit(); + bbike_init(); } else if (movemode == MOVEMODE_GRAB) { - bgrabInit(); + bgrab_init(); } else if (movemode == MOVEMODE_CUTSCENE) { - bcutsceneInit(); + bcutscene_init(); } else if (movemode == MOVEMODE_WALK) { - bwalkInit(); + bwalk_init(); } } -void bmoveSetModeForAllPlayers(u32 movemode) +void bmove_set_mode_for_all_players(u32 movemode) { u32 prevplayernum = g_Vars.currentplayernum; s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); - bmoveSetMode(movemode); + set_current_player_num(i); + bmove_set_mode(movemode); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } -void bmoveHandleActivate(void) +void bmove_handle_activate(void) { if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { - bbikeHandleActivate(); + bbike_handle_activate(); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) { - bgrabHandleActivate(); + bgrab_handle_activate(); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK) { - bwalkHandleActivate(); + bwalk_handle_activate(); } } -void bmoveApplyMoveData(struct movedata *data) +void bmove_apply_move_data(struct movedata *data) { if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { - bbikeApplyMoveData(data); + bbike_apply_move_data(data); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) { - bgrabApplyMoveData(data); + bgrab_apply_move_data(data); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK) { - bwalkApplyMoveData(data); + bwalk_apply_move_data(data); } } -void bmoveUpdateSpeedTheta(void) +void bmove_update_speed_theta(void) { if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { // empty } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) { - bgrabUpdateSpeedTheta(); + bgrab_update_speed_theta(); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK) { - bwalkUpdateSpeedTheta(); + bwalk_update_speed_theta(); } } -f32 bmoveGetSpeedVertaLimit(f32 value) +f32 bmove_get_speed_verta_limit(f32 value) { if (value > 0) { - return (viGetFovY() * value * -0.7f) / 60.0f; + return (vi_get_fov_y() * value * -0.7f) / 60.0f; } if (value < 0) { - return (viGetFovY() * -value * 0.7f) / 60.0f; + return (vi_get_fov_y() * -value * 0.7f) / 60.0f; } return 0; } -void bmoveUpdateSpeedVerta(f32 value) +void bmove_update_speed_verta(f32 value) { - f32 mult = viGetFovY() / 60.0f; - f32 limit = bmoveGetSpeedVertaLimit(value); + f32 mult = vi_get_fov_y() / 60.0f; + f32 limit = bmove_get_speed_verta_limit(value); if (value > 0) { if (g_Vars.currentplayer->speedverta > 0) { @@ -313,23 +313,23 @@ void bmoveUpdateSpeedVerta(f32 value) } } -f32 bmoveGetSpeedThetaControlLimit(f32 value) +f32 bmove_get_speed_theta_control_limit(f32 value) { if (value > 0) { - return (viGetFovY() * value * -0.7f) / 60.0f; + return (vi_get_fov_y() * value * -0.7f) / 60.0f; } if (value < 0) { - return (viGetFovY() * -value * 0.7f) / 60.0f; + return (vi_get_fov_y() * -value * 0.7f) / 60.0f; } return 0; } -void bmoveUpdateSpeedThetaControl(f32 value) +void bmove_update_speed_theta_control(f32 value) { - f32 mult = viGetFovY() / 60.0f; - f32 limit = bmoveGetSpeedThetaControlLimit(value); + f32 mult = vi_get_fov_y() / 60.0f; + f32 limit = bmove_get_speed_theta_control_limit(value); if (value > 0) { if (g_Vars.currentplayer->speedthetacontrol > 0) { @@ -376,7 +376,7 @@ void bmoveUpdateSpeedThetaControl(f32 value) * 0 = horizontal * -90 = straight down */ -f32 bmoveCalculateLookahead(void) +f32 bmove_calculate_lookahead(void) { f32 result = -4.0f; f32 sp160 = 400.0f; @@ -415,7 +415,7 @@ f32 bmoveCalculateLookahead(void) return result; } - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); sp100.x = g_Vars.currentplayer->bond2.unk00.x; sp100.y = g_Vars.currentplayer->bond2.unk00.y; @@ -432,11 +432,11 @@ f32 bmoveCalculateLookahead(void) sp150.y = sp100.y * 400 + spf0.y; sp150.z = sp100.z * 400 + spf0.z; - if (cdExamLos08(&spf0, spe0, &sp150, + if (cd_exam_los08(&spf0, spe0, &sp150, CDTYPE_BG | CDTYPE_CLOSEDDOORS, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2 | GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT) == CDRESULT_COLLISION) { - cdGetPos(&sp150, 455, "bondmove.c"); - flags = cdGetGeoFlags(); + cd_get_pos(&sp150, 455, "bondmove.c"); + flags = cd_get_geo_flags(); sp160 = sqrtf((sp150.x - spf0.x) * (sp150.x - spf0.x) + (sp150.y - spf0.y) * (sp150.y - spf0.y) @@ -462,9 +462,9 @@ f32 bmoveCalculateLookahead(void) if ( #if VERSION >= VERSION_NTSC_1_0 - cdFindFloorRoomYColourFlagsAtPos(&spbc, sp80, &sp78, NULL, NULL) > 0 + cd_find_floor_room_y_colour_flags_at_pos(&spbc, sp80, &sp78, NULL, NULL) > 0 #else - cdFindFloorRoomYColourFlagsAtPos(&spbc, sp80, &sp78, NULL) > 0 + cd_find_floor_room_y_colour_flags_at_pos(&spbc, sp80, &sp78, NULL) > 0 #endif && sp78 - ground < 200 && sp78 - ground > -200) { @@ -526,7 +526,7 @@ f32 bmoveCalculateLookahead(void) return result; } -void bmoveResetMoveData(struct movedata *data) +void bmove_reset_move_data(struct movedata *data) { data->canswivelgun = 0; data->canmanualaim = 0; @@ -561,7 +561,7 @@ void bmoveResetMoveData(struct movedata *data) data->aimturnrightspeed = 0; data->zoomoutfovpersec = 0; data->zoominfovpersec = 0; - data->invertpitch = !optionsGetForwardPitch(g_Vars.currentplayerstats->mpindex); + data->invertpitch = !options_get_forward_pitch(g_Vars.currentplayerstats->mpindex); data->disablelookahead = false; data->c1stickxsafe = 0; data->c1stickysafe = 0; @@ -586,7 +586,7 @@ void bmoveResetMoveData(struct movedata *data) * 0, 0, 0, 1 = tickmode warp * 1, 1, 0, 1 = autowalk */ -void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2) +void bmove_process_input(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2) { struct movedata movedata; s32 controlmode; @@ -638,30 +638,30 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i f32 increment2; f32 newverta; - controlmode = optionsGetControlMode(g_Vars.currentplayerstats->mpindex); - weaponnum = bgunGetWeaponNum(HAND_RIGHT); - canmanualzoom = weaponHasAimFlag(weaponnum, INVAIMFLAG_MANUALZOOM); - contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); + controlmode = options_get_control_mode(g_Vars.currentplayerstats->mpindex); + weaponnum = bgun_get_weapon_num(HAND_RIGHT); + canmanualzoom = weapon_has_aim_flag(weaponnum, INVAIMFLAG_MANUALZOOM); + contpad1 = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); - c1stickx = allowc1x ? joyGetStickX(contpad1) : 0; - c1sticky = allowc1y ? joyGetStickY(contpad1) : 0; + c1stickx = allowc1x ? joy_get_stick_x(contpad1) : 0; + c1sticky = allowc1y ? joy_get_stick_y(contpad1) : 0; - c1buttons = allowc1buttons ? joyGetButtons(contpad1, 0xffff) : 0; - c1buttonsthisframe = allowc1buttons ? joyGetButtonsPressedThisFrame(contpad1, 0xffff) : 0; + c1buttons = allowc1buttons ? joy_get_buttons(contpad1, 0xffff) : 0; + c1buttonsthisframe = allowc1buttons ? joy_get_buttons_pressed_this_frame(contpad1, 0xffff) : 0; c1allowedbuttons = 0xffff; if (g_Vars.currentplayer->joybutinhibit & 0xffff) { inhibitedbuttons = g_Vars.currentplayer->joybutinhibit & 0xffff; c1allowedbuttons = ~inhibitedbuttons; - inhibitedbuttons = joyGetButtons(contpad1, 0xffff) & inhibitedbuttons; + inhibitedbuttons = joy_get_buttons(contpad1, 0xffff) & inhibitedbuttons; c1buttons &= ~inhibitedbuttons; c1buttonsthisframe &= ~inhibitedbuttons; g_Vars.currentplayer->joybutinhibit = (g_Vars.currentplayer->joybutinhibit & 0xffff0000) | inhibitedbuttons; } - numsamples = joyGetNumSamples(); - bmoveResetMoveData(&movedata); + numsamples = joy_get_num_samples(); + bmove_reset_move_data(&movedata); if (c1stickx < -5) { movedata.c1stickxsafe = c1stickx + 5; @@ -693,21 +693,21 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i if (g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED && (c1buttonsthisframe & START_BUTTON)) { if (g_Vars.mplayerisrunning == false) { if (g_Vars.lvframenum > 15) { - playerPause(MENUROOT_MAINMENU); + player_pause(MENUROOT_MAINMENU); } } else { - mpPushPauseDialog(); + mp_push_pause_dialog(); } } } else { if (g_Vars.mplayerisrunning) { if (PLAYERCOUNT() == 1) { - if (mpIsPaused() && (c1buttonsthisframe & START_BUTTON) && g_MpSetup.paused != MPPAUSEMODE_GAMEOVER) { - mpSetPaused(MPPAUSEMODE_UNPAUSED); + if (mp_is_paused() && (c1buttonsthisframe & START_BUTTON) && g_MpSetup.paused != MPPAUSEMODE_GAMEOVER) { + mp_set_paused(MPPAUSEMODE_UNPAUSED); } } else { - if (mpIsPaused() && (c1buttonsthisframe & START_BUTTON)) { - mpPushPauseDialog(); + if (mp_is_paused() && (c1buttonsthisframe & START_BUTTON)) { + mp_push_pause_dialog(); } } } @@ -720,11 +720,11 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i // 2.2: ctrl1 stick = look, z = fire, ctrl2 stick = walk/strafe, z = aim // 2.3: ctrl1 stick = walk/turn, z = aim, ctrl2 stick = look/strafe, z = fire // 2.4: ctrl1 stick = look, z = aim, ctrl2 stick = walk/strafe, z = fire - contpad2 = (s8) optionsGetContpadNum2(g_Vars.currentplayerstats->mpindex); - c2stickx = (s8) joyGetStickX(contpad2); - c2sticky = (joyGetStickY(contpad2) << 24) >> 24; - c2buttons = joyGetButtons(contpad2, 0xffff); - c2buttonsthisframe = joyGetButtonsPressedThisFrame(contpad2, 0xffff); + contpad2 = (s8) options_get_contpad_num2(g_Vars.currentplayerstats->mpindex); + c2stickx = (s8) joy_get_stick_x(contpad2); + c2sticky = (joy_get_stick_y(contpad2) << 24) >> 24; + c2buttons = joy_get_buttons(contpad2, 0xffff); + c2buttonsthisframe = joy_get_buttons_pressed_this_frame(contpad2, 0xffff); tmpc2stickx = c2stickx; tmpc2sticky = c2sticky; @@ -734,7 +734,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i if (g_Vars.currentplayer->joybutinhibit << 0 >> 16) { inhibitedbuttons = g_Vars.currentplayer->joybutinhibit >> 16; c2allowedbuttons = ~inhibitedbuttons; - inhibitedbuttons = joyGetButtons(contpad2, 0xffff) & inhibitedbuttons; + inhibitedbuttons = joy_get_buttons(contpad2, 0xffff) & inhibitedbuttons; c2buttons &= ~inhibitedbuttons; c2buttonsthisframe &= ~inhibitedbuttons; g_Vars.currentplayer->joybutinhibit = (g_Vars.currentplayer->joybutinhibit & 0xffff) | (inhibitedbuttons << 16); @@ -795,20 +795,20 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i shootallowedbuttons = c2allowedbuttons; } - if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { + if (options_get_aim_control(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { for (i = 0; i < numsamples; i++) { - aimonhist[i] = allowc1buttons && joyGetButtonsOnSample(i, aimpad, aimallowedbuttons & Z_TRIG); + aimonhist[i] = allowc1buttons && joy_get_buttons_on_sample(i, aimpad, aimallowedbuttons & Z_TRIG); aimoffhist[i] = !aimonhist[i]; } g_Vars.currentplayer->insightaimmode = aimonhist[numsamples - 1]; } - if (!lvIsPaused()) { + if (!lv_is_paused()) { // Handle aiming - if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) != AIMCONTROL_HOLD) { + if (options_get_aim_control(g_Vars.currentplayerstats->mpindex) != AIMCONTROL_HOLD) { for (i = 0; i < numsamples; i++) { - if (allowc1buttons && joyGetButtonsPressedOnSample(i, aimpad, aimallowedbuttons & Z_TRIG)) { + if (allowc1buttons && joy_get_buttons_pressed_on_sample(i, aimpad, aimallowedbuttons & Z_TRIG)) { g_Vars.currentplayer->insightaimmode = !g_Vars.currentplayer->insightaimmode; } @@ -817,7 +817,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { g_Vars.currentplayer->insightaimmode = true; } @@ -884,18 +884,18 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } else { for (i = 0; i < numsamples; i++) { - if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & A_BUTTON) - || joyGetButtonsOnSample(i, contpad2, c2allowedbuttons & A_BUTTON)) { + if (joy_get_buttons_on_sample(i, contpad1, c1allowedbuttons & A_BUTTON) + || joy_get_buttons_on_sample(i, contpad2, c2allowedbuttons & A_BUTTON)) { if (g_Vars.currentplayer->invdowntime > -2) { - if (joyGetButtonsPressedOnSample(i, shootpad, shootallowedbuttons & Z_TRIG)) { + if (joy_get_buttons_pressed_on_sample(i, shootpad, shootallowedbuttons & Z_TRIG)) { movedata.weaponbackoffset++; g_Vars.currentplayer->invdowntime = -1; } if (g_Vars.currentplayer->invdowntime > -1 - && joyGetButtonsOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) == 0) { + && joy_get_buttons_on_sample(i, shootpad, shootallowedbuttons & Z_TRIG) == 0) { if (g_Vars.currentplayer->invdowntime > TICKS(15)) { - amOpen(); + am_open(); g_Vars.currentplayer->invdowntime = -1; } else { g_Vars.currentplayer->invdowntime++; @@ -904,7 +904,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } else { if (g_Vars.currentplayer->invdowntime > 0 && - (!allowc1buttons || joyGetButtonsOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) == 0)) { + (!allowc1buttons || joy_get_buttons_on_sample(i, shootpad, shootallowedbuttons & Z_TRIG) == 0)) { movedata.weaponforwardoffset++; } @@ -917,18 +917,18 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i // Handle B button activation if (allowc1buttons) { for (i = 0; i < numsamples; i++) { - if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & B_BUTTON) - || joyGetButtonsOnSample(i, contpad2, c2allowedbuttons & B_BUTTON)) { + if (joy_get_buttons_on_sample(i, contpad1, c1allowedbuttons & B_BUTTON) + || joy_get_buttons_on_sample(i, contpad2, c2allowedbuttons & B_BUTTON)) { if (g_Vars.currentplayer->usedowntime >= -1) { - if (joyGetButtonsPressedOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) + if (joy_get_buttons_pressed_on_sample(i, shootpad, shootallowedbuttons & Z_TRIG) && g_Vars.currentplayer->usedowntime > -1 - && bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, true, false) != USETIMER_CONTINUE) { + && bgun_consider_toggle_gun_function(g_Vars.currentplayer->usedowntime, true, false) != USETIMER_CONTINUE) { g_Vars.currentplayer->usedowntime = -3; } if (g_Vars.currentplayer->usedowntime > -1) { if (g_Vars.currentplayer->usedowntime > TICKS(25)) { - result = bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, false, false); + result = bgun_consider_toggle_gun_function(g_Vars.currentplayer->usedowntime, false, false); if (result == USETIMER_STOP) { g_Vars.currentplayer->usedowntime = -1; @@ -942,7 +942,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } } else if (g_Vars.currentplayer->usedowntime >= -2) { - bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, false, false); + bgun_consider_toggle_gun_function(g_Vars.currentplayer->usedowntime, false, false); } } else { // Released B - activate or reload @@ -983,7 +983,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i if (allowc1buttons) { for (i = 0; i < numsamples; i++) { if (!canmanualzoom && aimonhist[i]) { - if (joyGetStickYOnSample(i, contpad2) > 30 && joyGetStickYOnSampleIndex(i, contpad2) <= 30) { + if (joy_get_stick_y_on_sample(i, contpad2) > 30 && joy_get_stick_y_on_sample_index(i, contpad2) <= 30) { if (movedata.crouchdown) { movedata.crouchdown--; } else { @@ -993,7 +993,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i g_Vars.currentplayer->aimtaptime = -1; } - if (joyGetStickYOnSample(i, contpad2) < -30 && joyGetStickYOnSampleIndex(i, contpad2) >= -30) { + if (joy_get_stick_y_on_sample(i, contpad2) < -30 && joy_get_stick_y_on_sample_index(i, contpad2) >= -30) { if (movedata.crouchup) { movedata.crouchup--; } else { @@ -1004,7 +1004,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } - if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { + if (options_get_aim_control(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { if (aimonhist[i]) { if (g_Vars.currentplayer->aimtaptime > -1) { g_Vars.currentplayer->aimtaptime++; @@ -1026,16 +1026,16 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } // Handle shutting eyes in multiplayer - if (bmoveGetCrouchPos() == CROUCHPOS_SQUAT + if (bmove_get_crouch_pos() == CROUCHPOS_SQUAT && g_Vars.currentplayer->crouchoffset == -90 && g_Vars.mplayerisrunning && g_Vars.coopplayernum < 0) { movedata.eyesshut = g_Vars.currentplayer->insightaimmode && !canmanualzoom - && joyGetStickY(contpad2) < -30; + && joy_get_stick_y(contpad2) < -30; } - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) { + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_FARSIGHT) { if (g_Vars.currentplayer->insightaimmode) { movedata.unk14 = 0; } @@ -1066,20 +1066,20 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i movedata.zooming = g_Vars.currentplayer->insightaimmode; if (g_Vars.currentplayer->waitforzrelease - && joyGetButtons(shootpad, shootallowedbuttons & Z_TRIG) == 0) { + && joy_get_buttons(shootpad, shootallowedbuttons & Z_TRIG) == 0) { g_Vars.currentplayer->waitforzrelease = false; } - if (weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_FIRETOACTIVATE)) { + if (weapon_has_flag(bgun_get_weapon_num(HAND_RIGHT), WEAPONFLAG_FIRETOACTIVATE)) { if (allowc1buttons - && joyGetButtonsPressedThisFrame(shootpad, shootallowedbuttons & Z_TRIG) + && joy_get_buttons_pressed_this_frame(shootpad, shootallowedbuttons & Z_TRIG) && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED) { movedata.btapcount++; } } else { movedata.triggeron = g_Vars.currentplayer->waitforzrelease == false && allowc1buttons - && joyGetButtons(shootpad, shootallowedbuttons & Z_TRIG) + && joy_get_buttons(shootpad, shootallowedbuttons & Z_TRIG) && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED && (c1buttons & A_BUTTON) == 0 && (c2buttons & A_BUTTON) == 0; @@ -1098,20 +1098,20 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i invbuttons = A_BUTTON; } - if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { + if (options_get_aim_control(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { for (i = 0; i < numsamples; i++) { - aimonhist[i] = allowc1buttons && joyGetButtonsOnSample(i, contpad1, aimbuttons & c1allowedbuttons); + aimonhist[i] = allowc1buttons && joy_get_buttons_on_sample(i, contpad1, aimbuttons & c1allowedbuttons); aimoffhist[i] = !aimonhist[i]; } g_Vars.currentplayer->insightaimmode = aimonhist[numsamples - 1]; } - if (!lvIsPaused()) { + if (!lv_is_paused()) { // Handle aiming - if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) != AIMCONTROL_HOLD) { + if (options_get_aim_control(g_Vars.currentplayerstats->mpindex) != AIMCONTROL_HOLD) { for (i = 0; i < numsamples; i++) { - if (allowc1buttons && joyGetButtonsPressedOnSample(i, contpad1, aimbuttons & c1allowedbuttons)) { + if (allowc1buttons && joy_get_buttons_pressed_on_sample(i, contpad1, aimbuttons & c1allowedbuttons)) { g_Vars.currentplayer->insightaimmode = !g_Vars.currentplayer->insightaimmode; } @@ -1120,7 +1120,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { g_Vars.currentplayer->insightaimmode = true; } @@ -1132,8 +1132,8 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i // Handle side stepping if (g_Vars.currentplayer->insightaimmode == false) { if (allowc1buttons) { - movedata.digitalstepleft = joyCountButtonsOnSpecificSamples(aimoffhist, contpad1, c1allowedbuttons & (L_JPAD | L_CBUTTONS)); - movedata.digitalstepright = joyCountButtonsOnSpecificSamples(aimoffhist, contpad1, c1allowedbuttons & (R_JPAD | R_CBUTTONS)); + movedata.digitalstepleft = joy_count_buttons_on_specific_samples(aimoffhist, contpad1, c1allowedbuttons & (L_JPAD | L_CBUTTONS)); + movedata.digitalstepright = joy_count_buttons_on_specific_samples(aimoffhist, contpad1, c1allowedbuttons & (R_JPAD | R_CBUTTONS)); } } else { // This doesn't appear to be r-leaning. @@ -1174,8 +1174,8 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } if (!g_Vars.currentplayer->insightaimmode && allowc1buttons) { - movedata.digitalstepleft = joyCountButtonsOnSpecificSamples(aimoffhist, contpad1, c1allowedbuttons & (L_JPAD | L_CBUTTONS)); - movedata.digitalstepright = joyCountButtonsOnSpecificSamples(aimoffhist, contpad1, c1allowedbuttons & (R_JPAD | R_CBUTTONS)); + movedata.digitalstepleft = joy_count_buttons_on_specific_samples(aimoffhist, contpad1, c1allowedbuttons & (L_JPAD | L_CBUTTONS)); + movedata.digitalstepright = joy_count_buttons_on_specific_samples(aimoffhist, contpad1, c1allowedbuttons & (R_JPAD | R_CBUTTONS)); } movedata.digitalstepforward = false; @@ -1243,17 +1243,17 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } else { for (i = 0; i < numsamples; i++) { - if (joyGetButtonsOnSample(i, contpad1, invbuttons & c1allowedbuttons)) { + if (joy_get_buttons_on_sample(i, contpad1, invbuttons & c1allowedbuttons)) { if (g_Vars.currentplayer->invdowntime > -2) { - if (joyGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons)) { + if (joy_get_buttons_pressed_on_sample(i, contpad1, shootbuttons & c1allowedbuttons)) { movedata.weaponbackoffset++; g_Vars.currentplayer->invdowntime = -1; } - if (g_Vars.currentplayer->invdowntime >= 0 && joyGetButtonsOnSample(i, contpad1, shootbuttons & c1allowedbuttons) == 0) { + if (g_Vars.currentplayer->invdowntime >= 0 && joy_get_buttons_on_sample(i, contpad1, shootbuttons & c1allowedbuttons) == 0) { // Holding A and haven't pressed Z if (g_Vars.currentplayer->invdowntime > TICKS(15)) { - amOpen(); + am_open(); g_Vars.currentplayer->invdowntime = -1; } else { g_Vars.currentplayer->invdowntime++; @@ -1263,7 +1263,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } else { // Wasn't holding A on this sample if (g_Vars.currentplayer->invdowntime > 0 && - (!allowc1buttons || joyGetButtonsOnSample(i, contpad1, shootbuttons & c1allowedbuttons) == 0)) { + (!allowc1buttons || joy_get_buttons_on_sample(i, contpad1, shootbuttons & c1allowedbuttons) == 0)) { // But was on previous sample, so cycle weapon movedata.weaponforwardoffset++; } @@ -1277,17 +1277,17 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i // Handle B button if (allowc1buttons) { for (i = 0; i < numsamples; i++) { - if (joyGetButtonsOnSample(i, contpad1, c1allowedbuttons & B_BUTTON)) { + if (joy_get_buttons_on_sample(i, contpad1, c1allowedbuttons & B_BUTTON)) { if (g_Vars.currentplayer->usedowntime >= -1) { - if (joyGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons) + if (joy_get_buttons_pressed_on_sample(i, contpad1, shootbuttons & c1allowedbuttons) && g_Vars.currentplayer->usedowntime >= 0 - && bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, true, false) != USETIMER_CONTINUE) { + && bgun_consider_toggle_gun_function(g_Vars.currentplayer->usedowntime, true, false) != USETIMER_CONTINUE) { g_Vars.currentplayer->usedowntime = -3; } if (g_Vars.currentplayer->usedowntime >= 0) { if (g_Vars.currentplayer->usedowntime > TICKS(25)) { - s32 result = bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, false, false); + s32 result = bgun_consider_toggle_gun_function(g_Vars.currentplayer->usedowntime, false, false); if (result == USETIMER_STOP) { g_Vars.currentplayer->usedowntime = -1; @@ -1302,7 +1302,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } else { if (g_Vars.currentplayer->usedowntime >= -2) { - bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, false, false); + bgun_consider_toggle_gun_function(g_Vars.currentplayer->usedowntime, false, false); } } } else { @@ -1324,7 +1324,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i zoomin = c1buttons & (U_JPAD | U_CBUTTONS); // @bug? Should this be HAND_RIGHT? - if (bgunGetWeaponNum(HAND_LEFT) == WEAPON_FARSIGHT) { + if (bgun_get_weapon_num(HAND_LEFT) == WEAPON_FARSIGHT) { increment = 0.5f; } @@ -1341,7 +1341,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i if (allowc1buttons) { for (i = 0; i < numsamples; i++) { if (!canmanualzoom && aimonhist[i]) { - if (joyGetButtonsPressedOnSample(i, contpad1, c1allowedbuttons & (U_JPAD | U_CBUTTONS))) { + if (joy_get_buttons_pressed_on_sample(i, contpad1, c1allowedbuttons & (U_JPAD | U_CBUTTONS))) { if (movedata.crouchdown) { movedata.crouchdown--; } else { @@ -1351,7 +1351,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i g_Vars.currentplayer->aimtaptime = -1; } - if (joyGetButtonsPressedOnSample(i, contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS))) { + if (joy_get_buttons_pressed_on_sample(i, contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS))) { if (movedata.crouchup) { movedata.crouchup--; } else { @@ -1362,7 +1362,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } - if (optionsGetAimControl(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { + if (options_get_aim_control(g_Vars.currentplayerstats->mpindex) == AIMCONTROL_HOLD) { if (aimonhist[i]) { if (g_Vars.currentplayer->aimtaptime >= 0) { g_Vars.currentplayer->aimtaptime++; @@ -1385,16 +1385,16 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } // Handle shutting eyes in multiplayer - if (bmoveGetCrouchPos() == CROUCHPOS_SQUAT + if (bmove_get_crouch_pos() == CROUCHPOS_SQUAT && g_Vars.currentplayer->crouchoffset == -90 && g_Vars.mplayerisrunning && g_Vars.coopplayernum <= -1) { movedata.eyesshut = g_Vars.currentplayer->insightaimmode && !canmanualzoom - && joyGetButtons(contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS)); + && joy_get_buttons(contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS)); } - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) { + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_FARSIGHT) { movedata.farsighttempautoseek = g_Vars.currentplayer->insightaimmode && (c1buttons & (L_CBUTTONS | R_CBUTTONS | L_JPAD | R_JPAD)); } else { movedata.rleanleft = g_Vars.currentplayer->insightaimmode && (c1buttons & (L_JPAD | L_CBUTTONS)); @@ -1422,7 +1422,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i g_Vars.currentplayer->waitforzrelease = false; } - if (weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_FIRETOACTIVATE)) { + if (weapon_has_flag(bgun_get_weapon_num(HAND_RIGHT), WEAPONFLAG_FIRETOACTIVATE)) { if ((c1buttonsthisframe & shootbuttons) && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED) { movedata.btapcount++; @@ -1448,7 +1448,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i g_Vars.currentplayer->activatetimethis = g_Vars.lvframe60; g_Vars.currentplayer->bondactivateorreload = movedata.btapcount; - bmoveHandleActivate(); + bmove_handle_activate(); } if (!movedata.invertpitch) { @@ -1459,37 +1459,37 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i movedata.speedvertaup = savedverta; } - bgunTickGameplay(movedata.triggeron); + bgun_tick_gameplay(movedata.triggeron); - if (g_Vars.bondvisible && (bgunIsFiring(HAND_RIGHT) || bgunIsFiring(HAND_LEFT))) { + if (g_Vars.bondvisible && (bgun_is_firing(HAND_RIGHT) || bgun_is_firing(HAND_LEFT))) { noiseradius = 0; - if (bgunIsFiring(HAND_RIGHT) && bgunGetNoiseRadius(HAND_RIGHT) > noiseradius) { - noiseradius = bgunGetNoiseRadius(HAND_RIGHT); + if (bgun_is_firing(HAND_RIGHT) && bgun_get_noise_radius(HAND_RIGHT) > noiseradius) { + noiseradius = bgun_get_noise_radius(HAND_RIGHT); } - if (bgunIsFiring(HAND_LEFT) && bgunGetNoiseRadius(HAND_LEFT) > noiseradius) { - noiseradius = bgunGetNoiseRadius(HAND_LEFT); + if (bgun_is_firing(HAND_LEFT) && bgun_get_noise_radius(HAND_LEFT) > noiseradius) { + noiseradius = bgun_get_noise_radius(HAND_LEFT); } - chrsCheckForNoise(noiseradius); + chrs_check_for_noise(noiseradius); } - bgunSetSightVisible(GUNSIGHTREASON_NOTAIMING, movedata.aiming); + bgun_set_sight_visible(GUNSIGHTREASON_NOTAIMING, movedata.aiming); if (movedata.zoomoutfovpersec > 0) { - currentPlayerZoomOut(movedata.zoomoutfovpersec); + current_player_zoom_out(movedata.zoomoutfovpersec); } if (movedata.zoominfovpersec > 0) { - currentPlayerZoomIn(movedata.zoominfovpersec); + current_player_zoom_in(movedata.zoominfovpersec); } if (g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED && !g_MainIsEndscreen) { zoomfov = 60; // FarSight in secondary function - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_FARSIGHT && g_Vars.currentplayer->insightaimmode && (movedata.farsighttempautoseek || g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponfunc == FUNC_SECONDARY) && g_Vars.currentplayer->autoeraserdist > 0) { @@ -1505,41 +1505,41 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i g_Vars.currentplayer->gunzoomfovs[1] = eraserfov; - mtx4TransformVec(camGetWorldToScreenMtxf(), &g_Vars.currentplayer->autoerasertarget->pos, &spa0); + mtx4_transform_vec(cam_get_world_to_screen_mtxf(), &g_Vars.currentplayer->autoerasertarget->pos, &spa0); cam0f0b4eb8(&spa0, crosspos, eraserfov, g_Vars.currentplayer->c_perspaspect); - if (crosspos[0] < (camGetScreenLeft() + camGetScreenWidth() * 0.5f) - 20.0f) { + if (crosspos[0] < (cam_get_screen_left() + cam_get_screen_width() * 0.5f) - 20.0f) { movedata.aimturnleftspeed = 0.25f; - } else if (crosspos[0] > camGetScreenLeft() + camGetScreenWidth() * 0.5f + 20.0f) { + } else if (crosspos[0] > cam_get_screen_left() + cam_get_screen_width() * 0.5f + 20.0f) { movedata.aimturnrightspeed = 0.25f; } - if (crosspos[1] < (camGetScreenTop() + camGetScreenHeight() * 0.5f) - 20.0f) { + if (crosspos[1] < (cam_get_screen_top() + cam_get_screen_height() * 0.5f) - 20.0f) { movedata.speedvertaup = 0.25f; - } else if (crosspos[1] > camGetScreenTop() + camGetScreenHeight() * 0.5f + 20.0f) { + } else if (crosspos[1] > cam_get_screen_top() + cam_get_screen_height() * 0.5f + 20.0f) { movedata.speedvertadown = 0.25f; } } if (movedata.zooming) { - zoomfov = currentPlayerGetGunZoomFov(); + zoomfov = current_player_get_gun_zoom_fov(); } - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_AR34 + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_AR34 && g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponfunc == FUNC_SECONDARY) { - zoomfov = currentPlayerGetGunZoomFov(); + zoomfov = current_player_get_gun_zoom_fov(); } if (zoomfov <= 0) { zoomfov = 60; } - playerTweenFovY(zoomfov); - playerUpdateZoom(); + player_tween_fov_y(zoomfov); + player_update_zoom(); } - bmoveApplyMoveData(&movedata); + bmove_apply_move_data(&movedata); // Speed boost // After 3 seconds of holding forward at max speed, apply boost multiplier. @@ -1551,7 +1551,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i if (g_Vars.currentplayer->speedboost > 1.25f) { #if PIRACYCHECKS - piracyRestore(); + piracy_restore(); #endif g_Vars.currentplayer->speedboost = 1.25f; } @@ -1575,7 +1575,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i if (g_Vars.currentplayer->lookaheadcentreenabled) { if (g_Vars.lvframenum != g_Vars.currentplayer->lookaheadframe && g_Vars.currentplayernum == (g_Vars.lvframenum & 3)) { - g_Vars.currentplayer->cachedlookahead = bmoveCalculateLookahead(); + g_Vars.currentplayer->cachedlookahead = bmove_calculate_lookahead(); } lookahead = g_Vars.currentplayer->cachedlookahead; @@ -1628,11 +1628,11 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i increment2 = (g_Vars.currentplayer->speedverta * g_Vars.currentplayer->speedverta * 0.5f) / 0.05f; if (g_Vars.currentplayer->vv_verta > lookahead + increment2) { - bmoveUpdateSpeedVerta(1); + bmove_update_speed_verta(1); } else if (g_Vars.currentplayer->vv_verta < lookahead - increment2) { - bmoveUpdateSpeedVerta(-1); + bmove_update_speed_verta(-1); } else { - bmoveUpdateSpeedVerta(0); + bmove_update_speed_verta(0); } // Calculate new verta @@ -1653,7 +1653,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } } else { if (movedata.cannaturalpitch) { - tmp = viGetFovY() / 60.0f; + tmp = vi_get_fov_y() / 60.0f; fVar25 = movedata.analogpitch / 70.0f; if (fVar25 > 1) { @@ -1670,19 +1670,19 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i g_Vars.currentplayer->speedverta = -fVar25 * tmp; } else if (movedata.speedvertadown > 0) { - bmoveUpdateSpeedVerta(movedata.speedvertadown); + bmove_update_speed_verta(movedata.speedvertadown); if (movedata.canlookahead && (movedata.analogwalk > 60 || movedata.analogwalk < -60)) { g_Vars.currentplayer->movecentrerelease = true; } } else if (movedata.speedvertaup > 0) { - bmoveUpdateSpeedVerta(-movedata.speedvertaup); + bmove_update_speed_verta(-movedata.speedvertaup); if (movedata.canlookahead && (movedata.analogwalk > 60 || movedata.analogwalk < -60)) { g_Vars.currentplayer->movecentrerelease = true; } } else { - bmoveUpdateSpeedVerta(0); + bmove_update_speed_verta(0); } g_Vars.currentplayer->vv_verta += g_Vars.currentplayer->speedverta * g_Vars.lvupdate60freal * 3.5f; @@ -1690,7 +1690,7 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i } if (movedata.cannaturalturn) { - tmp = viGetFovY() / 60.0f; + tmp = vi_get_fov_y() / 60.0f; fVar25 = movedata.analogturn / 70.0f; if (fVar25 > 1) { @@ -1707,20 +1707,20 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i g_Vars.currentplayer->speedthetacontrol = fVar25 * tmp; } else if (movedata.aimturnleftspeed > 0) { - bmoveUpdateSpeedThetaControl(movedata.aimturnleftspeed); + bmove_update_speed_theta_control(movedata.aimturnleftspeed); } else if (movedata.aimturnrightspeed > 0) { - bmoveUpdateSpeedThetaControl(-movedata.aimturnrightspeed); + bmove_update_speed_theta_control(-movedata.aimturnrightspeed); } else { - bmoveUpdateSpeedThetaControl(0); + bmove_update_speed_theta_control(0); } g_Vars.currentplayer->speedtheta = g_Vars.currentplayer->speedthetacontrol; - bmoveUpdateSpeedTheta(); + bmove_update_speed_theta(); if (movedata.detonating) { g_Vars.currentplayer->hands[HAND_RIGHT].mode = HANDMODE_NONE; g_Vars.currentplayer->hands[HAND_RIGHT].modenext = HANDMODE_NONE; - playerActivateRemoteMineDetonator(g_Vars.currentplayernum); + player_activate_remote_mine_detonator(g_Vars.currentplayernum); } cancycleweapons = true; @@ -1735,11 +1735,11 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i if (cancycleweapons) { while (movedata.weaponbackoffset-- > 0) { - bgunCycleBack(); + bgun_cycle_back(); } while (movedata.weaponforwardoffset-- > 0) { - bgunCycleForward(); + bgun_cycle_forward(); } } @@ -1749,21 +1749,21 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i f32 x; f32 y; - bgunSetAimType(0); + bgun_set_aim_type(0); if ( ( movedata.canautoaim - && (bmoveIsAutoAimXEnabledForCurrentWeapon() || bmoveIsAutoAimYEnabledForCurrentWeapon()) + && (bmove_is_auto_aim_x_enabled_for_current_weapon() || bmove_is_auto_aim_y_enabled_for_current_weapon()) && g_Vars.currentplayer->autoxaimprop && g_Vars.currentplayer->autoyaimprop - && weaponHasAimFlag(weaponnum, INVAIMFLAG_AUTOAIM) + && weapon_has_aim_flag(weaponnum, INVAIMFLAG_AUTOAIM) ) - || (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150 && g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponfunc == FUNC_SECONDARY)) { + || (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_CMP150 && g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponfunc == FUNC_SECONDARY)) { // Auto aim - move crosshair towards target s32 followlockon = false; - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150 + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_CMP150 && g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponfunc == FUNC_SECONDARY) { followlockon = true; } @@ -1780,9 +1780,9 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i y = g_Vars.currentplayer->autoaimy; if (followlockon) { - bgunSwivel(x, y, PAL ? 0.899f : 0.915f, PAL ? 0.899f : 0.915f); + bgun_swivel(x, y, PAL ? 0.899f : 0.915f, PAL ? 0.899f : 0.915f); } else { - bgunSwivelWithDamp(x, y, g_Vars.currentplayer->autoaimdamp); + bgun_swivel_with_damp(x, y, g_Vars.currentplayer->autoaimdamp); } } else { // This code moves the crosshair as the player turns and makes @@ -1798,22 +1798,22 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i x = g_Vars.currentplayer->speedtheta * 0.3f + g_Vars.currentplayer->gunextraaimx; y = -g_Vars.currentplayer->speedverta * 0.1f + g_Vars.currentplayer->gunextraaimy; - bgunSwivelWithDamp(x, y, PAL ? 0.955f : 0.963f); + bgun_swivel_with_damp(x, y, PAL ? 0.955f : 0.963f); } } else if (movedata.canmanualaim) { // Adjust crosshair's position on screen // when holding aim and moving stick - bgunSetAimType(0); - bgunSwivelWithoutDamp((movedata.c1stickxraw * 0.65f) / 80.0f, (movedata.c1stickyraw * 0.65f) / 80.0f); + bgun_set_aim_type(0); + bgun_swivel_without_damp((movedata.c1stickxraw * 0.65f) / 80.0f, (movedata.c1stickyraw * 0.65f) / 80.0f); } } -void bmoveFindEnteredRoomsByPos(struct player *player, struct coord *mid, RoomNum *rooms) +void bmove_find_entered_rooms_by_pos(struct player *player, struct coord *mid, RoomNum *rooms) { struct coord bbmin; struct coord bbmax; - f32 eyeheight = g_Vars.players[playermgrGetPlayerNumByProp(player->prop)]->vv_eyeheight; - f32 headheight = g_Vars.players[playermgrGetPlayerNumByProp(player->prop)]->vv_headheight; + f32 eyeheight = g_Vars.players[playermgr_get_player_num_by_prop(player->prop)]->vv_eyeheight; + f32 headheight = g_Vars.players[playermgr_get_player_num_by_prop(player->prop)]->vv_headheight; bbmin.x = mid->x - 50; bbmin.y = mid->y - player->crouchheight - eyeheight - 10; @@ -1823,19 +1823,19 @@ void bmoveFindEnteredRoomsByPos(struct player *player, struct coord *mid, RoomNu bbmax.y = mid->y - player->crouchheight - eyeheight + headheight + 10; bbmax.z = mid->z + 50; - bgFindEnteredRooms(&bbmin, &bbmax, rooms, 7, false); + bg_find_entered_rooms(&bbmin, &bbmax, rooms, 7, false); } -void bmoveFindEnteredRooms(struct player *player, RoomNum *rooms) +void bmove_find_entered_rooms(struct player *player, RoomNum *rooms) { - bmoveFindEnteredRoomsByPos(player, &player->prop->pos, rooms); + bmove_find_entered_rooms_by_pos(player, &player->prop->pos, rooms); } -void bmoveUpdateRooms(struct player *player) +void bmove_update_rooms(struct player *player) { - propDeregisterRooms(player->prop); - bmoveFindEnteredRooms(player, player->prop->rooms); - propRegisterRooms(player->prop); + prop_deregister_rooms(player->prop); + bmove_find_entered_rooms(player, player->prop->rooms); + prop_register_rooms(player->prop); } void bmove0f0cb904(struct coord *arg0) @@ -1886,7 +1886,7 @@ void bmove0f0cba88(f32 *a, f32 *b, struct coord *c, f32 mult1, f32 mult2) } } -void bmoveUpdateMoveInitSpeed(struct coord *newpos) +void bmove_update_move_init_speed(struct coord *newpos) { if (g_Vars.currentplayer->moveinitspeed.x != 0) { if (g_Vars.currentplayer->moveinitspeed.x < 0.001f && g_Vars.currentplayer->moveinitspeed.x > -0.001f) { @@ -1907,7 +1907,7 @@ void bmoveUpdateMoveInitSpeed(struct coord *newpos) } } -void bmoveTick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2) +void bmove_tick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2) { struct chrdata *chr; u8 foot; @@ -1917,16 +1917,16 @@ void bmoveTick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2) f32 zdiff; f32 distance; - bmoveProcessInput(allowc1x, allowc1y, allowc1buttons, ignorec2); + bmove_process_input(allowc1x, allowc1y, allowc1buttons, ignorec2); if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { - bbikeTick(); + bbike_tick(); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) { - bgrabTick(); + bgrab_tick(); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_CUTSCENE) { - bcutsceneTick(); + bcutscene_tick(); } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK) { - bwalkTick(); + bwalk_tick(); } // Update footstep sounds @@ -1962,7 +1962,7 @@ void bmoveTick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2) chr->floortype = g_Vars.currentplayer->floortype; - sound = footstepChooseSound(chr, distance > 10); + sound = footstep_choose_sound(chr, distance > 10); if (sound != -1) { snd00010718(0, 0, AL_VOL_FULL, AL_PAN_CENTER, sound, 1, 1, -1, true); @@ -1972,7 +1972,7 @@ void bmoveTick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2) } } -void bmoveUpdateVerta(void) +void bmove_update_verta(void) { while (g_Vars.currentplayer->vv_verta < -180) { g_Vars.currentplayer->vv_verta += 360; @@ -2008,7 +2008,7 @@ void bmoveUpdateVerta(void) struct chrdata *chr = g_Vars.currentplayer->prop->chr; if (chr && chr->model) { - chrSetLookAngle(chr, BADDEG2RAD(360 - g_Vars.currentplayer->vv_theta)); + chr_set_look_angle(chr, BADDEG2RAD(360 - g_Vars.currentplayer->vv_theta)); } } } @@ -2034,7 +2034,7 @@ void bmove0f0cc19c(struct coord *arg) g_Vars.currentplayer->bond2.unk10.y += -(1.0f - g_Vars.currentplayer->vv_cosverta) * g_Vars.currentplayer->bondleandown; } - if (cheatIsActive(CHEAT_SMALLJO)) { + if (cheat_is_active(CHEAT_SMALLJO)) { if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { mult = g_Vars.currentplayer->bondentert * 0.6f + 0.4f; } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK && g_Vars.currentplayer->walkinitmove) { @@ -2067,7 +2067,7 @@ void bmove0f0cc19c(struct coord *arg) #endif } -void bmoveUpdateHead(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4) +void bmove_update_head(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4) { f32 sp244 = 0; Mtxf sp180; @@ -2077,7 +2077,7 @@ void bmoveUpdateHead(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4) f32 sp68[4]; if (g_Vars.currentplayer->isdead == false) { - bheadAdjustAnimation(arg0); + bhead_adjust_animation(arg0); if (arg0 != 0) { sp244 = arg1 / arg0; @@ -2086,34 +2086,34 @@ void bmoveUpdateHead(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4) } } else { if (g_Vars.currentplayer->startnewbonddie) { - bheadStartDeathAnimation(g_DeathAnimations[random() % g_NumDeathAnimations], random() % 2, 0, 1); + bhead_start_death_animation(g_DeathAnimations[random() % g_NumDeathAnimations], random() % 2, 0, 1); g_Vars.currentplayer->startnewbonddie = false; } - bheadSetSpeed(0.5); + bhead_set_speed(0.5); arg2 = 0; } - bheadUpdate(sp244, arg2); - mtx4LoadXRotation(BADDEG2RAD(360 - g_Vars.currentplayer->vv_verta360), &sp180); + bhead_update(sp244, arg2); + mtx4_load_x_rotation(BADDEG2RAD(360 - g_Vars.currentplayer->vv_verta360), &sp180); - if (optionsGetHeadRoll(g_Vars.currentplayerstats->mpindex)) { + if (options_get_head_roll(g_Vars.currentplayerstats->mpindex)) { mtx00016d58(&sp116, 0, 0, 0, -g_Vars.currentplayer->headlook.x, -g_Vars.currentplayer->headlook.y, -g_Vars.currentplayer->headlook.z, g_Vars.currentplayer->headup.x, g_Vars.currentplayer->headup.y, g_Vars.currentplayer->headup.z); - mtx4MultMtx4InPlace(&sp116, &sp180); + mtx4_mult_mtx4_in_place(&sp116, &sp180); } - mtx4LoadYRotation(BADDEG2RAD(360 - g_Vars.currentplayer->vv_theta), &sp116); - mtx4MultMtx4InPlace(&sp116, &sp180); + mtx4_load_y_rotation(BADDEG2RAD(360 - g_Vars.currentplayer->vv_theta), &sp116); + mtx4_mult_mtx4_in_place(&sp116, &sp180); if (arg3) { quaternion0f097044(&sp180, sp100); quaternion0f097044(arg3, sp84); quaternion0f0976c0(sp100, sp84); - quaternionSlerp(sp100, sp84, arg4, sp68); - quaternionToMtx(sp68, &sp180); + quaternion_slerp(sp100, sp84, arg4, sp68); + quaternion_to_mtx(sp68, &sp180); } g_Vars.currentplayer->bond2.unk1c.x = sp180.m[2][0]; @@ -2126,17 +2126,17 @@ void bmoveUpdateHead(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4) void bmove0f0cc654(f32 arg0, f32 arg1, f32 arg2) { - bmoveUpdateHead(arg0, arg1, arg2, NULL, 0); + bmove_update_head(arg0, arg1, arg2, NULL, 0); } -s32 bmoveGetCrouchPos(void) +s32 bmove_get_crouch_pos(void) { return (g_Vars.currentplayer->crouchpos < g_Vars.currentplayer->autocrouchpos) ? g_Vars.currentplayer->crouchpos : g_Vars.currentplayer->autocrouchpos; } -s32 bmoveGetCrouchPosByPlayer(s32 playernum) +s32 bmove_get_crouch_pos_by_player(s32 playernum) { return (g_Vars.players[playernum]->crouchpos < g_Vars.players[playernum]->autocrouchpos) ? g_Vars.players[playernum]->crouchpos diff --git a/src/game/bondview.c b/src/game/bondview.c index 60ad46baa..46b93f7e0 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -45,12 +45,12 @@ u32 var8007f85c = 0x00000000; #if VERSION < VERSION_NTSC_1_0 void func0f13c2d0nb(void) { - mainOverrideVariable("fsrad", (u32 *)&g_IrBinocularRadius); - mainOverrideVariable("fscs", (u32 *)&var8007f850); + main_override_variable("fsrad", (u32 *)&g_IrBinocularRadius); + main_override_variable("fscs", (u32 *)&var8007f850); } #endif -Gfx *bviewDrawIrRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) +Gfx *bview_draw_ir_rect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) { gDPFillRectangle(gdl++, x1, y1, x2, y2); @@ -59,7 +59,7 @@ Gfx *bviewDrawIrRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) Gfx *bview0f141864(Gfx *gdl, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { - s32 value = viGetWidth() * arg2 + arg4; + s32 value = vi_get_width() * arg2 + arg4; gDPPipeSync(gdl++); gDPSetTextureImage(gdl++, G_IM_FMT_I, G_IM_SIZ_8b, SCREEN_320, value * 2 + arg1); @@ -71,7 +71,7 @@ Gfx *bview0f141864(Gfx *gdl, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) Gfx *bview0f141940(Gfx *gdl, s32 arg1, s32 arg2, s32 tile, s32 arg4, s32 width) { - s32 value = viGetWidth() * arg2 + arg4; + s32 value = vi_get_width() * arg2 + arg4; gDPPipeSync(gdl++); gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, value * 2 + arg1); @@ -95,7 +95,7 @@ Gfx *bview0f141a20(Gfx *gdl, s32 top, s32 height, s32 left, s32 width) return gdl; } -Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s32 left, s32 width) +Gfx *bview_copy_pixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s32 left, s32 width) { uintptr_t image; s32 width2; @@ -106,7 +106,7 @@ Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s numparts = 2; lrs[0] = width / numparts; - image = (uintptr_t) &fb[viGetWidth() * top + left] & 0x00ffffff; + image = (uintptr_t) &fb[vi_get_width() * top + left] & 0x00ffffff; gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_320, image); gDPLoadBlock(gdl++, tile, 0, 0, width / numparts - 1, 0); @@ -123,7 +123,7 @@ Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s left += lrs[0]; - image = (uintptr_t) &fb[viGetWidth() * top + left] & 0x00ffffff; + image = (uintptr_t) &fb[vi_get_width() * top + left] & 0x00ffffff; gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_320, image); gDPLoadBlock(gdl++, tile, 0, 0, lrs[0] - 1, 0); @@ -141,7 +141,7 @@ Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s } else { width2 = width; - image = (uintptr_t) &fb[viGetWidth() * top + left] & 0x00ffffff; + image = (uintptr_t) &fb[vi_get_width() * top + left] & 0x00ffffff; gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_320, image); gDPLoadBlock(gdl++, tile, 0, 0, width2 - 1, 0); @@ -163,7 +163,7 @@ Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s return gdl; } -Gfx *bviewDrawFisheyeRect(Gfx *gdl, s32 arg1, f32 arg2, s32 arg3, s32 arg4) +Gfx *bview_draw_fisheye_rect(Gfx *gdl, s32 arg1, f32 arg2, s32 arg3, s32 arg4) { if (arg2 < 1) { f32 tmp = arg4 * 0.5f; @@ -177,13 +177,13 @@ Gfx *bviewDrawFisheyeRect(Gfx *gdl, s32 arg1, f32 arg2, s32 arg3, s32 arg4) return gdl; } -Gfx *bviewPrepareStaticRgba16(Gfx *gdl, u32 colour, u32 alpha) +Gfx *bview_prepare_static_rgba16(Gfx *gdl, u32 colour, u32 alpha) { static u32 envcol = 0xffffffff; static u32 primcol = 0x7f7f7fff; - mainOverrideVariable("envcol", &envcol); - mainOverrideVariable("primcol", &primcol); + main_override_variable("envcol", &envcol); + main_override_variable("primcol", &primcol); gDPPipeSync(gdl++); gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 5, 0, @@ -211,13 +211,13 @@ Gfx *bviewPrepareStaticRgba16(Gfx *gdl, u32 colour, u32 alpha) return gdl; } -Gfx *bviewPrepareStaticI8(Gfx *gdl, u32 colour, u32 alpha) +Gfx *bview_prepare_static_i8(Gfx *gdl, u32 colour, u32 alpha) { static u32 envcol = 0xffffffff; static u32 primcol = 0x7f7f7fff; - mainOverrideVariable("envcol", &envcol); - mainOverrideVariable("primcol", &primcol); + main_override_variable("envcol", &envcol); + main_override_variable("primcol", &primcol); gDPPipeSync(gdl++); gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_8b, 0, 0x0000, 5, 0, @@ -245,15 +245,15 @@ Gfx *bviewPrepareStaticI8(Gfx *gdl, u32 colour, u32 alpha) return gdl; } -Gfx *bviewDrawMotionBlur(Gfx *gdl, u32 colour, u32 alpha) +Gfx *bview_draw_motion_blur(Gfx *gdl, u32 colour, u32 alpha) { - u16 *fb = viGetFrontBuffer(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); + u16 *fb = vi_get_front_buffer(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); f32 fxxx; f32 fyyy; - s32 viewwidth = viGetViewWidth(); - s32 viewleft = viGetViewLeft(); + s32 viewwidth = vi_get_view_width(); + s32 viewleft = vi_get_view_left(); f32 somefloat; s32 newalpha; s32 i; @@ -276,18 +276,18 @@ Gfx *bviewDrawMotionBlur(Gfx *gdl, u32 colour, u32 alpha) var8007f844 = 0; - mainOverrideVariable("sfxxx", &sfxxx); + main_override_variable("sfxxx", &sfxxx); fxxx = sfxxx / 1000.0f; - mainOverrideVariable("sfyyy", &sfyyy); + main_override_variable("sfyyy", &sfyyy); fyyy = sfyyy / 1000.0f; gDPPipeSync(gdl++); somefloat = (viewheight - viewheight / fyyy) * 0.5f; - gdl = bviewPrepareStaticRgba16(gdl, colour, newalpha); + gdl = bview_prepare_static_rgba16(gdl, colour, newalpha); for (i = viewtop; i < viewtop + viewheight; i++) { - gdl = bviewCopyPixels(gdl, fb, viewtop + (s32)somefloat, 5, i, fxxx, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, viewtop + (s32)somefloat, 5, i, fxxx, viewleft, viewwidth); somefloat += 1.0f / fyyy; } @@ -297,22 +297,22 @@ Gfx *bviewDrawMotionBlur(Gfx *gdl, u32 colour, u32 alpha) /** * Draw static for the Infiltration intro cutscene and Slayer rockets. */ -Gfx *bviewDrawStatic(Gfx *gdl, u32 arg1, s32 arg2) +Gfx *bview_draw_static(Gfx *gdl, u32 arg1, s32 arg2) { - u16 *fb = viGetFrontBuffer(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); - s32 viewleft = viGetViewLeft(); + u16 *fb = vi_get_front_buffer(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); + s32 viewleft = vi_get_view_left(); u16 *fb2 = (u16 *) PHYS_TO_K0(random() & 0xfff00); s32 y; gDPPipeSync(gdl++); - gdl = bviewPrepareStaticI8(gdl, arg1, arg2); + gdl = bview_prepare_static_i8(gdl, arg1, arg2); for (y = viewtop; y < viewtop + viewheight; y++) { - gdl = bviewCopyPixels(gdl, fb2, random() % 240, 5, y, 1.0f, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb2, random() % 240, 5, y, 1.0f, viewleft, viewwidth); } if (fb2) { @@ -325,14 +325,14 @@ Gfx *bviewDrawStatic(Gfx *gdl, u32 arg1, s32 arg2) /** * Draw the yellow interlace effect for Slayer rockets. */ -Gfx *bviewDrawSlayerRocketInterlace(Gfx *gdl, u32 colour, u32 alpha) +Gfx *bview_draw_slayer_rocket_interlace(Gfx *gdl, u32 colour, u32 alpha) { - u16 *fb = viGetBackBuffer(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); + u16 *fb = vi_get_back_buffer(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); s32 y; - s32 viewleft = viGetViewLeft(); + s32 viewleft = vi_get_view_left(); f32 angle = RAD(30, 0.52359879016876f); s32 offset = (s32)(g_20SecIntervalFrac * 600.0f) % 12; f32 increment; @@ -349,7 +349,7 @@ Gfx *bviewDrawSlayerRocketInterlace(Gfx *gdl, u32 colour, u32 alpha) increment = (RAD(150, 2.6179938316345f) - angle) / viewheight; - gdl = bviewPrepareStaticRgba16(gdl, colour, alpha); + gdl = bview_prepare_static_rgba16(gdl, colour, alpha); for (y = viewtop; y < viewtop + viewheight; y++) { s32 offsety = y - offset; @@ -362,7 +362,7 @@ Gfx *bviewDrawSlayerRocketInterlace(Gfx *gdl, u32 colour, u32 alpha) } } - gdl = bviewCopyPixels(gdl, fb, y, 5, y, 2.0f - sinf(angle), viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, y, 5, y, 2.0f - sinf(angle), viewleft, viewwidth); angle += increment; } @@ -373,14 +373,14 @@ Gfx *bviewDrawSlayerRocketInterlace(Gfx *gdl, u32 colour, u32 alpha) /** * Draw the blue film interlace effect for the Infiltration intro cutscene. */ -Gfx *bviewDrawFilmInterlace(Gfx *gdl, u32 colour, u32 alpha) +Gfx *bview_draw_film_interlace(Gfx *gdl, u32 colour, u32 alpha) { - u16 *fb = viGetBackBuffer(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); + u16 *fb = vi_get_back_buffer(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); s32 y; - s32 viewwidth = viGetViewWidth(); - s32 viewleft = viGetViewLeft(); + s32 viewwidth = vi_get_view_width(); + s32 viewleft = vi_get_view_left(); s32 offset = (s32)(g_20SecIntervalFrac * 600.0f) % 12; u32 stack; @@ -394,7 +394,7 @@ Gfx *bviewDrawFilmInterlace(Gfx *gdl, u32 colour, u32 alpha) gDPPipeSync(gdl++); - gdl = bviewPrepareStaticRgba16(gdl, colour, alpha); + gdl = bview_prepare_static_rgba16(gdl, colour, alpha); for (y = viewtop; y < viewtop + viewheight; y++) { s32 offsety = y - offset; @@ -412,7 +412,7 @@ Gfx *bviewDrawFilmInterlace(Gfx *gdl, u32 colour, u32 alpha) tmpy = random() % 200; } - gdl = bviewCopyPixels(gdl, fb, tmpy, 5, y, 1, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, tmpy, 5, y, 1, viewleft, viewwidth); } return gdl; @@ -423,13 +423,13 @@ Gfx *bviewDrawFilmInterlace(Gfx *gdl, u32 colour, u32 alpha) * * Used when entering/exiting combat boosts and when entering/exiting xray mode. */ -Gfx *bviewDrawZoomBlur(Gfx *gdl, u32 colour, s32 alpha, f32 arg3, f32 arg4) +Gfx *bview_draw_zoom_blur(Gfx *gdl, u32 colour, s32 alpha, f32 arg3, f32 arg4) { - u16 *fb = viGetFrontBuffer(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); - s32 viewleft = viGetViewLeft(); + u16 *fb = vi_get_front_buffer(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); + s32 viewleft = vi_get_view_left(); f32 somefloat; s32 i; @@ -445,10 +445,10 @@ Gfx *bviewDrawZoomBlur(Gfx *gdl, u32 colour, s32 alpha, f32 arg3, f32 arg4) somefloat = (viewheight - viewheight / arg4) * 0.5f; - gdl = bviewPrepareStaticRgba16(gdl, colour, alpha); + gdl = bview_prepare_static_rgba16(gdl, colour, alpha); for (i = viewtop; i < viewtop + viewheight; i++) { - gdl = bviewCopyPixels(gdl, fb, (s32)somefloat + viewtop, 5, i, arg3, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, (s32)somefloat + viewtop, 5, i, arg3, viewleft, viewwidth); somefloat += 1.0f / arg4; } @@ -487,9 +487,9 @@ f32 bview0f142d74(s32 arg0, f32 arg1, f32 arg2, f32 arg3) * no check for a vertical split being used, and as a result the fisheye radius * is smaller than it should be when using a horizontal split. @bug */ -Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 startuptimer60, u8 hit) +Gfx *bview_draw_fisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 startuptimer60, u8 hit) { - u16 *fb = viGetBackBuffer(); + u16 *fb = vi_get_back_buffer(); s32 viewtop; s32 viewheight; f32 f26; @@ -515,18 +515,18 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta f32 tmp; #if VERSION >= VERSION_PAL_FINAL - viewtop = viGetViewTop(); - viewheight = viGetViewHeight(); - viewwidth = viGetViewWidth(); - viewleft = viGetViewLeft(); + viewtop = vi_get_view_top(); + viewheight = vi_get_view_height(); + viewwidth = vi_get_view_width(); + viewleft = vi_get_view_left(); startupfrac = 1.0f; s2 = 0; #if PAL if (PLAYERCOUNT() >= 2 - || optionsGetEffectiveScreenSize() == SCREENSIZE_WIDE - || optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA) { + || options_get_effective_screen_size() == SCREENSIZE_WIDE + || options_get_effective_screen_size() == SCREENSIZE_CINEMA) { vpadding = 16; viewtop += vpadding; viewheight -= vpadding * 2; @@ -541,23 +541,23 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta sqhalfheight = halfheight * halfheight; f26 = -(halfheight + halfheight) / viewheight; #elif VERSION >= VERSION_PAL_BETA - viewtop = viGetViewTop() + 16; - viewheight = viGetViewHeight() - 32; + viewtop = vi_get_view_top() + 16; + viewheight = vi_get_view_height() - 32; halfheight = viewheight * 0.5f; sqhalfheight = halfheight * halfheight; f26 = -(halfheight + halfheight) / viewheight; - viewwidth = viGetViewWidth(); - viewleft = viGetViewLeft(); + viewwidth = vi_get_view_width(); + viewleft = vi_get_view_left(); startupfrac = 1.0f; s2 = 0; #else - viewtop = viGetViewTop(); - viewheight = viGetViewHeight(); + viewtop = vi_get_view_top(); + viewheight = vi_get_view_height(); halfheight = viewheight * 0.5f; sqhalfheight = halfheight * halfheight; f26 = -(halfheight + halfheight) / viewheight; - viewwidth = viGetViewWidth(); - viewleft = viGetViewLeft(); + viewwidth = vi_get_view_width(); + viewleft = vi_get_view_left(); startupfrac = 1.0f; s2 = 0; #endif @@ -587,7 +587,7 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta gDPPipeSync(gdl++); - gdl = bviewPrepareStaticRgba16(gdl, colour, alpha); + gdl = bview_prepare_static_rgba16(gdl, colour, alpha); if (starting) { for (i = viewtop; i < viewtop + viewheight; i++) { @@ -596,7 +596,7 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta gDPSetEnvColorViaWord(gdl++, (colour & 0xffffff00) | (spec & 0xff)); tmp = bview0f142d74(s2, f26, halfheight, sqhalfheight) * startupfrac; - gdl = bviewCopyPixels(gdl, fb, i, 5, i, tmp, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, i, 5, i, tmp, viewleft, viewwidth); } } @@ -622,13 +622,13 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta } tmp = bview0f142d74(s2, f26, halfheight, sqhalfheight) * f22; - gdl = bviewCopyPixels(gdl, fb, i, 5, i, tmp, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, i, 5, i, tmp, viewleft, viewwidth); if (hit == EYESPYHIT_DAMAGE) { gDPSetEnvColorViaWord(gdl++, 0xddaaaa99); tmp = bview0f142d74(s2, f26, halfheight, sqhalfheight) * 1.03f; - gdl = bviewCopyPixels(gdl, fb, i, 5, i, tmp, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, i, 5, i, tmp, viewleft, viewwidth); } s2 += s3; @@ -671,8 +671,8 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta } for (i = viewtop; i < viewtop + spa8 - s7; i++) { - gdl = bviewDrawFisheyeRect(gdl, i, 0.0f, viewleft, viewwidth); - gdl = bviewDrawFisheyeRect(gdl, viewtop + viewtop + viewheight - i, 0.0f, viewleft, viewwidth); + gdl = bview_draw_fisheye_rect(gdl, i, 0.0f, viewleft, viewwidth); + gdl = bview_draw_fisheye_rect(gdl, viewtop + viewtop + viewheight - i, 0.0f, viewleft, viewwidth); } gDPSetPrimColorViaWord(gdl++, 0, 0, 0x000000ff); @@ -691,10 +691,10 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta f20 += -tmp / s7; - gdl = bviewDrawFisheyeRect(gdl, i, f2 * startupfrac, viewleft, viewwidth); + gdl = bview_draw_fisheye_rect(gdl, i, f2 * startupfrac, viewleft, viewwidth); if (i != viewtop + viewtop + viewheight - i) { - gdl = bviewDrawFisheyeRect(gdl, viewtop + viewtop + viewheight - i, f2 * startupfrac, viewleft, viewwidth); + gdl = bview_draw_fisheye_rect(gdl, viewtop + viewtop + viewheight - i, f2 * startupfrac, viewleft, viewwidth); } } } else { @@ -702,7 +702,7 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta for (i = viewtop; i < viewtop + viewheight; i++) { tmp = bview0f142d74(s2, f26, halfheight, sqhalfheight); - gdl = bviewDrawFisheyeRect(gdl, i, tmp, viewleft, viewwidth); + gdl = bview_draw_fisheye_rect(gdl, i, tmp, viewleft, viewwidth); s2 += s3; @@ -714,11 +714,11 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta } #if PAL - s3 = viGetViewTop(); + s3 = vi_get_view_top(); #if VERSION >= VERSION_PAL_FINAL - s2 = s3 + viGetViewHeight() - vpadding; + s2 = s3 + vi_get_view_height() - vpadding; #else - s2 = s3 + viGetViewHeight() - 16; + s2 = s3 + vi_get_view_height() - 16; #endif #if VERSION >= VERSION_PAL_FINAL @@ -744,10 +744,10 @@ Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 sta * These are each 1px high, and go from the edge of the circle to the edge of * the screen. There is one drawn on every row on both sides. */ -Gfx *bviewDrawEyespySideRect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha) +Gfx *bview_draw_eyespy_side_rect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha) { - Vtx *vertices = gfxAllocateVertices(4); - Col *colours = gfxAllocateColours(2); + Vtx *vertices = gfx_allocate_vertices(4); + Col *colours = gfx_allocate_colours(2); vertices[0].x = points[0] * 10.0f; vertices[0].y = points[1] * 10.0f; @@ -800,22 +800,22 @@ Gfx *bviewDrawEyespySideRect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha) * - The speed and height bars are stretched. * - The device name and model are closer to the screen edge than intended. */ -Gfx *bviewDrawEyespyMetrics(Gfx *gdl) +Gfx *bview_draw_eyespy_metrics(Gfx *gdl) { char text[256]; - s32 viewleft = viGetViewLeft(); + s32 viewleft = vi_get_view_left(); #if VERSION >= VERSION_PAL_FINAL - s32 viewwidth = viGetViewWidth(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); + s32 viewwidth = vi_get_view_width(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); #elif VERSION >= VERSION_PAL_BETA - s32 viewwidth = viGetViewWidth(); - s32 viewtop = viGetViewTop() + 16; - s32 viewheight = viGetViewHeight() - 32; + s32 viewwidth = vi_get_view_width(); + s32 viewtop = vi_get_view_top() + 16; + s32 viewheight = vi_get_view_height() - 32; #else - s32 viewtop = viGetViewTop(); - s32 viewwidth = viGetViewWidth(); - s32 viewheight = viGetViewHeight(); + s32 viewtop = vi_get_view_top(); + s32 viewwidth = vi_get_view_width(); + s32 viewheight = vi_get_view_height(); #endif s32 viewright = viewleft + viewwidth - 1; s32 viewbottom = viewtop + viewheight - 1; @@ -848,8 +848,8 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) #if VERSION >= VERSION_PAL_FINAL #if PAL if (PLAYERCOUNT() >= 2 - || optionsGetEffectiveScreenSize() == SCREENSIZE_WIDE - || optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA) { + || options_get_effective_screen_size() == SCREENSIZE_WIDE + || options_get_effective_screen_size() == SCREENSIZE_CINEMA) { viewtop += 16; viewheight -= 32; } else { @@ -869,7 +869,7 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) chr = g_Vars.currentplayer->eyespy->prop->chr; #if VERSION >= VERSION_NTSC_1_0 - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() >= 2) { + if (options_get_screen_split() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() >= 2) { vsplit = true; } #endif @@ -909,11 +909,11 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) #endif if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { - gdl = textSetPrimColour(gdl, 0x00ff0028); + gdl = text_set_prim_colour(gdl, 0x00ff0028); } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { - gdl = textSetPrimColour(gdl, 0x2244ffa0); + gdl = text_set_prim_colour(gdl, 0x2244ffa0); } else { - gdl = textSetPrimColour(gdl, 0xff3300a0); + gdl = text_set_prim_colour(gdl, 0xff3300a0); } #if VERSION >= VERSION_NTSC_1_0 @@ -963,9 +963,9 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) } // "S/MPS" - sprintf(text, "%s %s%5.2f", langGet(L_MISC_073), "", movedist * 0.6f); + sprintf(text, "%s %s%5.2f", lang_get(L_MISC_073), "", movedist * 0.6f); savedy = viewtop + 14; - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = viewleft + 25 * scale; y = savedy; x2 = x + textwidth; \ @@ -974,16 +974,16 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextbright, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextbright, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif // "H/M" - sprintf(text, "%s %s%4.2f", langGet(L_MISC_074), "", g_Vars.currentplayer->eyespy->height * 0.01f); + sprintf(text, "%s %s%4.2f", lang_get(L_MISC_074), "", g_Vars.currentplayer->eyespy->height * 0.01f); savedy += 9; - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = viewleft + 25 * scale; y = savedy; x2 = x + textwidth; \ @@ -991,16 +991,16 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextbright, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextbright, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif // "Y/D" - sprintf(text, "%s %d", langGet(L_MISC_075), (s32)g_Vars.currentplayer->eyespy->theta); + sprintf(text, "%s %d", lang_get(L_MISC_075), (s32)g_Vars.currentplayer->eyespy->theta); savedy += 9; - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = viewleft + 25 * scale; y = savedy; x2 = x + textwidth; \ @@ -1008,16 +1008,16 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextbright, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextbright, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif // "P/D" - sprintf(text, "%s %d", langGet(L_MISC_076), (s32)g_Vars.currentplayer->eyespy->verta); + sprintf(text, "%s %d", lang_get(L_MISC_076), (s32)g_Vars.currentplayer->eyespy->verta); savedy += 9; - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = viewleft + 25 * scale; y = savedy; x2 = x + textwidth; \ @@ -1025,15 +1025,15 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextbright, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextbright, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextbright, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif // "CI 2023" - sprintf(text, "%s", langGet(L_MISC_077)); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + sprintf(text, "%s", lang_get(L_MISC_077)); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_NTSC_1_0 x = (vsplit ? -3 : 0) + viewleft + 25 * scale + 5; @@ -1047,21 +1047,21 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { - sprintf(text, "%s", langGet(L_MISC_078)); // "YKK: 95935" + sprintf(text, "%s", lang_get(L_MISC_078)); // "YKK: 95935" } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { - sprintf(text, "%s", langGet(L_MISC_208)); // "JM: 201172" + sprintf(text, "%s", lang_get(L_MISC_208)); // "JM: 201172" } else { - sprintf(text, "%s", langGet(L_MISC_217)); // "BNC: 15877" + sprintf(text, "%s", lang_get(L_MISC_217)); // "BNC: 15877" } - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_NTSC_1_0 x = viewleft + 25 * scale + (vsplit ? -3 : 0) + 5; @@ -1076,16 +1076,16 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { // "CAMSPY" - sprintf(text, " %s", langGet(L_MISC_079)); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + sprintf(text, " %s", lang_get(L_MISC_079)); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_PAL_FINAL x = viewright - textwidth - 27; @@ -1102,15 +1102,15 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { // "DRUGSPY" - sprintf(text, " %s", langGet(L_MISC_468)); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + sprintf(text, " %s", lang_get(L_MISC_468)); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_PAL_FINAL x = viewright - textwidth - 27; @@ -1127,15 +1127,15 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif } else { // "BOMBSPY" - sprintf(text, " %s", langGet(L_MISC_469)); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + sprintf(text, " %s", lang_get(L_MISC_469)); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_PAL_FINAL x = viewright - textwidth - 27; @@ -1152,23 +1152,23 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif } // Model number if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { - sprintf(text, "%s", langGet(L_MISC_080)); // "MODEL 1.2" + sprintf(text, "%s", lang_get(L_MISC_080)); // "MODEL 1.2" } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { - sprintf(text, "%s", langGet(L_MISC_207)); // "MODEL 1.4" + sprintf(text, "%s", lang_get(L_MISC_207)); // "MODEL 1.4" } else { - sprintf(text, "%s", langGet(L_MISC_216)); // "MODEL 1.3" + sprintf(text, "%s", lang_get(L_MISC_216)); // "MODEL 1.3" } - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_PAL_FINAL x = (vsplit ? 3 : 0) + viewright - textwidth - 27; y = (vsplit ? -11 : 0) + viewtop + 34; @@ -1184,21 +1184,21 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif // Gyrostat/dartammo text if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY || g_Vars.currentplayer->eyespy->mode == EYESPYMODE_BOMBSPY) { - sprintf(text, "%s", langGet(L_MISC_081)); // "GYROSTAT" + sprintf(text, "%s", lang_get(L_MISC_081)); // "GYROSTAT" } else { - sprintf(text, "%s", langGet(L_MISC_206)); // "DARTAMMO" + sprintf(text, "%s", lang_get(L_MISC_206)); // "DARTAMMO" } - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_PAL_FINAL x = viewright - textwidth - 27; y = (vsplit ? -2 : 0) + viewbottom - 12; @@ -1215,20 +1215,20 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) gdl = text0f153858(gdl, &x, &y, &x2, &y2); #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, - colourtextdull, colourglow, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + colourtextdull, colourglow, vi_get_width(), vi_get_height(), 0, 0); #endif gdl = text0f153838(gdl); { - s8 contpadnum = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); - u16 buttonsdown = joyGetButtons(contpadnum, 0xffff); \ - u16 buttonsthisframe = joyGetButtonsPressedThisFrame(contpadnum, 0xffff); - s8 cstickx = joyGetStickX(contpadnum); \ - s8 csticky = joyGetStickY(contpadnum); + s8 contpadnum = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); + u16 buttonsdown = joy_get_buttons(contpadnum, 0xffff); \ + u16 buttonsthisframe = joy_get_buttons_pressed_this_frame(contpadnum, 0xffff); + s8 cstickx = joy_get_stick_x(contpadnum); \ + s8 csticky = joy_get_stick_y(contpadnum); s32 xpos; s32 tmpval; u8 brightness; @@ -1808,8 +1808,8 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) #if VERSION == VERSION_PAL_FINAL if (PLAYERCOUNT() >= 2 - || optionsGetEffectiveScreenSize() == SCREENSIZE_WIDE - || optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA) { + || options_get_effective_screen_size() == SCREENSIZE_WIDE + || options_get_effective_screen_size() == SCREENSIZE_CINEMA) { ypos += 16; } else { ypos += 23; @@ -1843,11 +1843,11 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) ypos -= 2; if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { - gdl = bviewDrawEyespySideRect(gdl, points, 0, brightness, 0, alpha); + gdl = bview_draw_eyespy_side_rect(gdl, points, 0, brightness, 0, alpha); } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { - gdl = bviewDrawEyespySideRect(gdl, points, 0x10, brightness, brightness * 3, alpha); + gdl = bview_draw_eyespy_side_rect(gdl, points, 0x10, brightness, brightness * 3, alpha); } else { - gdl = bviewDrawEyespySideRect(gdl, points, brightness, brightness >> 2, 0, alpha); + gdl = bview_draw_eyespy_side_rect(gdl, points, brightness, brightness >> 2, 0, alpha); } y += barheight; @@ -1877,8 +1877,8 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) #if VERSION == VERSION_PAL_FINAL if (PLAYERCOUNT() >= 2 - || optionsGetEffectiveScreenSize() == SCREENSIZE_WIDE - || optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA) { + || options_get_effective_screen_size() == SCREENSIZE_WIDE + || options_get_effective_screen_size() == SCREENSIZE_CINEMA) { ypos += 16; } else { ypos += 23; @@ -1912,11 +1912,11 @@ Gfx *bviewDrawEyespyMetrics(Gfx *gdl) ypos -= 2; if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { - gdl = bviewDrawEyespySideRect(gdl, points, 0, brightness, 0, alpha); + gdl = bview_draw_eyespy_side_rect(gdl, points, 0, brightness, 0, alpha); } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { - gdl = bviewDrawEyespySideRect(gdl, points, 0x10, brightness, brightness * 3U, alpha); + gdl = bview_draw_eyespy_side_rect(gdl, points, 0x10, brightness, brightness * 3U, alpha); } else { - gdl = bviewDrawEyespySideRect(gdl, points, brightness, brightness >> 2, 0, alpha); + gdl = bview_draw_eyespy_side_rect(gdl, points, brightness, brightness >> 2, 0, alpha); } y += barheight; @@ -1937,13 +1937,13 @@ void bview0f1572f8(void) u8 var8007f878 = 0; -Gfx *bviewDrawNvLens(Gfx *gdl) +Gfx *bview_draw_nv_lens(Gfx *gdl) { - u16 *fb = viGetBackBuffer(); - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); - s32 viewtop = viGetViewTop(); - s32 viewleft = viGetViewLeft(); + u16 *fb = vi_get_back_buffer(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); + s32 viewtop = vi_get_view_top(); + s32 viewleft = vi_get_view_left(); s32 viewbottom = viewtop + viewheight; s32 brightness; s32 y; @@ -1962,19 +1962,19 @@ Gfx *bviewDrawNvLens(Gfx *gdl) var8009caed = 0x50; var8009caee = 0xc0; - brightness = roomGetFinalBrightness(g_Vars.currentplayer->prop->rooms[0]); + brightness = room_get_final_brightness(g_Vars.currentplayer->prop->rooms[0]); if (brightness > 128) { - skySetOverexposure(brightness, brightness, brightness); + sky_set_overexposure(brightness, brightness, brightness); } if (g_Menus[g_Vars.currentplayerstats->mpindex].curdialog == NULL) { - gdl = bviewDrawMotionBlur(gdl, 0x00ff0000, 0x60); + gdl = bview_draw_motion_blur(gdl, 0x00ff0000, 0x60); } gDPPipeSync(gdl++); - gdl = bviewPrepareStaticRgba16(gdl, 0xffffffff, 0xff); + gdl = bview_prepare_static_rgba16(gdl, 0xffffffff, 0xff); var8007f878++; @@ -1990,7 +1990,7 @@ Gfx *bviewDrawNvLens(Gfx *gdl) gDPSetColor(gdl++, G_SETENVCOLOR, (green << 16) + 0xff); - gdl = bviewCopyPixels(gdl, fb, y, 5, y, 1, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, y, 5, y, 1, viewleft, viewwidth); } return gdl; @@ -1999,20 +1999,20 @@ Gfx *bviewDrawNvLens(Gfx *gdl) /** * Night vision doesn't have binoculars. */ -Gfx *bviewDrawNvBinoculars(Gfx *gdl) +Gfx *bview_draw_nv_binoculars(Gfx *gdl) { return gdl; } -Gfx *bviewDrawIrLens(Gfx *gdl) +Gfx *bview_draw_ir_lens(Gfx *gdl) { s32 i; s32 fadeincrement; - u16 *fb = viGetBackBuffer(); - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); - s32 viewtop = viGetViewTop(); - s32 viewleft = viGetViewLeft(); + u16 *fb = vi_get_back_buffer(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); + s32 viewtop = vi_get_view_top(); + s32 viewleft = vi_get_view_left(); s32 viewright; s32 viewbottom; s32 viewcentrex; @@ -2134,7 +2134,7 @@ Gfx *bviewDrawIrLens(Gfx *gdl) gDPPipeSync(gdl++); - gdl = bviewPrepareStaticRgba16(gdl, 0xffffffff, 255); + gdl = bview_prepare_static_rgba16(gdl, 0xffffffff, 255); sqinnerradius = innerradius * innerradius; @@ -2172,14 +2172,14 @@ Gfx *bviewDrawIrLens(Gfx *gdl) s32 rightsidewidth = viewwidth - semicircleright; // Left and right of semicircle - gdl = bviewCopyPixels(gdl, fb, i, 5, i, 1.0f, viewleft, viewcentrex); - gdl = bviewCopyPixels(gdl, fb, i, 5, i, 1.0f, semicircleright, rightsidewidth); + gdl = bview_copy_pixels(gdl, fb, i, 5, i, 1.0f, viewleft, viewcentrex); + gdl = bview_copy_pixels(gdl, fb, i, 5, i, 1.0f, semicircleright, rightsidewidth); // The semicircle itself has a static colour gDPSetEnvColorViaWord(gdl++, 0xee0000ff); - gdl = bviewCopyPixels(gdl, fb, i, 5, i, 1.0f, viewcentrex, semicirclewidth); + gdl = bview_copy_pixels(gdl, fb, i, 5, i, 1.0f, viewcentrex, semicirclewidth); } else { - gdl = bviewCopyPixels(gdl, fb, i, 5, i, 1.0f, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, i, 5, i, 1.0f, viewleft, viewwidth); } #if VERSION >= VERSION_NTSC_1_0 @@ -2194,7 +2194,7 @@ Gfx *bviewDrawIrLens(Gfx *gdl) } if (g_Menus[g_Vars.currentplayerstats->mpindex].curdialog == NULL) { - gdl = bviewDrawMotionBlur(gdl, 0xff000000, 0x40); + gdl = bview_draw_motion_blur(gdl, 0xff000000, 0x40); } return gdl; @@ -2204,15 +2204,15 @@ Gfx *bviewDrawIrLens(Gfx *gdl) * Draw a horizontal blur/sretch effect. Unused. * * The term "Intro" used in the string suggests that was made for an older - * version of the title screen, similar to bviewDrawIntroText. + * version of the title screen, similar to bview_draw_intro_text. */ -Gfx *bviewDrawIntroFaderBlur(Gfx *gdl, s32 arg1) +Gfx *bview_draw_intro_fader_blur(Gfx *gdl, s32 arg1) { - u16 *fb = viGetBackBuffer(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); - s32 viewleft = viGetViewLeft(); + u16 *fb = vi_get_back_buffer(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); + s32 viewleft = vi_get_view_left(); f32 halfheight; f32 extra; s32 y; @@ -2227,7 +2227,7 @@ Gfx *bviewDrawIntroFaderBlur(Gfx *gdl, s32 arg1) gDPPipeSync(gdl++); - gdl = bviewPrepareStaticRgba16(gdl, 0xffffffff, 255); + gdl = bview_prepare_static_rgba16(gdl, 0xffffffff, 255); halfheight = viewheight * 0.5f; @@ -2247,7 +2247,7 @@ Gfx *bviewDrawIntroFaderBlur(Gfx *gdl, s32 arg1) frac = 1.0f; } - gdl = bviewCopyPixels(gdl, fb, y, 5, y, RANDOMFRAC() * frac + 1.0f, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, y, 5, y, RANDOMFRAC() * frac + 1.0f, viewleft, viewwidth); } return gdl; @@ -2256,13 +2256,13 @@ Gfx *bviewDrawIntroFaderBlur(Gfx *gdl, s32 arg1) /** * Called from the title screen's "Rare Presents" mode, which is unused. */ -Gfx *bviewDrawIntroText(Gfx *gdl) +Gfx *bview_draw_intro_text(Gfx *gdl) { - u16 *fb = viGetBackBuffer(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); - s32 viewleft = viGetViewLeft(); + u16 *fb = vi_get_back_buffer(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); + s32 viewleft = vi_get_view_left(); s32 y; var8007f840++; @@ -2275,22 +2275,22 @@ Gfx *bviewDrawIntroText(Gfx *gdl) gDPPipeSync(gdl++); - gdl = bviewPrepareStaticRgba16(gdl, 0x8f8f8f8f, 255); + gdl = bview_prepare_static_rgba16(gdl, 0x8f8f8f8f, 255); for (y = viewtop; y < viewtop + viewheight; y += 2) { - gdl = bviewCopyPixels(gdl, fb, y, 5, y, 1.0f, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, y, 5, y, 1.0f, viewleft, viewwidth); } return gdl; } -Gfx *bviewDrawHorizonScanner(Gfx *gdl) +Gfx *bview_draw_horizon_scanner(Gfx *gdl) { - u16 *fb = viGetBackBuffer(); - s32 viewtop = viGetViewTop(); - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); - s32 viewleft = viGetViewLeft(); + u16 *fb = vi_get_back_buffer(); + s32 viewtop = vi_get_view_top(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); + s32 viewleft = vi_get_view_left(); char directiontext[32]; char hertztext[24]; char zoomtext[24]; @@ -2338,7 +2338,7 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) scale = 2; } - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() >= 2) { + if (options_get_screen_split() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() >= 2) { vsplit = true; } @@ -2356,7 +2356,7 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) lenstop = viewtop + (viewheight / 2) - (lensheight / 2); // Black out areas above and below lens - gdl = textSetPrimColour(gdl, 0x000000ff); + gdl = text_set_prim_colour(gdl, 0x000000ff); gDPFillRectangle(gdl++, viewleft, viewtop, viewleft + viewwidth, lenstop); gDPFillRectangle(gdl++, viewleft, lenstop + lensheight, viewleft + viewwidth, viewtop + viewheight); @@ -2365,9 +2365,9 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) // Prepare text buffers sprintf(directiontext, "%s %s:%03d", arrows, &directions[(turnangle + 22) / 45], turnangle); - sprintf(hertztext, "%s %s%s%4.2fh", arrows, "", "", menuGetCosOscFrac(4) * 4.6f + 917.4f); + sprintf(hertztext, "%s %s%s%4.2fh", arrows, "", "", menu_get_cos_osc_frac(4) * 4.6f + 917.4f); - fovy = viGetFovY(); + fovy = vi_get_fov_y(); if (fovy == 0 || fovy == 60.0f) { fovy = 1; @@ -2387,8 +2387,8 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) } y = lenstop - 7; - gdl = textRenderProjected(gdl, &x, &y, arrows, - g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, arrows, + g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, vi_get_width(), vi_get_height(), 0, 0); // Product name #if VERSION >= VERSION_NTSC_1_0 @@ -2400,18 +2400,18 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) strcat(nametext, " SCANNER\n"); - gdl = textRenderProjected(gdl, &x, &y, nametext, - g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, nametext, + g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRenderProjected(gdl, &x, &y, " JMBC WIDE BAND SCANNER\n", - g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, " JMBC WIDE BAND SCANNER\n", + g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, vi_get_width(), vi_get_height(), 0, 0); #endif // Hertz x = viewleft + 75 * scale; y = lenstop + lensheight + 1; - gdl = textRenderProjected(gdl, &x, &y, hertztext, - g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, hertztext, + g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, vi_get_width(), vi_get_height(), 0, 0); // Zoom level if (vsplit) { @@ -2422,8 +2422,8 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) y = lenstop + lensheight + 1; } - gdl = textRenderProjected(gdl, &x, &y, zoomtext, - g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, zoomtext, + g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, vi_get_width(), vi_get_height(), 0, 0); // Direction if (vsplit) { @@ -2434,13 +2434,13 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) y = lenstop + lensheight + 1; } - gdl = textRenderProjected(gdl, &x, &y, directiontext, - g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, directiontext, + g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffff7f, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); gDPPipeSync(gdl++); - gdl = bviewPrepareStaticRgba16(gdl, 0xffffffff, 255); + gdl = bview_prepare_static_rgba16(gdl, 0xffffffff, 255); if (vsplit) { vsplit = 14; @@ -2473,7 +2473,7 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) } if (range > 0) { - colour = colourBlend(0x000000ff, colour, range * 255.0f); + colour = colour_blend(0x000000ff, colour, range * 255.0f); } } else { // Outside of the lens @@ -2493,7 +2493,7 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) gDPSetColor(gdl++, G_SETENVCOLOR, colour); - gdl = bviewCopyPixels(gdl, fb, liney, 5, liney, RANDOMFRAC() * range + 1, viewleft, viewwidth); + gdl = bview_copy_pixels(gdl, fb, liney, 5, liney, RANDOMFRAC() * range + 1, viewleft, viewwidth); } return gdl; @@ -2507,12 +2507,12 @@ Gfx *bviewDrawHorizonScanner(Gfx *gdl) * screen is then iterated top to bottom, one line at a time, and draws * black rectangles on each line to fill in the area outside the circles. */ -Gfx *bviewDrawIrBinoculars(Gfx *gdl) +Gfx *bview_draw_ir_binoculars(Gfx *gdl) { - s32 viewheight = viGetViewHeight(); - s32 viewwidth = viGetViewWidth(); - s32 viewtop = viGetViewTop(); - s32 viewleft = viGetViewLeft(); + s32 viewheight = vi_get_view_height(); + s32 viewwidth = vi_get_view_width(); + s32 viewtop = vi_get_view_top(); + s32 viewleft = vi_get_view_left(); s32 viewright = viewleft + viewwidth; s32 viewbottom = viewtop + viewheight; s32 leftx = viewleft + viewwidth / 3; @@ -2538,24 +2538,24 @@ Gfx *bviewDrawIrBinoculars(Gfx *gdl) // Left side if (leftx - xoffset > viewleft) { - gdl = bviewDrawIrRect(gdl, viewleft, y, leftx - xoffset, y + 1); + gdl = bview_draw_ir_rect(gdl, viewleft, y, leftx - xoffset, y + 1); } // Middle (top and bottom) if (leftx + xoffset < rightx - xoffset) { - gdl = bviewDrawIrRect(gdl, leftx + xoffset, y, rightx - xoffset, y + 1); + gdl = bview_draw_ir_rect(gdl, leftx + xoffset, y, rightx - xoffset, y + 1); } // Right side if (rightx + xoffset < viewright) { - gdl = bviewDrawIrRect(gdl, rightx + xoffset, y, viewright, y + 1); + gdl = bview_draw_ir_rect(gdl, rightx + xoffset, y, viewright, y + 1); } } else { // Very top or bottom - whole line is black #if VERSION >= VERSION_NTSC_1_0 - gdl = bviewDrawIrRect(gdl, viewleft, y, viewright, y + 1); + gdl = bview_draw_ir_rect(gdl, viewleft, y, viewright, y + 1); #else - gdl = bviewDrawIrRect(gdl, viewleft, y, viewright - 1, y + 1); + gdl = bview_draw_ir_rect(gdl, viewleft, y, viewright - 1, y + 1); #endif } } @@ -2568,14 +2568,14 @@ Gfx *bview0f148b38(Gfx *gdl) return gdl; } -void bviewSetMotionBlur(u32 bluramount) +void bview_set_motion_blur(u32 bluramount) { var8007f840 = 0; var8007f848 = 0; var8007f844 = (bluramount << 1) / 3; } -void bviewClearMotionBlur(void) +void bview_clear_motion_blur(void) { var8007f844 = 0; } diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index 2e87123ab..472f68371 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -27,7 +27,7 @@ #include "data.h" #include "types.h" -void bwalkInit(void) +void bwalk_init(void) { u32 prevmode = g_Vars.currentplayer->bondmovemode; s32 i; @@ -69,14 +69,14 @@ void bwalkInit(void) g_Vars.currentplayer->crouchoffset = 0; #if VERSION < VERSION_NTSC_1_0 - bwalkUpdateCrouchOffsetReal(); + bwalk_update_crouch_offset_real(); #endif g_Vars.currentplayer->guncloseroffset = 0; } #if VERSION >= VERSION_NTSC_1_0 - bwalkUpdateCrouchOffsetReal(); + bwalk_update_crouch_offset_real(); #endif if (prevmode != MOVEMODE_GRAB && prevmode != MOVEMODE_WALK) { @@ -110,9 +110,9 @@ void bwalkInit(void) delta.y = 0; delta.z = g_Vars.currentplayer->walkinitpos.z - g_Vars.currentplayer->prop->pos.z; - propSetPerimEnabled(g_Vars.currentplayer->hoverbike, false); - bwalkCalculateNewPositionWithPush(&delta, 0, true, 0, CDTYPE_ALL); - propSetPerimEnabled(g_Vars.currentplayer->hoverbike, true); + prop_set_perim_enabled(g_Vars.currentplayer->hoverbike, false); + bwalk_calculate_new_position_with_push(&delta, 0, true, 0, CDTYPE_ALL); + prop_set_perim_enabled(g_Vars.currentplayer->hoverbike, true); } else if (prevmode != MOVEMODE_GRAB && prevmode != MOVEMODE_WALK) { g_Vars.currentplayer->moveinitspeed.x = 0; g_Vars.currentplayer->moveinitspeed.y = 0; @@ -120,12 +120,12 @@ void bwalkInit(void) } } -void bwalkSetSwayTarget(s32 value) +void bwalk_set_sway_target(s32 value) { g_Vars.currentplayer->swaytarget = value * 75.0f; } -void bwalkAdjustCrouchPos(s32 value) +void bwalk_adjust_crouch_pos(s32 value) { g_Vars.currentplayer->crouchpos += value; @@ -150,9 +150,9 @@ void bwalk0f0c3b38(struct coord *reltarget, struct defaultobj *obj) abstarget.z = reltarget->z + g_Vars.currentplayer->prop->pos.z; #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&globalthinga, &globalthingb, 223, "bondwalk.c"); + cd_get_edge(&globalthinga, &globalthingb, 223, "bondwalk.c"); #else - cdGetEdge(&globalthinga, &globalthingb, 221, "bondwalk.c"); + cd_get_edge(&globalthinga, &globalthingb, 221, "bondwalk.c"); #endif vector.x = globalthingb.z - globalthinga.z; @@ -183,7 +183,7 @@ void bwalk0f0c3b38(struct coord *reltarget, struct defaultobj *obj) * The function is called with amount = 0 when attempting to stand up from a * crouch, after increasing the player's bbox to the standing size. */ -s32 bwalkTryMoveUpwards(f32 amount) +s32 bwalk_try_move_upwards(f32 amount) { bool result; struct coord newpos; @@ -206,23 +206,23 @@ s32 bwalkTryMoveUpwards(f32 amount) types = g_Vars.bondcollisions ? CDTYPE_ALL : CDTYPE_BG; - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); func0f065e74(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &newpos, rooms); - bmoveFindEnteredRoomsByPos(g_Vars.currentplayer, &newpos, rooms); - propSetPerimEnabled(g_Vars.currentplayer->prop, false); + bmove_find_entered_rooms_by_pos(g_Vars.currentplayer, &newpos, rooms); + prop_set_perim_enabled(g_Vars.currentplayer->prop, false); ymin -= 0.1f; - result = cdTestVolume(&newpos, radius, rooms, types, CHECKVERTICAL_YES, + result = cd_test_volume(&newpos, radius, rooms, types, CHECKVERTICAL_YES, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); - propSetPerimEnabled(g_Vars.currentplayer->prop, true); + prop_set_perim_enabled(g_Vars.currentplayer->prop, true); if (result == CDRESULT_NOCOLLISION) { g_Vars.currentplayer->prop->pos.y = newpos.y; - propDeregisterRooms(g_Vars.currentplayer->prop); - roomsCopy(rooms, g_Vars.currentplayer->prop->rooms); + prop_deregister_rooms(g_Vars.currentplayer->prop); + rooms_copy(rooms, g_Vars.currentplayer->prop->rooms); } g_Vars.enableslopes = true; @@ -230,7 +230,7 @@ s32 bwalkTryMoveUpwards(f32 amount) return result; } -bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, f32 extrawidth, s32 checktypes) +bool bwalk_calculate_new_position(struct coord *vel, f32 rotateamount, bool apply, f32 extrawidth, s32 checktypes) { s32 result = CDRESULT_NOCOLLISION; f32 halfradius; @@ -258,10 +258,10 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, if (vel->x || vel->y || vel->z) { if (g_Vars.currentplayer->tank) { - propSetPerimEnabled(g_Vars.currentplayer->tank, false); + prop_set_perim_enabled(g_Vars.currentplayer->tank, false); } - propSetPerimEnabled(g_Vars.currentplayer->prop, false); + prop_set_perim_enabled(g_Vars.currentplayer->prop, false); dstpos.x += vel->x; dstpos.y += vel->y; @@ -269,7 +269,7 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, types = g_Vars.bondcollisions ? checktypes : CDTYPE_BG; - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); radius += extrawidth; func0f065dfc(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, @@ -285,7 +285,7 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, } #endif - bmoveFindEnteredRoomsByPos(g_Vars.currentplayer, &dstpos, dstrooms); + bmove_find_entered_rooms_by_pos(g_Vars.currentplayer, &dstpos, dstrooms); copyrooms = true; @@ -297,29 +297,29 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, halfradius = radius * 0.5f; if (xdiff > halfradius || zdiff > halfradius || xdiff < -halfradius || zdiff < -halfradius) { - result = cdExamCylMove06(&g_Vars.currentplayer->prop->pos, + result = cd_exam_cyl_move06(&g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, &dstpos, dstrooms, radius, types, 1, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); if (result == CDRESULT_NOCOLLISION) { - result = cdExamCylMove02(&g_Vars.currentplayer->prop->pos, + result = cd_exam_cyl_move02(&g_Vars.currentplayer->prop->pos, &dstpos, radius, dstrooms, types, true, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); } } else { - result = cdExamCylMove02(&g_Vars.currentplayer->prop->pos, + result = cd_exam_cyl_move02(&g_Vars.currentplayer->prop->pos, &dstpos, radius, sp64, types, true, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y); } - propSetPerimEnabled(g_Vars.currentplayer->prop, true); + prop_set_perim_enabled(g_Vars.currentplayer->prop, true); if (g_Vars.currentplayer->tank) { - propSetPerimEnabled(g_Vars.currentplayer->tank, true); + prop_set_perim_enabled(g_Vars.currentplayer->tank, true); } } @@ -341,8 +341,8 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, g_Vars.currentplayer->prop->pos.z = dstpos.z; if (copyrooms) { - propDeregisterRooms(g_Vars.currentplayer->prop); - roomsCopy(dstrooms, g_Vars.currentplayer->prop->rooms); + prop_deregister_rooms(g_Vars.currentplayer->prop); + rooms_copy(dstrooms, g_Vars.currentplayer->prop->rooms); } } @@ -351,12 +351,12 @@ bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, return result; } -bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bool apply, f32 extrawidth, s32 types) +bool bwalk_calculate_new_position_with_push(struct coord *delta, f32 rotateamount, bool apply, f32 extrawidth, s32 types) { - s32 result = bwalkCalculateNewPosition(delta, rotateamount, apply, extrawidth, types); + s32 result = bwalk_calculate_new_position(delta, rotateamount, apply, extrawidth, types); if (result != CDRESULT_NOCOLLISION) { - struct prop *obstacle = cdGetObstacleProp(); + struct prop *obstacle = cd_get_obstacle_prop(); if (obstacle && g_Vars.lvupdate240 > 0) { if (obstacle->type == PROPTYPE_DOOR) { @@ -368,9 +368,9 @@ bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bo if (door->doorflags & DOORFLAG_DAMAGEONCONTACT) { if (!g_Vars.currentplayer->isdead) { #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp84, &sp78, 465, "bondwalk.c"); + cd_get_edge(&sp84, &sp78, 465, "bondwalk.c"); #else - cdGetEdge(&sp84, &sp78, 460, "bondwalk.c"); + cd_get_edge(&sp84, &sp78, 460, "bondwalk.c"); #endif sp90.x = sp78.f[2] - sp84.f[2]; @@ -383,10 +383,10 @@ bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bo sp90.z = 1; } - chrDamageByLaser(g_Vars.currentplayer->prop->chr, 0.4f, &sp90, 0, g_Vars.currentplayer->prop); + chr_damage_by_laser(g_Vars.currentplayer->prop->chr, 0.4f, &sp90, 0, g_Vars.currentplayer->prop); // Laser zap sound - sndStart(var80095200, SFX_PICKUP_LASER, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_LASER, 0, -1, -1, -1, -1, -1); } } } else if (obstacle->type == PROPTYPE_CHR) { @@ -400,7 +400,7 @@ bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bo bool canpush = false; if (g_Vars.normmplayerisrunning) { - if (chrCompareTeams(g_Vars.currentplayer->prop->chr, chr, COMPARE_FRIENDS)) { + if (chr_compare_teams(g_Vars.currentplayer->prop->chr, chr, COMPARE_FRIENDS)) { // AI bot on same team canpush = true; } @@ -434,18 +434,18 @@ bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bo newpos.y = obstacle->pos.y; newpos.z = obstacle->pos.z + chr->pushspeed[1] * LVUPDATE60FREAL(); - chrCalculatePushPos(chr, &newpos, newrooms, false); + chr_calculate_push_pos(chr, &newpos, newrooms, false); obstacle->pos.x = newpos.x; obstacle->pos.y = newpos.y; obstacle->pos.z = newpos.z; - propDeregisterRooms(obstacle); - roomsCopy(newrooms, obstacle->rooms); + prop_deregister_rooms(obstacle); + rooms_copy(newrooms, obstacle->rooms); chr0f0220ac(chr); - modelSetRootPosition(chr->model, &newpos); + model_set_root_position(chr->model, &newpos); - result = bwalkCalculateNewPosition(delta, rotateamount, apply, extrawidth, types); + result = bwalk_calculate_new_position(delta, rotateamount, apply, extrawidth, types); } } } @@ -473,7 +473,7 @@ bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bo if (obj->hidden & OBJHFLAG_PROJECTILE && (obj->projectile->flags & PROJECTILEFLAG_SLIDING)) { bool somevalue; bool embedded = false; - somevalue = projectileTick(obj, &embedded); + somevalue = projectile_tick(obj, &embedded); if (obj->hidden & OBJHFLAG_PROJECTILE) { obj->projectile->flags |= PROJECTILEFLAG_00001000; @@ -486,7 +486,7 @@ bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bo } if (somevalue) { - result = bwalkCalculateNewPosition(delta, rotateamount, apply, extrawidth, types); + result = bwalk_calculate_new_position(delta, rotateamount, apply, extrawidth, types); } } } @@ -501,13 +501,13 @@ bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bo s32 bwalk0f0c4764(struct coord *delta, struct coord *arg1, struct coord *arg2, s32 types) { - s32 result = bwalkCalculateNewPositionWithPush(delta, 0, true, 0, types); + s32 result = bwalk_calculate_new_position_with_push(delta, 0, true, 0, types); if (result == CDRESULT_COLLISION) { #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(arg1, arg2, 607, "bondwalk.c"); + cd_get_edge(arg1, arg2, 607, "bondwalk.c"); #else - cdGetEdge(arg1, arg2, 602, "bondwalk.c"); + cd_get_edge(arg1, arg2, 602, "bondwalk.c"); #endif } @@ -520,12 +520,12 @@ s32 bwalk0f0c47d0(struct coord *a, struct coord *b, struct coord *c, struct coord quarter; bool result; - if (cd00024ea4()) { - f32 mult = cd00024e98(); + if (cd_00024ea4()) { + f32 mult = cd_00024e98(); quarter.x = a->x * mult * 0.25f; quarter.y = a->y * mult * 0.25f; quarter.z = a->z * mult * 0.25f; - result = bwalkCalculateNewPositionWithPush(&quarter, 0, true, 0, types); + result = bwalk_calculate_new_position_with_push(&quarter, 0, true, 0, types); if (result == CDRESULT_NOCOLLISION) { return CDRESULT_NOCOLLISION; @@ -533,9 +533,9 @@ s32 bwalk0f0c47d0(struct coord *a, struct coord *b, struct coord *c, if (result == CDRESULT_COLLISION) { #if VERSION >= VERSION_NTSC_1_0 - cdGetEdge(d, e, 635, "bondwalk.c"); + cd_get_edge(d, e, 635, "bondwalk.c"); #else - cdGetEdge(d, e, 630, "bondwalk.c"); + cd_get_edge(d, e, 630, "bondwalk.c"); #endif if (b->x != d->x @@ -574,7 +574,7 @@ s32 bwalk0f0c494c(struct coord *a, struct coord *b, struct coord *c, s32 types) sp2c.y = 0; sp2c.z = sp38.z * tmp; - return bwalkCalculateNewPositionWithPush(&sp2c, 0, true, 0, types); + return bwalk_calculate_new_position_with_push(&sp2c, 0, true, 0, types); } return -1; @@ -589,7 +589,7 @@ s32 bwalk0f0c4a5c(struct coord *arg0, struct coord *arg1, struct coord *arg2, s3 f32 tmp; f32 radius; - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); sp34.x = arg1->x - (g_Vars.currentplayer->prop->pos.x + arg0->f[0]); sp34.z = arg1->z - (g_Vars.currentplayer->prop->pos.z + arg0->f[2]); @@ -614,7 +614,7 @@ s32 bwalk0f0c4a5c(struct coord *arg0, struct coord *arg1, struct coord *arg2, s3 sp28.y = 0; sp28.z = sp34.z; - if (bwalkCalculateNewPositionWithPush(&sp28, 0, true, 0, types) == CDRESULT_NOCOLLISION) { + if (bwalk_calculate_new_position_with_push(&sp28, 0, true, 0, types) == CDRESULT_NOCOLLISION) { return true; } } @@ -642,7 +642,7 @@ s32 bwalk0f0c4a5c(struct coord *arg0, struct coord *arg1, struct coord *arg2, s3 sp28.y = 0; sp28.z = sp34.z; - if (bwalkCalculateNewPositionWithPush(&sp28, 0, true, 0, types) == CDRESULT_NOCOLLISION) { + if (bwalk_calculate_new_position_with_push(&sp28, 0, true, 0, types) == CDRESULT_NOCOLLISION) { return true; } } @@ -657,7 +657,7 @@ void bwalk0f0c4d98(void) // empty } -void bwalkUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult) +void bwalk_update_speed_sideways(f32 targetspeed, f32 accelspeed, s32 mult) { if (g_Vars.normmplayerisrunning) { targetspeed = (g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.unk1c + 25.0f) / 100 * targetspeed; @@ -680,7 +680,7 @@ void bwalkUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult) g_Vars.currentplayer->speedsideways = g_Vars.currentplayer->speedstrafe; } -void bwalkUpdateSpeedForwards(f32 targetspeed, f32 accelspeed) +void bwalk_update_speed_forwards(f32 targetspeed, f32 accelspeed) { if (g_Vars.normmplayerisrunning) { targetspeed = (g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.unk1c + 25.0f) / 100 * targetspeed; @@ -703,7 +703,7 @@ void bwalkUpdateSpeedForwards(f32 targetspeed, f32 accelspeed) g_Vars.currentplayer->speedforwards = g_Vars.currentplayer->speedgo; } -void bwalkUpdateVertical(void) +void bwalk_update_vertical(void) { s32 i; f32 newfallspeed; @@ -734,7 +734,7 @@ void bwalkUpdateVertical(void) struct defaultobj *obj; #endif - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); #if VERSION >= VERSION_NTSC_1_0 // Maybe reset counter-op's radius - not sure why @@ -742,7 +742,7 @@ void bwalkUpdateVertical(void) if (g_Vars.antiplayernum >= 0 && g_Vars.currentplayer == g_Vars.anti && g_Vars.currentplayer->bond2.radius != 30 - && cdTestVolume(&g_Vars.currentplayer->prop->pos, 30, g_Vars.currentplayer->prop->rooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y)) { + && cd_test_volume(&g_Vars.currentplayer->prop->pos, 30, g_Vars.currentplayer->prop->rooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - g_Vars.currentplayer->prop->pos.y, ymin - g_Vars.currentplayer->prop->pos.y)) { g_Vars.currentplayer->prop->chr->radius = 30; g_Vars.currentplayer->bond2.radius = 30; radius = 30; @@ -753,7 +753,7 @@ void bwalkUpdateVertical(void) // If this comes up false, a second check is done... maybe checking if the // player is touching a ladder from a room which shares the same coordinate // space? - onladder = cdFindLadder(&g_Vars.currentplayer->prop->pos, + onladder = cd_find_ladder(&g_Vars.currentplayer->prop->pos, radius * 1.2f, ymax - g_Vars.currentplayer->prop->pos.y, g_Vars.currentplayer->vv_manground - g_Vars.currentplayer->prop->pos.y + 1, g_Vars.currentplayer->prop->rooms, GEOFLAG_LADDER | GEOFLAG_LADDER_PLAYERONLY, @@ -763,9 +763,9 @@ void bwalkUpdateVertical(void) testpos.x = g_Vars.currentplayer->prop->pos.x; testpos.y = g_Vars.currentplayer->prop->pos.y - 10; testpos.z = g_Vars.currentplayer->prop->pos.z; - roomsCopy(g_Vars.currentplayer->prop->rooms, rooms); - bmoveFindEnteredRoomsByPos(g_Vars.currentplayer, &testpos, rooms); - onladder2 = cdFindLadder(&g_Vars.currentplayer->prop->pos, + rooms_copy(g_Vars.currentplayer->prop->rooms, rooms); + bmove_find_entered_rooms_by_pos(g_Vars.currentplayer, &testpos, rooms); + onladder2 = cd_find_ladder(&g_Vars.currentplayer->prop->pos, radius * 1.1f, ymax - g_Vars.currentplayer->prop->pos.y, g_Vars.currentplayer->vv_manground - g_Vars.currentplayer->prop->pos.y - 10, rooms, GEOFLAG_LADDER | GEOFLAG_LADDER_PLAYERONLY, &g_Vars.currentplayer->laddernormal); @@ -779,9 +779,9 @@ void bwalkUpdateVertical(void) testpos.y -= g_Vars.currentplayer->crouchheight + g_Vars.currentplayer->crouchoffsetrealsmall; } - roomsCopy(g_Vars.currentplayer->prop->rooms, rooms); - bmoveFindEnteredRoomsByPos(g_Vars.currentplayer, &testpos, rooms); - ground = cdFindGroundInfoAtCyl(&testpos, g_Vars.currentplayer->bond2.radius, rooms, + rooms_copy(g_Vars.currentplayer->prop->rooms, rooms); + bmove_find_entered_rooms_by_pos(g_Vars.currentplayer, &testpos, rooms); + ground = cd_find_ground_info_at_cyl(&testpos, g_Vars.currentplayer->bond2.radius, rooms, &g_Vars.currentplayer->floorcol, &g_Vars.currentplayer->floortype, &g_Vars.currentplayer->floorflags, &g_Vars.currentplayer->floorroom, &newinlift, &lift); @@ -794,7 +794,7 @@ void bwalkUpdateVertical(void) #if PIRACYCHECKS if (g_Vars.currentplayer->inlift && newinlift == false) { // Exiting a lift - piracyRestore(); + piracy_restore(); } #endif @@ -817,7 +817,7 @@ void bwalkUpdateVertical(void) || lift == NULL || lift->obj == NULL || (lift->obj->flags & OBJFLAG_CHOPPER_INACTIVE) == 0 - || bwalkTryMoveUpwards(moveamount) == CDRESULT_NOCOLLISION) { + || bwalk_try_move_upwards(moveamount) == CDRESULT_NOCOLLISION) { // Going up g_Vars.currentplayer->vv_manground += moveamount; g_Vars.currentplayer->sumground = g_Vars.currentplayer->vv_manground / (PAL ? 0.054400026798248f : 0.045499980449677f); @@ -847,11 +847,11 @@ void bwalkUpdateVertical(void) (ground <= g_Vars.currentplayer->vv_manground && ground <= g_Vars.currentplayer->vv_manground + g_Vars.currentplayer->ladderupdown)) { // Still on ladder - if (bwalkTryMoveUpwards(g_Vars.currentplayer->ladderupdown) == CDRESULT_NOCOLLISION) { + if (bwalk_try_move_upwards(g_Vars.currentplayer->ladderupdown) == CDRESULT_NOCOLLISION) { g_Vars.currentplayer->vv_manground += g_Vars.currentplayer->ladderupdown; } } else { - if (bwalkTryMoveUpwards(ground - g_Vars.currentplayer->vv_manground) == CDRESULT_NOCOLLISION) { + if (bwalk_try_move_upwards(ground - g_Vars.currentplayer->vv_manground) == CDRESULT_NOCOLLISION) { g_Vars.currentplayer->vv_manground = ground; onladder = false; } @@ -885,13 +885,13 @@ void bwalkUpdateVertical(void) sumground = g_Vars.currentplayer->vv_ground - 50; } - if (bwalkTryMoveUpwards(sumground - g_Vars.currentplayer->vv_manground) == CDRESULT_NOCOLLISION) { + if (bwalk_try_move_upwards(sumground - g_Vars.currentplayer->vv_manground) == CDRESULT_NOCOLLISION) { g_Vars.currentplayer->vv_manground = sumground; } #if VERSION >= VERSION_NTSC_1_0 else { // Not enough room above. If on a hoverbike, blow it up - prop = cdGetObstacleProp(); + prop = cd_get_obstacle_prop(); if (prop && g_Vars.currentplayer->prop->pos.y < prop->pos.y @@ -901,7 +901,7 @@ void bwalkUpdateVertical(void) if (obj->modelnum == MODEL_HOVBIKE) { amount = (obj->maxdamage - obj->damage + 1) / 250.0f; obj->flags &= ~OBJFLAG_INVINCIBLE; - objDamage(obj, amount, &obj->prop->pos, WEAPON_REMOTEMINE, -1); + obj_damage(obj, amount, &obj->prop->pos, WEAPON_REMOTEMINE, -1); } } } @@ -913,7 +913,7 @@ void bwalkUpdateVertical(void) && g_Vars.currentplayer->vv_manground - 20.0f < g_Vars.currentplayer->vv_ground && g_Vars.currentplayer->onladder == false && onladder2 == false) { - playerDie(true); + player_die(true); } } @@ -922,7 +922,7 @@ void bwalkUpdateVertical(void) fallspeed = g_Vars.currentplayer->bdeltapos.y; newmanground = g_Vars.currentplayer->vv_manground; - if (debugIsTurboModeEnabled() + if (debug_is_turbo_mode_enabled() && g_Vars.currentplayer->bondforcespeed.x == 0 && g_Vars.currentplayer->bondforcespeed.z == 0) { multiplier = 0.277777777f * 5; @@ -944,7 +944,7 @@ void bwalkUpdateVertical(void) fallspeed = -fallspeed; } - if (bwalkTryMoveUpwards(newmanground - g_Vars.currentplayer->vv_manground) == CDRESULT_NOCOLLISION) { + if (bwalk_try_move_upwards(newmanground - g_Vars.currentplayer->vv_manground) == CDRESULT_NOCOLLISION) { // Falling g_Vars.currentplayer->vv_manground = newmanground; g_Vars.currentplayer->bdeltapos.y = fallspeed; @@ -956,7 +956,7 @@ void bwalkUpdateVertical(void) } else { if (g_Vars.lvframe60 - g_Vars.currentplayer->fallstart > TICKS(240)) { // Have been falling for 4 seconds - playerDie(true); + player_die(true); } } } else { @@ -966,24 +966,24 @@ void bwalkUpdateVertical(void) && g_Vars.currentplayer->vv_ground < g_Vars.currentplayer->vv_manground - 30) { // Not falling - but still at least 30 units off the ground. // Must be something in the way... - prop = cdGetObstacleProp(); + prop = cd_get_obstacle_prop(); if (prop) { if (prop->type == PROPTYPE_CHR) { // Landed on top of a chr if (prop->chr->inlift) { - chrYeetFromPos(prop->chr, &g_Vars.currentplayer->prop->pos, 0); + chr_yeet_from_pos(prop->chr, &g_Vars.currentplayer->prop->pos, 0); } } else if (prop->type == PROPTYPE_PLAYER) { // Landed on top of a player u32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(prop)); + set_current_player_num(playermgr_get_player_num_by_prop(prop)); if (g_Vars.currentplayer->inlift) { - playerDieByShooter(prevplayernum, true); + player_die_by_shooter(prevplayernum, true); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } } } @@ -996,7 +996,7 @@ void bwalkUpdateVertical(void) } if (g_Vars.currentplayer->vv_manground <= -30000) { - playerDie(true); + player_die(true); } } } else { @@ -1006,7 +1006,7 @@ void bwalkUpdateVertical(void) } if (g_Vars.currentplayer->vv_manground <= -30000) { - playerDie(true); + player_die(true); } } @@ -1036,19 +1036,19 @@ void bwalkUpdateVertical(void) chr->floortype = g_Vars.currentplayer->floortype; chr->footstep = 1; - sound = footstepChooseSound(chr, true); + sound = footstep_choose_sound(chr, true); if (sound != -1) { if (sound != -1) { - psCreate(NULL, g_Vars.currentplayer->prop, sound, + ps_create(NULL, g_Vars.currentplayer->prop, sound, -1, -1, PSFLAG_0400 | PSFLAG_IGNOREROOMS, 0, PSTYPE_NONE, 0, -1, NULL, -1, -1, -1, -1); } chr->footstep = 2; - sound = footstepChooseSound(chr, true); + sound = footstep_choose_sound(chr, true); if (sound != -1) { - psCreate(NULL, g_Vars.currentplayer->prop, sound, + ps_create(NULL, g_Vars.currentplayer->prop, sound, -1, -1, PSFLAG_0400 | PSFLAG_IGNOREROOMS, 0, PSTYPE_NONE, 0, -1, NULL, -1, -1, -1, -1); } } @@ -1063,7 +1063,7 @@ void bwalkUpdateVertical(void) SFX_JO_LANDING_05B7 }; - psCreate(NULL, g_Vars.currentplayer->prop, sounds[random() % 3], + ps_create(NULL, g_Vars.currentplayer->prop, sounds[random() % 3], -1, -1, PSFLAG_0400 | PSFLAG_IGNOREROOMS, 0, PSTYPE_NONE, 0, -1, NULL, -1, -1, -1, -1); } } @@ -1128,23 +1128,23 @@ void bwalkUpdateVertical(void) g_Vars.currentplayer->prop->pos.y = newpos.y; g_Vars.currentplayer->prop->pos.z = newpos.z; - propDeregisterRooms(g_Vars.currentplayer->prop); - roomsCopy(newrooms, g_Vars.currentplayer->prop->rooms); + prop_deregister_rooms(g_Vars.currentplayer->prop); + rooms_copy(newrooms, g_Vars.currentplayer->prop->rooms); } } -void bwalkApplyCrouchSpeed(void) +void bwalk_apply_crouch_speed(void) { - if (bmoveGetCrouchPos() == CROUCHPOS_DUCK) { + if (bmove_get_crouch_pos() == CROUCHPOS_DUCK) { g_Vars.currentplayer->speedforwards *= 0.5f; g_Vars.currentplayer->speedsideways *= 0.5f; - } else if (bmoveGetCrouchPos() == CROUCHPOS_SQUAT) { + } else if (bmove_get_crouch_pos() == CROUCHPOS_SQUAT) { g_Vars.currentplayer->speedforwards *= 0.35f; g_Vars.currentplayer->speedsideways *= 0.35f; } } -void bwalkUpdateCrouchOffsetReal(void) +void bwalk_update_crouch_offset_real(void) { if (g_Vars.currentplayer->vv_eyeheight + -90.0f * g_Vars.currentplayer->vv_eyeheight * (1.0f / 159.0f) < 69.0f) { g_Vars.currentplayer->crouchoffsetreal = g_Vars.currentplayer->crouchoffset * ((69.0f - g_Vars.currentplayer->vv_eyeheight) / -90.0f); @@ -1152,7 +1152,7 @@ void bwalkUpdateCrouchOffsetReal(void) g_Vars.currentplayer->crouchoffsetreal = g_Vars.currentplayer->crouchoffset * g_Vars.currentplayer->vv_eyeheight * (1.0f / 159.0f); } - if (cheatIsActive(CHEAT_SMALLJO)) { + if (cheat_is_active(CHEAT_SMALLJO)) { g_Vars.currentplayer->crouchoffsetsmall = 69.0f - g_Vars.currentplayer->vv_eyeheight; g_Vars.currentplayer->crouchoffsetrealsmall = 69.0f - g_Vars.currentplayer->vv_eyeheight; } else { @@ -1161,15 +1161,15 @@ void bwalkUpdateCrouchOffsetReal(void) } } -void bwalkUpdateCrouchOffset(void) +void bwalk_update_crouch_offset(void) { f32 targetoffset = 0; - if (bmoveGetCrouchPos() == CROUCHPOS_SQUAT) { + if (bmove_get_crouch_pos() == CROUCHPOS_SQUAT) { targetoffset = -90; - } else if (bmoveGetCrouchPos() == CROUCHPOS_DUCK) { + } else if (bmove_get_crouch_pos() == CROUCHPOS_DUCK) { targetoffset = -45; - } else if (bmoveGetCrouchPos() == CROUCHPOS_STAND) { + } else if (bmove_get_crouch_pos() == CROUCHPOS_STAND) { // empty } @@ -1180,19 +1180,19 @@ void bwalkUpdateCrouchOffset(void) f32 prevcrouchoffsetrealsmall = g_Vars.currentplayer->crouchoffsetrealsmall; // f32 *frac, f32 maxfrac, f32 *fracspeed, f32 accel, f32 decel, f32 maxspeed - applySpeed(&g_Vars.currentplayer->crouchoffset, targetoffset, + apply_speed(&g_Vars.currentplayer->crouchoffset, targetoffset, &g_Vars.currentplayer->crouchspeed, PALUPF(0.5f), PALUPF(0.5f), PALUPF(5.0f)); - bwalkUpdateCrouchOffsetReal(); + bwalk_update_crouch_offset_real(); - if (bwalkTryMoveUpwards(0) == CDRESULT_COLLISION) { + if (bwalk_try_move_upwards(0) == CDRESULT_COLLISION) { // Crouch adjustment is blocked by ceiling g_Vars.currentplayer->crouchoffset = prevcrouchoffset; g_Vars.currentplayer->crouchoffsetreal = prevcrouchoffsetreal; g_Vars.currentplayer->crouchoffsetsmall = prevcrouchoffsetsmall; g_Vars.currentplayer->crouchoffsetrealsmall = prevcrouchoffsetrealsmall; g_Vars.currentplayer->crouchspeed = 0; - bwalkAdjustCrouchPos(-1); + bwalk_adjust_crouch_pos(-1); } } @@ -1203,7 +1203,7 @@ void bwalkUpdateCrouchOffset(void) g_Vars.currentplayer->guncloseroffset = g_Vars.currentplayer->crouchoffset / -90; } -void bwalkUpdateTheta(void) +void bwalk_update_theta(void) { f32 mult; f32 rotateamount; @@ -1214,7 +1214,7 @@ void bwalkUpdateTheta(void) rotateamount = g_Vars.currentplayer->speedtheta * mult * g_Vars.lvupdate60freal * 0.0174505133f * 3.5f; - bwalkCalculateNewPositionWithPush(&delta, rotateamount, true, 0, CDTYPE_ALL); + bwalk_calculate_new_position_with_push(&delta, rotateamount, true, 0, CDTYPE_ALL); } void bwalk0f0c63bc(struct coord *arg0, u32 arg1, s32 types) @@ -1263,50 +1263,50 @@ void bwalk0f0c63bc(struct coord *arg0, u32 arg1, s32 types) bwalk0f0c4d98(); } -void bwalkUpdatePrevPos(void) +void bwalk_update_prev_pos(void) { g_Vars.currentplayer->bondprevpos.x = g_Vars.currentplayer->prop->pos.x; g_Vars.currentplayer->bondprevpos.y = g_Vars.currentplayer->prop->pos.y; g_Vars.currentplayer->bondprevpos.z = g_Vars.currentplayer->prop->pos.z; - roomsCopy(g_Vars.currentplayer->prop->rooms, g_Vars.currentplayer->bondprevrooms); + rooms_copy(g_Vars.currentplayer->prop->rooms, g_Vars.currentplayer->bondprevrooms); } -void bwalkHandleActivate(void) +void bwalk_handle_activate(void) { if (g_Vars.currentplayer->walkinitmove) { g_Vars.currentplayer->bondactivateorreload = 0; } } -void bwalkApplyMoveData(struct movedata *data) +void bwalk_apply_move_data(struct movedata *data) { if (g_Vars.currentplayer->walkinitmove == false) { // Sideways if (data->digitalstepleft) { - bwalkUpdateSpeedSideways(-1, 0.2f, data->digitalstepleft); + bwalk_update_speed_sideways(-1, 0.2f, data->digitalstepleft); } else if (data->digitalstepright) { - bwalkUpdateSpeedSideways(1, 0.2f, data->digitalstepright); + bwalk_update_speed_sideways(1, 0.2f, data->digitalstepright); } else if (data->unk14 == false) { - bwalkUpdateSpeedSideways(0, 0.2f, g_Vars.lvupdate60); + bwalk_update_speed_sideways(0, 0.2f, g_Vars.lvupdate60); } if (data->unk14) { - bwalkUpdateSpeedSideways(data->analogstrafe * 0.014285714365542f, 0.2f, g_Vars.lvupdate60); + bwalk_update_speed_sideways(data->analogstrafe * 0.014285714365542f, 0.2f, g_Vars.lvupdate60); } // Forward/back if (data->digitalstepforward) { - bwalkUpdateSpeedForwards(1, 1); + bwalk_update_speed_forwards(1, 1); g_Vars.currentplayer->speedmaxtime60 += g_Vars.lvupdate60; } else if (data->digitalstepback) { - bwalkUpdateSpeedForwards(-1, 1); + bwalk_update_speed_forwards(-1, 1); } else if (data->canlookahead == false) { - bwalkUpdateSpeedForwards(0, 1); + bwalk_update_speed_forwards(0, 1); } if (data->canlookahead) { - bwalkUpdateSpeedForwards(data->analogwalk * 0.014285714365542f, 1); + bwalk_update_speed_forwards(data->analogwalk * 0.014285714365542f, 1); if (data->analogwalk > 60) { g_Vars.currentplayer->speedmaxtime60 += g_Vars.lvupdate60; @@ -1336,35 +1336,35 @@ void bwalkApplyMoveData(struct movedata *data) g_Vars.currentplayer->speedforwards *= g_Vars.currentplayer->speedboost; if ((data->canlookahead == false && data->digitalstepforward == false) || - bmoveGetCrouchPos() != CROUCHPOS_STAND) { + bmove_get_crouch_pos() != CROUCHPOS_STAND) { g_Vars.currentplayer->speedmaxtime60 = 0; } if (data->rleanleft) { - bwalkSetSwayTarget(-1); + bwalk_set_sway_target(-1); } else if (data->rleanright) { - bwalkSetSwayTarget(1); + bwalk_set_sway_target(1); } else { - bwalkSetSwayTarget(0); + bwalk_set_sway_target(0); } while (data->crouchdown-- > 0) { - bwalkAdjustCrouchPos(-1); + bwalk_adjust_crouch_pos(-1); } while (data->crouchup-- > 0) { - bwalkAdjustCrouchPos(1); + bwalk_adjust_crouch_pos(1); } g_Vars.currentplayer->eyesshut = data->eyesshut; } } -void bwalkUpdateSpeedTheta(void) +void bwalk_update_speed_theta(void) { - if (bmoveGetCrouchPos() == CROUCHPOS_SQUAT) { + if (bmove_get_crouch_pos() == CROUCHPOS_SQUAT) { g_Vars.currentplayer->speedtheta *= 0.5f; - } else if (bmoveGetCrouchPos() == CROUCHPOS_DUCK) { + } else if (bmove_get_crouch_pos() == CROUCHPOS_DUCK) { g_Vars.currentplayer->speedtheta *= 0.75f; } } @@ -1416,7 +1416,7 @@ void bwalk0f0c69b8(void) spc0 = g_Vars.currentplayer->vv_eyeheight - 159; - if (invHasBriefcase() && ((g_MpSetup.scenario == MPSCENARIO_HOLDTHEBRIEFCASE || g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE))) { + if (inv_has_briefcase() && ((g_MpSetup.scenario == MPSCENARIO_HOLDTHEBRIEFCASE || g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE))) { spc0 = -63.600006f; } @@ -1427,7 +1427,7 @@ void bwalk0f0c69b8(void) } #if VERSION >= VERSION_NTSC_1_0 - if (cheatIsActive(CHEAT_SMALLJO)) { + if (cheat_is_active(CHEAT_SMALLJO)) { spc0 *= 0.4f; } #endif @@ -1442,15 +1442,15 @@ void bwalk0f0c69b8(void) g_Vars.currentplayer->walkinitt2 = 1.0f - (cosf(g_Vars.currentplayer->walkinitt * M_BADPI) + 1.0f) * 0.5f; - bmoveUpdateHead(0.0f, 0.0f, 0.0f, &g_Vars.currentplayer->walkinitmtx, 1.0f - g_Vars.currentplayer->walkinitt2); + bmove_update_head(0.0f, 0.0f, 0.0f, &g_Vars.currentplayer->walkinitmtx, 1.0f - g_Vars.currentplayer->walkinitt2); g_Vars.currentplayer->gunspeed = 0.0f; - bmoveUpdateMoveInitSpeed(&spcc); - bwalkCalculateNewPositionWithPush(&spcc, 0.0f, true, 0.0f, CDTYPE_ALL); + bmove_update_move_init_speed(&spcc); + bwalk_calculate_new_position_with_push(&spcc, 0.0f, true, 0.0f, CDTYPE_ALL); } else { - bwalkApplyCrouchSpeed(); - bwalkUpdateCrouchOffset(); + bwalk_apply_crouch_speed(); + bwalk_update_crouch_offset(); bmove0f0cba88(&spc8, &spc4, &g_Vars.currentplayer->bondshotspeed, @@ -1547,7 +1547,7 @@ void bwalk0f0c69b8(void) spe0 = (g_Vars.currentplayer->speedsideways * spc0 + spc4) * mult; #if VERSION >= VERSION_NTSC_1_0 - if (cheatIsActive(CHEAT_SMALLJO)) { + if (cheat_is_active(CHEAT_SMALLJO)) { spe0 /= 0.4f; } #endif @@ -1560,7 +1560,7 @@ void bwalk0f0c69b8(void) spd8 = g_Vars.currentplayer->headpos.z; #if VERSION >= VERSION_NTSC_1_0 - if (cheatIsActive(CHEAT_SMALLJO)) { + if (cheat_is_active(CHEAT_SMALLJO)) { spdc *= 0.4f; } #endif @@ -1570,9 +1570,9 @@ void bwalk0f0c69b8(void) spcc.f[0] += spb4; spcc.f[2] += spb0; - bmoveUpdateMoveInitSpeed(&spcc); + bmove_update_move_init_speed(&spcc); - if (debugIsTurboModeEnabled()) { + if (debug_is_turbo_mode_enabled()) { spcc.f[0] += (g_Vars.currentplayer->bond2.unk00.f[0] * g_Vars.currentplayer->speedforwards - g_Vars.currentplayer->bond2.unk00.f[2] * g_Vars.currentplayer->speedsideways) * g_Vars.lvupdate60freal * 10.0f; spcc.f[2] += (g_Vars.currentplayer->bond2.unk00.f[2] * g_Vars.currentplayer->speedforwards + g_Vars.currentplayer->bond2.unk00.f[0] * g_Vars.currentplayer->speedsideways) * g_Vars.lvupdate60freal * 10.0f; } @@ -1593,9 +1593,9 @@ void bwalk0f0c69b8(void) spcc.f[2] += sp74 * g_Vars.currentplayer->laddernormal.f[2]; g_Vars.currentplayer->ladderupdown = sp74 * 0.3f; } else { - playerGetBbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); + player_get_bbox(g_Vars.currentplayer->prop, &radius, &ymax, &ymin); - if (!cd0002a13c(&g_Vars.currentplayer->prop->pos, + if (!cd_0002a13c(&g_Vars.currentplayer->prop->pos, radius * 1.1f, ymax - g_Vars.currentplayer->prop->pos.y, (g_Vars.currentplayer->vv_manground - g_Vars.currentplayer->prop->pos.y) + 1.0f, g_Vars.currentplayer->prop->rooms, GEOFLAG_LADDER | GEOFLAG_LADDER_PLAYERONLY)) { @@ -1720,7 +1720,7 @@ void bwalk0f0c69b8(void) sp40 = g_Vars.currentplayer->speedverta / 0.7f + g_Vars.currentplayer->crouchspeed / PALUPF(5.0f); sp3c = g_Vars.currentplayer->gunspeed; - breathing = bheadGetBreathingValue(); + breathing = bhead_get_breathing_value(); if (sp40 > 1.0f) { sp40 = 1.0f; @@ -1733,16 +1733,16 @@ void bwalk0f0c69b8(void) } bgun0f09d8dc(breathing, sp3c, sp40, sp44, 0.0f); - bgunSetAdjustPos(g_Vars.currentplayer->vv_verta360 * 0.017450513318181f); + bgun_set_adjust_pos(g_Vars.currentplayer->vv_verta360 * 0.017450513318181f); } -void bwalkTick(void) +void bwalk_tick(void) { - bwalkUpdatePrevPos(); - bwalkUpdateTheta(); - bmoveUpdateVerta(); + bwalk_update_prev_pos(); + bwalk_update_theta(); + bmove_update_verta(); bwalk0f0c69b8(); - bwalkUpdateVertical(); + bwalk_update_vertical(); #if VERSION >= VERSION_NTSC_1_0 { @@ -1750,7 +1750,7 @@ void bwalkTick(void) for (i = 0; g_Vars.currentplayer->prop->rooms[i] != -1; i++) { if (g_Vars.currentplayer->floorroom == g_Vars.currentplayer->prop->rooms[i]) { - propDeregisterRooms(g_Vars.currentplayer->prop); + prop_deregister_rooms(g_Vars.currentplayer->prop); g_Vars.currentplayer->prop->rooms[0] = g_Vars.currentplayer->floorroom; g_Vars.currentplayer->prop->rooms[1] = -1; break; @@ -1759,8 +1759,8 @@ void bwalkTick(void) } #endif - bmoveUpdateRooms(g_Vars.currentplayer); - objectiveCheckRoomEntered(g_Vars.currentplayer->prop->rooms[0]); + bmove_update_rooms(g_Vars.currentplayer); + objective_check_room_entered(g_Vars.currentplayer->prop->rooms[0]); if (g_Vars.currentplayer->walkinitmove) { struct coord coord; @@ -1778,6 +1778,6 @@ void bwalkTick(void) bmove0f0cc19c(&g_Vars.currentplayer->prop->pos); } - playerUpdatePerimInfo(); - doorsCheckAutomatic(); + player_update_perim_info(); + doors_check_automatic(); } diff --git a/src/game/bossfile.c b/src/game/bossfile.c index 9c8e99705..b355ec5eb 100644 --- a/src/game/bossfile.c +++ b/src/game/bossfile.c @@ -25,23 +25,23 @@ u8 var800a22d0[0x5b]; u8 g_AltTitleUnlocked; u8 g_AltTitleEnabled; -void bossfileSetDefaults2(void) +void bossfile_set_defaults2(void) { - bossfileSetDefaults(); + bossfile_set_defaults(); } -void bossfileSetAndSaveDefaults(void) +void bossfile_set_and_save_defaults(void) { - bossfileSetDefaults(); - bossfileSave(); + bossfile_set_defaults(); + bossfile_save(); } -bool bossfileLoadFull(void) +bool bossfile_load_full(void) { - bossfileLoad(); + bossfile_load(); #if VERSION >= VERSION_PAL_BETA - langSetEuropean(g_Vars.language); + lang_set_european(g_Vars.language); #endif return true; @@ -57,16 +57,16 @@ void func0f1106f4(u8 *dst) bcopy(var800a22d0, dst, sizeof(var800a22d0)); } -u32 bossfileFindFileId(void) +u32 bossfile_find_file_id(void) { struct pakfileheader header; u32 fileids[513]; u32 candidate = 0; s32 i; - if (pakGetFileIdsByType(SAVEDEVICE_GAMEPAK, PAKFILETYPE_BOSS, fileids) == 0) { + if (pak_get_file_ids_by_type(SAVEDEVICE_GAMEPAK, PAKFILETYPE_BOSS, fileids) == 0) { for (i = 0; fileids[i] != 0; i++) { - pakFindFile(SAVEDEVICE_GAMEPAK, fileids[i], &header); + pak_find_file(SAVEDEVICE_GAMEPAK, fileids[i], &header); if (!header.occupied) { candidate = fileids[i]; @@ -75,7 +75,7 @@ u32 bossfileFindFileId(void) } for (i = 0; fileids[i] != 0; i++) { - pakFindFile(SAVEDEVICE_GAMEPAK, fileids[i], &header); + pak_find_file(SAVEDEVICE_GAMEPAK, fileids[i], &header); if (header.occupied) { candidate = fileids[i]; @@ -87,7 +87,7 @@ u32 bossfileFindFileId(void) return candidate; } -void bossfileLoad(void) +void bossfile_load(void) { bool failed = false; struct savebuffer buffer; @@ -95,14 +95,14 @@ void bossfileLoad(void) s32 fileid; struct fileguid guid; - fileid = bossfileFindFileId(); + fileid = bossfile_find_file_id(); if (fileid == 0) { failed = true; } else { - savebufferClear(&buffer); + savebuffer_clear(&buffer); - if (pakReadBodyAtGuid(SAVEDEVICE_GAMEPAK, fileid, buffer.bytes, 0) != 0) { + if (pak_read_body_at_guid(SAVEDEVICE_GAMEPAK, fileid, buffer.bytes, 0) != 0) { failed = true; } } @@ -110,20 +110,20 @@ void bossfileLoad(void) if (!failed) { u8 tracknum; - savebufferReadGuid(&buffer, &guid); + savebuffer_read_guid(&buffer, &guid); g_Vars.bossfileid = guid.fileid; g_Vars.bossdeviceserial = guid.deviceserial; - g_BossFile.unk89 = savebufferReadBits(&buffer, 1); + g_BossFile.unk89 = savebuffer_read_bits(&buffer, 1); - g_Vars.language = savebufferReadBits(&buffer, 4); + g_Vars.language = savebuffer_read_bits(&buffer, 4); for (i = 0; i < ARRAYCOUNT(g_BossFile.teamnames); i++) { - savebufferReadString(&buffer, g_BossFile.teamnames[i], 1); + savebuffer_read_string(&buffer, g_BossFile.teamnames[i], 1); } - tracknum = savebufferReadBits(&buffer, 8); + tracknum = savebuffer_read_bits(&buffer, 8); if (tracknum == 0xff) { g_BossFile.tracknum = -1; @@ -132,23 +132,23 @@ void bossfileLoad(void) } for (i = 0; i < ARRAYCOUNT(g_BossFile.multipletracknums); i++) { - g_BossFile.multipletracknums[i] = savebufferReadBits(&buffer, 8); + g_BossFile.multipletracknums[i] = savebuffer_read_bits(&buffer, 8); } - g_BossFile.usingmultipletunes = savebufferReadBits(&buffer, 1); - g_AltTitleUnlocked = savebufferReadBits(&buffer, 1); - g_AltTitleEnabled = savebufferReadBits(&buffer, 1); + g_BossFile.usingmultipletunes = savebuffer_read_bits(&buffer, 1); + g_AltTitleUnlocked = savebuffer_read_bits(&buffer, 1); + g_AltTitleEnabled = savebuffer_read_bits(&buffer, 1); func0f0d54c4(&buffer); } if (failed) { - bossfileSetDefaults(); - bossfileSave(); + bossfile_set_defaults(); + bossfile_save(); } } -void bossfileSave(void) +void bossfile_save(void) { volatile bool sp12c = false; struct savebuffer buffer; @@ -157,48 +157,48 @@ void bossfileSave(void) s32 i; s32 fileid; - savebufferClear(&buffer); + savebuffer_clear(&buffer); guid.fileid = g_Vars.bossfileid; guid.deviceserial = g_Vars.bossdeviceserial; - savebufferWriteGuid(&buffer, &guid); + savebuffer_write_guid(&buffer, &guid); - savebufferOr(&buffer, g_BossFile.unk89, 1); - savebufferOr(&buffer, g_Vars.language, 4); + savebuffer_or(&buffer, g_BossFile.unk89, 1); + savebuffer_or(&buffer, g_Vars.language, 4); for (i = 0; i < ARRAYCOUNT(g_BossFile.teamnames); i++) { func0f0d55a4(&buffer, g_BossFile.teamnames[i]); } if (g_BossFile.tracknum == -1) { - savebufferOr(&buffer, 0xff, 8); + savebuffer_or(&buffer, 0xff, 8); } else { - savebufferOr(&buffer, g_BossFile.tracknum, 8); + savebuffer_or(&buffer, g_BossFile.tracknum, 8); } for (i = 0; i < ARRAYCOUNT(g_BossFile.multipletracknums); i++) { - savebufferOr(&buffer, g_BossFile.multipletracknums[i], 8); + savebuffer_or(&buffer, g_BossFile.multipletracknums[i], 8); } - savebufferOr(&buffer, g_BossFile.usingmultipletunes, 1); - savebufferOr(&buffer, g_AltTitleUnlocked, 1); - savebufferOr(&buffer, g_AltTitleEnabled, 1); + savebuffer_or(&buffer, g_BossFile.usingmultipletunes, 1); + savebuffer_or(&buffer, g_AltTitleUnlocked, 1); + savebuffer_or(&buffer, g_AltTitleEnabled, 1); func0f0d54c4(&buffer); - fileid = bossfileFindFileId(); + fileid = bossfile_find_file_id(); if (fileid == 0) { - faultAssert("fileGuid", "bossfile.c", VERSION >= VERSION_PAL_BETA ? 377 : 375); + fault_assert("fileGuid", "bossfile.c", VERSION >= VERSION_PAL_BETA ? 377 : 375); } - if (pakSaveAtGuid(SAVEDEVICE_GAMEPAK, fileid, PAKFILETYPE_BOSS, buffer.bytes, NULL, 0) != 0) { + if (pak_save_at_guid(SAVEDEVICE_GAMEPAK, fileid, PAKFILETYPE_BOSS, buffer.bytes, NULL, 0) != 0) { sp12c = true; } } -void bossfileSetDefaults(void) +void bossfile_set_defaults(void) { g_BossFile.teamnames[0][0] = '\0'; g_BossFile.teamnames[1][0] = '\0'; @@ -210,7 +210,7 @@ void bossfileSetDefaults(void) g_BossFile.teamnames[7][0] = '\0'; g_BossFile.tracknum = -1; - mpEnableAllMultiTracks(); + mp_enable_all_multi_tracks(); g_BossFile.usingmultipletunes = false; g_BossFile.unk89 = 0; g_BossFile.locktype = MPLOCKTYPE_NONE; @@ -220,5 +220,5 @@ void bossfileSetDefaults(void) g_AltTitleUnlocked = 0; g_AltTitleEnabled = false; - bossfileSave(); + bossfile_save(); } diff --git a/src/game/bot.c b/src/game/bot.c index b87d57994..a8b1733a7 100644 --- a/src/game/bot.c +++ b/src/game/bot.c @@ -96,12 +96,12 @@ struct botdifficulty g_BotDifficulties[] = { { 0 }, }; -bool botIsDizzy(struct chrdata *chr) +bool bot_is_dizzy(struct chrdata *chr) { return chr->blurdrugamount >= g_BotDifficulties[chr->aibot->config->difficulty].dizzyamount; } -void botReset(struct chrdata *chr, u8 respawning) +void bot_reset(struct chrdata *chr, u8 respawning) { s32 i; u32 rand; @@ -120,13 +120,13 @@ void botReset(struct chrdata *chr, u8 respawning) chr->target = -1; chr->chrpreset1 = -1; chr->cover = -1; - chrSetShield(chr, 0); + chr_set_shield(chr, 0); chr->cmnum = 0; chr->cmnum2 = 0; #if VERSION >= VERSION_NTSC_1_0 - bgunFreeFireslot(chr->fireslots[0]); - bgunFreeFireslot(chr->fireslots[1]); + bgun_free_fireslot(chr->fireslots[0]); + bgun_free_fireslot(chr->fireslots[1]); #endif chr->unk32c_12 = 0; @@ -146,7 +146,7 @@ void botReset(struct chrdata *chr, u8 respawning) aibot->ammoheld[i] = 0; } - botinvClear(chr); + botinv_clear(chr); aibot->weaponnum = WEAPON_UNARMED; aibot->gunfunc = FUNC_PRIMARY; @@ -245,7 +245,7 @@ void botReset(struct chrdata *chr, u8 respawning) // rather than invert it. aibot->flags &= ~BOTFLAG_UNLIMITEDAMMO; - if (mpHasShield()) { + if (mp_has_shield()) { chr->cshield = 8; } } @@ -255,7 +255,7 @@ void botReset(struct chrdata *chr, u8 respawning) } } -void botSpawn(struct chrdata *chr, u8 respawning) +void bot_spawn(struct chrdata *chr, u8 respawning) { f32 thing; struct prop *prop; @@ -279,27 +279,27 @@ void botSpawn(struct chrdata *chr, u8 respawning) } if (aibot) { - botReset(chr, respawning); - splatResetChr(chr); - thing = scenarioChooseSpawnLocation(chr->radius, &pos, rooms, chr->prop); + bot_reset(chr, respawning); + splat_reset_chr(chr); + thing = scenario_choose_spawn_location(chr->radius, &pos, rooms, chr->prop); chr->hidden |= CHRHFLAG_WARPONSCREEN; - chrMoveToPos(chr, &pos, rooms, thing, true); - chr->aibot->roty = modelGetChrRotY(chr->model); + chr_move_to_pos(chr, &pos, rooms, thing, true); + chr->aibot->roty = model_get_chr_rot_y(chr->model); chr->aibot->angleoffset = 0; chr->aibot->speedtheta = 0; - chr->aibot->lookangle = modelGetChrRotY(chr->model); + chr->aibot->lookangle = model_get_chr_rot_y(chr->model); chr->aibot->moveratex = 0; chr->aibot->moveratey = 0; func0f02e9a0(chr, 0); } } -void botSpawnAll(void) +void bot_spawn_all(void) { s32 i; for (i = 0; i < g_BotCount; i++) { - botSpawn(g_MpBotChrPtrs[i], false); + bot_spawn(g_MpBotChrPtrs[i], false); } } @@ -310,7 +310,7 @@ u32 add87654321(u32 value) } #endif -u32 botPickupProp(struct prop *prop, struct chrdata *chr) +u32 bot_pickup_prop(struct prop *prop, struct chrdata *chr) { struct defaultobj *obj = prop->obj; @@ -333,18 +333,18 @@ u32 botPickupProp(struct prop *prop, struct chrdata *chr) s32 qty; if (1); - qty = ammocrateGetPickupAmmoQty(crate); + qty = ammocrate_get_pickup_ammo_qty(crate); dprint(); if (qty) { - botactGiveAmmoByType(chr->aibot, crate->ammotype, qty); + botact_give_ammo_by_type(chr->aibot, crate->ammotype, qty); } // Pickup sound - psCreate(NULL, prop, SFX_PICKUP_AMMO, -1, + ps_create(NULL, prop, SFX_PICKUP_AMMO, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); if (qty) { dprint(); @@ -359,8 +359,8 @@ u32 botPickupProp(struct prop *prop, struct chrdata *chr) s32 i; #if PIRACYCHECKS { - u32 *ptr = (u32 *)&doorFinishClose; - u32 *end = (u32 *)&doorSetMode; + u32 *ptr = (u32 *)&door_finish_close; + u32 *end = (u32 *)&door_set_mode; u32 checksum = 0; while (ptr < end) { @@ -370,7 +370,7 @@ u32 botPickupProp(struct prop *prop, struct chrdata *chr) } if (checksum != CHECKSUM_PLACEHOLDER) { - u32 *ptr = (u32 *)chrCheckCanSeeTarget; + u32 *ptr = (u32 *)chr_check_can_see_target; ptr[0] = add87654321(0x24020001 - 0x87654321); // li v0, 1 ptr[1] = add87654321(0x03e00008 - 0x87654321); // jr ra ptr[2] = add87654321(0x00000000 - 0x87654321); // nop @@ -387,56 +387,56 @@ u32 botPickupProp(struct prop *prop, struct chrdata *chr) } if (qty) { - botactGiveAmmoByType(chr->aibot, i + 1, qty); + botact_give_ammo_by_type(chr->aibot, i + 1, qty); } } // Pickup sound - psCreate(NULL, prop, SFX_PICKUP_AMMO, -1, + ps_create(NULL, prop, SFX_PICKUP_AMMO, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); } return 2; case OBJTYPE_WEAPON: { struct weaponobj *weapon = prop->weapon; - s32 itemtype = botinvGetItemType(chr, weapon->weaponnum); + s32 itemtype = botinv_get_item_type(chr, weapon->weaponnum); s32 result; s32 qty; if (weapon->weaponnum == WEAPON_BRIEFCASE2) { - result = scenarioPickUpBriefcase(chr, prop); + result = scenario_pick_up_briefcase(chr, prop); } else if (weapon->weaponnum == WEAPON_DATAUPLINK) { - result = scenarioPickUpUplink(chr, prop); + result = scenario_pick_up_uplink(chr, prop); } else { - propPlayPickupSound(prop, weapon->weaponnum); - qty = weaponGetPickupAmmoQty(weapon); + prop_play_pickup_sound(prop, weapon->weaponnum); + qty = weapon_get_pickup_ammo_qty(weapon); if (qty) { - botactGiveAmmoByWeapon(chr->aibot, weapon->weaponnum, weapon->gunfunc, qty); + botact_give_ammo_by_weapon(chr->aibot, weapon->weaponnum, weapon->gunfunc, qty); } if (itemtype) { - struct weapon *weapondef = weaponFindById(weapon->weaponnum); - s32 originalpad = botinvGetWeaponPad(chr, weapon->weaponnum); + struct weapon *weapondef = weapon_find_by_id(weapon->weaponnum); + s32 originalpad = botinv_get_weapon_pad(chr, weapon->weaponnum); s32 currentpad = obj->pad; if (itemtype == INVITEMTYPE_WEAP && weapondef && (weapondef->flags & WEAPONFLAG_DUALWIELD) && originalpad != currentpad) { - botinvGiveDualWeapon(chr, weapon->weaponnum); + botinv_give_dual_weapon(chr, weapon->weaponnum); result = 1; } else { result = 2; } } else { - botinvGiveProp(chr, prop); + botinv_give_prop(chr, prop); result = 1; } - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); } return result; @@ -445,11 +445,11 @@ u32 botPickupProp(struct prop *prop, struct chrdata *chr) { struct shieldobj *shield = (struct shieldobj *)prop->obj; - psCreate(NULL, prop, SFX_PICKUP_SHIELD, -1, + ps_create(NULL, prop, SFX_PICKUP_SHIELD, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); - chrSetShield(chr, shield->amount * 8); - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + chr_set_shield(chr, shield->amount * 8); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); } return 3; case OBJTYPE_BASIC: @@ -462,7 +462,7 @@ u32 botPickupProp(struct prop *prop, struct chrdata *chr) return 0; } -bool botTestPropForPickup(struct prop *prop, struct chrdata *chr) +bool bot_test_prop_for_pickup(struct prop *prop, struct chrdata *chr) { struct defaultobj *obj = prop->obj; @@ -492,7 +492,7 @@ bool botTestPropForPickup(struct prop *prop, struct chrdata *chr) bool sp3c; u32 stack2; - if (!chr || !chr->aibot || !g_Vars.lvmpbotlevel || chrIsDead(chr)) { + if (!chr || !chr->aibot || !g_Vars.lvmpbotlevel || chr_is_dead(chr)) { return false; } @@ -537,7 +537,7 @@ bool botTestPropForPickup(struct prop *prop, struct chrdata *chr) dprint(); - if (!objCanPickupFromSafe(obj)) { + if (!obj_can_pickup_from_safe(obj)) { return false; } @@ -547,15 +547,15 @@ bool botTestPropForPickup(struct prop *prop, struct chrdata *chr) if (obj->type == OBJTYPE_WEAPON) { weaponobj = prop->weapon; - itemtype = botinvGetItemType(chr, weaponobj->weaponnum); - weapon = weaponFindById(weaponobj->weaponnum); + itemtype = botinv_get_item_type(chr, weaponobj->weaponnum); + weapon = weapon_find_by_id(weaponobj->weaponnum); singleonly = weapon && (weapon->flags & WEAPONFLAG_DUALWIELD) == 0; if (weaponobj->weaponnum != WEAPON_BRIEFCASE2) { // If aibot is dual wielding, or single wielding and weapon doesn't support dual, // ignore the pickup if at max ammo already if (itemtype == INVITEMTYPE_DUAL || (itemtype == INVITEMTYPE_WEAP && singleonly)) { - if (botactGetAmmoQuantityByWeapon(chr->aibot, weaponobj->weaponnum, weaponobj->gunfunc, false) >= bgunGetCapacityByAmmotype(botactGetAmmoTypeByFunction(weaponobj->weaponnum, weaponobj->gunfunc))) { + if (botact_get_ammo_quantity_by_weapon(chr->aibot, weaponobj->weaponnum, weaponobj->gunfunc, false) >= bgun_get_capacity_by_ammotype(botact_get_ammo_type_by_function(weaponobj->weaponnum, weaponobj->gunfunc))) { return false; } } @@ -570,28 +570,28 @@ bool botTestPropForPickup(struct prop *prop, struct chrdata *chr) crate = (struct ammocrateobj *)prop->obj; // Ignore ammo crate if at max ammo already - if (botactGetAmmoQuantityByType(chr->aibot, crate->ammotype, false) >= bgunGetCapacityByAmmotype(crate->ammotype)) { + if (botact_get_ammo_quantity_by_type(chr->aibot, crate->ammotype, false) >= bgun_get_capacity_by_ammotype(crate->ammotype)) { return false; } } else if (obj->type == OBJTYPE_MULTIAMMOCRATE) { crate2 = (struct multiammocrateobj *)prop->obj; ignore1 = true; - if (objGetDestroyedLevel(obj)) { + if (obj_get_destroyed_level(obj)) { dprint(); return false; } for (i = 0; i < 0x13; i++) { - weaponnum = botactGetWeaponByAmmoType(i + 1); + weaponnum = botact_get_weapon_by_ammo_type(i + 1); if (crate2->slots[i].quantity > 0) { - if (botactGetAmmoQuantityByType(chr->aibot, i + 1, false) < bgunGetCapacityByAmmotype(i + 1)) { + if (botact_get_ammo_quantity_by_type(chr->aibot, i + 1, false) < bgun_get_capacity_by_ammotype(i + 1)) { ignore1 = false; - if (weaponnum && !botinvGetItemType(chr, weaponnum)) { + if (weaponnum && !botinv_get_item_type(chr, weaponnum)) { dprint(); - botinvGiveProp(chr, prop); + botinv_give_prop(chr, prop); } break; @@ -606,7 +606,7 @@ bool botTestPropForPickup(struct prop *prop, struct chrdata *chr) shield = (struct shieldobj *)prop->obj; ignore2 = false; - if (shield->amount <= chrGetShield(chr) * 0.125f) { + if (shield->amount <= chr_get_shield(chr) * 0.125f) { ignore2 = true; } else if (g_MpSetup.scenario == MPSCENARIO_HOLDTHEBRIEFCASE && chr->aibot->hasbriefcase) { ignore2 = true; @@ -642,20 +642,20 @@ bool botTestPropForPickup(struct prop *prop, struct chrdata *chr) dprint(); if ((obj->flags2 & OBJFLAG2_PICKUPWITHOUTLOS) == 0 - && !cdTestLos06(&chrprop->pos, chrprop->rooms, &prop->pos, prop->rooms, CDTYPE_DOORS | CDTYPE_BG)) { + && !cd_test_los06(&chrprop->pos, chrprop->rooms, &prop->pos, prop->rooms, CDTYPE_DOORS | CDTYPE_BG)) { sp3c = false; } } if (sp3c) { dprint(); - return botPickupProp(prop, chr); + return bot_pickup_prop(prop, chr); } return false; } -s32 botIsObjCollectable(struct defaultobj *obj) +s32 bot_is_obj_collectable(struct defaultobj *obj) { if (!obj) { return false; @@ -690,7 +690,7 @@ s32 botIsObjCollectable(struct defaultobj *obj) /** * Check nearby props to see if the chr is picking them up on this frame. */ -void botCheckPickups(struct chrdata *chr) +void bot_check_pickups(struct chrdata *chr) { s32 i; s16 *propnumptr; @@ -698,14 +698,14 @@ void botCheckPickups(struct chrdata *chr) RoomNum allrooms[22]; RoomNum neighbours[12]; - roomsCopy(chr->prop->rooms, allrooms); + rooms_copy(chr->prop->rooms, allrooms); for (i = 0; chr->prop->rooms[i] != -1; i++) { - bgRoomGetNeighbours(chr->prop->rooms[i], neighbours, 10); - roomsAppend(neighbours, allrooms, 20); + bg_room_get_neighbours(chr->prop->rooms[i], neighbours, 10); + rooms_append(neighbours, allrooms, 20); } - roomGetProps(allrooms, propnums, 256); + room_get_props(allrooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { @@ -723,9 +723,9 @@ void botCheckPickups(struct chrdata *chr) || obj->projectile == NULL || obj->projectile->pickuptimer240 <= 0 || obj->projectile->bouncecount != 0) { - if (botIsObjCollectable(obj)) { - if (botTestPropForPickup(prop, chr)) { - propExecuteTickOperation(prop, TICKOP_FREE); + if (bot_is_obj_collectable(obj)) { + if (bot_test_prop_for_pickup(prop, chr)) { + prop_execute_tick_operation(prop, TICKOP_FREE); } else { dprint(); } @@ -739,7 +739,7 @@ void botCheckPickups(struct chrdata *chr) } } -s32 botGuessCrouchPos(struct chrdata *chr) +s32 bot_guess_crouch_pos(struct chrdata *chr) { s32 crouchpos; @@ -754,7 +754,7 @@ s32 botGuessCrouchPos(struct chrdata *chr) return crouchpos; } -bool botApplyMovement(struct chrdata *chr) +bool bot_apply_movement(struct chrdata *chr) { struct aibot *aibot; u32 stack; @@ -769,7 +769,7 @@ bool botApplyMovement(struct chrdata *chr) aibot = chr->aibot; - angle = chrGetInverseTheta(chr) - chrGetRotY(chr); + angle = chr_get_inverse_theta(chr) - chr_get_rot_y(chr); if (angle < 0) { angle += M_BADTAU; @@ -778,9 +778,9 @@ bool botApplyMovement(struct chrdata *chr) speedforwards = aibot->speedmultforwards * cosf(angle) - sinf(angle) * aibot->speedmultsideways; speedsideways = aibot->speedmultforwards * sinf(angle) + cosf(angle) * aibot->speedmultsideways; - playerChooseThirdPersonAnimation(chr, botGuessCrouchPos(chr), speedsideways, speedforwards, aibot->speedtheta, &aibot->angleoffset, &aibot->attackanimconfig); + player_choose_third_person_animation(chr, bot_guess_crouch_pos(chr), speedsideways, speedforwards, aibot->speedtheta, &aibot->angleoffset, &aibot->attackanimconfig); - angle2 = chrGetInverseTheta(chr) - aibot->angleoffset; + angle2 = chr_get_inverse_theta(chr) - aibot->angleoffset; if (angle2 < 0) { angle2 += M_BADTAU; @@ -790,33 +790,33 @@ bool botApplyMovement(struct chrdata *chr) angle2 -= M_BADTAU; } - modelSetChrRotY(chr->model, angle2); + model_set_chr_rot_y(chr->model, angle2); return true; } -s32 botGetWeaponNum(struct chrdata *chr) +s32 bot_get_weapon_num(struct chrdata *chr) { if (chr->aibot) { return chr->aibot->weaponnum; } - return g_Vars.players[playermgrGetPlayerNumByProp(chr->prop)]->hands[HAND_RIGHT].gset.weaponnum; + return g_Vars.players[playermgr_get_player_num_by_prop(chr->prop)]->hands[HAND_RIGHT].gset.weaponnum; } -u8 botGetTargetsWeaponNum(struct chrdata *chr) +u8 bot_get_targets_weapon_num(struct chrdata *chr) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); u8 weaponnum = WEAPON_NONE; if (target) { - weaponnum = botGetWeaponNum(target->chr); + weaponnum = bot_get_weapon_num(target->chr); } return weaponnum; } -bool botIsAboutToAttack(struct chrdata *chr, bool arg1) +bool bot_is_about_to_attack(struct chrdata *chr, bool arg1) { bool result = false; struct prop *target; @@ -824,8 +824,8 @@ bool botIsAboutToAttack(struct chrdata *chr, bool arg1) s32 mpindex; if (chr->target != -1) { - target = chrGetTargetProp(chr); - mpindex = mpPlayerGetIndex(target->chr); + target = chr_get_target_prop(chr); + mpindex = mp_player_get_index(target->chr); result = false; if (chr->aibot->chrsinsight[mpindex]) { @@ -834,14 +834,14 @@ bool botIsAboutToAttack(struct chrdata *chr, bool arg1) if (chr->aibot->config->difficulty > BOTDIFF_MEAT) { if (chr->aibot->chrslastseen60[mpindex] >= g_Vars.lvframe60 - TICKS(240) - || (arrayIntersects(chr->prop->rooms, target->rooms))) { + || (array_intersects(chr->prop->rooms, target->rooms))) { result = true; } if (chr->aibot->config->difficulty >= BOTDIFF_NORMAL) { - if (bgRoomsAreNeighbours(chr->prop->rooms[0], target->rooms[0]) + if (bg_rooms_are_neighbours(chr->prop->rooms[0], target->rooms[0]) || chr->aibot->chrrooms[mpindex] == target->rooms[0] - || bgRoomsAreNeighbours(chr->aibot->chrrooms[mpindex], target->rooms[0])) { + || bg_rooms_are_neighbours(chr->aibot->chrrooms[mpindex], target->rooms[0])) { result = true; } @@ -860,8 +860,8 @@ bool botIsAboutToAttack(struct chrdata *chr, bool arg1) if (!arg1 && (chr->aibot->config->difficulty == BOTDIFF_MEAT || chr->aibot->config->difficulty == BOTDIFF_EASY) - && !chrGoPosIsWaiting(chr)) { - f32 tmp = chrGetRotY(chr); + && !chr_go_pos_is_waiting(chr)) { + f32 tmp = chr_get_rot_y(chr); f32 angle = atan2f(target->pos.x - chr->prop->pos.x, target->pos.z - chr->prop->pos.z) - tmp; if (angle < 0) { @@ -887,7 +887,7 @@ bool botIsAboutToAttack(struct chrdata *chr, bool arg1) return result; } -s32 botTick(struct prop *prop) +s32 bot_tick(struct prop *prop) { struct chrdata *chr = prop->chr; struct aibot *aibot = chr->aibot; @@ -904,13 +904,13 @@ s32 botTick(struct prop *prop) if (aibot) { if (updateable && g_Vars.lvframe60 >= 145) { - botTickUnpaused(chr); + bot_tick_unpaused(chr); // Calculate cheap aibot->cheap = true; for (i = 0; prop->rooms[i] != -1; i++) { - if (bgRoomIsOnscreen(prop->rooms[i]) || bgRoomIsStandby(prop->rooms[i])) { + if (bg_room_is_onscreen(prop->rooms[i]) || bg_room_is_standby(prop->rooms[i])) { aibot->cheap = false; break; } @@ -931,31 +931,31 @@ s32 botTick(struct prop *prop) } // Calculate target angle - oldangle = chrGetInverseTheta(chr); + oldangle = chr_get_inverse_theta(chr); - if (chrIsDead(chr)) { - targetangle = chrGetInverseTheta(chr); + if (chr_is_dead(chr)) { + targetangle = chr_get_inverse_theta(chr); } else if (aibot->skrocket) { - targetangle = chrGetInverseTheta(chr); - } else if (botIsAboutToAttack(chr, false)) { - struct prop *target = chrGetTargetProp(chr); - targetangle = chrGetAngleToPos(chr, &target->pos); + targetangle = chr_get_inverse_theta(chr); + } else if (bot_is_about_to_attack(chr, false)) { + struct prop *target = chr_get_target_prop(chr); + targetangle = chr_get_angle_to_pos(chr, &target->pos); targetangle = oldangle + targetangle + aibot->zeroangle; } else if (chr->myaction == MA_AIBOTDOWNLOAD && g_ScenarioData.htm.dlterminalnum != -1) { - targetangle = chrGetAngleToPos(chr, &g_ScenarioData.htm.terminals[g_ScenarioData.htm.dlterminalnum].prop->pos); + targetangle = chr_get_angle_to_pos(chr, &g_ScenarioData.htm.terminals[g_ScenarioData.htm.dlterminalnum].prop->pos); targetangle = oldangle + targetangle; } else if (chr->myaction == MA_AIBOTFOLLOW && aibot->followingplayernum >= 0 && aibot->chrdistances[aibot->followingplayernum] < 300 && aibot->realignangleframe >= g_Vars.lvframe60 - TICKS(60) && aibot->config->difficulty != BOTDIFF_MEAT) { - targetangle = chrGetInverseTheta(g_MpAllChrPtrs[aibot->followingplayernum]); + targetangle = chr_get_inverse_theta(g_MpAllChrPtrs[aibot->followingplayernum]); } else if (chr->myaction == MA_AIBOTDEFEND && aibot->realignangleframe >= g_Vars.lvframe60 - TICKS(60) && aibot->config->difficulty != BOTDIFF_MEAT) { targetangle = aibot->defendholdrot; } else { - targetangle = chrGetRotY(chr); + targetangle = chr_get_rot_y(chr); } while (targetangle >= M_BADTAU) { @@ -966,7 +966,7 @@ s32 botTick(struct prop *prop) targetangle += M_BADTAU; } - if (chr->blurdrugamount > 0 && !chrIsDead(chr) && aibot->skrocket == NULL) { + if (chr->blurdrugamount > 0 && !chr_is_dead(chr) && aibot->skrocket == NULL) { targetangle += chr->blurdrugamount * PALUPF(0.00031410926021636f) * sinf((g_Vars.lvframe60 % TICKS(120)) * PALUPF(0.052351541817188f)); if (targetangle >= M_BADTAU) { @@ -1028,7 +1028,7 @@ s32 botTick(struct prop *prop) newangle += M_BADTAU; } - chrSetLookAngle(chr, newangle); + chr_set_look_angle(chr, newangle); if (chr->target != -1 && !aibot->ismeleeweapon) { bool left = chr->weapons_held[HAND_LEFT] ? true : false; @@ -1036,7 +1036,7 @@ s32 botTick(struct prop *prop) func0f03e9f4(chr, aibot->attackanimconfig, left, right, 0); } else { - chrResetAimEndProperties(chr); + chr_reset_aim_end_properties(chr); } if (chr->actiontype == ACT_DIE || chr->actiontype == ACT_DEAD) { @@ -1056,17 +1056,17 @@ s32 botTick(struct prop *prop) } } - botApplyMovement(chr); + bot_apply_movement(chr); - result = chrTick(prop); + result = chr_tick(prop); if (g_Vars.lvframe60 >= 145) { if (updateable) { - scenarioTickChr(chr); + scenario_tick_chr(chr); } - if (updateable && !chrIsDead(chr)) { - botCheckPickups(chr); + if (updateable && !chr_is_dead(chr)) { + bot_check_pickups(chr); } } } @@ -1074,7 +1074,7 @@ s32 botTick(struct prop *prop) return result; } -f32 botCalculateMaxSpeed(struct chrdata *chr) +f32 bot_calculate_max_speed(struct chrdata *chr) { f32 speed; @@ -1114,13 +1114,13 @@ f32 botCalculateMaxSpeed(struct chrdata *chr) } } - if (botGuessCrouchPos(chr) == CROUCHPOS_SQUAT) { + if (bot_guess_crouch_pos(chr) == CROUCHPOS_SQUAT) { speed *= 0.35f; - } else if (botGuessCrouchPos(chr) == CROUCHPOS_DUCK) { + } else if (bot_guess_crouch_pos(chr) == CROUCHPOS_DUCK) { speed *= 0.5f; } else if (chr->actiontype == ACT_GOPOS && chr->act_gopos.waypoints[chr->act_gopos.curindex] == NULL - && chrGetLateralDistanceToCoord(chr, &chr->act_gopos.endpos) < 200) { + && chr_get_lateral_distance_to_coord(chr, &chr->act_gopos.endpos) < 200) { speed *= 0.5f; } @@ -1128,9 +1128,9 @@ f32 botCalculateMaxSpeed(struct chrdata *chr) } #if VERSION >= VERSION_NTSC_1_0 -void botUpdateLateral(struct chrdata *chr, f32 *move, s32 numupdates, f32 arg3) +void bot_update_lateral(struct chrdata *chr, f32 *move, s32 numupdates, f32 arg3) #else -void botUpdateLateral(struct chrdata *chr, f32 *move) +void bot_update_lateral(struct chrdata *chr, f32 *move) #endif { s32 i; @@ -1157,12 +1157,12 @@ void botUpdateLateral(struct chrdata *chr, f32 *move) speedsideways = chr->aibot->speedmultsideways; speedforwards = chr->aibot->speedmultforwards; - speed = botCalculateMaxSpeed(chr); + speed = bot_calculate_max_speed(chr); speedsideways *= speed; speedforwards *= speed; - sp50 = chrGetRotY(chr); + sp50 = chr_get_rot_y(chr); cosine = cosf(sp50); sine = sinf(sp50); @@ -1196,7 +1196,7 @@ void botUpdateLateral(struct chrdata *chr, f32 *move) #endif } -char *botGetCommandName(s32 command) +char *bot_get_command_name(s32 command) { static u32 names[] = { L_MISC_175, // "Follow" @@ -1216,62 +1216,62 @@ char *botGetCommandName(s32 command) }; if (command < 0 || command >= ARRAYCOUNT(names)) { - return langGet(L_MISC_179); // "Normal" + return lang_get(L_MISC_179); // "Normal" } - return langGet(names[command]); + return lang_get(names[command]); } -void botApplyAttack(struct chrdata *chr, struct prop *prop) +void bot_apply_attack(struct chrdata *chr, struct prop *prop) { chr->aibot->command = AIBOTCMD_ATTACK; chr->aibot->attackpropnum = prop - g_Vars.props; chr->aibot->forcemainloop = true; } -void botApplyFollow(struct chrdata *chr, struct prop *prop) +void bot_apply_follow(struct chrdata *chr, struct prop *prop) { chr->aibot->command = AIBOTCMD_FOLLOW; chr->aibot->followprotectpropnum = prop - g_Vars.props; chr->aibot->forcemainloop = true; } -void botApplyProtect(struct chrdata *chr, struct prop *prop) +void bot_apply_protect(struct chrdata *chr, struct prop *prop) { chr->aibot->command = AIBOTCMD_PROTECT; chr->aibot->followprotectpropnum = prop - g_Vars.props; chr->aibot->forcemainloop = true; } -void botApplyDefend(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle) +void bot_apply_defend(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle) { chr->aibot->command = AIBOTCMD_DEFEND; chr->aibot->defendholdpos.x = pos->x; chr->aibot->defendholdpos.y = pos->y; chr->aibot->defendholdpos.z = pos->z; - roomsCopy(room, chr->aibot->defendholdrooms); + rooms_copy(room, chr->aibot->defendholdrooms); chr->aibot->defendholdrot = angle; chr->aibot->forcemainloop = true; } -void botApplyHold(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle) +void bot_apply_hold(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle) { chr->aibot->command = AIBOTCMD_HOLD; chr->aibot->defendholdpos.x = pos->x; chr->aibot->defendholdpos.y = pos->y; chr->aibot->defendholdpos.z = pos->z; - roomsCopy(room, chr->aibot->defendholdrooms); + rooms_copy(room, chr->aibot->defendholdrooms); chr->aibot->defendholdrot = angle; chr->aibot->forcemainloop = true; } -void botApplyScenarioCommand(struct chrdata *chr, u32 command) +void bot_apply_scenario_command(struct chrdata *chr, u32 command) { chr->aibot->command = command; chr->aibot->forcemainloop = true; } -void botDisarm(struct chrdata *chr, struct prop *attackerprop) +void bot_disarm(struct chrdata *chr, struct prop *attackerprop) { if (chr->aibot->weaponnum >= WEAPON_FALCON2 && chr->aibot->weaponnum != WEAPON_BRIEFCASE2) { struct prop *prop = NULL; @@ -1286,19 +1286,19 @@ void botDisarm(struct chrdata *chr, struct prop *attackerprop) if (chr->weapons_held[HAND_RIGHT]) { prop = chr->weapons_held[HAND_RIGHT]; - weaponSetGunfireVisible(prop, false, -1); + weapon_set_gunfire_visible(prop, false, -1); chr->weapons_held[HAND_RIGHT] = NULL; } else { - s32 modelnum = playermgrGetModelOfWeapon(chr->aibot->weaponnum); + s32 modelnum = playermgr_get_model_of_weapon(chr->aibot->weaponnum); if (modelnum >= 0) { - prop = weaponCreateForChr(chr, modelnum, chr->aibot->weaponnum, OBJFLAG_WEAPON_AICANNOTUSE, NULL, NULL); + prop = weapon_create_for_chr(chr, modelnum, chr->aibot->weaponnum, OBJFLAG_WEAPON_AICANNOTUSE, NULL, NULL); } } if (prop && prop->obj) { obj = prop->obj; - objSetDropped(prop, DROPTYPE_DEFAULT); + obj_set_dropped(prop, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; if (obj->hidden & OBJHFLAG_PROJECTILE) { @@ -1307,12 +1307,12 @@ void botDisarm(struct chrdata *chr, struct prop *attackerprop) } } - botinvRemoveItem(chr, chr->aibot->weaponnum); + botinv_remove_item(chr, chr->aibot->weaponnum); chr->aibot->loadedammo[0] = 0; chr->aibot->loadedammo[1] = 0; - botinvSwitchToWeapon(chr, WEAPON_UNARMED, FUNC_PRIMARY); + botinv_switch_to_weapon(chr, WEAPON_UNARMED, FUNC_PRIMARY); } } @@ -1322,7 +1322,7 @@ void botDisarm(struct chrdata *chr, struct prop *attackerprop) * This should be called on each tick even if the target hasn't changed * because the tracking figures need to be constantly updated. */ -void botSetTarget(struct chrdata *botchr, s32 propnum) +void bot_set_target(struct chrdata *botchr, s32 propnum) { struct chrdata *otherchr = NULL; s32 index; @@ -1330,7 +1330,7 @@ void botSetTarget(struct chrdata *botchr, s32 propnum) if (propnum >= 0) { otherchr = (g_Vars.props + propnum)->chr; - index = mpPlayerGetIndex(otherchr); + index = mp_player_get_index(otherchr); botchr->aibot->targetinsight = botchr->aibot->chrsinsight[index]; botchr->aibot->targetlastseen60 = botchr->aibot->chrslastseen60[index]; @@ -1383,7 +1383,7 @@ void botSetTarget(struct chrdata *botchr, s32 propnum) } } -bool botIsTargetInvisible(struct chrdata *botchr, struct chrdata *otherchr) +bool bot_is_target_invisible(struct chrdata *botchr, struct chrdata *otherchr) { if (otherchr->prop->type == PROPTYPE_PLAYER && !g_Vars.bondvisible) { return true; @@ -1395,8 +1395,8 @@ bool botIsTargetInvisible(struct chrdata *botchr, struct chrdata *otherchr) if ((otherchr->hidden & CHRHFLAG_CLOAKED)) { if (botchr && botchr->aibot - && ((botchr->target != -1 && chrGetTargetProp(botchr) == otherchr->prop && botchr->aibot->targetcloaktimer60 > 0) - || (botchr->aibot->canseecloaked && chrIsLookingAtPos(botchr, &otherchr->prop->pos, 32)))) { + && ((botchr->target != -1 && chr_get_target_prop(botchr) == otherchr->prop && botchr->aibot->targetcloaktimer60 > 0) + || (botchr->aibot->canseecloaked && chr_is_looking_at_pos(botchr, &otherchr->prop->pos, 32)))) { return false; } @@ -1412,7 +1412,7 @@ bool botIsTargetInvisible(struct chrdata *botchr, struct chrdata *otherchr) * The death barrier is at -30000. * It's assumed that no walkable ground exists below -20000. */ -bool botHasGround(struct chrdata *chr) +bool bot_has_ground(struct chrdata *chr) { return chr->ground >= -20000; } @@ -1421,7 +1421,7 @@ bool botHasGround(struct chrdata *chr) * The zero angle is the additional angle that's needed for the bot to zero in * on its target from its natural facing angle. */ -void botUpdateZeroAngle(struct chrdata *chr) +void bot_update_zero_angle(struct chrdata *chr) { struct aibot *aibot = chr->aibot; s32 diff = aibot->config->difficulty; @@ -1483,7 +1483,7 @@ void botUpdateZeroAngle(struct chrdata *chr) // certain value. So the bot can zero faster when their target is cloaked? // Rare might have intended for this to apply to zeroinc instead. if (chr->target != -1) { - if (chrGetTargetProp(chr)->chr->hidden & CHRHFLAG_CLOAKED) { + if (chr_get_target_prop(chr)->chr->hidden & CHRHFLAG_CLOAKED) { if (maxspeed < g_BotDifficulties[diff].zerocloakspeed) { maxspeed = g_BotDifficulties[diff].zerocloakspeed; } @@ -1515,13 +1515,13 @@ void botUpdateZeroAngle(struct chrdata *chr) * Return true if the bot is a peacesim and is happy to fight the given chr, * or if the bot is not a peacesim. */ -bool botPassesPeaceCheck(struct chrdata *botchr, struct chrdata *otherchr) +bool bot_passes_peace_check(struct chrdata *botchr, struct chrdata *otherchr) { struct aibot *aibot = botchr->aibot; bool pass = true; if (aibot->config->type == BOTTYPE_PEACE) { - s32 otherweaponnum = botGetWeaponNum(otherchr); + s32 otherweaponnum = bot_get_weapon_num(otherchr); if (otherweaponnum == WEAPON_NONE || otherweaponnum == WEAPON_UNARMED) { pass = false; @@ -1535,7 +1535,7 @@ bool botPassesPeaceCheck(struct chrdata *botchr, struct chrdata *otherchr) * Return true if the bot is a cowardsim and is happy to fight the given chr, * or if the bot is not a cowardsim. */ -bool botPassesCowardCheck(struct chrdata *botchr, struct chrdata *otherchr) +bool bot_passes_coward_check(struct chrdata *botchr, struct chrdata *otherchr) { struct aibot *aibot = botchr->aibot; bool pass = true; @@ -1546,10 +1546,10 @@ bool botPassesCowardCheck(struct chrdata *botchr, struct chrdata *otherchr) s32 theirscore2; if (aibot->config->type == BOTTYPE_COWARD) { - otherweaponnum = botGetWeaponNum(otherchr); + otherweaponnum = bot_get_weapon_num(otherchr); - botinvScoreWeapon(botchr, aibot->weaponnum, FUNC_PRIMARY, 1, false, &myscore1, &myscore2, false, false); - botinvScoreWeapon(botchr, otherweaponnum, FUNC_PRIMARY, 1, false, &theirscore1, &theirscore2, false, false); + botinv_score_weapon(botchr, aibot->weaponnum, FUNC_PRIMARY, 1, false, &myscore1, &myscore2, false, false); + botinv_score_weapon(botchr, otherweaponnum, FUNC_PRIMARY, 1, false, &theirscore1, &theirscore2, false, false); if (theirscore1 >= myscore1 - 30) { pass = false; @@ -1567,7 +1567,7 @@ bool botPassesCowardCheck(struct chrdata *botchr, struct chrdata *otherchr) * The function does not compare weapons with the target, nor ammo counts, * and does not factor in the bot types (eg. VengeSim). */ -void botChooseGeneralTarget(struct chrdata *botchr) +void bot_choose_general_target(struct chrdata *botchr) { struct aibot *aibot = botchr->aibot; s32 i; @@ -1581,19 +1581,19 @@ void botChooseGeneralTarget(struct chrdata *botchr) // and update stats about that chr aibot->queryplayernum = (aibot->queryplayernum + 1) % g_MpNumChrs; - trychr = mpGetChrFromPlayerIndex(aibot->queryplayernum); + trychr = mp_get_chr_from_player_index(aibot->queryplayernum); if (trychr != botchr) { // This condition passes on average once every 4 minutes per player. // However, the usage of canseecloaked appears to be botched. - // It is implemented in botIsTargetInvisible, but that function is not + // It is implemented in bot_is_target_invisible, but that function is not // called here while canseecloaked is true. if (random() % TICKS(4 * 60 * 60) < g_MpNumChrs * g_Vars.lvupdate60) { aibot->canseecloaked = true; } - aibot->chrdistances[aibot->queryplayernum] = chrGetDistanceToCoord(botchr, &trychr->prop->pos); - aibot->chrsinsight[aibot->queryplayernum] = chrHasLosToChr(botchr, trychr, &room); + aibot->chrdistances[aibot->queryplayernum] = chr_get_distance_to_coord(botchr, &trychr->prop->pos); + aibot->chrsinsight[aibot->queryplayernum] = chr_has_los_to_chr(botchr, trychr, &room); aibot->chrrooms[aibot->queryplayernum] = room; aibot->canseecloaked = false; @@ -1628,11 +1628,11 @@ void botChooseGeneralTarget(struct chrdata *botchr) } } - botUpdateZeroAngle(botchr); + bot_update_zero_angle(botchr); // If the bot is data uplinking, clear the target if (botchr->myaction == MA_AIBOTDOWNLOAD) { - botSetTarget(botchr, -1); + bot_set_target(botchr, -1); return; } @@ -1640,32 +1640,32 @@ void botChooseGeneralTarget(struct chrdata *botchr) if (botchr->myaction == MA_AIBOTATTACK && aibot->attackingplayernum >= 0 && aibot->chrsinsight[aibot->attackingplayernum] - && !chrIsDead(g_MpAllChrPtrs[aibot->attackingplayernum])) { - botSetTarget(botchr, g_MpAllChrPtrs[aibot->attackingplayernum]->prop - g_Vars.props); + && !chr_is_dead(g_MpAllChrPtrs[aibot->attackingplayernum])) { + bot_set_target(botchr, g_MpAllChrPtrs[aibot->attackingplayernum]->prop - g_Vars.props); return; } // Check if existing target needs to be invalidated if (botchr->target != -1) { - struct prop *targetprop = chrGetTargetProp(botchr); + struct prop *targetprop = chr_get_target_prop(botchr); - if (chrIsDead(targetprop->chr)) { + if (chr_is_dead(targetprop->chr)) { botchr->target = -1; } - if (!botchr->aibot->targetinsight && botIsTargetInvisible(botchr, targetprop->chr)) { + if (!botchr->aibot->targetinsight && bot_is_target_invisible(botchr, targetprop->chr)) { botchr->target = -1; } - if (chrCompareTeams(botchr, targetprop->chr, COMPARE_FRIENDS)) { + if (chr_compare_teams(botchr, targetprop->chr, COMPARE_FRIENDS)) { botchr->target = -1; } - if (!botPassesPeaceCheck(botchr, targetprop->chr)) { + if (!bot_passes_peace_check(botchr, targetprop->chr)) { botchr->target = -1; } - if (!botchr->aibot->targetinsight && !botPassesCowardCheck(botchr, targetprop->chr)) { + if (!botchr->aibot->targetinsight && !bot_passes_coward_check(botchr, targetprop->chr)) { botchr->target = -1; } } @@ -1678,30 +1678,30 @@ void botChooseGeneralTarget(struct chrdata *botchr) for (tmp = 0; tmp < g_MpNumChrs; tmp++) { s32 i = aibot->chrnumsbydistanceasc[tmp]; - trychr = mpGetChrFromPlayerIndex(i); + trychr = mp_get_chr_from_player_index(i); if (trychr != botchr - && !chrIsDead(trychr) - && chrCompareTeams(botchr, trychr, COMPARE_ENEMIES) - && botPassesPeaceCheck(botchr, trychr)) { + && !chr_is_dead(trychr) + && chr_compare_teams(botchr, trychr, COMPARE_ENEMIES) + && bot_passes_peace_check(botchr, trychr)) { // If the chr is in sight, that's it if (aibot->chrsinsight[i]) { - botSetTarget(botchr, trychr->prop - g_Vars.props); + bot_set_target(botchr, trychr->prop - g_Vars.props); return; } // Meat and easy sims will target the closest chr, even if that // chr isn't in sight and when there are other chrs in sight who // are further away - if (!botIsTargetInvisible(botchr, trychr) + if (!bot_is_target_invisible(botchr, trychr) && (aibot->config->difficulty == BOTDIFF_MEAT || aibot->config->difficulty == BOTDIFF_EASY)) { - botSetTarget(botchr, trychr->prop - g_Vars.props); + bot_set_target(botchr, trychr->prop - g_Vars.props); return; } // Other sim types will prioritise chrs in sight, which means // the closest out of sight chrnum must be stored for later - if (!botIsTargetInvisible(botchr, trychr) && closestavailablechrnum < 0) { + if (!bot_is_target_invisible(botchr, trychr) && closestavailablechrnum < 0) { closestavailablechrnum = i; } } @@ -1709,22 +1709,22 @@ void botChooseGeneralTarget(struct chrdata *botchr) // Use closest out of sight chr if (closestavailablechrnum >= 0) { - trychr = mpGetChrFromPlayerIndex(closestavailablechrnum); - botSetTarget(botchr, trychr->prop - g_Vars.props); + trychr = mp_get_chr_from_player_index(closestavailablechrnum); + bot_set_target(botchr, trychr->prop - g_Vars.props); return; } // No one available - maybe everyone else is dead or cloaked - botSetTarget(botchr, -1); + bot_set_target(botchr, -1); return; } // Bot has an existing target // If they're still in sight, keep the target - playernum = mpPlayerGetIndex((g_Vars.props + botchr->target)->chr); + playernum = mp_player_get_index((g_Vars.props + botchr->target)->chr); if (aibot->chrsinsight[playernum]) { - botSetTarget(botchr, botchr->target); + bot_set_target(botchr, botchr->target); return; } @@ -1732,20 +1732,20 @@ void botChooseGeneralTarget(struct chrdata *botchr) // Check for other chrs who are in sight, by distance for (i = 0; i < g_MpNumChrs; i++) { if (aibot->chrsinsight[aibot->chrnumsbydistanceasc[i]]) { - trychr = mpGetChrFromPlayerIndex(aibot->chrnumsbydistanceasc[i]); + trychr = mp_get_chr_from_player_index(aibot->chrnumsbydistanceasc[i]); if (trychr != botchr - && !chrIsDead(trychr) - && chrCompareTeams(botchr, trychr, COMPARE_ENEMIES) - && botPassesPeaceCheck(botchr, trychr)) { - botSetTarget(botchr, trychr->prop - g_Vars.props); + && !chr_is_dead(trychr) + && chr_compare_teams(botchr, trychr, COMPARE_ENEMIES) + && bot_passes_peace_check(botchr, trychr)) { + bot_set_target(botchr, trychr->prop - g_Vars.props); return; } } } // No one else in sight - maintain original target - botSetTarget(botchr, botchr->target); + bot_set_target(botchr, botchr->target); } /** @@ -1753,7 +1753,7 @@ void botChooseGeneralTarget(struct chrdata *botchr) * * They are not capable if it would create a circular follow loop. */ -bool botCanFollow(struct chrdata *botchr, struct chrdata *leader) +bool bot_can_follow(struct chrdata *botchr, struct chrdata *leader) { bool canfollow = true; @@ -1777,7 +1777,7 @@ bool botCanFollow(struct chrdata *botchr, struct chrdata *leader) return canfollow; } -s32 botFindTeammateToFollow(struct chrdata *chr, f32 range) +s32 bot_find_teammate_to_follow(struct chrdata *chr, f32 range) { s32 result = -1; @@ -1790,9 +1790,9 @@ s32 botFindTeammateToFollow(struct chrdata *chr, f32 range) for (i = 0; i < g_MpNumChrs; i++) { if (chr != g_MpAllChrPtrs[i] - && !chrIsDead(g_MpAllChrPtrs[i]) + && !chr_is_dead(g_MpAllChrPtrs[i]) && chr->team == g_MpAllChrPtrs[i]->team - && botCanFollow(chr, g_MpAllChrPtrs[i])) { + && bot_can_follow(chr, g_MpAllChrPtrs[i])) { f32 distance = chr->aibot->chrdistances[i]; if (closestplayernum < 0 || distance < closestdistance) { @@ -1810,20 +1810,20 @@ s32 botFindTeammateToFollow(struct chrdata *chr, f32 range) return result; } -void botScheduleReload(struct chrdata *chr, s32 handnum) +void bot_schedule_reload(struct chrdata *chr, s32 handnum) { chr->aibot->timeuntilreload60[handnum] = g_BotWeaponConfigs[chr->aibot->weaponnum].reloaddelay * (PAL ? 50 : 60); if (g_BotWeaponConfigs[chr->aibot->weaponnum].allowpartialreloaddelay) { - s32 capacity = botactGetClipCapacityByFunction(chr->aibot->weaponnum, chr->aibot->gunfunc); + s32 capacity = botact_get_clip_capacity_by_function(chr->aibot->weaponnum, chr->aibot->gunfunc); chr->aibot->timeuntilreload60[handnum] *= capacity - chr->aibot->loadedammo[handnum]; chr->aibot->timeuntilreload60[handnum] /= capacity; } } -#define HASENOUGHPRI(aibot, weaponnum, goal) (g_BotWeaponConfigs[weaponnum].haspriammogoal && botactGetAmmoQuantityByWeapon(aibot, weaponnum, FUNC_PRIMARY, true) >= (goal)) -#define HASENOUGHSEC(aibot, weaponnum, goal) (g_BotWeaponConfigs[weaponnum].hassecammogoal && botactGetAmmoQuantityByWeapon(aibot, weaponnum, FUNC_SECONDARY, true) >= (goal)) +#define HASENOUGHPRI(aibot, weaponnum, goal) (g_BotWeaponConfigs[weaponnum].haspriammogoal && botact_get_ammo_quantity_by_weapon(aibot, weaponnum, FUNC_PRIMARY, true) >= (goal)) +#define HASENOUGHSEC(aibot, weaponnum, goal) (g_BotWeaponConfigs[weaponnum].hassecammogoal && botact_get_ammo_quantity_by_weapon(aibot, weaponnum, FUNC_SECONDARY, true) >= (goal)) /** * Find a prop for the bot to pick up. @@ -1843,7 +1843,7 @@ void botScheduleReload(struct chrdata *chr, s32 handnum) * Find pretty much any prop. This is used when the bot has nothing else to * do (eg. if all opponents are cloaked) and may as well stock up on ammo. */ -struct prop *botFindPickup(struct chrdata *chr, s32 criteria) +struct prop *bot_find_pickup(struct chrdata *chr, s32 criteria) { struct aibot *aibot = chr->aibot; s32 weaponnums[NUM_MPWEAPONSLOTS]; @@ -1881,17 +1881,17 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) if (aibot->teamisonlyai && g_MpSetup.scenario == MPSCENARIO_KINGOFTHEHILL && chr->prop->rooms[0] == g_ScenarioData.koh.hillrooms[0]) { - numteam = botGetNumTeammatesDefendingHill(chr); - numopponents = botGetNumOpponentsInHill(chr); + numteam = bot_get_num_teammates_defending_hill(chr); + numopponents = bot_get_num_opponents_in_hill(chr); if (numteam >= numopponents && numteam <= numopponents + 2) { barelydominatinghill = true; } } - // botinvScoreAllWeapons populates weaponnums, scores1 and scores2 + // botinv_score_all_weapons populates weaponnums, scores1 and scores2 // and sorts them by score1 descending - botinvScoreAllWeapons(chr, weaponnums, scores1, scores2); + botinv_score_all_weapons(chr, weaponnums, scores1, scores2); for (i = 0; i < ARRAYCOUNT(weapproplist); i++) { weapproplist[i] = NULL; @@ -1902,7 +1902,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) } for (i = 0; i < ARRAYCOUNT(weaponnums); i++) { - invitems[i] = botinvGetItem(chr, weaponnums[i]); + invitems[i] = botinv_get_item(chr, weaponnums[i]); } // Iterate all active props and populate the proplist and distlist arrays. @@ -1917,7 +1917,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) weapon = prop->weapon; if ((weapon->base.flags3 & OBJFLAG3_ISFETCHTARGET) == 0) { - sqdist1 = chrGetSquaredDistanceToCoord(chr, &prop->pos); + sqdist1 = chr_get_squared_distance_to_coord(chr, &prop->pos); for (i = 0; i < ARRAYCOUNT(weaponnums); i++) { if (weaponnums[i] > WEAPON_UNARMED && weaponnums[i] == weapon->weaponnum) { @@ -1931,7 +1931,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) } } - ammotype = botactGetAmmoTypeByFunction(weapon->weaponnum, FUNC_PRIMARY); + ammotype = botact_get_ammo_type_by_function(weapon->weaponnum, FUNC_PRIMARY); if (ammotype > 0 && random() % 16) { if (ammoproplist[ammotype] == NULL || sqdist1 < ammodistlist[ammotype] || random() % 16 == 0) { @@ -1946,13 +1946,13 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) if ((obj->flags3 & OBJFLAG3_ISFETCHTARGET) == 0) { if (obj->type == OBJTYPE_MULTIAMMOCRATE) { crate = (struct multiammocrateobj *)prop->obj; - sqdist2 = chrGetSquaredDistanceToCoord(chr, &prop->pos); + sqdist2 = chr_get_squared_distance_to_coord(chr, &prop->pos); for (i = 0; i < 19; i++) { s32 ammotype = i + 1; if (crate->slots[i].quantity > 0) { - weaponnum = botactGetWeaponByAmmoType(ammotype); + weaponnum = botact_get_weapon_by_ammo_type(ammotype); if (weaponnum > 0) { for (j = 0; j < ARRAYCOUNT(weaponnums); j++) { @@ -1979,7 +1979,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) } else if (obj->type == OBJTYPE_SHIELD) { for (i = 0; i < ARRAYCOUNT(weaponnums); i++) { if (weaponnums[i] == WEAPON_MPSHIELD) { - sqdist2 = chrGetSquaredDistanceToCoord(chr, &prop->pos); + sqdist2 = chr_get_squared_distance_to_coord(chr, &prop->pos); if (random() % 16 == 0) { break; @@ -2008,7 +2008,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) for (i = 0; i < ARRAYCOUNT(weaponnums); i++) { if (1); - if ((botinvAllowsWeapon(chr, weaponnums[i], FUNC_PRIMARY) || botinvAllowsWeapon(chr, weaponnums[i], FUNC_SECONDARY)) + if ((botinv_allows_weapon(chr, weaponnums[i], FUNC_PRIMARY) || botinv_allows_weapon(chr, weaponnums[i], FUNC_SECONDARY)) && (g_BotWeaponConfigs[weaponnums[i]].haspriammogoal || g_BotWeaponConfigs[weaponnums[i]].hassecammogoal) && scores1[i] > bestscore1) { bestscore1 = scores1[i]; @@ -2039,7 +2039,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) // Bots will be less likely to fetch shields while defending the hill triggerathealth = 4 - (aibot->randomfrac + aibot->randomfrac); desiredshield = 1 - aibot->randomfrac; - } else if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE && botShouldReturnCtcToken(chr)) { + } else if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE && bot_should_return_ctc_token(chr)) { // Bots will be less likely to fetch shields while returning a CTC case triggerathealth = 3 - (aibot->randomfrac + aibot->randomfrac); } else if (chr->myaction == MA_AIBOTDOWNLOAD) { @@ -2129,7 +2129,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) s32 stack; // Don't go after ammo when returning a CTC token - if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE && botShouldReturnCtcToken(chr)) { + if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE && bot_should_return_ctc_token(chr)) { done = true; break; } @@ -2163,14 +2163,14 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) } else if (criteria == PICKUPCRITERIA_ANY) { // If looking for any pickups at all, use the weapon's ammo // capacities as the goal ammo - desiredpriammo = bgunGetCapacityByAmmotype(botactGetAmmoTypeByFunction(weaponnums[i], FUNC_PRIMARY)); - desiredsecammo = bgunGetCapacityByAmmotype(botactGetAmmoTypeByFunction(weaponnums[i], FUNC_SECONDARY)); + desiredpriammo = bgun_get_capacity_by_ammotype(botact_get_ammo_type_by_function(weaponnums[i], FUNC_PRIMARY)); + desiredsecammo = bgun_get_capacity_by_ammotype(botact_get_ammo_type_by_function(weaponnums[i], FUNC_SECONDARY)); // If bot has max ammo for both weapon's functions if ((g_BotWeaponConfigs[weaponnums[i]].haspriammogoal == false - || botactGetAmmoQuantityByWeapon(aibot, weaponnums[i], FUNC_PRIMARY, false) >= desiredpriammo) + || botact_get_ammo_quantity_by_weapon(aibot, weaponnums[i], FUNC_PRIMARY, false) >= desiredpriammo) && (g_BotWeaponConfigs[weaponnums[i]].hassecammogoal == false - || botactGetAmmoQuantityByWeapon(aibot, weaponnums[i], FUNC_SECONDARY, false) >= desiredsecammo)) { + || botact_get_ammo_quantity_by_weapon(aibot, weaponnums[i], FUNC_SECONDARY, false) >= desiredsecammo)) { // Consider next weapon continue; } @@ -2199,12 +2199,12 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) // Iterate both weapon functions and check // if the bot has enough ammo for that function for (funcnum = 0; funcnum < 2; funcnum++) { - if (botinvAllowsWeapon(chr, weaponnums[i], funcnum)) { - s32 ammotype = botactGetAmmoTypeByFunction(weaponnums[i], funcnum); + if (botinv_allows_weapon(chr, weaponnums[i], funcnum)) { + s32 ammotype = botact_get_ammo_type_by_function(weaponnums[i], funcnum); if (ammotype > 0) { s32 goal = funcnum ? desiredsecammo : desiredpriammo; - s32 qty = botactGetAmmoQuantityByType(aibot, ammotype, include_equipped); + s32 qty = botact_get_ammo_quantity_by_type(aibot, ammotype, include_equipped); if (qty < goal && ammoproplist[ammotype]) { chosenprop = ammoproplist[ammotype]; @@ -2222,7 +2222,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) // Fetch the highest scoring weapon if there are any pickups for it. for (i = 0; i < ARRAYCOUNT(weaponnums) && !done; i++) { if (weaponnums[i] != WEAPON_MPSHIELD) { - if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE && botShouldReturnCtcToken(chr)) { + if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE && bot_should_return_ctc_token(chr)) { done = true; break; } @@ -2233,7 +2233,7 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) } if (!barelydominatinghill - && (botinvAllowsWeapon(chr, weaponnums[i], FUNC_PRIMARY) || botinvAllowsWeapon(chr, weaponnums[i], FUNC_SECONDARY)) + && (botinv_allows_weapon(chr, weaponnums[i], FUNC_PRIMARY) || botinv_allows_weapon(chr, weaponnums[i], FUNC_SECONDARY)) && invitems[i] == NULL && weapproplist[i] != NULL) { chosenprop = weapproplist[i]; @@ -2248,11 +2248,11 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) for (i = 0; i < ARRAYCOUNT(weaponnums) && !done; i++) { if (weaponnums[i] != WEAPON_MPSHIELD) { for (j = 0; j < 2; j++) { - if (botinvAllowsWeapon(chr, weaponnums[i], j)) { - s32 ammotype = botactGetAmmoTypeByFunction(weaponnums[i], j); + if (botinv_allows_weapon(chr, weaponnums[i], j)) { + s32 ammotype = botact_get_ammo_type_by_function(weaponnums[i], j); if (ammotype > 0 - && botactGetAmmoQuantityByType(aibot, ammotype, false) < bgunGetCapacityByAmmotype(ammotype) + && botact_get_ammo_quantity_by_type(aibot, ammotype, false) < bgun_get_capacity_by_ammotype(ammotype) && ammoproplist[ammotype] != NULL) { chosenprop = ammoproplist[ammotype]; done = true; @@ -2273,30 +2273,30 @@ struct prop *botFindPickup(struct chrdata *chr, s32 criteria) * This returns true when the bot is low on health or ammo and there are pickups * available. */ -bool botCanDoCriticalPickup(struct chrdata *chr) +bool bot_can_do_critical_pickup(struct chrdata *chr) { - return botFindPickup(chr, PICKUPCRITERIA_CRITICAL) != NULL; + return bot_find_pickup(chr, PICKUPCRITERIA_CRITICAL) != NULL; } /** * Find a pickup to fetch based on default criteria. Default criteria basically * means a good amount of ammo - not lacking but not excessive either. */ -struct prop *botFindDefaultPickup(struct chrdata *chr) +struct prop *bot_find_default_pickup(struct chrdata *chr) { - return botFindPickup(chr, PICKUPCRITERIA_DEFAULT); + return bot_find_pickup(chr, PICKUPCRITERIA_DEFAULT); } /** * Find any pickup to fetch. This is used when the bot has nothing else to do * (eg. if all opponents are cloaked). */ -struct prop *botFindAnyPickup(struct chrdata *chr) +struct prop *bot_find_any_pickup(struct chrdata *chr) { - return botFindPickup(chr, PICKUPCRITERIA_ANY); + return bot_find_pickup(chr, PICKUPCRITERIA_ANY); } -s32 botGetTeamSize(struct chrdata *chr) +s32 bot_get_team_size(struct chrdata *chr) { s32 count = 0; s32 i; @@ -2310,7 +2310,7 @@ s32 botGetTeamSize(struct chrdata *chr) return count; } -s32 botGetCountInTeamDoingCommand(struct chrdata *self, u32 command, bool includeself) +s32 bot_get_count_in_team_doing_command(struct chrdata *self, u32 command, bool includeself) { s32 count = 0; s32 i; @@ -2328,9 +2328,9 @@ s32 botGetCountInTeamDoingCommand(struct chrdata *self, u32 command, bool includ return count; } -s32 botIsChrsCtcTokenHeld(struct chrdata *chr) +s32 bot_is_chrs_ctc_token_held(struct chrdata *chr) { - struct mpchrconfig *mpchr = g_MpAllChrConfigPtrs[mpPlayerGetIndex(chr)]; + struct mpchrconfig *mpchr = g_MpAllChrConfigPtrs[mp_player_get_index(chr)]; struct prop *prop = g_ScenarioData.ctc.tokens[mpchr->team]; return prop && (prop->type == PROPTYPE_CHR || prop->type == PROPTYPE_PLAYER); @@ -2342,10 +2342,10 @@ s32 botIsChrsCtcTokenHeld(struct chrdata *chr) * If chr is on a team by themself and their token is stolen, return false * Otherwise, return true */ -bool botShouldReturnCtcToken(struct chrdata *chr) +bool bot_should_return_ctc_token(struct chrdata *chr) { if (chr->aibot->hascase) { - if (!chr->aibot->teamisonlyai || botGetTeamSize(chr) >= 2 || !botIsChrsCtcTokenHeld(chr)) { + if (!chr->aibot->teamisonlyai || bot_get_team_size(chr) >= 2 || !bot_is_chrs_ctc_token_held(chr)) { return true; } } @@ -2353,7 +2353,7 @@ bool botShouldReturnCtcToken(struct chrdata *chr) return false; } -s32 botGetNumTeammatesDefendingHill(struct chrdata *bot) +s32 bot_get_num_teammates_defending_hill(struct chrdata *bot) { s32 count = 0; s32 i; @@ -2377,9 +2377,9 @@ s32 botGetNumTeammatesDefendingHill(struct chrdata *bot) * * This function is slightly misnamed. */ -s32 botGetNumOpponentsInHill(struct chrdata *chr) +s32 bot_get_num_opponents_in_hill(struct chrdata *chr) { - struct mpchrconfig *mpchr = g_MpAllChrConfigPtrs[mpPlayerGetIndex(chr)]; + struct mpchrconfig *mpchr = g_MpAllChrConfigPtrs[mp_player_get_index(chr)]; struct mpchrconfig *loopmpchr; s32 countsperteam[MAX_TEAMS] = {0}; s32 max = 0; @@ -2420,14 +2420,14 @@ s32 botGetNumOpponentsInHill(struct chrdata *chr) * - Apply the new myaction if any * - If the existing myaction is no longer valid, force a return to the main * loop on the next tick - * - Decide whether to switch weapons (via botinvTick) + * - Decide whether to switch weapons (via botinv_tick) * - Decide whether to discharge a shot on this tick */ -void botTickUnpaused(struct chrdata *chr) +void bot_tick_unpaused(struct chrdata *chr) { s32 newaction = -1; - if (!chrIsDead(chr)) { + if (!chr_is_dead(chr)) { struct aibot *aibot = chr->aibot; s32 i; @@ -2447,19 +2447,19 @@ void botTickUnpaused(struct chrdata *chr) aibot->timeuntilreload60[i] -= g_Vars.lvupdate60; if (aibot->timeuntilreload60[i] <= 0) { - botactReload(chr, i, true); + botact_reload(chr, i, true); } - } else if (!botactIsWeaponThrowable(aibot->weaponnum, aibot->gunfunc)) { + } else if (!botact_is_weapon_throwable(aibot->weaponnum, aibot->gunfunc)) { // If the weapon is reloadable, schedule a reload if bot is out // of ammo or has less than half a clip and last saw their // target 2 seconds ago s32 loadedammo = aibot->loadedammo[i]; - s32 clipsize = botactGetClipCapacityByFunction(aibot->weaponnum, aibot->gunfunc); + s32 clipsize = botact_get_clip_capacity_by_function(aibot->weaponnum, aibot->gunfunc); if (loadedammo <= 0 && clipsize > 0) { - botScheduleReload(chr, i); + bot_schedule_reload(chr, i); } else if (loadedammo < clipsize / 2 && aibot->lastseenanytarget60 < g_Vars.lvframe60 - TICKS(120)) { - botScheduleReload(chr, i); + bot_schedule_reload(chr, i); } } } @@ -2469,17 +2469,17 @@ void botTickUnpaused(struct chrdata *chr) aibot->changeguntimer60 -= g_Vars.lvupdate60; if (aibot->changeguntimer60 <= 0) { - struct invitem *item = botinvGetItem(chr, aibot->weaponnum); - s32 modelnum = playermgrGetModelOfWeapon(aibot->weaponnum); + struct invitem *item = botinv_get_item(chr, aibot->weaponnum); + s32 modelnum = playermgr_get_model_of_weapon(aibot->weaponnum); s32 i; if (item && modelnum >= 0) { - chrGiveWeapon(chr, modelnum, aibot->weaponnum, 0); - botactReload(chr, HAND_RIGHT, false); + chr_give_weapon(chr, modelnum, aibot->weaponnum, 0); + botact_reload(chr, HAND_RIGHT, false); if (item->type == INVITEMTYPE_DUAL) { - chrGiveWeapon(chr, modelnum, aibot->weaponnum, OBJFLAG_WEAPON_LEFTHANDED); - botactReload(chr, HAND_LEFT, false); + chr_give_weapon(chr, modelnum, aibot->weaponnum, OBJFLAG_WEAPON_LEFTHANDED); + botact_reload(chr, HAND_LEFT, false); } } else { // Bot doesn't have the weapon it was told to switch to @@ -2507,7 +2507,7 @@ void botTickUnpaused(struct chrdata *chr) // Consider starting or stopping cloak if (aibot->ammoheld[AMMOTYPE_CLOAK] > 0 - && (botIsAboutToAttack(chr, true) || chr->myaction == MA_AIBOTDOWNLOAD)) { + && (bot_is_about_to_attack(chr, true) || chr->myaction == MA_AIBOTDOWNLOAD)) { aibot->cloakdeviceenabled = true; } else { #if VERSION >= VERSION_PAL_FINAL @@ -2527,9 +2527,9 @@ void botTickUnpaused(struct chrdata *chr) // Consider starting or stopping RC-P120 cloak if (!aibot->cloakdeviceenabled && aibot->weaponnum == WEAPON_RCP120) { - s32 qty = botactGetAmmoQuantityByWeapon(aibot, WEAPON_RCP120, FUNC_PRIMARY, true); + s32 qty = botact_get_ammo_quantity_by_weapon(aibot, WEAPON_RCP120, FUNC_PRIMARY, true); - if (botIsAboutToAttack(chr, true)) { + if (bot_is_about_to_attack(chr, true)) { if (qty > 200 + (aibot->random1 >> 6) % 200) { aibot->rcp120cloakenabled = true; } else if (qty <= 30 + (aibot->random1 >> 16) % 70) { @@ -2562,34 +2562,34 @@ void botTickUnpaused(struct chrdata *chr) } if (aibot->commandtimer60 <= 0) { - s32 teamsize = botGetTeamSize(chr); + s32 teamsize = bot_get_team_size(chr); if (g_MpSetup.scenario == MPSCENARIO_HOLDTHEBRIEFCASE) { - s32 numgetting = botGetCountInTeamDoingCommand(chr, AIBOTCMD_GETCASE2, false); + s32 numgetting = bot_get_count_in_team_doing_command(chr, AIBOTCMD_GETCASE2, false); if (numgetting <= 0 || (numgetting < (teamsize + 1) / 2 || random() % 100 < 66)) { - botApplyScenarioCommand(chr, AIBOTCMD_GETCASE2); + bot_apply_scenario_command(chr, AIBOTCMD_GETCASE2); } else { - botApplyScenarioCommand(chr, AIBOTCMD_NORMAL); + bot_apply_scenario_command(chr, AIBOTCMD_NORMAL); } } else if (g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL) { - s32 numbots = botGetCountInTeamDoingCommand(chr, AIBOTCMD_DOWNLOAD, false); + s32 numbots = bot_get_count_in_team_doing_command(chr, AIBOTCMD_DOWNLOAD, false); if (aibot->hasuplink || numbots <= 0 || (numbots < (teamsize + 1) / 2 || random() % 100 < 50)) { - botApplyScenarioCommand(chr, AIBOTCMD_DOWNLOAD); + bot_apply_scenario_command(chr, AIBOTCMD_DOWNLOAD); } else { - botApplyScenarioCommand(chr, AIBOTCMD_NORMAL); + bot_apply_scenario_command(chr, AIBOTCMD_NORMAL); } } else if (g_MpSetup.scenario == MPSCENARIO_POPACAP) { - s32 numchasing = botGetCountInTeamDoingCommand(chr, AIBOTCMD_POPCAP, false); + s32 numchasing = bot_get_count_in_team_doing_command(chr, AIBOTCMD_POPCAP, false); if (numchasing <= 0 || numchasing < (teamsize + 1) / 2 || random() % 100 < 50) { - botApplyScenarioCommand(chr, AIBOTCMD_POPCAP); + bot_apply_scenario_command(chr, AIBOTCMD_POPCAP); } else { - botApplyScenarioCommand(chr, AIBOTCMD_NORMAL); + bot_apply_scenario_command(chr, AIBOTCMD_NORMAL); } } else if (g_MpSetup.scenario == MPSCENARIO_KINGOFTHEHILL) { - s32 numinhill = botGetNumTeammatesDefendingHill(chr); + s32 numinhill = bot_get_num_teammates_defending_hill(chr); // Don't count ourselves if (chr->prop->rooms[0] == g_ScenarioData.koh.hillrooms[0]) { @@ -2597,59 +2597,59 @@ void botTickUnpaused(struct chrdata *chr) } if (numinhill <= 0 || numinhill < teamsize / 2) { - botApplyScenarioCommand(chr, AIBOTCMD_HOLDHILL); - } else if (numinhill > botGetNumOpponentsInHill(chr)) { + bot_apply_scenario_command(chr, AIBOTCMD_HOLDHILL); + } else if (numinhill > bot_get_num_opponents_in_hill(chr)) { if (random() % 100 < 50) { - botApplyScenarioCommand(chr, AIBOTCMD_DEFHILL); + bot_apply_scenario_command(chr, AIBOTCMD_DEFHILL); } else { - botApplyScenarioCommand(chr, AIBOTCMD_NORMAL); + bot_apply_scenario_command(chr, AIBOTCMD_NORMAL); } } else { - botApplyScenarioCommand(chr, AIBOTCMD_HOLDHILL); + bot_apply_scenario_command(chr, AIBOTCMD_HOLDHILL); } } else if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE) { if (teamsize == 1) { // One man team - s32 numgetting = botGetCountInTeamDoingCommand(chr, AIBOTCMD_GETCASE, true); + s32 numgetting = bot_get_count_in_team_doing_command(chr, AIBOTCMD_GETCASE, true); - if (botShouldReturnCtcToken(chr)) { - botApplyScenarioCommand(chr, AIBOTCMD_GETCASE); - } else if (botIsChrsCtcTokenHeld(chr)) { + if (bot_should_return_ctc_token(chr)) { + bot_apply_scenario_command(chr, AIBOTCMD_GETCASE); + } else if (bot_is_chrs_ctc_token_held(chr)) { if (random() % 100 < 30) { - botApplyScenarioCommand(chr, AIBOTCMD_GETCASE); + bot_apply_scenario_command(chr, AIBOTCMD_GETCASE); } else { - botApplyScenarioCommand(chr, AIBOTCMD_SAVECASE); + bot_apply_scenario_command(chr, AIBOTCMD_SAVECASE); } } else { if (random() % 100 < 70 || numgetting <= 0) { - botApplyScenarioCommand(chr, AIBOTCMD_GETCASE); + bot_apply_scenario_command(chr, AIBOTCMD_GETCASE); } else { - botApplyScenarioCommand(chr, AIBOTCMD_SAVECASE); + bot_apply_scenario_command(chr, AIBOTCMD_SAVECASE); } } } else { // Not a one man team - s32 numgetting = botGetCountInTeamDoingCommand(chr, AIBOTCMD_GETCASE, false); - s32 numsaving = botGetCountInTeamDoingCommand(chr, AIBOTCMD_SAVECASE, false); + s32 numgetting = bot_get_count_in_team_doing_command(chr, AIBOTCMD_GETCASE, false); + s32 numsaving = bot_get_count_in_team_doing_command(chr, AIBOTCMD_SAVECASE, false); - if (botShouldReturnCtcToken(chr)) { - botApplyScenarioCommand(chr, AIBOTCMD_GETCASE); - } else if (botIsChrsCtcTokenHeld(chr)) { + if (bot_should_return_ctc_token(chr)) { + bot_apply_scenario_command(chr, AIBOTCMD_GETCASE); + } else if (bot_is_chrs_ctc_token_held(chr)) { if (numsaving <= 0 || random() % 100 < 70) { - botApplyScenarioCommand(chr, AIBOTCMD_SAVECASE); + bot_apply_scenario_command(chr, AIBOTCMD_SAVECASE); } else { - botApplyScenarioCommand(chr, AIBOTCMD_GETCASE); + bot_apply_scenario_command(chr, AIBOTCMD_GETCASE); } } else if (numgetting <= 0 || numgetting < teamsize / 3) { - botApplyScenarioCommand(chr, AIBOTCMD_GETCASE); + bot_apply_scenario_command(chr, AIBOTCMD_GETCASE); } else if (numsaving <= 0 || numsaving < teamsize / 4) { - botApplyScenarioCommand(chr, AIBOTCMD_SAVECASE); + bot_apply_scenario_command(chr, AIBOTCMD_SAVECASE); } else if (random() % 100 < 30) { - botApplyScenarioCommand(chr, AIBOTCMD_GETCASE); + bot_apply_scenario_command(chr, AIBOTCMD_GETCASE); } else if (random() % 100 < 30) { - botApplyScenarioCommand(chr, AIBOTCMD_SAVECASE); + bot_apply_scenario_command(chr, AIBOTCMD_SAVECASE); } else { - botApplyScenarioCommand(chr, AIBOTCMD_NORMAL); + bot_apply_scenario_command(chr, AIBOTCMD_NORMAL); } } } @@ -2669,13 +2669,13 @@ void botTickUnpaused(struct chrdata *chr) // KazeSim will attack people on sight regardless of command if (aibot->config->type == BOTTYPE_KAZE && chr->target != -1 && aibot->targetinsight) { newaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(chrGetTargetProp(chr)->chr); + aibot->attackingplayernum = mp_player_get_index(chr_get_target_prop(chr)->chr); aibot->abortattacktimer60 = -1; } // Check if the bot needs to fetch some weapons or ammo if (newaction < 0) { - aibot->gotoprop = botFindDefaultPickup(chr); + aibot->gotoprop = bot_find_default_pickup(chr); if (aibot->gotoprop) { newaction = MA_AIBOTGETITEM; @@ -2689,11 +2689,11 @@ void botTickUnpaused(struct chrdata *chr) // This is a human command only struct chrdata *targetchr = (g_Vars.props + aibot->attackpropnum)->chr; - if (!chrIsDead(targetchr) - && !botIsTargetInvisible(chr, targetchr) - && botPassesCowardCheck(chr, targetchr)) { + if (!chr_is_dead(targetchr) + && !bot_is_target_invisible(chr, targetchr) + && bot_passes_coward_check(chr, targetchr)) { newaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(targetchr); + aibot->attackingplayernum = mp_player_get_index(targetchr); aibot->abortattacktimer60 = -1; } } else if (aibot->command == AIBOTCMD_FOLLOW) { @@ -2701,13 +2701,13 @@ void botTickUnpaused(struct chrdata *chr) // This is a human command only newaction = MA_AIBOTFOLLOW; aibot->canbreakfollow = true; - aibot->followingplayernum = mpPlayerGetIndex((g_Vars.props + aibot->followprotectpropnum)->chr); + aibot->followingplayernum = mp_player_get_index((g_Vars.props + aibot->followprotectpropnum)->chr); } else if (aibot->command == AIBOTCMD_PROTECT) { // Protect the prop (player) given in followprotectpropnum // This is a human command only newaction = MA_AIBOTFOLLOW; aibot->canbreakfollow = false; - aibot->followingplayernum = mpPlayerGetIndex((g_Vars.props + aibot->followprotectpropnum)->chr); + aibot->followingplayernum = mp_player_get_index((g_Vars.props + aibot->followprotectpropnum)->chr); } else if (aibot->command == AIBOTCMD_DEFEND) { // Defend the position given in defendholdpos // This is a human command only @@ -2723,7 +2723,7 @@ void botTickUnpaused(struct chrdata *chr) if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE && !aibot->hascase) { // Make an array of pointers to other teams' tokens // but ignore enemy tokens held by other teams - s32 botteamindex = radarGetTeamIndex(chr->team); + s32 botteamindex = radar_get_team_index(chr->team); s32 i; struct prop *tokens[4]; s32 numtokens = 0; @@ -2757,7 +2757,7 @@ void botTickUnpaused(struct chrdata *chr) i = (index + 1) % numtokens; while (true) { - f32 sqdist = chrGetSquaredDistanceToCoord(chr, &tokens[i]->pos); + f32 sqdist = chr_get_squared_distance_to_coord(chr, &tokens[i]->pos); if (sqdist < 1000 * 1000) { index = i; @@ -2778,10 +2778,10 @@ void botTickUnpaused(struct chrdata *chr) if (tokens[index]->type == PROPTYPE_WEAPON || tokens[index]->type == PROPTYPE_OBJ) { newaction = MA_AIBOTGETITEM; aibot->gotoprop = tokens[index]; - } else if (botCanFollow(chr, tokens[index]->chr)) { + } else if (bot_can_follow(chr, tokens[index]->chr)) { newaction = MA_AIBOTFOLLOW; aibot->canbreakfollow = random() % 4 == 0; - aibot->followingplayernum = mpPlayerGetIndex(tokens[index]->chr); + aibot->followingplayernum = mp_player_get_index(tokens[index]->chr); } } } @@ -2789,25 +2789,25 @@ void botTickUnpaused(struct chrdata *chr) // Capture the case - recover/protect bot's own token if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE) { // Find out where the bot's token is - struct prop *token = g_ScenarioData.ctc.tokens[radarGetTeamIndex(chr->team)]; + struct prop *token = g_ScenarioData.ctc.tokens[radar_get_team_index(chr->team)]; if (token->type == PROPTYPE_CHR || token->type == PROPTYPE_PLAYER) { struct chrdata *tokenchr = token->chr; if (tokenchr->team == chr->team) { // Held by a teammate - follow/protect them - if (botCanFollow(chr, tokenchr)) { + if (bot_can_follow(chr, tokenchr)) { newaction = MA_AIBOTFOLLOW; aibot->canbreakfollow = random() % 4 == 0; - aibot->followingplayernum = mpPlayerGetIndex(tokenchr); + aibot->followingplayernum = mp_player_get_index(tokenchr); } } else { // Held by an opponent - attack them - if (!chrIsDead(tokenchr) - && !botIsTargetInvisible(chr, tokenchr) - && botPassesCowardCheck(chr, tokenchr)) { + if (!chr_is_dead(tokenchr) + && !bot_is_target_invisible(chr, tokenchr) + && bot_passes_coward_check(chr, tokenchr)) { newaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(tokenchr); + aibot->attackingplayernum = mp_player_get_index(tokenchr); aibot->abortattacktimer60 = -1; } } @@ -2817,7 +2817,7 @@ void botTickUnpaused(struct chrdata *chr) aibot->gotopos.x = token->pos.x; aibot->gotopos.y = token->pos.y; aibot->gotopos.z = token->pos.z; - roomsCopy(token->rooms, aibot->gotorooms); + rooms_copy(token->rooms, aibot->gotorooms); aibot->inhill = false; } } @@ -2827,10 +2827,10 @@ void botTickUnpaused(struct chrdata *chr) if (chr->prop->rooms[0] == g_ScenarioData.koh.hillrooms[0] && chr->target != -1 && aibot->targetinsight - && botPassesCowardCheck(chr, chrGetTargetProp(chr)->chr)) { + && bot_passes_coward_check(chr, chr_get_target_prop(chr)->chr)) { // Bot is in the hill and sees target - attack them newaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(chrGetTargetProp(chr)->chr); + aibot->attackingplayernum = mp_player_get_index(chr_get_target_prop(chr)->chr); aibot->abortattacktimer60 = TICKS(300); } else { // Go to the hill if not there already @@ -2840,12 +2840,12 @@ void botTickUnpaused(struct chrdata *chr) s32 padnuminhill; s32 covernuminhill; - if (botroomFindPos(g_ScenarioData.koh.hillrooms[0], &posinhill, &angle, &padnuminhill, &covernuminhill)) { + if (botroom_find_pos(g_ScenarioData.koh.hillrooms[0], &posinhill, &angle, &padnuminhill, &covernuminhill)) { newaction = MA_AIBOTGOTOPOS; aibot->gotopos.x = posinhill.x; aibot->gotopos.y = posinhill.y; aibot->gotopos.z = posinhill.z; - roomsCopy(g_ScenarioData.koh.hillrooms, aibot->gotorooms); + rooms_copy(g_ScenarioData.koh.hillrooms, aibot->gotorooms); aibot->inhill = (chr->prop->rooms[0] == g_ScenarioData.koh.hillrooms[0]) != 0; aibot->hillpadnum = padnuminhill; aibot->hillcovernum = covernuminhill; @@ -2862,12 +2862,12 @@ void botTickUnpaused(struct chrdata *chr) s32 covernuminhill; // Go to the hill if not there already - if (botroomFindPos(g_ScenarioData.koh.hillrooms[0], &posinhill, &angle, &padnuminhill, &covernuminhill)) { + if (botroom_find_pos(g_ScenarioData.koh.hillrooms[0], &posinhill, &angle, &padnuminhill, &covernuminhill)) { newaction = MA_AIBOTGOTOPOS; aibot->gotopos.x = posinhill.x; aibot->gotopos.y = posinhill.y; aibot->gotopos.z = posinhill.z; - roomsCopy(g_ScenarioData.koh.hillrooms, aibot->gotorooms); + rooms_copy(g_ScenarioData.koh.hillrooms, aibot->gotorooms); aibot->inhill = (chr->prop->rooms[0] == g_ScenarioData.koh.hillrooms[0]) != 0; aibot->hillpadnum = padnuminhill; aibot->hillcovernum = covernuminhill; @@ -2886,16 +2886,16 @@ void botTickUnpaused(struct chrdata *chr) if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) && uplinkchr->team == chr->team) { // Uplink is held by teammate - protect them - if (botCanFollow(chr, uplinkchr)) { + if (bot_can_follow(chr, uplinkchr)) { newaction = MA_AIBOTFOLLOW; aibot->canbreakfollow = random() % 4 == 0; - aibot->followingplayernum = mpPlayerGetIndex(uplinkchr); + aibot->followingplayernum = mp_player_get_index(uplinkchr); } } else { // Uplink is held by opponent - attack them - if (!botIsTargetInvisible(chr, uplinkchr) && botPassesCowardCheck(chr, uplinkchr)) { + if (!bot_is_target_invisible(chr, uplinkchr) && bot_passes_coward_check(chr, uplinkchr)) { newaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(uplinkchr); + aibot->attackingplayernum = mp_player_get_index(uplinkchr); aibot->abortattacktimer60 = -1; } } @@ -2917,15 +2917,15 @@ void botTickUnpaused(struct chrdata *chr) if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) && tokenchr->team == chr->team) { // Briefcase is held by teammate - protect them - if (botCanFollow(chr, tokenchr)) { + if (bot_can_follow(chr, tokenchr)) { newaction = MA_AIBOTFOLLOW; aibot->canbreakfollow = random() % 4 == 0; - aibot->followingplayernum = mpPlayerGetIndex(tokenchr); + aibot->followingplayernum = mp_player_get_index(tokenchr); } - } else if (!botIsTargetInvisible(chr, tokenchr) && botPassesCowardCheck(chr, tokenchr)) { + } else if (!bot_is_target_invisible(chr, tokenchr) && bot_passes_coward_check(chr, tokenchr)) { // Briefcase is held by opponent - attack them newaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(tokenchr); + aibot->attackingplayernum = mp_player_get_index(tokenchr); aibot->abortattacktimer60 = -1; } } else { @@ -2945,16 +2945,16 @@ void botTickUnpaused(struct chrdata *chr) if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) && victimchr->team == chr->team) { // Victim is a teammate - protect them - if (botCanFollow(chr, victimchr)) { + if (bot_can_follow(chr, victimchr)) { newaction = MA_AIBOTFOLLOW; aibot->canbreakfollow = random() % 4 == 0; - aibot->followingplayernum = mpPlayerGetIndex(victimchr); + aibot->followingplayernum = mp_player_get_index(victimchr); } } else { // Victim is an opponent - attack them - if (!botIsTargetInvisible(chr, victimchr) && botPassesCowardCheck(chr, victimchr)) { + if (!bot_is_target_invisible(chr, victimchr) && bot_passes_coward_check(chr, victimchr)) { newaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(victimchr); + aibot->attackingplayernum = mp_player_get_index(victimchr); aibot->abortattacktimer60 = -1; } } @@ -2973,7 +2973,7 @@ void botTickUnpaused(struct chrdata *chr) s32 playernum = -1; if (random() % 100 < 66) { - playernum = botFindTeammateToFollow(chr, 100000); + playernum = bot_find_teammate_to_follow(chr, 100000); } if (playernum >= 0) { @@ -2991,7 +2991,7 @@ void botTickUnpaused(struct chrdata *chr) s32 playernum = -1; if (random() % 100 < 66) { - playernum = botFindTeammateToFollow(chr, 100000); + playernum = bot_find_teammate_to_follow(chr, 100000); } if (playernum >= 0) { @@ -3003,11 +3003,11 @@ void botTickUnpaused(struct chrdata *chr) } } else if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE) { // If the bot is holding an opponent's token, take it home - if (botShouldReturnCtcToken(chr)) { + if (bot_should_return_ctc_token(chr)) { struct pad pad; - s32 teamindex = g_ScenarioData.ctc.teamindexes[radarGetTeamIndex(chr->team)]; + s32 teamindex = g_ScenarioData.ctc.teamindexes[radar_get_team_index(chr->team)]; newaction = MA_AIBOTGOTOPOS; - padUnpack(g_ScenarioData.ctc.spawnpadsperteam[teamindex].homepad, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(g_ScenarioData.ctc.spawnpadsperteam[teamindex].homepad, PADFIELD_POS | PADFIELD_ROOM, &pad); aibot->gotopos.x = pad.pos.x; aibot->gotopos.y = pad.pos.y; aibot->gotopos.z = pad.pos.z; @@ -3018,7 +3018,7 @@ void botTickUnpaused(struct chrdata *chr) } else if (g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL) { // If the bot has the uplink, go to the terminal if (g_ScenarioData.htm.uplink == chr->prop) { - if (g_ScenarioData.htm.playernuminrange != mpPlayerGetIndex(chr)) { + if (g_ScenarioData.htm.playernuminrange != mp_player_get_index(chr)) { newaction = MA_AIBOTGOTOPROP; aibot->gotoprop = g_ScenarioData.htm.terminals[0].prop; } else { @@ -3033,7 +3033,7 @@ void botTickUnpaused(struct chrdata *chr) if (aibot->config->type == BOTTYPE_VENGE) { // Attack the last player who killed the bot if (aibot->lastkilledbyplayernum >= 0 - && !botIsTargetInvisible(chr, g_MpAllChrPtrs[aibot->lastkilledbyplayernum])) { + && !bot_is_target_invisible(chr, g_MpAllChrPtrs[aibot->lastkilledbyplayernum])) { newaction = MA_AIBOTATTACK; aibot->attackingplayernum = aibot->lastkilledbyplayernum; aibot->abortattacktimer60 = -1; @@ -3042,11 +3042,11 @@ void botTickUnpaused(struct chrdata *chr) // Attack a single player the whole match if (aibot->feudplayernum < 0 && aibot->lastkilledbyplayernum >= 0 - && !chrCompareTeams(chr, g_MpAllChrPtrs[aibot->lastkilledbyplayernum], COMPARE_FRIENDS)) { + && !chr_compare_teams(chr, g_MpAllChrPtrs[aibot->lastkilledbyplayernum], COMPARE_FRIENDS)) { aibot->feudplayernum = aibot->lastkilledbyplayernum; } - if (aibot->feudplayernum >= 0 && !botIsTargetInvisible(chr, g_MpAllChrPtrs[aibot->feudplayernum])) { + if (aibot->feudplayernum >= 0 && !bot_is_target_invisible(chr, g_MpAllChrPtrs[aibot->feudplayernum])) { newaction = MA_AIBOTATTACK; aibot->abortattacktimer60 = -1; aibot->attackingplayernum = aibot->feudplayernum; @@ -3054,19 +3054,19 @@ void botTickUnpaused(struct chrdata *chr) } else if (aibot->config->type == BOTTYPE_JUDGE) { // Attack the winning player struct ranking rankings[MAX_MPCHRS]; - s32 count = mpGetPlayerRankings(rankings); + s32 count = mp_get_player_rankings(rankings); s32 i; for (i = 0; i < count; i++) { s32 playernum = func0f18d0e8(rankings[i].chrnum); - struct chrdata *otherchr = mpGetChrFromPlayerIndex(playernum); + struct chrdata *otherchr = mp_get_chr_from_player_index(playernum); - if (otherchr != chr && !chrIsDead(otherchr)) { + if (otherchr != chr && !chr_is_dead(otherchr)) { #if PAL if (1); #endif - if (chrCompareTeams(chr, otherchr, COMPARE_ENEMIES) - && !botIsTargetInvisible(chr, otherchr)) { + if (chr_compare_teams(chr, otherchr, COMPARE_ENEMIES) + && !bot_is_target_invisible(chr, otherchr)) { newaction = MA_AIBOTATTACK; aibot->attackingplayernum = playernum; aibot->abortattacktimer60 = -1; @@ -3081,16 +3081,16 @@ void botTickUnpaused(struct chrdata *chr) s32 i; for (i = 0; i < g_MpNumChrs; i++) { - struct chrdata *otherchr = mpGetChrFromPlayerIndex(i); + struct chrdata *otherchr = mp_get_chr_from_player_index(i); if (otherchr != chr - && !chrIsDead(otherchr) - && chrCompareTeams(chr, otherchr, COMPARE_ENEMIES) - && !botIsTargetInvisible(chr, otherchr)) { + && !chr_is_dead(otherchr) + && chr_compare_teams(chr, otherchr, COMPARE_ENEMIES) + && !bot_is_target_invisible(chr, otherchr)) { if (otherchr->aibot) { health = otherchr->maxdamage - otherchr->damage; } else { - health = g_Vars.players[playermgrGetPlayerNumByProp(otherchr->prop)]->bondhealth * 8; + health = g_Vars.players[playermgr_get_player_num_by_prop(otherchr->prop)]->bondhealth * 8; } if (weakestplayernum < 0 || health < minhealth) { @@ -3111,7 +3111,7 @@ void botTickUnpaused(struct chrdata *chr) // If the bot didn't set an action above, // try attacking the existing target if (newaction < 0) { - if (chr->target != -1 && botPassesCowardCheck(chr, chrGetTargetProp(chr)->chr)) { + if (chr->target != -1 && bot_passes_coward_check(chr, chr_get_target_prop(chr)->chr)) { newaction = MA_AIBOTATTACK; aibot->abortattacktimer60 = -1; } @@ -3119,7 +3119,7 @@ void botTickUnpaused(struct chrdata *chr) // If there's no existing target, just follow a teammate if (newaction < 0) { - s32 playernum = botFindTeammateToFollow(chr, 300); + s32 playernum = bot_find_teammate_to_follow(chr, 300); if (playernum >= 0) { newaction = MA_AIBOTFOLLOW; @@ -3130,7 +3130,7 @@ void botTickUnpaused(struct chrdata *chr) // If there's no teammate to follow, stock up on weapons and ammo if (newaction < 0) { - aibot->gotoprop = botFindAnyPickup(chr); + aibot->gotoprop = bot_find_any_pickup(chr); if (aibot->gotoprop) { newaction = MA_AIBOTGETITEM; @@ -3142,7 +3142,7 @@ void botTickUnpaused(struct chrdata *chr) if (newaction >= 0) { if (newaction == MA_AIBOTGETITEM) { if (aibot->gotoprop) { - chrGoToProp(chr, aibot->gotoprop, GOPOSFLAG_RUN); + chr_go_to_prop(chr, aibot->gotoprop, GOPOSFLAG_RUN); chr->myaction = newaction; } } else if (newaction == MA_AIBOTATTACK) { @@ -3156,17 +3156,17 @@ void botTickUnpaused(struct chrdata *chr) aibot->distmode = -1; if (aibot->canbreakfollow) { - botSetTarget(chr, -1); + bot_set_target(chr, -1); } } } else if (newaction == MA_AIBOTDEFEND) { chr->myaction = newaction; if (aibot->canbreakdefend) { - botSetTarget(chr, -1); + bot_set_target(chr, -1); } - chrGoToRoomPos(chr, &aibot->defendholdpos, aibot->defendholdrooms, GOPOSFLAG_RUN); + chr_go_to_room_pos(chr, &aibot->defendholdpos, aibot->defendholdrooms, GOPOSFLAG_RUN); } else if (newaction == MA_AIBOTGOTOPOS) { f32 xdist = chr->prop->pos.x - aibot->gotopos.x; f32 ydist = chr->prop->pos.y - aibot->gotopos.y; @@ -3186,18 +3186,18 @@ void botTickUnpaused(struct chrdata *chr) if (xdist > 20 || zdist > 20 || (ydist > 200 && chr->inlift == 0)) { chr->myaction = newaction; - chrGoToRoomPos(chr, &aibot->gotopos, aibot->gotorooms, GOPOSFLAG_RUN); + chr_go_to_room_pos(chr, &aibot->gotopos, aibot->gotorooms, GOPOSFLAG_RUN); } else { - chrStand(chr); + chr_stand(chr); } } else if (newaction == MA_AIBOTGOTOPROP) { if (aibot->gotoprop) { chr->myaction = newaction; - chrGoToProp(chr, aibot->gotoprop, GOPOSFLAG_RUN); + chr_go_to_prop(chr, aibot->gotoprop, GOPOSFLAG_RUN); } } else if (newaction == MA_AIBOTDOWNLOAD) { chr->myaction = newaction; - chrStand(chr); + chr_stand(chr); } } @@ -3212,17 +3212,17 @@ void botTickUnpaused(struct chrdata *chr) } } else if (chr->myaction == MA_AIBOTATTACK) { if (aibot->attackingplayernum >= 0 - && (chrIsDead(g_MpAllChrPtrs[aibot->attackingplayernum]) || !botPassesCowardCheck(chr, g_MpAllChrPtrs[aibot->attackingplayernum]))) { + && (chr_is_dead(g_MpAllChrPtrs[aibot->attackingplayernum]) || !bot_passes_coward_check(chr, g_MpAllChrPtrs[aibot->attackingplayernum]))) { chr->myaction = MA_AIBOTMAINLOOP; } else if (aibot->attackingplayernum < 0 && (chr->target == -1 - || chrIsDead(chrGetTargetProp(chr)->chr) - || !botPassesCowardCheck(chr, chrGetTargetProp(chr)->chr))) { + || chr_is_dead(chr_get_target_prop(chr)->chr) + || !bot_passes_coward_check(chr, chr_get_target_prop(chr)->chr))) { chr->myaction = MA_AIBOTMAINLOOP; } else { - botcmdTickDistMode(chr); + botcmd_tick_dist_mode(chr); - if (botCanDoCriticalPickup(chr)) { + if (bot_can_do_critical_pickup(chr)) { chr->myaction = MA_AIBOTMAINLOOP; } else if (aibot->abortattacktimer60 >= 0 && aibot->targetlastseen60 < g_Vars.lvframe60 - aibot->abortattacktimer60) { chr->myaction = MA_AIBOTMAINLOOP; @@ -3230,15 +3230,15 @@ void botTickUnpaused(struct chrdata *chr) } } else if (chr->myaction == MA_AIBOTFOLLOW) { if (aibot->followingplayernum < 0 - || chrIsDead(g_MpAllChrPtrs[aibot->followingplayernum])) { + || chr_is_dead(g_MpAllChrPtrs[aibot->followingplayernum])) { chr->myaction = MA_AIBOTMAINLOOP; } else { - botcmdTickDistMode(chr); + botcmd_tick_dist_mode(chr); if (aibot->canbreakfollow && chr->target != -1 && aibot->targetinsight - && botPassesCowardCheck(chr, chrGetTargetProp(chr)->chr)) { + && bot_passes_coward_check(chr, chr_get_target_prop(chr)->chr)) { f32 xdist = chr->prop->pos.x - g_MpAllChrPtrs[aibot->followingplayernum]->prop->pos.x; f32 zdist = chr->prop->pos.z - g_MpAllChrPtrs[aibot->followingplayernum]->prop->pos.z; @@ -3253,13 +3253,13 @@ void botTickUnpaused(struct chrdata *chr) // No y check? if (xdist < 500 && zdist < 500) { chr->myaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(chrGetTargetProp(chr)->chr); + aibot->attackingplayernum = mp_player_get_index(chr_get_target_prop(chr)->chr); aibot->abortattacktimer60 = TICKS(300); aibot->distmode = -1; } } - if (botCanDoCriticalPickup(chr)) { + if (bot_can_do_critical_pickup(chr)) { chr->myaction = MA_AIBOTMAINLOOP; } } @@ -3287,14 +3287,14 @@ void botTickUnpaused(struct chrdata *chr) if (xdist > 40 || zdist > 40 || (ydist > 200 && !chr->inlift)) { if (aibot->returntodefendtimer60 <= 0) { - chrGoToRoomPos(chr, &aibot->defendholdpos, aibot->defendholdrooms, GOPOSFLAG_RUN); + chr_go_to_room_pos(chr, &aibot->defendholdpos, aibot->defendholdrooms, GOPOSFLAG_RUN); } } else if (aibot->canbreakdefend && chr->target != -1 && aibot->targetinsight - && botPassesCowardCheck(chr, chrGetTargetProp(chr)->chr)) { + && bot_passes_coward_check(chr, chr_get_target_prop(chr)->chr)) { chr->myaction = MA_AIBOTATTACK; - aibot->attackingplayernum = mpPlayerGetIndex(chrGetTargetProp(chr)->chr); + aibot->attackingplayernum = mp_player_get_index(chr_get_target_prop(chr)->chr); aibot->abortattacktimer60 = TICKS(300); aibot->distmode = -1; } @@ -3304,7 +3304,7 @@ void botTickUnpaused(struct chrdata *chr) } } - if (botCanDoCriticalPickup(chr)) { + if (bot_can_do_critical_pickup(chr)) { chr->myaction = MA_AIBOTMAINLOOP; } } else if (chr->myaction == MA_AIBOTGOTOPOS) { @@ -3315,19 +3315,19 @@ void botTickUnpaused(struct chrdata *chr) } else if (chr->prop->rooms[0] == g_ScenarioData.koh.hillrooms[0]) { // empty } else if (aibot->hillpadnum >= 0) { - padSetFlag(aibot->hillpadnum, PADFLAG_AIBOTINUSE); + pad_set_flag(aibot->hillpadnum, PADFLAG_AIBOTINUSE); } else if (aibot->hillcovernum >= 0) { - coverSetFlag(aibot->hillcovernum, COVERFLAG_AIBOTINUSE); + cover_set_flag(aibot->hillcovernum, COVERFLAG_AIBOTINUSE); } } if (chr->actiontype != ACT_GOPOS) { chr->myaction = MA_AIBOTMAINLOOP; - } else if (botCanDoCriticalPickup(chr)) { + } else if (bot_can_do_critical_pickup(chr)) { chr->myaction = MA_AIBOTMAINLOOP; } } else if (chr->myaction == MA_AIBOTGOTOPROP) { - if (botCanDoCriticalPickup(chr)) { + if (bot_can_do_critical_pickup(chr)) { chr->myaction = MA_AIBOTMAINLOOP; } else if (chr->actiontype != ACT_GOPOS || aibot->gotoprop == NULL || aibot->gotoprop->parent) { chr->myaction = MA_AIBOTMAINLOOP; @@ -3335,35 +3335,35 @@ void botTickUnpaused(struct chrdata *chr) // empty } else if (g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL && g_ScenarioData.htm.uplink == chr->prop - && g_ScenarioData.htm.playernuminrange == mpPlayerGetIndex(chr)) { + && g_ScenarioData.htm.playernuminrange == mp_player_get_index(chr)) { chr->myaction = MA_AIBOTMAINLOOP; } } else if (chr->myaction == MA_AIBOTDOWNLOAD) { - if (botCanDoCriticalPickup(chr)) { + if (bot_can_do_critical_pickup(chr)) { chr->myaction = MA_AIBOTMAINLOOP; - } else if (g_ScenarioData.htm.playernuminrange != mpPlayerGetIndex(chr)) { + } else if (g_ScenarioData.htm.playernuminrange != mp_player_get_index(chr)) { chr->myaction = MA_AIBOTMAINLOOP; } } // Regardless of the action, choose a general target and maintain a // route to them, even if it won't be followed - botChooseGeneralTarget(chr); + bot_choose_general_target(chr); - if (mpPlayerGetIndex(chr) == (g_Vars.lvframenum % g_MpNumChrs) && chr->target != -1) { - struct prop *targetprop = chrGetTargetProp(chr); - struct waypoint *first = waypointFindClosestToPos(&chr->prop->pos, chr->prop->rooms); - struct waypoint *last = waypointFindClosestToPos(&targetprop->pos, targetprop->rooms); + if (mp_player_get_index(chr) == (g_Vars.lvframenum % g_MpNumChrs) && chr->target != -1) { + struct prop *targetprop = chr_get_target_prop(chr); + struct waypoint *first = waypoint_find_closest_to_pos(&chr->prop->pos, chr->prop->rooms); + struct waypoint *last = waypoint_find_closest_to_pos(&targetprop->pos, targetprop->rooms); if (first && last) { - navSetSeed(CHRNAVSEED(chr), CHRNAVSEED(chr)); - aibot->numwaystepstotarget = navFindRoute(last, first, aibot->waypoints, ARRAYCOUNT(aibot->waypoints)); - navSetSeed(0, 0); + nav_set_seed(CHRNAVSEED(chr), CHRNAVSEED(chr)); + aibot->numwaystepstotarget = nav_find_route(last, first, aibot->waypoints, ARRAYCOUNT(aibot->waypoints)); + nav_set_seed(0, 0); } } // Tick the bot's inventory. They may decide to switch weapons. - botinvTick(chr); + botinv_tick(chr); // Iterate both hands and handle shooting { @@ -3396,9 +3396,9 @@ void botTickUnpaused(struct chrdata *chr) // starting the punch. if (aibot->punchtimer60[i] >= 0 && aibot->timeuntilreload60[i] <= 0) { if (aibot->weaponnum == WEAPON_TRANQUILIZER - && aibot->loadedammo[i] < bgunGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY)) { + && aibot->loadedammo[i] < bgun_get_min_clip_qty(WEAPON_TRANQUILIZER, FUNC_SECONDARY)) { aibot->punchtimer60[i] = 0; - botScheduleReload(chr, i); + bot_schedule_reload(chr, i); } else { f32 range = 210; @@ -3411,13 +3411,13 @@ void botTickUnpaused(struct chrdata *chr) if (chr->target != -1 && aibot->targetinsight && aibot->shootdelaytimer60 >= g_BotDifficulties[aibot->config->difficulty].shootdelay60) { - if (!botIsDizzy(chr)) { + if (!bot_is_dizzy(chr)) { if (aibot->weaponnum == WEAPON_TRANQUILIZER) { - if (!chrIsTargetInFov(chr, 30, 0) || chrGetDistanceToTarget(chr) > range) { + if (!chr_is_target_in_fov(chr, 30, 0) || chr_get_distance_to_target(chr) > range) { aibot->punchtimer60[i] = 0; } } else { - if (!chrIsTargetInFov(chr, 40, 0) || chrGetDistanceToTarget(chr) > range + 150) { + if (!chr_is_target_in_fov(chr, 40, 0) || chr_get_distance_to_target(chr) > range + 150) { aibot->punchtimer60[i] = 0; } } @@ -3428,8 +3428,8 @@ void botTickUnpaused(struct chrdata *chr) // If the punch was not cancelled, execute it if (aibot->punchtimer60[i] < 0) { - chrUncloakTemporarily(chr); - chrPunchInflictDamage(chr, 2, range, false); + chr_uncloak_temporarily(chr); + chr_punch_inflict_damage(chr, 2, range, false); if (i == HAND_RIGHT) { // Set the punch cooldown timer @@ -3487,7 +3487,7 @@ void botTickUnpaused(struct chrdata *chr) break; case WEAPON_TRANQUILIZER: aibot->punchtimer60[0] = TICKS(60); - aibot->loadedammo[0] -= bgunGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); + aibot->loadedammo[0] -= bgun_get_min_clip_qty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); break; case WEAPON_REAPER: aibot->punchtimer60[0] = 0; @@ -3501,11 +3501,11 @@ void botTickUnpaused(struct chrdata *chr) // Bots fire Slayer rockets regardless of where they are // on the map provided they have ammo if (aibot->loadedammo[0] > 0) { - chrUncloakTemporarily(chr); - botactCreateSlayerRocket(chr); + chr_uncloak_temporarily(chr); + botact_create_slayer_rocket(chr); aibot->loadedammo[0]--; } - } else if (botactIsWeaponThrowable(aibot->weaponnum, aibot->gunfunc)) { + } else if (botact_is_weapon_throwable(aibot->weaponnum, aibot->gunfunc)) { // Hand throwing a weapon if (i == HAND_RIGHT) { if (aibot->throwtimer60 > 0) { @@ -3513,7 +3513,7 @@ void botTickUnpaused(struct chrdata *chr) } if (chr->aibot->throwtimer60 <= 0) { - if (botactGetAmmoQuantityByWeapon(aibot, aibot->weaponnum, aibot->gunfunc, false) > 0 + if (botact_get_ammo_quantity_by_weapon(aibot, aibot->weaponnum, aibot->gunfunc, false) > 0 || aibot->weaponnum == WEAPON_LAPTOPGUN || aibot->weaponnum == WEAPON_DRAGON) { bool throw = false; @@ -3521,25 +3521,25 @@ void botTickUnpaused(struct chrdata *chr) if (chr->target != -1 && aibot->targetinsight && aibot->shootdelaytimer60 >= g_BotDifficulties[aibot->config->difficulty].shootdelay60 - && (botIsDizzy(chr) || chrIsTargetInFov(chr, 45, false))) { + && (bot_is_dizzy(chr) || chr_is_target_in_fov(chr, 45, false))) { throw = true; } if (throw) { struct weaponfunc *func; - chrUncloakTemporarily(chr); - botactTryRemoveAmmoFromReserve(aibot, aibot->weaponnum, aibot->gunfunc, 1); - botactThrow(chr); + chr_uncloak_temporarily(chr); + botact_try_remove_ammo_from_reserve(aibot, aibot->weaponnum, aibot->gunfunc, 1); + botact_throw(chr); - func = weaponGetFunctionById(aibot->weaponnum, aibot->gunfunc); + func = weapon_get_function_by_id(aibot->weaponnum, aibot->gunfunc); if (func && (func->flags & FUNCFLAG_DISCARDWEAPON)) { - botinvRemoveItem(chr, aibot->weaponnum); - botinvSwitchToWeapon(chr, WEAPON_UNARMED, FUNC_PRIMARY); + botinv_remove_item(chr, aibot->weaponnum); + botinv_switch_to_weapon(chr, WEAPON_UNARMED, FUNC_PRIMARY); } - aibot->throwtimer60 = botactGetProjectileThrowInterval(chr->aibot->weaponnum); + aibot->throwtimer60 = botact_get_projectile_throw_interval(chr->aibot->weaponnum); } } } @@ -3548,7 +3548,7 @@ void botTickUnpaused(struct chrdata *chr) // Handle firing a regular weapon bool canshoot = false; - if (weaponGetNumTicksPerShot(aibot->weaponnum, aibot->gunfunc) <= 0) { + if (weapon_get_num_ticks_per_shot(aibot->weaponnum, aibot->gunfunc) <= 0) { // Increment the mauler charge and deplete ammo as // the charge amount crosses each whole number. // Yes, this is actually implemented for bots. @@ -3584,8 +3584,8 @@ void botTickUnpaused(struct chrdata *chr) } else if (chr->target != -1 && aibot->targetinsight && aibot->shootdelaytimer60 >= g_BotDifficulties[aibot->config->difficulty].shootdelay60 - && (botIsDizzy(chr) || chrIsTargetInFov(chr, 45, false)) - && !chrIsDead(chrGetTargetProp(chr)->chr)) { + && (bot_is_dizzy(chr) || chr_is_target_in_fov(chr, 45, false)) + && !chr_is_dead(chr_get_target_prop(chr)->chr)) { firing = true; if (aibot->weaponnum == WEAPON_CYCLONE && aibot->gunfunc == FUNC_SECONDARY) { @@ -3612,9 +3612,9 @@ void botTickUnpaused(struct chrdata *chr) } } - if (weaponGetNumTicksPerShot(aibot->weaponnum, aibot->gunfunc) <= 0 && firing) { + if (weapon_get_num_ticks_per_shot(aibot->weaponnum, aibot->gunfunc) <= 0 && firing) { struct weaponfunc *func; - aibot->nextbullettimer60[i] = botactGetShootInterval60(aibot->weaponnum, aibot->gunfunc); + aibot->nextbullettimer60[i] = botact_get_shoot_interval60(aibot->weaponnum, aibot->gunfunc); #if PAL if (aibot->nextbullettimer60[i] >= 6) { @@ -3622,7 +3622,7 @@ void botTickUnpaused(struct chrdata *chr) } #endif - func = weaponGetFunctionById(aibot->weaponnum, aibot->gunfunc); + func = weapon_get_function_by_id(aibot->weaponnum, aibot->gunfunc); if (func && (func->flags & (FUNCFLAG_BURST3 | FUNCFLAG_BURST2)) @@ -3645,20 +3645,20 @@ void botTickUnpaused(struct chrdata *chr) } if (firing) { - chrUncloakTemporarily(chr); + chr_uncloak_temporarily(chr); if (i == HAND_RIGHT) { firingright = true; } } - chrSetHandFiring(chr, i, firing); + chr_set_hand_firing(chr, i, firing); } } } } -void botCheckFetch(struct chrdata *chr) +void bot_check_fetch(struct chrdata *chr) { bool alreadyfetching = false; struct aibot *aibot = chr->aibot; @@ -3688,6 +3688,6 @@ void botCheckFetch(struct chrdata *chr) } if (!alreadyfetching) { - chrGoToRoomPos(chr, &chr->act_gopos.endpos, chr->act_gopos.endrooms, chr->act_gopos.flags); + chr_go_to_room_pos(chr, &chr->act_gopos.endpos, chr->act_gopos.endrooms, chr->act_gopos.flags); } } diff --git a/src/game/botact.c b/src/game/botact.c index 8341fea75..03f1f00cf 100644 --- a/src/game/botact.c +++ b/src/game/botact.c @@ -19,10 +19,10 @@ #include "data.h" #include "types.h" -s32 botactGetAmmoTypeByFunction(s32 weaponnum, s32 funcnum) +s32 botact_get_ammo_type_by_function(s32 weaponnum, s32 funcnum) { if (weaponnum >= WEAPON_FALCON2 && weaponnum <= WEAPON_SUICIDEPILL) { - struct inventory_ammo *ammo = weaponGetAmmoByFunction(weaponnum, funcnum); + struct inventory_ammo *ammo = weapon_get_ammo_by_function(weaponnum, funcnum); if (ammo) { return ammo->type; @@ -32,10 +32,10 @@ s32 botactGetAmmoTypeByFunction(s32 weaponnum, s32 funcnum) return 0; } -s32 botactGetClipCapacityByFunction(s32 weaponnum, u32 funcnum) +s32 botact_get_clip_capacity_by_function(s32 weaponnum, u32 funcnum) { if (weaponnum >= WEAPON_FALCON2 && weaponnum <= WEAPON_SUICIDEPILL) { - struct inventory_ammo *ammo = weaponGetAmmoByFunction(weaponnum, funcnum); + struct inventory_ammo *ammo = weapon_get_ammo_by_function(weaponnum, funcnum); if (ammo) { return ammo->clipsize; @@ -45,29 +45,29 @@ s32 botactGetClipCapacityByFunction(s32 weaponnum, u32 funcnum) return 0; } -void botactReload(struct chrdata *chr, s32 handnum, bool withsound) +void botact_reload(struct chrdata *chr, s32 handnum, bool withsound) { struct aibot *aibot = chr->aibot; aibot->timeuntilreload60[handnum] = 0; aibot->maulercharge[handnum] = 0; - if (chr->weapons_held[handnum] && !botactIsWeaponThrowable(aibot->weaponnum, aibot->gunfunc)) { - s32 capacity = botactGetClipCapacityByFunction(aibot->weaponnum, aibot->gunfunc); + if (chr->weapons_held[handnum] && !botact_is_weapon_throwable(aibot->weaponnum, aibot->gunfunc)) { + s32 capacity = botact_get_clip_capacity_by_function(aibot->weaponnum, aibot->gunfunc); if (capacity > 0) { s32 tryamount = capacity - aibot->loadedammo[handnum]; - s32 actualamount = botactTryRemoveAmmoFromReserve(aibot, aibot->weaponnum, aibot->gunfunc, tryamount); + s32 actualamount = botact_try_remove_ammo_from_reserve(aibot, aibot->weaponnum, aibot->gunfunc, tryamount); if (actualamount > 0) { aibot->loadedammo[handnum] += actualamount; if (withsound) { if (aibot->weaponnum == WEAPON_FARSIGHT) { - psCreate(NULL, chr->prop, SFX_RELOAD_FARSIGHT, -1, + ps_create(NULL, chr->prop, SFX_RELOAD_FARSIGHT, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } else { - psCreate(NULL, chr->prop, SFX_RELOAD_DEFAULT, -1, + ps_create(NULL, chr->prop, SFX_RELOAD_DEFAULT, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } } @@ -76,7 +76,7 @@ void botactReload(struct chrdata *chr, s32 handnum, bool withsound) } } -s32 botactGetAmmoQuantityByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, bool include_equipped) +s32 botact_get_ammo_quantity_by_weapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, bool include_equipped) { s32 qty = 0; s32 ammotype; @@ -84,16 +84,16 @@ s32 botactGetAmmoQuantityByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnu if (aibot) { if (aibot->flags & BOTFLAG_UNLIMITEDAMMO) { - ammotype = botactGetAmmoTypeByFunction(weaponnum, funcnum); - qty = bgunGetCapacityByAmmotype(ammotype); + ammotype = botact_get_ammo_type_by_function(weaponnum, funcnum); + qty = bgun_get_capacity_by_ammotype(ammotype); } else { - ammotype = botactGetAmmoTypeByFunction(weaponnum, funcnum); + ammotype = botact_get_ammo_type_by_function(weaponnum, funcnum); qty = aibot->ammoheld[ammotype]; } if (include_equipped) { - ammotype = botactGetAmmoTypeByFunction(weaponnum, funcnum); - equippedammotype = botactGetAmmoTypeByFunction(aibot->weaponnum, aibot->gunfunc); + ammotype = botact_get_ammo_type_by_function(weaponnum, funcnum); + equippedammotype = botact_get_ammo_type_by_function(aibot->weaponnum, aibot->gunfunc); if (equippedammotype == ammotype) { qty += aibot->loadedammo[HAND_LEFT] + aibot->loadedammo[HAND_RIGHT]; @@ -104,19 +104,19 @@ s32 botactGetAmmoQuantityByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnu return qty; } -s32 botactGetAmmoQuantityByType(struct aibot *aibot, s32 ammotype, bool include_equipped) +s32 botact_get_ammo_quantity_by_type(struct aibot *aibot, s32 ammotype, bool include_equipped) { s32 qty = 0; if (aibot) { if (aibot->flags & BOTFLAG_UNLIMITEDAMMO) { - qty = bgunGetCapacityByAmmotype(ammotype); + qty = bgun_get_capacity_by_ammotype(ammotype); } else { qty = aibot->ammoheld[ammotype]; } if (include_equipped - && botactGetAmmoTypeByFunction(aibot->weaponnum, aibot->gunfunc) == ammotype) { + && botact_get_ammo_type_by_function(aibot->weaponnum, aibot->gunfunc) == ammotype) { qty += aibot->loadedammo[HAND_LEFT] + aibot->loadedammo[HAND_RIGHT]; } } @@ -131,10 +131,10 @@ s32 botactGetAmmoQuantityByType(struct aibot *aibot, s32 ammotype, bool include_ * The amount removed will be less than the attempted amount if the aibot * doesn't have enough ammo in reserve. */ -s32 botactTryRemoveAmmoFromReserve(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 tryqty) +s32 botact_try_remove_ammo_from_reserve(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 tryqty) { s32 amountremoved; - s32 *ammoheld = &aibot->ammoheld[botactGetAmmoTypeByFunction(weaponnum, funcnum)]; + s32 *ammoheld = &aibot->ammoheld[botact_get_ammo_type_by_function(weaponnum, funcnum)]; if (!aibot || *ammoheld <= 0 || tryqty <= 0) { return 0; @@ -162,10 +162,10 @@ s32 botactTryRemoveAmmoFromReserve(struct aibot *aibot, s32 weaponnum, s32 funcn return amountremoved; } -void botactGiveAmmoByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 qty) +void botact_give_ammo_by_weapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 qty) { s32 max; - s32 *heldquantity = &aibot->ammoheld[botactGetAmmoTypeByFunction(weaponnum, funcnum)]; + s32 *heldquantity = &aibot->ammoheld[botact_get_ammo_type_by_function(weaponnum, funcnum)]; if (aibot && (aibot->flags & BOTFLAG_UNLIMITEDAMMO) == 0 && qty > 0) { dprint(); @@ -173,7 +173,7 @@ void botactGiveAmmoByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 if (heldquantity); - max = bgunGetCapacityByAmmotype(botactGetAmmoTypeByFunction(weaponnum, funcnum)); + max = bgun_get_capacity_by_ammotype(botact_get_ammo_type_by_function(weaponnum, funcnum)); if (*heldquantity > max) { *heldquantity = max; @@ -183,7 +183,7 @@ void botactGiveAmmoByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 } } -void botactGiveAmmoByType(struct aibot *aibot, u32 ammotype, s32 quantity) +void botact_give_ammo_by_type(struct aibot *aibot, u32 ammotype, s32 quantity) { s32 max; s32 *heldquantity = &aibot->ammoheld[ammotype]; @@ -198,7 +198,7 @@ void botactGiveAmmoByType(struct aibot *aibot, u32 ammotype, s32 quantity) if (heldquantity); - max = bgunGetCapacityByAmmotype(ammotype); + max = bgun_get_capacity_by_ammotype(ammotype); if (*heldquantity > max) { *heldquantity = max; @@ -207,7 +207,7 @@ void botactGiveAmmoByType(struct aibot *aibot, u32 ammotype, s32 quantity) dprint(); } -bool botactShootFarsight(struct chrdata *chr, s32 arg1, struct coord *vector, struct coord *arg3) +bool botact_shoot_farsight(struct chrdata *chr, s32 arg1, struct coord *vector, struct coord *arg3) { struct aibot *aibot; struct chrdata *oppchr; @@ -232,7 +232,7 @@ bool botactShootFarsight(struct chrdata *chr, s32 arg1, struct coord *vector, st s32 side = -1; s32 hitpart = HITPART_GENERAL; struct gset gset = {WEAPON_FARSIGHT, 0, 0, FUNC_PRIMARY}; - f32 damage = gsetGetDamage(&gset); + f32 damage = gset_get_damage(&gset); s32 fallback = 30; s32 value = fallback; @@ -241,7 +241,7 @@ bool botactShootFarsight(struct chrdata *chr, s32 arg1, struct coord *vector, st oppprop = g_MpAllChrPtrs[i]->prop; if (oppprop->type == PROPTYPE_PLAYER) { - struct player *player = g_Vars.players[playermgrGetPlayerNumByProp(oppprop)]; + struct player *player = g_Vars.players[playermgr_get_player_num_by_prop(oppprop)]; speed = player->speedforwards * player->speedforwards + player->speedsideways * player->speedsideways; @@ -259,14 +259,14 @@ bool botactShootFarsight(struct chrdata *chr, s32 arg1, struct coord *vector, st // chance of passing. if (oppchr != chr && value > rand - && func0f06b39c(arg3, vector, &oppprop->pos, chrGetHitRadius(oppchr))) { - bgunPlayPropHitSound(&gset, oppprop, -1); + && func0f06b39c(arg3, vector, &oppprop->pos, chr_get_hit_radius(oppchr))) { + bgun_play_prop_hit_sound(&gset, oppprop, -1); - if (oppchr->model && chrGetShield(oppchr) > 0) { - chrCalculateShieldHit(oppchr, &oppprop->pos, vector, &node, &hitpart, &model, &side); + if (oppchr->model && chr_get_shield(oppchr) > 0) { + chr_calculate_shield_hit(oppchr, &oppprop->pos, vector, &node, &hitpart, &model, &side); } - chrEmitSparks(oppchr, oppprop, hitpart, &oppprop->pos, vector, chr); + chr_emit_sparks(oppchr, oppprop, hitpart, &oppprop->pos, vector, chr); func0f0341dc(oppchr, damage, vector, &gset, chr->prop, HITPART_GENERAL, oppprop, node, model, side, 0); } } @@ -280,12 +280,12 @@ bool botactShootFarsight(struct chrdata *chr, s32 arg1, struct coord *vector, st return true; } -s32 botactGetWeaponModel(s32 weapon) +s32 botact_get_weapon_model(s32 weapon) { - return playermgrGetModelOfWeapon(weapon); + return playermgr_get_model_of_weapon(weapon); } -bool botactIsWeaponThrowable(s32 weaponnum, bool is_secondary) +bool botact_is_weapon_throwable(s32 weaponnum, bool is_secondary) { switch (weaponnum) { case WEAPON_LAPTOPGUN: @@ -303,7 +303,7 @@ bool botactIsWeaponThrowable(s32 weaponnum, bool is_secondary) return false; } -u32 botactGetProjectileThrowInterval(u32 weapon) +u32 botact_get_projectile_throw_interval(u32 weapon) { switch (weapon) { case WEAPON_COMBATKNIFE: @@ -322,7 +322,7 @@ u32 botactGetProjectileThrowInterval(u32 weapon) } } -s32 botactGetWeaponByAmmoType(s32 ammotype) +s32 botact_get_weapon_by_ammo_type(s32 ammotype) { switch (ammotype) { case AMMOTYPE_NBOMB: return WEAPON_NBOMB; @@ -336,24 +336,24 @@ s32 botactGetWeaponByAmmoType(s32 ammotype) return 0; } -void botactThrow(struct chrdata *chr) +void botact_throw(struct chrdata *chr) { struct coord sp228 = {0, 0, 0}; Mtxf sp164; struct coord sp152; struct prop *prop = chr->prop; Mtxf sp84; - f32 sp80 = chrGetAimAngle(chr); + f32 sp80 = chr_get_aim_angle(chr); u32 stack; struct gset gset = {0}; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); struct coord sp56; f32 mult; gset.weaponnum = chr->aibot->weaponnum; gset.weaponfunc = chr->aibot->gunfunc; - if (chrIsTargetInFov(chr, 30, 0)) { + if (chr_is_target_in_fov(chr, 30, 0)) { sp56.x = target->pos.x; sp56.z = target->pos.z; @@ -367,7 +367,7 @@ void botactThrow(struct chrdata *chr) } } - chrCalculateTrajectory(&prop->pos, 16.666666f, &sp56, &sp152); + chr_calculate_trajectory(&prop->pos, 16.666666f, &sp56, &sp152); } else { sp152.x = cosf(RAD(20, 0.34901028871536f)) * sinf(sp80); sp152.y = sinf(RAD(20, 0.34901028871536f)); @@ -380,20 +380,20 @@ void botactThrow(struct chrdata *chr) sp228.y = sp152.y * mult; sp228.z = sp152.z * mult; - mtx4LoadIdentity(&sp164); + mtx4_load_identity(&sp164); if (chr->aibot->weaponnum == WEAPON_COMBATKNIFE) { - mtx4LoadZRotation(M_BADPI * 1.5f, &sp164); - mtx4LoadXRotation(M_BADPI, &sp84); - mtx4MultMtx4InPlace(&sp84, &sp164); + mtx4_load_z_rotation(M_BADPI * 1.5f, &sp164); + mtx4_load_x_rotation(M_BADPI, &sp84); + mtx4_mult_mtx4_in_place(&sp84, &sp164); } - mtx4LoadXRotation(RAD(20, 0.34901028871536f), &sp84); + mtx4_load_x_rotation(RAD(20, 0.34901028871536f), &sp84); mtx00015be0(&sp84, &sp164); - mtx4LoadYRotation(sp80, &sp84); + mtx4_load_y_rotation(sp80, &sp84); mtx00015be0(&sp84, &sp164); - bgunCreateThrownProjectile2(chr, &gset, &prop->pos, prop->rooms, &sp164, &sp228); + bgun_create_thrown_projectile2(chr, &gset, &prop->pos, prop->rooms, &sp164, &sp228); if (gset.weaponnum == WEAPON_REMOTEMINE) { chr->aibot->flags |= BOTFLAG_THREWREMOTEMINE; @@ -403,11 +403,11 @@ void botactThrow(struct chrdata *chr) /** * Get the shoot interval of the given weapon, in time60. */ -s32 botactGetShootInterval60(s32 weaponnum, s32 funcnum) +s32 botact_get_shoot_interval60(s32 weaponnum, s32 funcnum) { s32 stack[2]; s32 result = 1; - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); if (weapon) { struct weaponfunc *func = weapon->functions[funcnum]; @@ -437,17 +437,17 @@ s32 botactGetShootInterval60(s32 weaponnum, s32 funcnum) * * Return true if a route was found, false if not. */ -bool botactFindRocketRoute(struct chrdata *chr, struct coord *frompos, struct coord *topos, RoomNum *fromrooms, RoomNum *torooms, struct projectile *projectile) +bool botact_find_rocket_route(struct chrdata *chr, struct coord *frompos, struct coord *topos, RoomNum *fromrooms, RoomNum *torooms, struct projectile *projectile) { - struct waypoint *from = waypointFindClosestToPos(frompos, fromrooms); - struct waypoint *to = waypointFindClosestToPos(topos, torooms); + struct waypoint *from = waypoint_find_closest_to_pos(frompos, fromrooms); + struct waypoint *to = waypoint_find_closest_to_pos(topos, torooms); struct waypoint *waypoints[MAX_CHRWAYPOINTS]; s32 numwaypoints; if (from && to) { - navSetSeed(CHRNAVSEED(chr), CHRNAVSEED(chr)); - numwaypoints = navFindRoute(from, to, waypoints, 6); - navSetSeed(0, 0); + nav_set_seed(CHRNAVSEED(chr), CHRNAVSEED(chr)); + numwaypoints = nav_find_route(from, to, waypoints, 6); + nav_set_seed(0, 0); if (numwaypoints > 1) { s32 i = 0; @@ -473,27 +473,27 @@ bool botactFindRocketRoute(struct chrdata *chr, struct coord *frompos, struct co * * It's the ground position of the pad plus 1.5 metres. */ -void botactGetRocketNextStepPos(u16 padnum, struct coord *pos) +void botact_get_rocket_next_step_pos(u16 padnum, struct coord *pos) { struct pad pad; RoomNum rooms[2]; - padUnpack(padnum, PADFIELD_ROOM | PADFIELD_POS, &pad); + pad_unpack(padnum, PADFIELD_ROOM | PADFIELD_POS, &pad); rooms[0] = pad.room; rooms[1] = -1; pos->x = pad.pos.x; - pos->y = cdFindFloorYColourTypeAtPos(&pad.pos, rooms, 0, 0) + 150; + pos->y = cd_find_floor_y_colour_type_at_pos(&pad.pos, rooms, 0, 0) + 150; pos->z = pad.pos.z; } /** * Create a Slayer rocket in fly-by-wire mode (ie. remote controlled). */ -void botactCreateSlayerRocket(struct chrdata *chr) +void botact_create_slayer_rocket(struct chrdata *chr) { - struct weaponobj *rocket = weaponCreateProjectileFromWeaponNum(MODEL_CHRSKROCKETMIS, WEAPON_SKROCKET, chr); + struct weaponobj *rocket = weapon_create_projectile_from_weapon_num(MODEL_CHRSKROCKETMIS, WEAPON_SKROCKET, chr); if (rocket) { Mtxf sp260; @@ -504,22 +504,22 @@ void botactCreateSlayerRocket(struct chrdata *chr) f32 xrot; struct coord sp100; - yrot = chrGetAimAngle(chr); - xrot = chrGetPitchAngle(chr); + yrot = chr_get_aim_angle(chr); + xrot = chr_get_pitch_angle(chr); sp100.x = cosf(xrot) * sinf(yrot); sp100.y = sinf(xrot); sp100.z = cosf(xrot) * cosf(yrot); - mtx4LoadXRotation(xrot, &sp196); - mtx4LoadYRotation(yrot, &sp132); + mtx4_load_x_rotation(xrot, &sp196); + mtx4_load_y_rotation(yrot, &sp132); mtx00015be0(&sp132, &sp196); - mtx4LoadIdentity(&sp260); + mtx4_load_identity(&sp260); bgun0f09ebcc(&rocket->base, &chr->prop->pos, chr->prop->rooms, &sp196, &sp100, &sp260, chr->prop, &chr->prop->pos); if (rocket->base.hidden & OBJHFLAG_PROJECTILE) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); rocket->timer240 = -1; rocket->base.projectile->unk010 = 7.5; rocket->base.projectile->unk014 = xrot; @@ -528,13 +528,13 @@ void botactCreateSlayerRocket(struct chrdata *chr) rocket->base.projectile->pickuptimer240 = 0x20000000; // Fire rocket sound - psCreate(NULL, rocket->base.prop, SFX_LAUNCH_ROCKET_8053, -1, + ps_create(NULL, rocket->base.prop, SFX_LAUNCH_ROCKET_8053, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); - if (!botactFindRocketRoute(chr, &chr->prop->pos, &target->pos, chr->prop->rooms, target->rooms, rocket->base.projectile)) { + if (!botact_find_rocket_route(chr, &chr->prop->pos, &target->pos, chr->prop->rooms, target->rooms, rocket->base.projectile)) { rocket->timer240 = 0; // blow up rocket } else { - botactGetRocketNextStepPos(rocket->base.projectile->waypads[0], &rocket->base.projectile->nextsteppos); + botact_get_rocket_next_step_pos(rocket->base.projectile->waypads[0], &rocket->base.projectile->nextsteppos); chr->aibot->skrocket = rocket->base.prop; } } diff --git a/src/game/botcmd.c b/src/game/botcmd.c index eaf9d341d..19377b1e4 100644 --- a/src/game/botcmd.c +++ b/src/game/botcmd.c @@ -37,7 +37,7 @@ f32 g_BotDistConfigs[][3] = { { 450, 700, 4500 }, // BOTDISTCFG_THROWEXPLOSIVE }; -void botcmdTickDistMode(struct chrdata *chr) +void botcmd_tick_dist_mode(struct chrdata *chr) { s32 confignum; f32 *limits; @@ -55,7 +55,7 @@ void botcmdTickDistMode(struct chrdata *chr) if (aibot->config->type == BOTTYPE_KAZE) { confignum = BOTDISTCFG_KAZE; } else { - confignum = botinvGetDistConfig(aibot->weaponnum, aibot->gunfunc); + confignum = botinv_get_dist_config(aibot->weaponnum, aibot->gunfunc); } if (chr->myaction == MA_AIBOTFOLLOW && aibot->followingplayernum >= 0) { @@ -64,7 +64,7 @@ void botcmdTickDistMode(struct chrdata *chr) insight = aibot->chrsinsight[aibot->followingplayernum]; if (chr->target != -1 && (confignum == BOTDISTCFG_CLOSE || confignum == BOTDISTCFG_KAZE)) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); f32 xdiff = targetprop->pos.x - target->pos.x; f32 ydiff = targetprop->pos.y - target->pos.y; f32 zdiff = targetprop->pos.z - target->pos.z; @@ -82,7 +82,7 @@ void botcmdTickDistMode(struct chrdata *chr) targetprop = g_MpAllChrPtrs[aibot->attackingplayernum]->prop; insight = aibot->chrsinsight[aibot->attackingplayernum]; } else if (chr->target != -1) { - targetprop = chrGetTargetProp(chr); + targetprop = chr_get_target_prop(chr); insight = aibot->targetinsight; } } @@ -91,11 +91,11 @@ void botcmdTickDistMode(struct chrdata *chr) return; } - if (!botHasGround(targetprop->chr)) { + if (!bot_has_ground(targetprop->chr)) { return; } - distance = chrGetDistanceToCoord(chr, &targetprop->pos); + distance = chr_get_distance_to_coord(chr, &targetprop->pos); minattackdistance = limits[0]; maxattackdistance = limits[1]; limit3 = limits[2]; @@ -176,16 +176,16 @@ void botcmdTickDistMode(struct chrdata *chr) || (newmode != BOTDISTMODE_OK && (chr->actiontype == ACT_STAND || aibot->distmodettl60 <= 0))) { switch (newmode) { case BOTDISTMODE_BACKUP: - chrRunFromPos(chr, GOPOSFLAG_RUN, 10000, &targetprop->pos); + chr_run_from_pos(chr, GOPOSFLAG_RUN, 10000, &targetprop->pos); break; case BOTDISTMODE_OK: - chrTryStop(chr); + chr_try_stop(chr); break; case BOTDISTMODE_ADVANCE: - chrGoToProp(chr, targetprop, GOPOSFLAG_RUN); + chr_go_to_prop(chr, targetprop, GOPOSFLAG_RUN); break; case BOTDISTMODE_GOTO: - chrGoToProp(chr, targetprop, GOPOSFLAG_RUN); + chr_go_to_prop(chr, targetprop, GOPOSFLAG_RUN); break; } @@ -193,30 +193,30 @@ void botcmdTickDistMode(struct chrdata *chr) } } -void botcmdApply(struct chrdata *chr, u32 command) +void botcmd_apply(struct chrdata *chr, u32 command) { f32 value; switch (command) { case AIBOTCMD_ATTACK: - amOpenPickTarget(); + am_open_pick_target(); break; case AIBOTCMD_FOLLOW: - botApplyFollow(chr, g_Vars.currentplayer->prop); + bot_apply_follow(chr, g_Vars.currentplayer->prop); break; case AIBOTCMD_PROTECT: - botApplyProtect(chr, g_Vars.currentplayer->prop); + bot_apply_protect(chr, g_Vars.currentplayer->prop); break; case AIBOTCMD_DEFEND: - value = chrGetInverseTheta(g_Vars.currentplayer->prop->chr); - botApplyDefend(chr, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, value); + value = chr_get_inverse_theta(g_Vars.currentplayer->prop->chr); + bot_apply_defend(chr, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, value); break; case AIBOTCMD_HOLD: - value = chrGetInverseTheta(g_Vars.currentplayer->prop->chr); - botApplyHold(chr, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, value); + value = chr_get_inverse_theta(g_Vars.currentplayer->prop->chr); + bot_apply_hold(chr, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, value); break; default: - botApplyScenarioCommand(chr, command); + bot_apply_scenario_command(chr, command); break; } } diff --git a/src/game/botinv.c b/src/game/botinv.c index 87f468634..f0c5ff244 100644 --- a/src/game/botinv.c +++ b/src/game/botinv.c @@ -135,7 +135,7 @@ struct botweaponconfig g_BotWeaponConfigs[] = { /** * Remove all items from the bot's inventory. */ -void botinvClear(struct chrdata *chr) +void botinv_clear(struct chrdata *chr) { if (chr && chr->aibot) { s32 i = 0; @@ -155,7 +155,7 @@ void botinvClear(struct chrdata *chr) * weapons, and 4 are for scenario-specific items such as briefcases and the * data uplink. */ -struct invitem *botinvGetFreeSlot(struct chrdata *chr) +struct invitem *botinv_get_free_slot(struct chrdata *chr) { s32 i; @@ -177,7 +177,7 @@ struct invitem *botinvGetFreeSlot(struct chrdata *chr) /** * Retrieve an inventory item from the bot's inventory. */ -struct invitem *botinvGetItem(struct chrdata *chr, s32 weaponnum) +struct invitem *botinv_get_item(struct chrdata *chr, s32 weaponnum) { s32 i; @@ -205,7 +205,7 @@ struct invitem *botinvGetItem(struct chrdata *chr, s32 weaponnum) /** * Remove a weapon from the bot's inventory. */ -void botinvRemoveItem(struct chrdata *chr, s32 weaponnum) +void botinv_remove_item(struct chrdata *chr, s32 weaponnum) { s32 i; @@ -234,7 +234,7 @@ void botinvRemoveItem(struct chrdata *chr, s32 weaponnum) * * See the INVITEMTYPE constants. */ -u32 botinvGetItemType(struct chrdata *chr, u32 weaponnum) +u32 botinv_get_item_type(struct chrdata *chr, u32 weaponnum) { struct invitem *item; @@ -242,7 +242,7 @@ u32 botinvGetItemType(struct chrdata *chr, u32 weaponnum) return 0; } - item = botinvGetItem(chr, weaponnum); + item = botinv_get_item(chr, weaponnum); if (item) { return item->type; @@ -256,14 +256,14 @@ u32 botinvGetItemType(struct chrdata *chr, u32 weaponnum) * * There is no pickup pad, so this is likely for dropped items. */ -bool botinvGiveSingleWeapon(struct chrdata *chr, u32 weaponnum) +bool botinv_give_single_weapon(struct chrdata *chr, u32 weaponnum) { if (!chr || !chr->aibot) { return false; } - if (!botinvGetItemType(chr, weaponnum)) { - struct invitem *item = botinvGetFreeSlot(chr); + if (!botinv_get_item_type(chr, weaponnum)) { + struct invitem *item = botinv_get_free_slot(chr); if (item) { item->type = INVITEMTYPE_WEAP; @@ -287,9 +287,9 @@ bool botinvGiveSingleWeapon(struct chrdata *chr, u32 weaponnum) * inventory items for both single and dual and the player can choose which one * they want to use. */ -void botinvGiveDualWeapon(struct chrdata *chr, u32 weaponnum) +void botinv_give_dual_weapon(struct chrdata *chr, u32 weaponnum) { - struct invitem *item = botinvGetItem(chr, weaponnum); + struct invitem *item = botinv_get_item(chr, weaponnum); if (item) { item->type = INVITEMTYPE_DUAL; @@ -303,9 +303,9 @@ void botinvGiveDualWeapon(struct chrdata *chr, u32 weaponnum) * this does not happen if the second weapon is from the same pad as the first * (ie. is the first weapon respawned). */ -s16 botinvGetWeaponPad(struct chrdata *chr, u32 weaponnum) +s16 botinv_get_weapon_pad(struct chrdata *chr, u32 weaponnum) { - struct invitem *item = botinvGetItem(chr, weaponnum); + struct invitem *item = botinv_get_item(chr, weaponnum); if (item && item->type == INVITEMTYPE_WEAP) { return item->type_weap.pickuppad; @@ -319,7 +319,7 @@ s16 botinvGetWeaponPad(struct chrdata *chr, u32 weaponnum) * * This function does not give any ammo to the bot. */ -bool botinvGiveProp(struct chrdata *chr, struct prop *prop) +bool botinv_give_prop(struct chrdata *chr, struct prop *prop) { bool result = false; struct defaultobj *obj; @@ -335,10 +335,10 @@ bool botinvGiveProp(struct chrdata *chr, struct prop *prop) if (obj->type == OBJTYPE_WEAPON) { struct weaponobj *weapon = prop->weapon; s32 weaponnum = weapon->weaponnum; - result = botinvGiveSingleWeapon(chr, weaponnum); + result = botinv_give_single_weapon(chr, weaponnum); if (result) { - struct invitem *item = botinvGetItem(chr, weaponnum); + struct invitem *item = botinv_get_item(chr, weaponnum); item->type_weap.pickuppad = obj->pad; } } @@ -347,10 +347,10 @@ bool botinvGiveProp(struct chrdata *chr, struct prop *prop) for (i = 0; i < 19; i++) { if (multi->slots[i].quantity > 0) { - s32 weaponnum = botactGetWeaponByAmmoType(i + 1); + s32 weaponnum = botact_get_weapon_by_ammo_type(i + 1); if (weaponnum > 0) { - botinvGiveSingleWeapon(chr, weaponnum); + botinv_give_single_weapon(chr, weaponnum); } } } @@ -368,7 +368,7 @@ void botinv0f198060(u32 arg0) * Score all weapons in the match's weaponset by themselves and write them to * the 3 array pointers, ordered by score1 descending. */ -void botinvScoreAllWeapons(struct chrdata *chr, s32 *weaponnums, s32 *scores1, s32 *scores2) +void botinv_score_all_weapons(struct chrdata *chr, s32 *weaponnums, s32 *scores1, s32 *scores2) { s32 i; s32 pri1; @@ -382,8 +382,8 @@ void botinvScoreAllWeapons(struct chrdata *chr, s32 *weaponnums, s32 *scores1, s s32 weaponnum = g_MpWeapons[g_MpSetup.weapons[i]].weaponnum; weaponnums[i] = weaponnum; - botinvScoreWeaponByItself(chr, weaponnum, FUNC_PRIMARY, -1, false, &pri1, &pri2); - botinvScoreWeaponByItself(chr, weaponnum, FUNC_SECONDARY, -1, false, &sec1, &sec2); + botinv_score_weapon_by_itself(chr, weaponnum, FUNC_PRIMARY, -1, false, &pri1, &pri2); + botinv_score_weapon_by_itself(chr, weaponnum, FUNC_SECONDARY, -1, false, &sec1, &sec2); scores1[i] = pri1 >= sec1 ? pri1 : sec1; scores2[i] = pri2 >= sec2 ? pri2 : sec2; @@ -420,7 +420,7 @@ void botinvScoreAllWeapons(struct chrdata *chr, s32 *weaponnums, s32 *scores1, s /** * Return true if the match's weaponset contains a shield. */ -bool mpHasShield(void) +bool mp_has_shield(void) { s32 i; @@ -438,7 +438,7 @@ bool mpHasShield(void) /** * Get the weapon slot (0 to 5) by weapon number. */ -s32 mpGetWeaponSlotByWeaponNum(s32 weaponnum) +s32 mp_get_weapon_slot_by_weapon_num(s32 weaponnum) { s32 result = -1; s32 i; @@ -460,7 +460,7 @@ s32 mpGetWeaponSlotByWeaponNum(s32 weaponnum) * Weapon scoring is used to determine if a weapon is better than another, * which affects whether the bot engages in combat or seeks a better weapon. */ -void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2, bool comparewithtarget, bool learn) +void botinv_score_weapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2, bool comparewithtarget, bool learn) { s32 score1 = 0; s32 score2 = 0; @@ -517,7 +517,7 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam case WEAPON_UNARMED: if (comparewithtarget && funcnum != FUNC_PRIMARY) { if (chr->target != -1 - && botGetTargetsWeaponNum(chr) > WEAPON_UNARMED + && bot_get_targets_weapon_num(chr) > WEAPON_UNARMED && chr->aibot->config->difficulty > BOTDIFF_MEAT) { score1 = 26; score2 = 26; @@ -587,7 +587,7 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam break; case WEAPON_RCP120: if (chr->aibot->cloakdeviceenabled == false - && botactGetAmmoQuantityByWeapon(chr->aibot, WEAPON_RCP120, FUNC_PRIMARY, true) > 500 + && botact_get_ammo_quantity_by_weapon(chr->aibot, WEAPON_RCP120, FUNC_PRIMARY, true) > 500 && chr->aibot->config->difficulty > BOTDIFF_MEAT) { score1 += chr->aibot->random1 % 10; score2 += chr->aibot->random1 % 10; @@ -639,7 +639,7 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam if (chr->aibot->config->difficulty > BOTDIFF_MEAT) { if (comparewithtarget) { if (chr->target != -1 - && chr->aibot->chrsinsight[mpPlayerGetIndex(chrGetTargetProp(chr)->chr)] == 0 + && chr->aibot->chrsinsight[mp_player_get_index(chr_get_target_prop(chr)->chr)] == 0 && (chr->aibot->random1 % 2) == 0) { score1 += 10; } else { @@ -656,7 +656,7 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam if (chr->aibot->config->difficulty >= BOTDIFF_NORMAL) { if (comparewithtarget) { if (chr->target != -1 - && chr->aibot->chrsinsight[mpPlayerGetIndex(chrGetTargetProp(chr)->chr)] == 0 + && chr->aibot->chrsinsight[mp_player_get_index(chr_get_target_prop(chr)->chr)] == 0 && (chr->aibot->random1 % 2) == 0) { score1 = 178; score2 = 188; @@ -688,7 +688,7 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam score2 = 0; } } else { - if (comparewithtarget && chr->target != -1 && chrGetTargetProp(chr)->chr->blurdrugamount > TICKS(3500)) { + if (comparewithtarget && chr->target != -1 && chr_get_target_prop(chr)->chr->blurdrugamount > TICKS(3500)) { score1 = 0; score2 = 0; } else { @@ -702,7 +702,7 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam s32 bluramount = 0; if (chr->target != -1) { - bluramount = chrGetTargetProp(chr)->chr->blurdrugamount; + bluramount = chr_get_target_prop(chr)->chr->blurdrugamount; } if (funcnum != FUNC_PRIMARY) { @@ -752,7 +752,7 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam break; case WEAPON_NBOMB: if (comparewithtarget && chr->target != -1) { - botGetTargetsWeaponNum(chr); + bot_get_targets_weapon_num(chr); } break; } @@ -773,7 +773,7 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam } } - weaponindex = mpGetWeaponSlotByWeaponNum(weaponnum); + weaponindex = mp_get_weapon_slot_by_weapon_num(weaponnum); if (weaponindex >= 0) { float2 = ceilf(chr->aibot->equipdurations60[weaponindex][funcnum] * (1.0f / TICKS(3600.0f))); @@ -813,21 +813,21 @@ void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifam *dst2 = score2; } -void botinvScoreWeaponAgainstTarget(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2) +void botinv_score_weapon_against_target(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2) { - botinvScoreWeapon(chr, weaponnum, funcnum, ifammo, dual, dst1, dst2, true, true); + botinv_score_weapon(chr, weaponnum, funcnum, ifammo, dual, dst1, dst2, true, true); } -void botinvScoreWeaponByItself(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) { - botinvScoreWeapon(chr, weaponnum, funcnum, ifammo, dual, dst1, dst2, false, true); + botinv_score_weapon(chr, weaponnum, funcnum, ifammo, dual, dst1, dst2, false, true); } /** * Return the aibot's distance configuration index for the given weapon and * function. */ -s32 botinvGetDistConfig(s32 weaponnum, s32 funcnum) +s32 botinv_get_dist_config(s32 weaponnum, s32 funcnum) { if (funcnum != FUNC_PRIMARY) { return g_BotWeaponConfigs[weaponnum].secdistconfig; @@ -840,7 +840,7 @@ s32 botinvGetDistConfig(s32 weaponnum, s32 funcnum) * Check if the bot's personality permits it to use the given weapon and * function. */ -bool botinvAllowsWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) +bool botinv_allows_weapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) { bool allow = true; @@ -864,7 +864,7 @@ bool botinvAllowsWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) * * The logic for deciding when to switch weapons is here. */ -void botinvTick(struct chrdata *chr) +void botinv_tick(struct chrdata *chr) { s32 newweaponnum = WEAPON_UNARMED; s32 newfuncnum = FUNC_PRIMARY; @@ -878,7 +878,7 @@ void botinvTick(struct chrdata *chr) } aibot = chr->aibot; - weaponindex = mpGetWeaponSlotByWeaponNum(aibot->weaponnum); + weaponindex = mp_get_weapon_slot_by_weapon_num(aibot->weaponnum); if (weaponindex >= 0) { aibot->equipdurations60[weaponindex][aibot->gunfunc] += g_Vars.lvupdate60; @@ -969,12 +969,12 @@ void botinvTick(struct chrdata *chr) canuse = g_BotWeaponConfigs[weaponnum].haspriammogoal; } - if (canuse && botinvAllowsWeapon(chr, weaponnum, j)) { - botinvScoreWeaponAgainstTarget(chr, weaponnum, j, 1, item && item->type == INVITEMTYPE_DUAL, &score1, &score2); + if (canuse && botinv_allows_weapon(chr, weaponnum, j)) { + botinv_score_weapon_against_target(chr, weaponnum, j, 1, item && item->type == INVITEMTYPE_DUAL, &score1, &score2); if (score1 >= bestscore) { - if (!botactGetAmmoTypeByFunction(weaponnum, j) - || botactGetAmmoQuantityByWeapon(aibot, weaponnum, j, true) > 0) { + if (!botact_get_ammo_type_by_function(weaponnum, j) + || botact_get_ammo_quantity_by_weapon(aibot, weaponnum, j, true) > 0) { bestscore = score1; newweaponnum = weaponnum; newfuncnum = j; @@ -988,23 +988,23 @@ void botinvTick(struct chrdata *chr) // Consider setting knives to secondary function (throw) if (newweaponnum == WEAPON_COMBATKNIFE - && botactGetAmmoQuantityByWeapon(aibot, WEAPON_COMBATKNIFE, FUNC_SECONDARY, true) >= 2 + && botact_get_ammo_quantity_by_weapon(aibot, WEAPON_COMBATKNIFE, FUNC_SECONDARY, true) >= 2 && chr->target != -1 - && chr->aibot->chrdistances[mpPlayerGetIndex(chrGetTargetProp(chr)->chr)] > 200 - && chr->aibot->chrdistances[mpPlayerGetIndex(chrGetTargetProp(chr)->chr)] < 1500) { + && chr->aibot->chrdistances[mp_player_get_index(chr_get_target_prop(chr)->chr)] > 200 + && chr->aibot->chrdistances[mp_player_get_index(chr_get_target_prop(chr)->chr)] < 1500) { newfuncnum = FUNC_SECONDARY; } // Consider setting Phoenix and SuperDragon to their explosive functions if (aibot->config->type == BOTTYPE_ROCKET) { - if (newweaponnum == WEAPON_PHOENIX && botactGetAmmoQuantityByWeapon(aibot, WEAPON_PHOENIX, FUNC_SECONDARY, true) > 0) { + if (newweaponnum == WEAPON_PHOENIX && botact_get_ammo_quantity_by_weapon(aibot, WEAPON_PHOENIX, FUNC_SECONDARY, true) > 0) { newfuncnum = FUNC_SECONDARY; - } else if (newweaponnum == WEAPON_SUPERDRAGON && botactGetAmmoQuantityByWeapon(aibot, WEAPON_SUPERDRAGON, FUNC_SECONDARY, true) > 0) { + } else if (newweaponnum == WEAPON_SUPERDRAGON && botact_get_ammo_quantity_by_weapon(aibot, WEAPON_SUPERDRAGON, FUNC_SECONDARY, true) > 0) { newfuncnum = FUNC_SECONDARY; } } - botinvSwitchToWeapon(chr, newweaponnum, newfuncnum); + botinv_switch_to_weapon(chr, newweaponnum, newfuncnum); } } @@ -1014,7 +1014,7 @@ void botinvTick(struct chrdata *chr) * The weapon must already exist in the bot's inventory, * otherwise unarmed will be equipped instead. */ -bool botinvSwitchToWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) +bool botinv_switch_to_weapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) { struct invitem *item; struct weaponfunc *func; @@ -1037,7 +1037,7 @@ bool botinvSwitchToWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) // If changing to anything other than unarmed, make sure the aibot has the // weapon in their inventory. Otherwise make them switch to unarmed. if (weaponnum != WEAPON_UNARMED) { - item = botinvGetItem(chr, weaponnum); + item = botinv_get_item(chr, weaponnum); if (!item) { weaponnum = WEAPON_UNARMED; @@ -1067,7 +1067,7 @@ bool botinvSwitchToWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) if (changingfunc || changinggun) { for (i = 0; i < 2; i++) { if (aibot->loadedammo[i] > 0) { - botactGiveAmmoByWeapon(aibot, aibot->weaponnum, aibot->gunfunc, aibot->loadedammo[i]); + botact_give_ammo_by_weapon(aibot, aibot->weaponnum, aibot->gunfunc, aibot->loadedammo[i]); aibot->loadedammo[i] = 0; } } @@ -1081,24 +1081,24 @@ bool botinvSwitchToWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) if (changingfunc && !changinggun) { for (i = 0; i < 2; i++) { if (chr->weapons_held[i]) { - botactReload(chr, i, false); + botact_reload(chr, i, false); } } } if (!changinggun) { - modelnum = playermgrGetModelOfWeapon(weaponnum); + modelnum = playermgr_get_model_of_weapon(weaponnum); // @dangerous: item is uninitialised if weaponnum is WEAPON_UNARMED. - // This function assumes playermgrGetModelOfWeapon returns a negative value for + // This function assumes playermgr_get_model_of_weapon returns a negative value for // WEAPON_UNARMED which is a dangerous assumption to make, but correct. if (modelnum >= 0 && item && item->type == INVITEMTYPE_DUAL && chr->weapons_held[HAND_LEFT] == NULL) { - chrGiveWeapon(chr, modelnum, weaponnum, OBJFLAG_WEAPON_LEFTHANDED); - botactReload(chr, HAND_LEFT, false); + chr_give_weapon(chr, modelnum, weaponnum, OBJFLAG_WEAPON_LEFTHANDED); + botact_reload(chr, HAND_LEFT, false); } } - func = weaponGetFunctionById(weaponnum, funcnum); + func = weapon_get_function_by_id(weaponnum, funcnum); aibot->ismeleeweapon = func && func->type == INVENTORYFUNCTYPE_MELEE; @@ -1117,7 +1117,7 @@ bool botinvSwitchToWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum) * * dropall is used when the bot is killed. */ -void botinvDrop(struct chrdata *chr, s32 weaponnum, u8 dropall) +void botinv_drop(struct chrdata *chr, s32 weaponnum, u8 dropall) { s32 i; @@ -1134,21 +1134,21 @@ void botinvDrop(struct chrdata *chr, s32 weaponnum, u8 dropall) if ((item->type == INVITEMTYPE_WEAP || item->type == INVITEMTYPE_DUAL) && (dropall || weaponnum == item->type_weap.weapon1)) { - if (!weaponHasFlag(item->type_weap.weapon1, WEAPONFLAG_UNDROPPABLE) + if (!weapon_has_flag(item->type_weap.weapon1, WEAPONFLAG_UNDROPPABLE) || (g_Vars.normmplayerisrunning && g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL && item->type_weap.weapon1 == WEAPON_DATAUPLINK)) { - s32 modelnum = playermgrGetModelOfWeapon(item->type_weap.weapon1); + s32 modelnum = playermgr_get_model_of_weapon(item->type_weap.weapon1); if (modelnum > 0) { - struct prop *prop = weaponCreateForChr(chr, modelnum, item->type_weap.weapon1, OBJFLAG_WEAPON_AICANNOTUSE, NULL, NULL); + struct prop *prop = weapon_create_for_chr(chr, modelnum, item->type_weap.weapon1, OBJFLAG_WEAPON_AICANNOTUSE, NULL, NULL); if (prop) { - objSetDropped(prop, DROPTYPE_DEFAULT); - objDrop(prop, true); + obj_set_dropped(prop, DROPTYPE_DEFAULT); + obj_drop(prop, true); if (item->type_weap.weapon1 == WEAPON_BRIEFCASE2) { - scenarioHandleDroppedToken(chr, prop); + scenario_handle_dropped_token(chr, prop); } } } @@ -1158,22 +1158,22 @@ void botinvDrop(struct chrdata *chr, s32 weaponnum, u8 dropall) if ((dropall && weaponnum >= WEAPON_FALCON2) || (!dropall && weaponnum == chr->aibot->weaponnum)) { - botinvSwitchToWeapon(chr, WEAPON_UNARMED, FUNC_PRIMARY); + botinv_switch_to_weapon(chr, WEAPON_UNARMED, FUNC_PRIMARY); } chr->hidden |= CHRHFLAG_DROPPINGITEM; if (!dropall) { - botinvRemoveItem(chr, weaponnum); + botinv_remove_item(chr, weaponnum); } } -void botinvDropAll(struct chrdata *chr, u32 weaponnum) +void botinv_drop_all(struct chrdata *chr, u32 weaponnum) { - botinvDrop(chr, weaponnum, true); + botinv_drop(chr, weaponnum, true); } -void botinvDropOne(struct chrdata *chr, u32 weaponnum) +void botinv_drop_one(struct chrdata *chr, u32 weaponnum) { - botinvDrop(chr, weaponnum, false); + botinv_drop(chr, weaponnum, false); } diff --git a/src/game/botinvinit.c b/src/game/botinvinit.c index 7fcef9787..b8a41f0a0 100644 --- a/src/game/botinvinit.c +++ b/src/game/botinvinit.c @@ -6,7 +6,7 @@ #include "lib/memp.h" #include "types.h" -void botinvInit(struct chrdata *chr, s32 maxitems) +void botinv_init(struct chrdata *chr, s32 maxitems) { if (chr && chr->aibot && maxitems > 0) { if (maxitems > 255) { @@ -14,8 +14,8 @@ void botinvInit(struct chrdata *chr, s32 maxitems) } chr->aibot->maxitems = maxitems; - chr->aibot->items = mempAlloc(ALIGN16(maxitems * sizeof(struct invitem)), MEMPOOL_STAGE); + chr->aibot->items = memp_alloc(ALIGN16(maxitems * sizeof(struct invitem)), MEMPOOL_STAGE); - botinvClear(chr); + botinv_clear(chr); } } diff --git a/src/game/botmgr.c b/src/game/botmgr.c index fe1f420cc..976a66b90 100644 --- a/src/game/botmgr.c +++ b/src/game/botmgr.c @@ -15,7 +15,7 @@ #include "data.h" #include "types.h" -void botmgrRemoveAll(void) +void botmgr_remove_all(void) { s32 i; @@ -26,7 +26,7 @@ void botmgrRemoveAll(void) g_BotCount = 0; } -void botmgrAllocateBot(s32 chrnum, s32 aibotnum) +void botmgr_allocate_bot(s32 chrnum, s32 aibotnum) { RoomNum rooms[1]; struct prop *prop; @@ -39,29 +39,29 @@ void botmgrAllocateBot(s32 chrnum, s32 aibotnum) rooms[0] = -1; - headnum = mpGetHeadId(g_BotConfigsArray[aibotnum].base.mpheadnum); - bodynum = mpGetBodyId(g_BotConfigsArray[aibotnum].base.mpbodynum); + headnum = mp_get_head_id(g_BotConfigsArray[aibotnum].base.mpheadnum); + bodynum = mp_get_body_id(g_BotConfigsArray[aibotnum].base.mpbodynum); if (IS4MB()) { headnum = HEAD_DDSHOCK; bodynum = BODY_DDSHOCK; } - model = bodyAllocateModel(bodynum, headnum, 0); + model = body_allocate_model(bodynum, headnum, 0); if (model != NULL) { struct coord pos = {0.0f, 0.0f, 0.0f}; u32 stack; - prop = chrAllocate(model, &pos, rooms, 0.0f, ailistFindById(GAILIST_AIBOT_INIT)); + prop = chr_allocate(model, &pos, rooms, 0.0f, ailist_find_by_id(GAILIST_AIBOT_INIT)); if (prop != NULL) { - propActivate(prop); - propEnable(prop); + prop_activate(prop); + prop_enable(prop); chr = prop->chr; - chrSetChrnum(chr, chrnum); + chr_set_chrnum(chr, chrnum); chr->chrnum = chrnum; chr->padpreset1 = -1; @@ -70,7 +70,7 @@ void botmgrAllocateBot(s32 chrnum, s32 aibotnum) chr->visionrange = 80; chr->headnum = headnum; chr->bodynum = bodynum; - chr->race = bodyGetRace(chr->bodynum); + chr->race = body_get_race(chr->bodynum); chr->flags = CHRFLAG0_CAN_EXAMINE_BODY; // reused flag? chr->flags2 = 0; chr->team = 1 << g_BotConfigsArray[aibotnum].base.team; @@ -80,7 +80,7 @@ void botmgrAllocateBot(s32 chrnum, s32 aibotnum) g_MpBotChrPtrs[g_BotCount] = chr; g_BotCount++; - aibot = mempAlloc(sizeof(struct aibot), MEMPOOL_STAGE); + aibot = memp_alloc(sizeof(struct aibot), MEMPOOL_STAGE); chr->aibot = aibot; if (aibot != NULL) { @@ -103,7 +103,7 @@ void botmgrAllocateBot(s32 chrnum, s32 aibotnum) g_MpAllChrConfigPtrs[g_MpNumChrs] = &g_BotConfigsArray[aibotnum].base; g_MpNumChrs++; - aibot->ammoheld = mempAlloc(36 * sizeof(s32), MEMPOOL_STAGE); + aibot->ammoheld = memp_alloc(36 * sizeof(s32), MEMPOOL_STAGE); for (i = 0; i < 33; i++) { aibot->ammoheld[i] = 0; @@ -201,10 +201,10 @@ void botmgrAllocateBot(s32 chrnum, s32 aibotnum) aibot->reaperspeed[HAND_RIGHT] = 0; aibot->maulercharge[HAND_LEFT] = 0.0f; aibot->maulercharge[HAND_RIGHT] = 0.0f; - aibot->roty = modelGetChrRotY(chr->model); + aibot->roty = model_get_chr_rot_y(chr->model); aibot->angleoffset = 0.0f; aibot->speedtheta = 0.0f; - aibot->lookangle = modelGetChrRotY(chr->model); + aibot->lookangle = model_get_chr_rot_y(chr->model); aibot->moveratex = 0.0f; aibot->moveratey = 0.0f; @@ -271,7 +271,7 @@ void botmgrAllocateBot(s32 chrnum, s32 aibotnum) return; } - botinvInit(chr, 10); + botinv_init(chr, 10); } } } diff --git a/src/game/botroom.c b/src/game/botroom.c index b27308f13..26dfa6506 100644 --- a/src/game/botroom.c +++ b/src/game/botroom.c @@ -34,7 +34,7 @@ * For covernums, the three variables declared above it are never written to the * stack, so the outer loop would need to iterate three times while covernums is * full in order to write into the caller's stack space. The only caller is - * botTickUnpaused, and its first stack usage is 0x20 where it backs up s0. + * bot_tick_unpaused, and its first stack usage is 0x20 where it backs up s0. * So the outer loop would need to iterate 11 times before any damage could be * done. * @@ -46,7 +46,7 @@ * It's likely that these don't ever overflow, or they overflow minimally which * has no serious effect, but this should be investigated further. */ -bool botroomFindPos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnumptr, s32 *covernumptr) +bool botroom_find_pos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnumptr, s32 *covernumptr) { s32 i; struct waypoint *waypoint; @@ -75,12 +75,12 @@ bool botroomFindPos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnump do { sp54 = false; - count = coverGetCount(); + count = cover_get_count(); for (i = 0; i < count; i++) { - if (coverUnpack(i, &cover) && !coverIsSpecial(&cover) && arrayIntersects(cover.rooms, rooms)) { + if (cover_unpack(i, &cover) && !cover_is_special(&cover) && array_intersects(cover.rooms, rooms)) { if (sp50 && (cover.flags & COVERFLAG_AIBOTINUSE)) { - coverUnsetFlag(i, COVERFLAG_AIBOTINUSE); + cover_unset_flag(i, COVERFLAG_AIBOTINUSE); covernums[covercount] = i; covercount++; totalcount++; @@ -105,10 +105,10 @@ bool botroomFindPos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnump waypointnum = g_Vars.waypointnums[g_Rooms[room].firstwaypoint + i]; waypoint = &g_StageSetup.waypoints[waypointnum]; - padUnpack(waypoint->padnum, PADFIELD_FLAGS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_FLAGS, &pad); if (sp50 && (pad.flags & PADFLAG_AIBOTINUSE)) { - padUnsetFlag(waypoint->padnum, PADFLAG_AIBOTINUSE); + pad_unset_flag(waypoint->padnum, PADFLAG_AIBOTINUSE); padnums[padcount] = waypoint->padnum; padcount++; totalcount++; @@ -138,7 +138,7 @@ bool botroomFindPos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnump i = random() % totalcount; if (i < covercount) { - coverUnpack(covernums[i], &cover); + cover_unpack(covernums[i], &cover); pos->x = cover.pos->x; pos->y = cover.pos->y; @@ -149,7 +149,7 @@ bool botroomFindPos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnump *covernumptr = covernums[i]; } else { i -= covercount; - padUnpack(padnums[i], PADFIELD_POS | PADFIELD_LOOK, &pad); + pad_unpack(padnums[i], PADFIELD_POS | PADFIELD_LOOK, &pad); pos->x = pad.pos.x; pos->y = pad.pos.y; diff --git a/src/game/buildtime.c b/src/game/buildtime.c index 5cca0cdf5..d352a2173 100644 --- a/src/game/buildtime.c +++ b/src/game/buildtime.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -char *buildGetTimestamp(void) +char *build_get_timestamp(void) { #if VERSION >= VERSION_JPN_FINAL return "Jul 19 2000 09:43:24"; diff --git a/src/game/camdraw.c b/src/game/camdraw.c index 7dbe3dc83..2368d172e 100644 --- a/src/game/camdraw.c +++ b/src/game/camdraw.c @@ -258,10 +258,10 @@ void *func0f149d58(u32 size, u32 line, char *file) size = align16(size); - bgGarbageCollectRooms(size, 1); + bg_garbage_collect_rooms(size, 1); var8007f9d0 += size; - allocation = memaAlloc(size); + allocation = mema_alloc(size); var8007f9d4++; for (i = 0; i < var800a45a0->unk37c; i++) { @@ -290,7 +290,7 @@ void func0f149e58(u8 *arg0, u32 size) for (i = 0; i < var800a45a0->unk37c; i++) { if (arg0 == NULL || arg0 == var800a45a0->unk380[i]) { - memaFree(var800a45a0->unk380[i], var800a45a0->unk3f8[i]); + mema_free(var800a45a0->unk380[i], var800a45a0->unk3f8[i]); var800a45a0->unk380[i] = 0; } } @@ -387,9 +387,9 @@ bool func0f14a194(void) * 2 returns "Style 3" * 3 returns "Style 4" */ -char *phGetStyleName(s32 stylenum) +char *ph_get_style_name(s32 stylenum) { - return langGet(L_MISC_429 + stylenum); + return lang_get(L_MISC_429 + stylenum); } /** @@ -398,9 +398,9 @@ char *phGetStyleName(s32 stylenum) * 2 returns "Auburn" * 3 returns "Blue Rinse" */ -char *phGetColourName(s32 colournum) +char *ph_get_colour_name(s32 colournum) { - return langGet(L_MISC_433 + colournum); + return lang_get(L_MISC_433 + colournum); } struct var8007f8dc *func0f14a20c(void) @@ -444,7 +444,7 @@ bool func0f14a2fc(s32 index, u32 line, char *file) return thing->unk3f4_00; } -void pheadInit(void) +void phead_init(void) { s32 i; @@ -452,8 +452,8 @@ void pheadInit(void) u32 size1 = align16(sizeof(struct var8007f8dc) * 4); u32 size2 = align16(sizeof(struct var800a45a0)); - var8007f8dc = mempAlloc(size1, MEMPOOL_PERMANENT); - var800a45a0 = mempAlloc(size2, MEMPOOL_PERMANENT); + var8007f8dc = memp_alloc(size1, MEMPOOL_PERMANENT); + var800a45a0 = memp_alloc(size2, MEMPOOL_PERMANENT); func0f14a240(); @@ -463,12 +463,12 @@ void pheadInit(void) } } -void pheadInit2(void) +void phead_init2(void) { // empty } -void pheadReset(void) +void phead_reset(void) { s32 i; @@ -707,7 +707,7 @@ void func0f14aa94(s32 colournum) { struct var8007f8e0 *thing; - phGetColourName(colournum); + ph_get_colour_name(colournum); thing = func0f14a06c(-1); thing->colournum = colournum; @@ -731,7 +731,7 @@ void func0f14ab0c(s32 stylenum) { struct var8007f8e0 *thing; - phGetStyleName(stylenum); + ph_get_style_name(stylenum); thing = func0f14a06c(-1); thing->stylenum = stylenum; @@ -914,7 +914,7 @@ void func0f14aee0(void) totalsize = align16(sizeof(struct textureconfig) * count); totalsize += align16(texturesize * count); - ptr = mempAlloc(totalsize, MEMPOOL_STAGE); + ptr = memp_alloc(totalsize, MEMPOOL_STAGE); var800a45a0->unk484 = (struct textureconfig *)ptr; ptr += sizeof(struct textureconfig) * count; @@ -1174,13 +1174,13 @@ void func0f14b8ac(s32 index) { struct var8007f8dc *thing = &var8007f8dc[index]; - mainOverrideVariable("kg", &var8007f8e8); - mainOverrideVariable("Kp", &var8007f8ec); - mainOverrideVariable("Ki", &var8007f8f0); - mainOverrideVariable("Kd", &var8007f8f4); - mainOverrideVariable("tInt", &var8007f8f8); - mainOverrideVariable("gocal", &var8007f8fc); - mainOverrideVariable("aim", &var8007f900); + main_override_variable("kg", &var8007f8e8); + main_override_variable("Kp", &var8007f8ec); + main_override_variable("Ki", &var8007f8f0); + main_override_variable("Kd", &var8007f8f4); + main_override_variable("tInt", &var8007f8f8); + main_override_variable("gocal", &var8007f8fc); + main_override_variable("aim", &var8007f900); if (thing->unk0d4_00) { func0f14cf6c(); @@ -1199,7 +1199,7 @@ void func0f14b8ac(s32 index) return; } - switch (pakGetUnk008(func0f14a5a4())) { + switch (pak_get_unk008(func0f14a5a4())) { case PAK008_12: func0f14a95c(); func0f14aa48(); @@ -1348,14 +1348,14 @@ void func0f14bdbc(s32 index) if (value == 4 || value == 5) { thing->unk0f4 = 6; g_MpPlayerNum = index; - menuSetBanner(-1, false); + menu_set_banner(-1, false); thing2 = func0f14a06c(-1); thing2->unk3f4_00 = false; g_MpPlayerNum = index; - menuPopDialog(); + menu_pop_dialog(); g_MpPlayerNum = 0; } else { @@ -1423,7 +1423,7 @@ void func0f14bec8(s32 index) func0f14bc04(); pak0f11d478(func0f14a5a4()); g_MpPlayerNum = index; - menuSetBanner(-1, false); + menu_set_banner(-1, false); func0f14a678(); thing2->unk3f4_00 = true; g_MpPlayerNum = index; @@ -1509,7 +1509,7 @@ void func0f14c3a4(s32 index) } else { pak0f11d620(func0f14a5a4()); - switch (pakGetUnk008(func0f14a5a4())) { + switch (pak_get_unk008(func0f14a5a4())) { case PAK008_01: func0f14c1cc(index); break; @@ -1528,7 +1528,7 @@ void func0f14c4c0(s32 index) var8007f8dc[index].unk0f4 = 4; g_MpPlayerNum = index; - menuSetBanner(MENUBANNER_DOWNLOADINGIMAGE, false); + menu_set_banner(MENUBANNER_DOWNLOADINGIMAGE, false); } void func0f14c50c(struct var8007f8e0 *dst, struct var8007f8e0 *src, u32 line, char *file) @@ -1669,7 +1669,7 @@ Gfx *func0f14c870(Gfx *gdl, struct textureconfig *tconfig, f32 *arg2, f32 arg3, gDPSetTextureConvert(gdl++, G_TC_FILT); gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI); - texSelect(&gdl, tconfig, 1, 0, 2, 1, &var800a45a8); + tex_select(&gdl, tconfig, 1, 0, 2, 1, &var800a45a8); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -1712,7 +1712,7 @@ void func0f14cdb8(s32 index, u8 *arg1) void func0f14ce84(void) { if (pak0f11d3f8(func0f14a5a4())) { - if (pakGetUnk008(func0f14a5a4()) != PAK008_12) { + if (pak_get_unk008(func0f14a5a4()) != PAK008_12) { var8007f8dc[func0f14a5a4()].unk0f8 = 1; var8007f8dc[func0f14a5a4()].unk0d4_00 = false; @@ -1730,7 +1730,7 @@ void func0f14cf6c(void) { g_MpPlayerNum = 0; - menuSetBanner(-1, false); + menu_set_banner(-1, false); if (var8007f8dc[func0f14a5a4()].unk0f8) { switch (var8007f8dc[func0f14a5a4()].unk0f8) { @@ -1741,7 +1741,7 @@ void func0f14cf6c(void) case 6: pak0f1171b4(func0f14a5a4(), PAK00C_03, 0); g_MpPlayerNum = 0; - menuSetBanner(-1, false); + menu_set_banner(-1, false); break; } @@ -1760,7 +1760,7 @@ void func0f14d064(s32 index, u8 *arg1) thing->unk064 = 0x2000; thing->unk060 = 6; g_MpPlayerNum = index; - menuSetBanner(MENUBANNER_CALIBRATINGCAMERA, false); + menu_set_banner(MENUBANNER_CALIBRATINGCAMERA, false); func0f14a16c(1); pak0f1171b4(func0f14a5a4(), PAK00C_01, 1); thing->unk0f8 = 3; @@ -1805,7 +1805,7 @@ void func0f14d064(s32 index, u8 *arg1) thing->unk0f8 = 6; thing->unk100 = thing->unk0fc; g_MpPlayerNum = index; - menuSetBanner(-1, false); + menu_set_banner(-1, false); pak0f1171b4(func0f14a5a4(), PAK00C_03, 0); var8007f8dc[var800a45a0->unk000].unk0d4_04 = true; thing->unk0f8 = 0; @@ -2654,9 +2654,9 @@ void func0f14f1d4(s16 *src, s32 len, s32 *dst) s32 func0f14f2b4(struct modeldef *modeldef, Vtx **dst, u32 *len) { - struct modelnode *node1 = modelGetPart(modeldef, MODELPART_HEAD_0190); - struct modelnode *node2 = modelGetPart(modeldef, MODELPART_HEAD_0191); - struct modelnode *node3 = modelGetPart(modeldef, MODELPART_HEAD_0192); + struct modelnode *node1 = model_get_part(modeldef, MODELPART_HEAD_0190); + struct modelnode *node2 = model_get_part(modeldef, MODELPART_HEAD_0191); + struct modelnode *node3 = model_get_part(modeldef, MODELPART_HEAD_0192); s32 totalverts = 0; @@ -3136,7 +3136,7 @@ bool func0f15015c(s8 device, s32 filenum, u8 *arg2) s32 ret; s32 i; - ret = pakReadBodyAtGuid(device, filenum, buffer, 128); + ret = pak_read_body_at_guid(device, filenum, buffer, 128); if (ret == 0) { for (i = 0; i < sizeof(buffer); i++) { @@ -3160,7 +3160,7 @@ bool func0f15015c(s8 device, s32 filenum, u8 *arg2) return false; } -bool pheadLoadFile(s8 device, s32 fileid, u16 serial, s32 arg3) +bool phead_load_file(s8 device, s32 fileid, u16 serial, s32 arg3) { s32 i; s32 ret; @@ -3170,7 +3170,7 @@ bool pheadLoadFile(s8 device, s32 fileid, u16 serial, s32 arg3) struct var8007f8e0 *s0 = func0f14a06c(arg3 == -1 ? -1 : arg3); struct var8007f8e0 *s1 = func0f14a06c(-1); - ret = pakReadBodyAtGuid(device, fileid, (u8 *)&file, 0); + ret = pak_read_body_at_guid(device, fileid, (u8 *)&file, 0); if (ret == 0) { s0->fileguid.fileid = fileid; @@ -3238,7 +3238,7 @@ const char var7f1b727c[] = "\nCam_SaveEditSlotToParamPakItem -> Save failed\n"; const char var7f1b72ac[] = "Camera Save Error Result: %d\n"; const char var7f1b72cc[] = "Magic Guid set to %d\n"; -s32 pheadSaveFile(s8 device, s32 fileid, u16 serial) +s32 phead_save_file(s8 device, s32 fileid, u16 serial) { u32 stack[2]; struct camerafile file; @@ -3308,7 +3308,7 @@ s32 pheadSaveFile(s8 device, s32 fileid, u16 serial) var80075bd0[3] = true; - ret = pakSaveAtGuid(device, fileid, PAKFILETYPE_CAMERA, (u8 *)&file, &writtenfileid, NULL); + ret = pak_save_at_guid(device, fileid, PAKFILETYPE_CAMERA, (u8 *)&file, &writtenfileid, NULL); if (ret == 0) { s32 i; @@ -3337,7 +3337,7 @@ s32 pheadSaveFile(s8 device, s32 fileid, u16 serial) return -1; } -void phGetGuid(s32 index, struct fileguid *guid) +void ph_get_guid(s32 index, struct fileguid *guid) { struct var8007f8e0 *thing = func0f14a06c(index); @@ -3345,7 +3345,7 @@ void phGetGuid(s32 index, struct fileguid *guid) guid->deviceserial = thing->fileguid.deviceserial; } -void phSetFileId(s32 fileid) +void ph_set_file_id(s32 fileid) { struct var8007f8e0 *thing = func0f14a06c(-1); diff --git a/src/game/camera.c b/src/game/camera.c index a520282b9..18ea306f2 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -27,7 +27,7 @@ void cam0f0b4950(void) // empty } -void camSetScreenSize(f32 width, f32 height) +void cam_set_screen_size(f32 width, f32 height) { struct player *player = g_Vars.currentplayer; @@ -37,7 +37,7 @@ void camSetScreenSize(f32 width, f32 height) player->c_halfheight = height * 0.5f; } -void camSetScreenPosition(f32 left, f32 top) +void cam_set_screen_position(f32 left, f32 top) { struct player *player = g_Vars.currentplayer; @@ -45,7 +45,7 @@ void camSetScreenPosition(f32 left, f32 top) player->c_screentop = top; } -void camSetPerspective(f32 near, f32 fovy, f32 aspect) +void cam_set_perspective(f32 near, f32 fovy, f32 aspect) { struct player *player = g_Vars.currentplayer; @@ -66,7 +66,7 @@ f32 cam0f0b49b8(f32 arg0) return result; } -void camSetScale(void) +void cam_set_scale(void) { struct player *player = g_Vars.currentplayer; f32 fVar4; @@ -179,57 +179,57 @@ void cam0f0b4eb8(struct coord *arg0, f32 arg1[2], f32 zoom, f32 aspect) arg1[0] = player->c_screenleft + player->c_halfwidth - f14 * arg0->f[0]; } -void camSetMtxL1738(Mtx *mtx) +void cam_set_mtxl1738(Mtx *mtx) { g_Vars.currentplayer->mtxl1738 = mtx; } -Mtx *camGetMtxL1738(void) +Mtx *cam_get_mtxl1738(void) { return g_Vars.currentplayer->mtxl1738; } -void camSetMtxL173c(Mtx *mtx) +void cam_set_mtxl173c(Mtx *mtx) { g_Vars.currentplayer->mtxl173c = mtx; } -Mtx *camGetMtxL173c(void) +Mtx *cam_get_mtxl173c(void) { return g_Vars.currentplayer->mtxl173c; } -void camSetMtxF006c(Mtxf *mtx) +void cam_set_mtxf006c(Mtxf *mtx) { g_Vars.currentplayer->mtxf006c = mtx; } -Mtxf *camGetMtxF006c(void) +Mtxf *cam_get_mtxf006c(void) { return g_Vars.currentplayer->mtxf006c; } -void camSetPerspectiveMtxL(Mtx *mtx) +void cam_set_perspective_mtxl(Mtx *mtx) { g_Vars.currentplayer->perspmtxl = mtx; } -Mtx *camGetPerspectiveMtxL(void) +Mtx *cam_get_perspective_mtxl(void) { return g_Vars.currentplayer->perspmtxl; } -void camSetOrthogonalMtxL(Mtx *mtx) +void cam_set_orthogonal_mtxl(Mtx *mtx) { g_Vars.currentplayer->orthomtxl = mtx; } -Mtx *camGetOrthogonalMtxL(void) +Mtx *cam_get_orthogonal_mtxl(void) { return g_Vars.currentplayer->orthomtxl; } -void camSetWorldToScreenMtxf(Mtxf *mtx) +void cam_set_world_to_screen_mtxf(Mtxf *mtx) { struct player *player = g_Vars.currentplayer; @@ -247,7 +247,7 @@ Mtxf *cam0f0b5050(u8 *arg0) if (arg0 >= g_VtxBuffers[g_GfxActiveBufferIndex] && arg0 < g_VtxBuffers[g_GfxActiveBufferIndex + 1]) { for (i = 0; i < PLAYERCOUNT(); i++) { - if (g_Vars.currentplayerindex >= playermgrGetOrderOfPlayer(i)) { + if (g_Vars.currentplayerindex >= playermgr_get_order_of_player(i)) { if (g_GfxNumSwaps == g_Vars.players[i]->c_viewfmdynticknum) { if (arg0 >= g_Vars.players[i]->unk0484 && (u8 *)result < g_Vars.players[i]->unk0484) { result = g_Vars.players[i]->worldtoscreenmtx; @@ -257,7 +257,7 @@ Mtxf *cam0f0b5050(u8 *arg0) } } else { for (i = 0; i < PLAYERCOUNT(); i++) { - if (g_Vars.currentplayerindex >= playermgrGetOrderOfPlayer(i)) { + if (g_Vars.currentplayerindex >= playermgr_get_order_of_player(i)) { if (g_GfxNumSwaps == g_Vars.players[i]->c_prevviewfmdynticknum + 1) { if (arg0 >= g_Vars.players[i]->unk0488 && (u8 *)result < g_Vars.players[i]->unk0488) { result = g_Vars.players[i]->prevworldtoscreenmtx; @@ -283,7 +283,7 @@ Mtxf *cam0f0b53a4(u8 *arg0) if (arg0 >= g_VtxBuffers[g_GfxActiveBufferIndex] && arg0 < g_VtxBuffers[g_GfxActiveBufferIndex + 1]) { for (i = 0; i < PLAYERCOUNT(); i++) { - if (g_Vars.currentplayerindex >= playermgrGetOrderOfPlayer(i)) { + if (g_Vars.currentplayerindex >= playermgr_get_order_of_player(i)) { if (g_GfxNumSwaps == g_Vars.players[i]->c_viewfmdynticknum) { if (arg0 >= g_Vars.players[i]->unk0484 && (u8 *)result < g_Vars.players[i]->unk0484) { result = g_Vars.players[i]->projectionmtx; @@ -293,7 +293,7 @@ Mtxf *cam0f0b53a4(u8 *arg0) } } else { for (i = 0; i < PLAYERCOUNT(); i++) { - if (g_Vars.currentplayerindex >= playermgrGetOrderOfPlayer(i)) { + if (g_Vars.currentplayerindex >= playermgr_get_order_of_player(i)) { if (g_GfxNumSwaps == g_Vars.players[i]->c_prevviewfmdynticknum + 1) { if (arg0 >= g_Vars.players[i]->unk0488 && (u8 *)result < g_Vars.players[i]->unk0488) { result = g_Vars.players[i]->prevprojectionmtx; @@ -312,37 +312,37 @@ Mtxf *cam0f0b53a4(u8 *arg0) return result; } -Mtxf *camGetWorldToScreenMtxf(void) +Mtxf *cam_get_world_to_screen_mtxf(void) { return g_Vars.currentplayer->worldtoscreenmtx; } -void camSetMtxF1754(Mtxf *mtx) +void cam_set_mtxf1754(Mtxf *mtx) { g_Vars.currentplayer->mtxf1754 = mtx; } -Mtxf *camGetMtxF1754(void) +Mtxf *cam_get_mtxf1754(void) { return g_Vars.currentplayer->mtxf1754; } -Mtxf *camGetPrevWorldToScreenMtxf(void) +Mtxf *cam_get_prev_world_to_screen_mtxf(void) { return g_Vars.currentplayer->prevworldtoscreenmtx; } -void camSetMtxF1748(Mtxf *mtx) +void cam_set_mtxf1748(Mtxf *mtx) { g_Vars.currentplayer->mtxf1748 = mtx; } -Mtxf *camGetMtxF1748(void) +Mtxf *cam_get_mtxf1748(void) { return g_Vars.currentplayer->mtxf1748; } -void camSetProjectionMtxF(Mtxf *mtx) +void cam_set_projection_mtxf(Mtxf *mtx) { struct player *player = g_Vars.currentplayer; @@ -351,62 +351,62 @@ void camSetProjectionMtxF(Mtxf *mtx) player->projectionmtx = mtx; } -Mtxf *camGetProjectionMtxF(void) +Mtxf *cam_get_projection_mtxf(void) { return g_Vars.currentplayer->projectionmtx; } -Mtxf *camGetPrevProjectionMtxF(void) +Mtxf *cam_get_prev_projection_mtxf(void) { return g_Vars.currentplayer->prevprojectionmtx; } -void camSetLookAt(LookAt *lookat) +void cam_set_look_at(LookAt *lookat) { g_Vars.currentplayer->lookat = lookat; } -LookAt *camGetLookAt(void) +LookAt *cam_get_look_at(void) { return g_Vars.currentplayer->lookat; } -f32 camGetLodScaleZ(void) +f32 cam_get_lod_scale_z(void) { return g_Vars.currentplayer->c_lodscalez; } -u32 camGetLodScaleZU32(void) +u32 cam_get_lod_scale_z_u32(void) { return g_Vars.currentplayer->c_lodscalezu32; } -f32 camGetScreenWidth(void) +f32 cam_get_screen_width(void) { return g_Vars.currentplayer->c_screenwidth; } -f32 camGetScreenHeight(void) +f32 cam_get_screen_height(void) { return g_Vars.currentplayer->c_screenheight; } -f32 camGetScreenLeft(void) +f32 cam_get_screen_left(void) { return g_Vars.currentplayer->c_screenleft; } -f32 camGetScreenTop(void) +f32 cam_get_screen_top(void) { return g_Vars.currentplayer->c_screentop; } -f32 camGetPerspFovY(void) +f32 cam_get_persp_fov_y(void) { return g_Vars.currentplayer->c_perspfovy; } -f32 camGetPerspAspect(void) +f32 cam_get_persp_aspect(void) { return g_Vars.currentplayer->c_perspaspect; } @@ -494,7 +494,7 @@ bool cam0f0b5b9c(struct coord *arg0, f32 arg1) return true; } -bool camIsPosInScreenBox(struct coord *pos, f32 arg1, struct drawslot *drawslot) +bool cam_is_pos_in_screen_box(struct coord *pos, f32 arg1, struct drawslot *drawslot) { struct coord sp74; f32 sp70; @@ -585,16 +585,16 @@ bool camIsPosInScreenBox(struct coord *pos, f32 arg1, struct drawslot *drawslot) /** * This function is building a drawslot on the stack so it can pass it to - * camIsPosInScreenBox, however if we allocate this struct then it uses too much + * cam_is_pos_in_screen_box, however if we allocate this struct then it uses too much * stack and creates a mismatch. * * We resolve this by allocating a screenbox instead, which is a substruct of * drawslot and is all we need in this function. screenbox isn't at the * start of drawslot though, so we use a negative array index to pass the - * correct address to camIsPosInScreenBox so it can interpret the pointer as a + * correct address to cam_is_pos_in_screen_box so it can interpret the pointer as a * drawslot. */ -bool camIsPosInFovAndVisibleRoom(RoomNum *rooms, struct coord *pos, f32 arg2) +bool cam_is_pos_in_fov_and_visible_room(RoomNum *rooms, struct coord *pos, f32 arg2) { s32 i; RoomNum room; @@ -604,7 +604,7 @@ bool camIsPosInFovAndVisibleRoom(RoomNum *rooms, struct coord *pos, f32 arg2) for (i = 0, room = rooms[i]; room != -1; i++, room = rooms[i]) { if (g_Rooms[room].flags & ROOMFLAG_ONSCREEN) { - thisthing = bgGetRoomDrawSlot(room); + thisthing = bg_get_room_draw_slot(room); if (hasdata == false) { box.xmin = thisthing->box.xmin; @@ -637,5 +637,5 @@ bool camIsPosInFovAndVisibleRoom(RoomNum *rooms, struct coord *pos, f32 arg2) return false; } - return camIsPosInScreenBox(pos, arg2, (struct drawslot *) &(((u8 *) &box)[-((uintptr_t) &(((struct drawslot *)0)->box))])); + return cam_is_pos_in_screen_box(pos, arg2, (struct drawslot *) &(((u8 *) &box)[-((uintptr_t) &(((struct drawslot *)0)->box))])); } diff --git a/src/game/casingreset.c b/src/game/casingreset.c index 237b2acec..430134a51 100644 --- a/src/game/casingreset.c +++ b/src/game/casingreset.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void casingsReset(void) +void casings_reset(void) { s32 i; struct casing *end; diff --git a/src/game/casingtick.c b/src/game/casingtick.c index a70eb036c..71b5d85d4 100644 --- a/src/game/casingtick.c +++ b/src/game/casingtick.c @@ -10,7 +10,7 @@ #include "data.h" #include "types.h" -void casingTick(struct casing *casing) +void casing_tick(struct casing *casing) { f32 tmp; f32 tmp2; @@ -45,7 +45,7 @@ void casingTick(struct casing *casing) sp58 = RANDOMFRAC() * 0.25f + 0.98f; var8009d0d8 = TICKS(20); - sndStart(var80095200, SFX_8051, &g_CasingAudioHandles[i], -1, -1, -1.0f, -1, -1); + snd_start(var80095200, SFX_8051, &g_CasingAudioHandles[i], -1, -1, -1.0f, -1, -1); if (g_CasingAudioHandles[i]) { audioPostEvent(g_CasingAudioHandles[i], AL_SNDP_PITCH_EVT, *(s32 *)&sp58); @@ -78,7 +78,7 @@ void casingTick(struct casing *casing) } } -void casingsTick(void) +void casings_tick(void) { s32 i; struct casing *end; @@ -100,7 +100,7 @@ void casingsTick(void) while (casing < end) { if (casing->modeldef) { - casingTick(casing); + casing_tick(casing); if (!g_CasingsActive) { g_CasingsActive = true; diff --git a/src/game/challenge.c b/src/game/challenge.c index 7a1481f5d..250bd9884 100644 --- a/src/game/challenge.c +++ b/src/game/challenge.c @@ -59,12 +59,12 @@ struct challenge g_MpChallenges[] = { { L_OPTIONS_435, MPCONFIG_CHALLENGE30 }, // "Challenge 30" }; -bool challengeIsAvailable(s32 challengeindex) +bool challenge_is_available(s32 challengeindex) { return (g_MpChallenges[challengeindex].availability & 1) != 0; } -bool challengeIsAvailableToPlayer(s32 chrnum, s32 challengeindex) +bool challenge_is_available_to_player(s32 chrnum, s32 challengeindex) { if ((g_MpSetup.chrslots & (1 << chrnum)) == 0) { return 0; @@ -73,12 +73,12 @@ bool challengeIsAvailableToPlayer(s32 chrnum, s32 challengeindex) return ((g_MpChallenges[challengeindex].availability & (2 << chrnum)) != 0); } -bool challengeIsAvailableToAnyPlayer(s32 challengeindex) +bool challenge_is_available_to_any_player(s32 challengeindex) { return (g_MpChallenges[challengeindex].availability & (((g_MpSetup.chrslots & 0xf) << 1) | 1)) != 0; } -void challengeDetermineUnlockedFeatures(void) +void challenge_determine_unlocked_features(void) { s32 challengeindex; s32 numgifted; // number of unlocked but not completed challenges @@ -99,10 +99,10 @@ void challengeDetermineUnlockedFeatures(void) for (challengeindex = 0; challengeindex < ARRAYCOUNT(g_MpChallenges); challengeindex++) { flag = 0; - if (challengeIsCompletedByAnyPlayerWithNumPlayers(challengeindex, 1) - || challengeIsCompletedByAnyPlayerWithNumPlayers(challengeindex, 2) - || challengeIsCompletedByAnyPlayerWithNumPlayers(challengeindex, 3) - || challengeIsCompletedByAnyPlayerWithNumPlayers(challengeindex, 4)) { + if (challenge_is_completed_by_any_player_with_num_players(challengeindex, 1) + || challenge_is_completed_by_any_player_with_num_players(challengeindex, 2) + || challenge_is_completed_by_any_player_with_num_players(challengeindex, 3) + || challenge_is_completed_by_any_player_with_num_players(challengeindex, 4)) { // Completed challenge flag = 1; } else if (challengeindex < 4) { @@ -110,16 +110,16 @@ void challengeDetermineUnlockedFeatures(void) flag = 1; numgifted++; } else if (challengeindex > 0 - && (challengeIsCompletedByAnyPlayerWithNumPlayers(challengeindex - 1, 1) - || challengeIsCompletedByAnyPlayerWithNumPlayers(challengeindex - 1, 2) - || challengeIsCompletedByAnyPlayerWithNumPlayers(challengeindex - 1, 3) - || challengeIsCompletedByAnyPlayerWithNumPlayers(challengeindex - 1, 4))) { + && (challenge_is_completed_by_any_player_with_num_players(challengeindex - 1, 1) + || challenge_is_completed_by_any_player_with_num_players(challengeindex - 1, 2) + || challenge_is_completed_by_any_player_with_num_players(challengeindex - 1, 3) + || challenge_is_completed_by_any_player_with_num_players(challengeindex - 1, 4))) { // Challenges are available if their previous one is complete flag = 1; numgifted++; } #ifdef DEBUG - else if (debugIsAllChallengesEnabled()) { + else if (debug_is_all_challenges_enabled()) { flag = 1; } #endif @@ -142,10 +142,10 @@ void challengeDetermineUnlockedFeatures(void) for (challengeindex = 0; challengeindex < ARRAYCOUNT(g_MpChallenges); challengeindex++) { flag = 0; - if (challengeIsCompletedByPlayerWithNumPlayers(j, challengeindex, 1) - || challengeIsCompletedByPlayerWithNumPlayers(j, challengeindex, 2) - || challengeIsCompletedByPlayerWithNumPlayers(j, challengeindex, 3) - || challengeIsCompletedByPlayerWithNumPlayers(j, challengeindex, 4)) { + if (challenge_is_completed_by_player_with_num_players(j, challengeindex, 1) + || challenge_is_completed_by_player_with_num_players(j, challengeindex, 2) + || challenge_is_completed_by_player_with_num_players(j, challengeindex, 3) + || challenge_is_completed_by_player_with_num_players(j, challengeindex, 4)) { // Completed challenge flag = 2 << j; } else if (challengeindex < 4) { @@ -156,10 +156,10 @@ void challengeDetermineUnlockedFeatures(void) // Challenges are available if their previous one is complete prev = challengeindex - 1; - if (challengeIsCompletedByPlayerWithNumPlayers(j, prev, 1) - || challengeIsCompletedByPlayerWithNumPlayers(j, prev, 2) - || challengeIsCompletedByPlayerWithNumPlayers(j, prev, 3) - || challengeIsCompletedByPlayerWithNumPlayers(j, prev, 4)) { + if (challenge_is_completed_by_player_with_num_players(j, prev, 1) + || challenge_is_completed_by_player_with_num_players(j, prev, 2) + || challenge_is_completed_by_player_with_num_players(j, prev, 3) + || challenge_is_completed_by_player_with_num_players(j, prev, 4)) { flag = 2 << j; numgifted++; } @@ -181,7 +181,7 @@ void challengeDetermineUnlockedFeatures(void) flag = 0; for (challengeindex = 0; challengeindex < ARRAYCOUNT(g_MpChallenges); challengeindex++) { - if (challengeIsAvailableToAnyPlayer(challengeindex)) { + if (challenge_is_available_to_any_player(challengeindex)) { for (i = 0; i < ARRAYCOUNT(g_MpChallenges[challengeindex].unlockfeatures); i++) { if (g_MpChallenges[challengeindex].unlockfeatures[i] == j) { flag |= 1; @@ -198,7 +198,7 @@ void challengeDetermineUnlockedFeatures(void) for (challengeindex = 0; challengeindex < ARRAYCOUNT(g_MpChallenges); challengeindex++) { for (prev = 0; prev < MAX_PLAYERS; prev++) { - if (challengeIsAvailableToPlayer(prev, challengeindex)) { + if (challenge_is_available_to_player(prev, challengeindex)) { for (i = 0; i < ARRAYCOUNT(g_MpChallenges[challengeindex].unlockfeatures); i++) { if (g_MpChallenges[challengeindex].unlockfeatures[i] == j) { flag |= 2 << prev; @@ -222,10 +222,10 @@ void challengeDetermineUnlockedFeatures(void) func0f1895e8(); // If the ability to have 8 simulants hasn't been unlocked, limit them to 4 - if (!challengeIsFeatureUnlocked(MPFEATURE_8BOTS)) { + if (!challenge_is_feature_unlocked(MPFEATURE_8BOTS)) { for (k = 4; k < MAX_BOTS; k++) { if (g_MpSetup.chrslots & (1 << (MAX_PLAYERS + k))) { - mpRemoveSimulant(k); + mp_remove_simulant(k); } } @@ -235,7 +235,7 @@ void challengeDetermineUnlockedFeatures(void) } } -void challengePerformSanityChecks(void) +void challenge_perform_sanity_checks(void) { if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) { s32 numplayers = 0; @@ -264,19 +264,19 @@ void challengePerformSanityChecks(void) if (g_MpSetup.scenario == MPSCENARIO_KINGOFTHEHILL) { g_Vars.mphilltime = 10; } - } else if (!challengeIsFeatureUnlocked(MPFEATURE_8BOTS)) { + } else if (!challenge_is_feature_unlocked(MPFEATURE_8BOTS)) { // Limit to 4 players and 4 simulants g_MpSetup.chrslots &= 0x00ff; } } -s32 challengeGetNumAvailable(void) +s32 challenge_get_num_available(void) { s32 challengeindex; s32 count = 0; for (challengeindex = 0; challengeindex < ARRAYCOUNT(g_MpChallenges); challengeindex++) { - if (challengeIsAvailableToAnyPlayer(challengeindex)) { + if (challenge_is_available_to_any_player(challengeindex)) { count++; } } @@ -284,20 +284,20 @@ s32 challengeGetNumAvailable(void) return count; } -char *challengeGetName(s32 challengeindex) +char *challenge_get_name(s32 challengeindex) { - return langGet(g_MpChallenges[challengeindex].name); + return lang_get(g_MpChallenges[challengeindex].name); } -char *challengeGetNameBySlot(s32 slot) +char *challenge_get_name_by_slot(s32 slot) { s32 index = 0; s32 i; for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { - if (challengeIsAvailableToAnyPlayer(i)) { + if (challenge_is_available_to_any_player(i)) { if (index == slot) { - return challengeGetName(i); + return challenge_get_name(i); } index++; @@ -307,13 +307,13 @@ char *challengeGetNameBySlot(s32 slot) return ""; } -void challengeSetCurrentBySlot(s32 slotnum) +void challenge_set_current_by_slot(s32 slotnum) { s32 challengeindex; g_MpChallengeIndex = 0; for (challengeindex = 0; challengeindex < ARRAYCOUNT(g_MpChallenges); challengeindex++) { - if (challengeIsAvailableToAnyPlayer(challengeindex)) { + if (challenge_is_available_to_any_player(challengeindex)) { if (slotnum == 0) { g_MpChallengeIndex = challengeindex; break; @@ -323,23 +323,23 @@ void challengeSetCurrentBySlot(s32 slotnum) } } - challengeApply(); + challenge_apply(); } -s32 challengeGetCurrent(void) +s32 challenge_get_current(void) { return g_MpChallengeIndex; } -bool challengeIsCompletedByAnyChrWithNumPlayersBySlot(s32 slot, s32 numplayers) +bool challenge_is_completed_by_any_chr_with_num_players_by_slot(s32 slot, s32 numplayers) { s32 availableindex = 0; s32 i; for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { - if (challengeIsAvailableToAnyPlayer(i)) { + if (challenge_is_available_to_any_player(i)) { if (availableindex == slot) { - return challengeIsCompletedByAnyPlayerWithNumPlayers(i, numplayers); + return challenge_is_completed_by_any_player_with_num_players(i, numplayers); } availableindex++; @@ -349,15 +349,15 @@ bool challengeIsCompletedByAnyChrWithNumPlayersBySlot(s32 slot, s32 numplayers) return false; } -bool challengeIsCompletedByChrWithNumPlayersBySlot(s32 mpchrnum, s32 slot, s32 numplayers) +bool challenge_is_completed_by_chr_with_num_players_by_slot(s32 mpchrnum, s32 slot, s32 numplayers) { s32 availableindex = 0; s32 i; for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { - if (challengeIsAvailableToAnyPlayer(i)) { + if (challenge_is_available_to_any_player(i)) { if (availableindex == slot) { - return challengeIsCompletedByPlayerWithNumPlayers(mpchrnum, i, numplayers); + return challenge_is_completed_by_player_with_num_players(mpchrnum, i, numplayers); } availableindex++; @@ -367,13 +367,13 @@ bool challengeIsCompletedByChrWithNumPlayersBySlot(s32 mpchrnum, s32 slot, s32 n return false; } -struct mpconfigfull *challengeLoadConfig(s32 confignum, u8 *buffer, s32 len) +struct mpconfigfull *challenge_load_config(s32 confignum, u8 *buffer, s32 len) { struct mpconfigfull *mpconfig; u8 buffer2[sizeof(struct mpstrings) + 40]; struct mpstrings *loadedstrings; s32 bank; - u32 language_id = langGetFileNumOffset(); + u32 language_id = lang_get_file_num_offset(); extern struct mpconfig _mpconfigsSegmentRomStart[]; extern struct mpstrings _mpstringsESegmentRomStart; extern struct mpstrings _mpstringsJSegmentRomStart; @@ -401,31 +401,31 @@ struct mpconfigfull *challengeLoadConfig(s32 confignum, u8 *buffer, s32 len) }; // Load mpconfigs - mpconfig = dmaExecWithAutoAlign(buffer, (s32)&_mpconfigsSegmentRomStart[confignum], sizeof(struct mpconfig)); + mpconfig = dma_exec_with_auto_align(buffer, (s32)&_mpconfigsSegmentRomStart[confignum], sizeof(struct mpconfig)); // Load mpstrings bank = banks[language_id][0]; - loadedstrings = dmaExecWithAutoAlign(buffer2, bank + confignum * sizeof(struct mpstrings), sizeof(struct mpstrings)); + loadedstrings = dma_exec_with_auto_align(buffer2, bank + confignum * sizeof(struct mpstrings), sizeof(struct mpstrings)); mpconfig->strings = *loadedstrings; return mpconfig; } -struct mpconfigfull *challengeLoad(s32 challengeindex, u8 *buffer, s32 len) +struct mpconfigfull *challenge_load(s32 challengeindex, u8 *buffer, s32 len) { - return challengeLoadConfig(g_MpChallenges[challengeindex].confignum, buffer, len); + return challenge_load_config(g_MpChallenges[challengeindex].confignum, buffer, len); } -struct mpconfigfull *challengeLoadBySlot(s32 n, u8 *buffer, s32 len) +struct mpconfigfull *challenge_load_by_slot(s32 n, u8 *buffer, s32 len) { s32 numavailable = 0; s32 challengeindex; for (challengeindex = 0; challengeindex < ARRAYCOUNT(g_MpChallenges); challengeindex++) { - if (challengeIsAvailableToAnyPlayer(challengeindex)) { + if (challenge_is_available_to_any_player(challengeindex)) { if (numavailable == n) { - return challengeLoad(challengeindex, buffer, len); + return challenge_load(challengeindex, buffer, len); } numavailable++; @@ -435,15 +435,15 @@ struct mpconfigfull *challengeLoadBySlot(s32 n, u8 *buffer, s32 len) return 0; } -struct mpconfigfull *challengeLoadCurrent(u8 *buffer, s32 len) +struct mpconfigfull *challenge_load_current(u8 *buffer, s32 len) { - return challengeLoad(g_MpChallengeIndex, buffer, len); + return challenge_load(g_MpChallengeIndex, buffer, len); } /** * This is adding featurenum to the array, provided it's unique. */ -s32 challengeForceUnlockFeature(s32 featurenum, u8 *array, s32 tail, s32 len) +s32 challenge_force_unlock_feature(s32 featurenum, u8 *array, s32 tail, s32 len) { s32 i; @@ -461,7 +461,7 @@ s32 challengeForceUnlockFeature(s32 featurenum, u8 *array, s32 tail, s32 len) return tail; } -s32 challengeForceUnlockSetupFeatures(struct mpsetup *setup, u8 *array, s32 len) +s32 challenge_force_unlock_setup_features(struct mpsetup *setup, u8 *array, s32 len) { s32 index = 0; s32 i; @@ -471,17 +471,17 @@ s32 challengeForceUnlockSetupFeatures(struct mpsetup *setup, u8 *array, s32 len) s32 featurenum = g_MpWeapons[setup->weapons[i]].unlockfeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, array, index, len); + index = challenge_force_unlock_feature(featurenum, array, index, len); } } // Force unlock the stage - for (i = 0; i < mpGetNumStages(); i++) { + for (i = 0; i < mp_get_num_stages(); i++) { if (g_MpArenas[i].stagenum == setup->stagenum) { s32 featurenum = g_MpArenas[i].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, array, index, len); + index = challenge_force_unlock_feature(featurenum, array, index, len); } } } @@ -491,48 +491,48 @@ s32 challengeForceUnlockSetupFeatures(struct mpsetup *setup, u8 *array, s32 len) s32 featurenum = g_MpScenarioOverviews[setup->scenario].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, array, index, len); + index = challenge_force_unlock_feature(featurenum, array, index, len); } } // Force unlock the scenario options if (setup->options & MPOPTION_ONEHITKILLS) { - index = challengeForceUnlockFeature(MPFEATURE_ONEHITKILLS, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_ONEHITKILLS, array, index, len); } if (setup->options & (MPOPTION_SLOWMOTION_ON | MPOPTION_SLOWMOTION_SMART)) { - index = challengeForceUnlockFeature(MPFEATURE_SLOWMOTION, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_SLOWMOTION, array, index, len); } return index; } -void challengeForceUnlockConfigFeatures(struct mpconfig *config, u8 *array, s32 len, s32 challengeindex) +void challenge_force_unlock_config_features(struct mpconfig *config, u8 *array, s32 len, s32 challengeindex) { - s32 index = challengeForceUnlockSetupFeatures(&config->setup, array, len); + s32 index = challenge_force_unlock_setup_features(&config->setup, array, len); s32 featurenum; s32 numplayers; s32 i; for (i = 0; i < MAX_BOTS; i++) { - s32 simtype = mpFindBotProfile(config->simulants[i].type, BOTDIFF_NORMAL); + s32 simtype = mp_find_bot_profile(config->simulants[i].type, BOTDIFF_NORMAL); if (simtype >= 0) { featurenum = g_BotProfiles[simtype].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, array, index, len); + index = challenge_force_unlock_feature(featurenum, array, index, len); } } for (numplayers = 0; numplayers < MAX_PLAYERS; numplayers++) { - simtype = mpFindBotProfile(0, config->simulants[i].difficulties[numplayers]); + simtype = mp_find_bot_profile(0, config->simulants[i].difficulties[numplayers]); if (simtype >= 0) { featurenum = g_BotProfiles[simtype].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, array, index, len); + index = challenge_force_unlock_feature(featurenum, array, index, len); } } } @@ -541,7 +541,7 @@ void challengeForceUnlockConfigFeatures(struct mpconfig *config, u8 *array, s32 featurenum = g_MpBodies[config->simulants[i].mpbodynum].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, array, index, len); + index = challenge_force_unlock_feature(featurenum, array, index, len); } } @@ -549,34 +549,34 @@ void challengeForceUnlockConfigFeatures(struct mpconfig *config, u8 *array, s32 featurenum = g_MpHeads[config->simulants[i].mpheadnum].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, array, index, len); + index = challenge_force_unlock_feature(featurenum, array, index, len); } } } #if VERSION >= VERSION_NTSC_1_0 if (challengeindex >= 25) { - index = challengeForceUnlockFeature(MPFEATURE_BOTDIFF_DARK, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_BOTDIFF_DARK, array, index, len); } else if (challengeindex >= 20) { - index = challengeForceUnlockFeature(MPFEATURE_STAGE_CARPARK, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_STAGE_CARPARK, array, index, len); } else if (challengeindex >= 15) { - index = challengeForceUnlockFeature(MPFEATURE_SCENARIO_PAC, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_SCENARIO_PAC, array, index, len); } if (challengeindex >= 10) { - index = challengeForceUnlockFeature(MPFEATURE_8BOTS, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_8BOTS, array, index, len); } #else if (challengeindex >= 10) { - index = challengeForceUnlockFeature(MPFEATURE_8BOTS, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_8BOTS, array, index, len); } if (challengeindex >= 15) { - index = challengeForceUnlockFeature(MPFEATURE_SCENARIO_PAC, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_SCENARIO_PAC, array, index, len); } if (challengeindex >= 20) { - index = challengeForceUnlockFeature(MPFEATURE_STAGE_CARPARK, array, index, len); + index = challenge_force_unlock_feature(MPFEATURE_STAGE_CARPARK, array, index, len); } #endif @@ -586,32 +586,32 @@ void challengeForceUnlockConfigFeatures(struct mpconfig *config, u8 *array, s32 } } -void challengeForceUnlockBotFeatures(void) +void challenge_force_unlock_bot_features(void) { s32 numsims = 0; - s32 index = challengeForceUnlockSetupFeatures(&g_MpSetup, g_MpFeaturesForceUnlocked, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); + s32 index = challenge_force_unlock_setup_features(&g_MpSetup, g_MpFeaturesForceUnlocked, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); s32 i; for (i = 0; i < ARRAYCOUNT(g_BotConfigsArray); i++) { // Force unlock the simulant type - s32 simtypeindex = mpFindBotProfile(g_BotConfigsArray[i].type, BOTDIFF_NORMAL); + s32 simtypeindex = mp_find_bot_profile(g_BotConfigsArray[i].type, BOTDIFF_NORMAL); if (simtypeindex >= 0) { s32 featurenum = g_BotProfiles[simtypeindex].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); + index = challenge_force_unlock_feature(featurenum, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); } } // Force unlock the simulant difficulty - simtypeindex = mpFindBotProfile(BOTTYPE_GENERAL, g_BotConfigsArray[i].difficulty); + simtypeindex = mp_find_bot_profile(BOTTYPE_GENERAL, g_BotConfigsArray[i].difficulty); if (simtypeindex >= 0) { s32 featurenum = g_BotProfiles[simtypeindex].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); + index = challenge_force_unlock_feature(featurenum, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); } } @@ -624,7 +624,7 @@ void challengeForceUnlockBotFeatures(void) s32 featurenum = g_MpBodies[g_BotConfigsArray[i].base.mpbodynum].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); + index = challenge_force_unlock_feature(featurenum, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); } } @@ -633,14 +633,14 @@ void challengeForceUnlockBotFeatures(void) s32 featurenum = g_MpHeads[g_BotConfigsArray[i].base.mpheadnum].requirefeature; if (featurenum) { - index = challengeForceUnlockFeature(featurenum, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); + index = challenge_force_unlock_feature(featurenum, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); } } } // Force unlock 8 simulants if (numsims > 4) { - index = challengeForceUnlockFeature(MPFEATURE_8BOTS, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); + index = challenge_force_unlock_feature(MPFEATURE_8BOTS, g_MpFeaturesForceUnlocked, index, ARRAYCOUNT(g_MpFeaturesForceUnlocked)); } // Clear the remainder of the array @@ -648,10 +648,10 @@ void challengeForceUnlockBotFeatures(void) g_MpFeaturesForceUnlocked[i] = 0; } - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); } -void challengeRemoveForceUnlocks(void) +void challenge_remove_force_unlocks(void) { s32 i; @@ -659,43 +659,43 @@ void challengeRemoveForceUnlocks(void) g_MpFeaturesForceUnlocked[i] = 0; } - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); } -void challengeApply(void) +void challenge_apply(void) { s32 i; u8 buffer[0x1ca]; - mpApplyConfig(challengeLoadCurrent(buffer, 0x1ca)); - mpSetLock(MPLOCKTYPE_CHALLENGE, 5); + mp_apply_config(challenge_load_current(buffer, 0x1ca)); + mp_set_lock(MPLOCKTYPE_CHALLENGE, 5); for (i = 0; i < MAX_PLAYERS; i++) { g_PlayerConfigsArray[i].base.team = 0; } } -s32 challengeRemovePlayerLock(void) +s32 challenge_remove_player_lock(void) { - return mpSetLock(MPLOCKTYPE_NONE, 0); + return mp_set_lock(MPLOCKTYPE_NONE, 0); } -void challengeLoadAndStoreCurrent(u8 *buffer, s32 len) +void challenge_load_and_store_current(u8 *buffer, s32 len) { - g_MpCurrentChallengeConfig = challengeLoadCurrent(buffer, len); + g_MpCurrentChallengeConfig = challenge_load_current(buffer, len); } -void challengeUnsetCurrent(void) +void challenge_unset_current(void) { g_MpCurrentChallengeConfig = NULL; } -bool challengeIsLoaded(void) +bool challenge_is_loaded(void) { return g_MpCurrentChallengeConfig != NULL; } -char *challengeGetCurrentDescription(void) +char *challenge_get_current_description(void) { if (g_MpCurrentChallengeConfig) { return g_MpCurrentChallengeConfig->strings.description; @@ -704,7 +704,7 @@ char *challengeGetCurrentDescription(void) return ""; } -char *challengeGetConfigDescription(struct mpconfigfull *mpconfig) +char *challenge_get_config_description(struct mpconfigfull *mpconfig) { if (mpconfig) { return mpconfig->strings.description; @@ -717,16 +717,16 @@ char *challengeGetConfigDescription(struct mpconfigfull *mpconfig) * Return the index of the first incomplete challenge, but if it's in the first * 4 then return index 4 because the first 4 are always shown. */ -s32 challengeGetAutoFocusedIndex(s32 mpchrnum) +s32 challenge_get_auto_focused_index(s32 mpchrnum) { s32 challengeindex; s32 index = 0; for (challengeindex = ARRAYCOUNT(g_MpChallenges) - 1; challengeindex >= 0; challengeindex--) { - if (challengeIsCompletedByPlayerWithNumPlayers(mpchrnum, challengeindex, 1) || - challengeIsCompletedByPlayerWithNumPlayers(mpchrnum, challengeindex, 2) || - challengeIsCompletedByPlayerWithNumPlayers(mpchrnum, challengeindex, 3) || - challengeIsCompletedByPlayerWithNumPlayers(mpchrnum, challengeindex, 4)) { + if (challenge_is_completed_by_player_with_num_players(mpchrnum, challengeindex, 1) || + challenge_is_completed_by_player_with_num_players(mpchrnum, challengeindex, 2) || + challenge_is_completed_by_player_with_num_players(mpchrnum, challengeindex, 3) || + challenge_is_completed_by_player_with_num_players(mpchrnum, challengeindex, 4)) { index = challengeindex + 1; break; } @@ -739,22 +739,22 @@ s32 challengeGetAutoFocusedIndex(s32 mpchrnum) return index; } -char *challengeGetName2(s32 playernum, s32 challengeindex) +char *challenge_get_name2(s32 playernum, s32 challengeindex) { - return langGet(g_MpChallenges[challengeindex].name); + return lang_get(g_MpChallenges[challengeindex].name); } -bool challengeIsCompletedByPlayerWithNumPlayers2(s32 mpchrnum, s32 index, s32 numplayers) +bool challenge_is_completed_by_player_with_num_players2(s32 mpchrnum, s32 index, s32 numplayers) { - return challengeIsCompletedByPlayerWithNumPlayers(mpchrnum, index, numplayers); + return challenge_is_completed_by_player_with_num_players(mpchrnum, index, numplayers); } -bool challengeIsCompletedByAnyPlayerWithNumPlayers(s32 index, s32 numplayers) +bool challenge_is_completed_by_any_player_with_num_players(s32 index, s32 numplayers) { return (g_MpChallenges[index].completions[numplayers - 1] & 1) != 0; } -void challengeSetCompletedByAnyPlayerWithNumPlayers(s32 index, s32 numplayers, bool completed) +void challenge_set_completed_by_any_player_with_num_players(s32 index, s32 numplayers, bool completed) { if (completed) { g_MpChallenges[index].completions[numplayers - 1] |= 1; @@ -764,12 +764,12 @@ void challengeSetCompletedByAnyPlayerWithNumPlayers(s32 index, s32 numplayers, b g_MpChallenges[index].completions[numplayers - 1] &= ~1; } -bool challengeIsCompletedByPlayerWithNumPlayers(s32 mpchrnum, s32 index, s32 numplayers) +bool challenge_is_completed_by_player_with_num_players(s32 mpchrnum, s32 index, s32 numplayers) { return (g_MpChallenges[index].completions[numplayers - 1] & (2 << mpchrnum)) != 0; } -void challengeSetCompletedByPlayerWithNumPlayers(u32 mpchrnum, s32 index, s32 numplayers, bool completed) +void challenge_set_completed_by_player_with_num_players(u32 mpchrnum, s32 index, s32 numplayers, bool completed) { if (completed) { g_MpChallenges[index].completions[numplayers - 1] |= 2 << mpchrnum; @@ -779,7 +779,7 @@ void challengeSetCompletedByPlayerWithNumPlayers(u32 mpchrnum, s32 index, s32 nu g_MpChallenges[index].completions[numplayers - 1] &= ~(2 << mpchrnum); } -bool challengeIsCompleteForEndscreen(void) +bool challenge_is_complete_for_endscreen(void) { s32 prevplayernum = g_Vars.currentplayernum; s32 result = false; @@ -788,18 +788,18 @@ bool challengeIsCompleteForEndscreen(void) u32 stack; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); if (g_Vars.currentplayer->aborted) { aborted = true; } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); if (!aborted) { struct ranking rankings[MAX_MPCHRS]; - mpGetTeamRankings(rankings); + mp_get_team_rankings(rankings); if (rankings[0].teamnum == 0) { result = true; @@ -809,12 +809,12 @@ bool challengeIsCompleteForEndscreen(void) return result; } -void challengeConsiderMarkingComplete(void) +void challenge_consider_marking_complete(void) { - bool result = challengeIsCompleteForEndscreen(); + bool result = challenge_is_complete_for_endscreen(); #if VERSION >= VERSION_NTSC_1_0 && defined(DEBUG) - if ((g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0) && (result || debugIsSetCompleteEnabled())) + if ((g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0) && (result || debug_is_set_complete_enabled())) #elif VERSION >= VERSION_NTSC_1_0 if (g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0 && result) #else @@ -824,20 +824,20 @@ void challengeConsiderMarkingComplete(void) u32 prevplayernum; s32 i; - challengeSetCompletedByAnyPlayerWithNumPlayers(g_MpChallengeIndex, PLAYERCOUNT(), 1); + challenge_set_completed_by_any_player_with_num_players(g_MpChallengeIndex, PLAYERCOUNT(), 1); prevplayernum = g_Vars.currentplayernum; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); - challengeSetCompletedByPlayerWithNumPlayers(g_Vars.currentplayerstats->mpindex, g_MpChallengeIndex, PLAYERCOUNT(), true); + set_current_player_num(i); + challenge_set_completed_by_player_with_num_players(g_Vars.currentplayerstats->mpindex, g_MpChallengeIndex, PLAYERCOUNT(), true); } - setCurrentPlayerNum(prevplayernum); - challengeDetermineUnlockedFeatures(); + set_current_player_num(prevplayernum); + challenge_determine_unlocked_features(); } } -bool challengeIsFeatureUnlocked(s32 featurenum) +bool challenge_is_feature_unlocked(s32 featurenum) { if (featurenum == 0) { return true; @@ -846,7 +846,7 @@ bool challengeIsFeatureUnlocked(s32 featurenum) return (g_MpFeaturesUnlocked[featurenum] & 1) != 0; } -bool challengeIsFeatureUnlockedByPlayer(u32 numplayers, s32 featurenum) +bool challenge_is_feature_unlocked_by_player(u32 numplayers, s32 featurenum) { if (featurenum == 0) { return true; @@ -855,7 +855,7 @@ bool challengeIsFeatureUnlockedByPlayer(u32 numplayers, s32 featurenum) return (g_MpFeaturesUnlocked[featurenum] & (2 << numplayers)) != 0; } -bool challengeIsFeatureUnlockedByDefault(s32 featurenum) +bool challenge_is_feature_unlocked_by_default(s32 featurenum) { if (featurenum) { return false; diff --git a/src/game/challengeinit.c b/src/game/challengeinit.c index e40d6284f..ad6886f08 100644 --- a/src/game/challengeinit.c +++ b/src/game/challengeinit.c @@ -6,7 +6,7 @@ #include "data.h" #include "types.h" -void challengesInit(void) +void challenges_init(void) { struct mpconfigfull *mpconfig; u8 buffer[0x1ca]; @@ -19,14 +19,14 @@ void challengesInit(void) g_MpChallenges[i].completions[2] = 0; g_MpChallenges[i].completions[3] = 0; - mpconfig = challengeLoad(i, buffer, 0x1ca); - challengeForceUnlockConfigFeatures(&mpconfig->config, g_MpChallenges[i].unlockfeatures, 16, i); + mpconfig = challenge_load(i, buffer, 0x1ca); + challenge_force_unlock_config_features(&mpconfig->config, g_MpChallenges[i].unlockfeatures, 16, i); } - for (i = 0; i < mpGetNumPresets(); i++) { - mpconfig = challengeLoadConfig(g_MpPresets[i].confignum, buffer, 0x1ca); - challengeForceUnlockConfigFeatures(&mpconfig->config, g_MpPresets[i].requirefeatures, 16, -1); + for (i = 0; i < mp_get_num_presets(); i++) { + mpconfig = challenge_load_config(g_MpPresets[i].confignum, buffer, 0x1ca); + challenge_force_unlock_config_features(&mpconfig->config, g_MpPresets[i].requirefeatures, 16, -1); } - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); } diff --git a/src/game/cheats.c b/src/game/cheats.c index bfe910cb0..9a87cd394 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -102,13 +102,13 @@ struct cheat g_Cheats[] = { { L_MPWEAPONS_116, WEAPON_RCP45, 0, 0, CHEATFLAG_FIRINGRANGE }, // RC-P45 }; -u32 cheatIsUnlocked(s32 cheat_id) +u32 cheat_is_unlocked(s32 cheat_id) { struct cheat *cheat = &g_Cheats[cheat_id]; u32 unlocked = 0; if (cheat->flags & CHEATFLAG_FIRINGRANGE) { - if (frIsClassicWeaponUnlocked(cheat->time)) { + if (fr_is_classic_weapon_unlocked(cheat->time)) { unlocked++; } } else if (cheat->flags & CHEATFLAG_COMPLETION) { @@ -128,14 +128,14 @@ u32 cheatIsUnlocked(s32 cheat_id) } } - if ((cheat->flags & CHEATFLAG_TRANSFERPAK) && gamefileHasFlag(GAMEFILEFLAG_USED_TRANSFERPAK)) { + if ((cheat->flags & CHEATFLAG_TRANSFERPAK) && gamefile_has_flag(GAMEFILEFLAG_USED_TRANSFERPAK)) { unlocked++; } return unlocked; } -bool cheatIsActive(s32 cheat_id) +bool cheat_is_active(s32 cheat_id) { if (cheat_id < 32) { return g_CheatsActiveBank0 & (1 << cheat_id); @@ -144,7 +144,7 @@ bool cheatIsActive(s32 cheat_id) return g_CheatsActiveBank1 & (1 << (cheat_id - 32)); } -void cheatActivate(s32 cheat_id) +void cheat_activate(s32 cheat_id) { u32 prevplayernum; s32 playernum; @@ -155,11 +155,11 @@ void cheatActivate(s32 cheat_id) prevplayernum = g_Vars.currentplayernum; for (playernum = 0; playernum < PLAYERCOUNT(); playernum++) { - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); g_Vars.currentplayer->invincible = 1; } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); break; case CHEAT_ALLGUNS: // Give all guns if only one player playing @@ -167,11 +167,11 @@ void cheatActivate(s32 cheat_id) prevplayernum = g_Vars.currentplayernum; for (playernum = 0; playernum < PLAYERCOUNT(); playernum++) { - setCurrentPlayerNum(playernum); - invSetAllGuns(true); + set_current_player_num(playernum); + inv_set_all_guns(true); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } break; } @@ -183,7 +183,7 @@ void cheatActivate(s32 cheat_id) } } -void cheatDeactivate(s32 cheat_id) +void cheat_deactivate(s32 cheat_id) { u32 prevplayernum; s32 playernum; @@ -193,22 +193,22 @@ void cheatDeactivate(s32 cheat_id) prevplayernum = g_Vars.currentplayernum; for (playernum = 0; playernum < PLAYERCOUNT(); playernum++) { - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); g_Vars.currentplayer->invincible = 1; // @bug? } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); break; case CHEAT_ALLGUNS: if (PLAYERCOUNT() == 1 && g_Vars.normmplayerisrunning == false) { prevplayernum = g_Vars.currentplayernum; for (playernum = 0; playernum < PLAYERCOUNT(); playernum++) { - setCurrentPlayerNum(playernum); - invSetAllGuns(false); + set_current_player_num(playernum); + inv_set_all_guns(false); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } break; } @@ -220,7 +220,7 @@ void cheatDeactivate(s32 cheat_id) } } -void cheatsInit(void) +void cheats_init(void) { g_CheatsActiveBank0 = 0; g_CheatsActiveBank1 = 0; @@ -231,7 +231,7 @@ void cheatsInit(void) /** * Apply cheats at level startup. */ -void cheatsReset(void) +void cheats_reset(void) { s32 cheat_id; @@ -273,7 +273,7 @@ void cheatsReset(void) // Set any "always on" cheats to active and properly activate all active cheats for (cheat_id = 0; cheat_id < ARRAYCOUNT(g_Cheats); cheat_id++) { if (g_Cheats[cheat_id].flags & CHEATFLAG_ALWAYSON) { - if (cheatIsUnlocked(cheat_id)) { + if (cheat_is_unlocked(cheat_id)) { if (cheat_id < 32) { g_CheatsActiveBank0 = g_CheatsActiveBank0 | (1 << cheat_id); } else { @@ -288,13 +288,13 @@ void cheatsReset(void) } } - if (cheatIsActive(cheat_id)) { - cheatActivate(cheat_id); + if (cheat_is_active(cheat_id)) { + cheat_activate(cheat_id); } } } -MenuItemHandlerResult cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult cheat_checkbox_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -312,7 +312,7 @@ MenuItemHandlerResult cheatCheckboxMenuHandler(s32 operation, struct menuitem *i return false; case MENUOP_SET: - if (cheatIsUnlocked(item->param)) { + if (cheat_is_unlocked(item->param)) { if (item->param < 32) { // Bank 0 if (g_CheatsEnabledBank0 & (1 << item->param)) { @@ -345,7 +345,7 @@ MenuItemHandlerResult cheatCheckboxMenuHandler(s32 operation, struct menuitem *i return 0; } -MenuItemHandlerResult cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult cheat_menu_handle_buddy_checkbox(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -371,7 +371,7 @@ MenuItemHandlerResult cheatMenuHandleBuddyCheckbox(s32 operation, struct menuite (1 << CHEAT_HITANDRUN) | (1 << CHEAT_ALIEN) ); - } else if (cheatIsUnlocked(item->param)) { + } else if (cheat_is_unlocked(item->param)) { // Not Velvet g_CheatsEnabledBank0 = g_CheatsEnabledBank0 & ~( (1 << CHEAT_PUGILIST) | @@ -386,22 +386,22 @@ MenuItemHandlerResult cheatMenuHandleBuddyCheckbox(s32 operation, struct menuite return 0; } -char *cheatGetNameIfUnlocked(struct menuitem *item) +char *cheat_get_name_if_unlocked(struct menuitem *item) { - if (cheatIsUnlocked(item->param)) { - return langGet(g_Cheats[item->param].nametextid); + if (cheat_is_unlocked(item->param)) { + return lang_get(g_Cheats[item->param].nametextid); } - return langGet(L_MPWEAPONS_074); // "----------" + return lang_get(L_MPWEAPONS_074); // "----------" } -MenuDialogHandlerResult cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult cheat_menu_handle_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { func0f14a52c(); - if (gbpakIsAnyPerfectDark()) { - gamefileSetFlag(GAMEFILEFLAG_USED_TRANSFERPAK); + if (gbpak_is_any_perfect_dark()) { + gamefile_set_flag(GAMEFILEFLAG_USED_TRANSFERPAK); } #if PIRACYCHECKS @@ -430,8 +430,8 @@ MenuDialogHandlerResult cheatMenuHandleDialog(s32 operation, struct menudialogde } if (operation == MENUOP_CLOSE) { - if (gbpakIsAnyPerfectDark()) { - gamefileSetFlag(GAMEFILEFLAG_USED_TRANSFERPAK); + if (gbpak_is_any_perfect_dark()) { + gamefile_set_flag(GAMEFILEFLAG_USED_TRANSFERPAK); } func0f14a560(); @@ -485,7 +485,7 @@ struct menudialogdef g_CheatsWarningMenuDialog = { * * JPN final removes the colon characters from the format strings. */ -char *cheatGetMarquee(struct menuitem *arg0) +char *cheat_get_marquee(struct menuitem *arg0) { u32 cheat_id; char *ptr; @@ -505,16 +505,16 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog && g_Menus[g_MpPlayerNum].curdialog->focuseditem == &g_CheatsBuddiesMenuItems[0]) { // Velvet - sprintf(g_CheatMarqueeString, "%s %s", langGet(L_MPWEAPONS_143), langGet(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" - } else if (cheatIsUnlocked(cheat_id)) { + sprintf(g_CheatMarqueeString, "%s %s", lang_get(L_MPWEAPONS_143), lang_get(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" + } else if (cheat_is_unlocked(cheat_id)) { // Show cheat name sprintf(g_CheatMarqueeString, "%s %s\n", - g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" - langGet(g_Cheats[cheat_id].nametextid) + g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? lang_get(L_MPWEAPONS_143) : lang_get(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" + lang_get(g_Cheats[cheat_id].nametextid) ); } else { // Locked - strcpy(cheatname, langGet(g_Cheats[cheat_id].nametextid)); + strcpy(cheatname, lang_get(g_Cheats[cheat_id].nametextid)); ptr = cheatname; while (*ptr != '\n') { @@ -525,15 +525,15 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Cheats[cheat_id].flags & CHEATFLAG_COMPLETION) { sprintf(g_CheatMarqueeString, "%s %s %s %s %s", - langGet(L_MPWEAPONS_137), // "Complete" - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS_138), // "for cheat:" + lang_get(L_MPWEAPONS_137), // "Complete" + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), + lang_get(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } else { // Timed - strcpy(difficultyname, langGet(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); + strcpy(difficultyname, lang_get(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); ptr = difficultyname; while (*ptr != '\n') { @@ -543,21 +543,21 @@ char *cheatGetMarquee(struct menuitem *arg0) *ptr = '\0'; sprintf(g_CheatMarqueeString, "%s %s %s %s %s %s %d:%02d %s %s", - langGet(L_MPWEAPONS_137), // "Complete" - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS_139), // "on" + lang_get(L_MPWEAPONS_137), // "Complete" + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), + lang_get(L_MPWEAPONS_139), // "on" &difficultyname, - langGet(L_MPWEAPONS_140), // "in under" + lang_get(L_MPWEAPONS_140), // "in under" g_Cheats[cheat_id].time / 60, g_Cheats[cheat_id].time % 60, - langGet(L_MPWEAPONS_138), // "for cheat:" + lang_get(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } if (g_Cheats[cheat_id].flags & CHEATFLAG_TRANSFERPAK) { - strcat(g_CheatMarqueeString, langGet(L_MPWEAPONS_141)); // " or insert Game Boy ..." + strcat(g_CheatMarqueeString, lang_get(L_MPWEAPONS_141)); // " or insert Game Boy ..." } strcat(g_CheatMarqueeString, "\n"); @@ -588,16 +588,16 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog && g_Menus[g_MpPlayerNum].curdialog->focuseditem == &g_CheatsBuddiesMenuItems[0]) { // Velvet - sprintf(g_CheatMarqueeString, "%s: %s", langGet(L_MPWEAPONS_143), langGet(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" - } else if (cheatIsUnlocked(cheat_id)) { + sprintf(g_CheatMarqueeString, "%s: %s", lang_get(L_MPWEAPONS_143), lang_get(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" + } else if (cheat_is_unlocked(cheat_id)) { // Show cheat name sprintf(g_CheatMarqueeString, "%s: %s\n", - g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" - langGet(g_Cheats[cheat_id].nametextid) + g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? lang_get(L_MPWEAPONS_143) : lang_get(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" + lang_get(g_Cheats[cheat_id].nametextid) ); } else { // Locked - strcpy(cheatname, langGet(g_Cheats[cheat_id].nametextid)); + strcpy(cheatname, lang_get(g_Cheats[cheat_id].nametextid)); ptr = cheatname; while (*ptr != '\n') { @@ -608,15 +608,15 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Cheats[cheat_id].flags & CHEATFLAG_COMPLETION) { sprintf(g_CheatMarqueeString, "%s %s: %s %s %s", - langGet(L_MPWEAPONS_137), // "Complete" - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS_138), // "for cheat:" + lang_get(L_MPWEAPONS_137), // "Complete" + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), + lang_get(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } else { // Timed - strcpy(difficultyname, langGet(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); + strcpy(difficultyname, lang_get(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); ptr = difficultyname; while (*ptr != '\n') { @@ -626,21 +626,21 @@ char *cheatGetMarquee(struct menuitem *arg0) *ptr = '\0'; sprintf(g_CheatMarqueeString, "%s %s: %s %s %s %s %d:%02d %s %s", - langGet(L_MPWEAPONS_137), // "Complete" - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS_139), // "on" + lang_get(L_MPWEAPONS_137), // "Complete" + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), + lang_get(L_MPWEAPONS_139), // "on" &difficultyname, - langGet(L_MPWEAPONS_140), // "in under" + lang_get(L_MPWEAPONS_140), // "in under" g_Cheats[cheat_id].time / 60, g_Cheats[cheat_id].time % 60, - langGet(L_MPWEAPONS_138), // "for cheat:" + lang_get(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } if (g_Cheats[cheat_id].flags & CHEATFLAG_TRANSFERPAK) { - strcat(g_CheatMarqueeString, langGet(L_MPWEAPONS_141)); // " or insert Game Boy ..." + strcat(g_CheatMarqueeString, lang_get(L_MPWEAPONS_141)); // " or insert Game Boy ..." } strcat(g_CheatMarqueeString, "\n"); @@ -667,16 +667,16 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog && g_Menus[g_MpPlayerNum].curdialog->focuseditem == &g_CheatsBuddiesMenuItems[0]) { // Velvet - sprintf(g_CheatMarqueeString, "%s: %s", langGet(L_MPWEAPONS_143), langGet(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" - } else if (cheatIsUnlocked(cheat_id)) { + sprintf(g_CheatMarqueeString, "%s: %s", lang_get(L_MPWEAPONS_143), lang_get(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" + } else if (cheat_is_unlocked(cheat_id)) { // Show cheat name sprintf(g_CheatMarqueeString, "%s: %s\n", - g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" - langGet(g_Cheats[cheat_id].nametextid) + g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? lang_get(L_MPWEAPONS_143) : lang_get(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" + lang_get(g_Cheats[cheat_id].nametextid) ); } else { // Locked - strcpy(cheatname, langGet(g_Cheats[cheat_id].nametextid)); + strcpy(cheatname, lang_get(g_Cheats[cheat_id].nametextid)); ptr = cheatname; while (*ptr != '\n') { @@ -687,15 +687,15 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Cheats[cheat_id].flags & CHEATFLAG_COMPLETION) { sprintf(g_CheatMarqueeString, "%s %s: %s %s %s", - langGet(L_MPWEAPONS_137), // "Complete" - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS_138), // "for cheat:" + lang_get(L_MPWEAPONS_137), // "Complete" + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), + lang_get(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } else { // Timed - strcpy(difficultyname, langGet(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); + strcpy(difficultyname, lang_get(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); ptr = difficultyname; while (*ptr != '\n') { @@ -705,21 +705,21 @@ char *cheatGetMarquee(struct menuitem *arg0) *ptr = '\0'; sprintf(g_CheatMarqueeString, "%s %s: %s %s %s %s %d:%02d %s %s", - langGet(L_MPWEAPONS_137), // "Complete" - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS_139), // "on" + lang_get(L_MPWEAPONS_137), // "Complete" + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), + lang_get(L_MPWEAPONS_139), // "on" &difficultyname, - langGet(L_MPWEAPONS_140), // "in under" + lang_get(L_MPWEAPONS_140), // "in under" g_Cheats[cheat_id].time / 60, g_Cheats[cheat_id].time % 60, - langGet(L_MPWEAPONS_138), // "for cheat:" + lang_get(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } if (g_Cheats[cheat_id].flags & CHEATFLAG_TRANSFERPAK) { - strcat(g_CheatMarqueeString, langGet(L_MPWEAPONS_141)); // " or insert Game Boy ..." + strcat(g_CheatMarqueeString, lang_get(L_MPWEAPONS_141)); // " or insert Game Boy ..." } strcat(g_CheatMarqueeString, "\n"); @@ -736,16 +736,16 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog && g_Menus[g_MpPlayerNum].curdialog->focuseditem == &g_CheatsBuddiesMenuItems[0]) { // Velvet - sprintf(g_StringPointer, "%s: %s", langGet(L_MPWEAPONS_143), langGet(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" - } else if (cheatIsUnlocked(cheat_id)) { + sprintf(g_StringPointer, "%s: %s", lang_get(L_MPWEAPONS_143), lang_get(L_MPWEAPONS_117)); // "Buddy Available", "Velvet Dark" + } else if (cheat_is_unlocked(cheat_id)) { // Show cheat name sprintf(g_StringPointer, "%s: %s\n", - g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? langGet(L_MPWEAPONS_143) : langGet(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" - langGet(g_Cheats[cheat_id].nametextid) + g_Menus[g_MpPlayerNum].curdialog->definition == &g_CheatsBuddiesMenuDialog ? lang_get(L_MPWEAPONS_143) : lang_get(L_MPWEAPONS_136), // "Buddy Available", "Cheat available" + lang_get(g_Cheats[cheat_id].nametextid) ); } else { // Locked - strcpy(cheatname, langGet(g_Cheats[cheat_id].nametextid)); + strcpy(cheatname, lang_get(g_Cheats[cheat_id].nametextid)); ptr = cheatname; while (*ptr != '\n') { @@ -756,15 +756,15 @@ char *cheatGetMarquee(struct menuitem *arg0) if (g_Cheats[cheat_id].flags & CHEATFLAG_COMPLETION) { sprintf(g_StringPointer, "%s %s: %s %s %s", - langGet(L_MPWEAPONS_137), // "Complete" - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS_138), // "for cheat:" + lang_get(L_MPWEAPONS_137), // "Complete" + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), + lang_get(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } else { // Timed - strcpy(difficultyname, langGet(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); + strcpy(difficultyname, lang_get(L_OPTIONS_251 + g_Cheats[cheat_id].difficulty)); ptr = difficultyname; while (*ptr != '\n') { @@ -774,21 +774,21 @@ char *cheatGetMarquee(struct menuitem *arg0) *ptr = '\0'; sprintf(g_StringPointer, "%s %s: %s %s %s %s %d:%02d %s %s", - langGet(L_MPWEAPONS_137), // "Complete" - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), - langGet(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), - langGet(L_MPWEAPONS_139), // "on" + lang_get(L_MPWEAPONS_137), // "Complete" + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name1), + lang_get(g_SoloStages[g_Cheats[cheat_id].stage_index].name2), + lang_get(L_MPWEAPONS_139), // "on" &difficultyname, - langGet(L_MPWEAPONS_140), // "in under" + lang_get(L_MPWEAPONS_140), // "in under" g_Cheats[cheat_id].time / 60, g_Cheats[cheat_id].time % 60, - langGet(L_MPWEAPONS_138), // "for cheat:" + lang_get(L_MPWEAPONS_138), // "for cheat:" &cheatname ); } if (g_Cheats[cheat_id].flags & CHEATFLAG_TRANSFERPAK) { - strcat(g_StringPointer, langGet(L_MPWEAPONS_141)); // " or insert Game Boy ..." + strcat(g_StringPointer, lang_get(L_MPWEAPONS_141)); // " or insert Game Boy ..." } strcat(g_StringPointer, "\n"); @@ -799,10 +799,10 @@ char *cheatGetMarquee(struct menuitem *arg0) #endif // No cheat selected - return langGet(L_MPWEAPONS_142); // "Select cheat for information" + return lang_get(L_MPWEAPONS_142); // "Select cheat for information" } -MenuItemHandlerResult cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult cheat_menu_handle_turn_off_all_cheats(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_CheatsEnabledBank0 = 0; @@ -813,7 +813,7 @@ MenuItemHandlerResult cheatMenuHandleTurnOffAllCheats(s32 operation, struct menu } #if VERSION >= VERSION_NTSC_1_0 -s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty) +s32 cheat_get_by_timed_stage_index(s32 stage_index, s32 difficulty) { s32 cheat_id; @@ -831,7 +831,7 @@ s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty) #endif #if VERSION >= VERSION_NTSC_1_0 -s32 cheatGetByCompletedStageIndex(s32 stage_index) +s32 cheat_get_by_completed_stage_index(s32 stage_index) { s32 cheat_id; @@ -846,16 +846,16 @@ s32 cheatGetByCompletedStageIndex(s32 stage_index) #endif #if VERSION >= VERSION_NTSC_1_0 -s32 cheatGetTime(s32 cheat_id) +s32 cheat_get_time(s32 cheat_id) { return g_Cheats[cheat_id].time; } #endif #if VERSION >= VERSION_NTSC_1_0 -char *cheatGetName(s32 cheat_id) +char *cheat_get_name(s32 cheat_id) { - return langGet(g_Cheats[cheat_id].nametextid); + return lang_get(g_Cheats[cheat_id].nametextid); } #endif @@ -864,49 +864,49 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_DKMODE, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_SMALLJO, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_SMALLCHARACTERS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_TEAMHEADSONLY, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_PLAYASELVIS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_SLOMO, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -920,7 +920,7 @@ struct menuitem g_CheatsFunMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&cheatGetMarquee, + (uintptr_t)&cheat_get_marquee, 0, NULL, }, @@ -947,7 +947,7 @@ struct menudialogdef g_CheatsFunMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS_118, // "Fun" g_CheatsFunMenuItems, - cheatMenuHandleDialog, + cheat_menu_handle_dialog, 0, NULL, }; @@ -957,65 +957,65 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_INVINCIBLE, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_CLOAKINGDEVICE, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_MARQUIS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_JOSHIELD, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_SUPERSHIELD, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_ENEMYSHIELDS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_ENEMYROCKETS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_PERFECTDARKNESS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -1029,7 +1029,7 @@ struct menuitem g_CheatsGameplayMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&cheatGetMarquee, + (uintptr_t)&cheat_get_marquee, 0, NULL, }, @@ -1056,7 +1056,7 @@ struct menudialogdef g_CheatsGameplayMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS_119, // "Gameplay" g_CheatsGameplayMenuItems, - cheatMenuHandleDialog, + cheat_menu_handle_dialog, 0, NULL, }; @@ -1066,65 +1066,65 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_ROCKETLAUNCHER, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_SNIPERRIFLE, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_SUPERDRAGON, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_LAPTOPGUN, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_PHOENIX, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_PSYCHOSISGUN, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_TRENTSMAGNUM, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_FARSIGHT, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -1138,7 +1138,7 @@ struct menuitem g_CheatsSoloWeaponsMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&cheatGetMarquee, + (uintptr_t)&cheat_get_marquee, 0, NULL, }, @@ -1165,7 +1165,7 @@ struct menudialogdef g_CheatsSoloWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS_122, // "Weapons for Jo in Solo" g_CheatsSoloWeaponsMenuItems, - cheatMenuHandleDialog, + cheat_menu_handle_dialog, 0, NULL, }; @@ -1175,65 +1175,65 @@ struct menuitem g_CheatsClassicWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_PP9I, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_CC13, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_KL01313, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_KF7SPECIAL, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_ZZT, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_DMC, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_AR53, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_RCP45, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -1274,7 +1274,7 @@ struct menudialogdef g_CheatsClassicWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS_123, // "Classic Weapons for Jo in Solo" g_CheatsClassicWeaponsMenuItems, - cheatMenuHandleDialog, + cheat_menu_handle_dialog, 0, NULL, }; @@ -1284,65 +1284,65 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_CHECKBOX, CHEAT_CLASSICSIGHT, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_UNLIMITEDAMMOLAPTOP, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_HURRICANEFISTS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_UNLIMITEDAMMO, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_UNLIMITEDAMMONORELOADS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_XRAYSCANNER, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_RTRACKER, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_CHECKBOX, CHEAT_ALLGUNS, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatCheckboxMenuHandler, + cheat_checkbox_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -1356,7 +1356,7 @@ struct menuitem g_CheatsWeaponsMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&cheatGetMarquee, + (uintptr_t)&cheat_get_marquee, 0, NULL, }, @@ -1383,7 +1383,7 @@ struct menudialogdef g_CheatsWeaponsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS_120, // "Weapons" g_CheatsWeaponsMenuItems, - cheatMenuHandleDialog, + cheat_menu_handle_dialog, 0, NULL, }; @@ -1395,39 +1395,39 @@ struct menuitem g_CheatsBuddiesMenuItems[] = { 0, L_MPWEAPONS_117, // "Velvet Dark" 0, - cheatMenuHandleBuddyCheckbox, + cheat_menu_handle_buddy_checkbox, }, { MENUITEMTYPE_CHECKBOX, CHEAT_PUGILIST, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatMenuHandleBuddyCheckbox, + cheat_menu_handle_buddy_checkbox, }, { MENUITEMTYPE_CHECKBOX, CHEAT_HOTSHOT, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatMenuHandleBuddyCheckbox, + cheat_menu_handle_buddy_checkbox, }, { MENUITEMTYPE_CHECKBOX, CHEAT_HITANDRUN, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatMenuHandleBuddyCheckbox, + cheat_menu_handle_buddy_checkbox, }, { MENUITEMTYPE_CHECKBOX, CHEAT_ALIEN, 0, - (uintptr_t)&cheatGetNameIfUnlocked, + (uintptr_t)&cheat_get_name_if_unlocked, 0, - cheatMenuHandleBuddyCheckbox, + cheat_menu_handle_buddy_checkbox, }, { MENUITEMTYPE_SEPARATOR, @@ -1441,7 +1441,7 @@ struct menuitem g_CheatsBuddiesMenuItems[] = { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&cheatGetMarquee, + (uintptr_t)&cheat_get_marquee, 0, NULL, }, @@ -1468,7 +1468,7 @@ struct menudialogdef g_CheatsBuddiesMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPWEAPONS_121, // "Buddies" g_CheatsBuddiesMenuItems, - cheatMenuHandleDialog, + cheat_menu_handle_dialog, 0, NULL, }; @@ -1536,7 +1536,7 @@ struct menuitem g_CheatsMenuItems[] = { 0, L_MPWEAPONS_217, // "Turn off all Cheats" 0, - cheatMenuHandleTurnOffAllCheats, + cheat_menu_handle_turn_off_all_cheats, }, { MENUITEMTYPE_SEPARATOR, @@ -1561,7 +1561,7 @@ struct menudialogdef g_CheatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_476, // "Cheats" g_CheatsMenuItems, - cheatMenuHandleDialog, + cheat_menu_handle_dialog, 0, NULL, }; diff --git a/src/game/chr.c b/src/game/chr.c index de9ff1964..5a166ab37 100644 --- a/src/game/chr.c +++ b/src/game/chr.c @@ -48,7 +48,7 @@ #include "gbiex.h" #include "types.h" -void rng2SetSeed(u32 seed); +void rng2_set_seed(u32 seed); void *var8009ccc0[20]; s32 g_NumChrs; @@ -71,12 +71,12 @@ struct chrdata *g_ChrSlots = NULL; s32 g_NumChrSlots = 0; -s32 chrsGetNumSlots(void) +s32 chrs_get_num_slots(void) { return g_NumChrSlots; } -void chrSetChrnum(struct chrdata *chr, s16 chrnum) +void chr_set_chrnum(struct chrdata *chr, s16 chrnum) { s32 i; bool modified; @@ -113,7 +113,7 @@ void chrSetChrnum(struct chrdata *chr, s16 chrnum) } while (modified); } -void chrRegister(s32 chrnum, s32 chrindex) +void chr_register(s32 chrnum, s32 chrindex) { s32 i; s16 tmp; @@ -135,7 +135,7 @@ void chrRegister(s32 chrnum, s32 chrindex) g_NumChrs++; } -void chrDeregister(s32 chrnum) +void chr_deregister(s32 chrnum) { s32 i; @@ -156,32 +156,32 @@ void chrDeregister(s32 chrnum) } } -Vtx *chrAllocateVertices(s32 numvertices) +Vtx *chr_allocate_vertices(s32 numvertices) { - return (Vtx *) gfxAllocate(numvertices * sizeof(Vtx)); + return (Vtx *) gfx_allocate(numvertices * sizeof(Vtx)); } -void chrsSetVar8006297c(u32 arg0) +void chrs_set_var8006297c(u32 arg0) { var8006297c = arg0; } -u32 chrsGetVar8006297c(void) +u32 chrs_get_var8006297c(void) { return var8006297c; } -void chrsSetVar80062980(u32 arg0) +void chrs_set_var80062980(u32 arg0) { var80062980 = arg0; } -u32 chrsGetVar80062980(void) +u32 chrs_get_var80062980(void) { return var80062980; } -void chrSetPerimEnabled(struct chrdata *chr, bool enable) +void chr_set_perim_enabled(struct chrdata *chr, bool enable) { if (chr) { if (enable) { @@ -197,7 +197,7 @@ void chrSetPerimEnabled(struct chrdata *chr, bool enable) * pos and rooms for the chr. It does collision checks and updates dstpos and * dstrooms to valid ones if needed. */ -void chrCalculatePushPos(struct chrdata *chr, struct coord *dstpos, RoomNum *dstrooms, bool arg3) +void chr_calculate_push_pos(struct chrdata *chr, struct coord *dstpos, RoomNum *dstrooms, bool arg3) { f32 ymax; f32 ymin; @@ -228,21 +228,21 @@ void chrCalculatePushPos(struct chrdata *chr, struct coord *dstpos, RoomNum *dst // The eyespy can't be pushed if (CHRRACE(chr) == RACE_EYESPY) { - roomsCopy(prop->rooms, dstrooms); - chrSetPerimEnabled(chr, true); + rooms_copy(prop->rooms, dstrooms); + chr_set_perim_enabled(chr, true); return; } - chrGetBbox(prop, &radius, &ymax, &ymin); + chr_get_bbox(prop, &radius, &ymax, &ymin); halfradius = radius * 0.5f; - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); // myspecial is the chr's chair if (chr->myspecial != -1) { - chair = objFindByTagId(chr->myspecial); + chair = obj_find_by_tag_id(chr->myspecial); if (chair && chair->prop) { - objSetPerimEnabled(chair->prop, false); + obj_set_perim_enabled(chair->prop, false); } } @@ -264,13 +264,13 @@ void chrCalculatePushPos(struct chrdata *chr, struct coord *dstpos, RoomNum *dst movez = dstpos->z - prop->pos.z; if (movex > halfradius || movez > halfradius || movex < -halfradius || movez < -halfradius) { - cdresult = cdExamCylMove05(&prop->pos, prop->rooms, dstpos, dstrooms, CDTYPE_ALL, 1, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_exam_cyl_move05(&prop->pos, prop->rooms, dstpos, dstrooms, CDTYPE_ALL, 1, ymax - prop->pos.y, ymin - prop->pos.y); if (cdresult == CDRESULT_NOCOLLISION) { - cdresult = cdExamCylMove01(&prop->pos, dstpos, radius, dstrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_exam_cyl_move01(&prop->pos, dstpos, radius, dstrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); } } else { - cdresult = cdExamCylMove01(&prop->pos, dstpos, radius, sp84, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_exam_cyl_move01(&prop->pos, dstpos, radius, sp84, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); } if (cdresult != CDRESULT_ERROR) { @@ -284,13 +284,13 @@ void chrCalculatePushPos(struct chrdata *chr, struct coord *dstpos, RoomNum *dst moveok = true; } else { #if VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp78, &sp6c, 453, "chr/chr.c"); + cd_get_edge(&sp78, &sp6c, 453, "chr/chr.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&sp78, &sp6c, 453, "chr.c"); + cd_get_edge(&sp78, &sp6c, 453, "chr.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp78, &sp6c, 453, "chr/chr.c"); + cd_get_edge(&sp78, &sp6c, 453, "chr/chr.c"); #else - cdGetEdge(&sp78, &sp6c, 451, "chr.c"); + cd_get_edge(&sp78, &sp6c, 451, "chr.c"); #endif // Attempt to find a valid position - method #1 @@ -330,13 +330,13 @@ void chrCalculatePushPos(struct chrdata *chr, struct coord *dstpos, RoomNum *dst movez = sp44.z - prop->pos.z; if (movex > halfradius || movez > halfradius || movex < -halfradius || movez < -halfradius) { - cdresult = cdTestCylMove02(&prop->pos, prop->rooms, &sp44, dstrooms, CDTYPE_ALL, true, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_cyl_move02(&prop->pos, prop->rooms, &sp44, dstrooms, CDTYPE_ALL, true, ymax - prop->pos.y, ymin - prop->pos.y); if (cdresult == CDRESULT_NOCOLLISION) { - cdresult = cdTestVolume(&sp44, radius, dstrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_volume(&sp44, radius, dstrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); } } else { - cdresult = cdTestVolume(&sp44, radius, sp84, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_volume(&sp44, radius, sp84, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); } if (cdresult == CDRESULT_NOCOLLISION) { @@ -386,13 +386,13 @@ void chrCalculatePushPos(struct chrdata *chr, struct coord *dstpos, RoomNum *dst movez = sp44.z - prop->pos.z; if (movex > halfradius || movez > halfradius || movex < -halfradius || movez < -halfradius) { - cdresult = cdTestCylMove02(&prop->pos, prop->rooms, &sp44, dstrooms, CDTYPE_ALL, true, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_cyl_move02(&prop->pos, prop->rooms, &sp44, dstrooms, CDTYPE_ALL, true, ymax - prop->pos.y, ymin - prop->pos.y); if (cdresult == CDRESULT_NOCOLLISION) { - cdresult = cdTestVolume(&sp44, radius, dstrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_volume(&sp44, radius, dstrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); } } else { - cdresult = cdTestVolume(&sp44, radius, sp84, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_volume(&sp44, radius, sp84, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); } if (cdresult == CDRESULT_NOCOLLISION) { @@ -440,13 +440,13 @@ void chrCalculatePushPos(struct chrdata *chr, struct coord *dstpos, RoomNum *dst movez = sp44.z - prop->pos.z; if (movex > halfradius || movez > halfradius || movex < -halfradius || movez < -halfradius) { - cdresult = cdTestCylMove02(&prop->pos, prop->rooms, &sp44, dstrooms, CDTYPE_ALL, true, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_cyl_move02(&prop->pos, prop->rooms, &sp44, dstrooms, CDTYPE_ALL, true, ymax - prop->pos.y, ymin - prop->pos.y); if (cdresult == CDRESULT_NOCOLLISION) { - cdresult = cdTestVolume(&sp44, radius, dstrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_volume(&sp44, radius, dstrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); } } else { - cdresult = cdTestVolume(&sp44, radius, sp84, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); + cdresult = cd_test_volume(&sp44, radius, sp84, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y); } if (cdresult == CDRESULT_NOCOLLISION) { @@ -466,14 +466,14 @@ void chrCalculatePushPos(struct chrdata *chr, struct coord *dstpos, RoomNum *dst // Keep chr where they are dstpos->x = prop->pos.x; dstpos->z = prop->pos.z; - roomsCopy(prop->rooms, dstrooms); + rooms_copy(prop->rooms, dstrooms); chr->invalidmove = 1; } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); if (chair && chair->prop) { - objSetPerimEnabled(chair->prop, true); + obj_set_perim_enabled(chair->prop, true); } } @@ -494,19 +494,19 @@ bool chr0f01f264(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 arg newpos.y = pos->y + arg3; newpos.z = pos->z; - chrGetBbox(chr->prop, &radius, &ymax, &ymin); + chr_get_bbox(chr->prop, &radius, &ymax, &ymin); func0f065e74(pos, rooms, &newpos, newrooms); chr0f021fa8(chr, &newpos, newrooms); - chrSetPerimEnabled(chr, false); - result = cdTestVolume(&newpos, radius, newrooms, CDTYPE_ALL, CHECKVERTICAL_YES, + chr_set_perim_enabled(chr, false); + result = cd_test_volume(&newpos, radius, newrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - chr->prop->pos.y, ymin - chr->prop->pos.y); - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); #if VERSION >= VERSION_NTSC_1_0 if (result == true && arg4) { pos->y = newpos.y; - roomsCopy(newrooms, rooms); + rooms_copy(newrooms, rooms); } #endif @@ -554,7 +554,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 func0f065e74(&prop->pos, prop->rooms, arg2, spfc); } - ground = cdFindGroundInfoAtCyl(arg2, chr->radius, spfc, &chr->floorcol, &chr->floortype, &floorflags, &chr->floorroom, &inlift, &lift); + ground = cd_find_ground_info_at_cyl(arg2, chr->radius, spfc, &chr->floorcol, &chr->floortype, &floorflags, &chr->floorroom, &inlift, &lift); if (ground < -1000000) { ground = 0.0f; @@ -600,9 +600,9 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 lvupdate240 = 16; } - botUpdateLateral(chr, move, lvupdate240, lvupdate60freal); + bot_update_lateral(chr, move, lvupdate240, lvupdate60freal); #else - botUpdateLateral(chr, move); + bot_update_lateral(chr, move); #endif } @@ -611,7 +611,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 } if (chr->actiontype == ACT_PATROL || chr->actiontype == ACT_GOPOS) { - chr->onladder = cdFindLadder(&chr->prop->pos, chr->radius * 2.5f, + chr->onladder = cd_find_ladder(&chr->prop->pos, chr->radius * 2.5f, chr->manground + chr->height - chr->prop->pos.y, chr->manground + 1.0f - chr->prop->pos.y, chr->prop->rooms, GEOFLAG_LADDER, &chr->laddernormal); @@ -626,12 +626,12 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 chr->height = 135.0f; } else if (chr->actiontype == ACT_GOPOS && (chr->act_gopos.flags & GOPOSFLAG_CROUCH)) { chr->height = 90.0f; - } else if (cd0002a13c(&chr->prop->pos, chr->radius * 1.1f, + } else if (cd_0002a13c(&chr->prop->pos, chr->radius * 1.1f, chr->manground + 185.0f - chr->prop->pos.y, chr->manground - 10.0f - chr->prop->pos.y, chr->prop->rooms, GEOFLAG_AIBOTDUCK)) { chr->height = 135.0f; - } else if (cd0002a13c(&chr->prop->pos, chr->radius * 1.1f, + } else if (cd_0002a13c(&chr->prop->pos, chr->radius * 1.1f, chr->manground + 135.0f - chr->prop->pos.y, chr->manground - 10.0f - chr->prop->pos.y, chr->prop->rooms, GEOFLAG_AIBOTCROUCH)) { @@ -703,7 +703,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 arg2->z += chr->fallspeed.z * VAR(lvupdate60freal); if (race == RACE_EYESPY) { - struct eyespy *eyespy = chrToEyespy(chr); + struct eyespy *eyespy = chr_to_eyespy(chr); if (eyespy && eyespy->deployed) { arg2->x = chr->prop->pos.x; @@ -742,7 +742,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 arg2->x = prop->pos.x; arg2->z = prop->pos.z; - roomsCopy(prop->rooms, spfc); + rooms_copy(prop->rooms, spfc); chr->invalidmove = 0; chr->lastmoveok60 = g_Vars.lvframe60; @@ -752,7 +752,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 arg2->z = arg1->z; } - chrCalculatePushPos(chr, arg2, spfc, true); + chr_calculate_push_pos(chr, arg2, spfc, true); } if (chr->actiontype == ACT_SKJUMP @@ -803,7 +803,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 if (race == RACE_EYESPY) { ground = chr->manground; } else if (prop->type == PROPTYPE_PLAYER) { - struct player *player = g_Vars.players[playermgrGetPlayerNumByProp(prop)]; + struct player *player = g_Vars.players[playermgr_get_player_num_by_prop(prop)]; ground = player->vv_manground; chr->floorcol = player->floorcol; chr->floortype = player->floortype; @@ -823,7 +823,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 sp94 = spfc; } - ground = cdFindGroundInfoAtCyl(sp98, chr->radius, sp94, + ground = cd_find_ground_info_at_cyl(sp98, chr->radius, sp94, &chr->floorcol, &chr->floortype, &floorflags, &chr->floorroom, &inlift, &lift); #if VERSION >= VERSION_NTSC_1_0 @@ -842,11 +842,11 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 arg2->y = prop->pos.y; arg2->z = prop->pos.z; - roomsCopy(prop->rooms, spfc); + rooms_copy(prop->rooms, spfc); lvupdate60freal = 0.0f; - ground = cdFindGroundInfoAtCyl(arg2, chr->radius, spfc, + ground = cd_find_ground_info_at_cyl(arg2, chr->radius, spfc, &chr->floorcol, &chr->floortype, &floorflags, &chr->floorroom, &inlift, &lift); } #endif @@ -879,7 +879,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 manground = chr->manground; if (nodetype == MODELNODETYPE_CHRINFO) { - union modelrwdata *rwdata = modelGetNodeRwData(model, node); + union modelrwdata *rwdata = model_get_node_rw_data(model, node); rwdata->chrinfo.unk34.y = rwdata->chrinfo.unk24.y; } } else { @@ -921,10 +921,10 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 if (chr->lastshooter >= 0 && chr->timeshooter > 0) { shooter = chr->lastshooter; } else { - shooter = mpPlayerGetIndex(chr); + shooter = mp_player_get_index(chr); } - chrDie(chr, shooter); + chr_die(chr, shooter); } else { chr->hidden |= CHRHFLAG_DELETING; } @@ -957,7 +957,7 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 spd0.y = arg2->y; spd0.z = arg2->z; - roomsCopy(spfc, spc0); + rooms_copy(spfc, spc0); arg2->y += chr->manground - manground; @@ -995,14 +995,14 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 } } - propDeregisterRooms(prop); - roomsCopy(spfc, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(spfc, prop->rooms); #if VERSION >= VERSION_NTSC_1_0 if (prop->type == PROPTYPE_CHR) { for (i = 0; prop->rooms[i] != -1; i++) { if (chr->floorroom == prop->rooms[i]) { - propDeregisterRooms(prop); + prop_deregister_rooms(prop); prop->rooms[0] = chr->floorroom; prop->rooms[1] = -1; break; @@ -1012,12 +1012,12 @@ bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f3 #endif chr0f0220ac(chr); - propCalculateShadeColour(prop, chr->nextcol, chr->floorcol); + prop_calculate_shade_colour(prop, chr->nextcol, chr->floorcol); return true; } -s32 chrsGetNumFree(void) +s32 chrs_get_num_free(void) { s32 count = 0; s32 i; @@ -1031,22 +1031,22 @@ s32 chrsGetNumFree(void) return count; } -void chrSetMaxDamage(struct chrdata *chr, f32 maxdamage) +void chr_set_max_damage(struct chrdata *chr, f32 maxdamage) { chr->maxdamage = maxdamage; } -f32 chrGetMaxDamage(struct chrdata *chr) +f32 chr_get_max_damage(struct chrdata *chr) { return chr->maxdamage; } -void chrAddHealth(struct chrdata *chr, f32 health) +void chr_add_health(struct chrdata *chr, f32 health) { chr->damage -= health; } -f32 chrGetArmor(struct chrdata *chr) +f32 chr_get_armor(struct chrdata *chr) { if (chr->damage < 0) { return -chr->damage; @@ -1055,7 +1055,7 @@ f32 chrGetArmor(struct chrdata *chr) return 0; } -s16 chrsGetNextUnusedChrnum(void) +s16 chrs_get_next_unused_chrnum(void) { s32 chrnum; struct chrdata *chr; @@ -1067,13 +1067,13 @@ s16 chrsGetNextUnusedChrnum(void) chrnum = g_NextChrnum = 5000; } - chr = chrFindByLiteralId((s16)chrnum); + chr = chr_find_by_literal_id((s16)chrnum); } while (chr); return chrnum; } -void chrInit(struct prop *prop, u8 *ailist) +void chr_init(struct prop *prop, u8 *ailist) { s32 i; struct chrdata *chr = NULL; @@ -1086,8 +1086,8 @@ void chrInit(struct prop *prop, u8 *ailist) } prop->chr = chr; - chr->chrnum = chrsGetNextUnusedChrnum(); - chrRegister(chr->chrnum, i); + chr->chrnum = chrs_get_next_unused_chrnum(); + chr_register(chr->chrnum, i); chr->headnum = 0; chr->bodynum = 0; @@ -1099,7 +1099,7 @@ void chrInit(struct prop *prop, u8 *ailist) chr->lastmoveok60 = g_Vars.lvframe60; chr->visionrange = 250; - if (cheatIsActive(CHEAT_PERFECTDARKNESS)) { + if (cheat_is_active(CHEAT_PERFECTDARKNESS)) { chr->visionrange = 4; } @@ -1201,7 +1201,7 @@ void chrInit(struct prop *prop, u8 *ailist) chr->path = -1; chr->team = TEAM_01; - chrSetShield(chr, 0); + chr_set_shield(chr, 0); chr->cmnum = 0; chr->cmnum2 = 0; chr->cmnum3 = 0; @@ -1286,7 +1286,7 @@ void chrInit(struct prop *prop, u8 *ailist) chr->goposhitcount = 0; #endif - splatResetChr(chr); + splat_reset_chr(chr); } struct prop *chr0f020b14(struct prop *prop, struct model *model, @@ -1300,23 +1300,23 @@ struct prop *chr0f020b14(struct prop *prop, struct model *model, prop->type = PROPTYPE_CHR; if (prop->chr == NULL) { - chrInit(prop, ailist); + chr_init(prop, ailist); } chr = prop->chr; - modelSetAnim70(model, chr0f01f378); + model_set_anim70(model, chr0f01f378); model->chr = chr; model->unk01 = 1; chr->model = model; - chrSetLookAngle(chr, faceangle); - modelSetAnimPlaySpeed(model, PALUPF(var80062968), 0); + chr_set_look_angle(chr, faceangle); + model_set_anim_play_speed(model, PALUPF(var80062968), 0); testpos.x = pos->x; testpos.y = pos->y + 100; testpos.z = pos->z; - chr->ground = chr->manground = ground = cdFindGroundInfoAtCyl(&testpos, chr->radius, rooms, &chr->floorcol, &chr->floortype, NULL, &chr->floorroom, NULL, NULL); + chr->ground = chr->manground = ground = cd_find_ground_info_at_cyl(&testpos, chr->radius, rooms, &chr->floorcol, &chr->floortype, NULL, &chr->floorroom, NULL, NULL); chr->sumground = ground * (PAL ? 8.4175090789795f : 9.999998f); @@ -1324,15 +1324,15 @@ struct prop *chr0f020b14(struct prop *prop, struct model *model, prop->pos.y = ground + 100; prop->pos.z = testpos.z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); chr0f0220ac(chr); - modelSetRootPosition(model, &prop->pos); + model_set_root_position(model, &prop->pos); nodetype = chr->model->definition->rootnode->type; if ((nodetype & 0xff) == MODELNODETYPE_CHRINFO) { - union modelrwdata *rwdata = modelGetNodeRwData(chr->model, chr->model->definition->rootnode); + union modelrwdata *rwdata = model_get_node_rw_data(chr->model, chr->model->definition->rootnode); rwdata->chrinfo.ground = ground; } @@ -1340,20 +1340,20 @@ struct prop *chr0f020b14(struct prop *prop, struct model *model, chr->prevpos.y = prop->pos.y; chr->prevpos.z = prop->pos.z; - propCalculateShadeColour(prop, chr->nextcol, chr->floorcol); + prop_calculate_shade_colour(prop, chr->nextcol, chr->floorcol); return prop; } -struct prop *chrAllocate(struct model *model, struct coord *pos, RoomNum *rooms, f32 faceangle, u8 *ailist) +struct prop *chr_allocate(struct model *model, struct coord *pos, RoomNum *rooms, f32 faceangle, u8 *ailist) { - struct prop *prop = propAllocate(); + struct prop *prop = prop_allocate(); if (prop) { prop = chr0f020b14(prop, model, pos, rooms, faceangle, ailist); - if (cheatIsActive(CHEAT_ENEMYSHIELDS)) { - chrSetShield(prop->chr, 8); + if (cheat_is_active(CHEAT_ENEMYSHIELDS)) { + chr_set_shield(prop->chr, 8); } } @@ -1363,7 +1363,7 @@ struct prop *chrAllocate(struct model *model, struct coord *pos, RoomNum *rooms, /** * Removes a chr. If free is true, free the chr. */ -void chrRemove(struct prop *prop, bool free) +void chr_remove(struct prop *prop, bool free) { struct chrdata *chr = prop->chr; struct model *model = chr->model; @@ -1371,8 +1371,8 @@ void chrRemove(struct prop *prop, bool free) struct prop *child; u32 stack[2]; - bgunFreeFireslotWrapper(chr->fireslots[0]); - bgunFreeFireslotWrapper(chr->fireslots[1]); + bgun_free_fireslot_wrapper(chr->fireslots[0]); + bgun_free_fireslot_wrapper(chr->fireslots[1]); if (chr->proppreset1 >= 0) { struct prop *proppreset = &g_Vars.props[chr->proppreset1]; @@ -1380,14 +1380,14 @@ void chrRemove(struct prop *prop, bool free) chair->hidden &= ~OBJHFLAG_OCCUPIEDCHAIR; } - wallhitFadeSplatsForRemovedChr(prop); - psStopSound(prop, PSTYPE_GENERAL, 0xffff); - shieldhitsRemoveByProp(prop); - modelFreeVertices(VTXSTORETYPE_CHRVTX, model); - propDeregisterRooms(prop); + wallhit_fade_splats_for_removed_chr(prop); + ps_stop_sound(prop, PSTYPE_GENERAL, 0xffff); + shieldhits_remove_by_prop(prop); + model_free_vertices(VTXSTORETYPE_CHRVTX, model); + prop_deregister_rooms(prop); if (g_Vars.stagenum == STAGE_CITRAINING) { - eyespyobj = objFindByTagId(0x26); + eyespyobj = obj_find_by_tag_id(0x26); } child = prop->child; @@ -1399,26 +1399,26 @@ void chrRemove(struct prop *prop, bool free) if ((obj->hidden & OBJHFLAG_HASTEXTOVERRIDE) == 0 && obj != eyespyobj && (prop->type != PROPTYPE_PLAYER || (obj->flags3 & OBJFLAG3_PLAYERUNDROPPABLE) == 0)) { - objDetach(child); - objFreePermanently(obj, true); + obj_detach(child); + obj_free_permanently(obj, true); } child = next; } - modelmgrFreeModel(model); + modelmgr_free_model(model); chr->model = NULL; if (free) { - chrDeregister(chr->chrnum); + chr_deregister(chr->chrnum); if (chr->cover != -1) { - coverSetInUse(chr->cover, false); + cover_set_in_use(chr->cover, false); chr->cover = -1; } - chrClearReferences(prop - g_Vars.props); - projectilesUnrefOwner(prop); + chr_clear_references(prop - g_Vars.props); + projectiles_unref_owner(prop); if (g_Vars.normmplayerisrunning == false && g_MissionConfig.iscoop) { s32 i; @@ -1432,12 +1432,12 @@ void chrRemove(struct prop *prop, bool free) chr->chrnum = -1; - rebuildTeams(); - rebuildSquadrons(); + rebuild_teams(); + rebuild_squadrons(); } } -void chrClearReferences(s32 propnum) +void chr_clear_references(s32 propnum) { s32 i; s32 j; @@ -1445,7 +1445,7 @@ void chrClearReferences(s32 propnum) for (i = 0; i < g_NumChrSlots; i++) { if (g_ChrSlots[i].target == propnum) { - if (propGetIndexByChrId(&g_ChrSlots[i], g_ChrSlots[i].chrpreset1) == propnum) { + if (prop_get_index_by_chr_id(&g_ChrSlots[i], g_ChrSlots[i].chrpreset1) == propnum) { g_ChrSlots[i].chrpreset1 = -1; } @@ -1474,7 +1474,7 @@ void chr0f0211a8(f32 arg0) for (i = 0; i < g_NumChrSlots; i++) { if (g_ChrSlots[i].model) { - modelSetAnimPlaySpeed(g_ChrSlots[i].model, PALUPF(var80062968), 600); + model_set_anim_play_speed(g_ChrSlots[i].model, PALUPF(var80062968), 600); } } } @@ -1484,7 +1484,7 @@ f32 chr0f02124c(void) return var80062968; } -void chrUpdateAimProperties(struct chrdata *chr) +void chr_update_aim_properties(struct chrdata *chr) { if (chr->aimendcount >= 2) { f32 mult = g_Vars.lvupdate60f / chr->aimendcount; @@ -1507,7 +1507,7 @@ void chrUpdateAimProperties(struct chrdata *chr) } } -void chrFlinchBody(struct chrdata *chr) +void chr_flinch_body(struct chrdata *chr) { if (chr->actiontype != ACT_DEAD && chr->flinchcnt < 0) { chr->flinchcnt = 1; @@ -1516,7 +1516,7 @@ void chrFlinchBody(struct chrdata *chr) } } -void chrFlinchHead(struct chrdata *chr, f32 arg1) +void chr_flinch_head(struct chrdata *chr, f32 arg1) { s32 value; @@ -1541,7 +1541,7 @@ void chrFlinchHead(struct chrdata *chr, f32 arg1) chr->hidden2 |= value << 13; } -f32 chrGetFlinchAmount(struct chrdata *chr) +f32 chr_get_flinch_amount(struct chrdata *chr) { f32 value = chr->flinchcnt; @@ -1577,7 +1577,7 @@ f32 chrGetFlinchAmount(struct chrdata *chr) * - Body flinching when shot * - Chrs aiming up, down, left and right */ -void chrHandleJointPositioned(s32 joint, Mtxf *mtx) +void chr_handle_joint_positioned(s32 joint, Mtxf *mtx) { f32 scale = 1.0f; s32 lshoulderjoint; @@ -1599,7 +1599,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) if (g_CurModelChr->model->definition->skel == &g_SkelRobot) { // Handle Chicago robot guns - theta = chrGetInverseTheta(g_CurModelChr); + theta = chr_get_inverse_theta(g_CurModelChr); if (joint == 1) { gunrotx = g_CurModelChr->gunrotx[0]; @@ -1611,7 +1611,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) return; } - mtx00015be0(camGetProjectionMtxF(), mtx); + mtx00015be0(cam_get_projection_mtxf(), mtx); sp138.x = mtx->m[3][0]; sp138.y = mtx->m[3][1]; @@ -1635,9 +1635,9 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) gunrot -= M_BADTAU; } - mtx4LoadYRotation(gunrot, &spb8); + mtx4_load_y_rotation(gunrot, &spb8); mtx00015be0(&spb8, mtx); - mtx4LoadXRotation(gunrotx, &spf8); + mtx4_load_x_rotation(gunrotx, &spf8); mtx00015be0(&spf8, mtx); gunrot = gunroty + theta; @@ -1646,7 +1646,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) gunrot -= M_BADTAU; } - mtx4LoadYRotation(gunrot, &spb8); + mtx4_load_y_rotation(gunrot, &spb8); mtx00015be0(&spb8, mtx); if (scale != 1.0f) { @@ -1657,7 +1657,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) mtx->m[3][1] = sp138.y; mtx->m[3][2] = sp138.z; - mtx00015be0(camGetWorldToScreenMtxf(), mtx); + mtx00015be0(cam_get_world_to_screen_mtxf(), mtx); } else { if (g_CurModelChr->model->definition->skel == &g_SkelChr) { lshoulderjoint = 2; @@ -1676,7 +1676,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) neckjoint = -1; } - if (cheatIsActive(CHEAT_DKMODE) && CHRRACE(g_CurModelChr) == RACE_HUMAN) { + if (cheat_is_active(CHEAT_DKMODE) && CHRRACE(g_CurModelChr) == RACE_HUMAN) { if (joint == neckjoint) { scale = 4.0f; } else if (joint == lshoulderjoint || joint == rshoulderjoint) { @@ -1714,7 +1714,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) if (g_CurModelChr->aibot) { yrot += g_CurModelChr->aibot->angleoffset; } else if (g_CurModelChr->prop->type == PROPTYPE_PLAYER) { - yrot += g_Vars.players[playermgrGetPlayerNumByProp(g_CurModelChr->prop)]->angleoffset; + yrot += g_Vars.players[playermgr_get_player_num_by_prop(g_CurModelChr->prop)]->angleoffset; } } else if (joint == neckjoint) { // Head up/down @@ -1749,7 +1749,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) if (g_CurModelChr->hidden2 & CHRH2FLAG_HEADSHOTTED) { if (joint == neckjoint) { - f32 flinchamount = chrGetFlinchAmount(g_CurModelChr); + f32 flinchamount = chr_get_flinch_amount(g_CurModelChr); s32 flinchtype = (g_CurModelChr->hidden2 >> 13) & 7; f32 mult = isskedar ? 25.0f : 60.0f; @@ -1771,7 +1771,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) } } else if (joint == rshoulderjoint || joint == lshoulderjoint) { s32 flinchtype = (g_CurModelChr->hidden2 >> 13) & 7; - f32 flinchamount = chrGetFlinchAmount(g_CurModelChr) * RAD(15, 0.26175770163536f); + f32 flinchamount = chr_get_flinch_amount(g_CurModelChr) * RAD(15, 0.26175770163536f); xrot -= flinchamount; @@ -1784,7 +1784,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) f32 flinchamount; s32 flinchtype; - flinchamount = chrGetFlinchAmount(g_CurModelChr); + flinchamount = chr_get_flinch_amount(g_CurModelChr); flinchtype = (g_CurModelChr->hidden2 >> 13) & 7; xrot += flinchamount * RAD(15, 0.26175770163536f); @@ -1808,7 +1808,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) f32 aimangle; Mtxf tmpmtx; - aimangle = chrGetAimAngle(g_CurModelChr); + aimangle = chr_get_aim_angle(g_CurModelChr); if (xrot < 0.0f) { xrot = -xrot; @@ -1820,7 +1820,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) yrot += M_BADTAU; } - mtx00015be0(camGetProjectionMtxF(), mtx); + mtx00015be0(cam_get_projection_mtxf(), mtx); sp70.x = mtx->m[3][0]; sp70.y = mtx->m[3][1]; @@ -1837,23 +1837,23 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) yrot += M_BADTAU; } - mtx4LoadYRotation(yrot, &tmpmtx); + mtx4_load_y_rotation(yrot, &tmpmtx); mtx00015be0(&tmpmtx, mtx); if (xrot != 0.0f) { - mtx4LoadXRotation(xrot, &tmpmtx); + mtx4_load_x_rotation(xrot, &tmpmtx); mtx00015be0(&tmpmtx, mtx); } if (zrot != 0.0f) { - mtx4LoadZRotation(zrot, &tmpmtx); + mtx4_load_z_rotation(zrot, &tmpmtx); mtx00015be0(&tmpmtx, mtx); } - mtx4LoadYRotation(aimangle, &tmpmtx); + mtx4_load_y_rotation(aimangle, &tmpmtx); mtx00015be0(&tmpmtx, mtx); } else { - mtx4LoadYRotation(yrot, &tmpmtx); + mtx4_load_y_rotation(yrot, &tmpmtx); mtx00015be0(&tmpmtx, mtx); } @@ -1865,7 +1865,7 @@ void chrHandleJointPositioned(s32 joint, Mtxf *mtx) mtx->m[3][1] = sp70.y; mtx->m[3][2] = sp70.z; - mtx00015be0(camGetWorldToScreenMtxf(), mtx); + mtx00015be0(cam_get_world_to_screen_mtxf(), mtx); } } } @@ -1884,7 +1884,7 @@ void chr0f021fa8(struct chrdata *chr, struct coord *pos, RoomNum *rooms) chr->race == RACE_EYESPY #endif ) { - struct eyespy *eyespy = chrToEyespy(chr); + struct eyespy *eyespy = chr_to_eyespy(chr); if (eyespy) { height = eyespy->height + 30.0f; @@ -1901,7 +1901,7 @@ void chr0f021fa8(struct chrdata *chr, struct coord *pos, RoomNum *rooms) upper.y = pos->y + height; upper.z = pos->z + 50.0f; - bgFindEnteredRooms(&lower, &upper, rooms, 7, true); + bg_find_entered_rooms(&lower, &upper, rooms, 7, true); } void chr0f022084(struct chrdata *chr, RoomNum *room) @@ -1911,9 +1911,9 @@ void chr0f022084(struct chrdata *chr, RoomNum *room) void chr0f0220ac(struct chrdata *chr) { - propDeregisterRooms(chr->prop); + prop_deregister_rooms(chr->prop); chr0f022084(chr, chr->prop->rooms); - propRegisterRooms(chr->prop); + prop_register_rooms(chr->prop); } void chr0f0220ec(struct chrdata *chr, s32 lvupdate240, bool arg2) @@ -1937,12 +1937,12 @@ void chr0f0220ec(struct chrdata *chr, s32 lvupdate240, bool arg2) chr->chrflags &= ~CHRCFLAG_DELAYANIM; } else if (arg2) { if ((chr->hidden & CHRHFLAG_00000800) == 0) { - modelGetRootPosition(model, &chr->prevpos); - modelTickAnimQuarterSpeed(model, lvupdate240, true); - modelUpdateInfo(model); + model_get_root_position(model, &chr->prevpos); + model_tick_anim_quarter_speed(model, lvupdate240, true); + model_update_info(model); } } else { - modelTickAnimQuarterSpeed(model, lvupdate240, false); + model_tick_anim_quarter_speed(model, lvupdate240, false); } } @@ -1954,14 +1954,14 @@ void chr0f022214(struct chrdata *chr, struct prop *prop, bool fulltick) struct prop *next; if (obj->hidden & OBJHFLAG_DELETING) { - objFree(obj, true, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, true, obj->hidden2 & OBJH2FLAG_CANREGEN); return; } if (model->attachedtomodel && model->attachedtonode && (obj->hidden & OBJHFLAG_GONE) == 0 && (obj->flags2 & OBJFLAG2_INVISIBLE) == 0) { - Mtxf *sp104 = modelFindNodeMtx(model->attachedtomodel, model->attachedtonode, 0); + Mtxf *sp104 = model_find_node_mtx(model->attachedtomodel, model->attachedtonode, 0); struct modelrenderdata thing = {NULL, 1, 3}; u32 stack; Mtxf sp80; @@ -1974,22 +1974,22 @@ void chr0f022214(struct chrdata *chr, struct prop *prop, bool fulltick) thing.unk00 = &sp80; } else if (CHRRACE(chr) == RACE_SKEDAR) { // The skedar hand position is rotated weirdly, so compensate for it - mtx4LoadYRotation(RAD(76, 1.3192588090897f), &sp80); - mtx4LoadZRotation(RAD(90, 1.5705462694168f), &sp40); - mtx4MultMtx4InPlace(&sp40, &sp80); - mtx4MultMtx4InPlace(sp104, &sp80); + mtx4_load_y_rotation(RAD(76, 1.3192588090897f), &sp80); + mtx4_load_z_rotation(RAD(90, 1.5705462694168f), &sp40); + mtx4_mult_mtx4_in_place(&sp40, &sp80); + mtx4_mult_mtx4_in_place(sp104, &sp80); thing.unk00 = &sp80; } else if (prop == chr->weapons_held[HAND_LEFT]) { // Flip the model - mtx4LoadZRotation(M_BADPI, &sp80); - mtx4MultMtx4InPlace(sp104, &sp80); + mtx4_load_z_rotation(M_BADPI, &sp80); + mtx4_mult_mtx4_in_place(sp104, &sp80); thing.unk00 = &sp80; } else { thing.unk00 = sp104; } - thing.unk10 = gfxAllocate(model->definition->nummatrices * sizeof(Mtxf)); - modelSetMatrices(&thing, model); + thing.unk10 = gfx_allocate(model->definition->nummatrices * sizeof(Mtxf)); + model_set_matrices(&thing, model); func0f07063c(prop, fulltick); @@ -2018,31 +2018,31 @@ void chr0f022214(struct chrdata *chr, struct prop *prop, bool fulltick) } } -void chrCloak(struct chrdata *chr, bool value) +void chr_cloak(struct chrdata *chr, bool value) { - if (!chrIsDead(chr)) { + if (!chr_is_dead(chr)) { chr->hidden |= CHRHFLAG_CLOAKED; if (value) { - psCreate(0, chr->prop, SFX_CLOAK_ON, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); + ps_create(0, chr->prop, SFX_CLOAK_ON, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } } } -void chrUncloak(struct chrdata *chr, bool value) +void chr_uncloak(struct chrdata *chr, bool value) { if (chr->hidden & CHRHFLAG_CLOAKED) { chr->hidden &= ~CHRHFLAG_CLOAKED; if (value) { - psCreate(0, chr->prop, SFX_CLOAK_OFF, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); + ps_create(0, chr->prop, SFX_CLOAK_OFF, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } #if PIRACYCHECKS { u32 checksum = 0; - u32 *i = (u32 *)&botPickupProp; - u32 *end = (u32 *)&botTestPropForPickup; + u32 *i = (u32 *)&bot_pickup_prop; + u32 *end = (u32 *)&bot_test_prop_for_pickup; while (i < end) { checksum += ~*i; @@ -2050,20 +2050,20 @@ void chrUncloak(struct chrdata *chr, bool value) } if (checksum != CHECKSUM_PLACEHOLDER) { - ((u32 *)&cdReturnZero)[-2] = 0; + ((u32 *)&cd_return_zero)[-2] = 0; } } #endif } } -void chrUncloakTemporarily(struct chrdata *chr) +void chr_uncloak_temporarily(struct chrdata *chr) { - chrUncloak(chr, true); + chr_uncloak(chr, true); chr->cloakpause = TICKS(120); } -void chrUpdateCloak(struct chrdata *chr) +void chr_update_cloak(struct chrdata *chr) { s32 qty; s32 ammotype; @@ -2085,7 +2085,7 @@ void chrUpdateCloak(struct chrdata *chr) if (chr->aibot->cloakdeviceenabled) { qty = chr->aibot->ammoheld[AMMOTYPE_CLOAK]; - if (qty > 0 && !chrIsDead(chr)) { + if (qty > 0 && !chr_is_dead(chr)) { if (chr->hidden & CHRHFLAG_CLOAKED) { qty -= g_Vars.lvupdate60; @@ -2100,8 +2100,8 @@ void chrUpdateCloak(struct chrdata *chr) } } else if (chr->aibot->rcp120cloakenabled) { if (chr->aibot->weaponnum == WEAPON_RCP120 - && !chrIsDead(chr) - && botactGetAmmoQuantityByWeapon(chr->aibot, WEAPON_RCP120, 0, 1) > 0) { + && !chr_is_dead(chr) + && botact_get_ammo_quantity_by_weapon(chr->aibot, WEAPON_RCP120, 0, 1) > 0) { if (chr->hidden & CHRHFLAG_CLOAKED) { chr->aibot->rcpcloaktimer60 += LVUPDATE60FREAL() * 0.4f; @@ -2116,7 +2116,7 @@ void chrUpdateCloak(struct chrdata *chr) chr->aibot->loadedammo[0] = 0; } } else { - ammotype = botactGetAmmoTypeByFunction(WEAPON_RCP120, 0); + ammotype = botact_get_ammo_type_by_function(WEAPON_RCP120, 0); if (chr->aibot->ammoheld[ammotype] > 0) { chr->aibot->ammoheld[ammotype] -= qty; @@ -2136,19 +2136,19 @@ void chrUpdateCloak(struct chrdata *chr) if (chr->aibot->cloakdeviceenabled || chr->aibot->rcp120cloakenabled) { if ((chr->hidden & CHRHFLAG_CLOAKED) == 0) { if (chr->cloakpause < 1) { - chrCloak(chr, true); + chr_cloak(chr, true); } } } else if (chr->hidden & CHRHFLAG_CLOAKED) { - chrUncloak(chr, true); + chr_uncloak(chr, true); } } else if (chr->prop->type == PROPTYPE_PLAYER) { prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(chr->prop)); + set_current_player_num(playermgr_get_player_num_by_prop(chr->prop)); if (g_Vars.currentplayer->devicesactive & DEVICE_CLOAKDEVICE) { // Cloak is active - but may or may not be in effect due to recent shooting - s32 qty = bgunGetReservedAmmoCount(AMMOTYPE_CLOAK); + s32 qty = bgun_get_reserved_ammo_count(AMMOTYPE_CLOAK); if (qty > 0) { if (chr->hidden & CHRHFLAG_CLOAKED) { @@ -2159,7 +2159,7 @@ void chrUpdateCloak(struct chrdata *chr) qty = 0; } - bgunSetAmmoQuantity(AMMOTYPE_CLOAK, qty); + bgun_set_ammo_quantity(AMMOTYPE_CLOAK, qty); } } else { // Out of cloak ammo - turn off cloak @@ -2172,16 +2172,16 @@ void chrUpdateCloak(struct chrdata *chr) || (g_Vars.currentplayer->gunctrl.weaponnum == WEAPON_RCP120 && (g_Vars.currentplayer->devicesactive & DEVICE_CLOAKRCP120))) { if ((chr->hidden & CHRHFLAG_CLOAKED) == 0 && chr->cloakpause < 1) { - chrCloak(chr, true); + chr_cloak(chr, true); } } else { if ((g_Vars.currentplayer->devicesactive & DEVICE_CLOAKDEVICE) == false && (chr->hidden & CHRHFLAG_CLOAKED)) { - chrUncloak(chr, true); + chr_uncloak(chr, true); } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } // Update cloakfade @@ -2219,7 +2219,7 @@ void chrUpdateCloak(struct chrdata *chr) } } -s32 chrGetCloakAlpha(struct chrdata *chr) +s32 chr_get_cloak_alpha(struct chrdata *chr) { s32 alpha = 255; @@ -2239,13 +2239,13 @@ s32 chrGetCloakAlpha(struct chrdata *chr) return alpha; } -void chrSetPoisoned(struct chrdata *chr, struct prop *poisonprop) +void chr_set_poisoned(struct chrdata *chr, struct prop *poisonprop) { if (chr->actiontype != ACT_DEAD && chr->actiontype != ACT_DIE && chr->prop->type == PROPTYPE_PLAYER) { // This was probably used in a debug print - playermgrGetPlayerNumByProp(chr->prop); + playermgr_get_player_num_by_prop(chr->prop); } if (g_Vars.normmplayerisrunning) { @@ -2257,7 +2257,7 @@ void chrSetPoisoned(struct chrdata *chr, struct prop *poisonprop) } } -void chrTickPoisoned(struct chrdata *chr) +void chr_tick_poisoned(struct chrdata *chr) { if (chr->poisoncounter > 0) { struct coord coord = {0, 0, 0}; @@ -2278,7 +2278,7 @@ void chrTickPoisoned(struct chrdata *chr) } } } else if (chr->prop->type == PROPTYPE_PLAYER - && g_Vars.players[playermgrGetPlayerNumByProp(chr->prop)]->bondhealth < 0.001f) { + && g_Vars.players[playermgr_get_player_num_by_prop(chr->prop)]->bondhealth < 0.001f) { // Player who's alive but on almost zero health if (g_Vars.normmplayerisrunning) { if (chr->poisoncounter > TICKS(3600)) { @@ -2295,8 +2295,8 @@ void chrTickPoisoned(struct chrdata *chr) if (chr->poisoncounter <= 0) { if (!g_Vars.normmplayerisrunning) { - chrDamageByMisc(chr, 100, &coord, &gset, chr->poisonprop); - chrFlinchHead(chr, M_PI); + chr_damage_by_misc(chr, 100, &coord, &gset, chr->poisonprop); + chr_flinch_head(chr, M_PI); } chr->poisoncounter = 0; @@ -2306,7 +2306,7 @@ void chrTickPoisoned(struct chrdata *chr) if (g_Vars.normmplayerisrunning) { if (chr->poisoncounter / TICKS(720) != (chr->poisoncounter + g_Vars.lvupdate240) / TICKS(720)) { - chrDamageByMisc(chr, 1.3f, &coord, &gset, chr->poisonprop); + chr_damage_by_misc(chr, 1.3f, &coord, &gset, chr->poisonprop); } } } @@ -2319,16 +2319,16 @@ u32 var800629f0 = 0x00000000; u32 var800629f4 = 0x00000000; u32 var800629f8 = 0x00000000; -bool chrTickBeams(struct prop *prop) +bool chr_tick_beams(struct prop *prop) { struct chrdata *chr = prop->chr; if (chr->fireslots[0] >= 0) { - beamTick(&g_Fireslots[chr->fireslots[0]].beam); + beam_tick(&g_Fireslots[chr->fireslots[0]].beam); } if (chr->fireslots[1] >= 0) { - beamTick(&g_Fireslots[chr->fireslots[1]].beam); + beam_tick(&g_Fireslots[chr->fireslots[1]].beam); } if (chr->aibot && chr->aibot->fadeintimer60 > 0) { @@ -2350,7 +2350,7 @@ bool chrTickBeams(struct prop *prop) * much of the logic is skipped, and only the logic specific to the current * player is executed. */ -s32 chrTick(struct prop *prop) +s32 chr_tick(struct prop *prop) { struct modelrenderdata sp210 = {0, 1, 3}; struct chrdata *chr = prop->chr; @@ -2419,18 +2419,18 @@ s32 chrTick(struct prop *prop) } } - chrUpdateCloak(chr); - chrTickPoisoned(chr); + chr_update_cloak(chr); + chr_tick_poisoned(chr); if ((chr->chrflags & CHRCFLAG_HIDDEN) == 0 || (chr->chrflags & CHRCFLAG_NEVERSLEEP)) { if (var8006296c) { - if (animHasFrames(g_SelectedAnimNum)) { - if (modelGetAnimNum(model) != g_SelectedAnimNum || !animHasFrames(modelGetAnimNum(model))) { - modelSetAnimation(model, g_SelectedAnimNum, 0, 0.0f, 0.5f, 0.0f); + if (anim_has_frames(g_SelectedAnimNum)) { + if (model_get_anim_num(model) != g_SelectedAnimNum || !anim_has_frames(model_get_anim_num(model))) { + model_set_animation(model, g_SelectedAnimNum, 0, 0.0f, 0.5f, 0.0f); } } } else { - chraTick(chr); + chra_tick(chr); if (chr->model == NULL) { return TICKOP_FREE; @@ -2448,22 +2448,22 @@ s32 chrTick(struct prop *prop) if (chr->hidden & CHRHFLAG_DELETING) { if (chr->hidden & CHRHFLAG_DROPPINGITEM) { - objDropRecursively(prop, true); + obj_drop_recursively(prop, true); } - chrRemove(prop, true); + chr_remove(prop, true); return TICKOP_FREE; } } if (race == RACE_EYESPY) { - struct eyespy *eyespy = chrToEyespy(chr); + struct eyespy *eyespy = chr_to_eyespy(chr); if (eyespy && eyespy->deployed) { if (eyespy == g_Vars.currentplayer->eyespy && eyespy->active) { needsupdate = false; } else { - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); } if (fulltick) { @@ -2476,7 +2476,7 @@ s32 chrTick(struct prop *prop) needsupdate = false; } else if ((chr->chrflags & CHRCFLAG_UNPLAYABLE) || (prop->type == PROPTYPE_PLAYER - && g_Vars.currentplayer == (player = g_Vars.players[playermgrGetPlayerNumByProp(prop)]) + && g_Vars.currentplayer == (player = g_Vars.players[playermgr_get_player_num_by_prop(prop)]) && player->cameramode == CAMERAMODE_THIRDPERSON && player->visionmode != VISIONMODE_SLAYERROCKET)) { // Cutscene chr? @@ -2493,34 +2493,34 @@ s32 chrTick(struct prop *prop) } if (chr->model && chr->model->anim && (g_Anims[chr->model->anim->animnum].flags & ANIMFLAG_HASREPEATFRAMES)) { - animLoadHeader(chr->model->anim->animnum); + anim_load_header(chr->model->anim->animnum); - isrepeatframe = animGetRemappedFrame(chr->model->anim->animnum, chr->model->anim->framea) < 0 - || (animGetRemappedFrame(chr->model->anim->animnum, chr->model->anim->frameb) < 0 + isrepeatframe = anim_get_remapped_frame(chr->model->anim->animnum, chr->model->anim->framea) < 0 + || (anim_get_remapped_frame(chr->model->anim->animnum, chr->model->anim->frameb) < 0 && chr->model->anim->frac != 0.0f); } if (isrepeatframe) { needsupdate = false; } else { - needsupdate = posIsInDrawDistance(&prop->pos); + needsupdate = pos_is_in_draw_distance(&prop->pos); } } else if (chr->actiontype == ACT_PATROL || chr->actiontype == ACT_GOPOS) { if ((chr->actiontype == ACT_PATROL && chr->act_patrol.waydata.mode == WAYMODE_MAGIC) || (chr->actiontype == ACT_GOPOS && chr->act_gopos.waydata.mode == WAYMODE_MAGIC)) { - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); if (needsupdate) { model->anim->average = false; - modelGetRootPosition(model, &chr->prevpos); - modelUpdateInfo(model); + model_get_root_position(model, &chr->prevpos); + model_update_info(model); } } else { if (fulltick) { chr0f0220ec(chr, lvupdate240, true); } - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); if (needsupdate) { if (chr->actiontype == ACT_PATROL) { @@ -2534,7 +2534,7 @@ s32 chrTick(struct prop *prop) && !((prop->flags & (PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) != 0); } } else if (chr->actiontype == ACT_ANIM && !chr->act_anim.movewheninvis) { - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); if (fulltick) { model->anim->average = false; @@ -2550,9 +2550,9 @@ s32 chrTick(struct prop *prop) if (chr->chrflags & CHRCFLAG_FORCETOGROUND) { chr0f0220ec(chr, lvupdate240, true); - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); } else { - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); if (g_Vars.mplayerisrunning) { if (fulltick) { @@ -2577,14 +2577,14 @@ s32 chrTick(struct prop *prop) } } } else if (chr->actiontype == ACT_DEAD) { - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); } else if (prop->type == PROPTYPE_PLAYER && (g_Vars.mplayerisrunning - || (player = g_Vars.players[playermgrGetPlayerNumByProp(prop)], player->cameramode == CAMERAMODE_EYESPY) + || (player = g_Vars.players[playermgr_get_player_num_by_prop(prop)], player->cameramode == CAMERAMODE_EYESPY) || (player->cameramode == CAMERAMODE_THIRDPERSON && player->visionmode == VISIONMODE_SLAYERROCKET))) { model->anim->average = false; chr0f0220ec(chr, lvupdate240, true); - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); } else { isrepeatframe2 = false; @@ -2594,17 +2594,17 @@ s32 chrTick(struct prop *prop) } if (chr->model && chr->model->anim && (g_Anims[chr->model->anim->animnum].flags & ANIMFLAG_HASREPEATFRAMES)) { - animLoadHeader(chr->model->anim->animnum); + anim_load_header(chr->model->anim->animnum); - isrepeatframe2 = animGetRemappedFrame(chr->model->anim->animnum, chr->model->anim->framea) < 0 - || (animGetRemappedFrame(chr->model->anim->animnum, chr->model->anim->frameb) < 0 + isrepeatframe2 = anim_get_remapped_frame(chr->model->anim->animnum, chr->model->anim->framea) < 0 + || (anim_get_remapped_frame(chr->model->anim->animnum, chr->model->anim->frameb) < 0 && chr->model->anim->frac != 0.0f); } if (isrepeatframe2) { needsupdate = false; } else { - needsupdate = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), true); + needsupdate = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), true); } } @@ -2617,7 +2617,7 @@ s32 chrTick(struct prop *prop) #endif } - chrUpdateAimProperties(chr); + chr_update_aim_properties(chr); } if (prop->pos.y < -65536) { @@ -2632,7 +2632,7 @@ s32 chrTick(struct prop *prop) if (var8009cdac > 10) { needsupdate = false; - chrDropItemsForOwnerReap(chr); + chr_drop_items_for_owner_reap(chr); chr->hidden |= CHRHFLAG_DELETING; } } else { @@ -2657,30 +2657,30 @@ s32 chrTick(struct prop *prop) chr->hidden |= CHRHFLAG_ONBONDSSCREEN; } - if (cheatIsActive(CHEAT_DKMODE)) { - modelSetDistanceScale(0.3125f); + if (cheat_is_active(CHEAT_DKMODE)) { + model_set_distance_scale(0.3125f); } - g_ModelJointPositionedFunc = &chrHandleJointPositioned; + g_ModelJointPositionedFunc = &chr_handle_joint_positioned; g_CurModelChr = chr; if (CHRRACE(chr) == RACE_DRCAROLL && g_Vars.tickmode != TICKMODE_CUTSCENE) { - angle = chrGetInverseTheta(chr); + angle = chr_get_inverse_theta(chr); sp190.x = sinf(angle) * 19; sp190.y = 0.0f; sp190.z = cosf(angle) * 19; - mtx4LoadTranslation(&sp190, &sp1a8); - mtx4MultMtx4InPlace(camGetWorldToScreenMtxf(), &sp1a8); + mtx4_load_translation(&sp190, &sp1a8); + mtx4_mult_mtx4_in_place(cam_get_world_to_screen_mtxf(), &sp1a8); sp210.unk00 = &sp1a8; } else if (prop->type == PROPTYPE_PLAYER) { u8 stack[0x14]; f32 sp130; - player = g_Vars.players[playermgrGetPlayerNumByProp(prop)]; + player = g_Vars.players[playermgr_get_player_num_by_prop(prop)]; if (player->bondmovemode == MOVEMODE_BIKE) { - sp178 = chrGetInverseTheta(chr); + sp178 = chr_get_inverse_theta(chr); bike = (struct hoverbikeobj *)player->hoverbike->obj; sp130 = bike->w * 1000; @@ -2688,17 +2688,17 @@ s32 chrTick(struct prop *prop) sp17c.y = ABS(bike->w) * 200 + 25; sp17c.z = sinf(-sp178) * sp130; - mtx4LoadTranslation(&sp17c, &sp1a8); - mtx4MultMtx4InPlace(camGetWorldToScreenMtxf(), &sp1a8); + mtx4_load_translation(&sp17c, &sp1a8); + mtx4_mult_mtx4_in_place(cam_get_world_to_screen_mtxf(), &sp1a8); sp210.unk00 = &sp1a8; } else { - sp210.unk00 = camGetWorldToScreenMtxf(); + sp210.unk00 = cam_get_world_to_screen_mtxf(); } } else { - sp210.unk00 = camGetWorldToScreenMtxf(); + sp210.unk00 = cam_get_world_to_screen_mtxf(); } - sp210.unk10 = gfxAllocate(model->definition->nummatrices * sizeof(Mtxf)); + sp210.unk10 = gfx_allocate(model->definition->nummatrices * sizeof(Mtxf)); if (fulltick && g_CurModelChr->flinchcnt >= 0) { g_CurModelChr->flinchcnt += g_Vars.lvupdate60; @@ -2715,7 +2715,7 @@ s32 chrTick(struct prop *prop) f32 xdiff; f32 ydiff; f32 zdiff; - f32 sp114 = camGetLodScaleZ(); + f32 sp114 = cam_get_lod_scale_z(); bool restore = false; f32 prevfrac; s32 prevframea; @@ -2729,7 +2729,7 @@ s32 chrTick(struct prop *prop) limit = 700 * 700; } } else { - if (debugGetSlowMotion() != SLOWMOTION_OFF) { + if (debug_get_slow_motion() != SLOWMOTION_OFF) { limit = 2000 * 2000; } else { limit = 700 * 700; @@ -2768,7 +2768,7 @@ s32 chrTick(struct prop *prop) } } - modelSetMatricesWithAnim(&sp210, model); + model_set_matrices_with_anim(&sp210, model); if (restore) { anim->frac = prevfrac; @@ -2778,13 +2778,13 @@ s32 chrTick(struct prop *prop) } g_ModelJointPositionedFunc = NULL; - modelSetDistanceScale(var800629e8); + model_set_distance_scale(var800629e8); if (fulltick) { - colourTween(chr->shadecol, chr->nextcol); + colour_tween(chr->shadecol, chr->nextcol); } - prop->z = modelGetScreenDistance(model); + prop->z = model_get_screen_distance(model); child = prop->child; while (child) { @@ -2805,7 +2805,7 @@ s32 chrTick(struct prop *prop) f32 spdc; Mtxf sp9c; Mtxf sp5c; - s32 hattype = hatGetType(chr->weapons_held[2]); + s32 hattype = hat_get_type(chr->weapons_held[2]); u8 stack[0x0c]; index = chr->headnum - HEAD_SHAUN; @@ -2818,12 +2818,12 @@ s32 chrTick(struct prop *prop) spe0 = var8007dae4[index][hattype].unk10; spdc = var8007dae4[index][hattype].unk14; - mtx4LoadTranslation(&hatpos, &sp9c); + mtx4_load_translation(&hatpos, &sp9c); mtx00015e24(spe4, &sp9c); mtx00015e80(spe0, &sp9c); mtx00015edc(spdc, &sp9c); mtx00015be4(hatmodel->matrices, &sp9c, &sp5c); - mtx4Copy(&sp5c, hatmodel->matrices); + mtx4_copy(&sp5c, hatmodel->matrices); if (hattype == HATTYPE_2) { hatvisible = false; @@ -2832,16 +2832,16 @@ s32 chrTick(struct prop *prop) } if (model->definition->skel == &g_SkelChr) { - struct modelnode *headspotnode = modelGetPart(model->definition, MODELPART_CHR_HEADSPOT); + struct modelnode *headspotnode = model_get_part(model->definition, MODELPART_CHR_HEADSPOT); if (headspotnode && headspotnode->type == MODELNODETYPE_HEADSPOT) { - union modelrwdata *rwdata = modelGetNodeRwData(model, headspotnode); + union modelrwdata *rwdata = model_get_node_rw_data(model, headspotnode); if (rwdata->headspot.headmodeldef != NULL) { - struct modelnode *hatnode = modelGetPart(rwdata->headspot.headmodeldef, MODELPART_HEAD_HAT); + struct modelnode *hatnode = model_get_part(rwdata->headspot.headmodeldef, MODELPART_HEAD_HAT); if (hatnode != NULL) { - union modelrwdata *hatrwdata = modelGetNodeRwData(model, hatnode); + union modelrwdata *hatrwdata = model_get_node_rw_data(model, hatnode); hatrwdata->toggle.visible = hatvisible; } } @@ -2872,7 +2872,7 @@ s32 chrTick(struct prop *prop) if (fulltick && (chr->chrflags & CHRCFLAG_HIDDEN) == 0) { if (chr->hidden & CHRHFLAG_DROPPINGITEM) { - objDropRecursively(prop, false); + obj_drop_recursively(prop, false); chr->hidden &= ~CHRHFLAG_DROPPINGITEM; } @@ -2882,7 +2882,7 @@ s32 chrTick(struct prop *prop) return TICKOP_NONE; } -void chrDropConcealedItems(struct chrdata *chr) +void chr_drop_concealed_items(struct chrdata *chr) { struct prop *prop = chr->prop->child; @@ -2892,7 +2892,7 @@ void chrDropConcealedItems(struct chrdata *chr) && prop != chr->weapons_held[0] && (prop->obj->hidden & OBJHFLAG_EMBEDDED) == 0 && (prop->obj->flags & OBJFLAG_AIUNDROPPABLE) == 0) { - objSetDropped(prop, DROPTYPE_DEFAULT); + obj_set_dropped(prop, DROPTYPE_DEFAULT); } prop = prop->next; @@ -2901,21 +2901,21 @@ void chrDropConcealedItems(struct chrdata *chr) chr->hidden |= CHRHFLAG_DROPPINGITEM; } -void chrSetHudpieceVisible(struct chrdata *chr, bool visible) +void chr_set_hudpiece_visible(struct chrdata *chr, bool visible) { struct modeldef *modeldef = chr->model->definition; if (modeldef->skel == &g_SkelChr) { - struct modelnode *headspotnode = modelGetPart(modeldef, MODELPART_CHR_HEADSPOT); + struct modelnode *headspotnode = model_get_part(modeldef, MODELPART_CHR_HEADSPOT); if (headspotnode && headspotnode->type == MODELNODETYPE_HEADSPOT) { - union modelrwdata *rwdata = modelGetNodeRwData(chr->model, headspotnode); + union modelrwdata *rwdata = model_get_node_rw_data(chr->model, headspotnode); if (rwdata->headspot.headmodeldef) { - struct modelnode *hudpiecenode = modelGetPart(rwdata->headspot.headmodeldef, MODELPART_HEAD_HUDPIECE); + struct modelnode *hudpiecenode = model_get_part(rwdata->headspot.headmodeldef, MODELPART_HEAD_HUDPIECE); if (hudpiecenode) { - union modelrwdata *rwdata2 = modelGetNodeRwData(chr->model, hudpiecenode); + union modelrwdata *rwdata2 = model_get_node_rw_data(chr->model, hudpiecenode); rwdata2->toggle.visible = visible; } } @@ -2923,7 +2923,7 @@ void chrSetHudpieceVisible(struct chrdata *chr, bool visible) } } -void chrDropItemsForOwnerReap(struct chrdata *chr) +void chr_drop_items_for_owner_reap(struct chrdata *chr) { struct prop *prop = chr->prop->child; @@ -2933,7 +2933,7 @@ void chrDropItemsForOwnerReap(struct chrdata *chr) struct defaultobj *obj = prop->obj; if ((obj->flags & OBJFLAG_AIUNDROPPABLE) == 0) { - objSetDropped(prop, DROPTYPE_OWNERREAP); + obj_set_dropped(prop, DROPTYPE_OWNERREAP); } } @@ -2977,7 +2977,7 @@ bool chr0f024738(struct chrdata *chr) var80062960[i].unk004 = 0; } - roomGetProps(chr->prop->rooms, propnums, 256); + room_get_props(chr->prop->rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { @@ -3020,11 +3020,11 @@ bool chr0f024738(struct chrdata *chr) } if (!thing->unk00c) { - struct modelrodata_bbox *bbox = objFindBboxRodata(obj); + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(obj); thing->bbox = *bbox; - mtx3ToMtx4(obj->realrot, &thing->unk02c); - mtx4SetTranslation(&obj->prop->pos, &thing->unk02c); + mtx3_to_mtx4(obj->realrot, &thing->unk02c); + mtx4_set_translation(&obj->prop->pos, &thing->unk02c); mtx000172f0(thing->unk02c.m, thing->unk06c.m); campos = &g_Vars.currentplayer->cam_pos; @@ -3034,11 +3034,11 @@ bool chr0f024738(struct chrdata *chr) + thing->unk06c.m[1][2] * campos->f[1] + thing->unk06c.m[2][2] * campos->f[2]) + thing->unk06c.m[3][2]; - mtx00015be4(&thing->unk06c, camGetProjectionMtxF(), &thing->unk0ac); + mtx00015be4(&thing->unk06c, cam_get_projection_mtxf(), &thing->unk0ac); thing->unk00c = true; } - modelGetRootPosition(chr->model, &pos); + model_get_root_position(chr->model, &pos); thing->unk008 = ( thing->unk06c.m[0][2] * pos.f[0] + @@ -3104,7 +3104,7 @@ bool chr0f024b18(struct model *model, struct modelnode *node) if (bboxnode) { bbox = &bboxnode->rodata->bbox; - mtx = modelFindNodeMtx(model, node, 0); + mtx = model_find_node_mtx(model, node, 0); for (i = 0; i < var80062964; i++) { if (var80062960[i].unk004) { @@ -3142,12 +3142,12 @@ bool chr0f024b18(struct model *model, struct modelnode *node) sp88.z = thing->bbox.zmin; } - mtx00015be4(camGetWorldToScreenMtxf(), &thing->unk02c, &thing->unk0ec); - mtx4TransformVec(&thing->unk0ec, &spa0, &sp70); + mtx00015be4(cam_get_world_to_screen_mtxf(), &thing->unk02c, &thing->unk0ec); + mtx4_transform_vec(&thing->unk0ec, &spa0, &sp70); cam0f0b4dec(&sp70, thing->unk134); - mtx4TransformVec(&thing->unk0ec, &sp94, &sp70); + mtx4_transform_vec(&thing->unk0ec, &sp94, &sp70); cam0f0b4dec(&sp70, thing->unk13c); - mtx4TransformVec(&thing->unk0ec, &sp88, &sp70); + mtx4_transform_vec(&thing->unk0ec, &sp88, &sp70); cam0f0b4dec(&sp70, thing->unk144); thing->unk130 = 1; @@ -3201,7 +3201,7 @@ bool chr0f024b18(struct model *model, struct modelnode *node) break; } - mtx4TransformVec(mtx, &sp64, &sp70); + mtx4_transform_vec(mtx, &sp64, &sp70); cam0f0b4dec(&sp70, sp80); value = thing->unk14c * sp80[0] + thing->unk150 * sp80[1] - thing->unk154; @@ -3213,7 +3213,7 @@ bool chr0f024b18(struct model *model, struct modelnode *node) } if (!done) { - mtx4TransformVec(&spb4, &sp64, &sp70); + mtx4_transform_vec(&spb4, &sp64, &sp70); if (sp70.x >= thing->bbox.xmin && sp70.x <= thing->bbox.xmax @@ -3244,7 +3244,7 @@ bool chr0f024b18(struct model *model, struct modelnode *node) * This function is recursive. The chr's gun can have mines placed on it, and * mines can also have further mines placed on them. */ -void chrRenderAttachedObject(struct prop *prop, struct modelrenderdata *renderdata, bool xlupass, struct chrdata *chr) +void chr_render_attached_object(struct prop *prop, struct modelrenderdata *renderdata, bool xlupass, struct chrdata *chr) { if (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) { u32 stack; @@ -3252,28 +3252,28 @@ void chrRenderAttachedObject(struct prop *prop, struct modelrenderdata *renderda struct model *model = obj->model; struct prop *child; - modelRender(renderdata, model); + model_render(renderdata, model); // Note: OBJH2FLAG_HASOPA << 1 is OBJH2FLAG_HASXLU // so this is just checking if the appropriate flag is enabled if (obj->hidden2 & (OBJH2FLAG_HASOPA << xlupass)) { - renderdata->gdl = wallhitRenderPropHits(renderdata->gdl, prop, xlupass); + renderdata->gdl = wallhit_render_prop_hits(renderdata->gdl, prop, xlupass); } child = prop->child; while (child) { - chrRenderAttachedObject(child, renderdata, xlupass, chr); + chr_render_attached_object(child, renderdata, xlupass, chr); child = child->next; } if (xlupass) { - mtxF2LBulk(model->matrices, model->definition->nummatrices); + mtx_f2l_bulk(model->matrices, model->definition->nummatrices); } } } -void chrGetBloodColour(s16 bodynum, u8 *colour1, u32 *colour2) +void chr_get_blood_colour(s16 bodynum, u8 *colour1, u32 *colour2) { switch (bodynum) { case BODY_ELVIS1: @@ -3334,7 +3334,7 @@ void chrGetBloodColour(s16 bodynum, u8 *colour1, u32 *colour2) } } -Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) +Gfx *chr_render(struct prop *prop, Gfx *gdl, bool xlupass) { struct chrdata *chr = prop->chr; struct model *model = chr->model; @@ -3350,7 +3350,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) // Don't render the eyespy if we're the one controlling it if (CHRRACE(chr) == RACE_EYESPY) { - eyespy = chrToEyespy(chr); + eyespy = chr_to_eyespy(chr); if (eyespy) { if (!eyespy->deployed) { @@ -3373,9 +3373,9 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) alpha = (f32)alpha * (TICKS(120) - chr->aibot->fadeintimer60) * (1.0f / TICKS(120)); } - chrGetBloodColour(chr->bodynum, spec, NULL); + chr_get_blood_colour(chr->bodynum, spec, NULL); chr0f0246e4(spec); - alpha *= objCalculateFadeDistOpacityFrac(prop, modelGetEffectiveScale(model)); + alpha *= obj_calculate_fade_dist_opacity_frac(prop, model_get_effective_scale(model)); if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { f32 fadedist; @@ -3400,7 +3400,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) } if (!USINGDEVICE(DEVICE_IRSCANNER)) { - alpha = chrGetCloakAlpha(chr) * alpha * 0.0039215688593686f; + alpha = chr_get_cloak_alpha(chr) * alpha * 0.0039215688593686f; } if (alpha < 0xff) { @@ -3417,10 +3417,10 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) } } - shademode = envGetObjShadeMode(prop, shadecolourfracs); + shademode = env_get_obj_shade_mode(prop, shadecolourfracs); if (chr->unk32c_18) { - propCalculateShadeColour(chr->prop, chr->nextcol, chr->floorcol); + prop_calculate_shade_colour(chr->prop, chr->nextcol, chr->floorcol); chr->unk32c_18 = false; } @@ -3431,13 +3431,13 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) u32 stack; if (xlupass && chr->cloakfadefrac > 0 && !chr->cloakfadefinished) { - gdl = chrRenderCloak(gdl, chr->prop, chr->prop); + gdl = chr_render_cloak(gdl, chr->prop, chr->prop); } if (func0f08e5a8(prop->rooms, &screenbox) > 0 && (chr->chrflags & CHRCFLAG_UNPLAYABLE) == 0) { - gdl = bgScissorWithinViewport(gdl, screenbox.xmin, screenbox.ymin, screenbox.xmax, screenbox.ymax); + gdl = bg_scissor_within_viewport(gdl, screenbox.xmin, screenbox.ymin, screenbox.xmax, screenbox.ymax); } else { - gdl = bgScissorToViewport(gdl); + gdl = bg_scissor_to_viewport(gdl); } renderdata.flags = sp100; @@ -3458,7 +3458,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) } if (g_Vars.normmplayerisrunning) { - speb = scenarioHighlightProp(prop, colour); + speb = scenario_highlight_prop(prop, colour); } if (!speb) { @@ -3473,7 +3473,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) } } - objMergeColourFracs(colour, shademode, shadecolourfracs); + obj_merge_colour_fracs(colour, shademode, shadecolourfracs); // Configure colours for night vision if in use if (USINGDEVICE(DEVICE_NIGHTVISION)) { @@ -3503,12 +3503,12 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) // Set Skedar eyes open or closed if (model->definition->skel == &g_SkelSkedar) { - struct modelnode *node1 = modelGetPart(model->definition, MODELPART_SKEDAR_EYESOPEN); - struct modelnode *node2 = modelGetPart(model->definition, MODELPART_SKEDAR_EYESCLOSED); + struct modelnode *node1 = model_get_part(model->definition, MODELPART_SKEDAR_EYESOPEN); + struct modelnode *node2 = model_get_part(model->definition, MODELPART_SKEDAR_EYESCLOSED); if (node1 && node2) { - union modelrwdata *data1 = modelGetNodeRwData(model, node1); - union modelrwdata *data2 = modelGetNodeRwData(model, node2); + union modelrwdata *data1 = model_get_node_rw_data(model, node1); + union modelrwdata *data2 = model_get_node_rw_data(model, node2); data2->toggle.visible = chr->actiontype == ACT_DIE || chr->actiontype == ACT_DEAD; data1->toggle.visible = !data2->toggle.visible; @@ -3521,18 +3521,18 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) || chr->headnum == HEAD_MAIAN_S || chr->headnum == HEAD_ELVIS_GOGS) { if (model->definition->skel == &g_SkelChr) { - struct modelnode *headspotnode = modelGetPart(model->definition, MODELPART_CHR_HEADSPOT); + struct modelnode *headspotnode = model_get_part(model->definition, MODELPART_CHR_HEADSPOT); if (headspotnode && headspotnode->type == MODELNODETYPE_HEADSPOT) { - union modelrwdata *headrwdata = modelGetNodeRwData(model, headspotnode); + union modelrwdata *headrwdata = model_get_node_rw_data(model, headspotnode); if (headrwdata->headspot.headmodeldef) { - struct modelnode *node1 = modelGetPart(headrwdata->headspot.headmodeldef, MODELPART_HEAD_EYESOPEN); - struct modelnode *node2 = modelGetPart(headrwdata->headspot.headmodeldef, MODELPART_HEAD_EYESCLOSED); + struct modelnode *node1 = model_get_part(headrwdata->headspot.headmodeldef, MODELPART_HEAD_EYESOPEN); + struct modelnode *node2 = model_get_part(headrwdata->headspot.headmodeldef, MODELPART_HEAD_EYESCLOSED); if (node1 && node2) { - union modelrwdata *data1 = modelGetNodeRwData(model, node1); - union modelrwdata *data2 = modelGetNodeRwData(model, node2); + union modelrwdata *data1 = model_get_node_rw_data(model, node1); + union modelrwdata *data2 = model_get_node_rw_data(model, node2); data2->toggle.visible = chr->actiontype == ACT_DIE || chr->actiontype == ACT_DEAD; data1->toggle.visible = !data2->toggle.visible; @@ -3543,7 +3543,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) } if (chr->race == RACE_DRCAROLL) { - chrSetDrCarollImages(chr, chr->drcarollimage_left, chr->drcarollimage_right); + chr_set_dr_caroll_images(chr, chr->drcarollimage_left, chr->drcarollimage_right); } g_Vars.currentplayerstats->drawplayercount++; @@ -3553,13 +3553,13 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) } // Render the chr's model - modelRender(&renderdata, model); + model_render(&renderdata, model); // Render attached props (eg. held guns and attached mines/knives/bolts) child = prop->child; while (child) { - chrRenderAttachedObject(child, &renderdata, xlupass, chr); + chr_render_attached_object(child, &renderdata, xlupass, chr); child = child->next; } @@ -3610,21 +3610,21 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) shadowalpha = shadowalpha * (400 - gaptoground) * 0.004f; } - if (cheatIsActive(CHEAT_SMALLCHARACTERS)) { + if (cheat_is_active(CHEAT_SMALLCHARACTERS)) { radius *= 0.4f; } - gdl = gfxRenderRadialShadow(gdl, prop->pos.x, chr->ground, prop->pos.z, chrGetInverseTheta(chr), radius, 0xffffff00 | shadowalpha); + gdl = gfx_render_radial_shadow(gdl, prop->pos.x, chr->ground, prop->pos.z, chr_get_inverse_theta(chr), radius, 0xffffff00 | shadowalpha); } } } - mtxF2LBulk(model->matrices, model->definition->nummatrices); + mtx_f2l_bulk(model->matrices, model->definition->nummatrices); if (USINGDEVICE(DEVICE_IRSCANNER)) { - gdl = chrRenderShield(gdl, chr, 0x80); + gdl = chr_render_shield(gdl, chr, 0x80); } else { - gdl = chrRenderShield(gdl, chr, alpha); + gdl = chr_render_shield(gdl, chr, alpha); } } } @@ -3634,18 +3634,18 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass) struct shieldhit *g_ShieldHits = NULL; -void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct coord *coord, struct coord *coord2, struct chrdata *chr2) +void chr_emit_sparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct coord *coord, struct coord *coord2, struct chrdata *chr2) { struct prop *chrprop = chr->prop; s32 race; - if (chrIsUsingPaintball(chr2)) { - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_PAINT); + if (chr_is_using_paintball(chr2)) { + sparks_create(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_PAINT); return; } - if (chrGetShield(chr) > 0.0f) { - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_DEFAULT); + if (chr_get_shield(chr) > 0.0f) { + sparks_create(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_DEFAULT); return; } @@ -3654,14 +3654,14 @@ void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct c || prop->type == PROPTYPE_DOOR || hitpart == HITPART_GUN || hitpart == HITPART_HAT) { - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_DEFAULT); + sparks_create(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_DEFAULT); return; } race = CHRRACE(chr); if (race == RACE_DRCAROLL || race == RACE_ROBOT || race == RACE_EYESPY) { - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_ELECTRICAL); + sparks_create(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_ELECTRICAL); return; } @@ -3675,12 +3675,12 @@ void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct c coord3.y = coord2->y * 42.0f + coord->y; coord3.z = coord2->z * 42.0f + coord->z; - sparksCreate(chrprop->rooms[0], chrprop, &coord3, coord2, 0, SPARKTYPE_FLESH_LARGE); + sparks_create(chrprop->rooms[0], chrprop, &coord3, coord2, 0, SPARKTYPE_FLESH_LARGE); } #if VERSION < VERSION_JPN_FINAL - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_BLOOD); - sparksCreate(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_FLESH); + sparks_create(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_BLOOD); + sparks_create(chrprop->rooms[0], chrprop, coord, coord2, 0, SPARKTYPE_FLESH); #endif } @@ -3705,7 +3705,7 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc s32 op; s32 nodetype; - modelNodeGetModelRelativePosition(model, modelNodeFindMtxNode(node), &relpos); + model_node_get_model_relative_position(model, model_node_find_mtx_node(node), &relpos); spc8.f[0] = arg3->x - relpos.x; spc8.f[1] = arg3->y - relpos.y; @@ -3720,7 +3720,7 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc switch (nodetype) { case MODELNODETYPE_DL: rodata = &curnode->rodata->dl; - rwdata = modelGetNodeRwData(model, curnode); + rwdata = model_get_node_rw_data(model, curnode); if (rwdata->gdl == NULL) { break; @@ -3786,8 +3786,8 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc } } else if (op == G_MTX) { u32 addr = gdlptr->words.w1 & 0xffffff; - posnode = modelFindNodeByMtxIndex(model, addr / sizeof(Mtxf)); - modelNodeGetModelRelativePosition(model, posnode, &spd4); + posnode = model_find_node_by_mtx_index(model, addr / sizeof(Mtxf)); + model_node_get_model_relative_position(model, posnode, &spd4); spbc[0] = spd4.x + spc8.x; spbc[1] = spd4.y + spc8.y; @@ -3799,13 +3799,13 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, curnode); + model_apply_distance_relations(model, curnode); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, curnode); + model_apply_toggle_relations(model, curnode); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, curnode); + model_apply_head_relations(model, curnode); break; } @@ -3843,7 +3843,7 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc switch (nodetype) { case MODELNODETYPE_DL: rodata = &curnode->rodata->dl; - rwdata = modelGetNodeRwData(model, curnode); + rwdata = model_get_node_rw_data(model, curnode); if (rwdata->gdl == NULL) { break; @@ -3891,7 +3891,7 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc if (x == bestcoords[0] && y == bestcoords[1] && z == bestcoords[2]) { if ((uintptr_t)rwdata->colours == ALIGN8((uintptr_t)rodata->vertices + rodata->numvertices * sizeof(Vtx))) { - Col *colours = vtxstoreAllocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); + Col *colours = vtxstore_allocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); s32 j; if (colours) { @@ -3916,8 +3916,8 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc } } else if (op == G_MTX) { u32 addr = gdlptr->words.w1 & 0xffffff; - posnode = modelFindNodeByMtxIndex(model, addr / sizeof(Mtxf)); - modelNodeGetModelRelativePosition(model, posnode, &spd4); + posnode = model_find_node_by_mtx_index(model, addr / sizeof(Mtxf)); + model_node_get_model_relative_position(model, posnode, &spd4); } else if (op == G_COL) { spac = gdlptr->words.w1 & 0xffffff; } @@ -3927,13 +3927,13 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, curnode); + model_apply_distance_relations(model, curnode); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, curnode); + model_apply_toggle_relations(model, curnode); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, curnode); + model_apply_head_relations(model, curnode); break; } @@ -3958,7 +3958,7 @@ void chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struc * This happens when the chr is shot, which creates the illusion of blood * soaking through their clothing. */ -void chrBruise(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) { struct modelnode *bestnode = NULL; bool ok; @@ -3980,7 +3980,7 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct struct modelrwdata_dl *rwdata; s32 spac = 0; - modelNodeGetModelRelativePosition(model, modelNodeFindMtxNode(node), &relpos); + model_node_get_model_relative_position(model, model_node_find_mtx_node(node), &relpos); spc8.f[0] = arg3->f[0] - relpos.f[0]; spc8.f[1] = arg3->f[1] - relpos.f[1]; @@ -3995,7 +3995,7 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct switch (nodetype) { case MODELNODETYPE_DL: rodata = &curnode->rodata->dl; - rwdata = modelGetNodeRwData(model, curnode); + rwdata = model_get_node_rw_data(model, curnode); if (rwdata->gdl == NULL) { break; @@ -4061,8 +4061,8 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct } } else if (op == G_MTX) { u32 addr = gdlptr->words.w1 & 0xffffff; - posnode = modelFindNodeByMtxIndex(model, addr / sizeof(Mtxf)); - modelNodeGetModelRelativePosition(model, posnode, &spd4); + posnode = model_find_node_by_mtx_index(model, addr / sizeof(Mtxf)); + model_node_get_model_relative_position(model, posnode, &spd4); spbc[0] = spd4.x + spc8.x; spbc[1] = spd4.y + spc8.y; @@ -4074,13 +4074,13 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, curnode); + model_apply_distance_relations(model, curnode); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, curnode); + model_apply_toggle_relations(model, curnode); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, curnode); + model_apply_head_relations(model, curnode); break; } @@ -4137,7 +4137,7 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct case MODELNODETYPE_DL: if (ok) { rodata = &curnode->rodata->dl; - rwdata = modelGetNodeRwData(model, curnode); + rwdata = model_get_node_rw_data(model, curnode); if (rwdata->gdl == NULL) { break; @@ -4189,7 +4189,7 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct if (coordinate == bestcoords[2]) { if ((uintptr_t)rwdata->colours == ALIGN8((u32)rodata->vertices + rodata->numvertices * sizeof(Vtx))) { - Col *colours = vtxstoreAllocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); + Col *colours = vtxstore_allocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); s32 j; if (colours) { @@ -4214,8 +4214,8 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct } } else if (op == G_MTX) { u32 addr = gdlptr->words.w1 & 0xffffff; - posnode = modelFindNodeByMtxIndex(model, addr / sizeof(Mtxf)); - modelNodeGetModelRelativePosition(model, posnode, &spd4); + posnode = model_find_node_by_mtx_index(model, addr / sizeof(Mtxf)); + model_node_get_model_relative_position(model, posnode, &spd4); } else if (op == G_COL) { spac = gdlptr->words.w1 & 0xffffff; } @@ -4226,13 +4226,13 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, curnode); + model_apply_distance_relations(model, curnode); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, curnode); + model_apply_toggle_relations(model, curnode); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, curnode); + model_apply_head_relations(model, curnode); break; } @@ -4266,7 +4266,7 @@ void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct * each pointer found, the vertices at that offset in the table are adjusted * randomly. Lastly, every colour in the node's colour table is darkened. */ -void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) +void chr_disfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) { struct modelnode *node; struct modelrodata_dl *rodata; @@ -4284,7 +4284,7 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) u32 rand = random(); - if (g_Vars.mplayerisrunning || !chrIsDead(chr)) { + if (g_Vars.mplayerisrunning || !chr_is_dead(chr)) { return; } @@ -4295,7 +4295,7 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) switch (node->type & 0xff) { case MODELNODETYPE_DL: rodata = &node->rodata->dl; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); if (rwdata->gdl == NULL) { break; @@ -4306,7 +4306,7 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) if (rwdata->vertices == rodata->vertices) { // Copy the vertices from the modeldef to the vtxstore if (rwdata->vertices == rodata->vertices) { - Vtx *vertices = vtxstoreAllocate(rodata->numvertices, VTXSTORETYPE_CHRVTX, 0, 0); + Vtx *vertices = vtxstore_allocate(rodata->numvertices, VTXSTORETYPE_CHRVTX, 0, 0); if (vertices) { for (i = 0; i < rodata->numvertices; i++) { @@ -4319,7 +4319,7 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) // Copy the colours from the modeldef to the vtxstore if ((uintptr_t)rwdata->colours == ALIGN8((uintptr_t)&rodata->vertices[rodata->numvertices])) { - colours = vtxstoreAllocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); + colours = vtxstore_allocate(rodata->numcolours, VTXSTORETYPE_CHRCOL, 0, 0); if (colours) { for (i = 0; i < rodata->numcolours; i++) { @@ -4373,7 +4373,7 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) if (posnode) { for (i = 0; i < numverts; i++) { - rng2SetSeed(rand + vertices[i].x + vertices[i].y + vertices[i].z + (u32)pos.f[0] + (u32)pos.f[1] + (u32)pos.f[2]); + rng2_set_seed(rand + vertices[i].x + vertices[i].y + vertices[i].z + (u32)pos.f[0] + (u32)pos.f[1] + (u32)pos.f[2]); if (vertices[i].x > 0) { vertices[i].x -= (s16)(random2() % 20); @@ -4398,8 +4398,8 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) } else if (op == G_MTX) { // Get the position of the node relative to the model u32 addr = gdlptr->words.w1 & 0xffffff; - posnode = modelFindNodeByMtxIndex(model, addr / sizeof(Mtxf)); - modelNodeGetModelRelativePosition(model, posnode, &pos); + posnode = model_find_node_by_mtx_index(model, addr / sizeof(Mtxf)); + model_node_get_model_relative_position(model, posnode, &pos); } gdlptr++; @@ -4423,13 +4423,13 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, node); + model_apply_distance_relations(model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, node); + model_apply_toggle_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; } @@ -4449,19 +4449,19 @@ void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius) } } -f32 chrGetHitRadius(struct chrdata *chr) +f32 chr_get_hit_radius(struct chrdata *chr) { s32 i; f32 result; f32 highest = 0; if (chr->model) { - result = modelGetEffectiveScale(chr->model); + result = model_get_effective_scale(chr->model); for (i = 0; i < 2; i++) { if (chr->weapons_held[i]) { struct defaultobj *obj = chr->weapons_held[i]->obj; - f32 value = modelGetEffectiveScale(obj->model) * chr->model->scale; + f32 value = model_get_effective_scale(obj->model) * chr->model->scale; if (value > highest) { highest = value; @@ -4471,7 +4471,7 @@ f32 chrGetHitRadius(struct chrdata *chr) result += highest; - if (chrGetShield(chr) > 0) { + if (chr_get_shield(chr) > 0) { result += 10; } } else { @@ -4481,14 +4481,14 @@ f32 chrGetHitRadius(struct chrdata *chr) return result; } -void chrTestHit(struct prop *prop, struct shotdata *shotdata, bool isshooting, bool cheap) +void chr_test_hit(struct prop *prop, struct shotdata *shotdata, bool isshooting, bool cheap) { struct coord spdc; struct coord spd0; struct chrdata *chr = prop->chr; if ((chr->chrflags & CHRCFLAG_HIDDEN) == 0 && (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK)) { - f32 radius = chrGetHitRadius(chr); + f32 radius = chr_get_hit_radius(chr); if (prop->z - radius < shotdata->distance) { struct model *model = chr->model; @@ -4498,7 +4498,7 @@ void chrTestHit(struct prop *prop, struct shotdata *shotdata, bool isshooting, b struct hitthing sp88; s32 sp84 = 0; struct modelnode *sp80 = NULL; - Mtxf *rootmtx = modelGetRootMtx(model); + Mtxf *rootmtx = model_get_root_mtx(model); struct prop *next; struct prop *child; f32 sp70; @@ -4511,7 +4511,7 @@ void chrTestHit(struct prop *prop, struct shotdata *shotdata, bool isshooting, b } if (hitpart) { - if (chrGetShield(chr) > 0.0f) { + if (chr_get_shield(chr) > 0.0f) { var8005efc0 = 10.0f / model->scale; } @@ -4524,27 +4524,27 @@ void chrTestHit(struct prop *prop, struct shotdata *shotdata, bool isshooting, b } if (cheap || var8005efc0 > 0.0f) { - hitpart = modelTestForHit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node); + hitpart = model_test_for_hit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node); while (hitpart > 0) { if (func0f084594(model, node, &shotdata->gunpos2d, &shotdata->gundir2d, &sp88, &sp84, &sp80)) { - mtx4TransformVec(&model->matrices[sp84], &sp88.pos, &spdc); - mtx4TransformVecInPlace(camGetProjectionMtxF(), &spdc); - mtx4RotateVec(&model->matrices[sp84], &sp88.unk0c, &spd0); - mtx4RotateVecInPlace(camGetProjectionMtxF(), &spd0); + mtx4_transform_vec(&model->matrices[sp84], &sp88.pos, &spdc); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &spdc); + mtx4_rotate_vec(&model->matrices[sp84], &sp88.unk0c, &spd0); + mtx4_rotate_vec_in_place(cam_get_projection_mtxf(), &spd0); break; } - hitpart = modelTestForHit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node); + hitpart = model_test_for_hit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node); } } else { - hitpart = modelTestForHit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node); + hitpart = model_test_for_hit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node); if (hitpart > 0) { if (func0f06bea0(model, model->definition->rootnode, model->definition->rootnode, &shotdata->gunpos2d, &shotdata->gundir2d, &sp88.pos, &sp70, &node, &hitpart, &sp84, &sp80)) { - mtx4TransformVec(camGetProjectionMtxF(), &sp88.pos, &spdc); - mtx4RotateVec(camGetProjectionMtxF(), &sp88.unk0c, &spd0); + mtx4_transform_vec(cam_get_projection_mtxf(), &sp88.pos, &spdc); + mtx4_rotate_vec(cam_get_projection_mtxf(), &sp88.unk0c, &spd0); } else { hitpart = 0; } @@ -4557,17 +4557,17 @@ void chrTestHit(struct prop *prop, struct shotdata *shotdata, bool isshooting, b } if (hitpart > 0) { - mtx = camGetWorldToScreenMtxf(); + mtx = cam_get_world_to_screen_mtxf(); sp68 = spdc.x * mtx->m[0][2] + spdc.y * mtx->m[1][2] + spdc.z * mtx->m[2][2] + mtx->m[3][2]; sp68 = -sp68; if (sp68 < shotdata->distance) { - hitCreate(shotdata, prop, sp68, hitpart, node, &sp88, sp84, sp80, model, true, chrGetShield(chr) > 0.0f, &spdc, &spd0); + hit_create(shotdata, prop, sp68, hitpart, node, &sp88, sp84, sp80, model, true, chr_get_shield(chr) > 0.0f, &spdc, &spd0); } } if (spb8 && hitpart <= 0 && prop->z <= shotdata->distance && isshooting) { - if (chrGetTargetProp(chr) == g_Vars.currentplayer->prop) { + if (chr_get_target_prop(chr) == g_Vars.currentplayer->prop) { chr->chrflags |= CHRCFLAG_NEAR_MISS; } @@ -4580,7 +4580,7 @@ void chrTestHit(struct prop *prop, struct shotdata *shotdata, bool isshooting, b /** * Handle a chr being shot. */ -void chrHit(struct shotdata *shotdata, struct hit *hit) +void chr_hit(struct shotdata *shotdata, struct hit *hit) { struct prop *prop; struct chrdata *chr; @@ -4589,7 +4589,7 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) struct coord sp98; s16 sp90[3]; u8 ismelee = false; - struct weaponfunc *func = gsetGetWeaponFunction(&shotdata->gset); + struct weaponfunc *func = gset_get_weapon_function(&shotdata->gset); f32 shield; if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_MELEE) { @@ -4611,19 +4611,19 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) sp98.y = shotdata->gunpos2d.y - (hit->distance * shotdata->gundir2d.y) / shotdata->gundir2d.z; sp98.z = shotdata->gunpos2d.z - hit->distance; - mtx4TransformVec(camGetProjectionMtxF(), &sp98, &hitpos); - bgunSetHitPos(&hitpos); - bgunPlayPropHitSound(&shotdata->gset, hit->prop, -1); + mtx4_transform_vec(cam_get_projection_mtxf(), &sp98, &hitpos); + bgun_set_hit_pos(&hitpos); + bgun_play_prop_hit_sound(&shotdata->gset, hit->prop, -1); - chrEmitSparks(chr, hit->prop, hit->hitpart, &hitpos, &shotdata->gundir3d, g_Vars.currentplayer->prop->chr); + chr_emit_sparks(chr, hit->prop, hit->hitpart, &hitpos, &shotdata->gundir3d, g_Vars.currentplayer->prop->chr); sp90[0] = hit->hitthing.pos.x; sp90[1] = hit->hitthing.pos.y; sp90[2] = hit->hitthing.pos.z; - shield = chrGetShield(chr); + shield = chr_get_shield(chr); - func0f0341dc(chr, gsetGetDamage(&shotdata->gset), &shotdata->gundir3d, &shotdata->gset, + func0f0341dc(chr, gset_get_damage(&shotdata->gset), &shotdata->gundir3d, &shotdata->gset, g_Vars.currentplayer->prop, hit->hitpart, hit->prop, hit->bboxnode, hit->model, hit->hitthing.unk28 / 2, sp90); @@ -4659,9 +4659,9 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) || weapon->weaponnum == WEAPON_TIMEDMINE || weapon->weaponnum == WEAPON_REMOTEMINE || weapon->weaponnum == WEAPON_PROXIMITYMINE) { - objSetDropped(hit->prop, DROPTYPE_DEFAULT); + obj_set_dropped(hit->prop, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; - objDamage(&weapon->base, gsetGetDamage(&shotdata->gset), &sp98, shotdata->gset.weaponnum, g_Vars.currentplayernum); + obj_damage(&weapon->base, gset_get_damage(&shotdata->gset), &sp98, shotdata->gset.weaponnum, g_Vars.currentplayernum); return; } @@ -4678,7 +4678,7 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) if (type->numwallhittexes > 0) { index = random() % type->numwallhittexes; - wallhitCreate( + wallhit_create( &hit->hitthing.pos, &hit->hitthing.unk0c, &shotdata->gunpos3d, @@ -4697,7 +4697,7 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) // Drop gun if (chr->aibot == NULL && (chr->flags & CHRFLAG0_CANLOSEGUN)) { chr->gunprop = hit->prop; - objSetDropped(hit->prop, DROPTYPE_DEFAULT); + obj_set_dropped(hit->prop, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } } else if (hit->hitpart == HITPART_HAT) { @@ -4714,7 +4714,7 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) index = random() % type->numwallhittexes; - wallhitCreate( + wallhit_create( &hit->hitthing.pos, &hit->hitthing.unk0c, &shotdata->gunpos3d, @@ -4731,11 +4731,11 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) // Shot a chr in the flesh s32 race = CHRRACE(chr); struct coord sp5c; - Mtxf *sp58 = modelFindNodeMtx(hit->model, hit->bboxnode, 0); + Mtxf *sp58 = model_find_node_mtx(hit->model, hit->bboxnode, 0); // Create blood mtx0001719c(sp58->m, spb0.m); - mtx4TransformVec(&spb0, &sp98, &sp5c); + mtx4_transform_vec(&spb0, &sp98, &sp5c); #if VERSION >= VERSION_NTSC_1_0 if (!chr->noblood @@ -4752,16 +4752,16 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) darker = false; } - if (!chrIsUsingPaintball(g_Vars.currentplayer->prop->chr)) { - chrBruise(hit->model, hit->hitpart, hit->bboxnode, &sp5c); + if (!chr_is_using_paintball(g_Vars.currentplayer->prop->chr)) { + chr_bruise(hit->model, hit->hitpart, hit->bboxnode, &sp5c); } - splatsCreateForChrHit(prop, shotdata, &sp98, &hitpos, darker, 0, g_Vars.currentplayer->prop->chr); + splats_create_for_chr_hit(prop, shotdata, &sp98, &hitpos, darker, 0, g_Vars.currentplayer->prop->chr); } #else // NTSC beta wraps all the blood logic in this paintball check. // If paintball is enabled, neither blood nor paint is created. - if (!chrIsUsingPaintball(g_Vars.currentplayer->prop->chr) + if (!chr_is_using_paintball(g_Vars.currentplayer->prop->chr) && !chr->noblood && race != RACE_DRCAROLL && race != RACE_ROBOT @@ -4776,9 +4776,9 @@ void chrHit(struct shotdata *shotdata, struct hit *hit) darker = false; } - chrBruise(hit->model, hit->hitpart, hit->bboxnode, &sp5c); + chr_bruise(hit->model, hit->hitpart, hit->bboxnode, &sp5c); - splatsCreateForChrHit(prop, shotdata, &sp98, &hitpos, darker, 0, g_Vars.currentplayer->prop->chr); + splats_create_for_chr_hit(prop, shotdata, &sp98, &hitpos, darker, 0, g_Vars.currentplayer->prop->chr); } #endif } @@ -4802,7 +4802,7 @@ void chr0f0284ac(s32 arg0) g_SelectedAnimNum -= arg0; if (g_SelectedAnimNum <= 0) { - g_SelectedAnimNum = animGetNumAnimations() - 1; + g_SelectedAnimNum = anim_get_num_animations() - 1; } } @@ -4810,7 +4810,7 @@ void chr0f0284f4(s32 arg0) { g_SelectedAnimNum += arg0; - if (g_SelectedAnimNum >= animGetNumAnimations()) { + if (g_SelectedAnimNum >= anim_get_num_animations()) { g_SelectedAnimNum = 1; } } @@ -4824,10 +4824,10 @@ void chr0f02855c(s32 arg0) { var80062978 = arg0; - mainOverrideVariable("selectanimnum", &g_SelectedAnimNum); + main_override_variable("selectanimnum", &g_SelectedAnimNum); } -void chrsCheckForNoise(f32 noiseradius) +void chrs_check_for_noise(f32 noiseradius) { s32 i; f32 add = 0.075f; @@ -4837,9 +4837,9 @@ void chrsCheckForNoise(f32 noiseradius) struct prop *prop = g_ChrSlots[i].prop; if (prop && prop->type == PROPTYPE_CHR && - chrGetTargetProp(&g_ChrSlots[i]) == g_Vars.currentplayer->prop) { + chr_get_target_prop(&g_ChrSlots[i]) == g_Vars.currentplayer->prop) { - f32 distance = chrGetDistanceToCurrentPlayer(&g_ChrSlots[i]); + f32 distance = chr_get_distance_to_current_player(&g_ChrSlots[i]); if (distance == 0) { distance = 2; @@ -4848,7 +4848,7 @@ void chrsCheckForNoise(f32 noiseradius) } if (distance > 1.0f) { - chrRecordLastHearTargetTime(&g_ChrSlots[i]); + chr_record_last_hear_target_time(&g_ChrSlots[i]); #if PIRACYCHECKS { s32 *i = (s32 *)&__scHandleRetrace; @@ -4872,7 +4872,7 @@ void chrsCheckForNoise(f32 noiseradius) } } -struct chrdata *chrFindByLiteralId(s32 chrnum) +struct chrdata *chr_find_by_literal_id(s32 chrnum) { s32 lower = 0; s32 upper = g_NumChrs; @@ -4895,19 +4895,19 @@ struct chrdata *chrFindByLiteralId(s32 chrnum) return NULL; } -struct prop *chrGetHeldProp(struct chrdata *chr, s32 hand) +struct prop *chr_get_held_prop(struct chrdata *chr, s32 hand) { return chr->weapons_held[hand]; } -struct prop *chrGetHeldUsableProp(struct chrdata *chr, s32 hand) +struct prop *chr_get_held_usable_prop(struct chrdata *chr, s32 hand) { struct prop *prop = chr->weapons_held[hand]; if (prop) { struct weaponobj *weapon = prop->weapon; - if (!weaponHasFlag(weapon->weaponnum, WEAPONFLAG_AICANUSE)) { + if (!weapon_has_flag(weapon->weaponnum, WEAPONFLAG_AICANUSE)) { prop = NULL; } } @@ -4915,7 +4915,7 @@ struct prop *chrGetHeldUsableProp(struct chrdata *chr, s32 hand) return prop; } -struct prop *chrGetTargetProp(struct chrdata *chr) +struct prop *chr_get_target_prop(struct chrdata *chr) { struct prop *ret; @@ -4928,7 +4928,7 @@ struct prop *chrGetTargetProp(struct chrdata *chr) return ret; } -bool chrUpdateGeometry(struct prop *prop, u8 **start, u8 **end) +bool chr_update_geometry(struct prop *prop, u8 **start, u8 **end) { struct chrdata *chr = prop->chr; @@ -4973,7 +4973,7 @@ bool chrUpdateGeometry(struct prop *prop, u8 **start, u8 **end) return false; } -void chrGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) +void chr_get_bbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) { struct chrdata *chr = prop->chr; @@ -4986,13 +4986,13 @@ void chrGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) } } -f32 chrGetGround(struct prop *prop) +f32 chr_get_ground(struct prop *prop) { struct chrdata *chr = prop->chr; return chr->ground; } -bool chrCalculateAutoAim(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3) +bool chr_calculate_auto_aim(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3) { struct chrdata *chr = prop->chr; @@ -5004,7 +5004,7 @@ bool chrCalculateAutoAim(struct prop *prop, struct coord *arg1, f32 *arg2, f32 * && chr->actiontype != ACT_DEAD && (chr->chrflags & CHRCFLAG_NOAUTOAIM) == 0 && ((chr->hidden & CHRHFLAG_CLOAKED) == 0 || USINGDEVICE(DEVICE_IRSCANNER)) - && !(prop->type == PROPTYPE_PLAYER && g_Vars.players[playermgrGetPlayerNumByProp(prop)]->isdead) + && !(prop->type == PROPTYPE_PLAYER && g_Vars.players[playermgr_get_player_num_by_prop(prop)]->isdead) && !(g_Vars.coopplayernum >= 0 && (prop == g_Vars.bond->prop || prop == g_Vars.coop->prop))) { struct model *model = chr->model; Mtxf *mtx1; @@ -5054,7 +5054,7 @@ bool chrCalculateAutoAim(struct prop *prop, struct coord *arg1, f32 *arg2, f32 * bool chr0f028d50(struct prop *arg0, struct prop *arg1, struct modelnode *node, struct model *model, s32 *total) { if (arg1 == arg0) { - *total += modelFindNodeMtxIndex(node, 0); + *total += model_find_node_mtx_index(node, 0); return true; } @@ -5110,7 +5110,7 @@ bool chr0f028e6c(s32 arg0, struct prop *prop, struct prop **propptr, struct mode } } else { *propptr = prop; - *nodeptr = modelFindNodeByMtxIndex(model, arg0); + *nodeptr = model_find_node_by_mtx_index(model, arg0); *modelptr = model; result = true; } @@ -5119,7 +5119,7 @@ bool chr0f028e6c(s32 arg0, struct prop *prop, struct prop **propptr, struct mode } } -void shieldhitCreate(struct prop *prop, f32 shield, struct prop *arg2, struct modelnode *node, struct model *model, s32 side, s16 *arg6) +void shieldhit_create(struct prop *prop, f32 shield, struct prop *arg2, struct modelnode *node, struct model *model, s32 side, s16 *arg6) { struct shieldhit *shieldhit = NULL; s32 i; @@ -5208,7 +5208,7 @@ void shieldhitCreate(struct prop *prop, f32 shield, struct prop *arg2, struct mo g_ShieldHitActive = true; } -void shieldhitRemove(struct shieldhit *shieldhit) +void shieldhit_remove(struct shieldhit *shieldhit) { s32 exists = false; s32 i; @@ -5247,13 +5247,13 @@ void shieldhitRemove(struct shieldhit *shieldhit) } } -void shieldhitsRemoveByProp(struct prop *prop) +void shieldhits_remove_by_prop(struct prop *prop) { s32 i; for (i = 0; i < 20; i++) { if (prop == g_ShieldHits[i].prop) { - shieldhitRemove(&g_ShieldHits[i]); + shieldhit_remove(&g_ShieldHits[i]); } } } @@ -5267,7 +5267,7 @@ s32 chr0f02932c(struct prop *prop, s32 arg1) struct model *model; if (chr0f028e6c(arg1, prop, &prop2, &node, &model) && node) { - node2 = modelNodeFindParentMtxNode(node); + node2 = model_node_find_parent_mtx_node(node); if (node2) { result = chr0f028e18(prop2, node2, model, prop); @@ -5288,7 +5288,7 @@ s32 chr0f0293ec(struct prop *prop, s32 cmnum) struct model *model; if (chr0f028e6c(cmnum, prop, &prop2, &node, &model) && node) { - node2 = modelNodeFindChildMtxNode(node); + node2 = model_node_find_child_mtx_node(node); if (node2) { result = chr0f028e18(prop2, node2, model, prop); @@ -5322,11 +5322,11 @@ s32 chr0f0294cc(struct prop *prop, s32 arg1) struct model *model2; if (chr0f028e6c(arg1, prop, &prop2, &node2, &model2) && node2) { - struct modelnode *node3 = modelNodeFindChildOrParentMtxNode(node2); + struct modelnode *node3 = model_node_find_child_or_parent_mtx_node(node2); if (node3) { result = chr0f028e18(prop2, node3, model2, prop); - } else if (modelNodeFindParentMtxNode(node2) == NULL && prop2->parent) { + } else if (model_node_find_parent_mtx_node(node2) == NULL && prop2->parent) { child = prop2->parent->child; while (child && child != prop2) { @@ -5390,12 +5390,12 @@ void chr0f0295f8(f32 arg0, s32 *arg1, s32 *arg2, s32 *arg3) *arg3 = 0; } -f32 propGetShieldThing(struct prop **propptr) +f32 prop_get_shield_thing(struct prop **propptr) { struct prop *prop = *propptr; if (prop->type == PROPTYPE_CHR || prop->type == PROPTYPE_PLAYER) { - return chrGetShield(prop->chr); + return chr_get_shield(prop->chr); } if (prop->type == PROPTYPE_OBJ @@ -5415,7 +5415,7 @@ f32 propGetShieldThing(struct prop **propptr) bool g_ShieldHitActive = false; -Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop, struct model *model, +Gfx *chr_render_shield_component(Gfx *gdl, struct shieldhit *hit, struct prop *prop, struct model *model, struct modelnode *node, s32 side, s32 arg6, s32 arg7, s32 alpha) { struct modelrodata_bbox *bbox = &node->rodata->bbox; @@ -5467,7 +5467,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop if (prop->type == PROPTYPE_CHR || prop->type == PROPTYPE_PLAYER) { struct chrdata *chr = prop->chr; gap = 10.0f / chr->model->scale; - shieldamount = chrGetShield(chr); + shieldamount = chr_get_shield(chr); cloakfade = chr->cloakfadefrac; cmcount = chr->cmcount; } else { @@ -5478,7 +5478,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop shieldamount = (obj->flags3 & OBJFLAG3_SHOWSHIELD) ? 4.0f : 8.0f; } - mtxindex = modelFindNodeMtxIndex(node, 0); + mtxindex = model_find_node_mtx_index(node, 0); modelmtx = &model->matrices[mtxindex]; xmin = bbox->xmin - gap; @@ -5523,7 +5523,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop gSPMatrix(gdl++, osVirtualToPhysical(modelmtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (side == -7) { - colours = gfxAllocateColours(1); + colours = gfx_allocate_colours(1); gSPColor(gdl++, osVirtualToPhysical(colours), 1); @@ -5537,7 +5537,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop colours[0].a = (s32) ((127 - cloakfade) * (f32) alpha * (1.0f / 85.0f)); } - vertices = gfxAllocateVertices(24); + vertices = gfx_allocate_vertices(24); for (i = 0; i < ARRAYCOUNT(sp104); i++) { for (j = 0; j < ARRAYCOUNT(sp104[i]); j++) { @@ -5566,7 +5566,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop } else { f32 shield; - texSelect(&gdl, &g_TexShieldConfigs[0], 4, 1, 2, true, NULL); + tex_select(&gdl, &g_TexShieldConfigs[0], 4, 1, 2, true, NULL); if (side >= 0) { shield = hit->shield; @@ -5622,7 +5622,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop st4 = st2 + 512; if (side == -3 || side == -4 || side == -5 || side == -6) { - colours = gfxAllocateColours(1); + colours = gfx_allocate_colours(1); gSPColor(gdl++, osVirtualToPhysical(colours), 1); @@ -5649,7 +5649,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop } } - vertices = gfxAllocateVertices(24); + vertices = gfx_allocate_vertices(24); if ((prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR) && (prop->obj->flags3 & OBJFLAG3_SHOWSHIELD)) { @@ -5710,7 +5710,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop alpha3 = 0.0f; } - colours = gfxAllocateColours(3); + colours = gfx_allocate_colours(3); gSPColor(gdl++, osVirtualToPhysical(colours), 3); @@ -5723,7 +5723,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop colours[0].a = (s32) alpha3; colours[1].a = 0; - vertices = gfxAllocateVertices(30); + vertices = gfx_allocate_vertices(30); for (i = 0; i < ARRAYCOUNT(sp104); i++) { for (j = 0; j < ARRAYCOUNT(sp104[i]); j++) { @@ -5758,7 +5758,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop vertices += 5; } } else if (side < 0) { - vertices = gfxAllocateVertices(12); + vertices = gfx_allocate_vertices(12); if (side == -1) { if (g_Vars.lvframe60 - hit->lvframe60 <= TICKS(80)) { @@ -5770,7 +5770,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop alpha1 = 0; } - colours = gfxAllocateColours(1); + colours = gfx_allocate_colours(1); gSPColor(gdl++, osVirtualToPhysical(colours), 1); @@ -5795,7 +5795,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop alpha4 = 0.0f; } - colours = gfxAllocateColours(1); + colours = gfx_allocate_colours(1); gSPColor(gdl++, osVirtualToPhysical(colours), 1); @@ -5893,7 +5893,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop alpha2 = 0; } - colours = gfxAllocateColours(5); + colours = gfx_allocate_colours(5); gSPColor(gdl++, osVirtualToPhysical(colours), 5); @@ -5964,7 +5964,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop colours[4].a = alpha1; - vertices = gfxAllocateVertices(30); + vertices = gfx_allocate_vertices(30); for (j = 0; j < ARRAYCOUNT(sp104[side]); j++) { vertices[j] = vtxtemplate; @@ -6143,7 +6143,7 @@ Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop * Objects can have a specific model part for the shield area (eg. hoverbed). * If not specified, every bbox node in the object will be used. */ -Gfx *shieldhitRender(Gfx *gdl, struct prop *prop1, struct prop *prop2, 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) { u32 stack[4]; @@ -6158,7 +6158,7 @@ Gfx *shieldhitRender(Gfx *gdl, struct prop *prop1, struct prop *prop2, s32 alpha model = chr->model; } else { model = prop2->obj->model; - specificnode = modelGetPart(model->definition, MODELPART_BASIC_0067); + specificnode = model_get_part(model->definition, MODELPART_BASIC_0067); } node = model->definition->rootnode; @@ -6197,11 +6197,11 @@ Gfx *shieldhitRender(Gfx *gdl, struct prop *prop1, struct prop *prop2, s32 alpha } if (s0) { - gdl = chrRenderShieldComponent(gdl, s0, prop1, s0->model, s0->node, s0->side, -1, -1, 255); + gdl = chr_render_shield_component(gdl, s0, prop1, s0->model, s0->node, s0->side, -1, -1, 255); } else if (s1) { - gdl = chrRenderShieldComponent(gdl, s1, prop1, model, node, -1, -1, -1, 255); + gdl = chr_render_shield_component(gdl, s1, prop1, model, node, -1, -1, -1, 255); } else if (s2) { - gdl = chrRenderShieldComponent(gdl, s2, prop1, model, node, -2, s2->unk018[index], s2->unk038[index], 255); + gdl = chr_render_shield_component(gdl, s2, prop1, model, node, -2, s2->unk018[index], s2->unk038[index], 255); } else { if (arg4) { if (specificnode) { @@ -6222,16 +6222,16 @@ Gfx *shieldhitRender(Gfx *gdl, struct prop *prop1, struct prop *prop2, s32 alpha gDPSetTextureFilter(gdl++, G_TF_BILERP); gDPSetColorDither(gdl++, G_CD_BAYER); - gdl = chrRenderShieldComponent(gdl, NULL, prop1, model, node, -7, -1, -1, 255); + gdl = chr_render_shield_component(gdl, NULL, prop1, model, node, -7, -1, -1, 255); } else { if (index == cmnum1) { - gdl = chrRenderShieldComponent(gdl, NULL, prop1, model, node, -3, -1, -1, alpha); + gdl = chr_render_shield_component(gdl, NULL, prop1, model, node, -3, -1, -1, alpha); } else if (index == cmnum2) { - gdl = chrRenderShieldComponent(gdl, NULL, prop1, model, node, -4, -1, -1, alpha); + gdl = chr_render_shield_component(gdl, NULL, prop1, model, node, -4, -1, -1, alpha); } else if (index == cmnum3) { - gdl = chrRenderShieldComponent(gdl, NULL, prop1, model, node, -5, -1, -1, alpha); + gdl = chr_render_shield_component(gdl, NULL, prop1, model, node, -5, -1, -1, alpha); } else if (index == cmnum4) { - gdl = chrRenderShieldComponent(gdl, NULL, prop1, model, node, -6, -1, -1, alpha); + gdl = chr_render_shield_component(gdl, NULL, prop1, model, node, -6, -1, -1, alpha); } } } @@ -6256,7 +6256,7 @@ Gfx *shieldhitRender(Gfx *gdl, struct prop *prop1, struct prop *prop2, s32 alpha struct prop *child; for (child = prop2->child; child != NULL; child = child->next) { - gdl = shieldhitRender(gdl, prop1, child, alpha, arg4, cmnum1, cmnum2, cmnum3, cmnum4); + gdl = shieldhit_render(gdl, prop1, child, alpha, arg4, cmnum1, cmnum2, cmnum3, cmnum4); } } } @@ -6272,7 +6272,7 @@ Gfx *shieldhitRender(Gfx *gdl, struct prop *prop1, struct prop *prop2, s32 alpha * The function iterates the child props and calls itself recursively, setting * thisprop to the current child being iterated. */ -Gfx *chrRenderCloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) +Gfx *chr_render_cloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) { struct model *model; struct modelnode *bbox = NULL; @@ -6283,7 +6283,7 @@ Gfx *chrRenderCloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) model = thisprop->chr->model; } else { model = thisprop->obj->model; - bbox = modelGetPart(model->definition, MODELPART_BASIC_0067); + bbox = model_get_part(model->definition, MODELPART_BASIC_0067); } if (thisprop->parent == NULL) { @@ -6324,7 +6324,7 @@ Gfx *chrRenderCloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) } if (index <= 19) { - Mtxf *mtx = modelFindNodeMtx(model, modelNodeFindMtxNode(node), 0); + Mtxf *mtx = model_find_node_mtx(model, model_node_find_mtx_node(node), 0); s32 uls; // upper left s coordinate s32 ult; // upper left t coordinate struct coord coord; @@ -6342,35 +6342,35 @@ Gfx *chrRenderCloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) screenpos[0] = 0.0f; } - if (screenpos[0] > viGetWidth()) { - screenpos[0] = viGetWidth(); + if (screenpos[0] > vi_get_width()) { + screenpos[0] = vi_get_width(); } if (screenpos[1] < 0.0f) { screenpos[1] = 0.0f; } - if (screenpos[1] > viGetHeight()) { - screenpos[1] = viGetHeight(); + if (screenpos[1] > vi_get_height()) { + screenpos[1] = vi_get_height(); } uls = (s32)screenpos[0] - 8; ult = (s32)screenpos[1] - 8; - if (uls < viGetViewLeft()) { - uls = viGetViewLeft(); + if (uls < vi_get_view_left()) { + uls = vi_get_view_left(); } - if (uls > viGetViewLeft() + viGetViewWidth() - 16) { - uls = viGetViewLeft() + viGetViewWidth() - 16; + if (uls > vi_get_view_left() + vi_get_view_width() - 16) { + uls = vi_get_view_left() + vi_get_view_width() - 16; } - if (ult < viGetViewTop()) { - ult = viGetViewTop(); + if (ult < vi_get_view_top()) { + ult = vi_get_view_top(); } - if (ult > viGetViewTop() + viGetViewHeight() - 16) { - ult = viGetViewTop() + viGetViewHeight() - 16; + if (ult > vi_get_view_top() + vi_get_view_height() - 16) { + ult = vi_get_view_top() + vi_get_view_height() - 16; } lrs = uls + 15; @@ -6379,8 +6379,8 @@ Gfx *chrRenderCloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, OS_K0_TO_PHYSICAL(var8009ccc0[index])); gDPTileSync(gdl++); - gDPLoadTextureTile(gdl++, viGetBackBuffer(), G_IM_FMT_RGBA, G_IM_SIZ_16b, - viGetWidth(), 0, uls, ult, lrs, lrt, + gDPLoadTextureTile(gdl++, vi_get_back_buffer(), G_IM_FMT_RGBA, G_IM_SIZ_16b, + vi_get_width(), 0, uls, ult, lrs, lrt, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD); @@ -6409,7 +6409,7 @@ Gfx *chrRenderCloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) struct prop *child; for (child = thisprop->child; child != NULL; child = child->next) { - gdl = chrRenderCloak(gdl, chrprop, child); + gdl = chr_render_cloak(gdl, chrprop, child); } } @@ -6418,8 +6418,8 @@ Gfx *chrRenderCloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) gDPPipeSync(gdl++); gDPLoadSync(gdl++); gDPTileSync(gdl++); - gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetBufWidth(), OS_K0_TO_PHYSICAL(viGetBackBuffer())); - gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetWidth(), viGetHeight()); + gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, vi_get_buf_width(), OS_K0_TO_PHYSICAL(vi_get_back_buffer())); + gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, vi_get_width(), vi_get_height()); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetRenderMode(gdl++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI); @@ -6432,9 +6432,9 @@ Gfx *chrRenderCloak(Gfx *gdl, struct prop *chrprop, struct prop *thisprop) return gdl; } -Gfx *chrRenderShield(Gfx *gdl, struct chrdata *chr, u32 alpha) +Gfx *chr_render_shield(Gfx *gdl, struct chrdata *chr, u32 alpha) { - if (chrGetShield(chr) > 0 && g_Vars.lvupdate240 > 0) { + if (chr_get_shield(chr) > 0 && g_Vars.lvupdate240 > 0) { chr->cmcount++; if (chr->cmcount > 300) { @@ -6443,9 +6443,9 @@ Gfx *chrRenderShield(Gfx *gdl, struct chrdata *chr, u32 alpha) } if ((chr->hidden2 & CHRH2FLAG_SHIELDHIT) - || (chrGetShield(chr) > 0 && chr->cmcount < 10) + || (chr_get_shield(chr) > 0 && chr->cmcount < 10) || (chr->cloakfadefrac > 0 && !chr->cloakfadefinished)) { - if (chrGetShield(chr) > 0 && g_Vars.lvupdate240 > 0) { + if (chr_get_shield(chr) > 0 && g_Vars.lvupdate240 > 0) { s32 numiterations = (random() % 4) + 1; s32 newcmnum = chr->cmnum2; s32 candidate; @@ -6508,7 +6508,7 @@ Gfx *chrRenderShield(Gfx *gdl, struct chrdata *chr, u32 alpha) gSPSetGeometryMode(gdl++, G_CULL_BACK); - gdl = shieldhitRender(gdl, chr->prop, chr->prop, alpha, + gdl = shieldhit_render(gdl, chr->prop, chr->prop, alpha, chr->cloakfadefrac > 0 && !chr->cloakfadefinished, chr->cmnum, chr->cmnum2, chr->cmnum3, chr->cmnum4); @@ -6521,7 +6521,7 @@ Gfx *chrRenderShield(Gfx *gdl, struct chrdata *chr, u32 alpha) /** * This ticks the shield damage effect when you shoot a shielded chr. */ -void shieldhitsTick(void) +void shieldhits_tick(void) { s32 index; bool changed = false; @@ -6534,7 +6534,7 @@ void shieldhitsTick(void) if (g_ShieldHits[i].prop) { if (g_ShieldHits[i].lvframe60 >= g_Vars.lvframe60 - TICKS(80)) { changed = true; - g_ShieldHits[i].shield += (propGetShieldThing(&g_ShieldHits[i].prop) - g_ShieldHits[i].shield) * g_Vars.lvupdate60f * (PAL ? 0.0151515156f : 0.0125f); + g_ShieldHits[i].shield += (prop_get_shield_thing(&g_ShieldHits[i].prop) - g_ShieldHits[i].shield) * g_Vars.lvupdate60f * (PAL ? 0.0151515156f : 0.0125f); } for (j = 0; j < 32; j++) { @@ -6581,14 +6581,14 @@ void shieldhitsTick(void) } if (!changed) { - shieldhitRemove(&g_ShieldHits[i]); + shieldhit_remove(&g_ShieldHits[i]); } } } } } -void chrSetDrCarollImages(struct chrdata *drcaroll, s32 imageleft, s32 imageright) +void chr_set_dr_caroll_images(struct chrdata *drcaroll, s32 imageleft, s32 imageright) { if (drcaroll && imageleft >= DRCAROLLIMAGE_EYESDEFAULT && imageleft <= DRCAROLLIMAGE_BINARY @@ -6604,12 +6604,12 @@ void chrSetDrCarollImages(struct chrdata *drcaroll, s32 imageleft, s32 imagerigh // Parts 0-5 are the left image // Parts 6-11 are the right image for (i = 0; i < 6; i++) { - nodes[0] = modelGetPart(model->definition, i); - nodes[1] = modelGetPart(model->definition, i + 6); + nodes[0] = model_get_part(model->definition, i); + nodes[1] = model_get_part(model->definition, i + 6); for (j = 0; j < ARRAYCOUNT(nodes); j++) { if (nodes[j]) { - rwdata = modelGetNodeRwData(model, nodes[j]); + rwdata = model_get_node_rw_data(model, nodes[j]); if (j == 0) { rwdata->toggle.visible = (imageleft == i) ? true : false; diff --git a/src/game/chraction.c b/src/game/chraction.c index 0a120ac61..3a5d960f6 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -1421,7 +1421,7 @@ f32 func0f02dff0(s16 animnum) return 1.0f; } -bool chrGoPosIsWaiting(struct chrdata *chr) +bool chr_go_pos_is_waiting(struct chrdata *chr) { static s16 list1[] = { ANIM_TWO_GUN_HOLD, ANIM_006A, -1 }; static s16 list2[] = { ANIM_00C0, -1 }; @@ -1436,7 +1436,7 @@ bool chrGoPosIsWaiting(struct chrdata *chr) return true; } } else { - s16 animnum = modelGetAnimNum(chr->model); + s16 animnum = model_get_anim_num(chr->model); s32 i; for (i = 0; i < ARRAYCOUNT(waitableanims); i++) { @@ -1454,11 +1454,11 @@ bool chrGoPosIsWaiting(struct chrdata *chr) return false; } -bool weaponIsOneHanded(struct prop *prop) +bool weapon_is_one_handed(struct prop *prop) { if (prop) { struct weaponobj *weapon = prop->weapon; - return weaponHasFlag(weapon->weaponnum, WEAPONFLAG_ONEHANDED); + return weapon_has_flag(weapon->weaponnum, WEAPONFLAG_ONEHANDED); } return false; @@ -1474,11 +1474,11 @@ bool weaponIsOneHanded(struct prop *prop) * reaction speed is always zero because PD doesn't have it in the settings. * It was used in GE but disabled in PD. */ -f32 chrGetRangedSpeed(struct chrdata *chr, f32 min, f32 max) +f32 chr_get_ranged_speed(struct chrdata *chr, f32 min, f32 max) { f32 speedrating = chr->speedrating; - speedrating = pdmodeGetEnemyReactionSpeed() * (100.0f - speedrating) + speedrating; + speedrating = pdmode_get_enemy_reaction_speed() * (100.0f - speedrating) + speedrating; return (max - min) * speedrating * 0.01f + min; } @@ -1495,26 +1495,26 @@ f32 chrGetRangedSpeed(struct chrdata *chr, f32 min, f32 max) * For example, if the chr's speedrating is 10 (out of 100) and the given * percentage is 50, the result will be 45. */ -s32 chrGetPercentageOfSlowness(struct chrdata *chr, s32 percentage) +s32 chr_get_percentage_of_slowness(struct chrdata *chr, s32 percentage) { s32 speedrating = chr->speedrating; - s32 extra = pdmodeGetEnemyReactionSpeed() * (100 - speedrating); + s32 extra = pdmode_get_enemy_reaction_speed() * (100 - speedrating); speedrating = extra + speedrating; return (100 - speedrating) * percentage / 100; } -f32 chrGetRangedArghSpeed(struct chrdata *chr, f32 min, f32 max) +f32 chr_get_ranged_argh_speed(struct chrdata *chr, f32 min, f32 max) { f32 arghrating = chr->arghrating; - arghrating = pdmodeGetEnemyReactionSpeed() * (100.0f - arghrating) + arghrating; + arghrating = pdmode_get_enemy_reaction_speed() * (100.0f - arghrating) + arghrating; return (max - min) * arghrating * 0.01f + min; } -f32 chrGetAttackEntityRelativeAngle(struct chrdata *chr, s32 attackflags, s32 entityid) +f32 chr_get_attack_entity_relative_angle(struct chrdata *chr, s32 attackflags, s32 entityid) { f32 angle; struct coord pos; @@ -1526,7 +1526,7 @@ f32 chrGetAttackEntityRelativeAngle(struct chrdata *chr, s32 attackflags, s32 en if (attackflags & ATTACKFLAG_AIMATDIRECTION) { angle = entityid * (M_BADTAU / 65536); - angle -= chrGetInverseTheta(chr); + angle -= chr_get_inverse_theta(chr); if (angle < 0) { angle += M_BADTAU; @@ -1535,23 +1535,23 @@ f32 chrGetAttackEntityRelativeAngle(struct chrdata *chr, s32 attackflags, s32 en return angle; } - chrGetAttackEntityPos(chr, attackflags, entityid, &pos, rooms); + chr_get_attack_entity_pos(chr, attackflags, entityid, &pos, rooms); - return chrGetAngleToPos(chr, &pos); + return chr_get_angle_to_pos(chr, &pos); } -f32 chrGetAttackEntityDistance(struct chrdata *chr, u32 attackflags, s32 entityid) +f32 chr_get_attack_entity_distance(struct chrdata *chr, u32 attackflags, s32 entityid) { if (attackflags & ATTACKFLAG_AIMATTARGET) { - return chrGetDistanceToTarget(chr); + return chr_get_distance_to_target(chr); } if (attackflags & ATTACKFLAG_AIMATCHR) { - return chrGetDistanceToChr(chr, entityid); + return chr_get_distance_to_chr(chr, entityid); } if (attackflags & ATTACKFLAG_AIMATPAD) { - return chrGetDistanceToPad(chr, entityid); + return chr_get_distance_to_pad(chr, entityid); } return 0; @@ -1583,11 +1583,11 @@ void func0f02e4f8(struct coord *arg0, struct coord *arg1, struct coord *dst) struct coord sp20; #if VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp2c, &sp20, 2298, "chr/chraction.c"); + cd_get_edge(&sp2c, &sp20, 2298, "chr/chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp2c, &sp20, 2298, "chraction.c"); + cd_get_edge(&sp2c, &sp20, 2298, "chraction.c"); #else - cdGetEdge(&sp2c, &sp20, 2338, "chraction.c"); + cd_get_edge(&sp2c, &sp20, 2338, "chraction.c"); #endif func0f02e3dc(&sp2c, &sp20, arg0, arg1, dst); @@ -1611,17 +1611,17 @@ f32 func0f02e550(struct prop *prop, f32 arg1, f32 arg2, u32 cdtypes, f32 ymax, f sp50.y = prop->pos.y; sp50.z = prop->pos.z + sp5c.f[2] * arg2; - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); - if (cdExamCylMove03(&prop->pos, prop->rooms, &sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { + if (cd_exam_cyl_move03(&prop->pos, prop->rooms, &sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { result = arg2; } else { #if VERSION >= VERSION_PAL_FINAL - cdGetPos(&sp3c, 2377, "chr/chraction.c"); + cd_get_pos(&sp3c, 2377, "chr/chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&sp3c, 2377, "chraction.c"); + cd_get_pos(&sp3c, 2377, "chraction.c"); #else - cdGetPos(&sp3c, 2417, "chraction.c"); + cd_get_pos(&sp3c, 2417, "chraction.c"); #endif xdiff = sp3c.x - prop->pos.x; @@ -1630,7 +1630,7 @@ f32 func0f02e550(struct prop *prop, f32 arg1, f32 arg2, u32 cdtypes, f32 ymax, f result = sqrtf(xdiff * xdiff + zdiff * zdiff); } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); return result; } @@ -1641,17 +1641,17 @@ f32 func0f02e684(struct prop *prop, f32 arg1, f32 arg2) f32 ymin; f32 radius; - chrGetBbox(prop, &radius, &ymax, &ymin); + chr_get_bbox(prop, &radius, &ymax, &ymin); return func0f02e550(prop, arg1, arg2, CDTYPE_ALL, ymax, ymin); } -void chrChooseStandAnimation(struct chrdata *chr, f32 mergetime) +void chr_choose_stand_animation(struct chrdata *chr, f32 mergetime) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); s32 race = CHRRACE(chr); - s32 prevanimnum = modelGetAnimNum(chr->model); + s32 prevanimnum = model_get_anim_num(chr->model); if (chr->actiontype == ACT_GOPOS) { chr->act_gopos.flags |= GOPOSFLAG_WAITING; @@ -1662,28 +1662,28 @@ void chrChooseStandAnimation(struct chrdata *chr, f32 mergetime) } if (race == RACE_EYESPY) { - modelSetAnimation(chr->model, ANIM_013E, 0, 0, 0, mergetime); + model_set_animation(chr->model, ANIM_013E, 0, 0, 0, mergetime); } else if (race == RACE_HUMAN) { if (prevanimnum == ANIM_SNIPING_GETDOWN || prevanimnum == ANIM_SNIPING_GETUP || prevanimnum == ANIM_SNIPING_ONGROUND) { - modelSetAnimation(chr->model, ANIM_SNIPING_GETUP, chr->model->anim->flip, -1, chrGetRangedSpeed(chr, 0.5, 0.8), 16); + model_set_animation(chr->model, ANIM_SNIPING_GETUP, chr->model->anim->flip, -1, chr_get_ranged_speed(chr, 0.5, 0.8), 16); } else if ((leftgun && rightgun) || (!leftgun && !rightgun) - || weaponIsOneHanded(leftgun) - || weaponIsOneHanded(rightgun)) { - modelSetAnimation(chr->model, ANIM_006A, random() % 2, 0, 0.25, mergetime); - modelSetAnimLooping(chr->model, 0, 16); + || weapon_is_one_handed(leftgun) + || weapon_is_one_handed(rightgun)) { + model_set_animation(chr->model, ANIM_006A, random() % 2, 0, 0.25, mergetime); + model_set_anim_looping(chr->model, 0, 16); } else if (rightgun || leftgun) { - modelSetAnimation(chr->model, ANIM_TWO_GUN_HOLD, leftgun != NULL, 0, 0.25, mergetime); - modelSetAnimLooping(chr->model, 0, 16); - modelSetAnimEndFrame(chr->model, 120); + model_set_animation(chr->model, ANIM_TWO_GUN_HOLD, leftgun != NULL, 0, 0.25, mergetime); + model_set_anim_looping(chr->model, 0, 16); + model_set_anim_end_frame(chr->model, 120); } } else if (race == RACE_SKEDAR) { - modelSetAnimation(chr->model, ANIM_00C0, random() % 2, 0, 0.5, mergetime); + model_set_animation(chr->model, ANIM_00C0, random() % 2, 0, 0.5, mergetime); } else if (race == RACE_DRCAROLL) { - modelSetAnimation(chr->model, ANIM_013E, 0, 0, 0.5, mergetime); + model_set_animation(chr->model, ANIM_013E, 0, 0, 0.5, mergetime); } else if (race == RACE_ROBOT) { - modelSetAnimation(chr->model, ANIM_0237, 0, 0, 0.5, mergetime); + model_set_animation(chr->model, ANIM_0237, 0, 0, 0.5, mergetime); } } @@ -1692,7 +1692,7 @@ void func0f02e9a0(struct chrdata *chr, f32 mergetime) f32 limit = 127; f32 fsleep; - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_STAND; chr->act_stand.prestand = false; chr->act_stand.flags = 0; @@ -1716,24 +1716,24 @@ void func0f02e9a0(struct chrdata *chr, f32 mergetime) chr->sleep = fsleep; - if (modelIsAnimMerging(chr->model) && !chr->aibot) { + if (model_is_anim_merging(chr->model) && !chr->aibot) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrChooseStandAnimation(chr, mergetime); + chr_choose_stand_animation(chr, mergetime); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrStand(struct chrdata *chr) +void chr_stand(struct chrdata *chr) { s32 race = CHRRACE(chr); f32 result; if (race != RACE_EYESPY) { - chrStopFiring(chr); + chr_stop_firing(chr); if (race == RACE_HUMAN && chr->actiontype == ACT_KNEEL) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_STAND; chr->act_stand.prestand = true; @@ -1747,16 +1747,16 @@ void chrStand(struct chrdata *chr) chr->act_stand.playwalkanim = false; if (chr->aibot == NULL) { - if (modelGetAnimNum(chr->model) == ANIM_KNEEL_SHOOT_RIGHT_HAND) { - result = chrGetRangedSpeed(chr, 0.5, 0.8); - modelSetAnimation(chr->model, ANIM_KNEEL_SHOOT_RIGHT_HAND, + if (model_get_anim_num(chr->model) == ANIM_KNEEL_SHOOT_RIGHT_HAND) { + result = chr_get_ranged_speed(chr, 0.5, 0.8); + model_set_animation(chr->model, ANIM_KNEEL_SHOOT_RIGHT_HAND, chr->model->anim->flip, 109, result, 16); - modelSetAnimEndFrame(chr->model, 140); + model_set_anim_end_frame(chr->model, 140); } else { - result = chrGetRangedSpeed(chr, 0.5, 0.8); - modelSetAnimation(chr->model, ANIM_KNEEL_TWO_HANDED_GUN, + result = chr_get_ranged_speed(chr, 0.5, 0.8); + model_set_animation(chr->model, ANIM_KNEEL_TWO_HANDED_GUN, chr->model->anim->flip, 120, result, 16); - modelSetAnimEndFrame(chr->model, 151); + model_set_anim_end_frame(chr->model, 151); } } } else if (race == RACE_DRCAROLL || race == RACE_ROBOT) { @@ -1778,15 +1778,15 @@ void chrStand(struct chrdata *chr) } } -bool chrFaceCover(struct chrdata *chr) +bool chr_face_cover(struct chrdata *chr) { struct cover cover; - if (!coverUnpack(chr->cover, &cover)) { + if (!cover_unpack(chr->cover, &cover)) { return false; } - chrStand(chr); + chr_stand(chr); chr->act_stand.reaim = 0; chr->act_stand.flags = ATTACKFLAG_AIMATDIRECTION; chr->act_stand.turning = TURNSTATE_TURNING; @@ -1803,51 +1803,51 @@ void func0f02ed28(struct chrdata *chr, f32 mergetime) chr->act_stand.checkfacingwall = true; } -void chrStop(struct chrdata *chr) +void chr_stop(struct chrdata *chr) { - chrStand(chr); + chr_stand(chr); chr->act_stand.checkfacingwall = true; } -void chrKneelChooseAnimation(struct chrdata *chr) +void chr_kneel_choose_animation(struct chrdata *chr) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); if (chr->aibot == NULL) { if ((leftgun && rightgun) || (!leftgun && !rightgun) - || weaponIsOneHanded(leftgun) - || weaponIsOneHanded(rightgun)) { + || weapon_is_one_handed(leftgun) + || weapon_is_one_handed(rightgun)) { bool flip = random() % 2; - modelSetAnimation(chr->model, ANIM_KNEEL_SHOOT_RIGHT_HAND, flip, 0, chrGetRangedSpeed(chr, 0.5, 0.8), 16); - modelSetAnimEndFrame(chr->model, 28); + model_set_animation(chr->model, ANIM_KNEEL_SHOOT_RIGHT_HAND, flip, 0, chr_get_ranged_speed(chr, 0.5, 0.8), 16); + model_set_anim_end_frame(chr->model, 28); } else if (rightgun || leftgun) { - modelSetAnimation(chr->model, ANIM_KNEEL_TWO_HANDED_GUN, leftgun != NULL, 0, chrGetRangedSpeed(chr, 0.5, 0.8), 16); - modelSetAnimEndFrame(chr->model, 27); + model_set_animation(chr->model, ANIM_KNEEL_TWO_HANDED_GUN, leftgun != NULL, 0, chr_get_ranged_speed(chr, 0.5, 0.8), 16); + model_set_anim_end_frame(chr->model, 27); } } } -void chrKneel(struct chrdata *chr) +void chr_kneel(struct chrdata *chr) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_KNEEL; chr->sleep = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrKneelChooseAnimation(chr); + chr_kneel_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrStartAlarmChooseAnimation(struct chrdata *chr) +void chr_start_alarm_choose_animation(struct chrdata *chr) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); bool flip = false; if (leftgun && !rightgun) { @@ -1856,70 +1856,70 @@ void chrStartAlarmChooseAnimation(struct chrdata *chr) flip = random() % 2; } - modelSetAnimation(chr->model, ANIM_TALKING_003D, flip, 40, 1, 16); - modelSetAnimEndFrame(chr->model, 82); + model_set_animation(chr->model, ANIM_TALKING_003D, flip, 40, 1, 16); + model_set_anim_end_frame(chr->model, 82); } -void chrStartAlarm(struct chrdata *chr) +void chr_start_alarm(struct chrdata *chr) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_STARTALARM; chr->sleep = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrStartAlarmChooseAnimation(chr); + chr_start_alarm_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrThrowGrenadeChooseAnimation(struct chrdata *chr) +void chr_throw_grenade_choose_animation(struct chrdata *chr) { u32 rand = random(); if (chr->act_throwgrenade.needsequip) { if (rand % 3 == 0) { - modelSetAnimation(chr->model, ANIM_THROWGRENADE_CROUCHING, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + model_set_animation(chr->model, ANIM_THROWGRENADE_CROUCHING, chr->act_throwgrenade.hand != 0, 0, chr_get_ranged_speed(chr, 0.5, 1.2), 16); } else if (rand % 3 == 1) { - modelSetAnimation(chr->model, ANIM_THROWGRENADE_NOPIN, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + model_set_animation(chr->model, ANIM_THROWGRENADE_NOPIN, chr->act_throwgrenade.hand != 0, 0, chr_get_ranged_speed(chr, 0.5, 1.2), 16); } else { - modelSetAnimation(chr->model, ANIM_THROWGRENADE_STANDING, chr->act_throwgrenade.hand != 0, 0, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + model_set_animation(chr->model, ANIM_THROWGRENADE_STANDING, chr->act_throwgrenade.hand != 0, 0, chr_get_ranged_speed(chr, 0.5, 1.2), 16); } } else { if (rand % 3 == 0) { - modelSetAnimation(chr->model, ANIM_THROWGRENADE_CROUCHING, chr->act_throwgrenade.hand != 0, 5, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + model_set_animation(chr->model, ANIM_THROWGRENADE_CROUCHING, chr->act_throwgrenade.hand != 0, 5, chr_get_ranged_speed(chr, 0.5, 1.2), 16); } else if (rand % 3 == 1) { - modelSetAnimation(chr->model, ANIM_THROWGRENADE_NOPIN, chr->act_throwgrenade.hand != 0, 6, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + model_set_animation(chr->model, ANIM_THROWGRENADE_NOPIN, chr->act_throwgrenade.hand != 0, 6, chr_get_ranged_speed(chr, 0.5, 1.2), 16); } else { - modelSetAnimation(chr->model, ANIM_THROWGRENADE_STANDING, chr->act_throwgrenade.hand != 0, 84, chrGetRangedSpeed(chr, 0.5, 1.2), 16); + model_set_animation(chr->model, ANIM_THROWGRENADE_STANDING, chr->act_throwgrenade.hand != 0, 84, chr_get_ranged_speed(chr, 0.5, 1.2), 16); } } - modelSetAnimEndFrame(chr->model, -1); + model_set_anim_end_frame(chr->model, -1); } -void chrThrowGrenade(struct chrdata *chr, s32 hand, s32 needsequip) +void chr_throw_grenade(struct chrdata *chr, s32 hand, s32 needsequip) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_THROWGRENADE; chr->act_throwgrenade.hand = hand; chr->act_throwgrenade.needsequip = needsequip; chr->sleep = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrThrowGrenadeChooseAnimation(chr); + chr_throw_grenade_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrSurprisedChooseAnimation(struct chrdata *chr) +void chr_surprised_choose_animation(struct chrdata *chr) { if (chr->act_surprised.type == 1) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); s32 flip = 0; if (leftgun != NULL && rightgun == NULL) { @@ -1928,125 +1928,125 @@ void chrSurprisedChooseAnimation(struct chrdata *chr) flip = random() & 1; } - modelSetAnimation(chr->model, ANIM_003F, flip, 10, chrGetRangedSpeed(chr, 0.6f, 0.96000003f), 16); - modelSetAnimEndFrame(chr->model, 52); + model_set_animation(chr->model, ANIM_003F, flip, 10, chr_get_ranged_speed(chr, 0.6f, 0.96000003f), 16); + model_set_anim_end_frame(chr->model, 52); } else if (chr->act_surprised.type == 2) { - modelSetAnimation(chr->model, ANIM_SURRENDER_002E, random() & 1, 0, chrGetRangedSpeed(chr, 0.35f, 0.56f), 16); - modelSetAnimEndFrame(chr->model, 7); + model_set_animation(chr->model, ANIM_SURRENDER_002E, random() & 1, 0, chr_get_ranged_speed(chr, 0.35f, 0.56f), 16); + model_set_anim_end_frame(chr->model, 7); } else { u32 part = random() % 3; - modelSetAnimation(chr->model, ANIM_0040, random() & 1, 17, 0.6f, 16); + model_set_animation(chr->model, ANIM_0040, random() & 1, 17, 0.6f, 16); if (part == 0) { - modelSetAnimEndFrame(chr->model, chrGetRangedSpeed(chr, 38, 8)); + model_set_anim_end_frame(chr->model, chr_get_ranged_speed(chr, 38, 8)); } else if (part == 1) { - modelSetAnimEndFrame(chr->model, chrGetRangedSpeed(chr, 66, 8)); + model_set_anim_end_frame(chr->model, chr_get_ranged_speed(chr, 66, 8)); } else { - modelSetAnimEndFrame(chr->model, chrGetRangedSpeed(chr, 96, 8)); + model_set_anim_end_frame(chr->model, chr_get_ranged_speed(chr, 96, 8)); } } } -void chrDoSurprisedOneHand(struct chrdata *chr) +void chr_do_surprised_one_hand(struct chrdata *chr) { - struct prop *prop = chrGetTargetProp(chr); - f32 angle = chrGetAngleToPos(chr, &prop->pos); + struct prop *prop = chr_get_target_prop(chr); + f32 angle = chr_get_angle_to_pos(chr, &prop->pos); if (angle < RAD(10, 0.17450514435768f) || angle > RAD(350, 6.1076798439026f)) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_SURPRISED; chr->act_surprised.type = 1; chr->sleep = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrSurprisedChooseAnimation(chr); + chr_surprised_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } - } else if (!chrIsStopped(chr)) { - chrStand(chr); + } else if (!chr_is_stopped(chr)) { + chr_stand(chr); } } -void chrDoSurprisedSurrender(struct chrdata *chr) +void chr_do_surprised_surrender(struct chrdata *chr) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_SURPRISED; chr->act_surprised.type = 2; chr->sleep = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrSurprisedChooseAnimation(chr); + chr_surprised_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrDoSurprisedLookAround(struct chrdata *chr) +void chr_do_surprised_look_around(struct chrdata *chr) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_SURPRISED; chr->act_surprised.type = 3; chr->sleep = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrSurprisedChooseAnimation(chr); + chr_surprised_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrSurrenderChooseAnimation(struct chrdata *chr) +void chr_surrender_choose_animation(struct chrdata *chr) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); if (rightgun || leftgun) { - modelSetAnimation(chr->model, ANIM_SURRENDER_002F, random() & 1, 0, 0.5, 16); - modelSetAnimLooping(chr->model, 40, 16); + model_set_animation(chr->model, ANIM_SURRENDER_002F, random() & 1, 0, 0.5, 16); + model_set_anim_looping(chr->model, 40, 16); if (leftgun) { - objSetDropped(leftgun, DROPTYPE_SURRENDER); + obj_set_dropped(leftgun, DROPTYPE_SURRENDER); } if (rightgun) { - objSetDropped(rightgun, DROPTYPE_SURRENDER); + obj_set_dropped(rightgun, DROPTYPE_SURRENDER); } chr->hidden |= CHRHFLAG_DROPPINGITEM; } else { - modelSetAnimation(chr->model, ANIM_SURRENDER_002E, random() & 1, 0, 0.5, 16); - modelSetAnimLooping(chr->model, 30, 16); + model_set_animation(chr->model, ANIM_SURRENDER_002E, random() & 1, 0, 0.5, 16); + model_set_anim_looping(chr->model, 30, 16); } - chrDropConcealedItems(chr); + chr_drop_concealed_items(chr); } -void chrSurrender(struct chrdata *chr) +void chr_surrender(struct chrdata *chr) { u32 action = ACT_SURRENDER; if (chr->actiontype != action) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = action; chr->sleep = action; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrSurrenderChooseAnimation(chr); + chr_surrender_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } } -void chrSidestepChooseAnimation(struct chrdata *chr) +void chr_sidestep_choose_animation(struct chrdata *chr) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); bool flip = false; bool allowflip = false; u32 race = CHRRACE(chr); @@ -2055,8 +2055,8 @@ void chrSidestepChooseAnimation(struct chrdata *chr) flip = random() % 2; allowflip = random() % 2; } else { - if (weaponIsOneHanded(leftgun) == false - && weaponIsOneHanded(rightgun) == false + if (weapon_is_one_handed(leftgun) == false + && weapon_is_one_handed(rightgun) == false && (leftgun || rightgun)) { flip = (leftgun != 0); allowflip = random() % 2; @@ -2066,92 +2066,92 @@ void chrSidestepChooseAnimation(struct chrdata *chr) if (race == RACE_HUMAN) { if (allowflip == false) { if (chr->act_sidestep.side) { - modelSetAnimation(chr->model, ANIM_0068, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); - modelSetAnimEndFrame(chr->model, 36); + model_set_animation(chr->model, ANIM_0068, true, 5, chr_get_ranged_speed(chr, 0.55, 0.88000005), 16); + model_set_anim_end_frame(chr->model, 36); } else { - modelSetAnimation(chr->model, ANIM_0068, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); - modelSetAnimEndFrame(chr->model, 36); + model_set_animation(chr->model, ANIM_0068, false, 5, chr_get_ranged_speed(chr, 0.55, 0.88000005), 16); + model_set_anim_end_frame(chr->model, 36); } } else { if ((chr->act_sidestep.side && !flip) || (chr->act_sidestep.side == 0 && flip)) { - modelSetAnimation(chr->model, ANIM_003B, flip, 5, chrGetRangedSpeed(chr, 0.7, 1.12), 16); - modelSetAnimEndFrame(chr->model, 34); + model_set_animation(chr->model, ANIM_003B, flip, 5, chr_get_ranged_speed(chr, 0.7, 1.12), 16); + model_set_anim_end_frame(chr->model, 34); } else { - modelSetAnimation(chr->model, ANIM_003A, flip, 5, chrGetRangedSpeed(chr, 0.7, 1.12), 16); - modelSetAnimEndFrame(chr->model, 32); + model_set_animation(chr->model, ANIM_003A, flip, 5, chr_get_ranged_speed(chr, 0.7, 1.12), 16); + model_set_anim_end_frame(chr->model, 32); } } } else if (race == RACE_SKEDAR) { if (chr->act_sidestep.side) { - modelSetAnimation(chr->model, ANIM_0328, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); - modelSetAnimEndFrame(chr->model, 27); + model_set_animation(chr->model, ANIM_0328, false, 5, chr_get_ranged_speed(chr, 0.55, 0.88000005), 16); + model_set_anim_end_frame(chr->model, 27); } else { - modelSetAnimation(chr->model, ANIM_0328, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); - modelSetAnimEndFrame(chr->model, 27); + model_set_animation(chr->model, ANIM_0328, true, 5, chr_get_ranged_speed(chr, 0.55, 0.88000005), 16); + model_set_anim_end_frame(chr->model, 27); } } } -void chrSidestep(struct chrdata *chr, bool side) +void chr_sidestep(struct chrdata *chr, bool side) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_SIDESTEP; chr->act_sidestep.side = side; chr->sleep = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrSidestepChooseAnimation(chr); + chr_sidestep_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrJumpOutChooseAnimation(struct chrdata *chr) +void chr_jump_out_choose_animation(struct chrdata *chr) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); bool flip = false; if (leftgun && !rightgun) { flip = true; } else if ((leftgun && rightgun) || (!leftgun && !rightgun) - || weaponIsOneHanded(leftgun) || weaponIsOneHanded(rightgun)) { + || weapon_is_one_handed(leftgun) || weapon_is_one_handed(rightgun)) { flip = random() % 2; } if ((chr->act_jumpout.side && !flip) || (chr->act_jumpout.side == 0 && flip)) { - modelSetAnimation(chr->model, ANIM_0068, true, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); - modelSetAnimEndFrame(chr->model, 36); + model_set_animation(chr->model, ANIM_0068, true, 5, chr_get_ranged_speed(chr, 0.55, 0.88000005), 16); + model_set_anim_end_frame(chr->model, 36); } else { - modelSetAnimation(chr->model, ANIM_0068, false, 5, chrGetRangedSpeed(chr, 0.55, 0.88000005), 16); - modelSetAnimEndFrame(chr->model, 36); + model_set_animation(chr->model, ANIM_0068, false, 5, chr_get_ranged_speed(chr, 0.55, 0.88000005), 16); + model_set_anim_end_frame(chr->model, 36); } } -void chrJumpOut(struct chrdata *chr, bool side) +void chr_jump_out(struct chrdata *chr, bool side) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_JUMPOUT; chr->act_jumpout.side = side; chr->sleep = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrJumpOutChooseAnimation(chr); + chr_jump_out_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrRunPosChooseAnimation(struct chrdata *chr) +void chr_run_pos_choose_animation(struct chrdata *chr) { f32 xdiff = chr->prop->pos.x - chr->act_runpos.pos.x; f32 ydiff = chr->prop->pos.y - chr->act_runpos.pos.y; f32 zdiff = chr->prop->pos.z - chr->act_runpos.pos.z; f32 distance = sqrtf(xdiff * xdiff + zdiff * zdiff); - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); bool heavy = true; bool flip; s32 race = CHRRACE(chr); @@ -2159,7 +2159,7 @@ void chrRunPosChooseAnimation(struct chrdata *chr) if ((leftgun && rightgun) || (!leftgun && !rightgun)) { heavy = false; flip = random() % 2; - } else if (weaponIsOneHanded(leftgun) || weaponIsOneHanded(rightgun)) { + } else if (weapon_is_one_handed(leftgun) || weapon_is_one_handed(rightgun)) { heavy = false; flip = (bool)leftgun != false; } else { @@ -2174,7 +2174,7 @@ void chrRunPosChooseAnimation(struct chrdata *chr) #else chr->act_runpos.eta60 = 1.0f / (func0f02dff0(ANIM_RUNNING_TWOHANDGUN) * mult) * distance; #endif - modelSetAnimation(chr->model, ANIM_RUNNING_TWOHANDGUN, flip, 0, mult, 16); + model_set_animation(chr->model, ANIM_RUNNING_TWOHANDGUN, flip, 0, mult, 16); } else { f32 mult = 0.5; #if PAL @@ -2182,7 +2182,7 @@ void chrRunPosChooseAnimation(struct chrdata *chr) #else chr->act_runpos.eta60 = 1.0f / (func0f02dff0(ANIM_RUNNING_ONEHANDGUN) * mult) * distance; #endif - modelSetAnimation(chr->model, ANIM_RUNNING_ONEHANDGUN, flip, 0, mult, 16); + model_set_animation(chr->model, ANIM_RUNNING_ONEHANDGUN, flip, 0, mult, 16); } } else if (race == RACE_SKEDAR) { f32 mult = 0.5; @@ -2191,13 +2191,13 @@ void chrRunPosChooseAnimation(struct chrdata *chr) #else chr->act_runpos.eta60 = 1.0f / (func0f02dff0(ANIM_SKEDAR_RUNNING) * mult) * distance; #endif - modelSetAnimation(chr->model, ANIM_SKEDAR_RUNNING, flip, 0, mult, 16); + model_set_animation(chr->model, ANIM_SKEDAR_RUNNING, flip, 0, mult, 16); } } -void chrRunToPos(struct chrdata *chr, struct coord *pos) +void chr_run_to_pos(struct chrdata *chr, struct coord *pos) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_RUNPOS; chr->act_runpos.pos.x = pos->x; chr->act_runpos.pos.y = pos->y; @@ -2206,26 +2206,26 @@ void chrRunToPos(struct chrdata *chr, struct coord *pos) chr->act_runpos.neardist = 30; chr->act_runpos.turnspeed = 0; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrRunPosChooseAnimation(chr); + chr_run_pos_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrAttackStand(struct chrdata *chr, u32 attackflags, s32 entityid) +void chr_attack_stand(struct chrdata *chr, u32 attackflags, s32 entityid) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); bool flip; struct attackanimgroup **animgroup; bool firing[] = {false, false}; s32 race = CHRRACE(chr); if (leftgun && rightgun) { - struct prop *leftgun2 = chrGetHeldUsableProp(chr, HAND_LEFT); - struct prop *rightgun2 = chrGetHeldUsableProp(chr, HAND_RIGHT); + struct prop *leftgun2 = chr_get_held_usable_prop(chr, HAND_LEFT); + struct prop *rightgun2 = chr_get_held_usable_prop(chr, HAND_RIGHT); if (leftgun2 && rightgun2) { flip = random() % 2; @@ -2246,7 +2246,7 @@ void chrAttackStand(struct chrdata *chr, u32 attackflags, s32 entityid) firing[HAND_RIGHT] = !flip; } } else { - if (weaponIsOneHanded(leftgun) || weaponIsOneHanded(rightgun)) { + if (weapon_is_one_handed(leftgun) || weapon_is_one_handed(rightgun)) { flip = (bool)leftgun != false; animgroup = g_StandLightAttackAnims[race]; firing[HAND_LEFT] = (bool)leftgun != false; @@ -2259,13 +2259,13 @@ void chrAttackStand(struct chrdata *chr, u32 attackflags, s32 entityid) } } - chrAttack(chr, animgroup, flip, firing, attackflags, entityid, true); + chr_attack(chr, animgroup, flip, firing, attackflags, entityid, true); } -void chrAttackLie(struct chrdata *chr, u32 attackflags, s32 entityid) +void chr_attack_lie(struct chrdata *chr, u32 attackflags, s32 entityid) { u32 stack[2]; - struct prop *gun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *gun = chr_get_held_prop(chr, HAND_RIGHT); s32 firing[2] = {false, false}; if (chr); @@ -2279,13 +2279,13 @@ void chrAttackLie(struct chrdata *chr, u32 attackflags, s32 entityid) firing[0] = (bool)!tmp; } - chrAttack(chr, &g_LieAttackAnims, gun == NULL, firing, attackflags, entityid, false); + chr_attack(chr, &g_LieAttackAnims, gun == NULL, firing, attackflags, entityid, false); } -void chrAttackKneel(struct chrdata *chr, u32 attackflags, s32 entityid) +void chr_attack_kneel(struct chrdata *chr, u32 attackflags, s32 entityid) { - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); s32 flip; struct attackanimgroup **animgroup; bool firing[2] = {false, false}; @@ -2294,8 +2294,8 @@ void chrAttackKneel(struct chrdata *chr, u32 attackflags, s32 entityid) struct prop *rightgun2; if (leftgun && rightgun) { - leftgun2 = chrGetHeldUsableProp(chr, HAND_LEFT); - rightgun2 = chrGetHeldUsableProp(chr, HAND_RIGHT); + leftgun2 = chr_get_held_usable_prop(chr, HAND_LEFT); + rightgun2 = chr_get_held_usable_prop(chr, HAND_RIGHT); if (leftgun2 && rightgun2) { flip = random() % 2; @@ -2316,7 +2316,7 @@ void chrAttackKneel(struct chrdata *chr, u32 attackflags, s32 entityid) firing[HAND_RIGHT] = !flip; } } else { - if (weaponIsOneHanded(leftgun) || weaponIsOneHanded(rightgun)) { + if (weapon_is_one_handed(leftgun) || weapon_is_one_handed(rightgun)) { flip = (bool)leftgun != false; animgroup = g_KneelLightAttackAnims[race]; firing[HAND_LEFT] = (bool)leftgun != false; @@ -2329,22 +2329,22 @@ void chrAttackKneel(struct chrdata *chr, u32 attackflags, s32 entityid) } } - chrAttack(chr, animgroup, flip, firing, attackflags, entityid, false); + chr_attack(chr, animgroup, flip, firing, attackflags, entityid, false); } -void chrAttackWalkChooseAnimation(struct chrdata *chr) +void chr_attack_walk_choose_animation(struct chrdata *chr) { if (chr->aibot == NULL) { - modelSetAnimation(chr->model, chr->act_attackwalk.animcfg->animnum, + model_set_animation(chr->model, chr->act_attackwalk.animcfg->animnum, chr->act_attackwalk.flip, chr->act_attackwalk.animcfg->unk10, 0.5, 16); } } -void chrAttackWalk(struct chrdata *chr, bool run) +void chr_attack_walk(struct chrdata *chr, bool run) { struct attackanimconfig *animcfg; - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); bool flip; bool firing[] = {false, false}; bool everytick[] = {false, false}; @@ -2354,8 +2354,8 @@ void chrAttackWalk(struct chrdata *chr, bool run) struct weaponobj *weapon; if (leftgun && rightgun) { - struct prop *leftgun2 = chrGetHeldUsableProp(chr, HAND_LEFT); - struct prop *rightgun2 = chrGetHeldUsableProp(chr, HAND_RIGHT); + struct prop *leftgun2 = chr_get_held_usable_prop(chr, HAND_LEFT); + struct prop *rightgun2 = chr_get_held_usable_prop(chr, HAND_RIGHT); s32 style = 0; if (leftgun2 && rightgun2) { @@ -2395,7 +2395,7 @@ void chrAttackWalk(struct chrdata *chr, bool run) firing[HAND_LEFT] = firing[HAND_RIGHT] = true; } } else { - if (weaponIsOneHanded(leftgun) || weaponIsOneHanded(rightgun)) { + if (weapon_is_one_handed(leftgun) || weapon_is_one_handed(rightgun)) { flip = (bool)leftgun != false; if (run) { @@ -2428,10 +2428,10 @@ void chrAttackWalk(struct chrdata *chr, bool run) for (i = 0; i < 2; i++) { if (firing[i]) { - prop = chrGetHeldProp(chr, i); + prop = chr_get_held_prop(chr, i); weapon = prop->weapon; - if (weaponGetNumTicksPerShot(weapon->weaponnum, weapon->gunfunc) < 1) { + if (weapon_get_num_ticks_per_shot(weapon->weaponnum, weapon->gunfunc) < 1) { everytick[i] = true; } @@ -2480,42 +2480,42 @@ void chrAttackWalk(struct chrdata *chr, bool run) chr->sleep = 0; chr->chrflags &= ~CHRCFLAG_INJUREDTARGET; - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrAttackWalkChooseAnimation(chr); + chr_attack_walk_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrAttackRollChooseAnimation(struct chrdata *chr) +void chr_attack_roll_choose_animation(struct chrdata *chr) { - modelSetAnimation(chr->model, chr->act_attack.animcfg->animnum, chr->act_attack.flip, - chr->act_attack.animcfg->unk10, chrGetRangedSpeed(chr, 0.5, 0.8), 16); + model_set_animation(chr->model, chr->act_attack.animcfg->animnum, chr->act_attack.flip, + chr->act_attack.animcfg->unk10, chr_get_ranged_speed(chr, 0.5, 0.8), 16); if (chr->act_attack.onehanded == false) { if (chr->act_attack.dorecoil) { if (chr->act_attack.animcfg->unk24 >= 0) { - modelSetAnimEndFrame(chr->model, chr->act_attack.animcfg->unk24); + model_set_anim_end_frame(chr->model, chr->act_attack.animcfg->unk24); } else { - modelSetAnimEndFrame(chr->model, chr->act_attack.animcfg->unk1c); + model_set_anim_end_frame(chr->model, chr->act_attack.animcfg->unk1c); } } else { if (chr->act_attack.animcfg->unk20 >= 0) { - modelSetAnimEndFrame(chr->model, chr->act_attack.animcfg->unk20); + model_set_anim_end_frame(chr->model, chr->act_attack.animcfg->unk20); } else if (chr->act_attack.animcfg->unk14 >= 0) { - modelSetAnimEndFrame(chr->model, chr->act_attack.animcfg->unk14); + model_set_anim_end_frame(chr->model, chr->act_attack.animcfg->unk14); } } } } -void chrAttackRoll(struct chrdata *chr, bool toleft) +void chr_attack_roll(struct chrdata *chr, bool toleft) { struct attackanimconfig *animcfg; - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); bool flip; bool onehanded = false; struct prop *prop; @@ -2528,8 +2528,8 @@ void chrAttackRoll(struct chrdata *chr, bool toleft) bool singleshot[] = {false, false}; if (leftgun && rightgun) { - struct prop *leftgun2 = chrGetHeldUsableProp(chr, HAND_LEFT); - struct prop *rightgun2 = chrGetHeldUsableProp(chr, HAND_RIGHT); + struct prop *leftgun2 = chr_get_held_usable_prop(chr, HAND_LEFT); + struct prop *rightgun2 = chr_get_held_usable_prop(chr, HAND_RIGHT); if (leftgun2 && rightgun2) { flip = random() % 2; @@ -2549,7 +2549,7 @@ void chrAttackRoll(struct chrdata *chr, bool toleft) firing[HAND_RIGHT] = !flip; } } else { - if (weaponIsOneHanded(leftgun) || weaponIsOneHanded(rightgun)) { + if (weapon_is_one_handed(leftgun) || weapon_is_one_handed(rightgun)) { flip = (bool)leftgun != false; onehanded = true; firing[HAND_LEFT] = flip; @@ -2586,10 +2586,10 @@ void chrAttackRoll(struct chrdata *chr, bool toleft) for (i = 0; i < 2; i++) { if (firing[i]) { - prop = chrGetHeldProp(chr, i); + prop = chr_get_held_prop(chr, i); weapon = prop->weapon; - if (weaponGetNumTicksPerShot(weapon->weaponnum, weapon->gunfunc) < 1) { + if (weapon_get_num_ticks_per_shot(weapon->weaponnum, weapon->gunfunc) < 1) { everytick[i] = true; if (weapon->weaponnum == WEAPON_LASER) { @@ -2668,16 +2668,16 @@ void chrAttackRoll(struct chrdata *chr, bool toleft) // provided it didn't read and clear the flag between the attacks. // It usually (always?) does though, so this isn't really an issue. - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrAttackRollChooseAnimation(chr); + chr_attack_roll_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrStartAnim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed) +void chr_start_anim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed) { u32 stack; @@ -2687,7 +2687,7 @@ void chrStartAnim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe } if (CHRRACE(chr) != RACE_DRCAROLL) { - chrStopFiring(chr); + chr_stop_firing(chr); } chr->actiontype = ACT_ANIM; @@ -2707,13 +2707,13 @@ void chrStartAnim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe chr->sleep = chr->act_anim.slowupdate ? merge : 0; - if (merge > 0 && modelIsAnimMerging(chr->model)) { + if (merge > 0 && model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - modelSetAnimation(chr->model, animnum, (chranimflags & CHRANIMFLAG_FLIP) != 0, startframe, speed, merge); + model_set_animation(chr->model, animnum, (chranimflags & CHRANIMFLAG_FLIP) != 0, startframe, speed, merge); if (endframe >= 0) { - modelSetAnimEndFrame(chr->model, endframe); + model_set_anim_end_frame(chr->model, endframe); } chr->hidden &= ~CHRHFLAG_NEEDANIM; @@ -2721,13 +2721,13 @@ void chrStartAnim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe } } -void chrBeginDead(struct chrdata *chr) +void chr_begin_dead(struct chrdata *chr) { if (chr->actiontype != ACT_DEAD) { - chrStopFiring(chr); + chr_stop_firing(chr); if (chr->cover != -1) { - coverSetInUse(chr->cover, false); + cover_set_in_use(chr->cover, false); chr->cover = -1; } @@ -2753,23 +2753,23 @@ void func0f031254(struct chrdata *chr) if (chr->act_attack.flags & ATTACKFLAG_AIMONLY) { if (animcfg->unk20 >= 0 && animcfg->unk20 < animcfg->unk18) { - modelSetAnimEndFrame(model, animcfg->unk20); + model_set_anim_end_frame(model, animcfg->unk20); } else { - modelSetAnimEndFrame(model, animcfg->unk18); + model_set_anim_end_frame(model, animcfg->unk18); } } else if (chr->act_attack.dorecoil) { if (animcfg->unk20 >= 0) { - modelSetAnimEndFrame(model, animcfg->unk20); + model_set_anim_end_frame(model, animcfg->unk20); } else { - modelSetAnimEndFrame(model, animcfg->unk18); + model_set_anim_end_frame(model, animcfg->unk18); } } else { if (animcfg->unk20 >= 0) { - modelSetAnimEndFrame(model, animcfg->unk20); + model_set_anim_end_frame(model, animcfg->unk20); } else if (animcfg->unk14 >= 0) { - modelSetAnimEndFrame(model, animcfg->unk14); + model_set_anim_end_frame(model, animcfg->unk14); } else { - modelSetAnimEndFrame(model, -1); + model_set_anim_end_frame(model, -1); } } } @@ -2778,7 +2778,7 @@ void func0f031254(struct chrdata *chr) * This function implements attack behaviour common to all the attack types, * such as stand, kneel and lie. */ -void chrAttack(struct chrdata *chr, struct attackanimgroup **animgroups, bool flip, bool *firing, u32 attackflags, s32 entityid, bool standing) +void chr_attack(struct chrdata *chr, struct attackanimgroup **animgroups, bool flip, bool *firing, u32 attackflags, s32 entityid, bool standing) { struct model *model = chr->model; s32 i; @@ -2801,17 +2801,17 @@ void chrAttack(struct chrdata *chr, struct attackanimgroup **animgroups, bool fl if (&animgroups[0] == &g_LieAttackAnims) { sniping = true; - if (modelGetAnimNum(chr->model) != ANIM_SNIPING_ONGROUND) { + if (model_get_anim_num(chr->model) != ANIM_SNIPING_ONGROUND) { // Getting up or getting down animcfg = g_SnipeAttackAnims; - modelSetAnimation(model, animcfg->animnum, flip, animcfg->unk10, chrGetRangedSpeed(chr, 0.5f, 0.8f), 16); - modelSetAnimEndFrame(model, 236); + model_set_animation(model, animcfg->animnum, flip, animcfg->unk10, chr_get_ranged_speed(chr, 0.5f, 0.8f), 16); + model_set_anim_end_frame(model, 236); } else { animcfg = &g_SnipeAttackAnims[1]; } } else { // Non-sniping animations: Choose animation based on angle to target - angle = chrGetAttackEntityRelativeAngle(chr, attackflags, entityid); + angle = chr_get_attack_entity_relative_angle(chr, attackflags, entityid); if (flip) { groupindex = (M_BADTAU - angle) * 5.0937690734863f + 0.5f; @@ -2829,16 +2829,16 @@ void chrAttack(struct chrdata *chr, struct attackanimgroup **animgroups, bool fl for (i = 0; i < 2; i++) { if (firing[i]) { - prop = chrGetHeldProp(chr, i); + prop = chr_get_held_prop(chr, i); if (prop == NULL) { - chrChooseStandAnimation(chr, 16); + chr_choose_stand_animation(chr, 16); return; } weapon = prop->weapon; - if (weaponGetNumTicksPerShot(weapon->weaponnum, weapon->gunfunc) < 1) { + if (weapon_get_num_ticks_per_shot(weapon->weaponnum, weapon->gunfunc) < 1) { // Note: the only weapon that can enter this branch is the laser everytick[i] = true; @@ -2920,10 +2920,10 @@ void chrAttack(struct chrdata *chr, struct attackanimgroup **animgroups, bool fl chr->chrflags &= ~CHRCFLAG_INJUREDTARGET; if (!sniping && !chr->aibot) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - modelSetAnimation(model, animcfg->animnum, flip, animcfg->unk10, chrGetRangedSpeed(chr, 0.5f, 0.8f), 16); + model_set_animation(model, animcfg->animnum, flip, animcfg->unk10, chr_get_ranged_speed(chr, 0.5f, 0.8f), 16); func0f031254(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; @@ -2932,22 +2932,22 @@ void chrAttack(struct chrdata *chr, struct attackanimgroup **animgroups, bool fl } } -void chrAttackAmount(struct chrdata *chr, u32 attackflags, u32 entityid, u32 maxshots) +void chr_attack_amount(struct chrdata *chr, u32 attackflags, u32 entityid, u32 maxshots) { u32 stack; - struct prop *prop = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *prop = chr_get_held_prop(chr, HAND_RIGHT); struct attackanimgroup **things = NULL; bool firing[] = {false, false}; u32 race = CHRRACE(chr); if (prop) { - things = weaponIsOneHanded(prop) ? g_StandLightAttackAnims[race] : g_StandHeavyAttackAnims[race]; + things = weapon_is_one_handed(prop) ? g_StandLightAttackAnims[race] : g_StandHeavyAttackAnims[race]; firing[1] = false; firing[0] = true; } - chrAttack(chr, things, false, firing, attackflags, entityid, false); + chr_attack(chr, things, false, firing, attackflags, entityid, false); chr->actiontype = ACT_ATTACKAMOUNT; chr->act_attack.numshots = 0; @@ -2974,7 +2974,7 @@ u8 var80068080 = 50; * - Updating kill statistics * - Dropping items */ -void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hitpart, struct gset *gset, bool knockout, s32 aplayernum) +void chr_begin_death(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hitpart, struct gset *gset, bool knockout, s32 aplayernum) { bool overridden = false; bool instant; @@ -3007,14 +3007,14 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit wasknockedout = true; #endif - mpstatsDecrementTotalKnockoutCount(); + mpstats_decrement_total_knockout_count(); } // Handle eyespy then return early if (race == RACE_EYESPY) { prevplayernum = g_Vars.currentplayernum; buddyplayernum = -1; - eyespy = chrToEyespy(chr); + eyespy = chr_to_eyespy(chr); objectivenum = -1; // Figure out which playernum has the eyespy that's being destroyed, @@ -3022,7 +3022,7 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit // can only be 1 or 2 here. for (i = 0; i < PLAYERCOUNT(); i++) { if (eyespy == g_Vars.players[i]->eyespy) { - setCurrentPlayerNum(i); + set_current_player_num(i); } else { buddyplayernum = i; } @@ -3038,26 +3038,26 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit // Destroy the eyespy chr->hidden |= CHRHFLAG_DELETING; - explosionCreateSimple(g_Vars.currentplayer->eyespy->prop, + explosion_create_simple(g_Vars.currentplayer->eyespy->prop, &g_Vars.currentplayer->eyespy->prop->pos, g_Vars.currentplayer->eyespy->prop->rooms, EXPLOSIONTYPE_EYESPY, 0); - invRemoveItemByNum(WEAPON_EYESPY); + inv_remove_item_by_num(WEAPON_EYESPY); - psStopSound(g_Vars.currentplayer->eyespy->prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(g_Vars.currentplayer->eyespy->prop, PSTYPE_GENERAL, 0xffff); g_Vars.currentplayer->eyespy = NULL; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); // For Investigation and G5 Building, set a stage flag to show that // the eyespy is destroyed. The scripting in those stages checks for // this flag and fails the objective if set. - switch (stageGetIndex(g_Vars.stagenum)) { + switch (stage_get_index(g_Vars.stagenum)) { case STAGEINDEX_INVESTIGATION: objectivenum = 0; break; case STAGEINDEX_G5BUILDING: - if (lvGetDifficulty() == DIFF_A) { + if (lv_get_difficulty() == DIFF_A) { objectivenum = 2; - } else if (lvGetDifficulty() == DIFF_SA) { + } else if (lv_get_difficulty() == DIFF_SA) { objectivenum = 2; } else { objectivenum = 2; @@ -3067,21 +3067,21 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit // But don't set the flag if the coop buddy still has an eyespy if (objectivenum >= 0 && buddyplayernum >= 0) { - setCurrentPlayerNum(buddyplayernum); + set_current_player_num(buddyplayernum); if (g_Vars.currentplayer->eyespy) { objectivenum = -1; } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } - if (objectivenum >= 0 && objectiveCheck(objectivenum) != OBJECTIVE_COMPLETE) { + if (objectivenum >= 0 && objective_check(objectivenum) != OBJECTIVE_COMPLETE) { g_StageFlags |= STAGEFLAG_EYESPY_DESTROYED; } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); return; } @@ -3098,8 +3098,8 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit // Set up chr's new action chr->blurdrugamount = 0; - chrStopFiring(chr); - chrUncloak(chr, true); + chr_stop_firing(chr); + chr_uncloak(chr, true); #if VERSION >= VERSION_NTSC_1_0 chr->chrflags &= ~CHRCFLAG_HIDDEN; @@ -3122,7 +3122,7 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit // Handle robots and Dr Caroll then return early if (race == RACE_ROBOT || race == RACE_DRCAROLL) { - impactforce1 = gsetGetImpactForce(gset) * 0.5f; + impactforce1 = gset_get_impact_force(gset) * 0.5f; if (impactforce1 <= 0) { impactforce1 = 3; @@ -3142,7 +3142,7 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit chr->soundtimer = 0; chr->voicebox = VOICEBOX_MALE1; - modelSetAnimation(chr->model, ANIM_0164, false, 0, 0.5f, 16); + model_set_animation(chr->model, ANIM_0164, false, 0, 0.5f, 16); } return; @@ -3150,13 +3150,13 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit // Handle humans and Skedar if (race == RACE_HUMAN) { - animnum = modelGetAnimNum(chr->model); + animnum = model_get_anim_num(chr->model); // Chrs in lying-down sniping poses don't use standard death animations if (animnum == ANIM_SNIPING_GETDOWN || animnum == ANIM_SNIPING_GETUP || animnum == ANIM_SNIPING_ONGROUND) { - modelSetAnimation(chr->model, ANIM_SNIPING_DIE, false, 0, 0.5f, 16); + model_set_animation(chr->model, ANIM_SNIPING_DIE, false, 0, 0.5f, 16); } else { // Consider making the chr do an animation where they slump against // a wall or object which is behind them. @@ -3164,7 +3164,7 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit && random() % 20 == 0 && chr->specialdie == SPECIALDIE_NONE) { f32 angle1; - f32 angle2 = chrGetInverseTheta(chr); + f32 angle2 = chr_get_inverse_theta(chr); f32 fval1; f32 fval2; @@ -3191,10 +3191,10 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit chr->act_die.thudframe1 = row->thudframe1; chr->act_die.thudframe2 = row->thudframe2; - modelSetAnimationWithMerge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); + model_set_animation_with_merge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); if (row->endframe >= 0) { - modelSetAnimEndFrame(model, row->endframe); + model_set_anim_end_frame(model, row->endframe); } chr->radius = 10; @@ -3236,12 +3236,12 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit chr->act_die.thudframe1 = row->thudframe1; chr->act_die.thudframe2 = row->thudframe2; - modelSetAnimationWithMerge(model, row->animnum, flip, 0, row->speed, 16, !instant); + model_set_animation_with_merge(model, row->animnum, flip, 0, row->speed, 16, !instant); if (row->endframe >= 0) { - modelSetAnimEndFrame(model, chrGetRangedArghSpeed(chr, row->endframe, 8)); + model_set_anim_end_frame(model, chr_get_ranged_argh_speed(chr, row->endframe, 8)); } else { - modelSetAnimEndFrame(model, chrGetRangedArghSpeed(chr, animGetNumFrames(row->animnum) - 1, 8)); + model_set_anim_end_frame(model, chr_get_ranged_argh_speed(chr, anim_get_num_frames(row->animnum) - 1, 8)); } chr->chrflags &= ~CHRCFLAG_HAS_SPECIAL_DEATH_ANIMATION; @@ -3263,7 +3263,7 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit // chr->myspecial is the tag number of the chr's chair if (chr->myspecial >= 0) { - struct defaultobj *obj = objFindByTagId(chr->myspecial); + struct defaultobj *obj = obj_find_by_tag_id(chr->myspecial); obj->flags3 &= ~OBJFLAG3_PUSHABLE; obj->flags |= OBJFLAG_INVINCIBLE; @@ -3285,16 +3285,16 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit chr->act_die.thudframe2 = row->thudframe2; if (chr->specialdie == SPECIALDIE_NONE) { - modelSetAnimationWithMerge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); + model_set_animation_with_merge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); } else { - modelSetAnimationWithMerge(model, row->animnum, row->flip, 0, row->speed, 30, !instant); + model_set_animation_with_merge(model, row->animnum, row->flip, 0, row->speed, 30, !instant); } if (row->endframe >= 0) { - modelSetAnimEndFrame(model, row->endframe); + model_set_anim_end_frame(model, row->endframe); } - impactforce2 = gsetGetImpactForce(gset); + impactforce2 = gset_get_impact_force(gset); if (impactforce2 <= 0 && (chr->chrflags & CHRCFLAG_DIEWITHFORCE)) { impactforce2 = 6; @@ -3322,10 +3322,10 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit chr->act_die.thudframe1 = row->thudframe1; chr->act_die.thudframe2 = row->thudframe2; - modelSetAnimationWithMerge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); + model_set_animation_with_merge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); if (row->endframe >= 0) { - modelSetAnimEndFrame(model, row->endframe); + model_set_anim_end_frame(model, row->endframe); } } else { // Normal Skedar death @@ -3341,13 +3341,13 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit chr->act_die.thudframe1 = row->thudframe1; chr->act_die.thudframe2 = row->thudframe2; - modelSetAnimationWithMerge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); + model_set_animation_with_merge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); if (row->endframe >= 0) { - modelSetAnimEndFrame(model, row->endframe); + model_set_anim_end_frame(model, row->endframe); } - impactforce3 = gsetGetImpactForce(gset); + impactforce3 = gset_get_impact_force(gset); if (impactforce3 <= 0 && (chr->chrflags & CHRCFLAG_DIEWITHFORCE)) { impactforce3 = 6; @@ -3367,35 +3367,35 @@ void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hit // Handle multiplayer stats and kill count if (g_Vars.mplayerisrunning) { - mpstatsRecordDeath(aplayernum, mpPlayerGetIndex(chr)); + mpstats_record_death(aplayernum, mp_player_get_index(chr)); } else if (aplayernum >= 0) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(aplayernum); - mpstatsRecordPlayerKill(); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(aplayernum); + mpstats_record_player_kill(); + set_current_player_num(prevplayernum); } if (chr->chrflags & CHRCFLAG_KILLCOUNTABLE) { - mpstatsIncrementTotalKillCount(); + mpstats_increment_total_kill_count(); } // Drop items if (race == RACE_HUMAN || race == RACE_SKEDAR) { if (chr->weapons_held[0] && (chr->weapons_held[0]->obj->flags & OBJFLAG_AIUNDROPPABLE) == 0) { - objSetDropped(chr->weapons_held[0], DROPTYPE_DEFAULT); + obj_set_dropped(chr->weapons_held[0], DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } if (chr->weapons_held[1] && (chr->weapons_held[1]->obj->flags & OBJFLAG_AIUNDROPPABLE) == 0) { - objSetDropped(chr->weapons_held[1], DROPTYPE_DEFAULT); + obj_set_dropped(chr->weapons_held[1], DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } - chrDropConcealedItems(chr); + chr_drop_concealed_items(chr); } } -void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) +void chr_begin_argh(struct chrdata *chr, f32 angle, s32 hitpart) { bool doneanim = false; s32 instant; @@ -3403,12 +3403,12 @@ void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) struct model *model = chr->model; s32 i; s32 race = CHRRACE(chr); - s32 animnum = modelGetAnimNum(chr->model); + s32 animnum = model_get_anim_num(chr->model); if (animnum == ANIM_SNIPING_GETDOWN || animnum == ANIM_SNIPING_GETUP || animnum == ANIM_SNIPING_ONGROUND) { - chrFlinchBody(chr); + chr_flinch_body(chr); return; } @@ -3423,7 +3423,7 @@ void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) chr->sleep = 0; - modelSetAnimation(chr->model, ANIM_0163, false, 0, 0.5f, 16); + model_set_animation(chr->model, ANIM_0163, false, 0, 0.5f, 16); chr->drcarollimage_left = DRCAROLLIMAGE_X; chr->drcarollimage_right = DRCAROLLIMAGE_X; @@ -3462,7 +3462,7 @@ void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) { ANIM_0037, 0, -1, 0.5, 0, -1, -1 }, }; - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_ARGH; chr->act_argh.notifychrindex = 0; @@ -3471,13 +3471,13 @@ void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) row = &rows[random() % 8]; - modelSetAnimationWithMerge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); + model_set_animation_with_merge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); if (row->endframe >= 0) { - modelSetAnimEndFrame(model, chrGetRangedArghSpeed(chr, row->endframe, 8)); + model_set_anim_end_frame(model, chr_get_ranged_argh_speed(chr, row->endframe, 8)); doneanim = true; } else { - modelSetAnimEndFrame(model, chrGetRangedArghSpeed(chr, animGetNumFrames(row->animnum) - 1, 8)); + model_set_anim_end_frame(model, chr_get_ranged_argh_speed(chr, anim_get_num_frames(row->animnum) - 1, 8)); doneanim = true; } } @@ -3488,8 +3488,8 @@ void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) && g_AnimTablesByRace[race][index].injuryanimcount > 0) { // If shot in a hand that's holding a gun, remap the hit location to the // forearm because the hand injury animations assume the hand is empty. - struct prop *lgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *lgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rgun = chr_get_held_prop(chr, HAND_RIGHT); s32 rowindex; struct animtablerow *row; @@ -3506,28 +3506,28 @@ void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart) row = &g_AnimTablesByRace[race][index].injuryanims[rowindex]; - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_ARGH; chr->act_argh.notifychrindex = 0; chr->act_argh.lvframe60 = g_Vars.lvframe60; chr->sleep = 0; - modelSetAnimationWithMerge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); + model_set_animation_with_merge(model, row->animnum, row->flip, 0, row->speed, 16, !instant); if (row->endframe >= 0) { - modelSetAnimEndFrame(model, chrGetRangedArghSpeed(chr, row->endframe, 8)); + model_set_anim_end_frame(model, chr_get_ranged_argh_speed(chr, row->endframe, 8)); } else { - modelSetAnimEndFrame(model, chrGetRangedArghSpeed(chr, animGetNumFrames(row->animnum) - 1, 8)); + model_set_anim_end_frame(model, chr_get_ranged_argh_speed(chr, anim_get_num_frames(row->animnum) - 1, 8)); } } } -void chrReactToDamage(struct chrdata *chr, struct coord *vector, f32 angle, s32 hitpart, struct gset *gset, s32 aplayernum) +void chr_react_to_damage(struct chrdata *chr, struct coord *vector, f32 angle, s32 hitpart, struct gset *gset, s32 aplayernum) { s32 race = CHRRACE(chr); bool knockedout = false; - s32 animnum = modelGetAnimNum(chr->model); + s32 animnum = model_get_anim_num(chr->model); #if VERSION >= VERSION_NTSC_1_0 if (chr->actiontype == ACT_DRUGGEDKO) @@ -3541,8 +3541,8 @@ void chrReactToDamage(struct chrdata *chr, struct coord *vector, f32 angle, s32 } if (race == RACE_EYESPY) { - f32 strength = gsetGetImpactForce(gset); - struct eyespy *eyespy = chrToEyespy(chr); + f32 strength = gset_get_impact_force(gset); + struct eyespy *eyespy = chr_to_eyespy(chr); if (eyespy) { if (strength <= 0) { @@ -3558,15 +3558,15 @@ void chrReactToDamage(struct chrdata *chr, struct coord *vector, f32 angle, s32 } if (chr->damage >= chr->maxdamage) { - chrBeginDeath(chr, vector, angle, hitpart, gset, false, aplayernum); + chr_begin_death(chr, vector, angle, hitpart, gset, false, aplayernum); } else if (animnum == ANIM_SNIPING_GETDOWN || animnum == ANIM_SNIPING_GETUP || animnum == ANIM_SNIPING_ONGROUND) { - chrFlinchBody(chr); + chr_flinch_body(chr); } else if (race == RACE_EYESPY) { // empty } else if (race == RACE_DRCAROLL || race == RACE_ROBOT) { - f32 strength = gsetGetImpactForce(gset); + f32 strength = gset_get_impact_force(gset); if (race == RACE_DRCAROLL) { strength *= 0.5f; @@ -3585,17 +3585,17 @@ void chrReactToDamage(struct chrdata *chr, struct coord *vector, f32 angle, s32 } if (race == RACE_DRCAROLL) { - chrBeginArgh(chr, 0, 0); + chr_begin_argh(chr, 0, 0); } } else if (!knockedout) { - chrBeginArgh(chr, angle, hitpart); + chr_begin_argh(chr, angle, hitpart); } } /** * Launch a chr away from the given pos (for explosions). */ -void chrYeetFromPos(struct chrdata *chr, struct coord *exppos, f32 force) +void chr_yeet_from_pos(struct chrdata *chr, struct coord *exppos, f32 force) { struct model *model = chr->model; struct prop *prop = chr->prop; @@ -3613,7 +3613,7 @@ void chrYeetFromPos(struct chrdata *chr, struct coord *exppos, f32 force) f32 angletoexplosion; if (race != RACE_DRCAROLL && race != RACE_EYESPY && race != RACE_ROBOT) { - faceangle = chrGetInverseTheta(chr); + faceangle = chr_get_inverse_theta(chr); latangle = atan2f(prop->pos.x - exppos->x, prop->pos.z - exppos->z); dist.x = prop->pos.x - exppos->x; @@ -3653,8 +3653,8 @@ void chrYeetFromPos(struct chrdata *chr, struct coord *exppos, f32 force) row = &g_YeetAnimsSkedar[g_YeetAnimIndexesByRaceAngle[race][angleindex].indexes[subindex]]; } - chrStopFiring(chr); - chrUncloak(chr, true); + chr_stop_firing(chr); + chr_uncloak(chr, true); #if VERSION >= VERSION_NTSC_1_0 chr->chrflags &= ~CHRCFLAG_HIDDEN; @@ -3674,15 +3674,15 @@ void chrYeetFromPos(struct chrdata *chr, struct coord *exppos, f32 force) } chr->sleep = 0; - modelSetAnimation(model, row->animnum, row->flip, row->startframe, row->speed, 8); + model_set_animation(model, row->animnum, row->flip, row->startframe, row->speed, 8); if (row->endframe >= 0.0f) { - modelSetAnimEndFrame(model, row->endframe); + model_set_anim_end_frame(model, row->endframe); } } } -s32 gsetGetBlurAmount(struct gset *gset) +s32 gset_get_blur_amount(struct gset *gset) { s32 amount = TICKS(1000); @@ -3705,26 +3705,26 @@ s32 gsetGetBlurAmount(struct gset *gset) return amount; } -void chrKnockOut(struct chrdata *chr, f32 angle, s32 hitpart, struct gset *gset) +void chr_knock_out(struct chrdata *chr, f32 angle, s32 hitpart, struct gset *gset) { if (chr->actiontype != ACT_DRUGGEDCOMINGUP && chr->actiontype != ACT_DRUGGEDDROP && chr->actiontype != ACT_DRUGGEDKO) { #if VERSION >= VERSION_PAL_FINAL - if (mpstatsGetTotalKnockoutCount() < 2) { + if (mpstats_get_total_knockout_count() < 2) { chr->chrflags |= CHRCFLAG_KEEPCORPSEKO; - if (mainGetStageNum() == STAGE_VILLA) { + if (main_get_stage_num() == STAGE_VILLA) { chr->hidden |= CHRHFLAG_ANTINONINTERACTABLE; } } #elif VERSION >= VERSION_NTSC_1_0 - if (mpstatsGetTotalKnockoutCount() < 2) { + if (mpstats_get_total_knockout_count() < 2) { chr->chrflags |= CHRCFLAG_KEEPCORPSEKO; } #endif - mpstatsIncrementTotalKnockoutCount(); + mpstats_increment_total_knockout_count(); chr->actiontype = ACT_DRUGGEDCOMINGUP; chr->act_druggedcomingup.timer60 = 0; @@ -3739,7 +3739,7 @@ void chrKnockOut(struct chrdata *chr, f32 angle, s32 hitpart, struct gset *gset) * * The attack roll animation is the only one which is too awkward to transition. */ -bool chrIsAnimPreventingArgh(struct chrdata *chr, f32 *dst) +bool chr_is_anim_preventing_argh(struct chrdata *chr, f32 *dst) { bool result = false; s32 race = CHRRACE(chr); @@ -3749,15 +3749,15 @@ bool chrIsAnimPreventingArgh(struct chrdata *chr, f32 *dst) } if (race == RACE_HUMAN) { - s32 animnum = modelGetAnimNum(chr->model); + s32 animnum = model_get_anim_num(chr->model); f32 endframe; if (animnum == ANIM_SNIPING_GETDOWN || animnum == ANIM_SNIPING_GETUP || animnum == ANIM_SNIPING_ONGROUND) { - chrFlinchBody(chr); + chr_flinch_body(chr); } else if (chr->actiontype == ACT_ATTACKROLL - && modelGetAnimNum(chr->model) == chr->act_attack.animcfg->animnum) { + && model_get_anim_num(chr->model) == chr->act_attack.animcfg->animnum) { if (chr->act_attack.onehanded) { if (chr->act_attack.animcfg == &g_RollAttackAnims[4] || chr->act_attack.animcfg == &g_RollAttackAnims[5] @@ -3769,7 +3769,7 @@ bool chrIsAnimPreventingArgh(struct chrdata *chr, f32 *dst) endframe = chr->act_attack.animcfg->unk14; } - if (endframe > modelGetCurAnimFrame(chr->model)) { + if (endframe > model_get_cur_anim_frame(chr->model)) { *dst = endframe; result = true; } @@ -3777,7 +3777,7 @@ bool chrIsAnimPreventingArgh(struct chrdata *chr, f32 *dst) } else { endframe = chr->act_attack.animcfg->unk04 - 8; - if (endframe > modelGetCurAnimFrame(chr->model)) { + if (endframe > model_get_cur_anim_frame(chr->model)) { *dst = endframe; result = true; } @@ -3792,7 +3792,7 @@ bool chrIsAnimPreventingArgh(struct chrdata *chr, f32 *dst) return result; } -void chrChoke(struct chrdata *chr, s32 choketype) +void chr_choke(struct chrdata *chr, s32 choketype) { bool male = false; s16 soundnum = -1; @@ -3812,7 +3812,7 @@ void chrChoke(struct chrdata *chr, s32 choketype) } if (chr->prop->type == PROPTYPE_PLAYER) { - playernum = playermgrGetPlayerNumByProp(chr->prop); + playernum = playermgr_get_player_num_by_prop(chr->prop); if (g_Vars.players[playernum]->isdead) { return; @@ -4029,25 +4029,25 @@ void chrChoke(struct chrdata *chr, s32 choketype) if (soundnum >= 0) { if (chr->prop->type == PROPTYPE_PLAYER) { if (g_Vars.players[playernum]->chokehandle == NULL) { - sndStart(var80095200, soundnum, &g_Vars.players[playernum]->chokehandle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, &g_Vars.players[playernum]->chokehandle, -1, -1, -1, -1, -1); } } else { - psStopSound(chr->prop, PSTYPE_CHRTALK, 0); + ps_stop_sound(chr->prop, PSTYPE_CHRTALK, 0); - if (!psPropHasSoundWithContext(chr->prop, PSTYPE_CHRCHOKE)) { - psCreate(NULL, chr->prop, soundnum, -1, + if (!ps_prop_has_sound_with_context(chr->prop, PSTYPE_CHRCHOKE)) { + ps_create(NULL, chr->prop, soundnum, -1, -1, 0, 0, PSTYPE_CHRCHOKE, NULL, -1, NULL, -1, -1, -1, -1); } } } } -f32 chrGetShield(struct chrdata *chr) +f32 chr_get_shield(struct chrdata *chr) { return chr->cshield; } -void chrSetShield(struct chrdata *chr, f32 amount) +void chr_set_shield(struct chrdata *chr, f32 amount) { if (amount < 0) { amount = 0; @@ -4060,23 +4060,23 @@ void chrSetShield(struct chrdata *chr, f32 amount) } if (chr->prop->type == PROPTYPE_PLAYER) { - s32 playernum = playermgrGetPlayerNumByProp(chr->prop); + s32 playernum = playermgr_get_player_num_by_prop(chr->prop); if (playernum >= 0) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); - playerDisplayHealth(); + set_current_player_num(playernum); + player_display_health(); g_Vars.currentplayerstats->armourcount += amount * 0.125f; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } } } bool func0f034080(struct chrdata *chr, struct modelnode *node, struct prop *prop, struct model *model, s32 side, s16 *arg5) { - if (chrGetShield(chr) > 0) { + if (chr_get_shield(chr) > 0) { if (node && (node->type & 0xff) == MODELNODETYPE_BBOX) { - shieldhitCreate(chr->prop, chrGetShield(chr), prop, node, model, side, arg5); + shieldhit_create(chr->prop, chr_get_shield(chr), prop, node, model, side, arg5); } return true; @@ -4090,9 +4090,9 @@ bool func0f034080(struct chrdata *chr, struct modelnode *node, struct prop *prop * * Used for knife poison, nbomb damage, Investigation radioactivity and Escape gas. */ -void chrDamageByMisc(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop) +void chr_damage_by_misc(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop) { - chrDamage(chr, damage, vector, gset, prop, HITPART_GENERAL, + chr_damage(chr, damage, vector, gset, prop, HITPART_GENERAL, false, // damageshield NULL, // prop2 NULL, // node @@ -4103,9 +4103,9 @@ void chrDamageByMisc(struct chrdata *chr, f32 damage, struct coord *vector, stru NULL); // explosionpos } -void chrDamageByLaser(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop) +void chr_damage_by_laser(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop) { - chrDamage(chr, damage, vector, gset, prop, HITPART_GENERAL, + chr_damage(chr, damage, vector, gset, prop, HITPART_GENERAL, true, // damageshield chr->prop, // prop2 NULL, // node @@ -4118,7 +4118,7 @@ void chrDamageByLaser(struct chrdata *chr, f32 damage, struct coord *vector, str void func0f0341dc(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 *arg10) { - chrDamage(chr, damage, vector, gset, prop, hitpart, + chr_damage(chr, damage, vector, gset, prop, hitpart, true, // damageshield prop2, // prop2 node, // node @@ -4130,7 +4130,7 @@ void func0f0341dc(struct chrdata *chr, f32 damage, struct coord *vector, struct } /** - * Unused, and same as chrDamageByImpact but sets hitpart to HITPART_GENERAL instead of argument. + * Unused, and same as chr_damage_by_impact but sets hitpart to HITPART_GENERAL instead of argument. */ void func0f034248(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop) { @@ -4139,11 +4139,11 @@ void func0f034248(struct chrdata *chr, f32 damage, struct coord *vector, struct s32 side = 0; s32 hitpart = HITPART_GENERAL; - if (chrGetShield(chr) >= 0 && chr->model) { - chrCalculateShieldHit(chr, &chr->prop->pos, vector, &node, &hitpart, &model, &side); + if (chr_get_shield(chr) >= 0 && chr->model) { + chr_calculate_shield_hit(chr, &chr->prop->pos, vector, &node, &hitpart, &model, &side); } - chrDamage(chr, damage, vector, gset, prop, HITPART_GENERAL, + chr_damage(chr, damage, vector, gset, prop, HITPART_GENERAL, true, // damageshield chr->prop, // prop2 node, // node @@ -4157,17 +4157,17 @@ void func0f034248(struct chrdata *chr, f32 damage, struct coord *vector, struct /** * Used for punching, but also used by AI commands to make chrs take damage. */ -void chrDamageByImpact(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop, s32 hitpart) +void chr_damage_by_impact(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop, s32 hitpart) { struct modelnode *node = NULL; struct model *model = NULL; s32 side = 0; - if (chrGetShield(chr) >= 0 && chr->model) { - chrCalculateShieldHit(chr, &chr->prop->pos, vector, &node, &hitpart, &model, &side); + if (chr_get_shield(chr) >= 0 && chr->model) { + chr_calculate_shield_hit(chr, &chr->prop->pos, vector, &node, &hitpart, &model, &side); } - chrDamage(chr, damage, vector, gset, prop, hitpart, + chr_damage(chr, damage, vector, gset, prop, hitpart, true, // damageshield chr->prop, // prop2 node, // node @@ -4178,9 +4178,9 @@ void chrDamageByImpact(struct chrdata *chr, f32 damage, struct coord *vector, st NULL); // explosionpos } -void chrDamageByExplosion(struct chrdata *chr, f32 damage, struct coord *vector, struct prop *prop, struct coord *explosionpos) +void chr_damage_by_explosion(struct chrdata *chr, f32 damage, struct coord *vector, struct prop *prop, struct coord *explosionpos) { - chrDamage(chr, damage, vector, NULL, prop, HITPART_GENERAL, + chr_damage(chr, damage, vector, NULL, prop, HITPART_GENERAL, true, // damageshield chr->prop, // prop2 NULL, // node @@ -4191,12 +4191,12 @@ void chrDamageByExplosion(struct chrdata *chr, f32 damage, struct coord *vector, explosionpos); } -void playerUpdateDamageStats(struct prop *attacker, struct prop *victim, f32 damage) +void player_update_damage_stats(struct prop *attacker, struct prop *victim, f32 damage) { s32 playernum; if (attacker && attacker->type == PROPTYPE_PLAYER) { - playernum = playermgrGetPlayerNumByProp(attacker); + playernum = playermgr_get_player_num_by_prop(attacker); if (playernum >= 0) { g_Vars.playerstats[playernum].damtransmitted += damage; @@ -4204,7 +4204,7 @@ void playerUpdateDamageStats(struct prop *attacker, struct prop *victim, f32 dam } if (victim && victim->type == PROPTYPE_PLAYER) { - playernum = playermgrGetPlayerNumByProp(victim); + playernum = playermgr_get_player_num_by_prop(victim); if (playernum >= 0) { g_Vars.playerstats[playernum].damreceived += damage; @@ -4236,7 +4236,7 @@ void playerUpdateDamageStats(struct prop *attacker, struct prop *victim, f32 dam * explosion - true if damage is coming from an explosion * explosionpos - position of said explosion */ -void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, +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) @@ -4286,7 +4286,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // Don't damage if in CI training outside of training session if (chr->prop == g_Vars.currentplayer->prop && g_Vars.currentplayer->training == false - && mainGetStageNum() == STAGE_CITRAINING) { + && main_get_stage_num() == STAGE_CITRAINING) { return; } @@ -4334,9 +4334,9 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse gset = &gset2; } - func = gsetGetWeaponFunction(gset); + func = gset_get_weapon_function(gset); ismelee = func && (func->type & 0xff) == INVENTORYFUNCTYPE_MELEE; - makedizzy = race != RACE_DRCAROLL && gsetHasFunctionFlags(gset, FUNCFLAG_MAKEDIZZY); + makedizzy = race != RACE_DRCAROLL && gset_has_function_flags(gset, FUNCFLAG_MAKEDIZZY); if (chr->prop == g_Vars.currentplayer->prop && g_Vars.currentplayer->invincible) { return; @@ -4353,12 +4353,12 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // hit their target if (aprop && aprop->type == PROPTYPE_CHR - && chrGetTargetProp(aprop->chr) == chr->prop) { + && chr_get_target_prop(aprop->chr) == chr->prop) { aprop->chr->chrflags |= CHRCFLAG_INJUREDTARGET; } // Disarm only hurts the victim in solo missions and if the victim is an NPC - if (gsetHasFunctionFlags(gset, FUNCFLAG_DISARM) + if (gset_has_function_flags(gset, FUNCFLAG_DISARM) && gset->weaponnum == WEAPON_UNARMED && (vprop->type == PROPTYPE_PLAYER || g_Vars.normmplayerisrunning)) { damage = 0; @@ -4377,16 +4377,16 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse headshotdamagescale = 25; } else if (aprop && aprop->type == PROPTYPE_CHR && vprop->type == PROPTYPE_PLAYER) { // Chr is attacking player - damage *= g_PlayerDamageRxScale * pdmodeGetEnemyDamage(); + damage *= g_PlayerDamageRxScale * pdmode_get_enemy_damage(); } if (vprop->type != PROPTYPE_PLAYER) { - damage /= pdmodeGetEnemyHealth(); + damage /= pdmode_get_enemy_health(); } if (vprop->type == PROPTYPE_PLAYER) { - healthscale = g_Vars.players[playermgrGetPlayerNumByProp(vprop)]->healthscale; - armourscale = g_Vars.players[playermgrGetPlayerNumByProp(vprop)]->armourscale; + healthscale = g_Vars.players[playermgr_get_player_num_by_prop(vprop)]->healthscale; + armourscale = g_Vars.players[playermgr_get_player_num_by_prop(vprop)]->armourscale; } } else if (g_Vars.coopplayernum >= 0) { // Co-op @@ -4398,16 +4398,16 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse damage *= g_PlayerDamageTxScale; headshotdamagescale = 25; } else if (aprop && aprop->type == PROPTYPE_CHR && vprop->type == PROPTYPE_PLAYER) { - damage *= g_PlayerDamageRxScale * pdmodeGetEnemyDamage(); + damage *= g_PlayerDamageRxScale * pdmode_get_enemy_damage(); } if (vprop->type != PROPTYPE_PLAYER) { - damage /= pdmodeGetEnemyHealth(); + damage /= pdmode_get_enemy_health(); } if (vprop->type == PROPTYPE_PLAYER) { - healthscale = g_Vars.players[playermgrGetPlayerNumByProp(vprop)]->healthscale; - armourscale = g_Vars.players[playermgrGetPlayerNumByProp(vprop)]->armourscale; + healthscale = g_Vars.players[playermgr_get_player_num_by_prop(vprop)]->healthscale; + armourscale = g_Vars.players[playermgr_get_player_num_by_prop(vprop)]->armourscale; } } else if (g_Vars.antiplayernum >= 0) { // Anti @@ -4419,16 +4419,16 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse damage *= g_PlayerDamageTxScale; headshotdamagescale = 25; } else if (aprop && aprop != g_Vars.bond->prop && vprop == g_Vars.bond->prop) { - damage *= g_PlayerDamageRxScale * pdmodeGetEnemyDamage(); + damage *= g_PlayerDamageRxScale * pdmode_get_enemy_damage(); } if (vprop != g_Vars.bond->prop) { - damage /= pdmodeGetEnemyHealth(); + damage /= pdmode_get_enemy_health(); } if (vprop == g_Vars.bond->prop) { - healthscale = g_Vars.players[playermgrGetPlayerNumByProp(vprop)]->healthscale; - armourscale = g_Vars.players[playermgrGetPlayerNumByProp(vprop)]->armourscale; + healthscale = g_Vars.players[playermgr_get_player_num_by_prop(vprop)]->healthscale; + armourscale = g_Vars.players[playermgr_get_player_num_by_prop(vprop)]->armourscale; } // Anti shooting other enemies is lethal @@ -4439,9 +4439,9 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // Normal multiplayer if (vprop->type == PROPTYPE_PLAYER) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(vprop)); + set_current_player_num(playermgr_get_player_num_by_prop(vprop)); damage *= g_Vars.currentplayerstats->damagescale; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } } @@ -4453,39 +4453,39 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse s32 contpad1; s32 contpad2; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(vprop)); + set_current_player_num(playermgr_get_player_num_by_prop(vprop)); - joyGetContpadNumsForPlayer(g_Vars.currentplayernum, &contpad1, &contpad2); + joy_get_contpad_nums_for_player(g_Vars.currentplayernum, &contpad1, &contpad2); if (contpad1 >= 0) { - pakRumble(contpad1, 0.25f, -1, -1); + pak_rumble(contpad1, 0.25f, -1, -1); } if (contpad2 >= 0) { - pakRumble(contpad2, 0.25f, -1, -1); + pak_rumble(contpad2, 0.25f, -1, -1); } #else - setCurrentPlayerNum(playermgrGetPlayerNumByProp(vprop)); + set_current_player_num(playermgr_get_player_num_by_prop(vprop)); - pakRumble((s8)g_Vars.currentplayernum, 0.25f, -1, -1); + pak_rumble((s8)g_Vars.currentplayernum, 0.25f, -1, -1); - if (optionsGetControlMode(g_Vars.currentplayerstats->mpindex) >= CONTROLMODE_21) { - pakRumble((s8)(PLAYERCOUNT() + g_Vars.currentplayernum), 0.25f, -1, -1); + if (options_get_control_mode(g_Vars.currentplayerstats->mpindex) >= CONTROLMODE_21) { + pak_rumble((s8)(PLAYERCOUNT() + g_Vars.currentplayernum), 0.25f, -1, -1); } #endif - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } // Find the attacker's player number if possible // (includes MP aibots, not applicable for solo chrs) if (g_Vars.mplayerisrunning) { if (aprop && (aprop->type == PROPTYPE_PLAYER || aprop->type == PROPTYPE_CHR)) { - aplayernum = mpPlayerGetIndex(aprop->chr); + aplayernum = mp_player_get_index(aprop->chr); } } else { if (aprop && aprop->type == PROPTYPE_PLAYER) { - aplayernum = playermgrGetPlayerNumByProp(aprop); + aplayernum = playermgr_get_player_num_by_prop(aprop); } } @@ -4516,7 +4516,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // Handle shield damage if (damageshield) { - shield = chrGetShield(chr); + shield = chr_get_shield(chr); if (chr->aibot && chr->aibot->config->type == BOTTYPE_TURTLE) { armourscale = 4; @@ -4526,9 +4526,9 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse if (g_Vars.normmplayerisrunning) { #if VERSION >= VERSION_PAL_FINAL // Fixing a @bug? - damage = damage * mpHandicapToDamageScale(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].handicap); + damage = damage * mp_handicap_to_damage_scale(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].handicap); #else - damage /= mpHandicapToDamageScale(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].handicap); + damage /= mp_handicap_to_damage_scale(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].handicap); #endif } @@ -4537,21 +4537,21 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse if (prop2 && node && chr->model) { func0f034080(chr, node, prop2, model, side, arg11); } else { - shieldhitCreate(chr->prop, chrGetShield(chr), NULL, NULL, NULL, 0, 0); + shieldhit_create(chr->prop, chr_get_shield(chr), NULL, NULL, NULL, 0, 0); } if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_ONEHITKILLS)) { damage = 0; - chrSetShield(chr, 0); + chr_set_shield(chr, 0); } else if (shield >= damage / armourscale) { // Has enough shield to sustain the damage shield -= damage / armourscale; damage = 0; - chrSetShield(chr, shield); + chr_set_shield(chr, shield); } else { // Shield is now gone damage = 0; - chrSetShield(chr, 0); + chr_set_shield(chr, 0); } showshield = true; @@ -4561,7 +4561,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // Handle hat shots. This is left over from GE, as hats don't exist in PD if (damage > 0 && hitpart == HITPART_HAT && chr->weapons_held[2]) { - s32 type = hatGetType(chr->weapons_held[2]); + s32 type = hat_get_type(chr->weapons_held[2]); if (type == HATTYPE_CLOTH) { // Hat remains on head and damages the chr (eg. Moonraker Elite) @@ -4569,14 +4569,14 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse } else if (type != HATTYPE_METAL) { // Normal hat damage = 0; - objSetDropped(chr->weapons_held[2], DROPTYPE_HAT); + obj_set_dropped(chr->weapons_held[2], DROPTYPE_HAT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } else { // Metal helmets don't fall off and make a metallic chink noise when shot u16 sounds[] = { SFX_HIT_METAL_807B, SFX_HIT_METAL_8079, SFX_HATHIT_807C }; damage = 0; - psCreate(NULL, chr->prop, sounds[random() % 3], -1, + ps_create(NULL, chr->prop, sounds[random() % 3], -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); } } @@ -4585,7 +4585,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse if (aprop && aprop->type == PROPTYPE_PLAYER && !explosion) { bool alreadydead = false; s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(aprop)); + set_current_player_num(playermgr_get_player_num_by_prop(aprop)); // ACT_DIE is not checked here, so it would appear that shooting // a chr as they're dying will increment the shots hit count @@ -4593,37 +4593,37 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse alreadydead = true; } - if (vprop->type == PROPTYPE_PLAYER && g_Vars.players[playermgrGetPlayerNumByProp(vprop)]->isdead) { + if (vprop->type == PROPTYPE_PLAYER && g_Vars.players[playermgr_get_player_num_by_prop(vprop)]->isdead) { alreadydead = true; } if (!alreadydead && hitpart) { switch (hitpart) { case HITPART_HEAD: - mpstatsIncrementPlayerShotCount2(gset, SHOTREGION_HEAD); + mpstats_increment_player_shot_count2(gset, SHOTREGION_HEAD); break; case HITPART_GUN: - mpstatsIncrementPlayerShotCount2(gset, SHOTREGION_GUN); + mpstats_increment_player_shot_count2(gset, SHOTREGION_GUN); break; case HITPART_HAT: - mpstatsIncrementPlayerShotCount2(gset, SHOTREGION_HAT); + mpstats_increment_player_shot_count2(gset, SHOTREGION_HAT); break; case HITPART_PELVIS: case HITPART_TORSO: - mpstatsIncrementPlayerShotCount2(gset, SHOTREGION_BODY); + mpstats_increment_player_shot_count2(gset, SHOTREGION_BODY); break; default: - mpstatsIncrementPlayerShotCount2(gset, SHOTREGION_LIMB); + mpstats_increment_player_shot_count2(gset, SHOTREGION_LIMB); break; } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } // If the chr is invincible, make them flinch then we're done if (chr->chrflags & CHRCFLAG_INVINCIBLE) { - chrFlinchBody(chr); + chr_flinch_body(chr); return; } @@ -4635,7 +4635,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse pos.x = vprop->pos.x - vector->x; pos.y = vprop->pos.y - vector->y; pos.z = vprop->pos.z - vector->z; - chrFlinchHead(chr, chrGetAngleToPos(chr, &pos)); + chr_flinch_head(chr, chr_get_angle_to_pos(chr, &pos)); } return; @@ -4650,7 +4650,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse sp9c.x = vprop->pos.x - vector->x; sp9c.y = vprop->pos.y - vector->y; sp9c.z = vprop->pos.z - vector->z; - angle = chrGetAngleToPos(chr, &sp9c); + angle = chr_get_angle_to_pos(chr, &sp9c); // Knife in the back to an unalerted chr is lethal if (gset->weaponnum == WEAPON_COMBATKNIFE @@ -4662,7 +4662,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse } // Punching and pistol whipping is less effective from the front - if (gsetHasFunctionFlags(gset, FUNCFLAG_BLUNTIMPACT)) { + if (gset_has_function_flags(gset, FUNCFLAG_BLUNTIMPACT)) { if (angle < RAD(60, 1.0470308065414f) || angle > RAD(300, 5.2351541519165f)) { damage *= 0.4f; } else if (angle < RAD(120, 2.0940616130829f) || angle > RAD(240, 4.1881237030029f)) { @@ -4671,8 +4671,8 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse onehitko = true; } - if (chrGetHeldProp(chr, HAND_RIGHT) == NULL - && chrGetHeldProp(chr, HAND_LEFT) == NULL + if (chr_get_held_prop(chr, HAND_RIGHT) == NULL + && chr_get_held_prop(chr, HAND_LEFT) == NULL && (chr->gunprop == NULL || chr->actiontype == ACT_SURRENDER || chr->actiontype == ACT_SURPRISED)) { // Chr is unarmed and has no hope of getting their gun onehitko = true; @@ -4701,12 +4701,12 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse if (hitpart == HITPART_HEAD) { if (race == RACE_SKEDAR) { damage += damage; - chrFlinchHead(chr, angle); + chr_flinch_head(chr, angle); } else { damage *= 4; if (isshoot && !usedshield) { - chrFlinchHead(chr, angle); + chr_flinch_head(chr, angle); damage *= headshotdamagescale; if (gset->weaponnum == WEAPON_COMBATKNIFE && gset->weaponfunc != FUNC_POISON) { @@ -4730,18 +4730,18 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // Handle situations where the player is the one being shot, then return if (vprop->type == PROPTYPE_PLAYER) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(vprop)); + set_current_player_num(playermgr_get_player_num_by_prop(vprop)); if (g_Vars.normmplayerisrunning) { - damage /= mpHandicapToDamageScale(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].handicap); + damage /= mp_handicap_to_damage_scale(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].handicap); } if (g_Vars.currentplayer->isdead == false && !g_PlayerInvincible) { f32 boostscale; // Handle player losing gun - if (gsetHasFunctionFlags(gset, FUNCFLAG_DISARM)) { - bgunDisarm(aprop); + if (gset_has_function_flags(gset, FUNCFLAG_DISARM)) { + bgun_disarm(aprop); } // Handle player dizziness @@ -4759,9 +4759,9 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse if (!achr || !achr->aibot - || !gsetHasFunctionFlags(gset, FUNCFLAG_00400000) + || !gset_has_function_flags(gset, FUNCFLAG_00400000) || chr->blurdrugamount < TICKS(4500)) { - chr->blurdrugamount += gsetGetBlurAmount(gset) * blurscale; + chr->blurdrugamount += gset_get_blur_amount(gset) * blurscale; } chr->blurnumtimesdied = 0; @@ -4779,8 +4779,8 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse statsamount = g_Vars.currentplayer->bondhealth; } - playerUpdateDamageStats(aprop, vprop, statsamount); - playerDisplayHealth(); + player_update_damage_stats(aprop, vprop, statsamount); + player_display_health(); if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_ONEHITKILLS)) { g_Vars.currentplayer->bondhealth = 0; @@ -4794,15 +4794,15 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse if (g_Vars.currentplayer->training == false && g_Vars.currentplayer->bondhealth <= 0) { - playerDieByShooter(aplayernum, false); + player_die_by_shooter(aplayernum, false); chr->blurnumtimesdied++; } - if (!lvIsPaused() && canchoke) { - chrChoke(chr, choketype); + if (!lv_is_paused() && canchoke) { + chr_choke(chr, choketype); } - chrFlinchBody(chr); + chr_flinch_body(chr); } // Handle player boost @@ -4818,19 +4818,19 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse g_Vars.currentplayer->bondshotspeed.z += vector->z * boostscale; if (showdamage) { - playerDisplayDamage(); + player_display_damage(); } if (showshield) { - playerDisplayShield(); + player_display_shield(); } if (g_Vars.normmplayerisrunning && aprop && aprop->type == PROPTYPE_PLAYER) { - playerCheckIfShotInBack(prevplayernum, vector->x, vector->z); + player_check_if_shot_in_back(prevplayernum, vector->x, vector->z); } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); return; } @@ -4843,24 +4843,24 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // NPC was alive prior to being shot. // Handle aibot/chr losing gun - if (gsetHasFunctionFlags(gset, FUNCFLAG_DISARM) + if (gset_has_function_flags(gset, FUNCFLAG_DISARM) && ((chr->flags & CHRFLAG0_CANLOSEGUN) || chr->aibot)) { if (chr->aibot) { - botDisarm(chr, aprop); + bot_disarm(chr, aprop); } else { - weapon = chrGetHeldProp(chr, HAND_RIGHT); + weapon = chr_get_held_prop(chr, HAND_RIGHT); if (weapon) { chr->gunprop = weapon; - objSetDropped(weapon, DROPTYPE_DEFAULT); + obj_set_dropped(weapon, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } - weapon = chrGetHeldProp(chr, HAND_LEFT); + weapon = chr_get_held_prop(chr, HAND_LEFT); if (weapon) { chr->gunprop = weapon; - objSetDropped(weapon, DROPTYPE_DEFAULT); + obj_set_dropped(weapon, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } } @@ -4875,10 +4875,10 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // Handle chr dizziness and psychosis if (makedizzy && race != RACE_DRCAROLL && race != RACE_ROBOT) { - if (gsetHasFunctionFlags(gset, FUNCFLAG_PSYCHOSIS)) { + if (gset_has_function_flags(gset, FUNCFLAG_PSYCHOSIS)) { chr->hidden |= CHRHFLAG_PSYCHOSISED; } else { - chr->blurdrugamount += gsetGetBlurAmount(gset); + chr->blurdrugamount += gset_get_blur_amount(gset); chr->blurnumtimesdied = 0; if (!chr->aibot && chr->blurdrugamount >= TICKS(5000)) { @@ -4911,11 +4911,11 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse // Handle one-hit knockouts if (onehitko && chr->aibot == NULL && race == RACE_HUMAN) { - chrKnockOut(chr, angle, hitpart, gset); - psStopSound(chr->prop, PSTYPE_CHRTALK, 0); + chr_knock_out(chr, angle, hitpart, gset); + ps_stop_sound(chr->prop, PSTYPE_CHRTALK, 0); if (canchoke) { - chrChoke(chr, choketype); + chr_choke(chr, choketype); } if (gset->weaponnum == WEAPON_UNARMED && chr->actiontype != ACT_DRUGGEDKO) { @@ -4937,7 +4937,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse amount *= 0.125f; - playerUpdateDamageStats(aprop, vprop, amount); + player_update_damage_stats(aprop, vprop, amount); chr->damage += damage; chr->lastattacker = (aprop ? aprop->chr : NULL); @@ -4949,13 +4949,13 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse } if (canchoke) { - chrChoke(chr, choketype); + chr_choke(chr, choketype); } - chrFlinchBody(chr); + chr_flinch_body(chr); if (chr->damage >= chr->maxdamage) { - chrDie(chr, aplayernum); + chr_die(chr, aplayernum); } } else if (explosion) { // Chrs die instantly from explosion damage provided they @@ -4968,44 +4968,44 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse chr->damage = chr->maxdamage; if (race == RACE_DRCAROLL || race == RACE_EYESPY || race == RACE_ROBOT) { - chrBeginDeath(chr, vector, angle, hitpart, gset, false, aplayernum); + chr_begin_death(chr, vector, angle, hitpart, gset, false, aplayernum); } else { - chrYeetFromPos(chr, explosionpos, explosionforce); + chr_yeet_from_pos(chr, explosionpos, explosionforce); } if (canchoke) { - chrChoke(chr, choketype); + chr_choke(chr, choketype); } if (g_Vars.mplayerisrunning) { - mpstatsRecordDeath(aplayernum, mpPlayerGetIndex(chr)); + mpstats_record_death(aplayernum, mp_player_get_index(chr)); } else if (aprop && aprop->type == PROPTYPE_PLAYER) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(aprop)); - mpstatsRecordPlayerKill(); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playermgr_get_player_num_by_prop(aprop)); + mpstats_record_player_kill(); + set_current_player_num(prevplayernum); } if (chr->chrflags & CHRCFLAG_KILLCOUNTABLE) { - mpstatsIncrementTotalKillCount(); + mpstats_increment_total_kill_count(); } if (chr->aibot == NULL) { - chrDropConcealedItems(chr); + chr_drop_concealed_items(chr); } if (chr->aibot == NULL) { weapon = chr->weapons_held[HAND_RIGHT]; if (weapon && (weapon->obj->flags & OBJFLAG_AIUNDROPPABLE) == 0) { - objSetDropped(weapon, DROPTYPE_DEFAULT); + obj_set_dropped(weapon, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } weapon = chr->weapons_held[HAND_LEFT]; if (weapon && (weapon->obj->flags & OBJFLAG_AIUNDROPPABLE) == 0) { - objSetDropped(weapon, DROPTYPE_DEFAULT); + obj_set_dropped(weapon, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } } @@ -5013,29 +5013,29 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse } else { // Non-explosion damage to solo mode chr if (chr->actiontype != ACT_DRUGGEDKO && canchoke) { - chrChoke(chr, choketype); + chr_choke(chr, choketype); } if (makedizzy && chr->damage >= chr->maxdamage) { chr->damage = chr->maxdamage - 0.1f; - chrKnockOut(chr, angle, hitpart, gset); + chr_knock_out(chr, angle, hitpart, gset); } // If chr has armour or the weapon doesn't stun if (chr->damage < 0 || - (gsetHasFunctionFlags(gset, FUNCFLAG_NOSTUN) && chr->damage < chr->maxdamage)) { + (gset_has_function_flags(gset, FUNCFLAG_NOSTUN) && chr->damage < chr->maxdamage)) { f32 endframe = -1; - if (!chrIsAnimPreventingArgh(chr, &endframe)) { - chrFlinchBody(chr); + if (!chr_is_anim_preventing_argh(chr, &endframe)) { + chr_flinch_body(chr); } } else if (hitpart != HITPART_HAT) { // Cancel current animation and prepare for argh f32 endframe = -1; - if (chrIsAnimPreventingArgh(chr, &endframe)) { + if (chr_is_anim_preventing_argh(chr, &endframe)) { if (endframe >= 0) { - modelSetAnimEndFrame(chr->model, endframe); + model_set_anim_end_frame(chr->model, endframe); } chr->actiontype = ACT_PREARGH; @@ -5052,7 +5052,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse chr->sleep = 0; } else { - chrReactToDamage(chr, vector, angle, hitpart, gset, aplayernum); + chr_react_to_damage(chr, vector, angle, hitpart, gset, aplayernum); } } } @@ -5076,11 +5076,11 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse } } -void chrDie(struct chrdata *chr, s32 aplayernum) +void chr_die(struct chrdata *chr, s32 aplayernum) { if (chr->actiontype != ACT_DIE) { - chrStopFiring(chr); - chrUncloak(chr, true); + chr_stop_firing(chr); + chr_uncloak(chr, true); chr->actiontype = ACT_DIE; chr->act_die.notifychrindex = 0; @@ -5090,11 +5090,11 @@ void chrDie(struct chrdata *chr, s32 aplayernum) chr->act_die.thudframe2 = -1; chr->act_die.timeextra = 0; - chr->ailist = ailistFindById(GAILIST_AIBOT_DEAD); + chr->ailist = ailist_find_by_id(GAILIST_AIBOT_DEAD); chr->aioffset = 0; - mpstatsRecordDeath(aplayernum, mpPlayerGetIndex(chr)); - botinvDropAll(chr, chr->aibot->weaponnum); + mpstats_record_death(aplayernum, mp_player_get_index(chr)); + botinv_drop_all(chr, chr->aibot->weaponnum); #if VERSION >= VERSION_NTSC_1_0 chr->aibot->hasbriefcase = false; @@ -5115,16 +5115,16 @@ bool func0f03645c(struct chrdata *chr, struct coord *arg1, RoomNum *arg2, struct RoomNum rooms[8]; struct prop *prop = chr->prop; - chrGetBbox(prop, &radius, &ymax, &ymin); - chrSetPerimEnabled(chr, false); + chr_get_bbox(prop, &radius, &ymax, &ymin); + chr_set_perim_enabled(chr, false); - if (cdTestCylMove04(arg1, arg2, arg3, rooms, arg5, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { - if (cdTestCylMove01(arg3, rooms, arg4, arg5, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { + if (cd_test_cyl_move04(arg1, arg2, arg3, rooms, arg5, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { + if (cd_test_cyl_move01(arg3, rooms, arg4, arg5, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { result = true; } } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); return result; } @@ -5146,11 +5146,11 @@ bool func0f03654c(struct chrdata *chr, struct coord *pos, RoomNum *rooms, struct prop = chr->prop; - chrSetPerimEnabled(chr, false); - chrGetBbox(prop, &radius, &ymax, &ymin); + chr_set_perim_enabled(chr, false); + chr_get_bbox(prop, &radius, &ymax, &ymin); - if ((rooms2 && cdTestCylMove02(pos, rooms, pos2, rooms2, types, true, ymax - prop->pos.y, ymin - prop->pos.y)) - || (rooms2 == NULL && cdTestCylMove01(pos, rooms, pos2, types, 1, ymax - prop->pos.y, ymin - prop->pos.y))) { + if ((rooms2 && cd_test_cyl_move02(pos, rooms, pos2, rooms2, types, true, ymax - prop->pos.y, ymin - prop->pos.y)) + || (rooms2 == NULL && cd_test_cyl_move01(pos, rooms, pos2, types, 1, ymax - prop->pos.y, ymin - prop->pos.y))) { if (vector == NULL) { vector = &tmp; @@ -5159,7 +5159,7 @@ bool func0f03654c(struct chrdata *chr, struct coord *pos, RoomNum *rooms, struct tmp.z = pos2->z - pos->z; if (tmp.f[0] == 0 && tmp.f[2] == 0) { - // @bug: Needs to call chrSetPerimEnabled(chr, true) + // @bug: Needs to call chr_set_perim_enabled(chr, true) // before returning return true; } @@ -5180,8 +5180,8 @@ bool func0f03654c(struct chrdata *chr, struct coord *pos, RoomNum *rooms, struct sp50.y = pos2->y; sp50.z = pos2->z - a; - if (cdTestCylMove04(pos, rooms, &sp5c, sp40, types, 1, ymax - prop->pos.y, ymin - prop->pos.y) - && cdTestCylMove01(&sp5c, sp40, &sp50, types, 1, ymax - prop->pos.y, ymin - prop->pos.y)) { + if (cd_test_cyl_move04(pos, rooms, &sp5c, sp40, types, 1, ymax - prop->pos.y, ymin - prop->pos.y) + && cd_test_cyl_move01(&sp5c, sp40, &sp50, types, 1, ymax - prop->pos.y, ymin - prop->pos.y)) { sp5c.x = pos->x - b; sp5c.y = pos->y; sp5c.z = pos->z + a; @@ -5190,24 +5190,24 @@ bool func0f03654c(struct chrdata *chr, struct coord *pos, RoomNum *rooms, struct sp50.y = pos2->y; sp50.z = pos2->z + a; - if (cdTestCylMove04(pos, rooms, &sp5c, sp40, types, 1, ymax - prop->pos.y, ymin - prop->pos.y) - && cdTestCylMove01(&sp5c, sp40, &sp50, types, 1, ymax - prop->pos.y, ymin - prop->pos.y)) { + if (cd_test_cyl_move04(pos, rooms, &sp5c, sp40, types, 1, ymax - prop->pos.y, ymin - prop->pos.y) + && cd_test_cyl_move01(&sp5c, sp40, &sp50, types, 1, ymax - prop->pos.y, ymin - prop->pos.y)) { result = true; } } } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); return result; } -bool propchrHasClearLineToPos(struct prop *prop, struct coord *dstpos, struct coord *vector) +bool propchr_has_clear_line_to_pos(struct prop *prop, struct coord *dstpos, struct coord *vector) { return func0f03654c(prop->chr, &prop->pos, prop->rooms, dstpos, NULL, vector, prop->chr->radius * 1.2f, CDTYPE_ALL); } -bool propchrHasClearLineInVector(struct prop *prop, struct coord *vector, f32 mult) +bool propchr_has_clear_line_in_vector(struct prop *prop, struct coord *vector, f32 mult) { struct coord dstpos; @@ -5215,7 +5215,7 @@ bool propchrHasClearLineInVector(struct prop *prop, struct coord *vector, f32 mu dstpos.y = prop->pos.y; dstpos.z = vector->z * mult + prop->pos.z; - return propchrHasClearLineToPos(prop, &dstpos, vector); + return propchr_has_clear_line_to_pos(prop, &dstpos, vector); } bool func0f036974(struct prop *prop, struct coord *pos) @@ -5223,10 +5223,10 @@ bool func0f036974(struct prop *prop, struct coord *pos) return func0f03654c(prop->chr, &prop->pos, prop->rooms, pos, NULL, NULL, prop->chr->radius * 1.2f, CDTYPE_ALL); } -void chrGetSideVectorToTarget(struct chrdata *chr, bool side, struct coord *vector) +void chr_get_side_vector_to_target(struct chrdata *chr, bool side, struct coord *vector) { struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); vector->x = 0; vector->y = 0; @@ -5254,24 +5254,24 @@ void chrGetSideVectorToTarget(struct chrdata *chr, bool side, struct coord *vect } } -bool chrCanRollInDirection(struct chrdata *chr, bool side, f32 distance) +bool chr_can_roll_in_direction(struct chrdata *chr, bool side, f32 distance) { struct prop *prop = chr->prop; struct coord vector; struct coord dstpos; - chrGetSideVectorToTarget(chr, side, &vector); + chr_get_side_vector_to_target(chr, side, &vector); dstpos.x = vector.x * distance + prop->pos.x; dstpos.y = prop->pos.y; dstpos.z = vector.z * distance + prop->pos.z; - return propchrHasClearLineToPos(prop, &dstpos, &vector); + return propchr_has_clear_line_to_pos(prop, &dstpos, &vector); } -void chrGetSideVector(struct chrdata *chr, bool side, struct coord *vector) +void chr_get_side_vector(struct chrdata *chr, bool side, struct coord *vector) { - f32 angle = chrGetInverseTheta(chr); + f32 angle = chr_get_inverse_theta(chr); if (side) { vector->x = cosf(angle); @@ -5284,22 +5284,22 @@ void chrGetSideVector(struct chrdata *chr, bool side, struct coord *vector) } } -bool chrCanJumpInDirection(struct chrdata *chr, bool side, f32 distance) +bool chr_can_jump_in_direction(struct chrdata *chr, bool side, f32 distance) { struct prop *prop = chr->prop; struct coord vector; struct coord dstpos; - chrGetSideVector(chr, side, &vector); + chr_get_side_vector(chr, side, &vector); dstpos.x = vector.x * distance + prop->pos.x; dstpos.y = prop->pos.y; dstpos.z = vector.z * distance + prop->pos.z; - return propchrHasClearLineToPos(prop, &dstpos, &vector); + return propchr_has_clear_line_to_pos(prop, &dstpos, &vector); } -bool chrIsRoomOffScreen(struct chrdata *chr, struct coord *waypos, RoomNum *wayrooms) +bool chr_is_room_off_screen(struct chrdata *chr, struct coord *waypos, RoomNum *wayrooms) { struct prop *prop = chr->prop; RoomNum sp7c[20]; @@ -5333,7 +5333,7 @@ bool chrIsRoomOffScreen(struct chrdata *chr, struct coord *waypos, RoomNum *wayr for (i = 0; i < PLAYERCOUNT(); i++) { portal00018148(waypos, &g_Vars.players[i]->prop->pos, wayrooms, sp50, 0, 0); - if (arrayIntersects(g_Vars.players[i]->prop->rooms, sp50)) { + if (array_intersects(g_Vars.players[i]->prop->rooms, sp50)) { offscreen = false; break; } @@ -5343,7 +5343,7 @@ bool chrIsRoomOffScreen(struct chrdata *chr, struct coord *waypos, RoomNum *wayr return offscreen; } -void chrGoPosInitMagic(struct chrdata *chr, struct waydata *waydata, struct coord *padpos, struct coord *chrpos) +void chr_go_pos_init_magic(struct chrdata *chr, struct waydata *waydata, struct coord *padpos, struct coord *chrpos) { f32 xdiff1 = padpos->x - chr->prop->pos.x; f32 zdiff1 = padpos->z - chr->prop->pos.z; @@ -5358,16 +5358,16 @@ void chrGoPosInitMagic(struct chrdata *chr, struct waydata *waydata, struct coor waydata->magictotal = sqrtf(xdiff1 * xdiff1 + zdiff1 * zdiff1); waydata->magicdone = waydata->magictotal - sqrtf(xdiff2 * xdiff2 + zdiff2 * zdiff2); - chrSetLookAngle(chr, angle); + chr_set_look_angle(chr, angle); } -void chrGoPosGetCurWaypointInfoWithFlags(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 *flags) +void chr_go_pos_get_cur_waypoint_info_with_flags(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 *flags) { struct waypoint *waypoint = chr->act_gopos.waypoints[chr->act_gopos.curindex]; struct pad pad; if (waypoint) { - padUnpack(waypoint->padnum, PADFIELD_POS | PADFIELD_ROOM | PADFIELD_FLAGS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_POS | PADFIELD_ROOM | PADFIELD_FLAGS, &pad); pos->x = pad.pos.x; pos->y = pad.pos.y; @@ -5393,9 +5393,9 @@ void chrGoPosGetCurWaypointInfoWithFlags(struct chrdata *chr, struct coord *pos, } } -void chrGoPosGetCurWaypointInfo(struct chrdata *chr, struct coord *pos, RoomNum *rooms) +void chr_go_pos_get_cur_waypoint_info(struct chrdata *chr, struct coord *pos, RoomNum *rooms) { - chrGoPosGetCurWaypointInfoWithFlags(chr, pos, rooms, NULL); + chr_go_pos_get_cur_waypoint_info_with_flags(chr, pos, rooms, NULL); } f32 func0f0370a8(struct chrdata *chr) @@ -5403,16 +5403,16 @@ f32 func0f0370a8(struct chrdata *chr) f32 result; if (chr->aibot) { - result = botCalculateMaxSpeed(chr); + result = bot_calculate_max_speed(chr); } else { - s16 animnum = modelGetAnimNum(chr->model); + s16 animnum = model_get_anim_num(chr->model); result = func0f02dff0(animnum) * (chr->model->scale * 9.999999f); } return result; } -s32 chrGoPosCalculateBaseTtl(struct chrdata *chr) +s32 chr_go_pos_calculate_base_ttl(struct chrdata *chr) { f32 xdiff; f32 zdiff; @@ -5421,7 +5421,7 @@ s32 chrGoPosCalculateBaseTtl(struct chrdata *chr) RoomNum rooms[8]; f32 speed; - chrGoPosGetCurWaypointInfo(chr, &pos, rooms); + chr_go_pos_get_cur_waypoint_info(chr, &pos, rooms); xdiff = pos.x - chr->prop->pos.x; zdiff = pos.z - chr->prop->pos.z; @@ -5437,7 +5437,7 @@ s32 chrGoPosCalculateBaseTtl(struct chrdata *chr) speed = func0f0370a8(chr); if (chr->aibot == NULL) { - speed *= modelGetAbsAnimSpeed(chr->model); + speed *= model_get_abs_anim_speed(chr->model); } if (speed < 0.001f) { @@ -5447,21 +5447,21 @@ s32 chrGoPosCalculateBaseTtl(struct chrdata *chr) return (xdiff + zdiff) / speed; } -void chrGoPosClearRestartTtl(struct chrdata *chr) +void chr_go_pos_clear_restart_ttl(struct chrdata *chr) { chr->act_gopos.restartttl = 0; } -void chrGoPosConsiderRestart(struct chrdata *chr) +void chr_go_pos_consider_restart(struct chrdata *chr) { if (chr->act_gopos.waydata.mode != WAYMODE_MAGIC && chr->liftaction != LIFTACTION_WAITINGONLIFT && chr->liftaction != LIFTACTION_WAITINGFORLIFT) { if (chr->act_gopos.restartttl == 0) { #if PAL - s32 value = (chrGoPosCalculateBaseTtl(chr) * 100 + 15000) / 60; + s32 value = (chr_go_pos_calculate_base_ttl(chr) * 100 + 15000) / 60; #else - s32 value = chrGoPosCalculateBaseTtl(chr) * 2 + 300; + s32 value = chr_go_pos_calculate_base_ttl(chr) * 2 + 300; #endif if (value > 0xffff) { @@ -5471,9 +5471,9 @@ void chrGoPosConsiderRestart(struct chrdata *chr) chr->act_gopos.restartttl = value; } else if (chr->act_gopos.restartttl <= (u16)g_Vars.lvupdate60) { if (chr->aibot) { - botCheckFetch(chr); + bot_check_fetch(chr); } else { - chrGoToRoomPos(chr, &chr->act_gopos.endpos, chr->act_gopos.endrooms, chr->act_gopos.flags); + chr_go_to_room_pos(chr, &chr->act_gopos.endpos, chr->act_gopos.endrooms, chr->act_gopos.flags); } } else { chr->act_gopos.restartttl -= (u16)g_Vars.lvupdate60; @@ -5481,12 +5481,12 @@ void chrGoPosConsiderRestart(struct chrdata *chr) } } -void chrGoPosInitExpensive(struct chrdata *chr) +void chr_go_pos_init_expensive(struct chrdata *chr) { struct coord pos; RoomNum rooms[8]; - chrGoPosGetCurWaypointInfo(chr, &pos, rooms); + chr_go_pos_get_cur_waypoint_info(chr, &pos, rooms); chr->act_gopos.waydata.mode = WAYMODE_INIT; chr->act_gopos.waydata.iter = 0; @@ -5495,7 +5495,7 @@ void chrGoPosInitExpensive(struct chrdata *chr) chr->act_gopos.waydata.aimpos.y = pos.y; chr->act_gopos.waydata.aimpos.z = pos.z; - chrGoPosClearRestartTtl(chr); + chr_go_pos_clear_restart_ttl(chr); } /** @@ -5506,7 +5506,7 @@ void chrGoPosInitExpensive(struct chrdata *chr) * far into the array, new pathfinding will be done and the array and index will * be reset. */ -void chrGoPosAdvanceWaypoint(struct chrdata *chr) +void chr_go_pos_advance_waypoint(struct chrdata *chr) { if (chr->act_gopos.curindex < 3) { chr->act_gopos.curindex++; @@ -5514,12 +5514,12 @@ void chrGoPosAdvanceWaypoint(struct chrdata *chr) struct waypoint *from = chr->act_gopos.waypoints[chr->act_gopos.curindex]; chr->act_gopos.curindex = 1; - navSetSeed(CHRNAVSEED(chr), CHRNAVSEED(chr)); - navFindRoute(from, chr->act_gopos.target, chr->act_gopos.waypoints, MAX_CHRWAYPOINTS); - navSetSeed(0, 0); + nav_set_seed(CHRNAVSEED(chr), CHRNAVSEED(chr)); + nav_find_route(from, chr->act_gopos.target, chr->act_gopos.waypoints, MAX_CHRWAYPOINTS); + nav_set_seed(0, 0); } - chrGoPosInitExpensive(chr); + chr_go_pos_init_expensive(chr); } /** @@ -5530,7 +5530,7 @@ void chrGoPosAdvanceWaypoint(struct chrdata *chr) * whether the chr will be traversing the path in the forward direction at that * point. */ -s32 chrPatrolCalculateStep(struct chrdata *chr, bool *forward, s32 numsteps) +s32 chr_patrol_calculate_step(struct chrdata *chr, bool *forward, s32 numsteps) { s32 nextstep = chr->act_patrol.nextstep; bool isforward = *forward; @@ -5587,22 +5587,22 @@ s32 chrPatrolCalculateStep(struct chrdata *chr, bool *forward, s32 numsteps) * Determines which pad number the chr will be at given their current index and * the number of steps to take. */ -s16 chrPatrolCalculatePadNum(struct chrdata *chr, s32 numsteps) +s16 chr_patrol_calculate_pad_num(struct chrdata *chr, s32 numsteps) { s32 *padnumptr; bool forward = chr->act_patrol.forward; - s32 step = chrPatrolCalculateStep(chr, &forward, numsteps); + s32 step = chr_patrol_calculate_step(chr, &forward, numsteps); padnumptr = &chr->act_patrol.path->pads[step]; return *padnumptr; } -void chrPatrolGetCurWaypointInfoWithFlags(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 *flags) +void chr_patrol_get_cur_waypoint_info_with_flags(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 *flags) { - s32 padnum = chrPatrolCalculatePadNum(chr, 0); + s32 padnum = chr_patrol_calculate_pad_num(chr, 0); struct pad pad; - padUnpack(padnum, PADFIELD_POS | PADFIELD_ROOM | PADFIELD_FLAGS, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_ROOM | PADFIELD_FLAGS, &pad); pos->x = pad.pos.x; pos->y = pad.pos.y; @@ -5616,9 +5616,9 @@ void chrPatrolGetCurWaypointInfoWithFlags(struct chrdata *chr, struct coord *pos } } -void chrPatrolGetCurWaypointInfo(struct chrdata *chr, struct coord *pos, RoomNum *rooms) +void chr_patrol_get_cur_waypoint_info(struct chrdata *chr, struct coord *pos, RoomNum *rooms) { - chrPatrolGetCurWaypointInfoWithFlags(chr, pos, rooms, NULL); + chr_patrol_get_cur_waypoint_info_with_flags(chr, pos, rooms, NULL); } void func0f037580(struct chrdata *chr) @@ -5629,12 +5629,12 @@ void func0f037580(struct chrdata *chr) chr->act_patrol.waydata.iter = 0; chr->act_patrol.waydata.gotaimpos = false; - chrPatrolGetCurWaypointInfo(chr, &chr->act_patrol.waydata.aimpos, rooms); + chr_patrol_get_cur_waypoint_info(chr, &chr->act_patrol.waydata.aimpos, rooms); } void func0f0375b0(struct chrdata *chr) { - s32 nextstep = chrPatrolCalculateStep(chr, &chr->act_patrol.forward, 1); + s32 nextstep = chr_patrol_calculate_step(chr, &chr->act_patrol.forward, 1); chr->act_patrol.nextstep = nextstep; chr->patrolnextstep = nextstep; @@ -5642,7 +5642,7 @@ void func0f0375b0(struct chrdata *chr) func0f037580(chr); } -void chrNavTickMagic(struct chrdata *chr, struct waydata *waydata, f32 speed, struct coord *arg3, RoomNum *rooms) +void chr_nav_tick_magic(struct chrdata *chr, struct waydata *waydata, f32 speed, struct coord *arg3, RoomNum *rooms) { RoomNum sp118[8]; f32 ymax; @@ -5666,25 +5666,25 @@ void chrNavTickMagic(struct chrdata *chr, struct waydata *waydata, f32 speed, st chr->invalidmove = 0; chr->lastmoveok60 = g_Vars.lvframe60; - waydata->magicdone += speed * modelGetAbsAnimSpeed(chr->model) * g_Vars.lvupdate60freal; + waydata->magicdone += speed * model_get_abs_anim_speed(chr->model) * g_Vars.lvupdate60freal; if (waydata->magicdone >= waydata->magictotal) { // Reached end of segment - chrSetPerimEnabled(chr, false); - roomsCopy(rooms, sp118); + chr_set_perim_enabled(chr, false); + rooms_copy(rooms, sp118); chr0f021fa8(chr, arg3, sp118); - ground = cdFindGroundInfoAtCyl(arg3, chr->radius, sp118, &floorcol, &floortype, 0, &floorroom, NULL, NULL); + ground = cd_find_ground_info_at_cyl(arg3, chr->radius, sp118, &floorcol, &floortype, 0, &floorroom, NULL, NULL); spf4.x = arg3->x; spf4.y = prop->pos.y - chr->ground + ground; spf4.z = arg3->z; - roomsCopy(rooms, sp118); + rooms_copy(rooms, sp118); chr0f021fa8(chr, &spf4, sp118); - chrGetBbox(chr->prop, &radius, &ymax, &ymin); + chr_get_bbox(chr->prop, &radius, &ymax, &ymin); - if (cdTestVolume(&spf4, chr->radius, sp118, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { + if (cd_test_volume(&spf4, chr->radius, sp118, CDTYPE_ALL, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { // Reached end of segment with no collision prop->pos.x = spf4.x; prop->pos.y = spf4.y; @@ -5698,42 +5698,42 @@ void chrNavTickMagic(struct chrdata *chr, struct waydata *waydata, f32 speed, st chr->floortype = floortype; chr->floorroom = floorroom; - propDeregisterRooms(prop); - roomsCopy(sp118, prop->rooms); - propRegisterRooms(prop); + prop_deregister_rooms(prop); + rooms_copy(sp118, prop->rooms); + prop_register_rooms(prop); - modelSetRootPosition(chr->model, &prop->pos); + model_set_root_position(chr->model, &prop->pos); - rwdata = modelGetNodeRwData(chr->model, chr->model->definition->rootnode); + rwdata = model_get_node_rw_data(chr->model, chr->model->definition->rootnode); rwdata->chrinfo.ground = ground; chr->chrflags |= CHRCFLAG_FORCETOGROUND; if (chr->actiontype == ACT_PATROL) { func0f0375b0(chr); - chrPatrolGetCurWaypointInfo(chr, &spdc, spcc); - chrGoPosInitMagic(chr, waydata, &spdc, &prop->pos); + chr_patrol_get_cur_waypoint_info(chr, &spdc, spcc); + chr_go_pos_init_magic(chr, waydata, &spdc, &prop->pos); } else if (chr->actiontype == ACT_GOPOS) { if (chr->act_gopos.waypoints[chr->act_gopos.curindex] == NULL) { // Reached the end of the route if (chr->act_gopos.flags & GOPOSFLAG_FORPATHSTART) { - chrTryStartPatrol(chr); + chr_try_start_patrol(chr); } else { if (chr->act_gopos.curindex >= 2) { waypoint = chr->act_gopos.waypoints[chr->act_gopos.curindex - 2]; - padUnpack(waypoint->padnum, PADFIELD_POS, &pad); - chrSetLookAngle(chr, atan2f(prop->pos.x - pad.pos.x, prop->pos.z - pad.pos.z)); + pad_unpack(waypoint->padnum, PADFIELD_POS, &pad); + chr_set_look_angle(chr, atan2f(prop->pos.x - pad.pos.x, prop->pos.z - pad.pos.z)); } if (CHRRACE(chr) == RACE_HUMAN || CHRRACE(chr) == RACE_SKEDAR) { - chrStop(chr); + chr_stop(chr); } } } else { // Advance to next segment, still using magic - chrGoPosAdvanceWaypoint(chr); - chrGoPosGetCurWaypointInfo(chr, &sp5c, sp4c); - chrGoPosInitMagic(chr, waydata, &sp5c, &prop->pos); + chr_go_pos_advance_waypoint(chr); + chr_go_pos_get_cur_waypoint_info(chr, &sp5c, sp4c); + chr_go_pos_init_magic(chr, waydata, &sp5c, &prop->pos); } } } else { @@ -5745,11 +5745,11 @@ void chrNavTickMagic(struct chrdata *chr, struct waydata *waydata, f32 speed, st func0f037580(chr); } else { chr->act_gopos.waydata.lastvisible60 = g_Vars.lvframe60; - chrGoPosInitExpensive(chr); + chr_go_pos_init_expensive(chr); } } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); } } @@ -5768,13 +5768,13 @@ void chrNavTickMagic(struct chrdata *chr, struct waydata *waydata, f32 speed, st * The pos variable is used for both loading the next pad's position and for * returning the new position, which means there's less stack usage. */ -void chrCalculatePosition(struct chrdata *chr, struct coord *pos) +void chr_calculate_position(struct chrdata *chr, struct coord *pos) { RoomNum rooms[8]; f32 frac; if (chr->actiontype == ACT_PATROL && chr->act_patrol.waydata.mode == WAYMODE_MAGIC) { - chrPatrolGetCurWaypointInfo(chr, pos, rooms); + chr_patrol_get_cur_waypoint_info(chr, pos, rooms); if (!(chr->act_patrol.waydata.magicdone >= chr->act_patrol.waydata.magictotal) && chr->act_patrol.waydata.magictotal > 0) { @@ -5784,7 +5784,7 @@ void chrCalculatePosition(struct chrdata *chr, struct coord *pos) pos->z = (pos->z - chr->prop->pos.z) * frac + chr->prop->pos.z; } } else if (chr->actiontype == ACT_GOPOS && chr->act_gopos.waydata.mode == WAYMODE_MAGIC) { - chrGoPosGetCurWaypointInfo(chr, pos, rooms); + chr_go_pos_get_cur_waypoint_info(chr, pos, rooms); if (!(chr->act_gopos.waydata.magicdone >= chr->act_gopos.waydata.magictotal) && chr->act_gopos.waydata.magictotal > 0) { @@ -5800,12 +5800,12 @@ void chrCalculatePosition(struct chrdata *chr, struct coord *pos) } } -void chrGoPosChooseAnimation(struct chrdata *chr) +void chr_go_pos_choose_animation(struct chrdata *chr) { s32 gospeed = chr->act_gopos.flags & GOPOSMASK_SPEED; s32 male = g_HeadsAndBodies[chr->bodynum].ismale; - struct prop *leftgun = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightgun = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftgun = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightgun = chr_get_held_prop(chr, HAND_RIGHT); s32 flip = false; s32 heavy; s32 race = CHRRACE(chr); @@ -5829,7 +5829,7 @@ void chrGoPosChooseAnimation(struct chrdata *chr) heavy = false; flip = random() % 2; } else { - if (weaponIsOneHanded(leftgun) || weaponIsOneHanded(rightgun)) { + if (weapon_is_one_handed(leftgun) || weapon_is_one_handed(rightgun)) { heavy = false; flip = (bool)leftgun != false; } else { @@ -5996,7 +5996,7 @@ void chrGoPosChooseAnimation(struct chrdata *chr) || chr->hitpart == HITPART_RBICEP) { anim = ANIM_01F8; flip = true; - } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { + } else if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { anim = ANIM_005F; } else if (male) { if (random() % 2) { @@ -6064,15 +6064,15 @@ void chrGoPosChooseAnimation(struct chrdata *chr) } if (anim >= 0) { - modelSetAnimation(chr->model, anim, flip, 0, speed, sp60); + model_set_animation(chr->model, anim, flip, 0, speed, sp60); if (animspeed > 0) { - modelSetAnimSpeed(chr->model, animspeed, startframe); + model_set_anim_speed(chr->model, animspeed, startframe); } } } -bool chrGoToRoomPos(struct chrdata *chr, struct coord *pos, RoomNum *room, u32 goposflags) +bool chr_go_to_room_pos(struct chrdata *chr, struct coord *pos, RoomNum *room, u32 goposflags) { struct prop *prop = chr->prop; struct waypoint *nextwaypoint; @@ -6083,7 +6083,7 @@ bool chrGoToRoomPos(struct chrdata *chr, struct coord *pos, RoomNum *room, u32 g RoomNum curwprooms[8]; s32 isgopos = chr->actiontype == ACT_GOPOS && (chr->act_gopos.flags & GOPOSMASK_SPEED) == (goposflags & 0xff & GOPOSMASK_SPEED) - && !chrGoPosIsWaiting(chr); + && !chr_go_pos_is_waiting(chr); s32 ismagic = isgopos && chr->act_gopos.waydata.mode == WAYMODE_MAGIC; struct coord prevpos; s32 numwaypoints = 0; @@ -6097,33 +6097,33 @@ bool chrGoToRoomPos(struct chrdata *chr, struct coord *pos, RoomNum *room, u32 g if (isgopos && ismagic && chr->act_gopos.waypoints[chr->act_gopos.curindex]) { nextwaypoint = chr->act_gopos.waypoints[chr->act_gopos.curindex]; } else { - nextwaypoint = waypointFindClosestToPos(&prop->pos, prop->rooms); + nextwaypoint = waypoint_find_closest_to_pos(&prop->pos, prop->rooms); } - lastwaypoint = waypointFindClosestToPos(pos, room); + lastwaypoint = waypoint_find_closest_to_pos(pos, room); if (nextwaypoint && lastwaypoint) { - navSetSeed(CHRNAVSEED(chr), CHRNAVSEED(chr)); - numwaypoints = navFindRoute(nextwaypoint, lastwaypoint, waypoints, MAX_CHRWAYPOINTS); - navSetSeed(0, 0); + nav_set_seed(CHRNAVSEED(chr), CHRNAVSEED(chr)); + numwaypoints = nav_find_route(nextwaypoint, lastwaypoint, waypoints, MAX_CHRWAYPOINTS); + nav_set_seed(0, 0); } if (numwaypoints > 1) { if (isgopos && ismagic) { - chrCalculatePosition(chr, &prevpos); + chr_calculate_position(chr, &prevpos); } else { prevpos.x = prop->pos.x; prevpos.y = prop->pos.y; prevpos.z = prop->pos.z; } - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_GOPOS; chr->act_gopos.endpos.x = pos->x; chr->act_gopos.endpos.y = pos->y; chr->act_gopos.endpos.z = pos->z; - roomsCopy(room, chr->act_gopos.endrooms); + rooms_copy(room, chr->act_gopos.endrooms); chr->act_gopos.target = lastwaypoint; chr->act_gopos.curindex = 0; @@ -6141,30 +6141,30 @@ bool chrGoToRoomPos(struct chrdata *chr, struct coord *pos, RoomNum *room, u32 g chr->act_gopos.waypoints[i] = waypoints[i]; } - chrGoPosInitExpensive(chr); + chr_go_pos_init_expensive(chr); #if VERSION >= VERSION_NTSC_1_0 chr->goposforce = -1; #endif chr->sleep = 0; chr->liftaction = 0; chr->act_gopos.flags &= ~(GOPOSFLAG_DUCK | GOPOSFLAG_CROUCH | GOPOSFLAG_WAITING); - chrGoPosGetCurWaypointInfo(chr, &curwppos, curwprooms); + chr_go_pos_get_cur_waypoint_info(chr, &curwppos, curwprooms); if ((!isgopos || ismagic) && g_Vars.normmplayerisrunning == false && (prop->flags & (PROPFLAG_ONANYSCREENPREVTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONTHISSCREENTHISTICK)) == 0 - && chrIsRoomOffScreen(chr, &curwppos, curwprooms) + && chr_is_room_off_screen(chr, &curwppos, curwprooms) && chr->inlift == false) { - chrGoPosInitMagic(chr, &chr->act_gopos.waydata, &curwppos, &prevpos); + chr_go_pos_init_magic(chr, &chr->act_gopos.waydata, &curwppos, &prevpos); } if (chr->act_gopos.waydata.mode != WAYMODE_MAGIC - && modelIsAnimMerging(chr->model) && !chr->aibot) { + && model_is_anim_merging(chr->model) && !chr->aibot) { chr->hidden |= CHRHFLAG_NEEDANIM; return true; } else { if (!isgopos) { - chrGoPosChooseAnimation(chr); + chr_go_pos_choose_animation(chr); } chr->hidden &= ~CHRHFLAG_NEEDANIM; @@ -6175,7 +6175,7 @@ bool chrGoToRoomPos(struct chrdata *chr, struct coord *pos, RoomNum *room, u32 g return false; } -struct path *pathFindById(u32 path_id) +struct path *path_find_by_id(u32 path_id) { s32 i = 0; @@ -6188,10 +6188,10 @@ struct path *pathFindById(u32 path_id) return NULL; } -void chrPatrolChooseAnimation(struct chrdata *chr) +void chr_patrol_choose_animation(struct chrdata *chr) { - struct prop *leftprop = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightprop = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftprop = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightprop = chr_get_held_prop(chr, HAND_RIGHT); s32 flip; bool heavy; s32 race = CHRRACE(chr); @@ -6207,7 +6207,7 @@ void chrPatrolChooseAnimation(struct chrdata *chr) flip = random() % 2; } else { // Single weapon - if (weaponIsOneHanded(leftprop) || weaponIsOneHanded(rightprop)) { + if (weapon_is_one_handed(leftprop) || weapon_is_one_handed(rightprop)) { heavy = false; flip = ((bool)leftprop != false); } else { @@ -6217,27 +6217,27 @@ void chrPatrolChooseAnimation(struct chrdata *chr) } if (race == RACE_SKEDAR) { - modelSetAnimation(chr->model, ANIM_0392, flip, 0, 0.25f, 16); + model_set_animation(chr->model, ANIM_0392, flip, 0, 0.25f, 16); } else { speed = 0.5f * func0f02dff0(ANIM_0028) / func0f02dff0(ANIM_006B); if (heavy) { - modelSetAnimation(chr->model, random() % 2 ? ANIM_0018 : ANIM_0028, flip, 0, speed, 16); + model_set_animation(chr->model, random() % 2 ? ANIM_0018 : ANIM_0028, flip, 0, speed, 16); } else if (ismale) { s32 anims[] = { ANIM_006B, ANIM_001B, ANIM_0016 }; - modelSetAnimation(chr->model, anims[random() % 3], flip, 0, speed, 16); + model_set_animation(chr->model, anims[random() % 3], flip, 0, speed, 16); } else { - modelSetAnimation(chr->model, random() % 2 ? ANIM_005C : ANIM_0072, flip, 0, speed, 16); + model_set_animation(chr->model, random() % 2 ? ANIM_005C : ANIM_0072, flip, 0, speed, 16); } } } else if (race == RACE_DRCAROLL) { - modelSetAnimation(chr->model, ANIM_015F, false, 0, 0.5f, 16); + model_set_animation(chr->model, ANIM_015F, false, 0, 0.5f, 16); } else if (race == RACE_ROBOT) { - modelSetAnimation(chr->model, ANIM_0238, false, 0, 0.5f, 16); + model_set_animation(chr->model, ANIM_0238, false, 0, 0.5f, 16); } } -void chrStartPatrol(struct chrdata *chr, struct path *path) +void chr_start_patrol(struct chrdata *chr, struct path *path) { s32 i; f32 dist; @@ -6261,21 +6261,21 @@ void chrStartPatrol(struct chrdata *chr, struct path *path) // maybe a line of sight check? if (chr->patrolnextstep >= 0 && chr->patrolnextstep < path->len) { padnumptr = &path->pads[chr->patrolnextstep]; - padUnpack(*padnumptr, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(*padnumptr, PADFIELD_POS | PADFIELD_ROOM, &pad); rooms[0] = pad.room; rooms[1] = -1; - chrGetBbox(prop, &radius, &ymax, &ymin); + chr_get_bbox(prop, &radius, &ymax, &ymin); - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); - if (cdTestCylMove04(&prop->pos, prop->rooms, &pad.pos, rooms, CDTYPE_BG, 1, + if (cd_test_cyl_move04(&prop->pos, prop->rooms, &pad.pos, rooms, CDTYPE_BG, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION) { nextstep = chr->patrolnextstep; } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); } // If the pad to resume from is not in sight, find the closest pad @@ -6283,7 +6283,7 @@ void chrStartPatrol(struct chrdata *chr, struct path *path) if (nextstep < 0) { for (i = 0; path->pads[i] >= 0; i++) { padnumptr = &path->pads[i]; - padUnpack(*padnumptr, PADFIELD_POS, &pad); + pad_unpack(*padnumptr, PADFIELD_POS, &pad); xdiff = pad.pos.x - prop->pos.x; zdiff = pad.pos.z - prop->pos.z; @@ -6297,7 +6297,7 @@ void chrStartPatrol(struct chrdata *chr, struct path *path) } padnumptr = &path->pads[nextstep]; - padUnpack(*padnumptr, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(*padnumptr, PADFIELD_POS | PADFIELD_ROOM, &pad); rooms[0] = pad.room; rooms[1] = -1; @@ -6306,7 +6306,7 @@ void chrStartPatrol(struct chrdata *chr, struct path *path) // otherwise use gopos to get to the starting pad if (func0f03654c(chr, &prop->pos, prop->rooms, &pad.pos, rooms, NULL, chr->radius * 1.2f, CDTYPE_PATHBLOCKER | CDTYPE_BG) != CDRESULT_COLLISION) { - chrStopFiring(chr); + chr_stop_firing(chr); chr->actiontype = ACT_PATROL; chr->act_patrol.path = path; @@ -6325,40 +6325,40 @@ void chrStartPatrol(struct chrdata *chr, struct path *path) chr->liftaction = LIFTACTION_NOTUSINGLIFT; chr->patrolnextstep = chr->act_patrol.nextstep; - chrPatrolGetCurWaypointInfo(chr, &nextpos, nextrooms); + chr_patrol_get_cur_waypoint_info(chr, &nextpos, nextrooms); if (!g_Vars.normmplayerisrunning && (chr->prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) == 0 - && chrIsRoomOffScreen(chr, &nextpos, nextrooms) + && chr_is_room_off_screen(chr, &nextpos, nextrooms) && !chr->inlift) { - chrGoPosInitMagic(chr, &chr->act_patrol.waydata, &nextpos, &prop->pos); + chr_go_pos_init_magic(chr, &chr->act_patrol.waydata, &nextpos, &prop->pos); } // @bug: This should be act_patrol rather than act_gopos. // It's actually reading act_patrol.waydata.aimposobj.y which is a // float, so it's taking its binary representation and comparing it // with integer 6. - if (chr->act_gopos.waydata.mode != WAYMODE_MAGIC && modelIsAnimMerging(chr->model)) { + if (chr->act_gopos.waydata.mode != WAYMODE_MAGIC && model_is_anim_merging(chr->model)) { chr->hidden |= CHRHFLAG_NEEDANIM; } else { - chrPatrolChooseAnimation(chr); + chr_patrol_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } else { sp60[0] = pad.room; sp60[1] = -1; - chrGoToRoomPos(chr, &pad.pos, sp60, GOPOSFLAG_FORPATHSTART); + chr_go_to_room_pos(chr, &pad.pos, sp60, GOPOSFLAG_FORPATHSTART); } } } -void chrRecordLastVisibleTargetTime(struct chrdata *chr) +void chr_record_last_visible_target_time(struct chrdata *chr) { chr->lastvisibletarget60 = g_Vars.lvframe60; } -bool chrHasLosToEntity(struct chrdata *chr, struct coord *chrpos, RoomNum *chrrooms, bool allowextraheight, u32 attackflags, u32 entityid) +bool chr_has_los_to_entity(struct chrdata *chr, struct coord *chrpos, RoomNum *chrrooms, bool allowextraheight, u32 attackflags, u32 entityid) { bool result = false; struct coord targetpos; @@ -6372,10 +6372,10 @@ bool chrHasLosToEntity(struct chrdata *chr, struct coord *chrpos, RoomNum *chrro result = true; } else { types = CDTYPE_DOORSWITHOUTFLAG | CDTYPE_ALL; - weaponprop = chrGetHeldProp(chr, HAND_RIGHT); + weaponprop = chr_get_held_prop(chr, HAND_RIGHT); if (weaponprop == NULL) { - weaponprop = chrGetHeldProp(chr, HAND_LEFT); + weaponprop = chr_get_held_prop(chr, HAND_LEFT); } if (weaponprop) { @@ -6390,14 +6390,14 @@ bool chrHasLosToEntity(struct chrdata *chr, struct coord *chrpos, RoomNum *chrro } } - chrGetAttackEntityPos(chr, attackflags, entityid, &targetpos, targetrooms); - chrSetPerimEnabled(chr, false); + chr_get_attack_entity_pos(chr, attackflags, entityid, &targetpos, targetrooms); + chr_set_perim_enabled(chr, false); if ((attackflags & ATTACKFLAG_AIMATTARGET)) { - targetprop = chrGetTargetProp(chr); + targetprop = chr_get_target_prop(chr); if (targetprop->type != PROPTYPE_PLAYER || g_Vars.bondvisible) { - propSetPerimEnabled(targetprop, false); + prop_set_perim_enabled(targetprop, false); if (allowextraheight && (chr->chrflags & CHRCFLAG_LOSEXTRAHEIGHT)) { struct coord frompos; @@ -6409,46 +6409,46 @@ bool chrHasLosToEntity(struct chrdata *chr, struct coord *chrpos, RoomNum *chrro func0f065dd8(chrpos, chrrooms, &frompos, fromrooms); - if (cdTestLos05(&frompos, fromrooms, &targetpos, targetrooms, types, GEOFLAG_BLOCK_SHOOT)) { - chrRecordLastVisibleTargetTime(chr); + if (cd_test_los05(&frompos, fromrooms, &targetpos, targetrooms, types, GEOFLAG_BLOCK_SHOOT)) { + chr_record_last_visible_target_time(chr); result = true; } } else { - if (cdTestLos05(chrpos, chrrooms, &targetpos, targetrooms, types, GEOFLAG_BLOCK_SHOOT)) { - chrRecordLastVisibleTargetTime(chr); + if (cd_test_los05(chrpos, chrrooms, &targetpos, targetrooms, types, GEOFLAG_BLOCK_SHOOT)) { + chr_record_last_visible_target_time(chr); result = true; } } - propSetPerimEnabled(targetprop, true); + prop_set_perim_enabled(targetprop, true); } } else if (attackflags & ATTACKFLAG_AIMATCHR) { - targetchr = chrFindById(chr, entityid); + targetchr = chr_find_by_id(chr, entityid); if (!targetchr || !targetchr->prop) { targetchr = chr; } - chrSetPerimEnabled(targetchr, false); + chr_set_perim_enabled(targetchr, false); - if (cdTestLos05(chrpos, chrrooms, &targetpos, targetrooms, types, GEOFLAG_BLOCK_SHOOT)) { + if (cd_test_los05(chrpos, chrrooms, &targetpos, targetrooms, types, GEOFLAG_BLOCK_SHOOT)) { result = true; } - chrSetPerimEnabled(targetchr, true); + chr_set_perim_enabled(targetchr, true); } else if (attackflags & ATTACKFLAG_AIMATPAD) { - if (cdTestLos05(chrpos, chrrooms, &targetpos, targetrooms, types, GEOFLAG_BLOCK_SHOOT)) { + if (cd_test_los05(chrpos, chrrooms, &targetpos, targetrooms, types, GEOFLAG_BLOCK_SHOOT)) { result = true; } } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); } return result; } -bool chrHasLosToAttackTarget(struct chrdata *chr, struct coord *pos, RoomNum *rooms, bool allowextraheight) +bool chr_has_los_to_attack_target(struct chrdata *chr, struct coord *pos, RoomNum *rooms, bool allowextraheight) { u32 attackflags = ATTACKFLAG_AIMATTARGET; u32 entityid = 0; @@ -6458,16 +6458,16 @@ bool chrHasLosToAttackTarget(struct chrdata *chr, struct coord *pos, RoomNum *ro entityid = chr->act_attack.entityid; } - return chrHasLosToEntity(chr, pos, rooms, allowextraheight, attackflags, entityid); + return chr_has_los_to_entity(chr, pos, rooms, allowextraheight, attackflags, entityid); } -bool chrHasLosToChr(struct chrdata *chr, struct chrdata *target, RoomNum *room) +bool chr_has_los_to_chr(struct chrdata *chr, struct chrdata *target, RoomNum *room) { bool cansee = false; u32 stack; RoomNum sp88[] = {-1, 0, 0, 0, 0, 0, 0, 0}; - if (!botIsTargetInvisible(chr, target)) { + if (!bot_is_target_invisible(chr, target)) { struct prop *prop = chr->prop; struct coord pos; RoomNum rooms[8]; @@ -6476,19 +6476,19 @@ bool chrHasLosToChr(struct chrdata *chr, struct chrdata *target, RoomNum *room) pos.y = chr->ground + chr->height - 20; pos.z = prop->pos.z; - chrSetPerimEnabled(chr, false); - chrSetPerimEnabled(target, false); + chr_set_perim_enabled(chr, false); + chr_set_perim_enabled(target, false); func0f065e74(&prop->pos, prop->rooms, &pos, rooms); - if (cdTestLos07(&pos, rooms, &target->prop->pos, target->prop->rooms, sp88, + if (cd_test_los07(&pos, rooms, &target->prop->pos, target->prop->rooms, sp88, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_AIOPAQUE, GEOFLAG_BLOCK_SIGHT)) { cansee = true; } - chrSetPerimEnabled(chr, true); - chrSetPerimEnabled(target, true); + chr_set_perim_enabled(chr, true); + chr_set_perim_enabled(target, true); } if (room) { @@ -6498,35 +6498,35 @@ bool chrHasLosToChr(struct chrdata *chr, struct chrdata *target, RoomNum *room) return cansee; } -bool chrHasLosToTarget(struct chrdata *chr) +bool chr_has_los_to_target(struct chrdata *chr) { bool cansee; struct prop *prop; #if VERSION >= VERSION_JPN_FINAL cansee = false; - prop = chrGetTargetProp(chr); + prop = chr_get_target_prop(chr); if (prop && prop->chr) { - cansee = chrHasLosToChr(chr, prop->chr, NULL); + cansee = chr_has_los_to_chr(chr, prop->chr, NULL); if (cansee) { - chrRecordLastVisibleTargetTime(chr); + chr_record_last_visible_target_time(chr); } } #else - prop = chrGetTargetProp(chr); - cansee = chrHasLosToChr(chr, prop->chr, NULL); + prop = chr_get_target_prop(chr); + cansee = chr_has_los_to_chr(chr, prop->chr, NULL); if (cansee) { - chrRecordLastVisibleTargetTime(chr); + chr_record_last_visible_target_time(chr); } #endif return cansee; } -bool chrHasLosToPos(struct chrdata *chr, struct coord *pos, RoomNum *rooms) +bool chr_has_los_to_pos(struct chrdata *chr, struct coord *pos, RoomNum *rooms) { struct prop *prop = chr->prop; bool result = false; @@ -6537,27 +6537,27 @@ bool chrHasLosToPos(struct chrdata *chr, struct coord *pos, RoomNum *rooms) eyepos.y = chr->ground + chr->height - 20; eyepos.z = prop->pos.z; - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); func0f065e74(&prop->pos, prop->rooms, &eyepos, chrrooms); - if (cdTestLos05(&eyepos, chrrooms, pos, rooms, + if (cd_test_los05(&eyepos, chrrooms, pos, rooms, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_AIOPAQUE, GEOFLAG_BLOCK_SIGHT)) { result = true; } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); return result; } /** * Wasteful because this function calculates angles then does nothing with them. - * chrHasLosToPos is called with the same arguments regardless. + * chr_has_los_to_pos is called with the same arguments regardless. */ -bool chrHasLosToPosWasteful(struct chrdata *chr, struct coord *pos, RoomNum *rooms) +bool chr_has_los_to_pos_wasteful(struct chrdata *chr, struct coord *pos, RoomNum *rooms) { - f32 facingangle = chrGetInverseTheta(chr); + f32 facingangle = chr_get_inverse_theta(chr); f32 posangle = atan2f(pos->x - chr->prop->pos.x, pos->z - chr->prop->pos.z); f32 diffangle = posangle - facingangle; @@ -6566,45 +6566,45 @@ bool chrHasLosToPosWasteful(struct chrdata *chr, struct coord *pos, RoomNum *roo } if ((diffangle < RAD(100, 1.7450513839722f) || diffangle > RAD(260, 4.5371336936951f)) - && chrHasFlag(chr, CHRFLAG1_NOOP_00200000, BANK_1) == false) { - return chrHasLosToPos(chr, pos, rooms); + && chr_has_flag(chr, CHRFLAG1_NOOP_00200000, BANK_1) == false) { + return chr_has_los_to_pos(chr, pos, rooms); } - return chrHasLosToPos(chr, pos, rooms); + return chr_has_los_to_pos(chr, pos, rooms); } -bool chrHasLosToProp(struct chrdata *chr, struct prop *prop) +bool chr_has_los_to_prop(struct chrdata *chr, struct prop *prop) { bool result; - propSetPerimEnabled(prop, false); - result = chrHasLosToPosWasteful(chr, &prop->pos, prop->rooms); - propSetPerimEnabled(prop, true); + prop_set_perim_enabled(prop, false); + result = chr_has_los_to_pos_wasteful(chr, &prop->pos, prop->rooms); + prop_set_perim_enabled(prop, true); return result; } -void chrRecordLastSeeTargetTime(struct chrdata *chr) +void chr_record_last_see_target_time(struct chrdata *chr) { chr->lastseetarget60 = g_Vars.lvframe60; } -void chrRecordLastHearTargetTime(struct chrdata *chr) +void chr_record_last_hear_target_time(struct chrdata *chr) { chr->hidden |= CHRHFLAG_IS_HEARING_TARGET; chr->lastheartarget60 = g_Vars.lvframe60; } -bool chrIsStopped(struct chrdata *chr) +bool chr_is_stopped(struct chrdata *chr) { - s16 anim = modelGetAnimNum(chr->model); + s16 anim = model_get_anim_num(chr->model); if (anim == ANIM_SNIPING_GETDOWN || anim == ANIM_SNIPING_GETUP) { return false; } if (anim == ANIM_SNIPING_ONGROUND && chr->act_attack.numshots >= chr->act_attack.maxshots) { - chrStopFiring(chr); + chr_stop_firing(chr); return true; } @@ -6625,8 +6625,8 @@ bool chrIsStopped(struct chrdata *chr) if (chr->actiontype == ACT_ANIM) { if (chr->act_anim.completed - || (modelGetAnimSpeed(chr->model) >= 0 && modelGetCurAnimFrame(chr->model) >= modelGetAnimEndFrame(chr->model)) - || (modelGetAnimSpeed(chr->model) < 0 && modelGetCurAnimFrame(chr->model) <= 0)) { + || (model_get_anim_speed(chr->model) >= 0 && model_get_cur_anim_frame(chr->model) >= model_get_anim_end_frame(chr->model)) + || (model_get_anim_speed(chr->model) < 0 && model_get_cur_anim_frame(chr->model) <= 0)) { return true; } } else if (chr->actiontype == ACT_PATROL) { @@ -6636,12 +6636,12 @@ bool chrIsStopped(struct chrdata *chr) return false; } -bool chrCheckCanSeeTarget(struct chrdata *chr) +bool chr_check_can_see_target(struct chrdata *chr) { struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); f32 sqdistance; - f32 invtheta = chrGetInverseTheta(chr); + f32 invtheta = chr_get_inverse_theta(chr); f32 x = target->pos.x - prop->pos.x; f32 y = target->pos.y - prop->pos.y; @@ -6661,7 +6661,7 @@ bool chrCheckCanSeeTarget(struct chrdata *chr) || (sqdistance < 40000.0f && (angle < RAD(110, 1.9195564985275f) || angle > RAD(250, 4.3626284599304f)))) { result = false; - if (sqdistance < envGetSquaredFogMax()) { + if (sqdistance < env_get_squared_fog_max()) { f32 tmp; s32 iVar8 = (sqrtf(sqdistance) * 0.001875f); s32 tmp2; @@ -6678,23 +6678,23 @@ bool chrCheckCanSeeTarget(struct chrdata *chr) iVar8 *= 1 + tmp2; } - iVar8 = chrGetPercentageOfSlowness(chr, iVar8) + 1; + iVar8 = chr_get_percentage_of_slowness(chr, iVar8) + 1; result = random() % iVar8 == 0; } } if (result) { - result = chrHasLosToTarget(chr); + result = chr_has_los_to_target(chr); } if (result) { - chrRecordLastSeeTargetTime(chr); + chr_record_last_see_target_time(chr); } return result; } -bool chrIsReadyForOrders(struct chrdata *chr) +bool chr_is_ready_for_orders(struct chrdata *chr) { if (chr->onladder) { return false; @@ -6735,14 +6735,14 @@ bool chrIsReadyForOrders(struct chrdata *chr) return true; } -bool chrIsDead(struct chrdata *chr) +bool chr_is_dead(struct chrdata *chr) { if (!chr || chr->actiontype == ACT_DIE || chr->actiontype == ACT_DEAD) { return true; } if (chr->prop && chr->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); if (g_Vars.players[playernum]->isdead) { return true; @@ -6752,15 +6752,15 @@ bool chrIsDead(struct chrdata *chr) return false; } -bool chrTrySidestep(struct chrdata *chr) +bool chr_try_sidestep(struct chrdata *chr) { u8 race = CHRRACE(chr); if ((race == RACE_HUMAN || race == RACE_SKEDAR) - && chrIsReadyForOrders(chr)) { + && chr_is_ready_for_orders(chr)) { struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); - f32 a = chrGetInverseTheta(chr); + struct prop *target = chr_get_target_prop(chr); + f32 a = chr_get_inverse_theta(chr); f32 b = atan2f(target->pos.x - prop->pos.x, target->pos.z - prop->pos.z); f32 angle = b - a; u32 stack[2]; @@ -6773,13 +6773,13 @@ bool chrTrySidestep(struct chrdata *chr) || (angle > RAD(135, 2.3558194637299f) && angle < RAD(225, 3.9263656139374f))) { bool side = (random() % 2) == 0; - if (chrCanJumpInDirection(chr, side, 100)) { - chrSidestep(chr, side); + if (chr_can_jump_in_direction(chr, side, 100)) { + chr_sidestep(chr, side); return true; } - if (chrCanJumpInDirection(chr, !side, 100)) { - chrSidestep(chr, !side); + if (chr_can_jump_in_direction(chr, !side, 100)) { + chr_sidestep(chr, !side); return true; } } @@ -6788,13 +6788,13 @@ bool chrTrySidestep(struct chrdata *chr) return false; } -bool chrTryJumpOut(struct chrdata *chr) +bool chr_try_jump_out(struct chrdata *chr) { - if (CHRRACE(chr) == RACE_HUMAN && chrIsReadyForOrders(chr)) { + if (CHRRACE(chr) == RACE_HUMAN && chr_is_ready_for_orders(chr)) { struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); - f32 a = chrGetInverseTheta(chr); + f32 a = chr_get_inverse_theta(chr); f32 b = atan2f(target->pos.x - prop->pos.x, target->pos.z - prop->pos.z); f32 angle = b - a; u32 stack[2]; @@ -6807,13 +6807,13 @@ bool chrTryJumpOut(struct chrdata *chr) || (angle > RAD(135, 2.3558194637299f) && angle < RAD(225, 3.9263656139374f))) { bool side = (random() % 2) == 0; - if (chrCanJumpInDirection(chr, side, 200)) { - chrJumpOut(chr, side); + if (chr_can_jump_in_direction(chr, side, 200)) { + chr_jump_out(chr, side); return true; } - if (chrCanJumpInDirection(chr, !side, 200)) { - chrJumpOut(chr, !side); + if (chr_can_jump_in_direction(chr, !side, 200)) { + chr_jump_out(chr, !side); return true; } } @@ -6822,26 +6822,26 @@ bool chrTryJumpOut(struct chrdata *chr) return false; } -bool chrTryRunSideways(struct chrdata *chr) +bool chr_try_run_sideways(struct chrdata *chr) { u32 race = CHRRACE(chr); if ((race == RACE_HUMAN || race == RACE_SKEDAR) - && chrIsReadyForOrders(chr) + && chr_is_ready_for_orders(chr) && g_Vars.lvframe60 - chr->lastwalk60 > TICKS(180)) { struct prop *prop = chr->prop; f32 distance = 200.0f + RANDOMFRAC() * 200.0f; struct coord vector; struct coord dstpos; - chrGetSideVectorToTarget(chr, random() % 2 == 0, &vector); + chr_get_side_vector_to_target(chr, random() % 2 == 0, &vector); dstpos.x = vector.x * distance + prop->pos.x; dstpos.y = prop->pos.y; dstpos.z = vector.z * distance + prop->pos.z; - if (propchrHasClearLineToPos(prop, &dstpos, &vector)) { - chrRunToPos(chr, &dstpos); + if (propchr_has_clear_line_to_pos(prop, &dstpos, &vector)) { + chr_run_to_pos(chr, &dstpos); return true; } @@ -6852,8 +6852,8 @@ bool chrTryRunSideways(struct chrdata *chr) dstpos.y = prop->pos.y; dstpos.z = vector.z * distance + prop->pos.z; - if (propchrHasClearLineToPos(prop, &dstpos, &vector)) { - chrRunToPos(chr, &dstpos); + if (propchr_has_clear_line_to_pos(prop, &dstpos, &vector)) { + chr_run_to_pos(chr, &dstpos); return true; } } @@ -6861,7 +6861,7 @@ bool chrTryRunSideways(struct chrdata *chr) return false; } -bool chrTryAttackWalk(struct chrdata *chr) +bool chr_try_attack_walk(struct chrdata *chr) { u32 race = CHRRACE(chr); @@ -6869,19 +6869,19 @@ bool chrTryAttackWalk(struct chrdata *chr) return false; } - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { struct prop *prop = chr->prop; - if (chrHasLosToAttackTarget(chr, &prop->pos, prop->rooms, false) - && (chrGetHeldUsableProp(chr, 0) || chrGetHeldUsableProp(chr, 1)) + if (chr_has_los_to_attack_target(chr, &prop->pos, prop->rooms, false) + && (chr_get_held_usable_prop(chr, 0) || chr_get_held_usable_prop(chr, 1)) && g_Vars.lvframe60 - chr->lastwalk60 > TICKS(120)) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); f32 x = target->pos.x - prop->pos.x; f32 y = target->pos.y - prop->pos.y; f32 z = target->pos.z - prop->pos.z; if (race == RACE_HUMAN && x * x + y * y + z * z >= 1000 * 1000) { - chrAttackWalk(chr, false); + chr_attack_walk(chr, false); return true; } } @@ -6890,7 +6890,7 @@ bool chrTryAttackWalk(struct chrdata *chr) return false; } -bool chrTryAttackRun(struct chrdata *chr) +bool chr_try_attack_run(struct chrdata *chr) { u32 race = CHRRACE(chr); @@ -6898,19 +6898,19 @@ bool chrTryAttackRun(struct chrdata *chr) return false; } - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { struct prop *prop = chr->prop; - if (chrHasLosToAttackTarget(chr, &prop->pos, prop->rooms, false) - && (chrGetHeldUsableProp(chr, 0) || chrGetHeldUsableProp(chr, 1)) + if (chr_has_los_to_attack_target(chr, &prop->pos, prop->rooms, false) + && (chr_get_held_usable_prop(chr, 0) || chr_get_held_usable_prop(chr, 1)) && g_Vars.lvframe60 - chr->lastwalk60 > TICKS(180)) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); f32 x = target->pos.x - prop->pos.x; f32 y = target->pos.y - prop->pos.y; f32 z = target->pos.z - prop->pos.z; if (race == RACE_HUMAN && x * x + y * y + z * z >= 1000 * 1000) { - chrAttackWalk(chr, true); + chr_attack_walk(chr, true); return true; } } @@ -6919,14 +6919,14 @@ bool chrTryAttackRun(struct chrdata *chr) return false; } -bool chrTryAttackRoll(struct chrdata *chr) +bool chr_try_attack_roll(struct chrdata *chr) { - if (CHRRACE(chr) == RACE_HUMAN && chrIsReadyForOrders(chr)) { + if (CHRRACE(chr) == RACE_HUMAN && chr_is_ready_for_orders(chr)) { struct prop *prop = chr->prop; - if (chrHasLosToAttackTarget(chr, &prop->pos, prop->rooms, false) && - (chrGetHeldUsableProp(chr, 0) || chrGetHeldUsableProp(chr, 1))) { - struct prop *target = chrGetTargetProp(chr); + if (chr_has_los_to_attack_target(chr, &prop->pos, prop->rooms, false) && + (chr_get_held_usable_prop(chr, 0) || chr_get_held_usable_prop(chr, 1))) { + struct prop *target = chr_get_target_prop(chr); f32 x = target->pos.x - prop->pos.x; f32 y = target->pos.y - prop->pos.y; f32 z = target->pos.z - prop->pos.z; @@ -6935,13 +6935,13 @@ bool chrTryAttackRoll(struct chrdata *chr) if (sqdistance >= 200 * 200) { bool toleft = (random() % 2) == 0; - if (chrCanRollInDirection(chr, toleft, 200)) { - chrAttackRoll(chr, toleft); + if (chr_can_roll_in_direction(chr, toleft, 200)) { + chr_attack_roll(chr, toleft); return true; } - if (chrCanRollInDirection(chr, !toleft, 200)) { - chrAttackRoll(chr, !toleft); + if (chr_can_roll_in_direction(chr, !toleft, 200)) { + chr_attack_roll(chr, !toleft); return true; } } @@ -6951,12 +6951,12 @@ bool chrTryAttackRoll(struct chrdata *chr) return false; } -bool chrTryAttackAmount(struct chrdata *chr, u32 arg1, u32 arg2, u8 lower, u8 upper) +bool chr_try_attack_amount(struct chrdata *chr, u32 arg1, u32 arg2, u8 lower, u8 upper) { u8 race = CHRRACE(chr); if ((race == RACE_HUMAN || race == RACE_SKEDAR) - && chrIsReadyForOrders(chr) + && chr_is_ready_for_orders(chr) && chr->weapons_held[0]) { s32 quantity; f32 percentage; @@ -6975,7 +6975,7 @@ bool chrTryAttackAmount(struct chrdata *chr, u32 arg1, u32 arg2, u8 lower, u8 up percentage = 0; } - ammo = weaponGetAmmoByFunction(weapon->weaponnum, 0); + ammo = weapon_get_ammo_by_function(weapon->weaponnum, 0); if (ammo) { quantity = ammo->clipsize * percentage; @@ -6991,7 +6991,7 @@ bool chrTryAttackAmount(struct chrdata *chr, u32 arg1, u32 arg2, u8 lower, u8 up chr->aimendsideback = 0; chr->aimendcount = 10; - chrAttackAmount(chr, arg1, arg2, quantity); + chr_attack_amount(chr, arg1, arg2, quantity); return true; } @@ -6999,7 +6999,7 @@ bool chrTryAttackAmount(struct chrdata *chr, u32 arg1, u32 arg2, u8 lower, u8 up return false; } -bool chrTryAttackStand(struct chrdata *chr, u32 attackflags, s32 entityid) +bool chr_try_attack_stand(struct chrdata *chr, u32 attackflags, s32 entityid) { s32 race = CHRRACE(chr); @@ -7007,16 +7007,16 @@ bool chrTryAttackStand(struct chrdata *chr, u32 attackflags, s32 entityid) return false; } - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { if (race == RACE_ROBOT) { - robotAttack(chr); + robot_attack(chr); return true; } if (race == RACE_HUMAN || race == RACE_SKEDAR) { - if (chrGetHeldUsableProp(chr, 0) || - (chrGetHeldUsableProp(chr, 1))) { - chrAttackStand(chr, attackflags, entityid); + if (chr_get_held_usable_prop(chr, 0) || + (chr_get_held_usable_prop(chr, 1))) { + chr_attack_stand(chr, attackflags, entityid); return true; } } @@ -7025,13 +7025,13 @@ bool chrTryAttackStand(struct chrdata *chr, u32 attackflags, s32 entityid) return false; } -bool chrTryAttackKneel(struct chrdata *chr, u32 attackflags, s32 entityid) +bool chr_try_attack_kneel(struct chrdata *chr, u32 attackflags, s32 entityid) { s32 race = CHRRACE(chr); if (race == RACE_HUMAN || race == RACE_SKEDAR) { - if (chrIsReadyForOrders(chr) && (chrGetHeldUsableProp(chr, 0) || chrGetHeldUsableProp(chr, 1))) { - chrAttackKneel(chr, attackflags, entityid); + if (chr_is_ready_for_orders(chr) && (chr_get_held_usable_prop(chr, 0) || chr_get_held_usable_prop(chr, 1))) { + chr_attack_kneel(chr, attackflags, entityid); return true; } } @@ -7039,13 +7039,13 @@ bool chrTryAttackKneel(struct chrdata *chr, u32 attackflags, s32 entityid) return false; } -bool chrTryAttackLie(struct chrdata *chr, u32 attackflags, s32 entityid) +bool chr_try_attack_lie(struct chrdata *chr, u32 attackflags, s32 entityid) { s32 race = CHRRACE(chr); if (race == RACE_HUMAN || race == RACE_SKEDAR) { - if (chrIsReadyForOrders(chr) && (chrGetHeldUsableProp(chr, 0) || chrGetHeldUsableProp(chr, 1))) { - chrAttackLie(chr, attackflags, entityid); + if (chr_is_ready_for_orders(chr) && (chr_get_held_usable_prop(chr, 0) || chr_get_held_usable_prop(chr, 1))) { + chr_attack_lie(chr, attackflags, entityid); return true; } } @@ -7053,7 +7053,7 @@ bool chrTryAttackLie(struct chrdata *chr, u32 attackflags, s32 entityid) return false; } -bool chrTryModifyAttack(struct chrdata *chr, u32 attackflags, s32 entityid) +bool chr_try_modify_attack(struct chrdata *chr, u32 attackflags, s32 entityid) { s32 race = CHRRACE(chr); @@ -7072,11 +7072,11 @@ bool chrTryModifyAttack(struct chrdata *chr, u32 attackflags, s32 entityid) return false; } -bool chrFaceEntity(struct chrdata *chr, u32 attackflags, s32 entityid) +bool chr_face_entity(struct chrdata *chr, u32 attackflags, s32 entityid) { - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { if (chr->actiontype != ACT_STAND) { - chrStand(chr); + chr_stand(chr); } if (attackflags != chr->act_stand.flags || entityid != chr->act_stand.entityid) { @@ -7097,10 +7097,10 @@ bool chrFaceEntity(struct chrdata *chr, u32 attackflags, s32 entityid) return false; } -bool chrGoToPad(struct chrdata *chr, s32 padnum, u32 goposflags) +bool chr_go_to_pad(struct chrdata *chr, s32 padnum, u32 goposflags) { if (padnum >= 0 - && chrIsReadyForOrders(chr) + && chr_is_ready_for_orders(chr) #if VERSION >= VERSION_NTSC_1_0 && (g_NumChrsSeenPlayerRecently2 <= 8 || (chr->hidden & CHRHFLAG_BASICGUARD) == 0 @@ -7109,7 +7109,7 @@ bool chrGoToPad(struct chrdata *chr, s32 padnum, u32 goposflags) && g_NumChrsSeenPlayerRecently2 <= 9 #endif ) { - padnum = chrResolvePadId(chr, padnum); + padnum = chr_resolve_pad_id(chr, padnum); #if VERSION >= VERSION_NTSC_1_0 if (padnum >= 0) @@ -7118,12 +7118,12 @@ bool chrGoToPad(struct chrdata *chr, s32 padnum, u32 goposflags) RoomNum rooms[2]; struct pad pad; - padUnpack(padnum, PADFIELD_ROOM | PADFIELD_POS, &pad); + pad_unpack(padnum, PADFIELD_ROOM | PADFIELD_POS, &pad); rooms[0] = pad.room; rooms[1] = -1; - if (chrGoToRoomPos(chr, &pad.pos, rooms, goposflags)) { + if (chr_go_to_room_pos(chr, &pad.pos, rooms, goposflags)) { return true; } } @@ -7132,45 +7132,45 @@ bool chrGoToPad(struct chrdata *chr, s32 padnum, u32 goposflags) return false; } -bool chrSetPath(struct chrdata *chr, u32 path_id) +bool chr_set_path(struct chrdata *chr, u32 path_id) { chr->path = path_id; return true; } -bool chrTryStartPatrol(struct chrdata *chr) +bool chr_try_start_patrol(struct chrdata *chr) { - struct path *path = pathFindById(chr->path); + struct path *path = path_find_by_id(chr->path); - if (path && chrIsReadyForOrders(chr)) { - chrStartPatrol(chr, path); + if (path && chr_is_ready_for_orders(chr)) { + chr_start_patrol(chr, path); return true; } return false; } -bool chrTrySurrender(struct chrdata *chr) +bool chr_try_surrender(struct chrdata *chr) { - if (CHRRACE(chr) == RACE_HUMAN && chrIsReadyForOrders(chr)) { - chrSurrender(chr); + if (CHRRACE(chr) == RACE_HUMAN && chr_is_ready_for_orders(chr)) { + chr_surrender(chr); return true; } return false; } -bool chrFadeOut(struct chrdata *chr) +bool chr_fade_out(struct chrdata *chr) { - chrBeginDead(chr); - chrFadeCorpse(chr); + chr_begin_dead(chr); + chr_fade_corpse(chr); return true; } -bool chrGoToTarget(struct chrdata *chr, u32 goposflags) +bool chr_go_to_target(struct chrdata *chr, u32 goposflags) { - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { if ( #if VERSION >= VERSION_NTSC_1_0 g_NumChrsSeenPlayerRecently2 <= 8 @@ -7180,9 +7180,9 @@ bool chrGoToTarget(struct chrdata *chr, u32 goposflags) g_NumChrsSeenPlayerRecently2 <= 9 #endif ) { - struct prop *prop = chrGetTargetProp(chr); + struct prop *prop = chr_get_target_prop(chr); - if (chrGoToRoomPos(chr, &prop->pos, prop->rooms, goposflags)) { + if (chr_go_to_room_pos(chr, &prop->pos, prop->rooms, goposflags)) { return true; } } @@ -7191,9 +7191,9 @@ bool chrGoToTarget(struct chrdata *chr, u32 goposflags) return false; } -bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 goposflags) +bool chr_go_to_chr(struct chrdata *chr, u32 dst_chrnum, u32 goposflags) { - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { if ( #if VERSION >= VERSION_NTSC_1_0 g_NumChrsSeenPlayerRecently2 <= 8 @@ -7203,9 +7203,9 @@ bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 goposflags) g_NumChrsSeenPlayerRecently2 <= 9 #endif ) { - struct chrdata *dstchr = chrFindById(chr, dst_chrnum); + struct chrdata *dstchr = chr_find_by_id(chr, dst_chrnum); - if (dstchr && dstchr->prop && chrGoToRoomPos(chr, &dstchr->prop->pos, dstchr->prop->rooms, goposflags)) { + if (dstchr && dstchr->prop && chr_go_to_room_pos(chr, &dstchr->prop->pos, dstchr->prop->rooms, goposflags)) { return true; } } @@ -7214,10 +7214,10 @@ bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 goposflags) return false; } -bool chrGoToProp(struct chrdata *chr, struct prop *prop, u32 goposflags) +bool chr_go_to_prop(struct chrdata *chr, struct prop *prop, u32 goposflags) { - if (chrIsReadyForOrders(chr) && prop) { - if (chrGoToRoomPos(chr, &prop->pos, prop->rooms, goposflags)) { + if (chr_is_ready_for_orders(chr) && prop) { + if (chr_go_to_room_pos(chr, &prop->pos, prop->rooms, goposflags)) { return true; } } @@ -7225,12 +7225,12 @@ bool chrGoToProp(struct chrdata *chr, struct prop *prop, u32 goposflags) return false; } -bool chrGoToPos(struct chrdata *chr, struct coord *pos, u32 goposflags) +bool chr_go_to_pos(struct chrdata *chr, struct coord *pos, u32 goposflags) { RoomNum inrooms[21]; RoomNum aboverooms[21]; - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { #if VERSION >= VERSION_NTSC_1_0 if (g_NumChrsSeenPlayerRecently2 < 9 || (chr->hidden & CHRHFLAG_BASICGUARD) == 0 @@ -7241,7 +7241,7 @@ bool chrGoToPos(struct chrdata *chr, struct coord *pos, u32 goposflags) { RoomNum *rooms = NULL; - bgFindRoomsByPos(pos, inrooms, aboverooms, 20, NULL); + bg_find_rooms_by_pos(pos, inrooms, aboverooms, 20, NULL); if (inrooms[0] != -1) { rooms = inrooms; @@ -7249,7 +7249,7 @@ bool chrGoToPos(struct chrdata *chr, struct coord *pos, u32 goposflags) rooms = aboverooms; } - if (rooms != NULL && chrGoToRoomPos(chr, pos, rooms, goposflags)) { + if (rooms != NULL && chr_go_to_room_pos(chr, pos, rooms, goposflags)) { return true; } } @@ -7263,16 +7263,16 @@ s32 func0f03aca0(struct chrdata *chr, f32 arg1, u8 arg2) f32 somefloat; if (!arg2) { - arg1 -= chrGetDistanceToCoord(chr, &chr->runfrompos); + arg1 -= chr_get_distance_to_coord(chr, &chr->runfrompos); } if (arg1 < 0) { - chrAssignCoverByCriteria(g_Vars.chrdata, + chr_assign_cover_by_criteria(g_Vars.chrdata, COVERCRITERIA_FURTHEREST | COVERCRITERIA_DISTTOTARGET | COVERCRITERIA_ONLYNEIGHBOURINGROOMS | COVERCRITERIA_ROOMSFROMME, 0); - return chrGoToCover(chr, GOPOSFLAG_RUN); + return chr_go_to_cover(chr, GOPOSFLAG_RUN); } somefloat = arg1 - 2000; @@ -7281,85 +7281,85 @@ s32 func0f03aca0(struct chrdata *chr, f32 arg1, u8 arg2) somefloat = 2000; } - if (!chrAssignCoverAwayFromDanger(chr, somefloat, arg1 + 10000)) { - chrAssignCoverByCriteria(g_Vars.chrdata, + if (!chr_assign_cover_away_from_danger(chr, somefloat, arg1 + 10000)) { + chr_assign_cover_by_criteria(g_Vars.chrdata, COVERCRITERIA_FURTHEREST | COVERCRITERIA_DISTTOTARGET | COVERCRITERIA_ONLYNEIGHBOURINGROOMS | COVERCRITERIA_ROOMSFROMME, 0); } - return chrGoToCover(chr, GOPOSFLAG_RUN); + return chr_go_to_cover(chr, GOPOSFLAG_RUN); } -bool chrTryStop(struct chrdata *chr) +bool chr_try_stop(struct chrdata *chr) { if (CHRRACE(chr) == RACE_EYESPY) { func0f02e9a0(chr, 0); return true; } - if (chrIsReadyForOrders(chr)) { - chrStop(chr); + if (chr_is_ready_for_orders(chr)) { + chr_stop(chr); return true; } return false; } -bool chrTrySurprisedOneHand(struct chrdata *chr) +bool chr_try_surprised_one_hand(struct chrdata *chr) { - if (CHRRACE(chr) == RACE_HUMAN && chrIsReadyForOrders(chr)) { - chrDoSurprisedOneHand(chr); + if (CHRRACE(chr) == RACE_HUMAN && chr_is_ready_for_orders(chr)) { + chr_do_surprised_one_hand(chr); return true; } return false; } -bool chrTrySurprisedSurrender(struct chrdata *chr) +bool chr_try_surprised_surrender(struct chrdata *chr) { - if (CHRRACE(chr) == RACE_HUMAN && chrIsReadyForOrders(chr)) { - chrDoSurprisedSurrender(chr); + if (CHRRACE(chr) == RACE_HUMAN && chr_is_ready_for_orders(chr)) { + chr_do_surprised_surrender(chr); return true; } return false; } -bool chrTrySurprisedLookAround(struct chrdata *chr) +bool chr_try_surprised_look_around(struct chrdata *chr) { - if (CHRRACE(chr) == RACE_HUMAN && chrIsReadyForOrders(chr)) { - chrDoSurprisedLookAround(chr); + if (CHRRACE(chr) == RACE_HUMAN && chr_is_ready_for_orders(chr)) { + chr_do_surprised_look_around(chr); return true; } return false; } -bool chrTryKneel(struct chrdata *chr) +bool chr_try_kneel(struct chrdata *chr) { - if (CHRRACE(chr) == RACE_HUMAN && chrIsReadyForOrders(chr)) { - chrKneel(chr); + if (CHRRACE(chr) == RACE_HUMAN && chr_is_ready_for_orders(chr)) { + chr_kneel(chr); return true; } return false; } -bool chrTryStartAnim(struct chrdata *chr, s32 animfnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed) +bool chr_try_start_anim(struct chrdata *chr, s32 animfnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed) { - if (chrIsReadyForOrders(chr)) { - chrStartAnim(chr, animfnum, startframe, endframe, chranimflags, merge, speed); + if (chr_is_ready_for_orders(chr)) { + chr_start_anim(chr, animfnum, startframe, endframe, chranimflags, merge, speed); return true; } return false; } -bool chrTryRunFromTarget(struct chrdata *chr) +bool chr_try_run_from_target(struct chrdata *chr) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); struct prop *prop = chr->prop; f32 ymax; f32 ymin; @@ -7369,7 +7369,7 @@ bool chrTryRunFromTarget(struct chrdata *chr) struct coord diff; f32 distance; - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { if (!target) { return false; } @@ -7389,20 +7389,20 @@ bool chrTryRunFromTarget(struct chrdata *chr) dst.z = prop->pos.z - diff.z * 1000; dst.y = prop->pos.y; - propGetBbox(prop, &radius, &ymax, &ymin); + prop_get_bbox(prop, &radius, &ymax, &ymin); // If dst runs into a wall, set it to closest valid spot - if (cdExamCylMove03(&prop->pos, prop->rooms, &dst, + if (cd_exam_cyl_move03(&prop->pos, prop->rooms, &dst, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { #if VERSION >= VERSION_JPN_FINAL - cdGetPos(&dst, 8796, "chr/chraction.c"); + cd_get_pos(&dst, 8796, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetPos(&dst, 8793, "chr/chraction.c"); + cd_get_pos(&dst, 8793, "chr/chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&dst, 8788, "chraction.c"); + cd_get_pos(&dst, 8788, "chraction.c"); #else - cdGetPos(&dst, 8782, "chraction.c"); + cd_get_pos(&dst, 8782, "chraction.c"); #endif } @@ -7414,7 +7414,7 @@ bool chrTryRunFromTarget(struct chrdata *chr) u32 speed = GOPOSFLAG_RUN; if (CHRRACE(chr) == RACE_HUMAN) { - f32 dist = chrGetDistanceToCoord(chr, &dst); + f32 dist = chr_get_distance_to_coord(chr, &dst); if (dist > 100) { speed = GOPOSFLAG_RUN; @@ -7426,7 +7426,7 @@ bool chrTryRunFromTarget(struct chrdata *chr) } func0f065e74(&prop->pos, prop->rooms, &dst, rooms); - chrGoToRoomPos(chr, &dst, rooms, speed); + chr_go_to_room_pos(chr, &dst, rooms, speed); return true; } @@ -7439,9 +7439,9 @@ bool chrTryRunFromTarget(struct chrdata *chr) * Attempt to make the chr find a suitable prop in their current room to use as * cover and run to it. However, a bug prevents this from working. */ -bool chrGoToCoverProp(struct chrdata *chr) +bool chr_go_to_cover_prop(struct chrdata *chr) { - struct prop *targetprop = chrGetTargetProp(chr); + struct prop *targetprop = chr_get_target_prop(chr); struct prop *chrprop = chr->prop; s16 i; s16 propnums[258]; @@ -7453,8 +7453,8 @@ bool chrGoToCoverProp(struct chrdata *chr) return false; } - if (chrIsReadyForOrders(chr)) { - roomGetProps(chrprop->rooms, propnums, 256); + if (chr_is_ready_for_orders(chr)) { + room_get_props(chrprop->rooms, propnums, 256); for (numprops = 0; propnums[numprops] >= 0; numprops++); @@ -7470,8 +7470,8 @@ bool chrGoToCoverProp(struct chrdata *chr) && (obj->hidden2 & OBJH2FLAG_DESTROYED) == 0 && (obj->hidden & OBJHFLAG_00008000) == 0 && (obj->hidden & OBJHFLAG_OCCUPIEDCHAIR) == 0) { - f32 targetdist = propGetDistanceToProp(targetprop, prop); - f32 chrdist = propGetDistanceToProp(chrprop, prop); + f32 targetdist = prop_get_distance_to_prop(targetprop, prop); + f32 chrdist = prop_get_distance_to_prop(chrprop, prop); // @bug: This condition cannot pass // (should be chrdist < targetdist + targetdist) @@ -7487,17 +7487,17 @@ bool chrGoToCoverProp(struct chrdata *chr) struct coord dstpos; RoomNum dstrooms[8]; - propGetBbox(prop, &propradius, &propymax, &propymin); - propGetBbox(chrprop, &chrradius, &chrymax, &chrymin); + prop_get_bbox(prop, &propradius, &propymax, &propymin); + prop_get_bbox(chrprop, &chrradius, &chrymax, &chrymin); propheight = propymax - propymin; chrheight = chrymax - chrymin; if (propheight > chrheight * 0.4f && propheight < chrheight * 0.9f) { - propSetPerimEnabled(prop, false); + prop_set_perim_enabled(prop, false); - if (cdTestLos04(&chrprop->pos, chrprop->rooms, &prop->pos, CDTYPE_DOORS | CDTYPE_BG)) { - propSetPerimEnabled(prop, true); + if (cd_test_los04(&chrprop->pos, chrprop->rooms, &prop->pos, CDTYPE_DOORS | CDTYPE_BG)) { + prop_set_perim_enabled(prop, true); dstpos.x = prop->pos.x - (targetprop->pos.x - prop->pos.x) / targetdist * (propradius * 1.25f + chrradius); dstpos.z = prop->pos.z - (targetprop->pos.z - prop->pos.z) / targetdist * (propradius * 1.25f + chrradius); @@ -7515,7 +7515,7 @@ bool chrGoToCoverProp(struct chrdata *chr) } func0f065e74(&chrprop->pos, chrprop->rooms, &dstpos, dstrooms); - chrGoToRoomPos(chr, &dstpos, dstrooms, speed); + chr_go_to_room_pos(chr, &dstpos, dstrooms, speed); chr->proppreset1 = prop - g_Vars.props; obj->hidden |= OBJHFLAG_OCCUPIEDCHAIR; @@ -7525,7 +7525,7 @@ bool chrGoToCoverProp(struct chrdata *chr) } } - propSetPerimEnabled(prop, true); + prop_set_perim_enabled(prop, true); } } } @@ -7534,19 +7534,19 @@ bool chrGoToCoverProp(struct chrdata *chr) return false; } -bool chrTryStartAlarm(struct chrdata *chr, s32 pad_id) +bool chr_try_start_alarm(struct chrdata *chr, s32 pad_id) { - if (CHRRACE(chr) == RACE_HUMAN && chrIsReadyForOrders(chr)) { - pad_id = chrResolvePadId(chr, pad_id); + if (CHRRACE(chr) == RACE_HUMAN && chr_is_ready_for_orders(chr)) { + pad_id = chr_resolve_pad_id(chr, pad_id); #if VERSION >= VERSION_NTSC_1_0 if (pad_id >= 0) #endif { - struct defaultobj *obj = objFindByPadNum(pad_id); + struct defaultobj *obj = obj_find_by_pad_num(pad_id); - if (obj && objIsHealthy(obj)) { - chrStartAlarm(chr); + if (obj && obj_is_healthy(obj)) { + chr_start_alarm(chr); return true; } } @@ -7555,15 +7555,15 @@ bool chrTryStartAlarm(struct chrdata *chr, s32 pad_id) return false; } -bool chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid) +bool chr_consider_grenade_throw(struct chrdata *chr, u32 attackflags, u32 entityid) { bool done = false; if (CHRRACE(chr) == RACE_HUMAN && chr->grenadeprob > (random() % 255) && - chrGetDistanceToTarget(chr) > 200 && - chrIsReadyForOrders(chr)) { - struct prop *target = chrGetTargetProp(chr); + chr_get_distance_to_target(chr) > 200 && + chr_is_ready_for_orders(chr)) { + struct prop *target = chr_get_target_prop(chr); struct coord pos; if (target) { @@ -7572,17 +7572,17 @@ bool chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid) pos.z = target->pos.z; } - if (target && cdTestLos04(&chr->prop->pos, chr->prop->rooms, &pos, + if (target && cd_test_los04(&chr->prop->pos, chr->prop->rooms, &pos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG)) { - struct prop *leftprop = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightprop = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftprop = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightprop = chr_get_held_prop(chr, HAND_RIGHT); struct weaponobj *weapon; #if PIRACYCHECKS { u32 checksum = 0; - s32 *i = (s32 *)&bgReset; - s32 *end = (s32 *)&bgBuildTables; + s32 *i = (s32 *)&bg_reset; + s32 *end = (s32 *)&bg_build_tables; u32 stackpadding[1]; while (i < end) { @@ -7605,7 +7605,7 @@ bool chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid) weapon = rightprop->weapon; if (weapon->weaponnum == WEAPON_GRENADE || weapon->weaponnum == WEAPON_NBOMB) { - chrThrowGrenade(chr, 0, false); + chr_throw_grenade(chr, 0, false); chr->act_throwgrenade.flags = attackflags; chr->act_throwgrenade.entityid = entityid; done = true; @@ -7616,7 +7616,7 @@ bool chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid) weapon = leftprop->weapon; if (weapon->weaponnum == WEAPON_GRENADE || weapon->weaponnum == WEAPON_NBOMB) { - chrThrowGrenade(chr, 1, false); + chr_throw_grenade(chr, 1, false); chr->act_throwgrenade.flags = attackflags; chr->act_throwgrenade.entityid = entityid; done = true; @@ -7633,16 +7633,16 @@ bool chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid) flags = OBJFLAG_WEAPON_LEFTHANDED; } - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR) { - prop = chrGiveWeapon(chr, MODEL_CHRGRENADE, WEAPON_NBOMB, flags); + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR) { + prop = chr_give_weapon(chr, MODEL_CHRGRENADE, WEAPON_NBOMB, flags); } else { - prop = chrGiveWeapon(chr, MODEL_CHRGRENADE, WEAPON_GRENADE, flags); + prop = chr_give_weapon(chr, MODEL_CHRGRENADE, WEAPON_GRENADE, flags); } if (prop) { weapon = prop->weapon; weapon->base.hidden |= OBJHFLAG_GONE; - chrThrowGrenade(chr, rightprop == NULL ? 0 : 1, true); + chr_throw_grenade(chr, rightprop == NULL ? 0 : 1, true); chr->act_throwgrenade.flags = attackflags; chr->act_throwgrenade.entityid = entityid; done = true; @@ -7654,7 +7654,7 @@ bool chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid) return done; } -bool chrDropItem(struct chrdata *chr, u32 modelnum, u32 weaponnum) +bool chr_drop_item(struct chrdata *chr, u32 modelnum, u32 weaponnum) { struct weaponobj *weapon; u8 race = CHRRACE(chr); @@ -7663,13 +7663,13 @@ bool chrDropItem(struct chrdata *chr, u32 modelnum, u32 weaponnum) return false; } - weapon = weaponCreateProjectileFromWeaponNum(modelnum, (u8)weaponnum, chr); + weapon = weapon_create_projectile_from_weapon_num(modelnum, (u8)weaponnum, chr); if (weapon && weapon->base.prop) { - modelSetScale(weapon->base.model, weapon->base.model->scale); - propReparent(weapon->base.prop, chr->prop); + model_set_scale(weapon->base.model, weapon->base.model->scale); + prop_reparent(weapon->base.prop, chr->prop); weapon->timer240 = TICKS(720); - objSetDropped(weapon->base.prop, DROPTYPE_DEFAULT); + obj_set_dropped(weapon->base.prop, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; return true; @@ -7678,9 +7678,9 @@ bool chrDropItem(struct chrdata *chr, u32 modelnum, u32 weaponnum) return false; } -void chrPunchInflictDamage(struct chrdata *chr, s32 damage, s32 range, u8 reverse) +void chr_punch_inflict_damage(struct chrdata *chr, s32 damage, s32 range, u8 reverse) { - struct prop *targetprop = chrGetTargetProp(chr); + struct prop *targetprop = chr_get_target_prop(chr); struct gset gset = {WEAPON_UNARMED, 0, 0, FUNC_PRIMARY}; struct coord vector; @@ -7689,9 +7689,9 @@ void chrPunchInflictDamage(struct chrdata *chr, s32 damage, s32 range, u8 revers gset.weaponfunc = chr->aibot->gunfunc; } - if (chrIsTargetInFov(chr, 20, reverse) - && chrGetDistanceToTarget(chr) < range - && cdTestLos04(&chr->prop->pos, chr->prop->rooms, &targetprop->pos, + if (chr_is_target_in_fov(chr, 20, reverse) + && chr_get_distance_to_target(chr) < range + && cd_test_los04(&chr->prop->pos, chr->prop->rooms, &targetprop->pos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG)) { vector.x = targetprop->pos.x - chr->prop->pos.x; vector.y = 0; @@ -7699,14 +7699,14 @@ void chrPunchInflictDamage(struct chrdata *chr, s32 damage, s32 range, u8 revers guNormalize(&vector.x, &vector.y, &vector.z); - bgunPlayPropHitSound(&gset, targetprop, -1); + bgun_play_prop_hit_sound(&gset, targetprop, -1); if (targetprop->type == PROPTYPE_PLAYER || targetprop->type == PROPTYPE_CHR) { - chrDamageByImpact(targetprop->chr, gsetGetDamage(&gset) * damage, &vector, &gset, chr->prop, 200); + chr_damage_by_impact(targetprop->chr, gset_get_damage(&gset) * damage, &vector, &gset, chr->prop, 200); } } - weaponPlayWhooshSound(gset.weaponnum, chr->prop); + weapon_play_whoosh_sound(gset.weaponnum, chr->prop); } struct punchanim { @@ -7749,7 +7749,7 @@ struct punchanim g_SkedarPunchAnims[] = { * Note that the final human anim can't be used because the modulus value is too * short by one. */ -bool chrTryPunch(struct chrdata *chr, u8 reverse) +bool chr_try_punch(struct chrdata *chr, u8 reverse) { struct punchanim *anims = NULL; s32 race = CHRRACE(chr); @@ -7799,24 +7799,24 @@ bool chrTryPunch(struct chrdata *chr, u8 reverse) } } - if (chrHasFlag(chr, CHRFLAG1_ADJUSTPUNCHSPEED, BANK_1)) { - if (chrHasFlag(chr, CHRFLAG0_CHUCKNORRIS, BANK_0)) { + if (chr_has_flag(chr, CHRFLAG1_ADJUSTPUNCHSPEED, BANK_1)) { + if (chr_has_flag(chr, CHRFLAG0_CHUCKNORRIS, BANK_0)) { // Fast punch - ok = chrTryStartAnim(chr, anims[animindex].animnum, startframe, anims[animindex].endframe, chranimflags, 16, 1.5f); + ok = chr_try_start_anim(chr, anims[animindex].animnum, startframe, anims[animindex].endframe, chranimflags, 16, 1.5f); } else { // Slow punch - ok = chrTryStartAnim(chr, anims[animindex].animnum, startframe, anims[animindex].endframe - 25, chranimflags, 16, 0.5f); + ok = chr_try_start_anim(chr, anims[animindex].animnum, startframe, anims[animindex].endframe - 25, chranimflags, 16, 0.5f); } chr->dodgerating = 0; } else { // Normal punch - ok = chrTryStartAnim(chr, anims[animindex].animnum, startframe, anims[animindex].endframe, chranimflags, 16, 0.85f); + ok = chr_try_start_anim(chr, anims[animindex].animnum, startframe, anims[animindex].endframe, chranimflags, 16, 0.85f); chr->dodgerating = 0; } if (ok) { - struct prop *targetprop = chrGetTargetProp(chr); + struct prop *targetprop = chr_get_target_prop(chr); if (targetprop->type == PROPTYPE_EYESPY || targetprop->type == PROPTYPE_PLAYER) { chr->act_anim.hitradius = playerhitradius; @@ -7829,9 +7829,9 @@ bool chrTryPunch(struct chrdata *chr, u8 reverse) if (g_Vars.normmplayerisrunning) { chr->act_anim.hitdamage = 1; - } else if (chrHasFlag(chr, CHRFLAG1_ADJUSTPUNCHSPEED, BANK_1) && chrHasFlag(chr, CHRFLAG0_CHUCKNORRIS, BANK_0)) { + } else if (chr_has_flag(chr, CHRFLAG1_ADJUSTPUNCHSPEED, BANK_1) && chr_has_flag(chr, CHRFLAG0_CHUCKNORRIS, BANK_0)) { chr->act_anim.hitdamage = (u16)anims[animindex].damage * (f32)chr->morale + (u16)anims[animindex].damage * (f32)chr->morale; - } else if (chrHasFlag(chr, CHRFLAG1_PUNCHHARDER, BANK_1)) { + } else if (chr_has_flag(chr, CHRFLAG1_PUNCHHARDER, BANK_1)) { chr->act_anim.hitdamage = (u16)anims[animindex].damage * 6; } else { chr->act_anim.hitdamage = anims[animindex].damage; @@ -7859,7 +7859,7 @@ void func0f03c03c(void) * the player list is required because the only pointer to an eyespy is via the * player struct. */ -struct eyespy *chrToEyespy(struct chrdata *chr) +struct eyespy *chr_to_eyespy(struct chrdata *chr) { if (chr && chr->prop) { if (CHRRACE(chr) == RACE_EYESPY) { @@ -7879,7 +7879,7 @@ struct eyespy *chrToEyespy(struct chrdata *chr) return NULL; } -void chrTickStand(struct chrdata *chr) +void chr_tick_stand(struct chrdata *chr) { s32 race; s32 i; @@ -7897,17 +7897,17 @@ void chrTickStand(struct chrdata *chr) s32 sp44[8]; if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrChooseStandAnimation(chr, chr->act_stand.mergetime); + chr_choose_stand_animation(chr, chr->act_stand.mergetime); chr->hidden &= ~CHRHFLAG_NEEDANIM; } - if (modelGetAnimNum(chr->model) == ANIM_SNIPING_GETUP) { - if (modelGetCurAnimFrame(chr->model) >= modelGetAnimEndFrame(chr->model)) { - chrChooseStandAnimation(chr, 8); + if (model_get_anim_num(chr->model) == ANIM_SNIPING_GETUP) { + if (model_get_cur_anim_frame(chr->model) >= model_get_anim_end_frame(chr->model)) { + chr_choose_stand_animation(chr, 8); chr->act_stand.prestand = 0; } @@ -7925,8 +7925,8 @@ void chrTickStand(struct chrdata *chr) } if (chr->act_stand.prestand) { - if (modelGetCurAnimFrame(chr->model) >= modelGetAnimEndFrame(chr->model)) { - chrChooseStandAnimation(chr, 8); + if (model_get_cur_anim_frame(chr->model) >= model_get_anim_end_frame(chr->model)) { + chr_choose_stand_animation(chr, 8); chr->act_stand.prestand = 0; } @@ -7936,10 +7936,10 @@ void chrTickStand(struct chrdata *chr) if (!chr->aibot && (race == RACE_HUMAN || race == RACE_SKEDAR) && chr->act_stand.flags > 0) { if (chr->act_stand.reaim) { - chr->act_stand.turning = chrTurn(chr, chr->act_stand.turning, modelGetNumAnimFrames(chr->model) - 1, 1, 0); + chr->act_stand.turning = chr_turn(chr, chr->act_stand.turning, model_get_num_anim_frames(chr->model) - 1, 1, 0); if (chr->act_stand.turning != TURNSTATE_TURNING) { - chrChooseStandAnimation(chr, 8); + chr_choose_stand_animation(chr, 8); chr->act_stand.reaim = false; if (chr->act_stand.flags & ATTACKFLAG_AIMATDIRECTION) { @@ -7947,12 +7947,12 @@ void chrTickStand(struct chrdata *chr) } } } else { - f32 relangle = chrGetAttackEntityRelativeAngle(chr, chr->act_stand.flags, chr->act_stand.entityid); + f32 relangle = chr_get_attack_entity_relative_angle(chr, chr->act_stand.flags, chr->act_stand.entityid); if ((relangle > RAD(20, 0.34901028871536f) && relangle < RAD(340, 5.9331746101379f)) || (relangle > RAD(10, 0.17450514435768f) && relangle < RAD(350, 6.1076798439026f) && !chr->act_stand.playwalkanim)) { - leftgun = chrGetHeldProp(chr, HAND_LEFT); - rightgun = chrGetHeldProp(chr, HAND_RIGHT); + leftgun = chr_get_held_prop(chr, HAND_LEFT); + rightgun = chr_get_held_prop(chr, HAND_RIGHT); chr->act_stand.reaim = true; chr->act_stand.turning = TURNSTATE_TURNING; @@ -7960,19 +7960,19 @@ void chrTickStand(struct chrdata *chr) if (race == RACE_HUMAN) { if ((leftgun && rightgun) || (!leftgun && !rightgun) - || weaponIsOneHanded(leftgun) - || weaponIsOneHanded(rightgun)) { - modelSetAnimation(chr->model, ANIM_006B, random() % 2, 0, 0.5f, 16); - modelSetAnimEndFrame(chr->model, animGetNumFrames(ANIM_006B) - 1); + || weapon_is_one_handed(leftgun) + || weapon_is_one_handed(rightgun)) { + model_set_animation(chr->model, ANIM_006B, random() % 2, 0, 0.5f, 16); + model_set_anim_end_frame(chr->model, anim_get_num_frames(ANIM_006B) - 1); } else { if (rightgun || leftgun) { - modelSetAnimation(chr->model, ANIM_0028, leftgun != NULL, 0, 0.5f, 16); - modelSetAnimEndFrame(chr->model, animGetNumFrames(ANIM_0028) - 1); + model_set_animation(chr->model, ANIM_0028, leftgun != NULL, 0, 0.5f, 16); + model_set_anim_end_frame(chr->model, anim_get_num_frames(ANIM_0028) - 1); } } } else if (race == RACE_SKEDAR) { - modelSetAnimation(chr->model, ANIM_0392, random() % 2, 0, 0.5f, 16); - modelSetAnimEndFrame(chr->model, animGetNumFrames(ANIM_0392) - 1); + model_set_animation(chr->model, ANIM_0392, random() % 2, 0, 0.5f, 16); + model_set_anim_end_frame(chr->model, anim_get_num_frames(ANIM_0392) - 1); } } else if (chr->act_stand.flags & ATTACKFLAG_AIMATDIRECTION) { chr->act_stand.flags = 0; @@ -8008,7 +8008,7 @@ void chrTickStand(struct chrdata *chr) return; } - sp6c = sp70 = chrGetInverseTheta(chr); + sp6c = sp70 = chr_get_inverse_theta(chr); for (i = 0; i < ARRAYCOUNT(sp74); i++) { sp6c += RAD(45, 0.7852731347084f); @@ -8066,55 +8066,55 @@ void chrTickStand(struct chrdata *chr) angle -= M_BADTAU; } - chrFaceEntity(chr, ATTACKFLAG_AIMATDIRECTION, angle * 10432.0390625f); + chr_face_entity(chr, ATTACKFLAG_AIMATDIRECTION, angle * 10432.0390625f); } else { chr->act_stand.checkfacingwall = false; } } -void chrTickKneel(struct chrdata *chr) +void chr_tick_kneel(struct chrdata *chr) { chr->sleep = 0; - if ((chr->hidden & CHRHFLAG_NEEDANIM) && !modelIsAnimMerging(chr->model)) { - chrKneelChooseAnimation(chr); + if ((chr->hidden & CHRHFLAG_NEEDANIM) && !model_is_anim_merging(chr->model)) { + chr_kneel_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } } -void chrTickAnim(struct chrdata *chr) +void chr_tick_anim(struct chrdata *chr) { if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - modelSetAnimation(chr->model, chr->act_anim.animnum, chr->act_anim.flip, + model_set_animation(chr->model, chr->act_anim.animnum, chr->act_anim.flip, chr->act_anim.startframe, chr->act_anim.speed, chr->act_anim.blend); if (chr->act_anim.endframe >= 0) { - modelSetAnimEndFrame(chr->model, chr->act_anim.endframe); + model_set_anim_end_frame(chr->model, chr->act_anim.endframe); } chr->hidden &= ~CHRHFLAG_NEEDANIM; } - if (!chr->act_anim.pauseatend && modelGetCurAnimFrame(chr->model) >= modelGetAnimEndFrame(chr->model)) { - chrStand(chr); + if (!chr->act_anim.pauseatend && model_get_cur_anim_frame(chr->model) >= model_get_anim_end_frame(chr->model)) { + chr_stand(chr); } - if (chr->act_anim.ishitanim && modelGetCurAnimFrame(chr->model) >= (s32)chr->act_anim.hitframe) { + if (chr->act_anim.ishitanim && model_get_cur_anim_frame(chr->model) >= (s32)chr->act_anim.hitframe) { chr->act_anim.ishitanim = false; - chrPunchInflictDamage(chr, chr->act_anim.hitdamage, chr->act_anim.hitradius, chr->act_anim.reverse); + chr_punch_inflict_damage(chr, chr->act_anim.hitdamage, chr->act_anim.hitradius, chr->act_anim.reverse); } // Play sneezing sound if (CHRRACE(chr) == RACE_HUMAN - && modelGetAnimNum(chr->model) == ANIM_SNEEZE - && modelGetCurAnimFrame(chr->model) >= 42 + && model_get_anim_num(chr->model) == ANIM_SNEEZE + && model_get_cur_anim_frame(chr->model) >= 42 && (g_Vars.lvframenum % 2) == 0 - && chrGetDistanceToCurrentPlayer(chr) < 800) { - psCreate(NULL, chr->prop, SFX_0037, -1, + && chr_get_distance_to_current_player(chr) < 800) { + ps_create(NULL, chr->prop, SFX_0037, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } @@ -8122,20 +8122,20 @@ void chrTickAnim(struct chrdata *chr) chr->sleep = 14 + (random() % 5); } - if (modelGetAnimNum(chr->model) == ANIM_RELOAD_0209) { - chrSetFiring(chr, HAND_RIGHT, false); - chrSetFiring(chr, HAND_LEFT, false); + if (model_get_anim_num(chr->model) == ANIM_RELOAD_0209) { + chr_set_firing(chr, HAND_RIGHT, false); + chr_set_firing(chr, HAND_LEFT, false); } } -void chrTickSurrender(struct chrdata *chr) +void chr_tick_surrender(struct chrdata *chr) { if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrSurrenderChooseAnimation(chr); + chr_surrender_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } @@ -8144,36 +8144,36 @@ void chrTickSurrender(struct chrdata *chr) struct model *model = chr->model; chr->sleep = 16; - if (modelGetAnimNum(model) == ANIM_SURRENDER_002F && modelGetCurAnimFrame(model) >= 80.0f) { + if (model_get_anim_num(model) == ANIM_SURRENDER_002F && model_get_cur_anim_frame(model) >= 80.0f) { struct coord coord = {0, 0, 0}; - f32 value = chrGetInverseTheta(chr); + f32 value = chr_get_inverse_theta(chr); coord.x = -sinf(value); coord.z = -cosf(value); - if (!propchrHasClearLineInVector(chr->prop, &coord, 20)) { - modelSetAnimation(chr->model, ANIM_SURRENDER_002E, random() & 1, 30, 0.5, 16); - modelSetAnimLooping(chr->model, 30, 16); + if (!propchr_has_clear_line_in_vector(chr->prop, &coord, 20)) { + model_set_animation(chr->model, ANIM_SURRENDER_002E, random() & 1, 30, 0.5, 16); + model_set_anim_looping(chr->model, 30, 16); } } } } } -void chrFadeCorpse(struct chrdata *chr) +void chr_fade_corpse(struct chrdata *chr) { if (chr->actiontype == ACT_DEAD || chr->actiontype == ACT_DRUGGEDKO) { chr->act_dead.fadenow = true; } } -void chrFadeCorpseWhenOffScreen(struct chrdata *chr) +void chr_fade_corpse_when_off_screen(struct chrdata *chr) { if (chr->actiontype == ACT_DEAD) { chr->act_dead.fadewheninvis = true; } } -void chrTickDead(struct chrdata *chr) +void chr_tick_dead(struct chrdata *chr) { struct aibot *aibot = chr->aibot; @@ -8186,7 +8186,7 @@ void chrTickDead(struct chrdata *chr) chr->fadealpha = 0; if (aibot) { - botSpawn(chr, true); + bot_spawn(chr, true); } else { chr->hidden |= CHRHFLAG_DELETING; } @@ -8199,7 +8199,7 @@ void chrTickDead(struct chrdata *chr) // screen and there's lots of other chrs around) if (chr->act_dead.fadenow) { chr->act_dead.fadetimer60 = 0; - chrDropItemsForOwnerReap(chr); + chr_drop_items_for_owner_reap(chr); } if (chr->prop->flags & PROPFLAG_ONANYSCREENPREVTICK) { @@ -8217,7 +8217,7 @@ void chrTickDead(struct chrdata *chr) chr->fadealpha = 0; - chrDropItemsForOwnerReap(chr); + chr_drop_items_for_owner_reap(chr); } } @@ -8237,11 +8237,11 @@ void chrTickDead(struct chrdata *chr) * from there next time the function is called. The function is called on * subsequent ticks while the chr is still in their injured or dying action. */ -void chrAlertOthersOfInjury(struct chrdata *chr, bool dying) +void chr_alert_others_of_injury(struct chrdata *chr, bool dying) { s32 index = 0; s32 numinrange = 0; - s32 numchrs = chrsGetNumSlots(); + s32 numchrs = chrs_get_num_slots(); if (g_Vars.antiplayernum >= 0 && chr->prop == g_Vars.anti->prop) { return; @@ -8266,7 +8266,7 @@ void chrAlertOthersOfInjury(struct chrdata *chr, bool dying) if (xdiff * xdiff + ydiff * ydiff + zdiff * zdiff < 4000000.0f) { numinrange++; - if (chrHasLosToPosWasteful(loopchr, &chr->prop->pos, chr->prop->rooms)) { + if (chr_has_los_to_pos_wasteful(loopchr, &chr->prop->pos, chr->prop->rooms)) { if (dying == false) { loopchr->chrseeshot = chr->chrnum; } else { @@ -8286,7 +8286,7 @@ void chrAlertOthersOfInjury(struct chrdata *chr, bool dying) } } -void chrTickDie(struct chrdata *chr) +void chr_tick_die(struct chrdata *chr) { struct model *model = chr->model; u32 race = CHRRACE(chr); @@ -8335,8 +8335,8 @@ void chrTickDie(struct chrdata *chr) if (race == RACE_ROBOT) { struct prop *prop = chr->prop; - psStopSound(prop, PSTYPE_GENERAL, 0xffff); - explosionCreateSimple(prop, &prop->pos, prop->rooms, EXPLOSIONTYPE_8, g_Vars.currentplayernum); + ps_stop_sound(prop, PSTYPE_GENERAL, 0xffff); + explosion_create_simple(prop, &prop->pos, prop->rooms, EXPLOSIONTYPE_8, g_Vars.currentplayernum); chr->hidden |= CHRHFLAG_DELETING; return; } @@ -8355,7 +8355,7 @@ void chrTickDie(struct chrdata *chr) SFX_DRCAROLL_YOU_WERE_SUPPOSED, }; - psCreate(NULL, chr->prop, phrases[random() % 5], -1, + ps_create(NULL, chr->prop, phrases[random() % 5], -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); chr->voicebox = 0; } @@ -8371,16 +8371,16 @@ void chrTickDie(struct chrdata *chr) if (g_DrCarollDyingTimer > TICKS(310)) { // Explode - psStopSound(prop, PSTYPE_GENERAL, 0xffff); - explosionCreateSimple(prop, &prop->pos, prop->rooms, EXPLOSIONTYPE_8, g_Vars.currentplayernum); - chrBeginDead(chr); + ps_stop_sound(prop, PSTYPE_GENERAL, 0xffff); + explosion_create_simple(prop, &prop->pos, prop->rooms, EXPLOSIONTYPE_8, g_Vars.currentplayernum); + chr_begin_dead(chr); } else if (chr->soundtimer > (s32)var80068080) { // Play shield damage sound chr->soundtimer = 0; var80068080 -= 5; - psCreate(NULL, prop, SFX_SHIELD_DAMAGE, -1, + ps_create(NULL, prop, SFX_SHIELD_DAMAGE, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); - sparksCreate(prop->rooms[0], prop, &prop->pos, NULL, 0, SPARKTYPE_ELECTRICAL); + sparks_create(prop->rooms[0], prop, &prop->pos, NULL, 0, SPARKTYPE_ELECTRICAL); } return; @@ -8388,12 +8388,12 @@ void chrTickDie(struct chrdata *chr) // Human or Skedar // If due, play thud 1 sound - if (chr->act_die.thudframe1 >= 0 && modelGetCurAnimFrame(model) >= chr->act_die.thudframe1) { + if (chr->act_die.thudframe1 >= 0 && model_get_cur_anim_frame(model) >= chr->act_die.thudframe1) { if (chr->specialdie == 0) { - psCreate(NULL, chr->prop, thuds[thudindex], -1, + ps_create(NULL, chr->prop, thuds[thudindex], -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } else if (chr->specialdie != SPECIALDIE_OVERRAILING) { - psCreate(NULL, chr->prop, specialdiesounds[chr->specialdie - 1], -1, + ps_create(NULL, chr->prop, specialdiesounds[chr->specialdie - 1], -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } @@ -8407,12 +8407,12 @@ void chrTickDie(struct chrdata *chr) } // If due, play thud 2 sound - if (chr->act_die.thudframe2 >= 0 && modelGetCurAnimFrame(model) >= chr->act_die.thudframe2) { + if (chr->act_die.thudframe2 >= 0 && model_get_cur_anim_frame(model) >= chr->act_die.thudframe2) { if (chr->specialdie < 5) { - psCreate(NULL, chr->prop, SFX_THUD_808E, -1, + ps_create(NULL, chr->prop, SFX_THUD_808E, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } else { - psCreate(NULL, chr->prop, thuds[thudindex], -1, + ps_create(NULL, chr->prop, thuds[thudindex], -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } @@ -8426,20 +8426,20 @@ void chrTickDie(struct chrdata *chr) } // Check for end of death animation and switch to ACT_DEAD - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { - if (CHRRACE(chr) == RACE_HUMAN && modelGetAnimNum(model) == ANIM_DEATH_STOMACH_LONG) { - modelSetAnimation(model, ANIM_003C, !modelIsFlipped(model), 50, 0.3, animGetNumFrames(ANIM_003C) - 51.0f); - modelSetAnimSpeed(model, 0.5, animGetNumFrames(ANIM_003C) - 51.0f); + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { + if (CHRRACE(chr) == RACE_HUMAN && model_get_anim_num(model) == ANIM_DEATH_STOMACH_LONG) { + model_set_animation(model, ANIM_003C, !model_is_flipped(model), 50, 0.3, anim_get_num_frames(ANIM_003C) - 51.0f); + model_set_anim_speed(model, 0.5, anim_get_num_frames(ANIM_003C) - 51.0f); return; } - chrBeginDead(chr); + chr_begin_dead(chr); } - chrAlertOthersOfInjury(chr, true); + chr_alert_others_of_injury(chr, true); } -void chrTickDruggedComingUp(struct chrdata *chr) +void chr_tick_drugged_coming_up(struct chrdata *chr) { u16 thuds[] = { SFX_THUD_808D, @@ -8465,7 +8465,7 @@ void chrTickDruggedComingUp(struct chrdata *chr) bool done = false; struct prop *weapon; - chrUncloak(chr, true); + chr_uncloak(chr, true); chr->actiontype = ACT_DRUGGEDDROP; @@ -8479,10 +8479,10 @@ void chrTickDruggedComingUp(struct chrdata *chr) chr->act_die.thudframe1 = row->thudframe1; chr->act_die.thudframe2 = row->thudframe2; - modelSetAnimationWithMerge(model, row->animnum, row->flip, 0, row->speed, 16, true); + model_set_animation_with_merge(model, row->animnum, row->flip, 0, row->speed, 16, true); if (row->endframe >= 0) { - modelSetAnimEndFrame(model, row->endframe); + model_set_anim_end_frame(model, row->endframe); } done = true; @@ -8500,22 +8500,22 @@ void chrTickDruggedComingUp(struct chrdata *chr) weapon = chr->weapons_held[HAND_RIGHT]; if (weapon && (weapon->obj->flags & OBJFLAG_AIUNDROPPABLE) == 0) { - objSetDropped(weapon, DROPTYPE_DEFAULT); + obj_set_dropped(weapon, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } weapon = chr->weapons_held[HAND_LEFT]; if (weapon && (weapon->obj->flags & OBJFLAG_AIUNDROPPABLE) == 0) { - objSetDropped(weapon, DROPTYPE_DEFAULT); + obj_set_dropped(weapon, DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } - chrDropConcealedItems(chr); + chr_drop_concealed_items(chr); } } -void chrTickDruggedDrop(struct chrdata *chr) +void chr_tick_drugged_drop(struct chrdata *chr) { struct model *model = chr->model; @@ -8536,8 +8536,8 @@ void chrTickDruggedDrop(struct chrdata *chr) static s32 thudindex = 0; // If due, play thud 1 sound - if (chr->act_die.thudframe1 >= 0 && modelGetCurAnimFrame(model) >= chr->act_die.thudframe1) { - psCreate(NULL, chr->prop, thuds[thudindex], -1, + if (chr->act_die.thudframe1 >= 0 && model_get_cur_anim_frame(model) >= chr->act_die.thudframe1) { + ps_create(NULL, chr->prop, thuds[thudindex], -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); thudindex++; @@ -8550,8 +8550,8 @@ void chrTickDruggedDrop(struct chrdata *chr) } // If due, play thud 2 sound - if (chr->act_die.thudframe2 >= 0 && modelGetCurAnimFrame(model) >= chr->act_die.thudframe2) { - psCreate(NULL, chr->prop, thuds[thudindex], -1, + if (chr->act_die.thudframe2 >= 0 && model_get_cur_anim_frame(model) >= chr->act_die.thudframe2) { + ps_create(NULL, chr->prop, thuds[thudindex], -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); thudindex++; @@ -8564,7 +8564,7 @@ void chrTickDruggedDrop(struct chrdata *chr) } // If falling animation finished, assign ACT_DRUGGEDKO - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { chr->actiontype = ACT_DRUGGEDKO; chr->act_dead.fadetimer60 = chr->aibot ? 0 : -1; chr->act_dead.fadenow = false; @@ -8574,10 +8574,10 @@ void chrTickDruggedDrop(struct chrdata *chr) chr->sleep = 0; } - chrAlertOthersOfInjury(chr, true); + chr_alert_others_of_injury(chr, true); } -void chrTickDruggedKo(struct chrdata *chr) +void chr_tick_drugged_ko(struct chrdata *chr) { bool reap = false; @@ -8609,18 +8609,18 @@ void chrTickDruggedKo(struct chrdata *chr) if (reap) { chr->fadealpha = 0; chr->hidden |= CHRHFLAG_DELETING; - chrDropItemsForOwnerReap(chr); + chr_drop_items_for_owner_reap(chr); } } -void chrTickArgh(struct chrdata *chr) +void chr_tick_argh(struct chrdata *chr) { struct model *model = chr->model; - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { - chrRecordLastSeeTargetTime(chr); + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { + chr_record_last_see_target_time(chr); - if (CHRRACE(chr) == RACE_HUMAN && modelGetAnimNum(model) == ANIM_DEATH_STOMACH_LONG) { + if (CHRRACE(chr) == RACE_HUMAN && model_get_anim_num(model) == ANIM_DEATH_STOMACH_LONG) { func0f02ed28(chr, 26); } else { if (chr->race == RACE_DRCAROLL) { @@ -8628,24 +8628,24 @@ void chrTickArgh(struct chrdata *chr) chr->drcarollimage_right = DRCAROLLIMAGE_EYESDEFAULT; } - chrStop(chr); + chr_stop(chr); } } - chrAlertOthersOfInjury(chr, false); + chr_alert_others_of_injury(chr, false); } -void chrTickPreArgh(struct chrdata *chr) +void chr_tick_pre_argh(struct chrdata *chr) { struct model *model = chr->model; - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { struct coord dir; dir.x = chr->act_preargh.dir.x; dir.y = chr->act_preargh.dir.y; dir.z = chr->act_preargh.dir.z; - chrReactToDamage(chr, &dir, + chr_react_to_damage(chr, &dir, chr->act_preargh.relshotdir, chr->act_preargh.hitpart, &chr->act_preargh.gset, @@ -8653,102 +8653,102 @@ void chrTickPreArgh(struct chrdata *chr) } } -void chrTickSidestep(struct chrdata *chr) +void chr_tick_sidestep(struct chrdata *chr) { struct model *model = chr->model; if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrSidestepChooseAnimation(chr); + chr_sidestep_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { - chrRecordLastSeeTargetTime(chr); + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { + chr_record_last_see_target_time(chr); func0f02ed28(chr, 10); } } -void chrTickJumpOut(struct chrdata *chr) +void chr_tick_jump_out(struct chrdata *chr) { struct model *model = chr->model; if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrJumpOutChooseAnimation(chr); + chr_jump_out_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { - chrRecordLastSeeTargetTime(chr); - chrStop(chr); + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { + chr_record_last_see_target_time(chr); + chr_stop(chr); } } -void chrTickTest(struct chrdata *chr) +void chr_tick_test(struct chrdata *chr) { struct model *model = chr->model; - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { - chrStand(chr); + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { + chr_stand(chr); } } -void chrTickStartAlarm(struct chrdata *chr) +void chr_tick_start_alarm(struct chrdata *chr) { struct model *model = chr->model; if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrStartAlarmChooseAnimation(chr); + chr_start_alarm_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } - if (modelGetCurAnimFrame(model) >= 60) { - alarmActivate(); + if (model_get_cur_anim_frame(model) >= 60) { + alarm_activate(); } - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { - chrStop(chr); + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { + chr_stop(chr); } } -void chrTickSurprised(struct chrdata *chr) +void chr_tick_surprised(struct chrdata *chr) { if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrSurprisedChooseAnimation(chr); + chr_surprised_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } if (CHRRACE(chr) == RACE_HUMAN) { struct model *model = chr->model; - if (modelGetCurAnimFrame(model) >= modelGetAnimEndFrame(model)) { - if (modelGetAnimNum(model) == ANIM_SURRENDER_002E) { + if (model_get_cur_anim_frame(model) >= model_get_anim_end_frame(model)) { + if (model_get_anim_num(model) == ANIM_SURRENDER_002E) { func0f02ed28(chr, 26); - } else if (modelGetAnimNum(model) == ANIM_003F) { + } else if (model_get_anim_num(model) == ANIM_003F) { func0f02ed28(chr, 26); } else { - chrStop(chr); + chr_stop(chr); } } } } -void chrUpdateFireslot(struct chrdata *chr, s32 handnum, bool withsound, bool withbeam, struct coord *from, struct coord *to) +void chr_update_fireslot(struct chrdata *chr, s32 handnum, bool withsound, bool withbeam, struct coord *from, struct coord *to) { struct prop *weaponprop; struct weaponobj *weapon; @@ -8757,16 +8757,16 @@ void chrUpdateFireslot(struct chrdata *chr, s32 handnum, bool withsound, bool wi u8 duration; u16 soundnum; - weaponprop = chrGetHeldProp(chr, handnum); + weaponprop = chr_get_held_prop(chr, handnum); if (weaponprop) { weapon = weaponprop->weapon; weaponnum = weapon->weaponnum; - duration = gsetGetFireslotDuration(&weapon->gset); - soundnum = gsetGetSingleShootSound(&weapon->gset); + duration = gset_get_fireslot_duration(&weapon->gset); + soundnum = gset_get_single_shoot_sound(&weapon->gset); if (chr->fireslots[handnum] < 0) { - chr->fireslots[handnum] = bgunAllocateFireslot(); + chr->fireslots[handnum] = bgun_allocate_fireslot(); } if (chr->fireslots[handnum] >= 0) { @@ -8795,12 +8795,12 @@ void chrUpdateFireslot(struct chrdata *chr, s32 handnum, bool withsound, bool wi if (playsound) { #if VERSION >= VERSION_NTSC_1_0 - psCreate(NULL, chr->prop, soundnum, -1, -1, + ps_create(NULL, chr->prop, soundnum, -1, -1, PSFLAG_0400, PSFLAG2_PRINTABLE, PSTYPE_CHRSHOOT, NULL, -1, NULL, -1, -1, -1, -1); fireslot->endlvframe = (u32)g_Vars.lvframe60 + duration; chr->hidden2 |= CHRH2FLAG_FIRESOUNDDONE; #else - psCreate(NULL, chr->prop, soundnum, -1, -1, + ps_create(NULL, chr->prop, soundnum, -1, -1, PSFLAG_0400, PSFLAG2_PRINTABLE, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); fireslot->endlvframe = (u32)g_Vars.lvframe60 + duration; chr->hidden |= CHRHFLAG_FIRESOUNDDONE; @@ -8810,7 +8810,7 @@ void chrUpdateFireslot(struct chrdata *chr, s32 handnum, bool withsound, bool wi } if (withbeam) { - beamCreate(&fireslot->beam, weaponnum, from, to); + beam_create(&fireslot->beam, weaponnum, from, to); } } } @@ -8819,14 +8819,14 @@ void chrUpdateFireslot(struct chrdata *chr, s32 handnum, bool withsound, bool wi /** * Returns the chr's turn angle difference to 360 degrees, in radians. */ -f32 chrGetInverseTheta(struct chrdata *chr) +f32 chr_get_inverse_theta(struct chrdata *chr) { if (chr->aibot) { return chr->aibot->lookangle; } if (chr->model == NULL && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { - struct player *player = g_Vars.players[playermgrGetPlayerNumByProp(chr->prop)]; + struct player *player = g_Vars.players[playermgr_get_player_num_by_prop(chr->prop)]; f32 angle = (360.0f - player->vv_theta) * 0.017450513318181f; if (angle >= M_BADTAU) { @@ -8838,39 +8838,39 @@ f32 chrGetInverseTheta(struct chrdata *chr) return angle; } - return modelGetChrRotY(chr->model); + return model_get_chr_rot_y(chr->model); } -void chrSetLookAngle(struct chrdata *chr, f32 angle) +void chr_set_look_angle(struct chrdata *chr, f32 angle) { if (chr->aibot) { chr->aibot->lookangle = angle; } else { - modelSetChrRotY(chr->model, angle); + model_set_chr_rot_y(chr->model, angle); } } -f32 chrGetRotY(struct chrdata *chr) +f32 chr_get_rot_y(struct chrdata *chr) { if (chr->aibot) { return chr->aibot->roty; } else { - return modelGetChrRotY(chr->model); + return model_get_chr_rot_y(chr->model); } } -void chrSetRotY(struct chrdata *chr, f32 roty) +void chr_set_rot_y(struct chrdata *chr, f32 roty) { if (chr->aibot) { chr->aibot->roty = roty; } else { - modelSetChrRotY(chr->model, roty); + model_set_chr_rot_y(chr->model, roty); } } -f32 chrGetAimAngle(struct chrdata *chr) +f32 chr_get_aim_angle(struct chrdata *chr) { - f32 angle = chrGetInverseTheta(chr) + chr->aimsideback; + f32 angle = chr_get_inverse_theta(chr) + chr->aimsideback; f32 offset = 0; if (angle >= M_BADTAU) { @@ -8890,7 +8890,7 @@ f32 chrGetAimAngle(struct chrdata *chr) || chr->actiontype == ACT_BOT_ATTACKSTRAFE) { offset = chr->act_attack.animcfg->unk0c; } else if (chr->prop->type == PROPTYPE_PLAYER) { - offset += g_Vars.players[playermgrGetPlayerNumByProp(chr->prop)]->angleoffset; + offset += g_Vars.players[playermgr_get_player_num_by_prop(chr->prop)]->angleoffset; } if (offset) { @@ -8910,7 +8910,7 @@ f32 chrGetAimAngle(struct chrdata *chr) return angle; } -f32 chrGetPitchAngle(struct chrdata *chr) +f32 chr_get_pitch_angle(struct chrdata *chr) { f32 sum = chr->aimuprshoulder + chr->aimupback; @@ -8924,31 +8924,31 @@ f32 chrGetPitchAngle(struct chrdata *chr) /** * Turn the chr slightly towards their target. */ -s32 chrTurn(struct chrdata *chr, s32 turning, f32 endanimframe, f32 speed, f32 toleranceangle) +s32 chr_turn(struct chrdata *chr, s32 turning, f32 endanimframe, f32 speed, f32 toleranceangle) { if (turning != TURNSTATE_OFF) { struct model *model = chr->model; - f32 curframe = modelGetCurAnimFrame(model); + f32 curframe = model_get_cur_anim_frame(model); u32 stack; - f32 finalangle = chrGetInverseTheta(chr); + f32 finalangle = chr_get_inverse_theta(chr); f32 remainingangle; f32 increment = M_BADTAU / 100.0f * speed * g_Vars.lvupdate60f * model->anim->playspeed; if (chr->aibot) { - struct prop *target = chrGetTargetProp(chr); - remainingangle = chrGetAngleToPos(chr, &target->pos); + struct prop *target = chr_get_target_prop(chr); + remainingangle = chr_get_angle_to_pos(chr, &target->pos); } else if (chr->actiontype == ACT_ATTACK || chr->actiontype == ACT_BOT_ATTACKSTAND || chr->actiontype == ACT_BOT_ATTACKKNEEL || chr->actiontype == ACT_BOT_ATTACKSTRAFE) { - remainingangle = chrGetAttackEntityRelativeAngle(chr, chr->act_attack.flags, chr->act_attack.entityid); + remainingangle = chr_get_attack_entity_relative_angle(chr, chr->act_attack.flags, chr->act_attack.entityid); } else if (chr->actiontype == ACT_STAND) { - remainingangle = chrGetAttackEntityRelativeAngle(chr, chr->act_stand.flags, chr->act_stand.entityid); + remainingangle = chr_get_attack_entity_relative_angle(chr, chr->act_stand.flags, chr->act_stand.entityid); } else if (chr->actiontype == ACT_THROWGRENADE) { - remainingangle = chrGetAttackEntityRelativeAngle(chr, chr->act_throwgrenade.flags, chr->act_throwgrenade.entityid); + remainingangle = chr_get_attack_entity_relative_angle(chr, chr->act_throwgrenade.flags, chr->act_throwgrenade.entityid); } else { - struct prop *target = chrGetTargetProp(chr); - remainingangle = chrGetAngleToPos(chr, &target->pos); + struct prop *target = chr_get_target_prop(chr); + remainingangle = chr_get_angle_to_pos(chr, &target->pos); } remainingangle -= toleranceangle; @@ -8965,7 +8965,7 @@ s32 chrTurn(struct chrdata *chr, s32 turning, f32 endanimframe, f32 speed, f32 t finalangle -= M_BADTAU; } - chrSetLookAngle(chr, finalangle); + chr_set_look_angle(chr, finalangle); turning = TURNSTATE_ONTARGET; } else if (remainingangle < M_PI) { // Turning in one direction @@ -8975,7 +8975,7 @@ s32 chrTurn(struct chrdata *chr, s32 turning, f32 endanimframe, f32 speed, f32 t finalangle -= M_BADTAU; } - chrSetLookAngle(chr, finalangle); + chr_set_look_angle(chr, finalangle); } else { // Turning in the other direction finalangle -= increment; @@ -8984,7 +8984,7 @@ s32 chrTurn(struct chrdata *chr, s32 turning, f32 endanimframe, f32 speed, f32 t finalangle += M_BADTAU; } - chrSetLookAngle(chr, finalangle); + chr_set_look_angle(chr, finalangle); } if (curframe >= endanimframe) { @@ -9021,7 +9021,7 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi f32 sp174; f32 sp170; struct prop *chrprop = chr->prop; - struct prop *targetprop = chrGetTargetProp(chr); + struct prop *targetprop = chr_get_target_prop(chr); f32 sqdist; bool holdturn; struct coord targetpos; @@ -9039,14 +9039,14 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi if (flags & ATTACKFLAG_DONTTURN) { holdturn = true; } else { - holdturn = chrHasLosToTarget(chr); + holdturn = chr_has_los_to_target(chr); } } else { holdturn = true; } if ((flags & ATTACKFLAG_AIMATTARGET) && targetprop->type == PROPTYPE_PLAYER) { - f32 eyeheight = g_Vars.players[playermgrGetPlayerNumByProp(targetprop)]->vv_eyeheight; + f32 eyeheight = g_Vars.players[playermgr_get_player_num_by_prop(targetprop)]->vv_eyeheight; targetpos.x = targetprop->pos.x; targetpos.y = targetprop->pos.y; @@ -9084,8 +9084,8 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi } else { struct coord chrpos; - modelGetRootPosition(chr->model, &chrpos); - chrGetAttackEntityPos(chr, flags, entityid, &targetpos, targetrooms); + model_get_root_position(chr->model, &chrpos); + chr_get_attack_entity_pos(chr, flags, entityid, &targetpos, targetrooms); sp178 = targetpos.x - chrpos.x; sp174 = targetpos.y - chrpos.y; @@ -9101,7 +9101,7 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi } if (holdturn) { - f32 aimangle = chrGetAimAngle(chr); + f32 aimangle = chr_get_aim_angle(chr); struct prop *gunprop; struct modelnode *posnode; struct model *gunmodel; @@ -9124,9 +9124,9 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi if (flags & ATTACKFLAG_AIMATTARGET) { if (firingright) { - gunprop = chrGetHeldProp(chr, HAND_RIGHT); + gunprop = chr_get_held_prop(chr, HAND_RIGHT); } else { - gunprop = chrGetHeldProp(chr, HAND_LEFT); + gunprop = chr_get_held_prop(chr, HAND_LEFT); } if (PLAYERCOUNT() == 1 @@ -9136,10 +9136,10 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi struct defaultobj *gun = gunprop->obj; gunmodel = gun->model; sp114 = 0; - burstnode = modelGetPart(gunmodel->definition, MODELPART_CHRGUN_GUNFIRE); + burstnode = model_get_part(gunmodel->definition, MODELPART_CHRGUN_GUNFIRE); if (burstnode) { - sp108 = modelFindNodeMtx(gunmodel, burstnode, 0); + sp108 = model_find_node_mtx(gunmodel, burstnode, 0); burstrodata = &burstnode->rodata->chrgunfire; spb4 = cam0f0b53a4((u8 *)sp108); @@ -9151,7 +9151,7 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi spb8.y = burstrodata->pos.y; spb8.z = burstrodata->pos.z; - mtx4TransformVecInPlace(&spc8, &spb8); + mtx4_transform_vec_in_place(&spc8, &spb8); sp114 = 1; sp118.x = spb8.x; @@ -9159,10 +9159,10 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi sp118.z = spb8.z; } } else { - posnode = modelGetPart(gunmodel->definition, MODELPART_CHRGUN_0001); + posnode = model_get_part(gunmodel->definition, MODELPART_CHRGUN_0001); if (posnode) { - spb0 = modelFindNodeMtx(gunmodel, posnode, 0); + spb0 = model_find_node_mtx(gunmodel, posnode, 0); sp6c = cam0f0b53a4((u8 *)spb0); if (sp6c) { @@ -9201,7 +9201,7 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi aimendsideback += M_BADTAU; } - chrrwdata = modelGetNodeRwData(chr->model, chr->model->definition->rootnode); + chrrwdata = model_get_node_rw_data(chr->model, chr->model->definition->rootnode); if (chrrwdata->unk5c > 0.0f) { aimendsideback -= chrrwdata->unk5c * chrrwdata->unk58; @@ -9220,7 +9220,7 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi && ((flags & (ATTACKFLAG_AIMONLY | ATTACKFLAG_DONTTURN)) == 0) && targetprop->type == PROPTYPE_PLAYER) { if (1); - aimendsideback += chrGetAimLimitAngle(sqdist) * 0.5f * sinf((((s32) (g_Vars.lvframe60 * chr->model->anim->playspeed) + chr->chrnum) % 60) * 0.10470308f); + aimendsideback += chr_get_aim_limit_angle(sqdist) * 0.5f * sinf((((s32) (g_Vars.lvframe60 * chr->model->anim->playspeed) + chr->chrnum) % 60) * 0.10470308f); if (aimendsideback < 0.0f) { aimendsideback += M_BADTAU; @@ -9259,7 +9259,7 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi } } - chrCalculateAimEndProperties(chr, animcfg, firingleft, firingright, shootrotx); + chr_calculate_aim_end_properties(chr, animcfg, firingleft, firingright, shootrotx); chr->aimendsideback = aimendsideback; chr->aimendcount = 10; @@ -9267,7 +9267,7 @@ bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, bool fi return result; } -void chrCalculateAimEndProperties(struct chrdata *chr, struct attackanimconfig *animcfg, bool firingleft, bool firingright, f32 shootrotx) +void chr_calculate_aim_end_properties(struct chrdata *chr, struct attackanimconfig *animcfg, bool firingleft, bool firingright, f32 shootrotx) { f32 aimfreeshoulder = 0; f32 aimendback = 0; @@ -9305,7 +9305,7 @@ void chrCalculateAimEndProperties(struct chrdata *chr, struct attackanimconfig * chr->aimendback = aimendback; } -void chrResetAimEndProperties(struct chrdata *chr) +void chr_reset_aim_end_properties(struct chrdata *chr) { chr->aimendcount = 10; chr->aimendrshoulder = 0; @@ -9314,44 +9314,44 @@ void chrResetAimEndProperties(struct chrdata *chr) chr->aimendsideback = 0; } -void chrSetFiring(struct chrdata *chr, s32 hand, bool firing) +void chr_set_firing(struct chrdata *chr, s32 hand, bool firing) { - struct prop *prop = chrGetHeldProp(chr, hand); + struct prop *prop = chr_get_held_prop(chr, hand); chr->prop->forcetick = firing ? true : false; if (prop) { - weaponSetGunfireVisible(prop, firing, chr->prop->rooms[0]); + weapon_set_gunfire_visible(prop, firing, chr->prop->rooms[0]); } } -bool chrIsGunfireVisible(struct chrdata *chr, s32 hand) +bool chr_is_gunfire_visible(struct chrdata *chr, s32 hand) { - struct prop *prop = chrGetHeldProp(chr, hand); + struct prop *prop = chr_get_held_prop(chr, hand); if (prop) { - return weaponIsGunfireVisible(prop); + return weapon_is_gunfire_visible(prop); } return false; } -void chrStopFiring(struct chrdata *chr) +void chr_stop_firing(struct chrdata *chr) { u8 race = CHRRACE(chr); if (race != RACE_DRCAROLL && race != RACE_EYESPY && chr->aibot == NULL) { - chrSetFiring(chr, HAND_RIGHT, false); - chrSetFiring(chr, HAND_LEFT, false); + chr_set_firing(chr, HAND_RIGHT, false); + chr_set_firing(chr, HAND_LEFT, false); - chrResetAimEndProperties(chr); + chr_reset_aim_end_properties(chr); - chr->fireslots[0] = bgunFreeFireslot(chr->fireslots[0]); - chr->fireslots[1] = bgunFreeFireslot(chr->fireslots[1]); + chr->fireslots[0] = bgun_free_fireslot(chr->fireslots[0]); + chr->fireslots[1] = bgun_free_fireslot(chr->fireslots[1]); } } -void chrSetHandFiring(struct chrdata *chr, s32 hand, bool firing) +void chr_set_hand_firing(struct chrdata *chr, s32 hand, bool firing) { if (firing) { if (hand == HAND_LEFT) { @@ -9368,11 +9368,11 @@ void chrSetHandFiring(struct chrdata *chr, s32 hand, bool firing) } if (!firing) { - chrSetFiring(chr, hand, false); + chr_set_firing(chr, hand, false); } } -f32 chrGetAimLimitAngle(f32 sqdist) +f32 chr_get_aim_limit_angle(f32 sqdist) { if (sqdist > 1600 * 1600) { return 0.018752790987492f; @@ -9405,7 +9405,7 @@ f32 chrGetAimLimitAngle(f32 sqdist) * is within range, and writes to the hit argument to indicate if the target is * being hit or not. */ -void chrCalculateHit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gset *gset) +void chr_calculate_hit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gset *gset) { struct prop *prop; struct prop *target; @@ -9426,18 +9426,18 @@ void chrCalculateHit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gs // Check that the chr's aim angle is within an acceptable range to their // target. prop = chr->prop; - target = chrGetTargetProp(chr); + target = chr_get_target_prop(chr); xdist = target->pos.x - prop->pos.x; ydist = target->pos.y - prop->pos.y; zdist = target->pos.z - prop->pos.z; angletotarget = atan2f(xdist, zdist); - angleaiming = chrGetAimAngle(chr); + angleaiming = chr_get_aim_angle(chr); anglediff = angletotarget - angleaiming; sqdist = xdist * xdist + ydist * ydist + zdist * zdist; - limitangle = chrGetAimLimitAngle(sqdist); + limitangle = chr_get_aim_limit_angle(sqdist); if (anglediff < 0) { anglediff += M_BADTAU; @@ -9523,10 +9523,10 @@ void chrCalculateHit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gs } // Apply PD mode enemy accuracy setting (default 1 which is no op) - if (pdmodeGetEnemyAccuracy() <= 1) { - accuracy *= pdmodeGetEnemyAccuracy(); + if (pdmode_get_enemy_accuracy() <= 1) { + accuracy *= pdmode_get_enemy_accuracy(); } else { - accuracy *= 9 / (10.001f - pdmodeGetEnemyAccuracy()); + accuracy *= 9 / (10.001f - pdmode_get_enemy_accuracy()); } // Apply difficulty multiplier (solo A = 0.6, SA = 0.8, PA = 1.175) @@ -9534,7 +9534,7 @@ void chrCalculateHit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gs // If the weapon fires more than once per tick, double the value to // account for it. No weapons meet this criteria, however. - if (weaponGetNumTicksPerShot(gset->weaponnum, gset->weaponfunc) <= 0) { + if (weapon_get_num_ticks_per_shot(gset->weaponnum, gset->weaponfunc) <= 0) { accuracy += accuracy; } @@ -9562,9 +9562,9 @@ void chrCalculateHit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gs * * If the chr's gun is off screen, return false without populating gunpos. */ -bool chrGetGunPos(struct chrdata *chr, s32 handnum, struct coord *gunpos) +bool chr_get_gun_pos(struct chrdata *chr, s32 handnum, struct coord *gunpos) { - struct prop *weaponprop = chrGetHeldProp(chr, handnum); + struct prop *weaponprop = chr_get_held_prop(chr, handnum); struct defaultobj *obj; struct model *model; bool result = false; @@ -9581,21 +9581,21 @@ bool chrGetGunPos(struct chrdata *chr, s32 handnum, struct coord *gunpos) model = obj->model; if ((chr->prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) && (weaponprop->flags & PROPFLAG_ONTHISSCREENTHISTICK)) { - if ((part0 = modelGetPart(model->definition, MODELPART_0000))) { - spac = modelFindNodeMtx(model, part0, 0); + if ((part0 = model_get_part(model->definition, MODELPART_0000))) { + spac = model_find_node_mtx(model, part0, 0); rodata = &part0->rodata->chrgunfire; gunpos->x = rodata->pos.x; gunpos->y = rodata->pos.y; gunpos->z = rodata->pos.z; - mtx00015be4(camGetProjectionMtxF(), spac, &sp6c); - mtx4TransformVecInPlace(&sp6c, gunpos); + mtx00015be4(cam_get_projection_mtxf(), spac, &sp6c); + mtx4_transform_vec_in_place(&sp6c, gunpos); result = true; - } else if ((part1 = modelGetPart(model->definition, MODELPART_0001))) { - sp64 = modelFindNodeMtx(model, part1, 0); + } else if ((part1 = model_get_part(model->definition, MODELPART_0001))) { + sp64 = model_find_node_mtx(model, part1, 0); - mtx00015be4(camGetProjectionMtxF(), sp64, &sp24); + mtx00015be4(cam_get_projection_mtxf(), sp64, &sp24); gunpos->x = sp24.m[3][0]; gunpos->y = sp24.m[3][1]; @@ -9622,7 +9622,7 @@ bool chrGetGunPos(struct chrdata *chr, s32 handnum, struct coord *gunpos) * sideptr - will be populated with an index in the range 0-5 which * represents which side of the node's bounding box was hit. */ -void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord *vector, +void chr_calculate_shield_hit(struct chrdata *chr, struct coord *pos, struct coord *vector, struct modelnode **nodeptr, s32 *hitpartptr, struct model **modelptr, s32 *sideptr) { u32 stack1; @@ -9647,22 +9647,22 @@ void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord f32 sides[6]; u32 stack3; - if (prop->type != PROPTYPE_PLAYER || g_Vars.normmplayerisrunning || chrGetShield(chr) > 0) { + if (prop->type != PROPTYPE_PLAYER || g_Vars.normmplayerisrunning || chr_get_shield(chr) > 0) { if (prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) { bestnode = NULL; bestvolume = MAXFLOAT; worldtoscreenmtx = cam0f0b5050((u8 *)chr->model->matrices); if (worldtoscreenmtx) { - mtx4TransformVec(worldtoscreenmtx, pos, &sp124); - mtx4RotateVec(worldtoscreenmtx, vector, &sp118); + mtx4_transform_vec(worldtoscreenmtx, pos, &sp124); + mtx4_rotate_vec(worldtoscreenmtx, vector, &sp118); - isdifferentmtx = (camGetWorldToScreenMtxf() != worldtoscreenmtx); + isdifferentmtx = (cam_get_world_to_screen_mtxf() != worldtoscreenmtx); node = chr->model->definition->rootnode; while (node) { if ((node->type & 0xff) == MODELNODETYPE_BBOX) { - mtxptr1 = modelFindNodeMtx(chr->model, node, 0); + mtxptr1 = model_find_node_mtx(chr->model, node, 0); if (isdifferentmtx) { mtx00016798(mtxptr1, &spc8); @@ -9710,7 +9710,7 @@ void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord *modelptr = chr->model; *sideptr = 0; - mtxptr2 = modelFindNodeMtx(chr->model, bestnode, 0); + mtxptr2 = model_find_node_mtx(chr->model, bestnode, 0); if (isdifferentmtx) { mtx00016798(mtxptr2, &sp48); @@ -9781,7 +9781,7 @@ void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord /** * Calculates the trajectory for thrown items. */ -void chrCalculateTrajectory(struct coord *frompos, f32 arg1, struct coord *aimpos, struct coord *arg3) +void chr_calculate_trajectory(struct coord *frompos, f32 arg1, struct coord *aimpos, struct coord *arg3) { f32 xvel; f32 yvel; @@ -9838,7 +9838,7 @@ const char var7f1a8ae4[] = "aimadjust=%d"; * This should be called on every frame while the chr is shooting. * The function takes care of the gun's fire rate. */ -void chrTickShoot(struct chrdata *chr, s32 handnum) +void chr_tick_shoot(struct chrdata *chr, s32 handnum) { struct prop *chrprop = chr->prop; struct prop *gunprop; @@ -9849,13 +9849,13 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) isaibot = true; } - gunprop = chrGetHeldProp(chr, handnum); + gunprop = chr_get_held_prop(chr, handnum); if (gunprop) { bool firingthisframe = false; struct weaponobj *weapon = gunprop->weapon; struct gset gset; - struct prop *targetprop = chrGetTargetProp(chr); + struct prop *targetprop = chr_get_target_prop(chr); u32 attackflags; bool shotdue; bool makebeam; @@ -9886,7 +9886,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) // The chr's firecount property tracks how many ticks have elapsed since // the last bullet, which is used to determine if another bullet should // be discharged on this tick. - tickspershot = weaponGetNumTicksPerShot(gset.weaponnum, gset.weaponfunc); + tickspershot = weapon_get_num_ticks_per_shot(gset.weaponnum, gset.weaponfunc); if (tickspershot <= 0) { shotdue = true; @@ -9912,7 +9912,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) } if (chr->actiontype == ACT_ATTACK) { - if (modelGetAnimNum(chr->model) == ANIM_SNIPING_ONGROUND) { + if (model_get_anim_num(chr->model) == ANIM_SNIPING_ONGROUND) { chr->act_attack.numshots++; } } @@ -9920,13 +9920,13 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) } if (shotdue) { - f32 roty = chrGetAimAngle(chr); - f32 rotx = chrGetPitchAngle(chr); + f32 roty = chr_get_aim_angle(chr); + f32 rotx = chr_get_pitch_angle(chr); bool extracdtypes = isaibot ? CDTYPE_PLAYERS : 0; firingthisframe = true; - if (!chrGetGunPos(chr, handnum, &gunpos)) { + if (!chr_get_gun_pos(chr, handnum, &gunpos)) { // Gun is off screen - use a quick but inexact calculation gunpos.x = chrprop->pos.x; gunpos.y = chrprop->pos.y + 30; @@ -9945,15 +9945,15 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) // as another chr or a closed door. If they are, the shot won't be // taken because that wouldn't be fair. // How nice of the developers to check for this! - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); - if (cdTestLos10(&chrprop->pos, chrprop->rooms, &gunpos, gunrooms, + if (cd_test_los10(&chrprop->pos, chrprop->rooms, &gunpos, gunrooms, CDTYPE_DOORS | CDTYPE_CHRS | CDTYPE_BG | CDTYPE_DOORSWITHOUTFLAG | extracdtypes, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { firingthisframe = false; } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); if (firingthisframe) { bool angleok = false; @@ -9970,7 +9970,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) ? CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_CHRS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_DOORSWITHOUTFLAG | CDTYPE_PLAYERS : CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_CHRS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_DOORSWITHOUTFLAG; u32 stack; - bool isshootingeyespy = CHRRACE(targetprop->chr) == RACE_EYESPY && chrGetDistanceToTarget(chr) > 150; + bool isshootingeyespy = CHRRACE(targetprop->chr) == RACE_EYESPY && chr_get_distance_to_target(chr) > 150; bool fudgeforeyespy = false; if (isshootingeyespy) { @@ -9979,16 +9979,16 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) vector.z = targetprop->pos.z - gunpos.z; guNormalize(&vector.x, &vector.y, &vector.z); - propSetPerimEnabled(targetprop, true); + prop_set_perim_enabled(targetprop, true); } else { vector.x = cosf(rotx) * sinf(roty); vector.y = sinf(rotx); vector.z = cosf(rotx) * cosf(roty); if (isaibot) { - bgunCalculateBotShotSpread(&vector, + bgun_calculate_bot_shot_spread(&vector, chr->aibot->weaponnum, chr->aibot->gunfunc, - chr->aibot->burstsdone[handnum], botGuessCrouchPos(chr), + chr->aibot->burstsdone[handnum], bot_guess_crouch_pos(chr), chr->weapons_held[0] && chr->weapons_held[1]); } } @@ -9999,7 +9999,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) makebeam = true; // This function can never return 2 though... - if (botactShootFarsight(chr + zero, 0, &vector, &gunpos) == 2) { + if (botact_shoot_farsight(chr + zero, 0, &vector, &gunpos) == 2) { normalshoot = random() % 255 > 200; } } @@ -10009,27 +10009,27 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) hitpos.y = gunpos.y + vector.y * 65536.0f; hitpos.z = gunpos.z + vector.z * 65536.0f; - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); if (isaibot) { g_Vars.useperimshoot = true; } - if (cdExamLos08(&gunpos, gunrooms, &hitpos, cdtypes, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { + if (cd_exam_los08(&gunpos, gunrooms, &hitpos, cdtypes, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { hitsomething = true; #if VERSION >= VERSION_JPN_FINAL - cdGetPos(&hitpos, 12080, "chr/chraction.c"); + cd_get_pos(&hitpos, 12080, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetPos(&hitpos, 12077, "chr/chraction.c"); + cd_get_pos(&hitpos, 12077, "chr/chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&hitpos, 12072, "chraction.c"); + cd_get_pos(&hitpos, 12072, "chraction.c"); #else - cdGetPos(&hitpos, 12086, "chraction.c"); + cd_get_pos(&hitpos, 12086, "chraction.c"); #endif - hitprop = cdGetObstacleProp(); + hitprop = cd_get_obstacle_prop(); } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); if (isaibot) { g_Vars.useperimshoot = false; @@ -10073,7 +10073,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) struct coord sp15c; Mtxf projectilemtx; Mtxf yrotmtx; - struct weapon *weapondef = weaponFindById(gset.weaponnum); + struct weapon *weapondef = weapon_find_by_id(gset.weaponnum); struct weaponfunc_shootprojectile *func = weapondef->functions[gset.weaponfunc]; // Handle creating the projectile @@ -10086,28 +10086,28 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) rocketweaponnum = WEAPON_HOMINGROCKET; } - projectileobj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, rocketweaponnum, chr); + projectileobj = weapon_create_projectile_from_weapon_num(func->projectilemodelnum, rocketweaponnum, chr); } else if (gset.weaponnum == WEAPON_CROSSBOW) { - projectileobj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, WEAPON_BOLT, chr); + projectileobj = weapon_create_projectile_from_weapon_num(func->projectilemodelnum, WEAPON_BOLT, chr); if (projectileobj) { projectileobj->gunfunc = gset.weaponfunc; } } else if (gset.weaponnum == WEAPON_DEVASTATOR) { - projectileobj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, WEAPON_GRENADEROUND, chr); + projectileobj = weapon_create_projectile_from_weapon_num(func->projectilemodelnum, WEAPON_GRENADEROUND, chr); if (projectileobj) { projectileobj->gunfunc = gset.weaponfunc; } } else if (gset.weaponnum == WEAPON_SUPERDRAGON) { - projectileobj = weaponCreateProjectileFromWeaponNum(func->projectilemodelnum, WEAPON_GRENADEROUND, chr); + projectileobj = weapon_create_projectile_from_weapon_num(func->projectilemodelnum, WEAPON_GRENADEROUND, chr); if (projectileobj) { projectileobj->gunfunc = FUNC_2; } } else { // Unreachable - projectileobj = weaponCreateProjectileFromGset(func->projectilemodelnum, &gset, g_Vars.currentplayer->prop->chr); + projectileobj = weapon_create_projectile_from_gset(func->projectilemodelnum, &gset, g_Vars.currentplayer->prop->chr); } if (projectileobj) { @@ -10118,7 +10118,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) // AI bots are a bit smarter than solo chrs // with regard to how they aim their projectiles - if (isaibot && chrIsTargetInFov(chr, 30, 0)) { + if (isaibot && chr_is_target_in_fov(chr, 30, 0)) { bool hasaimpos = false; u32 stack; struct coord aimpos; @@ -10148,7 +10148,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) aimpos.y = targetprop->chr->manground; aimpos.z = targetprop->pos.z; - chrCalculateTrajectory(&gunpos, spcc, &aimpos, &vector); + chr_calculate_trajectory(&gunpos, spcc, &aimpos, &vector); hasaimpos = true; } } else if ((gset.weaponnum == WEAPON_DEVASTATOR && gset.weaponfunc == FUNC_SECONDARY) @@ -10162,12 +10162,12 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) aimpos.y -= 25; } - chrCalculateTrajectory(&gunpos, spcc, &aimpos, &vector); + chr_calculate_trajectory(&gunpos, spcc, &aimpos, &vector); hasaimpos = true; } if (hasaimpos) { - f32 angle = chrGetAngleToPos(chr, &aimpos); + f32 angle = chr_get_angle_to_pos(chr, &aimpos); f32 cos = cosf(angle); f32 sin = sinf(angle); f32 x = vector.f[0]; @@ -10181,9 +10181,9 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) // Calculate and projectile's matrix, // spawn position and speed - mtx4LoadIdentity(&identmtx); - mtx4LoadXRotation(rotx, &projectilemtx); - mtx4LoadYRotation(roty, &yrotmtx); + mtx4_load_identity(&identmtx); + mtx4_load_x_rotation(rotx, &projectilemtx); + mtx4_load_y_rotation(roty, &yrotmtx); mtx00015be0(&yrotmtx, &projectilemtx); sp15c.x = vector.x * sp168; @@ -10221,11 +10221,11 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) projectileobj->base.projectile->unk08c = func->reflectangle; projectileobj->base.projectile->unk098 = func->unk50 * (1.0f / 0.6f); - projectileobj->base.projectile->targetprop = chrGetTargetProp(chr); + projectileobj->base.projectile->targetprop = chr_get_target_prop(chr); // Play sound if (func->soundnum > 0) { - psCreate(NULL, projectileobj->base.prop, func->soundnum, -1, + ps_create(NULL, projectileobj->base.prop, func->soundnum, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); } } @@ -10244,9 +10244,9 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) if (!isaibot) { if ((attackflags & ATTACKFLAG_AIMATTARGET) && targetprop->type == PROPTYPE_PLAYER - && chrHasLosToAttackTarget(chr, &gunpos, gunrooms, false) + && chr_has_los_to_attack_target(chr, &gunpos, gunrooms, false) #if VERSION >= VERSION_NTSC_1_0 - && chrCompareTeams(targetprop->chr, chr, COMPARE_ENEMIES) + && chr_compare_teams(targetprop->chr, chr, COMPARE_ENEMIES) #endif ) { // Solo chr shooting at a player @@ -10256,7 +10256,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) if (xdiff * xdiff + ydiff * ydiff + zdiff * zdiff <= sqshotdist) { // Player has a chance of being hit - chrCalculateHit(chr, &angleok, &hitplayer, &gset); + chr_calculate_hit(chr, &angleok, &hitplayer, &gset); // If the player was hit then turn off effective // (There's no need to check other props for @@ -10284,7 +10284,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) } if (hitplayer) { - f32 damage = gsetGetDamage(&gset); + f32 damage = gset_get_damage(&gset); struct modelnode *node = NULL; struct model *model = NULL; s32 side = -1; @@ -10301,10 +10301,10 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) hitpos.y -= 2 + random() % 10; } - bgunPlayPropHitSound(&gset, targetprop, -1); + bgun_play_prop_hit_sound(&gset, targetprop, -1); - if (targetchr->model && chrGetShield(targetchr) > 0) { - chrCalculateShieldHit(targetchr, &hitpos, &vector, &node, &hitpart, &model, &side); + if (targetchr->model && chr_get_shield(targetchr) > 0) { + chr_calculate_shield_hit(targetchr, &hitpos, &vector, &node, &hitpart, &model, &side); } func0f0341dc(targetchr, damage, &vector, &gset, chr->prop, HITPART_GENERAL, targetprop, node, model, side, NULL); @@ -10324,21 +10324,21 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) // were aiming for if (isaibot || fudgeforeyespy - || ((chr->chrflags & CHRCFLAG_NOFRIENDLYFIRE) && chrCompareTeams(hitprop->chr, chr, COMPARE_ENEMIES))) { + || ((chr->chrflags & CHRCFLAG_NOFRIENDLYFIRE) && chr_compare_teams(hitprop->chr, chr, COMPARE_ENEMIES))) { struct modelnode *node = NULL; struct model *model = NULL; s32 side = -1; s32 hitpart = HITPART_GENERAL; - f32 damage = gsetGetDamage(&gset); + f32 damage = gset_get_damage(&gset); struct chrdata *hitchr = hitprop->chr; - bgunPlayPropHitSound(&gset, hitprop, -1); + bgun_play_prop_hit_sound(&gset, hitprop, -1); - if (hitchr->model && chrGetShield(hitchr) > 0) { - chrCalculateShieldHit(hitchr, &hitpos, &vector, &node, &hitpart, &model, &side); + if (hitchr->model && chr_get_shield(hitchr) > 0) { + chr_calculate_shield_hit(hitchr, &hitpos, &vector, &node, &hitpart, &model, &side); } - chrEmitSparks(hitchr, hitprop, hitpart, &hitpos, &vector, chr); + chr_emit_sparks(hitchr, hitprop, hitpart, &hitpos, &vector, chr); func0f0341dc(hitchr, damage, &vector, &gset, chr->prop, HITPART_GENERAL, hitprop, node, model, side, NULL); } else { makebeam = false; @@ -10352,54 +10352,54 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) s32 playernum = -1; if (g_Vars.mplayerisrunning) { - playernum = mpPlayerGetIndex(chr); + playernum = mp_player_get_index(chr); } - bgunPlayPropHitSound(&gset, hitprop, -1); + bgun_play_prop_hit_sound(&gset, hitprop, -1); func0f065e74(&gunpos, gunrooms, &hitpos, hitrooms); queriedhitrooms = true; - if (chrIsUsingPaintball(chr)) { - sparksCreate(hitrooms[0], hitprop, &hitpos, NULL, NULL, SPARKTYPE_PAINT); + if (chr_is_using_paintball(chr)) { + sparks_create(hitrooms[0], hitprop, &hitpos, NULL, NULL, SPARKTYPE_PAINT); } else { - sparksCreate(hitrooms[0], hitprop, &hitpos, NULL, NULL, SPARKTYPE_DEFAULT); + sparks_create(hitrooms[0], hitprop, &hitpos, NULL, NULL, SPARKTYPE_DEFAULT); } if (g_MissionConfig.iscoop && chr->team == TEAM_ALLY && (hitobj->flags2 & OBJFLAG2_IMMUNETOANTI)) { // Co-op can't damage mission critical objects } else { - objTakeGunfire(hitobj, gsetGetDamage(&gset), &hitpos, gset.weaponnum, playernum); + obj_take_gunfire(hitobj, gset_get_damage(&gset), &hitpos, gset.weaponnum, playernum); } } } else if (hitsomething) { // Hit the background func0f065e74(&gunpos, gunrooms, &hitpos, hitrooms); queriedhitrooms = true; - bgunPlayBgHitSound(&gset, &hitpos, -1, hitrooms); + bgun_play_bg_hit_sound(&gset, &hitpos, -1, hitrooms); - if (chrIsUsingPaintball(chr)) { - sparksCreate(hitrooms[0], 0, &hitpos, NULL, NULL, SPARKTYPE_PAINT); + if (chr_is_using_paintball(chr)) { + sparks_create(hitrooms[0], 0, &hitpos, NULL, NULL, SPARKTYPE_PAINT); } else { - sparksCreate(hitrooms[0], 0, &hitpos, NULL, NULL, SPARKTYPE_DEFAULT); + sparks_create(hitrooms[0], 0, &hitpos, NULL, NULL, SPARKTYPE_DEFAULT); } } // Create explosion if using Phoenix if (gset.weaponnum == WEAPON_PHOENIX && gset.weaponfunc == FUNC_SECONDARY) { - s32 playernum = chr->aibot ? mpPlayerGetIndex(chr) : g_Vars.currentplayernum; + s32 playernum = chr->aibot ? mp_player_get_index(chr) : g_Vars.currentplayernum; if (!queriedhitrooms) { func0f065e74(&gunpos, gunrooms, &hitpos, hitrooms); } - explosionCreateSimple(NULL, &hitpos, hitrooms, EXPLOSIONTYPE_PHOENIX, playernum); + explosion_create_simple(NULL, &hitpos, hitrooms, EXPLOSIONTYPE_PHOENIX, playernum); } } } if (isshootingeyespy) { - propSetPerimEnabled(targetprop, false); + prop_set_perim_enabled(targetprop, false); } } } @@ -10452,7 +10452,7 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) osSyncPrintf("on"); osSyncPrintf("off"); - chrUpdateFireslot(chr, handnum, firingthisframe, firingthisframe && makebeam, &gunpos, &hitpos); + chr_update_fireslot(chr, handnum, firingthisframe, firingthisframe && makebeam, &gunpos, &hitpos); if (isaibot) { if (firingthisframe) { @@ -10465,9 +10465,9 @@ void chrTickShoot(struct chrdata *chr, s32 handnum) osSyncPrintf("numshots(%d) = %d", handnum, chr->aibot->loadedammo[handnum]); } - chrSetFiring(chr, handnum, firingthisframe && normalshoot); + chr_set_firing(chr, handnum, firingthisframe && normalshoot); } else { - chrSetFiring(chr, handnum, firingthisframe); + chr_set_firing(chr, handnum, firingthisframe); } } } @@ -10483,8 +10483,8 @@ void func0f041a74(struct chrdata *chr) if (chr->actiontype == ACT_ROBOTATTACK) { if (chr->act_robotattack.firing[0]) { chr->prop->forcetick = true; - projectileCreate(chr->prop, chr->unk348[0], &chr->act_robotattack.pos[0], - &chr->act_robotattack.dir[0], chr->act_robotattack.guntype[0], chrGetTargetProp(chr)); + projectile_create(chr->prop, chr->unk348[0], &chr->act_robotattack.pos[0], + &chr->act_robotattack.dir[0], chr->act_robotattack.guntype[0], chr_get_target_prop(chr)); chr->unk348[1]->unk08 = g_Vars.lvframe60 + 2; chr->unk348[1]->unk14 = chr->unk348[0]->unk14; } else { @@ -10493,28 +10493,28 @@ void func0f041a74(struct chrdata *chr) if (chr->act_robotattack.firing[1]) { chr->prop->forcetick = true; - projectileCreate(chr->prop, chr->unk348[1], &chr->act_robotattack.pos[1], - &chr->act_robotattack.dir[1], chr->act_robotattack.guntype[1], chrGetTargetProp(chr)); + projectile_create(chr->prop, chr->unk348[1], &chr->act_robotattack.pos[1], + &chr->act_robotattack.dir[1], chr->act_robotattack.guntype[1], chr_get_target_prop(chr)); chr->unk348[0]->unk14 = chr->unk348[1]->unk14; } else { chr->prop->forcetick = false; } - beamTick(chr->unk348[0]->beam); - beamTick(chr->unk348[1]->beam); + beam_tick(chr->unk348[0]->beam); + beam_tick(chr->unk348[1]->beam); } else if (chr->actiontype == ACT_ATTACKAMOUNT) { if (chr->act_attack.numshots < chr->act_attack.maxshots && (chr->hidden & CHRHFLAG_FIRINGRIGHT)) { - chrTickShoot(chr, HAND_RIGHT); + chr_tick_shoot(chr, HAND_RIGHT); } } else { if (chr->hidden & CHRHFLAG_FIRINGRIGHT) { - chrTickShoot(chr, HAND_RIGHT); + chr_tick_shoot(chr, HAND_RIGHT); chr->hidden &= ~CHRHFLAG_FIRINGRIGHT; } if (chr->hidden & CHRHFLAG_FIRINGLEFT) { - chrTickShoot(chr, HAND_LEFT); + chr_tick_shoot(chr, HAND_LEFT); chr->hidden &= ~CHRHFLAG_FIRINGLEFT; } } @@ -10532,10 +10532,10 @@ bool func0f041c44(struct chrdata *chr) chr->act_attack.animcfg = animcfg; chr->sleep = 0; - modelSetAnimation(model, animcfg->animnum, flip, animcfg->unk1c, chrGetRangedSpeed(chr, 0.7f, 1.12f), 22); + model_set_animation(model, animcfg->animnum, flip, animcfg->unk1c, chr_get_ranged_speed(chr, 0.7f, 1.12f), 22); if (animcfg->unk14 >= 0) { - modelSetAnimEndFrame(model, animcfg->unk14); + model_set_anim_end_frame(model, animcfg->unk14); } return true; @@ -10545,38 +10545,38 @@ bool func0f041c44(struct chrdata *chr) return false; } -void chrAttackAmountUpdateAnimation(struct chrdata *chr) +void chr_attack_amount_update_animation(struct chrdata *chr) { struct model *model = chr->model; if (chr->act_attack.animcfg->unk24 > 0) { - modelSetAnimation(model, - modelGetAnimNum(model), + model_set_animation(model, + model_get_anim_num(model), model->anim->flip, chr->act_attack.animcfg->unk24, - chrGetRangedSpeed(chr, 0.5f, 0.8f), + chr_get_ranged_speed(chr, 0.5f, 0.8f), 8); } else { - modelSetAnimation(model, - modelGetAnimNum(model), + model_set_animation(model, + model_get_anim_num(model), model->anim->flip, chr->act_attack.animcfg->unk1c, - chrGetRangedSpeed(chr, 0.5f, 0.8f), + chr_get_ranged_speed(chr, 0.5f, 0.8f), 8); } if (chr->act_attack.animcfg->unk14 >= 0) { - modelSetAnimEndFrame(model, chr->act_attack.animcfg->unk14); + model_set_anim_end_frame(model, chr->act_attack.animcfg->unk14); } } -void chrTickFire(struct chrdata *chr) +void chr_tick_fire(struct chrdata *chr) { struct model *model = chr->model; - f32 curframe = modelGetCurAnimFrame(model); + f32 curframe = model_get_cur_anim_frame(model); s32 i; - if (modelGetAnimNum(model) == ANIM_SNIPING_GETDOWN) { + if (model_get_anim_num(model) == ANIM_SNIPING_GETDOWN) { return; } @@ -10587,36 +10587,36 @@ void chrTickFire(struct chrdata *chr) && (chr->act_attack.animcfg->unk24 < 0 || curframe < chr->act_attack.animcfg->unk24)) { if (!chr->act_attack.dorecoil) { if (!func0f041c44(chr)) { - modelSetAnimation(model, modelGetAnimNum(model), model->anim->flip, - chr->act_attack.animcfg->unk1c, chrGetRangedSpeed(chr, 0.5f, 0.8f), 8); + model_set_animation(model, model_get_anim_num(model), model->anim->flip, + chr->act_attack.animcfg->unk1c, chr_get_ranged_speed(chr, 0.5f, 0.8f), 8); if (chr->act_attack.animcfg->unk14 >= 0) { - modelSetAnimEndFrame(model, chr->act_attack.animcfg->unk14); + model_set_anim_end_frame(model, chr->act_attack.animcfg->unk14); } } } else { - chrAttackAmountUpdateAnimation(chr); + chr_attack_amount_update_animation(chr); } chr->act_attack.numshots = chr->act_attack.maxshots + 1; - curframe = modelGetCurAnimFrame(model); + curframe = model_get_cur_anim_frame(model); } - if (curframe >= modelGetAnimEndFrame(model)) { - if (modelGetAnimNum(model) != ANIM_SNIPING_ONGROUND + if (curframe >= model_get_anim_end_frame(model)) { + if (model_get_anim_num(model) != ANIM_SNIPING_ONGROUND && (chr->act_attack.dooneburst || chr->act_attack.numshots > chr->act_attack.maxshots)) { if (!func0f041c44(chr)) { if (chr->act_attack.flags & ATTACKFLAG_AIMATTARGET) { - chrRecordLastSeeTargetTime(chr); + chr_record_last_see_target_time(chr); } - chrStop(chr); + chr_stop(chr); return; } } else if (chr->act_attack.numshots == chr->act_attack.maxshots) { chr->act_attack.numshots++; - chrAttackAmountUpdateAnimation(chr); + chr_attack_amount_update_animation(chr); } else if (chr->act_attack.fired) { f32 f2 = 0.5f; f32 startframe; @@ -10659,41 +10659,41 @@ void chrTickFire(struct chrdata *chr) chr->act_attack.fired = false; - modelSetAnimation(model, modelGetAnimNum(model), model->anim->flip, startframe, f2, 8); - modelSetAnimEndFrame(model, endframe); + model_set_animation(model, model_get_anim_num(model), model->anim->flip, startframe, f2, 8); + model_set_anim_end_frame(model, endframe); } - curframe = modelGetCurAnimFrame(model); + curframe = model_get_cur_anim_frame(model); } - if (modelGetAnimNum(model) != ANIM_SNIPING_ONGROUND && (chr->act_attack.flags & ATTACKFLAG_DONTTURN) == 0) { + if (model_get_anim_num(model) != ANIM_SNIPING_ONGROUND && (chr->act_attack.flags & ATTACKFLAG_DONTTURN) == 0) { f32 f2 = chr->act_attack.animcfg->unk0c; f32 f12 = chr->act_attack.animcfg->unk04; - if ((chr->act_attack.flags & ATTACKFLAG_AIMONLY) && f12 > modelGetAnimEndFrame(model)) { - f12 = modelGetAnimEndFrame(model); + if ((chr->act_attack.flags & ATTACKFLAG_AIMONLY) && f12 > model_get_anim_end_frame(model)) { + f12 = model_get_anim_end_frame(model); } if (model->anim->flip) { f2 = M_BADTAU - f2; } - chr->act_attack.turning = chrTurn(chr, chr->act_attack.turning, f12, chrGetRangedSpeed(chr, 1, 1.6f), f2); + chr->act_attack.turning = chr_turn(chr, chr->act_attack.turning, f12, chr_get_ranged_speed(chr, 1, 1.6f), f2); } if ((curframe > chr->act_attack.animcfg->unk28 && curframe < chr->act_attack.animcfg->unk2c) - || modelGetAnimNum(model) == ANIM_SNIPING_ONGROUND) { + || model_get_anim_num(model) == ANIM_SNIPING_ONGROUND) { func0f03e9f4(chr, chr->act_attack.animcfg, chr->act_attack.firegun[HAND_LEFT], chr->act_attack.firegun[HAND_RIGHT], 1); } else { - chrResetAimEndProperties(chr); + chr_reset_aim_end_properties(chr); } for (i = 0; i < 2; i++) { if (chr->act_attack.firegun[i]) { if (chr->act_attack.everytick[i] == 0) { - if (modelGetAnimNum(model) == ANIM_SNIPING_ONGROUND + if (model_get_anim_num(model) == ANIM_SNIPING_ONGROUND || (curframe >= chr->act_attack.animcfg->unk18 && curframe < chr->act_attack.animcfg->unk1c)) { - chrSetHandFiring(chr, i, true); + chr_set_hand_firing(chr, i, true); chr->act_attack.lastfire60 = g_Vars.lvframe60; @@ -10702,27 +10702,27 @@ void chrTickFire(struct chrdata *chr) if (f12 < 30) { if (chr->act_attack.pausecount >= TICKS(60) - (s32)(PAL ? f12 * (50.0f / 60.0f) : f12) * 2) { - modelSetAnimSpeed(model, 0.5f, 0); + model_set_anim_speed(model, 0.5f, 0); } else { - modelSetAnimSpeed(model, 0.1f, 0); + model_set_anim_speed(model, 0.1f, 0); chr->act_attack.pausecount += g_Vars.lvupdate60; } } else { - modelSetAnimSpeed(model, 0.5f, 0); + model_set_anim_speed(model, 0.5f, 0); } } else { - modelSetAnimSpeed(model, 0.5f, 0); + model_set_anim_speed(model, 0.5f, 0); } } else { - chrSetHandFiring(chr, i, false); + chr_set_hand_firing(chr, i, false); if (chr->actiontype == ACT_ATTACKROLL) { - modelSetAnimSpeed(model, chrGetRangedSpeed(chr, 0.5f, 0.8f), 0); + model_set_anim_speed(model, chr_get_ranged_speed(chr, 0.5f, 0.8f), 0); } else { - modelSetAnimSpeed(model, chrGetRangedSpeed(chr, 0.5f, 0.8f), 0); + model_set_anim_speed(model, chr_get_ranged_speed(chr, 0.5f, 0.8f), 0); } } - } else if (modelGetAnimNum(model) == ANIM_SNIPING_ONGROUND + } else if (model_get_anim_num(model) == ANIM_SNIPING_ONGROUND || ((!chr->act_attack.fired && (i == chr->act_attack.nextgun || !chr->act_attack.everytick[chr->act_attack.nextgun])) && ((chr->act_attack.animcfg->unk20 >= 0 && curframe >= chr->act_attack.animcfg->unk20 && curframe <= chr->act_attack.animcfg->unk24) || (chr->act_attack.animcfg->unk20 < 0 && curframe >= chr->act_attack.animcfg->unk18)))) { @@ -10731,30 +10731,30 @@ void chrTickFire(struct chrdata *chr) chr->act_attack.numshots++; chr->act_attack.lastfire60 = g_Vars.lvframe60; - chrSetHandFiring(chr, i, true); + chr_set_hand_firing(chr, i, true); } else { - chrSetHandFiring(chr, i, false); + chr_set_hand_firing(chr, i, false); } } else { - chrSetHandFiring(chr, i, false); + chr_set_hand_firing(chr, i, false); } } } -void chrTickAttackAmount(struct chrdata *chr) +void chr_tick_attack_amount(struct chrdata *chr) { struct model *model = chr->model; - f32 frame = modelGetCurAnimFrame(model); + f32 frame = model_get_cur_anim_frame(model); f32 unk0c = chr->act_attack.animcfg->unk0c; f32 unk04 = chr->act_attack.animcfg->unk04; - chrTurn(chr, 1, unk04, chrGetRangedSpeed(chr, 1, 1.6f), unk0c); + chr_turn(chr, 1, unk04, chr_get_ranged_speed(chr, 1, 1.6f), unk0c); if (frame > chr->act_attack.animcfg->unk28 && frame < chr->act_attack.animcfg->unk2c) { func0f03e9f4(chr, chr->act_attack.animcfg, false, true, 0.2f); } else { - chrResetAimEndProperties(chr); + chr_reset_aim_end_properties(chr); } if (frame >= chr->act_attack.animcfg->unk18 && chr->act_attack.dooneburst == false) { @@ -10763,13 +10763,13 @@ void chrTickAttackAmount(struct chrdata *chr) if (chr->act_attack.dooneburst) { if (chr->act_attack.numshots++ < chr->act_attack.maxshots) { - chrSetHandFiring(chr, HAND_RIGHT, true); + chr_set_hand_firing(chr, HAND_RIGHT, true); } else { - chrAttackAmountUpdateAnimation(chr); - chrSetHandFiring(chr, HAND_RIGHT, false); + chr_attack_amount_update_animation(chr); + chr_set_hand_firing(chr, HAND_RIGHT, false); } } else { - chrSetHandFiring(chr, HAND_RIGHT, false); + chr_set_hand_firing(chr, HAND_RIGHT, false); } } @@ -10779,7 +10779,7 @@ void chrTickAttackAmount(struct chrdata *chr) * There are two muzzles, left and right, which is specified using the `right` * argument. */ -void robotSetMuzzleFlash(struct chrdata *chr, bool right, bool visible) +void robot_set_muzzle_flash(struct chrdata *chr, bool right, bool visible) { struct modelnode *node; union modelrwdata *rwdata; @@ -10791,10 +10791,10 @@ void robotSetMuzzleFlash(struct chrdata *chr, bool right, bool visible) partnum = MODELPART_ROBOT_LGUNFIRE; } - node = modelGetPart(chr->model->definition, partnum); + node = model_get_part(chr->model->definition, partnum); if (node) { - rwdata = modelGetNodeRwData(chr->model, node); + rwdata = model_get_node_rw_data(chr->model, node); } if (rwdata) { @@ -10802,7 +10802,7 @@ void robotSetMuzzleFlash(struct chrdata *chr, bool right, bool visible) } } -void robotAttack(struct chrdata *chr) +void robot_attack(struct chrdata *chr) { u32 numshots = random() % 20; @@ -10815,7 +10815,7 @@ void robotAttack(struct chrdata *chr) chr->unk348[0]->unk08 = -1; chr->unk348[0]->unk0c = 0.85f; - if ((lvGetDifficulty() == DIFF_PA) * 0.2f) { + if ((lv_get_difficulty() == DIFF_PA) * 0.2f) { chr->unk348[0]->unk10 = 2.0f; } else { chr->unk348[0]->unk10 = 1.0f; @@ -10852,27 +10852,27 @@ void robotAttack(struct chrdata *chr) chr->act_robotattack.dir[1].y = 0.0f; chr->act_robotattack.dir[1].z = 0.0f; - chrChooseStandAnimation(chr, 16); + chr_choose_stand_animation(chr, 16); } } void func0f0429d8(struct chrdata *chr, f32 arg1, f32 arg2) { - struct prop *prop = chrGetTargetProp(chr); + struct prop *prop = chr_get_target_prop(chr); f32 distance = atan2f(prop->pos.x - chr->prop->pos.x, prop->pos.z - chr->prop->pos.z); - f32 value = modelTweenRotAxis(arg2, distance, arg1); - chrSetLookAngle(chr, value); + f32 value = model_tween_rot_axis(arg2, distance, arg1); + chr_set_look_angle(chr, value); } -void chrTickRobotAttack(struct chrdata *chr) +void chr_tick_robot_attack(struct chrdata *chr) { s32 i; f32 roty = 0.0f; f32 rotx = 0.0f; - struct prop *targetprop = chrGetTargetProp(chr); + struct prop *targetprop = chr_get_target_prop(chr); bool firing; bool empty; - f32 invtheta = chrGetInverseTheta(chr); + f32 invtheta = chr_get_inverse_theta(chr); struct act_robotattack *act = &chr->act_robotattack; func0f0429d8(chr, 0.085f, invtheta); @@ -10916,14 +10916,14 @@ void chrTickRobotAttack(struct chrdata *chr) Mtxf spa4; aimy = targetprop->pos.y - 20.0f; - rodata = modelGetPartRodata(chr->model->definition, (i ? MODELPART_ROBOT_0000 : MODELPART_ROBOT_0001)); + rodata = model_get_part_rodata(chr->model->definition, (i ? MODELPART_ROBOT_0000 : MODELPART_ROBOT_0001)); act->pos[i].x = rodata->position.pos.x; act->pos[i].y = rodata->position.pos.y - 300.0f; act->pos[i].z = rodata->position.pos.z; - mtx4LoadYRotation(invtheta, &spa4); - mtx4RotateVec(&spa4, &act->pos[i], &spe4); + mtx4_load_y_rotation(invtheta, &spa4); + mtx4_rotate_vec(&spa4, &act->pos[i], &spe4); spe4.x *= chr->model->scale; spe4.y *= chr->model->scale; @@ -10995,7 +10995,7 @@ void chrTickRobotAttack(struct chrdata *chr) act->dir[i].y = -sinf(gunrotx); act->dir[i].z = cosf(gunroty) * cosf(gunrotx); - robotSetMuzzleFlash(chr, i, true); + robot_set_muzzle_flash(chr, i, true); act->numshots[i]--; } @@ -11005,28 +11005,28 @@ void chrTickRobotAttack(struct chrdata *chr) } } -void chrTickAttack(struct chrdata *chr) +void chr_tick_attack(struct chrdata *chr) { struct model *model = chr->model; - f32 curframe = modelGetCurAnimFrame(model); + f32 curframe = model_get_cur_anim_frame(model); if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - modelSetAnimation(model, chr->act_attack.animcfg->animnum, chr->act_attack.flip, - chr->act_attack.animcfg->unk10, chrGetRangedSpeed(chr, 0.5f, 0.8f), 16); + model_set_animation(model, chr->act_attack.animcfg->animnum, chr->act_attack.flip, + chr->act_attack.animcfg->unk10, chr_get_ranged_speed(chr, 0.5f, 0.8f), 16); func0f031254(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } if (chr->act_attack.animcfg->animnum == ANIM_SNIPING_GETDOWN) { - if (curframe >= modelGetAnimEndFrame(model)) { + if (curframe >= model_get_anim_end_frame(model)) { chr->act_attack.animcfg = &g_SnipeAttackAnims[1]; - modelSetAnimation(model, chr->act_attack.animcfg->animnum, chr->act_attack.flip, - chr->act_attack.animcfg->unk10, chrGetRangedSpeed(chr, 0.5f, 0.8f), 16); + model_set_animation(model, chr->act_attack.animcfg->animnum, chr->act_attack.flip, + chr->act_attack.animcfg->unk10, chr_get_ranged_speed(chr, 0.5f, 0.8f), 16); } } @@ -11040,25 +11040,25 @@ void chrTickAttack(struct chrdata *chr) startframe = chr->act_attack.animcfg->unk1c; } - modelSetAnimation(model, modelGetAnimNum(model), model->anim->flip, startframe, chrGetRangedSpeed(chr, 0.5f, 0.8f), 16); + model_set_animation(model, model_get_anim_num(model), model->anim->flip, startframe, chr_get_ranged_speed(chr, 0.5f, 0.8f), 16); if (chr->act_attack.animcfg->unk14 >= 0) { - modelSetAnimEndFrame(model, chr->act_attack.animcfg->unk14); + model_set_anim_end_frame(model, chr->act_attack.animcfg->unk14); } chr->act_attack.reaim = 2; - chrResetAimEndProperties(chr); + chr_reset_aim_end_properties(chr); return; } if (chr->act_attack.reaim == 2) { - if (curframe >= modelGetAnimEndFrame(model)) { + if (curframe >= model_get_anim_end_frame(model)) { chr->act_attack.flags &= ~ATTACKFLAG_DONTTURN; if (chr->act_attack.standing) { - chrAttackStand(chr, chr->act_attack.flags, chr->act_attack.entityid); + chr_attack_stand(chr, chr->act_attack.flags, chr->act_attack.entityid); } else { - chrAttackKneel(chr, chr->act_attack.flags, chr->act_attack.entityid); + chr_attack_kneel(chr, chr->act_attack.flags, chr->act_attack.entityid); } } return; @@ -11073,7 +11073,7 @@ void chrTickAttack(struct chrdata *chr) return; } - if (curframe >= modelGetAnimEndFrame(model)) { + if (curframe >= model_get_anim_end_frame(model)) { chr->act_attack.flags |= ATTACKFLAG_DONTTURN; chr->act_attack.turning = TURNSTATE_OFF; return; @@ -11084,37 +11084,37 @@ void chrTickAttack(struct chrdata *chr) && chr->act_attack.dorecoil == 0 && chr->act_attack.animcfg->unk24 > 0 && curframe <= chr->act_attack.animcfg->unk24 - && curframe >= modelGetAnimEndFrame(model)) { - modelSetAnimation(model, modelGetAnimNum(model), model->anim->flip, - chr->act_attack.animcfg->unk24, chrGetRangedSpeed(chr, 0.5f, 0.8f), 16); + && curframe >= model_get_anim_end_frame(model)) { + model_set_animation(model, model_get_anim_num(model), model->anim->flip, + chr->act_attack.animcfg->unk24, chr_get_ranged_speed(chr, 0.5f, 0.8f), 16); if (chr->act_attack.dooneburst) { if (chr->act_attack.animcfg->unk14 >= 0) { - modelSetAnimEndFrame(model, chr->act_attack.animcfg->unk14); + model_set_anim_end_frame(model, chr->act_attack.animcfg->unk14); } } else { - modelSetAnimEndFrame(model, chr->act_attack.animcfg->unk1c); + model_set_anim_end_frame(model, chr->act_attack.animcfg->unk1c); } } - chrTickFire(chr); + chr_tick_fire(chr); } -void chrTickAttackRoll(struct chrdata *chr) +void chr_tick_attack_roll(struct chrdata *chr) { if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrAttackRollChooseAnimation(chr); + chr_attack_roll_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } if (chr->act_attack.onehanded) { struct model *model = chr->model; - f32 curframe = modelGetCurAnimFrame(model); + f32 curframe = model_get_cur_anim_frame(model); if (chr->act_attack.animcfg == &g_RollAttackAnims[4] || chr->act_attack.animcfg == &g_RollAttackAnims[5] @@ -11163,27 +11163,27 @@ void chrTickAttackRoll(struct chrdata *chr) chr->act_attack.animcfg = newanimcfg; chr->sleep = 0; - modelSetAnimation(model, newanimcfg->animnum, flip, newanimcfg->unk10, - chrGetRangedSpeed(chr, 0.5f, 0.8f), sp34); + model_set_animation(model, newanimcfg->animnum, flip, newanimcfg->unk10, + chr_get_ranged_speed(chr, 0.5f, 0.8f), sp34); if (chr->act_attack.dorecoil) { if (newanimcfg->unk24 >= 0.0f) { - modelSetAnimEndFrame(model, newanimcfg->unk24); + model_set_anim_end_frame(model, newanimcfg->unk24); } else { - modelSetAnimEndFrame(model, newanimcfg->unk1c); + model_set_anim_end_frame(model, newanimcfg->unk1c); } } else { if (newanimcfg->unk20 >= 0.0f) { - modelSetAnimEndFrame(model, newanimcfg->unk20); + model_set_anim_end_frame(model, newanimcfg->unk20); } else { if (newanimcfg->unk14 >= 0.0f) { - modelSetAnimEndFrame(model, newanimcfg->unk14); + model_set_anim_end_frame(model, newanimcfg->unk14); } } } if (chr->act_attack.animcfg->unk0c != 0.0f) { - union modelrwdata *rwdata = modelGetNodeRwData(model, model->definition->rootnode); + union modelrwdata *rwdata = model_get_node_rw_data(model, model->definition->rootnode); rwdata->chrinfo.unk5c = sp34; rwdata->chrinfo.unk58 = -chr->act_attack.animcfg->unk0c / sp34; @@ -11207,26 +11207,26 @@ void chrTickAttackRoll(struct chrdata *chr) if (!chr->act_attack.dorecoil && chr->act_attack.animcfg->unk24 > 0 && curframe <= chr->act_attack.animcfg->unk24 - && curframe >= modelGetAnimEndFrame(model)) { - modelSetAnimation(model, modelGetAnimNum(model), model->anim->flip, - chr->act_attack.animcfg->unk24, chrGetRangedSpeed(chr, 0.5f, 0.8f), 16); + && curframe >= model_get_anim_end_frame(model)) { + model_set_animation(model, model_get_anim_num(model), model->anim->flip, + chr->act_attack.animcfg->unk24, chr_get_ranged_speed(chr, 0.5f, 0.8f), 16); if (chr->act_attack.dooneburst) { if (chr->act_attack.animcfg->unk14 >= 0) { - modelSetAnimEndFrame(model, chr->act_attack.animcfg->unk14); + model_set_anim_end_frame(model, chr->act_attack.animcfg->unk14); } } else { u32 stack; - modelSetAnimEndFrame(model, chr->act_attack.animcfg->unk1c); + model_set_anim_end_frame(model, chr->act_attack.animcfg->unk1c); } } } } - chrTickFire(chr); + chr_tick_fire(chr); } -void propPrintDangerous(void) +void prop_print_dangerous(void) { u8 i; @@ -11249,7 +11249,7 @@ void propPrintDangerous(void) } } -void propUnsetDangerous(struct prop *prop) +void prop_unset_dangerous(struct prop *prop) { s32 i; @@ -11261,7 +11261,7 @@ void propUnsetDangerous(struct prop *prop) } } -void propSetDangerous(struct prop *prop) +void prop_set_dangerous(struct prop *prop) { s32 i; @@ -11273,7 +11273,7 @@ void propSetDangerous(struct prop *prop) } } -void chrTickThrowGrenade(struct chrdata *chr) +void chr_tick_throw_grenade(struct chrdata *chr) { struct model *model; f32 frame; @@ -11284,52 +11284,52 @@ void chrTickThrowGrenade(struct chrdata *chr) f32 frame2; if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrThrowGrenadeChooseAnimation(chr); + chr_throw_grenade_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } model = chr->model; - frame = modelGetCurAnimFrame(model); + frame = model_get_cur_anim_frame(model); hand = model->anim->flip ? HAND_LEFT : HAND_RIGHT; - weaponprop = chrGetHeldProp(chr, hand); + weaponprop = chr_get_held_prop(chr, hand); // Decide at which frame the grenade should become visible in the chr's hand - if ((frame >= 20 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_STANDING) - || (frame >= 1 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_NOPIN) - || (frame >= 1 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_CROUCHING)) { + if ((frame >= 20 && weaponprop && model_get_anim_num(model) == ANIM_THROWGRENADE_STANDING) + || (frame >= 1 && weaponprop && model_get_anim_num(model) == ANIM_THROWGRENADE_NOPIN) + || (frame >= 1 && weaponprop && model_get_anim_num(model) == ANIM_THROWGRENADE_CROUCHING)) { obj = weaponprop->obj; obj->hidden &= ~OBJHFLAG_GONE; } // Decide at which frame the grenade leaves the chr's hand - if ((frame >= 119 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_STANDING) - || (frame >= 57 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_NOPIN) - || (frame >= 58 && weaponprop && modelGetAnimNum(model) == ANIM_THROWGRENADE_CROUCHING)) { + if ((frame >= 119 && weaponprop && model_get_anim_num(model) == ANIM_THROWGRENADE_STANDING) + || (frame >= 57 && weaponprop && model_get_anim_num(model) == ANIM_THROWGRENADE_NOPIN) + || (frame >= 58 && weaponprop && model_get_anim_num(model) == ANIM_THROWGRENADE_CROUCHING)) { weapon = weaponprop->weapon; - objSetDropped(weaponprop, DROPTYPE_THROWGRENADE); + obj_set_dropped(weaponprop, DROPTYPE_THROWGRENADE); chr->hidden |= CHRHFLAG_DROPPINGITEM; weapon->timer240 = TICKS(240); } - frame2 = modelGetCurAnimFrame(model); + frame2 = model_get_cur_anim_frame(model); - if (frame2 >= modelGetAnimEndFrame(model)) { - chrStop(chr); + if (frame2 >= model_get_anim_end_frame(model)) { + chr_stop(chr); } else { - if ((frame >= 87 && frame <= 110 && modelGetAnimNum(model) == ANIM_THROWGRENADE_STANDING) - || (frame >= 5 && frame <= 45 && modelGetAnimNum(model) == ANIM_THROWGRENADE_NOPIN) - || ((frame >= 20 && frame <= 45 && modelGetAnimNum(model) == ANIM_THROWGRENADE_CROUCHING))) { - f32 value = chrGetRangedSpeed(chr, 1, 3.2); - chrTurn(chr, 1, 110, value, 0); + if ((frame >= 87 && frame <= 110 && model_get_anim_num(model) == ANIM_THROWGRENADE_STANDING) + || (frame >= 5 && frame <= 45 && model_get_anim_num(model) == ANIM_THROWGRENADE_NOPIN) + || ((frame >= 20 && frame <= 45 && model_get_anim_num(model) == ANIM_THROWGRENADE_CROUCHING))) { + f32 value = chr_get_ranged_speed(chr, 1, 3.2); + chr_turn(chr, 1, 110, value, 0); } } } -bool chrDetectDangerousObject(struct chrdata *chr, u8 flags) +bool chr_detect_dangerous_object(struct chrdata *chr, u8 flags) { s32 i; @@ -11348,7 +11348,7 @@ bool chrDetectDangerousObject(struct chrdata *chr, u8 flags) pass = true; } - if (pass && chrGetSquaredDistanceToCoord(chr, &prop->pos) < 1600) { + if (pass && chr_get_squared_distance_to_coord(chr, &prop->pos) < 1600) { chr->runfrompos.x = g_DangerousProps[i]->pos.x; chr->runfrompos.y = g_DangerousProps[i]->pos.y; chr->runfrompos.z = g_DangerousProps[i]->pos.z; @@ -11371,7 +11371,7 @@ bool chrDetectDangerousObject(struct chrdata *chr, u8 flags) return false; } -void chrTickBondDie(struct chrdata *chr) +void chr_tick_bond_die(struct chrdata *chr) { // empty } @@ -11392,7 +11392,7 @@ bool func0f043f2c(struct chrdata *chr, struct coord *runpos, u32 arg2, f32 *turn result = false; angle1 = atan2f(xdiff, zdiff); - finalangle = chrGetRotY(chr); + finalangle = chr_get_rot_y(chr); angle2 = angle1 - finalangle; if (finalangle > angle1) { @@ -11448,7 +11448,7 @@ bool func0f043f2c(struct chrdata *chr, struct coord *runpos, u32 arg2, f32 *turn maxspeed *= model->anim->playspeed; accel *= model->anim->playspeed; - applyRotation(&finalangle, angle1, turnspeed, accel, accel + accel, maxspeed); + apply_rotation(&finalangle, angle1, turnspeed, accel, accel + accel, maxspeed); if (ABS(finalangle - angle1) < 0.01f) { *turnspeed = 0; @@ -11456,26 +11456,26 @@ bool func0f043f2c(struct chrdata *chr, struct coord *runpos, u32 arg2, f32 *turn } } - chrSetRotY(chr, finalangle); + chr_set_rot_y(chr, finalangle); return result; } -void chrTickAttackWalk(struct chrdata *chr) +void chr_tick_attack_walk(struct chrdata *chr) { struct model *model = chr->model; struct prop *prop = chr->prop; - struct prop *targetprop = chrGetTargetProp(chr); + struct prop *targetprop = chr_get_target_prop(chr); s32 i; f32 xdiff; f32 zdiff; if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrAttackWalkChooseAnimation(chr); + chr_attack_walk_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } @@ -11487,14 +11487,14 @@ void chrTickAttackWalk(struct chrdata *chr) if (chr->invalidmove == 1 || chr->lastmoveok60 < g_Vars.lvframe60 - TICKS(60) || chr->act_attackwalk.frame60count > chr->act_attackwalk.frame60max) { - if (modelGetCurAnimFrame(model) > modelGetNumAnimFrames(model) * 0.5f) { - modelSetAnimSpeedAuto(model, 0, 16); + if (model_get_cur_anim_frame(model) > model_get_num_anim_frames(model) * 0.5f) { + model_set_anim_speed_auto(model, 0, 16); } else { - modelSetAnimSpeedAuto(model, modelGetNumAnimFrames(model) * 0.5f, 16); + model_set_anim_speed_auto(model, model_get_num_anim_frames(model) * 0.5f, 16); } - chrRecordLastSeeTargetTime(chr); - chrStop(chr); + chr_record_last_see_target_time(chr); + chr_stop(chr); return; } @@ -11503,8 +11503,8 @@ void chrTickAttackWalk(struct chrdata *chr) zdiff = targetprop->pos.z - prop->pos.z; if (xdiff < 300 && xdiff > -300 && zdiff < 300 && zdiff > -300) { - chrRecordLastSeeTargetTime(chr); - chrStop(chr); + chr_record_last_see_target_time(chr); + chr_stop(chr); return; } @@ -11517,14 +11517,14 @@ void chrTickAttackWalk(struct chrdata *chr) chr->act_attackwalk.firegun[HAND_LEFT], chr->act_attackwalk.firegun[HAND_RIGHT], 1); } else { - chrResetAimEndProperties(chr); + chr_reset_aim_end_properties(chr); } if (chr->act_attackwalk.facedtarget && chr->act_attackwalk.frame60count > TICKS(30)) { for (i = 0; i < 2; i++) { if (chr->act_attackwalk.firegun[i]) { if (!chr->act_attackwalk.everytick[i]) { - chrSetHandFiring(chr, i, true); + chr_set_hand_firing(chr, i, true); } else if (chr->act_attackwalk.frame60count > chr->act_attackwalk.nextshot60 && (i == chr->act_attackwalk.nextgun || chr->act_attackwalk.everytick[chr->act_attackwalk.nextgun] == 0)) { chr->act_attackwalk.nextshot60 = chr->act_attackwalk.frame60count; @@ -11545,17 +11545,17 @@ void chrTickAttackWalk(struct chrdata *chr) chr->act_attackwalk.nextgun = 1 - chr->act_attackwalk.nextgun; - chrSetHandFiring(chr, i, true); + chr_set_hand_firing(chr, i, true); } else { - chrSetHandFiring(chr, i, false); + chr_set_hand_firing(chr, i, false); } } else { - chrSetHandFiring(chr, i, false); + chr_set_hand_firing(chr, i, false); } } } else { - chrSetHandFiring(chr, HAND_LEFT, false); - chrSetHandFiring(chr, HAND_RIGHT, false); + chr_set_hand_firing(chr, HAND_LEFT, false); + chr_set_hand_firing(chr, HAND_RIGHT, false); } } @@ -11564,7 +11564,7 @@ void chrTickAttackWalk(struct chrdata *chr) * with different inputs to see what it returns, but I couldn't determine how * the range affects the latter part of the function. */ -bool posIsMovingTowardsPosOrStoppedInRange(struct coord *prevpos, struct coord *moveddelta, struct coord *targetpos, f32 range) +bool pos_is_moving_towards_pos_or_stopped_in_range(struct coord *prevpos, struct coord *moveddelta, struct coord *targetpos, f32 range) { struct coord prevdist; f32 tmp; @@ -11600,7 +11600,7 @@ bool posIsMovingTowardsPosOrStoppedInRange(struct coord *prevpos, struct coord * * * This is a lateral check, meaning the Y value is not considered. */ -bool posIsArrivingLaterallyAtPos(struct coord *prevpos, struct coord *curpos, struct coord *targetpos, f32 range) +bool pos_is_arriving_laterally_at_pos(struct coord *prevpos, struct coord *curpos, struct coord *targetpos, f32 range) { struct coord moveddelta; @@ -11624,7 +11624,7 @@ bool posIsArrivingLaterallyAtPos(struct coord *prevpos, struct coord *curpos, st moveddelta.y = 0; moveddelta.z = curpos->z - prevpos->z; - return posIsMovingTowardsPosOrStoppedInRange(prevpos, &moveddelta, targetpos, range); + return pos_is_moving_towards_pos_or_stopped_in_range(prevpos, &moveddelta, targetpos, range); } /** @@ -11634,7 +11634,7 @@ bool posIsArrivingLaterallyAtPos(struct coord *prevpos, struct coord *curpos, st * the range, and * - either prevpos or curpos is within 150cm vertically of targetpos. */ -bool posIsArrivingAtPos(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) { if (prevpos->y <= targetpos->y - 150 && curpos->y <= targetpos->y - 150) { return false; @@ -11644,10 +11644,10 @@ bool posIsArrivingAtPos(struct coord *prevpos, struct coord *curpos, struct coor return false; } - return posIsArrivingLaterallyAtPos(prevpos, curpos, targetpos, range); + return pos_is_arriving_laterally_at_pos(prevpos, curpos, targetpos, range); } -void chrTickRunPos(struct chrdata *chr) +void chr_tick_run_pos(struct chrdata *chr) { struct prop *prop = chr->prop; struct model *model = chr->model; @@ -11657,11 +11657,11 @@ void chrTickRunPos(struct chrdata *chr) f32 fVar7; if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrRunPosChooseAnimation(chr); + chr_run_pos_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } @@ -11669,35 +11669,35 @@ void chrTickRunPos(struct chrdata *chr) if (chr->invalidmove == 1 || g_Vars.lvframe60 - TICKS(60) > chr->lastmoveok60 - || posIsArrivingLaterallyAtPos(&chr->prevpos, &prop->pos, &chr->act_runpos.pos, chr->act_runpos.neardist)) { + || pos_is_arriving_laterally_at_pos(&chr->prevpos, &prop->pos, &chr->act_runpos.pos, chr->act_runpos.neardist)) { if (race == RACE_HUMAN) { - modelGetAnimNum(model); + model_get_anim_num(model); } zero = 0; - fVar7 = modelGetCurAnimFrame(model); + fVar7 = model_get_cur_anim_frame(model); fVar6 = fVar7 - zero; if (fVar7 < 0) { - fVar6 += modelGetNumAnimFrames(model); + fVar6 += model_get_num_anim_frames(model); } - if (modelGetNumAnimFrames(model) * 0.5f < fVar6) { + if (model_get_num_anim_frames(model) * 0.5f < fVar6) { zero = 0; - modelSetAnimSpeedAuto(model, modelGetNumAnimFrames(model) - zero, 16); + model_set_anim_speed_auto(model, model_get_num_anim_frames(model) - zero, 16); } else { zero = 0; - fVar7 = modelGetNumAnimFrames(model) * 0.5f; + fVar7 = model_get_num_anim_frames(model) * 0.5f; fVar6 = fVar7 - zero; if (fVar7 < 0) { - fVar6 += modelGetNumAnimFrames(model); + fVar6 += model_get_num_anim_frames(model); } - modelSetAnimSpeedAuto(model, fVar6, 16); + model_set_anim_speed_auto(model, fVar6, 16); } - chrStop(chr); + chr_stop(chr); return; } @@ -11709,7 +11709,7 @@ void chrTickRunPos(struct chrdata *chr) fVar7 = 1; if (race == RACE_HUMAN) { - if (modelGetAnimNum(model) == ANIM_RUNNING_ONEHANDGUN) { + if (model_get_anim_num(model) == ANIM_RUNNING_ONEHANDGUN) { fVar7 = func0f02dff0(ANIM_RUNNING_ONEHANDGUN); } else { fVar7 = func0f02dff0(ANIM_RUNNING_TWOHANDGUN); @@ -11718,7 +11718,7 @@ void chrTickRunPos(struct chrdata *chr) fVar7 = func0f02dff0(ANIM_SKEDAR_RUNNING); } - chr->act_runpos.neardist += fVar7 * g_Vars.lvupdate60freal * modelGetAbsAnimSpeed(model); + chr->act_runpos.neardist += fVar7 * g_Vars.lvupdate60freal * model_get_abs_anim_speed(model); } } @@ -11761,10 +11761,10 @@ void func0f044b68(struct coord *arg0, struct coord *arg1, struct coord *arg2) * * Return true if path ahead is clear. * - * This is similar to chrNavCheckForObstacle. The difference between the two are + * This is similar to chr_nav_check_for_obstacle. The difference between the two are * not yet understood. */ -bool chrNavCanSeeNextPos(struct chrdata *chr, struct coord *chrpos, RoomNum *chrrooms, struct coord *aimpos, struct coord *leftpos, struct coord *rightpos, f32 negchrradius, f32 chrradius, s32 cdtypes, s32 arg9) +bool chr_nav_can_see_next_pos(struct chrdata *chr, struct coord *chrpos, RoomNum *chrrooms, struct coord *aimpos, struct coord *leftpos, struct coord *rightpos, f32 negchrradius, f32 chrradius, s32 cdtypes, s32 arg9) { struct coord spd4; f32 spd0; @@ -11788,7 +11788,7 @@ bool chrNavCanSeeNextPos(struct chrdata *chr, struct coord *chrpos, RoomNum *chr RoomNum sp40[8]; struct prop *prop = chr->prop; - chrGetBbox(prop, &radius2, &ymax, &ymin); + chr_get_bbox(prop, &radius2, &ymax, &ymin); spd4.x = aimpos->x - chrpos->x; spd4.y = 0.0f; @@ -11807,7 +11807,7 @@ bool chrNavCanSeeNextPos(struct chrdata *chr, struct coord *chrpos, RoomNum *chr spc8 = spd4.x * chrradius * 1.2f; spc4 = spd4.z * chrradius * 1.2f; - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); sp6c.x = chrpos->x + spcc; sp6c.y = chrpos->y; @@ -11816,19 +11816,19 @@ bool chrNavCanSeeNextPos(struct chrdata *chr, struct coord *chrpos, RoomNum *chr sp60.y = aimpos->y; sp60.z = (spd4.z * negchrradius) + (aimpos->z - spc8); - if (cdExamCylMove07(chrpos, chrrooms, &sp6c, sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION - || cdExamCylMove03(&sp6c, sp50, &sp60, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { + if (cd_exam_cyl_move07(chrpos, chrrooms, &sp6c, sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION + || cd_exam_cyl_move03(&sp6c, sp50, &sp60, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { spbc = true; #if VERSION >= VERSION_JPN_FINAL - cdGetEdge(&spac, &spa0, 14154, "chr/chraction.c"); + cd_get_edge(&spac, &spa0, 14154, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetEdge(&spac, &spa0, 14151, "chr/chraction.c"); + cd_get_edge(&spac, &spa0, 14151, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&spac, &spa0, 14146, "chraction.c"); + cd_get_edge(&spac, &spa0, 14146, "chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&spac, &spa0, 14145, "chraction.c"); + cd_get_edge(&spac, &spa0, 14145, "chraction.c"); #else - cdGetEdge(&spac, &spa0, 14158, "chraction.c"); + cd_get_edge(&spac, &spa0, 14158, "chraction.c"); #endif func0f044b68(&spac, &spa0, &spd4); } @@ -11841,19 +11841,19 @@ bool chrNavCanSeeNextPos(struct chrdata *chr, struct coord *chrpos, RoomNum *chr sp60.y = aimpos->y; sp60.z = (spd4.z * negchrradius) + (aimpos->z + spc8); - if (cdExamCylMove07(chrpos, chrrooms, &sp6c, sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION - || cdExamCylMove03(&sp6c, chrrooms, &sp60, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { + if (cd_exam_cyl_move07(chrpos, chrrooms, &sp6c, sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION + || cd_exam_cyl_move03(&sp6c, chrrooms, &sp60, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { spb8 = true; #if VERSION >= VERSION_JPN_FINAL - cdGetEdge(&sp94, &sp88, 14169, "chr/chraction.c"); + cd_get_edge(&sp94, &sp88, 14169, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp94, &sp88, 14166, "chr/chraction.c"); + cd_get_edge(&sp94, &sp88, 14166, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&sp94, &sp88, 14161, "chraction.c"); + cd_get_edge(&sp94, &sp88, 14161, "chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp94, &sp88, 14160, "chraction.c"); + cd_get_edge(&sp94, &sp88, 14160, "chraction.c"); #else - cdGetEdge(&sp94, &sp88, 14173, "chraction.c"); + cd_get_edge(&sp94, &sp88, 14173, "chraction.c"); #endif func0f044b68(&sp94, &sp88, &spd4); } @@ -11885,25 +11885,25 @@ bool chrNavCanSeeNextPos(struct chrdata *chr, struct coord *chrpos, RoomNum *chr rightpos->x = sp88.x; rightpos->y = sp88.y; rightpos->z = sp88.z; - } else if (cdExamCylMove07(chrpos, chrrooms, aimpos, sp40, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION - && (!arg9 || cdExamCylMove01(chrpos, aimpos, chrradius, sp40, cdtypes, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION)) { + } else if (cd_exam_cyl_move07(chrpos, chrrooms, aimpos, sp40, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION + && (!arg9 || cd_exam_cyl_move01(chrpos, aimpos, chrradius, sp40, cdtypes, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION)) { result = true; } else { #if VERSION >= VERSION_JPN_FINAL - cdGetEdge(leftpos, rightpos, 14239, "chr/chraction.c"); + cd_get_edge(leftpos, rightpos, 14239, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetEdge(leftpos, rightpos, 14236, "chr/chraction.c"); + cd_get_edge(leftpos, rightpos, 14236, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(leftpos, rightpos, 14231, "chraction.c"); + cd_get_edge(leftpos, rightpos, 14231, "chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(leftpos, rightpos, 14230, "chraction.c"); + cd_get_edge(leftpos, rightpos, 14230, "chraction.c"); #else - cdGetEdge(leftpos, rightpos, 14243, "chraction.c"); + cd_get_edge(leftpos, rightpos, 14243, "chraction.c"); #endif func0f044b68(leftpos, rightpos, &spd4); } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); return result; } @@ -11918,10 +11918,10 @@ bool chrNavCanSeeNextPos(struct chrdata *chr, struct coord *chrpos, RoomNum *chr * * Return true if path ahead is clear. * - * This is similar to chrNavCanSeeNextPos. The only difference is this one uses + * This is similar to chr_nav_can_see_next_pos. The only difference is this one uses * the value1 and value2 variables. */ -bool chrNavCheckForObstacle(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_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) { struct coord spd4; f32 spd0; @@ -11947,7 +11947,7 @@ bool chrNavCheckForObstacle(struct chrdata *chr, struct coord *chrpos, RoomNum * RoomNum sp40[8]; struct prop *prop = chr->prop; - chrGetBbox(prop, &radius2, &ymax, &ymin); + chr_get_bbox(prop, &radius2, &ymax, &ymin); spd4.x = aimpos->x - chrpos->x; spd4.y = 0.0f; @@ -11966,7 +11966,7 @@ bool chrNavCheckForObstacle(struct chrdata *chr, struct coord *chrpos, RoomNum * spc8 = spd4.x * chrradius * 1.2f; spc4 = spd4.z * chrradius * 1.2f; - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); sp6c.x = chrpos->x + spcc; sp6c.y = chrpos->y; @@ -11975,22 +11975,22 @@ bool chrNavCheckForObstacle(struct chrdata *chr, struct coord *chrpos, RoomNum * sp60.y = aimpos->y; sp60.z = (spd4.z * negchrradius) + (aimpos->z - spc8); - if (cdExamCylMove07(chrpos, chrrooms, &sp6c, sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION - || cdExamCylMove03(&sp6c, sp50, &sp60, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { + if (cd_exam_cyl_move07(chrpos, chrrooms, &sp6c, sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION + || cd_exam_cyl_move03(&sp6c, sp50, &sp60, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { spbc = true; #if VERSION >= VERSION_JPN_FINAL - cdGetEdge(&spac, &spa0, 14319, "chr/chraction.c"); + cd_get_edge(&spac, &spa0, 14319, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetEdge(&spac, &spa0, 14316, "chr/chraction.c"); + cd_get_edge(&spac, &spa0, 14316, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&spac, &spa0, 14311, "chraction.c"); + cd_get_edge(&spac, &spa0, 14311, "chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&spac, &spa0, 14310, "chraction.c"); + cd_get_edge(&spac, &spa0, 14310, "chraction.c"); #else - cdGetEdge(&spac, &spa0, 14323, "chraction.c"); + cd_get_edge(&spac, &spa0, 14323, "chraction.c"); #endif func0f044b68(&spac, &spa0, &spd4); - value1 = cd00024e40(); + value1 = cd_00024e40(); } sp6c.x = chrpos->x - spcc; @@ -12001,22 +12001,22 @@ bool chrNavCheckForObstacle(struct chrdata *chr, struct coord *chrpos, RoomNum * sp60.y = aimpos->y; sp60.z = (spd4.z * negchrradius) + (aimpos->z + spc8); - if (cdExamCylMove07(chrpos, chrrooms, &sp6c, sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION - || cdExamCylMove03(&sp6c, chrrooms, &sp60, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { + if (cd_exam_cyl_move07(chrpos, chrrooms, &sp6c, sp50, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION + || cd_exam_cyl_move03(&sp6c, chrrooms, &sp60, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) == CDRESULT_COLLISION) { spb8 = true; #if VERSION >= VERSION_JPN_FINAL - cdGetEdge(&sp94, &sp88, 14334, "chr/chraction.c"); + cd_get_edge(&sp94, &sp88, 14334, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp94, &sp88, 14331, "chr/chraction.c"); + cd_get_edge(&sp94, &sp88, 14331, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&sp94, &sp88, 14326, "chraction.c"); + cd_get_edge(&sp94, &sp88, 14326, "chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp94, &sp88, 14325, "chraction.c"); + cd_get_edge(&sp94, &sp88, 14325, "chraction.c"); #else - cdGetEdge(&sp94, &sp88, 14338, "chraction.c"); + cd_get_edge(&sp94, &sp88, 14338, "chraction.c"); #endif func0f044b68(&sp94, &sp88, &spd4); - value2 = cd00024e40(); + value2 = cd_00024e40(); } if (spbc && spb8) { @@ -12053,30 +12053,30 @@ bool chrNavCheckForObstacle(struct chrdata *chr, struct coord *chrpos, RoomNum * rightpos->x = sp88.x; rightpos->y = sp88.y; rightpos->z = sp88.z; - } else if (cdExamCylMove07(chrpos, chrrooms, aimpos, sp40, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION - && (!hasobstacle || cdExamCylMove01(chrpos, aimpos, chrradius, sp40, cdtypes, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION)) { + } else if (cd_exam_cyl_move07(chrpos, chrrooms, aimpos, sp40, cdtypes, 1, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION + && (!hasobstacle || cd_exam_cyl_move01(chrpos, aimpos, chrradius, sp40, cdtypes, CHECKVERTICAL_YES, ymax - prop->pos.y, ymin - prop->pos.y) != CDRESULT_COLLISION)) { result = true; } else { #if VERSION >= VERSION_JPN_FINAL - cdGetEdge(leftpos, rightpos, 14404, "chr/chraction.c"); + cd_get_edge(leftpos, rightpos, 14404, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetEdge(leftpos, rightpos, 14401, "chr/chraction.c"); + cd_get_edge(leftpos, rightpos, 14401, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(leftpos, rightpos, 14396, "chraction.c"); + cd_get_edge(leftpos, rightpos, 14396, "chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(leftpos, rightpos, 14395, "chraction.c"); + cd_get_edge(leftpos, rightpos, 14395, "chraction.c"); #else - cdGetEdge(leftpos, rightpos, 14408, "chraction.c"); + cd_get_edge(leftpos, rightpos, 14408, "chraction.c"); #endif func0f044b68(leftpos, rightpos, &spd4); } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); return result; } -bool chrNavTryObstacle(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) +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 *prop = chr->prop; struct coord sp68; @@ -12133,7 +12133,7 @@ bool chrNavTryObstacle(struct chrdata *chr, struct coord *arg1, bool arg2, struc sp5c.y = arg1->y; sp5c.z = arg1->z + sp48.f[2]; - if (chrNavCanSeeNextPos(chr, &prop->pos, prop->rooms, &sp5c, sp44, sp40, arg8, chr->radius, cdtypes, 1)) { + if (chr_nav_can_see_next_pos(chr, &prop->pos, prop->rooms, &sp5c, sp44, sp40, arg8, chr->radius, cdtypes, 1)) { if (!arg5 || func0f03645c(chr, &prop->pos, prop->rooms, &sp5c, nextpos, cdtypes)) { if (arg10) { waydata->gotaimposobj = true; @@ -12177,14 +12177,14 @@ const char var7f1a8cb4[] = "chrdisttopad : %x -> %d : Dist=%f"; * * The chr must be within 200cm of the door unless it's a laser. */ -struct prop *chrOpenDoor(struct chrdata *chr, struct coord *rangepos) +struct prop *chr_open_door(struct chrdata *chr, struct coord *rangepos) { struct prop *doorprop = NULL; - if (cdExamCylMove03(&chr->prop->pos, chr->prop->rooms, rangepos, + if (cd_exam_cyl_move03(&chr->prop->pos, chr->prop->rooms, rangepos, CDTYPE_BG | CDTYPE_CLOSEDDOORS | CDTYPE_AJARDOORS, 1, 0, 0) == CDRESULT_COLLISION) { - doorprop = cdGetObstacleProp(); + doorprop = cd_get_obstacle_prop(); } if (doorprop) { @@ -12202,11 +12202,11 @@ struct prop *chrOpenDoor(struct chrdata *chr, struct coord *rangepos) f32 zdiff = doorprop->pos.z - chr->prop->pos.z; if (xdiff * xdiff + zdiff * zdiff < 200 * 200 || (door->doorflags & DOORFLAG_DAMAGEONCONTACT)) { - chrGoPosClearRestartTtl(chr); - doorsChooseSwingDirection(chr->prop, doorprop->door); + chr_go_pos_clear_restart_ttl(chr); + doors_choose_swing_direction(chr->prop, doorprop->door); - if (!doorCallLift(doorprop, false)) { - doorsRequestMode(doorprop->door, DOORMODE_OPENING); + if (!door_call_lift(doorprop, false)) { + doors_request_mode(doorprop->door, DOORMODE_OPENING); } } else { doorprop = NULL; @@ -12233,7 +12233,7 @@ struct prop *chrOpenDoor(struct chrdata *chr, struct coord *rangepos) * opened into their path. If one is found, the chr routes around the obstacle * and then to the next pos again. */ -void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata *waydata, bool arg3) +void chr_nav_tick_main(struct chrdata *chr, struct coord *nextpos, struct waydata *waydata, bool arg3) { struct prop *prop = chr->prop; struct coord sp100; @@ -12260,7 +12260,7 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * // Check to see if the chr can see the next pad. This is almost // always true, but if the chr has tried to avoid an object they // may have gone behind a wall and can't see the pad any more. - if (chrNavCanSeeNextPos(chr, &prop->pos, prop->rooms, &sp100, &waydata->obstacleleft, &waydata->obstacleright, -chr->radius, chr->radius, CDTYPE_PATHBLOCKER | CDTYPE_BG, arg3)) { + if (chr_nav_can_see_next_pos(chr, &prop->pos, prop->rooms, &sp100, &waydata->obstacleleft, &waydata->obstacleright, -chr->radius, chr->radius, CDTYPE_PATHBLOCKER | CDTYPE_BG, arg3)) { // Can see the next pad waydata->gotaimpos = true; waydata->aimpos.x = sp100.x; @@ -12281,10 +12281,10 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * // trying to avoid. f32 wantclearance = chr->radius * 1.26f; - if (chrNavTryObstacle(chr, &waydata->obstacleleft, true, &spf4, wantclearance, true, nextpos, waydata, 0, CDTYPE_PATHBLOCKER | CDTYPE_BG, 0)) { + if (chr_nav_try_obstacle(chr, &waydata->obstacleleft, true, &spf4, wantclearance, true, nextpos, waydata, 0, CDTYPE_PATHBLOCKER | CDTYPE_BG, 0)) { // Will go to left side waydata->mode = WAYMODE_HAVEAIMPOS; - } else if (chrNavTryObstacle(chr, &waydata->obstacleright, false, &spf4, wantclearance, true, nextpos, waydata, 0, CDTYPE_PATHBLOCKER | CDTYPE_BG, 0)) { + } else if (chr_nav_try_obstacle(chr, &waydata->obstacleright, false, &spf4, wantclearance, true, nextpos, waydata, 0, CDTYPE_PATHBLOCKER | CDTYPE_BG, 0)) { // Will go to right side waydata->mode = WAYMODE_HAVEAIMPOS; } else { @@ -12305,10 +12305,10 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * f32 wantclearance = chr->radius * 1.26f; u32 stack; - if (chrNavTryObstacle(chr, &waydata->obstacleleft, true, &spf4, wantclearance, false, NULL, waydata, 0, CDTYPE_PATHBLOCKER | CDTYPE_BG, 0)) { + if (chr_nav_try_obstacle(chr, &waydata->obstacleleft, true, &spf4, wantclearance, false, NULL, waydata, 0, CDTYPE_PATHBLOCKER | CDTYPE_BG, 0)) { // Will go to left side waydata->mode = WAYMODE_HAVEAIMPOS; - } else if (chrNavTryObstacle(chr, &waydata->obstacleright, false, &spf4, wantclearance, false, NULL, waydata, 0, CDTYPE_PATHBLOCKER | CDTYPE_BG, 0)) { + } else if (chr_nav_try_obstacle(chr, &waydata->obstacleright, false, &spf4, wantclearance, false, NULL, waydata, 0, CDTYPE_PATHBLOCKER | CDTYPE_BG, 0)) { // Will go to right side waydata->mode = WAYMODE_HAVEAIMPOS; } else { @@ -12344,7 +12344,7 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * hasobstacle = false; } - if (chrNavCheckForObstacle(chr, &prop->pos, prop->rooms, &waydata->aimpos, &waydata->obstacleleft, &waydata->obstacleright, -chr->radius, chr->radius, cdtypes, hasobstacle)) { + if (chr_nav_check_for_obstacle(chr, &prop->pos, prop->rooms, &waydata->aimpos, &waydata->obstacleleft, &waydata->obstacleright, -chr->radius, chr->radius, cdtypes, hasobstacle)) { // No obstacle ahead waydata->gotaimposobj = true; waydata->mode = WAYMODE_INIT; @@ -12403,7 +12403,7 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * u32 stack; f32 f22 = f24 * 1.1f; - if (chrNavTryObstacle(chr, &waydata->obstacleleft, true, &spf4, f24, false, NULL, waydata, f22, cdtypes, 1)) { + if (chr_nav_try_obstacle(chr, &waydata->obstacleleft, true, &spf4, f24, false, NULL, waydata, f22, cdtypes, 1)) { waydata->mode = WAYMODE_INIT; break; } @@ -12436,7 +12436,7 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * } if (spbc < spc0) { - if (chrNavTryObstacle(chr, &spf4, false, &spf4, f24, false, NULL, waydata, f22, cdtypes, 1)) { + if (chr_nav_try_obstacle(chr, &spf4, false, &spf4, f24, false, NULL, waydata, f22, cdtypes, 1)) { waydata->mode = WAYMODE_INIT; break; } @@ -12446,7 +12446,7 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * f32 spac; f32 f22 = f24 * 1.1f; - if (chrNavTryObstacle(chr, &waydata->obstacleright, false, &spf4, f24, false, NULL, waydata, f22, cdtypes, 1)) { + if (chr_nav_try_obstacle(chr, &waydata->obstacleright, false, &spf4, f24, false, NULL, waydata, f22, cdtypes, 1)) { waydata->mode = WAYMODE_INIT; break; } @@ -12479,7 +12479,7 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * } if (spac < spb0) { - if (chrNavTryObstacle(chr, &spf4, true, &spf4, f24, false, NULL, waydata, f22, cdtypes, 1)) { + if (chr_nav_try_obstacle(chr, &spf4, true, &spf4, f24, false, NULL, waydata, f22, cdtypes, 1)) { waydata->mode = WAYMODE_INIT; break; } @@ -12503,14 +12503,14 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * // Every 10 ticks, attempt to open any door in front of the chr if (waydata->age % 10 == 0) { - struct prop *doorprop = chrOpenDoor(chr, &waydata->aimposobj); + struct prop *doorprop = chr_open_door(chr, &waydata->aimposobj); // Consider returning to stand animation while door is opening if (doorprop && chr->aibot == NULL && (chr->hidden & CHRHFLAG_BLOCKINGDOOR) == 0 - && !chrGoPosIsWaiting(chr)) { - chrChooseStandAnimation(chr, 16); + && !chr_go_pos_is_waiting(chr)) { + chr_choose_stand_animation(chr, 16); chr->lastmoveok60 = g_Vars.lvframe60; } @@ -12518,13 +12518,13 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * // or if the chr is blocking the door if (!doorprop || (chr->hidden & CHRHFLAG_BLOCKINGDOOR)) { if (chr->aibot == NULL - && chrGoPosIsWaiting(chr) + && chr_go_pos_is_waiting(chr) && chr->liftaction != LIFTACTION_WAITINGFORLIFT && chr->liftaction != LIFTACTION_WAITINGONLIFT) { if (chr->actiontype == ACT_PATROL) { - chrPatrolChooseAnimation(chr); + chr_patrol_choose_animation(chr); } else { - chrGoPosChooseAnimation(chr); + chr_go_pos_choose_animation(chr); } } @@ -12542,33 +12542,33 @@ void chrNavTickMain(struct chrdata *chr, struct coord *nextpos, struct waydata * func0f043f2c(chr, &waydata->aimposobj, chr->act_gopos.flags, &chr->act_gopos.turnspeed); - if (chr->aibot == NULL && !chrGoPosIsWaiting(chr)) { + if (chr->aibot == NULL && !chr_go_pos_is_waiting(chr)) { if ((chr->act_gopos.flags & GOPOSMASK_SPEED) == GOPOSFLAG_RUN) { if (chr->act_gopos.turnspeed) { if (!chr->unk32c_21) { - modelSetAnimSpeed(chr->model, 0.25f, 8); + model_set_anim_speed(chr->model, 0.25f, 8); } } else { if (chr->unk32c_21) { if (chr->chrflags & CHRCFLAG_RUNFASTER) { - modelSetAnimSpeed(chr->model, 0.65f, 32); + model_set_anim_speed(chr->model, 0.65f, 32); } else { - modelSetAnimSpeed(chr->model, 0.5f, 32); + model_set_anim_speed(chr->model, 0.5f, 32); } } } } else if ((chr->act_gopos.flags & GOPOSMASK_SPEED) == GOPOSFLAG_JOG) { if (chr->act_gopos.turnspeed) { - modelSetAnimSpeed(chr->model, 0.4f, 0); + model_set_anim_speed(chr->model, 0.4f, 0); } else { - modelSetAnimSpeed(chr->model, 0.5f, 0); + model_set_anim_speed(chr->model, 0.5f, 0); } } } } } -bool chrGoPosUpdateLiftAction(struct chrdata *chr, u32 curpadflags, bool arg2, bool arrivingatlift, s16 curpadnum, s32 nextpadnum) +bool chr_go_pos_update_lift_action(struct chrdata *chr, u32 curpadflags, bool arg2, bool arrivingatlift, s16 curpadnum, s32 nextpadnum) { bool advance = false; struct pad nextpad; @@ -12576,7 +12576,7 @@ bool chrGoPosUpdateLiftAction(struct chrdata *chr, u32 curpadflags, bool arg2, b f32 nextground; f32 lifty; struct liftobj *lift; - struct prop *liftprop = liftFindByPad(curpadnum); + struct prop *liftprop = lift_find_by_pad(curpadnum); u32 stack; if (!liftprop) { @@ -12585,10 +12585,10 @@ bool chrGoPosUpdateLiftAction(struct chrdata *chr, u32 curpadflags, bool arg2, b lift = (struct liftobj *) liftprop->obj; - lifty = liftGetY(lift); + lifty = lift_get_y(lift); if (nextpadnum >= 0) { - padUnpack(nextpadnum, PADFIELD_POS | PADFIELD_ROOM | PADFIELD_FLAGS, &nextpad); + pad_unpack(nextpadnum, PADFIELD_POS | PADFIELD_ROOM | PADFIELD_FLAGS, &nextpad); nextpadflags = nextpad.flags; } @@ -12617,22 +12617,22 @@ bool chrGoPosUpdateLiftAction(struct chrdata *chr, u32 curpadflags, bool arg2, b // Just arrived at lift chr->liftaction = LIFTACTION_WAITINGFORLIFT; - chrChooseStandAnimation(chr, 16); + chr_choose_stand_animation(chr, 16); if (nextpadnum >= 0) { // Call the lift - chrOpenDoor(chr, &nextpad.pos); + chr_open_door(chr, &nextpad.pos); } } } else { // Enter lift chr->liftaction = LIFTACTION_NOTUSINGLIFT; - if (chrGoPosIsWaiting(chr)) { + if (chr_go_pos_is_waiting(chr)) { if (chr->actiontype == ACT_PATROL) { - chrPatrolChooseAnimation(chr); + chr_patrol_choose_animation(chr); } else { - chrGoPosChooseAnimation(chr); + chr_go_pos_choose_animation(chr); } } } @@ -12654,7 +12654,7 @@ bool chrGoPosUpdateLiftAction(struct chrdata *chr, u32 curpadflags, bool arg2, b rooms[0] = nextpad.room; - nextground = cdFindFloorYColourTypeAtPos(&nextpad.pos, rooms, NULL, NULL); + nextground = cd_find_floor_y_colour_type_at_pos(&nextpad.pos, rooms, NULL, NULL); // Begin exiting lift if lift is 30cm under destination or higher advance = (lifty >= nextground - 30); @@ -12674,17 +12674,17 @@ bool chrGoPosUpdateLiftAction(struct chrdata *chr, u32 curpadflags, bool arg2, b if (arg2 && chr->liftaction != LIFTACTION_WAITINGONLIFT) { // Just arrived inside lift chr->liftaction = LIFTACTION_WAITINGONLIFT; - chrChooseStandAnimation(chr, 16); + chr_choose_stand_animation(chr, 16); } } else { // Start disembarking chr->liftaction = LIFTACTION_ONLIFT; - if (chrGoPosIsWaiting(chr)) { + if (chr_go_pos_is_waiting(chr)) { if (chr->actiontype == ACT_PATROL) { - chrPatrolChooseAnimation(chr); + chr_patrol_choose_animation(chr); } else { - chrGoPosChooseAnimation(chr); + chr_go_pos_choose_animation(chr); } } } @@ -12702,12 +12702,12 @@ bool chrGoPosUpdateLiftAction(struct chrdata *chr, u32 curpadflags, bool arg2, b return advance; } -s32 chrIsUsingLift(struct chrdata *chr) +s32 chr_is_using_lift(struct chrdata *chr) { return (chr->actiontype == ACT_GOPOS || chr->actiontype == ACT_PATROL) && chr->liftaction > 0; } -s16 chrGoPosGetNextPadNum(struct chrdata *chr) +s16 chr_go_pos_get_next_pad_num(struct chrdata *chr) { if (chr->act_gopos.waypoints[chr->act_gopos.curindex + 1]) { return chr->act_gopos.waypoints[chr->act_gopos.curindex + 1]->padnum; @@ -12716,7 +12716,7 @@ s16 chrGoPosGetNextPadNum(struct chrdata *chr) return -1; } -void chrTickGoPos(struct chrdata *chr) +void chr_tick_go_pos(struct chrdata *chr) { struct waypoint *waypoint; struct coord nextpos; @@ -12732,11 +12732,11 @@ void chrTickGoPos(struct chrdata *chr) chr->act_gopos.flags &= ~(GOPOSFLAG_CROUCH | GOPOSFLAG_DUCK); if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrGoPosChooseAnimation(chr); + chr_go_pos_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } @@ -12750,7 +12750,7 @@ void chrTickGoPos(struct chrdata *chr) // Try and warp the chr past whatever obstacle is blocking them? struct coord sp196 = {0, 0, 0}; - chrDamageByMisc(chr, 1, &sp196, NULL, NULL); + chr_damage_by_misc(chr, 1, &sp196, NULL, NULL); chr->lastmoveok60 = g_Vars.lvframe60; return; @@ -12758,11 +12758,11 @@ void chrTickGoPos(struct chrdata *chr) #endif // Goposforce was not set - restart the action to try and find a new route - chrGoToRoomPos(chr, &chr->act_gopos.endpos, chr->act_gopos.endrooms, chr->act_gopos.flags); + chr_go_to_room_pos(chr, &chr->act_gopos.endpos, chr->act_gopos.endrooms, chr->act_gopos.flags); } - chrGoPosConsiderRestart(chr); - chrGoPosGetCurWaypointInfoWithFlags(chr, &curwppos, curwprooms, &curwpflags); + chr_go_pos_consider_restart(chr); + chr_go_pos_get_cur_waypoint_info_with_flags(chr, &curwppos, curwprooms, &curwpflags); // If magic mode ended over 3 seconds ago, not multiplayer, not in view of // eyespy, pad is nothing special and not in lift, then enter the magic move @@ -12770,23 +12770,23 @@ void chrTickGoPos(struct chrdata *chr) if (chr->act_gopos.waydata.mode != WAYMODE_MAGIC && chr->act_gopos.waydata.lastvisible60 + TICKS(180) < g_Vars.lvframe60 && g_Vars.normmplayerisrunning == false - && chrIsRoomOffScreen(chr, &curwppos, curwprooms) // related to eyespy + && chr_is_room_off_screen(chr, &curwppos, curwprooms) // related to eyespy && (curwpflags & (PADFLAG_AIWAITLIFT | PADFLAG_AIONLIFT)) == 0 && chr->inlift == false) { enteringmagic = true; - chrGoPosInitMagic(chr, &chr->act_gopos.waydata, &curwppos, &prop->pos); + chr_go_pos_init_magic(chr, &chr->act_gopos.waydata, &curwppos, &prop->pos); } #if VERSION >= VERSION_NTSC_1_0 if (g_NumChrsSeenPlayerRecently2 >= 9 && (chr->hidden & CHRHFLAG_BASICGUARD) && (chr->flags & CHRFLAG0_ACTIVATEALARM) == 0) { - chrStop(chr); + chr_stop(chr); return; } #else if (g_NumChrsSeenPlayerRecently2 >= 10) { - chrStop(chr); + chr_stop(chr); return; } #endif @@ -12799,7 +12799,7 @@ void chrTickGoPos(struct chrdata *chr) chr->goposforce -= g_Vars.lvupdate60; if (chr->goposforce < 0) { - chrStop(chr); + chr_stop(chr); return; } } @@ -12807,16 +12807,16 @@ void chrTickGoPos(struct chrdata *chr) // Check if chr needs to exit magic mode if (chr->act_gopos.waydata.mode == WAYMODE_MAGIC) { - if ((!enteringmagic && ((prop->flags & (PROPFLAG_ONANYSCREENPREVTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONTHISSCREENTHISTICK)) || !chrIsRoomOffScreen(chr, &curwppos, curwprooms))) + if ((!enteringmagic && ((prop->flags & (PROPFLAG_ONANYSCREENPREVTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONTHISSCREENTHISTICK)) || !chr_is_room_off_screen(chr, &curwppos, curwprooms))) || (curwpflags & (PADFLAG_AIWAITLIFT | PADFLAG_AIONLIFT)) || chr->inlift) { // Exiting magic mode - chrGoPosInitExpensive(chr); + chr_go_pos_init_expensive(chr); chr->act_gopos.waydata.lastvisible60 = g_Vars.lvframe60; return; } - chrNavTickMagic(chr, &chr->act_gopos.waydata, func0f0370a8(chr), &curwppos, curwprooms); + chr_nav_tick_magic(chr, &chr->act_gopos.waydata, func0f0370a8(chr), &curwppos, curwprooms); } else { bool advance = false; bool arrivingxyz; @@ -12834,10 +12834,10 @@ void chrTickGoPos(struct chrdata *chr) waypoint = chr->act_gopos.waypoints[chr->act_gopos.curindex]; if (waypoint) { - padUnpack(waypoint->padnum, PADFIELD_FLAGS | PADFIELD_POS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_FLAGS | PADFIELD_POS, &pad); - arrivingxyz = posIsArrivingAtPos(&chr->prevpos, &prop->pos, &pad.pos, 30); - arrivingxz = posIsArrivingLaterallyAtPos(&chr->prevpos, &prop->pos, &pad.pos, 30); + arrivingxyz = pos_is_arriving_at_pos(&chr->prevpos, &prop->pos, &pad.pos, 30); + arrivingxz = pos_is_arriving_laterally_at_pos(&chr->prevpos, &prop->pos, &pad.pos, 30); if (pad.flags & PADFLAG_AICROUCH) { chr->act_gopos.flags |= GOPOSFLAG_CROUCH; @@ -12846,7 +12846,7 @@ void chrTickGoPos(struct chrdata *chr) } if ((pad.flags & PADFLAG_AIWAITLIFT) || (pad.flags & PADFLAG_AIONLIFT)) { - advance = chrGoPosUpdateLiftAction(chr, pad.flags, arrivingxz, arrivingxyz, waypoint->padnum, chrGoPosGetNextPadNum(chr)); + advance = chr_go_pos_update_lift_action(chr, pad.flags, arrivingxz, arrivingxyz, waypoint->padnum, chr_go_pos_get_next_pad_num(chr)); } else { if (arrivingxyz || (arrivingxz && (chr->inlift || (pad.flags & PADFLAG_AIIGNOREY)))) { advance = true; @@ -12854,20 +12854,20 @@ void chrTickGoPos(struct chrdata *chr) } } else { // No more waypoints - chr is finished - if (posIsArrivingAtPos(&chr->prevpos, &prop->pos, &chr->act_gopos.endpos, 30) || - (chr->inlift && posIsArrivingLaterallyAtPos(&chr->prevpos, &prop->pos, &chr->act_gopos.endpos, 30))) { + if (pos_is_arriving_at_pos(&chr->prevpos, &prop->pos, &chr->act_gopos.endpos, 30) || + (chr->inlift && pos_is_arriving_laterally_at_pos(&chr->prevpos, &prop->pos, &chr->act_gopos.endpos, 30))) { if (chr->act_gopos.flags & GOPOSFLAG_FORPATHSTART) { - chrTryStartPatrol(chr); + chr_try_start_patrol(chr); return; } - chrStop(chr); + chr_stop(chr); return; } } if (advance) { - chrGoPosAdvanceWaypoint(chr); + chr_go_pos_advance_waypoint(chr); } // Every 10 ticks: Check something a couple of waypoints ahead @@ -12878,7 +12878,7 @@ void chrTickGoPos(struct chrdata *chr) waypoint = chr->act_gopos.waypoints[chr->act_gopos.curindex]; if (waypoint) { - padUnpack(waypoint->padnum, PADFIELD_FLAGS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_FLAGS, &pad); if ((pad.flags & PADFLAG_AIWALKDIRECT) == 0) { // The waypoint the chr is running to doesn't have @@ -12889,7 +12889,7 @@ void chrTickGoPos(struct chrdata *chr) waypoint = chr->act_gopos.waypoints[chr->act_gopos.curindex + 1]; if (waypoint) { - padUnpack(waypoint->padnum, PADFIELD_FLAGS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_FLAGS, &pad); if ((pad.flags & PADFLAG_AIWALKDIRECT) == 0) { // And this one doesn't have PADFLAG_AIWALKDIRECT either, @@ -12897,7 +12897,7 @@ void chrTickGoPos(struct chrdata *chr) waypoint = chr->act_gopos.waypoints[chr->act_gopos.curindex + 2]; if (waypoint) { - padUnpack(waypoint->padnum, PADFIELD_ROOM | PADFIELD_POS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_ROOM | PADFIELD_POS, &pad); nextpos.x = pad.pos.x; nextpos.y = pad.pos.y; @@ -12910,13 +12910,13 @@ void chrTickGoPos(struct chrdata *chr) nextpos.y = chr->act_gopos.endpos.y; nextpos.z = chr->act_gopos.endpos.z; - roomsCopy(chr->act_gopos.endrooms, nextrooms); + rooms_copy(chr->act_gopos.endrooms, nextrooms); } // Some bbox related check if (func0f03654c(chr, &prop->pos, prop->rooms, &nextpos, nextrooms, NULL, chr->radius * 1.2f, CDTYPE_PATHBLOCKER | CDTYPE_BG)) { - chrGoPosAdvanceWaypoint(chr); - chrGoPosAdvanceWaypoint(chr); + chr_go_pos_advance_waypoint(chr); + chr_go_pos_advance_waypoint(chr); } } } @@ -12929,12 +12929,12 @@ void chrTickGoPos(struct chrdata *chr) if (waypoint) { candosomething = (chr->act_gopos.flags & GOPOSFLAG_INIT) != 0; - padUnpack(waypoint->padnum, PADFIELD_FLAGS | PADFIELD_POS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_FLAGS | PADFIELD_POS, &pad); next = chr->act_gopos.waypoints[chr->act_gopos.curindex + 1]; if (next) { - padUnpack(next->padnum, PADFIELD_ROOM | PADFIELD_POS, &pad2); + pad_unpack(next->padnum, PADFIELD_ROOM | PADFIELD_POS, &pad2); if ((pad.flags & (PADFLAG_AIWAITLIFT | PADFLAG_AIONLIFT)) && (pad2.flags & (PADFLAG_AIWAITLIFT | PADFLAG_AIONLIFT))) { @@ -12955,7 +12955,7 @@ void chrTickGoPos(struct chrdata *chr) nextpos.y = chr->act_gopos.endpos.y; nextpos.z = chr->act_gopos.endpos.z; - roomsCopy(chr->act_gopos.endrooms, nextrooms); + rooms_copy(chr->act_gopos.endrooms, nextrooms); } // I suspect this is making the chr turn to face the next pad @@ -12974,13 +12974,13 @@ void chrTickGoPos(struct chrdata *chr) if (sp160 < RAD(45, 0.7852731347084f) || sp160 > RAD(315, 5.4969120025635f)) { if (func0f03654c(chr, &prop->pos, prop->rooms, &nextpos, nextrooms, NULL, chr->radius * 1.2f, CDTYPE_PATHBLOCKER | CDTYPE_BG)) { - chrGoPosAdvanceWaypoint(chr); + chr_go_pos_advance_waypoint(chr); } } } } else { if (func0f03654c(chr, &prop->pos, prop->rooms, &nextpos, nextrooms, NULL, chr->radius * 1.2f, CDTYPE_PATHBLOCKER | CDTYPE_BG)) { - chrGoPosAdvanceWaypoint(chr); + chr_go_pos_advance_waypoint(chr); } } } @@ -12992,7 +12992,7 @@ void chrTickGoPos(struct chrdata *chr) waypoint = chr->act_gopos.waypoints[chr->act_gopos.curindex]; if (waypoint) { - padUnpack(waypoint->padnum, PADFIELD_POS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_POS, &pad); nextpos.x = pad.pos.x; nextpos.y = pad.pos.y; @@ -13007,11 +13007,11 @@ void chrTickGoPos(struct chrdata *chr) } } - chrNavTickMain(chr, &nextpos, &chr->act_gopos.waydata, sp240); + chr_nav_tick_main(chr, &nextpos, &chr->act_gopos.waydata, sp240); } } -void chrTickPatrol(struct chrdata *chr) +void chr_tick_patrol(struct chrdata *chr) { struct prop *prop = chr->prop; bool enteringmagic; @@ -13025,15 +13025,15 @@ void chrTickPatrol(struct chrdata *chr) enteringmagic = 0; if (chr->hidden & CHRHFLAG_NEEDANIM) { - if (modelIsAnimMerging(chr->model)) { + if (model_is_anim_merging(chr->model)) { return; } - chrPatrolChooseAnimation(chr); + chr_patrol_choose_animation(chr); chr->hidden &= ~CHRHFLAG_NEEDANIM; } - chrPatrolGetCurWaypointInfoWithFlags(chr, &sp58, sp48, &flags); + chr_patrol_get_cur_waypoint_info_with_flags(chr, &sp58, sp48, &flags); chr->act_patrol.waydata.age++; @@ -13041,15 +13041,15 @@ void chrTickPatrol(struct chrdata *chr) if (chr->act_patrol.waydata.mode != WAYMODE_MAGIC && g_Vars.lvframe60 > chr->act_patrol.waydata.lastvisible60 + TICKS(180) && !g_Vars.normmplayerisrunning - && chrIsRoomOffScreen(chr, &sp58, sp48) + && chr_is_room_off_screen(chr, &sp58, sp48) && (flags & (PADFLAG_AIWAITLIFT | PADFLAG_AIONLIFT)) == 0 && !chr->inlift) { enteringmagic = true; - chrGoPosInitMagic(chr, &chr->act_patrol.waydata, &sp58, &prop->pos); + chr_go_pos_init_magic(chr, &chr->act_patrol.waydata, &sp58, &prop->pos); } if (chr->act_patrol.waydata.mode == WAYMODE_MAGIC) { - if ((!enteringmagic && ((prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) || !chrIsRoomOffScreen(chr, &sp58, sp48))) + if ((!enteringmagic && ((prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) || !chr_is_room_off_screen(chr, &sp58, sp48))) || (flags & (PADFLAG_AIWAITLIFT | PADFLAG_AIONLIFT)) || chr->inlift) { // Exit magic for lifts @@ -13057,53 +13057,53 @@ void chrTickPatrol(struct chrdata *chr) func0f037580(chr); } else { // Continue magic - chrNavTickMagic(chr, &chr->act_patrol.waydata, func0f0370a8(chr), &sp58, sp48); + chr_nav_tick_magic(chr, &chr->act_patrol.waydata, func0f0370a8(chr), &sp58, sp48); } - footstepCheckMagic(chr); + footstep_check_magic(chr); } else { - arrivinglaterally = posIsArrivingLaterallyAtPos(&chr->prevpos, &prop->pos, &sp58, 30); - arriving = posIsArrivingAtPos(&chr->prevpos, &prop->pos, &sp58, 30); + arrivinglaterally = pos_is_arriving_laterally_at_pos(&chr->prevpos, &prop->pos, &sp58, 30); + arriving = pos_is_arriving_at_pos(&chr->prevpos, &prop->pos, &sp58, 30); advance = false; if ((flags & PADFLAG_AIWAITLIFT) || (flags & PADFLAG_AIONLIFT)) { - advance = chrGoPosUpdateLiftAction(chr, flags, arrivinglaterally, arriving, - chrPatrolCalculatePadNum(chr, 0), - chrPatrolCalculatePadNum(chr, 1)); + advance = chr_go_pos_update_lift_action(chr, flags, arrivinglaterally, arriving, + chr_patrol_calculate_pad_num(chr, 0), + chr_patrol_calculate_pad_num(chr, 1)); } else if (arriving) { advance = true; } if (advance) { func0f0375b0(chr); - chrPatrolGetCurWaypointInfo(chr, &sp58, sp48); + chr_patrol_get_cur_waypoint_info(chr, &sp58, sp48); } - chrNavTickMain(chr, &sp58, &chr->act_patrol.waydata, true); - footstepCheckDefault(chr); + chr_nav_tick_main(chr, &sp58, &chr->act_patrol.waydata, true); + footstep_check_default(chr); } } -bool chrTrySkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4) +bool chr_try_sk_jump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4) { if (chr && chr->actiontype != ACT_SKJUMP - && chrIsReadyForOrders(chr) + && chr_is_ready_for_orders(chr) && CHRRACE(chr) == RACE_SKEDAR) { - return chrStartSkJump(chr, arg1, arg2, arg3, arg4); + return chr_start_sk_jump(chr, arg1, arg2, arg3, arg4); } return false; } -bool chrStartSkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4) +bool chr_start_sk_jump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4) { f32 radius; f32 ymax; f32 ymin; struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); bool iVar2; - f32 distance = chrGetDistanceToCoord(chr, &target->pos); + f32 distance = chr_get_distance_to_coord(chr, &target->pos); f32 diffs[2]; f32 thing; s32 time60; @@ -13112,14 +13112,14 @@ bool chrStartSkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4) return false; } - chrGetBbox(prop, &radius, &ymax, &ymin); - chrSetPerimEnabled(chr, false); - propSetPerimEnabled(target, false); - iVar2 = cdTestCylMove01(&prop->pos, prop->rooms, &target->pos, + chr_get_bbox(prop, &radius, &ymax, &ymin); + chr_set_perim_enabled(chr, false); + prop_set_perim_enabled(target, false); + iVar2 = cd_test_cyl_move01(&prop->pos, prop->rooms, &target->pos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG, 1, ymax - prop->pos.y, ymin - prop->pos.y); - chrSetPerimEnabled(chr, true); - propSetPerimEnabled(target, true); + chr_set_perim_enabled(chr, true); + prop_set_perim_enabled(target, true); if (iVar2) { diffs[0] = target->pos.x - chr->prop->pos.x; @@ -13133,11 +13133,11 @@ bool chrStartSkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4) chr->act_skjump.vel[0] = diffs[0] / time60; chr->act_skjump.vel[1] = diffs[1] / time60; - chr->act_skjump.roty = chrGetInverseTheta(chr) + chrGetAngleToPos(chr, &target->pos); + chr->act_skjump.roty = chr_get_inverse_theta(chr) + chr_get_angle_to_pos(chr, &target->pos); chr->act_skjump.hit = false; chr->act_skjump.timer60 = time60; chr->act_skjump.total60 = time60; - chr->act_skjump.ground = cdFindGroundAtCyl(&chr->prop->pos, chr->radius, chr->prop->rooms, NULL, NULL); + chr->act_skjump.ground = cd_find_ground_at_cyl(&chr->prop->pos, chr->radius, chr->prop->rooms, NULL, NULL); } else { return false; } @@ -13149,7 +13149,7 @@ bool chrStartSkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4) return true; } -void chrTickSkJump(struct chrdata *chr) +void chr_tick_sk_jump(struct chrdata *chr) { if (g_Vars.lvupdate60 == 0) { return; @@ -13160,8 +13160,8 @@ void chrTickSkJump(struct chrdata *chr) switch (chr->act_skjump.state) { case SKJUMPSTATE_TAKEOFF: - modelSetAnimation(chr->model, ANIM_SKEDAR_JUMPSTART, 0, 0, -1, 8); - modelSetAnimSpeed(chr->model, 2.5, 0); + model_set_animation(chr->model, ANIM_SKEDAR_JUMPSTART, 0, 0, -1, 8); + model_set_anim_speed(chr->model, 2.5, 0); break; case SKJUMPSTATE_AIRBORNE: { u16 sounds[] = { @@ -13170,10 +13170,10 @@ void chrTickSkJump(struct chrdata *chr) SFX_SKEDAR_ROAR_0534, }; - psCreate(NULL, chr->prop, sounds[random() % 3], -1, + ps_create(NULL, chr->prop, sounds[random() % 3], -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); - modelSetAnimation(chr->model, ANIM_SKEDAR_JUMPAIR, 0, 0, -1, 16); - modelSetAnimSpeed(chr->model, 1, 0); + model_set_animation(chr->model, ANIM_SKEDAR_JUMPAIR, 0, 0, -1, 16); + model_set_anim_speed(chr->model, 1, 0); } break; } @@ -13188,12 +13188,12 @@ void chrTickSkJump(struct chrdata *chr) switch (chr->act_skjump.state) { case SKJUMPSTATE_TAKEOFF: - fVar6 = chrGetInverseTheta(chr); - fVar5 = modelTweenRotAxis(fVar6, chr->act_skjump.roty, 0.35); - chrSetLookAngle(chr, fVar5); - frame = modelGetCurAnimFrame(chr->model); + fVar6 = chr_get_inverse_theta(chr); + fVar5 = model_tween_rot_axis(fVar6, chr->act_skjump.roty, 0.35); + chr_set_look_angle(chr, fVar5); + frame = model_get_cur_anim_frame(chr->model); - if (frame >= modelGetAnimEndFrame(chr->model)) { + if (frame >= model_get_anim_end_frame(chr->model)) { chr->act_skjump.state++; chr->act_skjump.needsnewanim = true; } @@ -13217,22 +13217,22 @@ void chrTickSkJump(struct chrdata *chr) chr->act_skjump.pos.y = 0; } - if (!chr->act_skjump.hit && chrGetDistanceToTarget(chr) < 150.0f) { - chrPunchInflictDamage(chr, 3, 150, false); + if (!chr->act_skjump.hit && chr_get_distance_to_target(chr) < 150.0f) { + chr_punch_inflict_damage(chr, 3, 150, false); chr->act_skjump.hit = true; } if (chr->act_skjump.timer60 > 0) { chr->act_skjump.timer60 -= g_Vars.lvupdate60; } else { - chrTryStop(chr); + chr_try_stop(chr); } break; } } } -void chraTick(struct chrdata *chr) +void chra_tick(struct chrdata *chr) { u32 race = CHRRACE(chr); @@ -13272,7 +13272,7 @@ void chraTick(struct chrdata *chr) u8 pass = race == RACE_HUMAN || race == RACE_SKEDAR; chr->sleep = 0; - chraiExecute(chr, PROPTYPE_CHR); + chrai_execute(chr, PROPTYPE_CHR); // Consider setting shootingatmelist if (chr->prop) { @@ -13280,8 +13280,8 @@ void chraTick(struct chrdata *chr) chr->aimtesttimer60 = TICKS(30); if (chr->aishootingatmelist >= 0 - && ailistFindById(chr->aishootingatmelist) != chr->ailist - && chrIsTargetAimingAtMe(chr)) { + && ailist_find_by_id(chr->aishootingatmelist) != chr->ailist + && chr_is_target_aiming_at_me(chr)) { chr->chrflags |= CHRCFLAG_CONSIDER_DODGE; } } else { @@ -13292,8 +13292,8 @@ void chraTick(struct chrdata *chr) // Consider setting darkroomlist if (chr->prop && chr->aidarkroomlist >= 0 - && roomGetSettledLocalBrightness(chr->prop->rooms[0]) < 25 - && ailistFindById(chr->aidarkroomlist) != chr->ailist) { + && room_get_settled_local_brightness(chr->prop->rooms[0]) < 25 + && ailist_find_by_id(chr->aidarkroomlist) != chr->ailist) { chr->darkroomthing = true; } @@ -13307,7 +13307,7 @@ void chraTick(struct chrdata *chr) if (playercount >= 2) { for (i = 0; i < playercount && alldead; i++) { if (i != prevplayernum) { - setCurrentPlayerNum(i); + set_current_player_num(i); if (g_Vars.currentplayer->isdead == false) { alldead = false; @@ -13315,54 +13315,54 @@ void chraTick(struct chrdata *chr) } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } - if (alldead && ailistFindById(chr->aiplayerdeadlist) != chr->ailist) { + if (alldead && ailist_find_by_id(chr->aiplayerdeadlist) != chr->ailist) { chr->playerdeadthing = true; } } if (race == RACE_ROBOT) { - robotSetMuzzleFlash(chr, 0, false); - robotSetMuzzleFlash(chr, 1, false); + robot_set_muzzle_flash(chr, 0, false); + robot_set_muzzle_flash(chr, 1, false); } if (chr->prop) { if (g_Vars.in_cutscene) { switch (chr->actiontype) { - case ACT_ANIM: chrTickAnim(chr); break; - case ACT_PATROL: chrTickPatrol(chr); pass = false; break; + case ACT_ANIM: chr_tick_anim(chr); break; + case ACT_PATROL: chr_tick_patrol(chr); pass = false; break; } } else { switch (chr->actiontype) { - case ACT_STAND: chrTickStand(chr); break; - case ACT_KNEEL: chrTickKneel(chr); break; - case ACT_ANIM: chrTickAnim(chr); break; - case ACT_DIE: chrTickDie(chr); break; - case ACT_ARGH: chrTickArgh(chr); break; - case ACT_PREARGH: chrTickPreArgh(chr); break; - case ACT_SIDESTEP: chrTickSidestep(chr); break; - case ACT_JUMPOUT: chrTickJumpOut(chr); break; - case ACT_DEAD: chrTickDead(chr); break; - case ACT_ATTACK: chrTickAttack(chr); break; - case ACT_ATTACKWALK: chrTickAttackWalk(chr); break; - case ACT_ATTACKROLL: chrTickAttackRoll(chr); break; - case ACT_RUNPOS: chrTickRunPos(chr); break; - case ACT_PATROL: chrTickPatrol(chr); pass = false; break; - case ACT_GOPOS: chrTickGoPos(chr); break; - case ACT_SURRENDER: chrTickSurrender(chr); break; - case ACT_TEST: chrTickTest(chr); break; - case ACT_SURPRISED: chrTickSurprised(chr); break; - case ACT_STARTALARM: chrTickStartAlarm(chr); break; - case ACT_THROWGRENADE: chrTickThrowGrenade(chr); break; - case ACT_BONDDIE: chrTickBondDie(chr); break; - case ACT_DRUGGEDCOMINGUP: chrTickDruggedComingUp(chr); break; - case ACT_DRUGGEDDROP: chrTickDruggedDrop(chr); break; - case ACT_DRUGGEDKO: chrTickDruggedKo(chr); break; - case ACT_ATTACKAMOUNT: chrTickAttackAmount(chr); break; - case ACT_ROBOTATTACK: chrTickRobotAttack(chr); break; - case ACT_SKJUMP: chrTickSkJump(chr); break; + case ACT_STAND: chr_tick_stand(chr); break; + case ACT_KNEEL: chr_tick_kneel(chr); break; + case ACT_ANIM: chr_tick_anim(chr); break; + case ACT_DIE: chr_tick_die(chr); break; + case ACT_ARGH: chr_tick_argh(chr); break; + case ACT_PREARGH: chr_tick_pre_argh(chr); break; + case ACT_SIDESTEP: chr_tick_sidestep(chr); break; + case ACT_JUMPOUT: chr_tick_jump_out(chr); break; + case ACT_DEAD: chr_tick_dead(chr); break; + case ACT_ATTACK: chr_tick_attack(chr); break; + case ACT_ATTACKWALK: chr_tick_attack_walk(chr); break; + case ACT_ATTACKROLL: chr_tick_attack_roll(chr); break; + case ACT_RUNPOS: chr_tick_run_pos(chr); break; + case ACT_PATROL: chr_tick_patrol(chr); pass = false; break; + case ACT_GOPOS: chr_tick_go_pos(chr); break; + case ACT_SURRENDER: chr_tick_surrender(chr); break; + case ACT_TEST: chr_tick_test(chr); break; + case ACT_SURPRISED: chr_tick_surprised(chr); break; + case ACT_STARTALARM: chr_tick_start_alarm(chr); break; + case ACT_THROWGRENADE: chr_tick_throw_grenade(chr); break; + case ACT_BONDDIE: chr_tick_bond_die(chr); break; + case ACT_DRUGGEDCOMINGUP: chr_tick_drugged_coming_up(chr); break; + case ACT_DRUGGEDDROP: chr_tick_drugged_drop(chr); break; + case ACT_DRUGGEDKO: chr_tick_drugged_ko(chr); break; + case ACT_ATTACKAMOUNT: chr_tick_attack_amount(chr); break; + case ACT_ROBOTATTACK: chr_tick_robot_attack(chr); break; + case ACT_SKJUMP: chr_tick_sk_jump(chr); break; } } } @@ -13375,14 +13375,14 @@ void chraTick(struct chrdata *chr) #endif if (pass) { - footstepCheckDefault(chr); + footstep_check_default(chr); } } else { - footstepCheckMagic(chr); + footstep_check_magic(chr); } } -void cutsceneStart(u32 ailistid) +void cutscene_start(u32 ailistid) { struct prop *prop; @@ -13404,7 +13404,7 @@ void cutsceneStart(u32 ailistid) prop = prop->next; } - g_BgChrs[g_NumBgChrs - 1].ailist = ailistFindById(ailistid); + g_BgChrs[g_NumBgChrs - 1].ailist = ailist_find_by_id(ailistid); g_BgChrs[g_NumBgChrs - 1].aioffset = 0; g_BgChrs[g_NumBgChrs - 1].aireturnlist = -1; } @@ -13417,10 +13417,10 @@ void cutsceneStart(u32 ailistid) * - Run BG scripts * - Choose which corpses to fade */ -void chraTickBg(void) +void chra_tick_bg(void) { s32 i; - s32 numchrs = chrsGetNumSlots(); + s32 numchrs = chrs_get_num_slots(); s32 numaliveonscreen; s32 numdeadonscreen; s32 onscreenlen; @@ -13467,13 +13467,13 @@ void chraTickBg(void) for (i = 0; i < numchrs; i++) { struct chrdata *chr = &g_ChrSlots[i]; - if (chr->model && chr->prop && !chrIsDead(chr)) { - struct prop *targetprop = chrGetTargetProp(chr); + if (chr->model && chr->prop && !chr_is_dead(chr)) { + struct prop *targetprop = chr_get_target_prop(chr); if (targetprop && (targetprop->type == PROPTYPE_CHR || targetprop->type == PROPTYPE_PLAYER)) { if ((targetprop->type == PROPTYPE_PLAYER && !(g_Vars.antiplayernum >= 0 && g_Vars.anti && g_Vars.anti->prop == targetprop) - && chrCompareTeams(chr, targetprop->chr, COMPARE_ENEMIES)) + && chr_compare_teams(chr, targetprop->chr, COMPARE_ENEMIES)) || CHRRACE(targetprop->chr) == RACE_EYESPY) { s32 time60; s32 lastsee; @@ -13507,13 +13507,13 @@ void chraTickBg(void) #endif // If enabled, print a list of dangerous props to the developer's console - if (debugDangerousProps()) { - propPrintDangerous(); + if (debug_dangerous_props()) { + prop_print_dangerous(); } // Handle switching to a new cutscene when using "Play All" from the menu if (g_Vars.autocutnum >= 0) { - cutsceneStart(g_Vars.autocutnum + 0xc00); + cutscene_start(g_Vars.autocutnum + 0xc00); g_Vars.autocutnum = -1; g_Vars.autocutplaying = true; } @@ -13521,7 +13521,7 @@ void chraTickBg(void) // Run BG scripts for (i = 0; i < g_NumBgChrs; i++) { if (!g_Vars.autocutplaying || (g_BgChrs[i].hidden2 & CHRH2FLAG_TICKDURINGAUTOCUT)) { - chraTick(&g_BgChrs[i]); + chra_tick(&g_BgChrs[i]); } } @@ -13559,7 +13559,7 @@ void chraTickBg(void) if (spawnslen >= 10) { writeindex = random() % spawnslen; - chrFadeCorpse(spawns[writeindex]); + chr_fade_corpse(spawns[writeindex]); spawns[writeindex] = spawns[spawnslen - 1]; spawnslen--; } @@ -13602,7 +13602,7 @@ void chraTickBg(void) && chr->prop && (chr->chrflags & CHRCFLAG_KEEPCORPSEKO) == 0)) && chr->act_dead.fadetimer60 < 0 && !chr->act_dead.fadenow) { - chrFadeCorpse(chr); + chr_fade_corpse(chr); } } } @@ -13624,7 +13624,7 @@ void chraTickBg(void) if (chr->model) { #if VERSION < VERSION_NTSC_1_0 if (!g_Vars.mplayerisrunning - && chrGetTargetProp(chr)->type == PROPTYPE_PLAYER + && chr_get_target_prop(chr)->type == PROPTYPE_PLAYER && chr->lastseetarget60 > 0 && g_Vars.lvframe60 - chr->lastseetarget60 < TICKS(120)) { g_NumChrsSeenPlayerRecently2++; @@ -13640,7 +13640,7 @@ void chraTickBg(void) // If there's too many corpses on screen, start fading. if (numdeadonscreen > maxdeadonscreen || chr->aibot) { - chrFadeCorpse(chr); + chr_fade_corpse(chr); numdeadonscreen--; } else if (!chr->act_dead.fadewheninvis) { // If there are 2 or more corpses on screen, @@ -13650,7 +13650,7 @@ void chraTickBg(void) if (onscreenlen >= (VERSION >= VERSION_NTSC_1_0 ? 2 : 3)) { writeindex = random() % onscreenlen; - chrFadeCorpseWhenOffScreen(onscreen[writeindex]); + chr_fade_corpse_when_off_screen(onscreen[writeindex]); onscreen[writeindex] = onscreen[onscreenlen - 1]; onscreenlen--; } @@ -13667,10 +13667,10 @@ void chraTickBg(void) writeindex = random() % offscreenlen; if (offscreen[writeindex]->actiontype != ACT_DEAD) { - chrBeginDead(offscreen[writeindex]); + chr_begin_dead(offscreen[writeindex]); } - chrFadeCorpseWhenOffScreen(offscreen[writeindex]); + chr_fade_corpse_when_off_screen(offscreen[writeindex]); offscreen[writeindex] = offscreen[offscreenlen - 1]; offscreenlen--; } @@ -13685,7 +13685,7 @@ void chraTickBg(void) if (1); } -bool chrSawTargetRecently(struct chrdata *chr) +bool chr_saw_target_recently(struct chrdata *chr) { if (chr->lastseetarget60 > 0 && g_Vars.lvframe60 - chr->lastseetarget60 < TICKS(600)) { return true; @@ -13694,7 +13694,7 @@ bool chrSawTargetRecently(struct chrdata *chr) return false; } -bool chrHeardTargetRecently(struct chrdata *chr) +bool chr_heard_target_recently(struct chrdata *chr) { if (chr->lastheartarget60 > 0 && g_Vars.lvframe60 - chr->lastheartarget60 < TICKS(600)) { return true; @@ -13703,7 +13703,7 @@ bool chrHeardTargetRecently(struct chrdata *chr) return false; } -f32 chrGetAngleToPos(struct chrdata *chr, struct coord *pos) +f32 chr_get_angle_to_pos(struct chrdata *chr, struct coord *pos) { f32 fVar3; f32 fVar2; @@ -13711,10 +13711,10 @@ f32 chrGetAngleToPos(struct chrdata *chr, struct coord *pos) struct prop *prop; if (chr->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); fVar3 = (360 - g_Vars.players[playernum]->vv_theta) * (M_BADTAU / 360); } else { - fVar3 = chrGetInverseTheta(chr); + fVar3 = chr_get_inverse_theta(chr); } prop = chr->prop; @@ -13728,13 +13728,13 @@ f32 chrGetAngleToPos(struct chrdata *chr, struct coord *pos) return fVar4; } -f32 chrGetAngleToTarget(struct chrdata *chr) +f32 chr_get_angle_to_target(struct chrdata *chr) { - struct prop *prop = chrGetTargetProp(chr); - return chrGetAngleToPos(chr, &prop->pos); + struct prop *prop = chr_get_target_prop(chr); + return chr_get_angle_to_pos(chr, &prop->pos); } -void chrGetAttackEntityPos(struct chrdata *chr, u32 attackflags, s32 entityid, struct coord *pos, RoomNum *rooms) +void chr_get_attack_entity_pos(struct chrdata *chr, u32 attackflags, s32 entityid, struct coord *pos, RoomNum *rooms) { struct prop *targetprop; struct chrdata *targetchr; @@ -13742,7 +13742,7 @@ void chrGetAttackEntityPos(struct chrdata *chr, u32 attackflags, s32 entityid, s if (attackflags & ATTACKFLAG_AIMATCHR) { // Aiming at a chr by chrnum - targetchr = chrFindById(chr, entityid); + targetchr = chr_find_by_id(chr, entityid); if (!targetchr || !targetchr->prop) { targetchr = chr; @@ -13760,11 +13760,11 @@ void chrGetAttackEntityPos(struct chrdata *chr, u32 attackflags, s32 entityid, s if (chr); - roomsCopy(targetchr->prop->rooms, rooms); + rooms_copy(targetchr->prop->rooms, rooms); } else if (attackflags & ATTACKFLAG_AIMATPAD) { // Aiming at a pad by padnum - s32 padnum = chrResolvePadId(chr, entityid); - padUnpack(padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); + s32 padnum = chr_resolve_pad_id(chr, entityid); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); pos->x = pad.pos.x; pos->y = pad.pos.y; @@ -13774,7 +13774,7 @@ void chrGetAttackEntityPos(struct chrdata *chr, u32 attackflags, s32 entityid, s rooms[1] = -1; } else { // Aiming at the chr's preconfigured target - targetprop = chrGetTargetProp(chr); + targetprop = chr_get_target_prop(chr); pos->x = targetprop->pos.x; pos->y = targetprop->pos.y; @@ -13788,15 +13788,15 @@ void chrGetAttackEntityPos(struct chrdata *chr, u32 attackflags, s32 entityid, s if (chr); - roomsCopy(targetprop->rooms, rooms); + rooms_copy(targetprop->rooms, rooms); } } -f32 chrGetAngleFromTargetsFov(struct chrdata *chr) +f32 chr_get_angle_from_targets_fov(struct chrdata *chr) { f32 targetfacingangle = 0; struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); f32 xdiff; f32 zdiff; f32 angletotarget; @@ -13808,10 +13808,10 @@ f32 chrGetAngleFromTargetsFov(struct chrdata *chr) angletotarget = atan2f(xdiff, zdiff); if (target->type == PROPTYPE_PLAYER) { - s32 playernum = playermgrGetPlayerNumByProp(target); + s32 playernum = playermgr_get_player_num_by_prop(target); targetfacingangle = (360.0f - g_Vars.players[playernum]->vv_theta) * M_BADTAU / 360.0f; } else if (target->type == PROPTYPE_CHR) { - targetfacingangle = chrGetInverseTheta(target->chr); + targetfacingangle = chr_get_inverse_theta(target->chr); } result = angletotarget - targetfacingangle; @@ -13824,10 +13824,10 @@ f32 chrGetAngleFromTargetsFov(struct chrdata *chr) return result; } -f32 chrGetVerticalAngleToTarget(struct chrdata *chr) +f32 chr_get_vertical_angle_to_target(struct chrdata *chr) { struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); f32 result = 0; if (prop && target) { @@ -13849,9 +13849,9 @@ f32 chrGetVerticalAngleToTarget(struct chrdata *chr) return result; } -bool chrIsInTargetsFovX(struct chrdata *chr, u8 fov360) +bool chr_is_in_targets_fov_x(struct chrdata *chr, u8 fov360) { - f32 angle = chrGetAngleFromTargetsFov(chr); + f32 angle = chr_get_angle_from_targets_fov(chr); if ((angle < fov360 * 0.024539785459638f && angle < M_PI) || (angle > M_BADTAU - fov360 * 0.024539785459638f && angle > M_PI)) { @@ -13861,9 +13861,9 @@ bool chrIsInTargetsFovX(struct chrdata *chr, u8 fov360) return false; } -bool chrIsVerticalAngleToTargetWithin(struct chrdata *chr, u8 fov360) +bool chr_is_vertical_angle_to_target_within(struct chrdata *chr, u8 fov360) { - f32 val = chrGetVerticalAngleToTarget(chr); + f32 val = chr_get_vertical_angle_to_target(chr); if ((val < fov360 * 0.024539785459638f && val < M_PI) || (val > M_BADTAU - fov360 * 0.024539785459638f && val > M_PI)) { @@ -13878,13 +13878,13 @@ f32 func0f048fcc(struct chrdata *chr, u8 reverse) f32 result; struct prop *chrprop = chr->prop; - struct prop *targetprop = chrGetTargetProp(chr); + struct prop *targetprop = chr_get_target_prop(chr); f32 xdiff = chrprop->pos.x - targetprop->pos.x; f32 zdiff = chrprop->pos.z - targetprop->pos.z; f32 angle1 = atan2f(-xdiff, -zdiff); - f32 angle2 = chrGetInverseTheta(chr) + M_PI * (s32)reverse; + f32 angle2 = chr_get_inverse_theta(chr) + M_PI * (s32)reverse; result = angle1 - angle2; @@ -13895,7 +13895,7 @@ f32 func0f048fcc(struct chrdata *chr, u8 reverse) return result; } -bool chrIsTargetInFov(struct chrdata *chr, u8 arg1, u8 reverse) +bool chr_is_target_in_fov(struct chrdata *chr, u8 arg1, u8 reverse) { f32 angle = func0f048fcc(chr, reverse); @@ -13907,9 +13907,9 @@ bool chrIsTargetInFov(struct chrdata *chr, u8 arg1, u8 reverse) return false; } -bool chrIsLookingAtPos(struct chrdata *chr, struct coord *pos, u8 arg2) +bool chr_is_looking_at_pos(struct chrdata *chr, struct coord *pos, u8 arg2) { - f32 angle = chrGetAngleToPos(chr, pos); + f32 angle = chr_get_angle_to_pos(chr, pos); if ((angle < arg2 * 0.024539785459638f && angle < M_PI) || (M_BADTAU - arg2 * 0.024539785459638f < angle && M_PI < angle)) { @@ -13919,25 +13919,25 @@ bool chrIsLookingAtPos(struct chrdata *chr, struct coord *pos, u8 arg2) return false; } -f32 chrGetDistanceToTarget(struct chrdata *chr) +f32 chr_get_distance_to_target(struct chrdata *chr) { - struct prop *prop = chrGetTargetProp(chr); - return propGetDistanceToProp(chr->prop, prop); + struct prop *prop = chr_get_target_prop(chr); + return prop_get_distance_to_prop(chr->prop, prop); } // Redundant function - it's the same as above -f32 chrGetDistanceToTarget2(struct chrdata *chr) +f32 chr_get_distance_to_target2(struct chrdata *chr) { - struct prop *prop = chrGetTargetProp(chr); - return propGetDistanceToProp(chr->prop, prop); + struct prop *prop = chr_get_target_prop(chr); + return prop_get_distance_to_prop(chr->prop, prop); } -f32 chrGetDistanceToCurrentPlayer(struct chrdata *chr) +f32 chr_get_distance_to_current_player(struct chrdata *chr) { - return propGetDistanceToProp(chr->prop, g_Vars.currentplayer->prop); + return prop_get_distance_to_prop(chr->prop, g_Vars.currentplayer->prop); } -f32 propGetDistanceToProp(struct prop *a, struct prop *b) +f32 prop_get_distance_to_prop(struct prop *a, struct prop *b) { f32 xdiff = a->pos.x - b->pos.x; f32 ydiff = a->pos.y - b->pos.y; @@ -13946,7 +13946,7 @@ f32 propGetDistanceToProp(struct prop *a, struct prop *b) return sqrtf(xdiff * xdiff + ydiff * ydiff + zdiff * zdiff); } -f32 propGetLateralDistanceToProp(struct prop *a, struct prop *b) +f32 prop_get_lateral_distance_to_prop(struct prop *a, struct prop *b) { f32 xdiff = a->pos.x - b->pos.x; f32 zdiff = a->pos.z - b->pos.z; @@ -13954,19 +13954,19 @@ f32 propGetLateralDistanceToProp(struct prop *a, struct prop *b) return sqrtf(xdiff * xdiff + zdiff * zdiff); } -f32 chrGetDistanceToPad(struct chrdata *chr, s32 pad_id) +f32 chr_get_distance_to_pad(struct chrdata *chr, s32 pad_id) { struct prop *prop = chr->prop; f32 xdiff, ydiff, zdiff; f32 distance = 0; struct pad pad; - pad_id = chrResolvePadId(chr, pad_id); + pad_id = chr_resolve_pad_id(chr, pad_id); #if VERSION >= VERSION_NTSC_1_0 if (pad_id >= 0) #endif { - padUnpack(pad_id, PADFIELD_POS, &pad); + pad_unpack(pad_id, PADFIELD_POS, &pad); xdiff = pad.pos.x - prop->pos.x; ydiff = pad.pos.y - prop->pos.y; zdiff = pad.pos.z - prop->pos.z; @@ -13977,15 +13977,15 @@ f32 chrGetDistanceToPad(struct chrdata *chr, s32 pad_id) } #if VERSION >= VERSION_NTSC_1_0 -f32 chrGetSameFloorDistanceToPad(struct chrdata *chr, s32 pad_id) +f32 chr_get_same_floor_distance_to_pad(struct chrdata *chr, s32 pad_id) { struct prop *prop = chr->prop; f32 xdiff, ydiff, zdiff, ydiff_absolute; struct pad pad; f32 ret; - pad_id = chrResolvePadId(chr, pad_id); - padUnpack(pad_id, PADFIELD_POS, &pad); + pad_id = chr_resolve_pad_id(chr, pad_id); + pad_unpack(pad_id, PADFIELD_POS, &pad); xdiff = pad.pos.x - prop->pos.x; ydiff = pad.pos.y - prop->pos.y; zdiff = pad.pos.z - prop->pos.z; @@ -14006,7 +14006,7 @@ f32 chrGetSameFloorDistanceToPad(struct chrdata *chr, s32 pad_id) } #endif -f32 chrGetDistanceToCoord(struct chrdata *chr, struct coord *pos) +f32 chr_get_distance_to_coord(struct chrdata *chr, struct coord *pos) { f32 xdiff = pos->x - chr->prop->pos.x; f32 ydiff = pos->y - chr->prop->pos.y; @@ -14015,7 +14015,7 @@ f32 chrGetDistanceToCoord(struct chrdata *chr, struct coord *pos) return sqrtf(xdiff * xdiff + ydiff * ydiff + zdiff * zdiff); } -f32 chrGetLateralDistanceToCoord(struct chrdata *chr, struct coord *pos) +f32 chr_get_lateral_distance_to_coord(struct chrdata *chr, struct coord *pos) { f32 xdiff = pos->x - chr->prop->pos.x; f32 zdiff = pos->z - chr->prop->pos.z; @@ -14023,7 +14023,7 @@ f32 chrGetLateralDistanceToCoord(struct chrdata *chr, struct coord *pos) return sqrtf(xdiff * xdiff + zdiff * zdiff); } -f32 chrGetLateralDistanceToPad(struct chrdata *chr, s32 pad_id) +f32 chr_get_lateral_distance_to_pad(struct chrdata *chr, s32 pad_id) { struct prop *prop = chr->prop; f32 xdiff, zdiff; @@ -14032,10 +14032,10 @@ f32 chrGetLateralDistanceToPad(struct chrdata *chr, s32 pad_id) #if VERSION >= VERSION_NTSC_1_0 f32 distance = 0; - pad_id = chrResolvePadId(chr, pad_id); + pad_id = chr_resolve_pad_id(chr, pad_id); if (pad_id >= 0) { - padUnpack(pad_id, PADFIELD_POS, &pad); + pad_unpack(pad_id, PADFIELD_POS, &pad); xdiff = pad.pos.x - prop->pos.x; zdiff = pad.pos.z - prop->pos.z; distance = sqrtf(xdiff * xdiff + zdiff * zdiff); @@ -14043,15 +14043,15 @@ f32 chrGetLateralDistanceToPad(struct chrdata *chr, s32 pad_id) return distance; #else - pad_id = chrResolvePadId(chr, pad_id); - padUnpack(pad_id, PADFIELD_POS, &pad); + pad_id = chr_resolve_pad_id(chr, pad_id); + pad_unpack(pad_id, PADFIELD_POS, &pad); xdiff = pad.pos.x - prop->pos.x; zdiff = pad.pos.z - prop->pos.z; return sqrtf(xdiff * xdiff + zdiff * zdiff); #endif } -f32 chrGetSquaredDistanceToCoord(struct chrdata *chr, struct coord *pos) +f32 chr_get_squared_distance_to_coord(struct chrdata *chr, struct coord *pos) { f32 xdiff = pos->x - chr->prop->pos.x; f32 ydiff = pos->y - chr->prop->pos.y; @@ -14060,7 +14060,7 @@ f32 chrGetSquaredDistanceToCoord(struct chrdata *chr, struct coord *pos) return xdiff * xdiff + ydiff * ydiff + zdiff * zdiff; } -f32 coordGetSquaredDistanceToCoord(struct coord *a, struct coord *b) +f32 coord_get_squared_distance_to_coord(struct coord *a, struct coord *b) { f32 xdiff = a->x - b->x; f32 ydiff = a->y - b->y; @@ -14069,20 +14069,20 @@ f32 coordGetSquaredDistanceToCoord(struct coord *a, struct coord *b) return xdiff * xdiff + ydiff * ydiff + zdiff * zdiff; } -s32 chrGetPadRoom(struct chrdata *chr, s32 pad_id) +s32 chr_get_pad_room(struct chrdata *chr, s32 pad_id) { s32 ret = -1; s32 pad_id_backup = pad_id; struct pad pad; if (pad_id >= 10000) { - s32 resolved_pad_id = chrResolvePadId(chr, pad_id - 10000); + s32 resolved_pad_id = chr_resolve_pad_id(chr, pad_id - 10000); #if VERSION >= VERSION_NTSC_1_0 if (resolved_pad_id >= 0) #endif { - padUnpack(resolved_pad_id, PADFIELD_ROOM, &pad); + pad_unpack(resolved_pad_id, PADFIELD_ROOM, &pad); ret = pad.room; } } else { @@ -14092,7 +14092,7 @@ s32 chrGetPadRoom(struct chrdata *chr, s32 pad_id) return ret; } -s32 chrResolvePadId(struct chrdata *chr, s32 pad_id) +s32 chr_resolve_pad_id(struct chrdata *chr, s32 pad_id) { if (pad_id == 9000) { pad_id = chr->padpreset1; @@ -14107,7 +14107,7 @@ s32 chrResolvePadId(struct chrdata *chr, s32 pad_id) * This function is called when the given player has died. It causes all guards * to switch their focus to the remaining coop player. */ -void chrsClearRefsToPlayer(s32 playernum) +void chrs_clear_refs_to_player(s32 playernum) { s32 otherplayernum; s32 playerpropnum; @@ -14122,7 +14122,7 @@ void chrsClearRefsToPlayer(s32 playernum) playerpropnum = g_Vars.coop->prop - g_Vars.props; } - for (i = 0; i < chrsGetNumSlots(); i++) { + for (i = 0; i < chrs_get_num_slots(); i++) { if (g_ChrSlots[i].p1p2 == playernum) { g_ChrSlots[i].p1p2 = otherplayernum; } @@ -14144,7 +14144,7 @@ void chrsClearRefsToPlayer(s32 playernum) } } -s32 chrResolveId(struct chrdata *ref, s32 id) +s32 chr_resolve_id(struct chrdata *ref, s32 id) { if (ref) { switch (id) { @@ -14197,7 +14197,7 @@ s32 chrResolveId(struct chrdata *ref, s32 id) break; case CHR_TARGET: { - struct prop *target = chrGetTargetProp(ref); + struct prop *target = chr_get_target_prop(ref); if ((target->type == PROPTYPE_CHR || target->type == PROPTYPE_PLAYER) && target->chr) { id = target->chr->chrnum; } @@ -14243,15 +14243,15 @@ s32 chrResolveId(struct chrdata *ref, s32 id) return id; } -struct chrdata *chrFindById(struct chrdata *basechr, s32 chrnum) +struct chrdata *chr_find_by_id(struct chrdata *basechr, s32 chrnum) { struct chrdata *chr; s32 lower; s32 upper; s32 i; - chrnum = chrResolveId(basechr, chrnum); - chr = chrFindByLiteralId(chrnum); + chrnum = chr_resolve_id(basechr, chrnum); + chr = chr_find_by_literal_id(chrnum); if (chr) { return chr; @@ -14277,14 +14277,14 @@ struct chrdata *chrFindById(struct chrdata *basechr, s32 chrnum) return NULL; } -s32 propGetIndexByChrId(struct chrdata *basechr, s32 chrnum) +s32 prop_get_index_by_chr_id(struct chrdata *basechr, s32 chrnum) { s32 index; if (chrnum == CHR_BOND || chrnum == CHR_BOND) { index = g_Vars.bond->prop - g_Vars.props; } else { - struct chrdata *chr = chrFindById(basechr, chrnum); + struct chrdata *chr = chr_find_by_id(basechr, chrnum); if (chr && chr->prop) { index = chr->prop - g_Vars.props; @@ -14296,10 +14296,10 @@ s32 propGetIndexByChrId(struct chrdata *basechr, s32 chrnum) return index; } -f32 chrGetDistanceToChr(struct chrdata *chr1, s32 chr2num) +f32 chr_get_distance_to_chr(struct chrdata *chr1, s32 chr2num) { struct prop *prop1 = chr1->prop; - struct chrdata *chr2 = chrFindById(chr1, chr2num); + struct chrdata *chr2 = chr_find_by_id(chr1, chr2num); f32 distance = 0; if (chr2 && chr2->prop) { @@ -14312,19 +14312,19 @@ f32 chrGetDistanceToChr(struct chrdata *chr1, s32 chr2num) return distance; } -f32 chrGetDistanceFromTargetToPad(struct chrdata *chr, s32 pad_id) +f32 chr_get_distance_from_target_to_pad(struct chrdata *chr, s32 pad_id) { - struct prop *prop = chrGetTargetProp(chr); + struct prop *prop = chr_get_target_prop(chr); f32 xdiff, ydiff, zdiff; struct pad pad; f32 distance = 0; - pad_id = chrResolvePadId(chr, pad_id); + pad_id = chr_resolve_pad_id(chr, pad_id); #if VERSION >= VERSION_NTSC_1_0 if (pad_id >= 0) #endif { - padUnpack(pad_id, PADFIELD_POS, &pad); + pad_unpack(pad_id, PADFIELD_POS, &pad); xdiff = pad.pos.x - prop->pos.x; ydiff = pad.pos.y - prop->pos.y; zdiff = pad.pos.z - prop->pos.z; @@ -14334,7 +14334,7 @@ f32 chrGetDistanceFromTargetToPad(struct chrdata *chr, s32 pad_id) return distance; } -void chrSetFlags(struct chrdata *chr, u32 flags, u8 bank) +void chr_set_flags(struct chrdata *chr, u32 flags, u8 bank) { if (bank == 0) { chr->flags |= flags; @@ -14343,7 +14343,7 @@ void chrSetFlags(struct chrdata *chr, u32 flags, u8 bank) } } -void chrUnsetFlags(struct chrdata *chr, u32 flags, u8 bank) +void chr_unset_flags(struct chrdata *chr, u32 flags, u8 bank) { if (bank == 0) { chr->flags &= ~flags; @@ -14352,7 +14352,7 @@ void chrUnsetFlags(struct chrdata *chr, u32 flags, u8 bank) } } -bool chrHasFlag(struct chrdata *chr, u32 flag, u8 bank) +bool chr_has_flag(struct chrdata *chr, u32 flag, u8 bank) { if (bank == 0) { return (chr->flags & flag) != 0; @@ -14361,93 +14361,93 @@ bool chrHasFlag(struct chrdata *chr, u32 flag, u8 bank) } } -void chrSetFlagsById(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank) +void chr_set_flags_by_id(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank) { - struct chrdata *chr = chrFindById(ref, chrnum); + struct chrdata *chr = chr_find_by_id(ref, chrnum); if (chr) { - chrSetFlags(chr, flags, bank); + chr_set_flags(chr, flags, bank); } } -void chrUnsetFlagsById(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank) +void chr_unset_flags_by_id(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank) { - struct chrdata *chr = chrFindById(ref, chrnum); + struct chrdata *chr = chr_find_by_id(ref, chrnum); if (chr) { - chrUnsetFlags(chr, flags, bank); + chr_unset_flags(chr, flags, bank); } } -bool chrHasFlagById(struct chrdata *ref, u32 chrnum, u32 flag, u32 bank) +bool chr_has_flag_by_id(struct chrdata *ref, u32 chrnum, u32 flag, u32 bank) { - struct chrdata *chr = chrFindById(ref, chrnum); + struct chrdata *chr = chr_find_by_id(ref, chrnum); if (chr) { - return chrHasFlag(chr, flag, bank); + return chr_has_flag(chr, flag, bank); } return false; } -void chrSetStageFlag(struct chrdata *chr, u32 flag) +void chr_set_stage_flag(struct chrdata *chr, u32 flag) { g_StageFlags |= flag; } -void chrUnsetStageFlag(struct chrdata *chr, u32 flag) +void chr_unset_stage_flag(struct chrdata *chr, u32 flag) { g_StageFlags = g_StageFlags & ~flag; } -bool chrHasStageFlag(struct chrdata *chr, u32 flag) +bool chr_has_stage_flag(struct chrdata *chr, u32 flag) { return (g_StageFlags & flag) != 0; } -bool chrIsHearingTarget(struct chrdata *chr) +bool chr_is_hearing_target(struct chrdata *chr) { return (chr->hidden & CHRHFLAG_IS_HEARING_TARGET) != 0; } -void chrRestartTimer(struct chrdata *chr) +void chr_restart_timer(struct chrdata *chr) { chr->timer60 = 0; chr->hidden |= CHRHFLAG_TIMER_RUNNING; } -f32 chrGetTimer(struct chrdata *chr) +f32 chr_get_timer(struct chrdata *chr) { return chr->timer60 * FRAMEDURATION; } -bool chrIsTargetAimingAtMe(struct chrdata *chr) +bool chr_is_target_aiming_at_me(struct chrdata *chr) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); if (target) { if (target->type == PROPTYPE_CHR) { - if (!chrHasLosToTarget(chr)) { + if (!chr_has_los_to_target(chr)) { return false; } - return chrIsInTargetsFovX(chr, 20); + return chr_is_in_targets_fov_x(chr, 20); } if (target->type == PROPTYPE_PLAYER) { if (g_Vars.bondvisible && - (cdTestLos05(&target->pos, target->rooms, &chr->prop->pos, chr->prop->rooms, + (cd_test_los05(&target->pos, target->rooms, &chr->prop->pos, chr->prop->rooms, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG, GEOFLAG_BLOCK_SIGHT))) { struct model *model = chr->model; struct coord sp68; struct coord sp56; struct coord sp44; - f32 somefloat = modelGetEffectiveScale(model) * 0.8f; + f32 somefloat = model_get_effective_scale(model) * 0.8f; bgun0f0a0c08(&sp68, &sp56); - modelGetRootPosition(model, &sp44); - mtx4TransformVecInPlace(camGetWorldToScreenMtxf(), &sp44); + model_get_root_position(model, &sp44); + mtx4_transform_vec_in_place(cam_get_world_to_screen_mtxf(), &sp44); if (func0f06b39c(&sp68, &sp56, &sp44, somefloat)) { return true; @@ -14459,7 +14459,7 @@ bool chrIsTargetAimingAtMe(struct chrdata *chr) return false; } -bool chrResetNearMiss(struct chrdata *chr) +bool chr_reset_near_miss(struct chrdata *chr) { bool has_flag = (chr->chrflags & CHRCFLAG_NEAR_MISS) != 0; chr->chrflags &= ~CHRCFLAG_NEAR_MISS; @@ -14467,26 +14467,26 @@ bool chrResetNearMiss(struct chrdata *chr) return has_flag; } -s32 chrGetNumArghs(struct chrdata *chr) +s32 chr_get_num_arghs(struct chrdata *chr) { return chr->numarghs; } -s32 chrGetNumCloseArghs(struct chrdata *chr) +s32 chr_get_num_close_arghs(struct chrdata *chr) { return chr->numclosearghs; } -bool chrSawInjury(struct chrdata *chr, u8 arg1) +bool chr_saw_injury(struct chrdata *chr, u8 arg1) { bool saw_injury = chr->chrseeshot >= 0; if (saw_injury && arg1 == 0) { chr->chrseeshot = -1; } else if (saw_injury && arg1 == 1) { - struct chrdata *victim = chrFindById(chr, chr->chrseeshot); + struct chrdata *victim = chr_find_by_id(chr, chr->chrseeshot); - if (victim && !chrCompareTeams(chr, victim, COMPARE_FRIENDS)) { + if (victim && !chr_compare_teams(chr, victim, COMPARE_FRIENDS)) { saw_injury = false; } } else { @@ -14496,18 +14496,18 @@ bool chrSawInjury(struct chrdata *chr, u8 arg1) return saw_injury; } -bool chrSawDeath(struct chrdata *chr, u8 arg1) +bool chr_saw_death(struct chrdata *chr, u8 arg1) { bool saw_death = chr->chrseedie >= 0; // The commented line below was likely originally there but removed before - // the final version. Compare with chrSawInjury above. + // the final version. Compare with chr_saw_injury above. if (saw_death && arg1 == 0) { //chr->chrseedie = -1; } else if (saw_death && arg1 == 1) { - struct chrdata *victim = chrFindById(chr, chr->chrseedie); + struct chrdata *victim = chr_find_by_id(chr, chr->chrseedie); - if (victim && !chrCompareTeams(chr, victim, COMPARE_FRIENDS)) { + if (victim && !chr_compare_teams(chr, victim, COMPARE_FRIENDS)) { saw_death = false; chr->chrseedie = -1; } @@ -14518,7 +14518,7 @@ bool chrSawDeath(struct chrdata *chr, u8 arg1) return saw_death; } -void decrementByte(u8 *dst, u8 amount) +void decrement_byte(u8 *dst, u8 amount) { if (*dst < amount) { *dst = 0; @@ -14528,7 +14528,7 @@ void decrementByte(u8 *dst, u8 amount) *dst -= amount; } -void incrementByte(u8 *dst, u8 amount) +void increment_byte(u8 *dst, u8 amount) { if (0xff - amount < *dst) { *dst = 0xff; @@ -14538,18 +14538,18 @@ void incrementByte(u8 *dst, u8 amount) *dst += amount; } -bool chrCanHearAlarm(struct chrdata *chr) +bool chr_can_hear_alarm(struct chrdata *chr) { - return alarmIsActive(); + return alarm_is_active(); } -bool waypointIsWithin90DegreesOfPosAngle(struct waypoint *waypoint, struct coord *pos, f32 angle) +bool waypoint_is_within_90_degrees_of_pos_angle(struct waypoint *waypoint, struct coord *pos, f32 angle) { u32 stack[3]; f32 diffangle; struct pad pad; - padUnpack(waypoint->padnum, PADFIELD_POS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_POS, &pad); diffangle = angle - atan2f(pad.pos.x - pos->x, pad.pos.z - pos->z); @@ -14577,9 +14577,9 @@ bool waypointIsWithin90DegreesOfPosAngle(struct waypoint *waypoint, struct coord * those are in the quadrant then no further checks are made and the function * returns -1. */ -s32 chrFindWaypointWithinPosQuadrant(struct coord *pos, RoomNum *rooms, f32 angle, u8 quadrant) +s32 chr_find_waypoint_within_pos_quadrant(struct coord *pos, RoomNum *rooms, f32 angle, u8 quadrant) { - struct waypoint *waypoint = waypointFindClosestToPos(pos, rooms); + struct waypoint *waypoint = waypoint_find_closest_to_pos(pos, rooms); s32 neighbournum; s32 i; @@ -14602,7 +14602,7 @@ s32 chrFindWaypointWithinPosQuadrant(struct coord *pos, RoomNum *rooms, f32 angl angle -= M_BADTAU; } - if (waypointIsWithin90DegreesOfPosAngle(waypoint, pos, angle)) { + if (waypoint_is_within_90_degrees_of_pos_angle(waypoint, pos, angle)) { return waypoint->padnum; } @@ -14610,7 +14610,7 @@ s32 chrFindWaypointWithinPosQuadrant(struct coord *pos, RoomNum *rooms, f32 angl if ((neighbournum & 0x8000) == 0) { neighbournum &= 0x3fff; - if (waypointIsWithin90DegreesOfPosAngle(&g_StageSetup.waypoints[neighbournum], pos, angle)) { + if (waypoint_is_within_90_degrees_of_pos_angle(&g_StageSetup.waypoints[neighbournum], pos, angle)) { return g_StageSetup.waypoints[neighbournum].padnum; } } @@ -14625,28 +14625,28 @@ bool func0f04a4ec(struct chrdata *chr, u8 quadrant) { if (quadrant == QUADRANT_TOWARDSTARGET || quadrant == QUADRANT_AWAYFROMTARGET) { struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); - struct waypoint *chrwp = waypointFindClosestToPos(&prop->pos, prop->rooms); - struct waypoint *tarwp = waypointFindClosestToPos(&target->pos, target->rooms); + struct waypoint *chrwp = waypoint_find_closest_to_pos(&prop->pos, prop->rooms); + struct waypoint *tarwp = waypoint_find_closest_to_pos(&target->pos, target->rooms); struct waypoint *waypoints[3]; s32 numwaypoints; if (chrwp && tarwp) { if (quadrant == QUADRANT_TOWARDSTARGET) { - navSetSeed(CHRNAVSEED(chr), CHRNAVSEED(chr)); - numwaypoints = navFindRoute(chrwp, tarwp, waypoints, 3); - navSetSeed(0, 0); + nav_set_seed(CHRNAVSEED(chr), CHRNAVSEED(chr)); + numwaypoints = nav_find_route(chrwp, tarwp, waypoints, 3); + nav_set_seed(0, 0); if (numwaypoints >= 3) { chr->padpreset1 = waypoints[1]->padnum; return true; } } else { - navSetSeed(CHRNAVSEED(chr), CHRNAVSEED(chr)); - chrwp = navChooseRetreatPoint(chrwp, tarwp); - navSetSeed(0, 0); + nav_set_seed(CHRNAVSEED(chr), CHRNAVSEED(chr)); + chrwp = nav_choose_retreat_point(chrwp, tarwp); + nav_set_seed(0, 0); if (chrwp) { chr->padpreset1 = chrwp->padnum; @@ -14655,7 +14655,7 @@ bool func0f04a4ec(struct chrdata *chr, u8 quadrant) } } } else { - s32 padnum = chrFindWaypointWithinPosQuadrant(&chr->prop->pos, chr->prop->rooms, chrGetInverseTheta(chr), quadrant); + s32 padnum = chr_find_waypoint_within_pos_quadrant(&chr->prop->pos, chr->prop->rooms, chr_get_inverse_theta(chr), quadrant); if (padnum >= 0) { chr->padpreset1 = padnum; @@ -14666,7 +14666,7 @@ bool func0f04a4ec(struct chrdata *chr, u8 quadrant) return false; } -bool chrSetPadPresetToWaypointWithinTargetQuadrant(struct chrdata *chr, u8 quadrant) +bool chr_set_pad_preset_to_waypoint_within_target_quadrant(struct chrdata *chr, u8 quadrant) { f32 angle; s32 padnum; @@ -14677,15 +14677,15 @@ bool chrSetPadPresetToWaypointWithinTargetQuadrant(struct chrdata *chr, u8 quadr } angle = 0; - prop = chrGetTargetProp(chr); + prop = chr_get_target_prop(chr); if (prop->type == PROPTYPE_PLAYER) { - angle = (360.0f - g_Vars.players[playermgrGetPlayerNumByProp(prop)]->vv_theta) * M_BADTAU / 360.0f; + angle = (360.0f - g_Vars.players[playermgr_get_player_num_by_prop(prop)]->vv_theta) * M_BADTAU / 360.0f; } else if (prop->type == PROPTYPE_CHR) { - angle = chrGetInverseTheta(prop->chr); + angle = chr_get_inverse_theta(prop->chr); } - padnum = chrFindWaypointWithinPosQuadrant(&prop->pos, prop->rooms, angle, quadrant); + padnum = chr_find_waypoint_within_pos_quadrant(&prop->pos, prop->rooms, angle, quadrant); if (padnum >= 0) { chr->padpreset1 = padnum; @@ -14695,31 +14695,31 @@ bool chrSetPadPresetToWaypointWithinTargetQuadrant(struct chrdata *chr, u8 quadr return false; } -bool chrSetChrPresetToAnyChrNearSelf(struct chrdata *chr, f32 distance) +bool chr_set_chr_preset_to_any_chr_near_self(struct chrdata *chr, f32 distance) { - return chrSetChrPresetToChrNearSelf(COMPARE_ANY, chr, distance); + return chr_set_chr_preset_to_chr_near_self(COMPARE_ANY, chr, distance); } -bool chrSetChrPresetToChrNearSelf(u8 checktype, struct chrdata *chr, f32 distance) +bool chr_set_chr_preset_to_chr_near_self(u8 checktype, struct chrdata *chr, f32 distance) { - return chrSetChrPresetToChrNearPos(checktype, chr, distance, &chr->prop->pos, chr->prop->rooms); + return chr_set_chr_preset_to_chr_near_pos(checktype, chr, distance, &chr->prop->pos, chr->prop->rooms); } -bool chrSetChrPresetToChrNearPad(u32 checktype, struct chrdata *chr, f32 distance, s32 padnum) +bool chr_set_chr_preset_to_chr_near_pad(u32 checktype, struct chrdata *chr, f32 distance, s32 padnum) { struct pad pad; RoomNum rooms[2]; - padnum = chrResolvePadId(chr, padnum); - padUnpack(padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); + padnum = chr_resolve_pad_id(chr, padnum); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); rooms[0] = pad.room; rooms[1] = -1; - return chrSetChrPresetToChrNearPos(checktype, chr, distance, &pad.pos, rooms); + return chr_set_chr_preset_to_chr_near_pos(checktype, chr, distance, &pad.pos, rooms); } -bool chrSetChrPresetToChrNearPos(u8 checktype, struct chrdata *chr, f32 distance, struct coord *pos, RoomNum *rooms) +bool chr_set_chr_preset_to_chr_near_pos(u8 checktype, struct chrdata *chr, f32 distance, struct coord *pos, RoomNum *rooms) { s32 i; s16 *propnumptr; @@ -14733,14 +14733,14 @@ bool chrSetChrPresetToChrNearPos(u8 checktype, struct chrdata *chr, f32 distance f32 zmax = pos->z + distance; RoomNum neighbours[11]; - roomsCopy(rooms, allrooms); + rooms_copy(rooms, allrooms); for (i = 0; rooms[i] != -1; i++) { - bgRoomGetNeighbours(rooms[i], neighbours, 10); - roomsAppend(neighbours, allrooms, 20); + bg_room_get_neighbours(rooms[i], neighbours, 10); + rooms_append(neighbours, allrooms, 20); } - roomGetProps(allrooms, propnums, 256); + room_get_props(allrooms, propnums, 256); propnumptr = propnums; @@ -14751,14 +14751,14 @@ bool chrSetChrPresetToChrNearPos(u8 checktype, struct chrdata *chr, f32 distance struct chrdata *loopchr = prop->chr; if (loopchr->chrnum != chr->chrnum - && !chrIsDead(loopchr) + && !chr_is_dead(loopchr) && prop->pos.x >= xmin && prop->pos.x <= xmax && prop->pos.y >= ymin && prop->pos.y <= ymax && prop->pos.z >= zmin && prop->pos.z <= zmax - && chrCompareTeams(loopchr, chr, checktype)) { + && chr_compare_teams(loopchr, chr, checktype)) { chr->chrpreset1 = loopchr->chrnum; return true; } @@ -14770,7 +14770,7 @@ bool chrSetChrPresetToChrNearPos(u8 checktype, struct chrdata *chr, f32 distance return false; } -bool chrCompareTeams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype) +bool chr_compare_teams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype) { if (chr1 && chr1->prop) { if (checktype == COMPARE_ANY) { @@ -14825,31 +14825,31 @@ bool chrCompareTeams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype) return false; } -void chrSetChrPreset(struct chrdata *chr, s32 chrpreset) +void chr_set_chr_preset(struct chrdata *chr, s32 chrpreset) { - chr->chrpreset1 = chrResolveId(chr, chrpreset); + chr->chrpreset1 = chr_resolve_id(chr, chrpreset); } -void chrSetChrPresetByChrnum(struct chrdata *basechr, s32 chrnum, s32 chrpreset) +void chr_set_chr_preset_by_chrnum(struct chrdata *basechr, s32 chrnum, s32 chrpreset) { - struct chrdata *chr = chrFindById(basechr, chrnum); + struct chrdata *chr = chr_find_by_id(basechr, chrnum); if (chr) { - chr->chrpreset1 = chrResolveId(basechr, chrpreset); + chr->chrpreset1 = chr_resolve_id(basechr, chrpreset); } } -void chrSetPadPreset(struct chrdata *chr, s32 pad_id) +void chr_set_pad_preset(struct chrdata *chr, s32 pad_id) { - chr->padpreset1 = chrResolvePadId(chr, pad_id); + chr->padpreset1 = chr_resolve_pad_id(chr, pad_id); } -void chrSetPadPresetByChrnum(struct chrdata *basechr, s32 chrnum, s32 pad_id) +void chr_set_pad_preset_by_chrnum(struct chrdata *basechr, s32 chrnum, s32 pad_id) { - struct chrdata *chr = chrFindById(basechr, chrnum); + struct chrdata *chr = chr_find_by_id(basechr, chrnum); if (chr) { - chr->padpreset1 = chrResolvePadId(basechr, pad_id); + chr->padpreset1 = chr_resolve_pad_id(basechr, pad_id); } } @@ -14859,9 +14859,9 @@ void chrSetPadPresetByChrnum(struct chrdata *basechr, s32 chrnum, s32 pad_id) * Find the first waypoint in view of both the chr and their target * and store it as the chr's pad preset. */ -bool chrSetPadPresetToPadOnRouteToTarget(struct chrdata *chr) +bool chr_set_pad_preset_to_pad_on_route_to_target(struct chrdata *chr) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); struct prop *prop = chr->prop; struct waypoint *fromwp; struct waypoint *towp; @@ -14871,27 +14871,27 @@ bool chrSetPadPresetToPadOnRouteToTarget(struct chrdata *chr) struct pad pad; if (target->type != PROPTYPE_PLAYER || g_Vars.bondvisible) { - if (cdTestLos04(&prop->pos, prop->rooms, &target->pos, CDTYPE_BG)) { + if (cd_test_los04(&prop->pos, prop->rooms, &target->pos, CDTYPE_BG)) { return false; } - fromwp = waypointFindClosestToPos(&prop->pos, prop->rooms); - towp = waypointFindClosestToPos(&target->pos, target->rooms); + fromwp = waypoint_find_closest_to_pos(&prop->pos, prop->rooms); + towp = waypoint_find_closest_to_pos(&target->pos, target->rooms); if (fromwp && towp) { // Note from/to are swapped here, so the route is from target to chr - navSetSeed(CHRNAVSEED(chr), CHRNAVSEED(chr)); - numwaypoints = navFindRoute(towp, fromwp, waypoints, 5); - navSetSeed(0, 0); + nav_set_seed(CHRNAVSEED(chr), CHRNAVSEED(chr)); + numwaypoints = nav_find_route(towp, fromwp, waypoints, 5); + nav_set_seed(0, 0); if (numwaypoints >= 3) { for (i = 0; waypoints[i] != NULL; i++) { struct waypoint *wp = waypoints[i]; - padUnpack(wp->padnum, PADFIELD_POS, &pad); + pad_unpack(wp->padnum, PADFIELD_POS, &pad); - if (cdTestLos04(&target->pos, target->rooms, &pad.pos, CDTYPE_BG)) { - if (cdTestLos04(&prop->pos, prop->rooms, &pad.pos, CDTYPE_BG)) { + if (cd_test_los04(&target->pos, target->rooms, &pad.pos, CDTYPE_BG)) { + if (cd_test_los04(&prop->pos, prop->rooms, &pad.pos, CDTYPE_BG)) { chr->padpreset1 = wp->padnum; return true; } @@ -14904,21 +14904,21 @@ bool chrSetPadPresetToPadOnRouteToTarget(struct chrdata *chr) return false; } -bool chrIsPosOffScreen(struct coord *pos, RoomNum *rooms) +bool chr_is_pos_off_screen(struct coord *pos, RoomNum *rooms) { bool offscreen = true; s32 i; - if (envIsPosInFogMaxDistance(pos, 0)) { + if (env_is_pos_in_fog_max_distance(pos, 0)) { for (i = 0; rooms[i] != -1; i++) { - if (bgRoomIsOnscreen(rooms[i])) { + if (bg_room_is_onscreen(rooms[i])) { break; } } if (rooms[i] != -1) { // Room is visible by player - offscreen = !camIsPosInScreenBox(pos, 200, bgGetRoomDrawSlot(rooms[i])); + offscreen = !cam_is_pos_in_screen_box(pos, 200, bg_get_room_draw_slot(rooms[i])); } } @@ -14935,7 +14935,7 @@ bool chrIsPosOffScreen(struct coord *pos, RoomNum *rooms) * If the spawn cannot happen, the function return false. */ #if VERSION >= VERSION_NTSC_1_0 -bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force, bool onlysurrounding) +bool chr_adjust_pos_for_spawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force, bool onlysurrounding) { struct coord testpos; s32 i; @@ -14969,14 +14969,14 @@ bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 // because if the chr was being spawned on top of another chr or object // then the calculated ground value would be raised. ymin = -200; - ground = cdFindGroundAtCyl(pos, chrradius, rooms, NULL, NULL); + ground = cd_find_ground_at_cyl(pos, chrradius, rooms, NULL, NULL); if (ground > -100000 && ground - pos->y < -200) { ymin = ground - pos->y; } - if (cdTestVolume(pos, chrradius, rooms, types, CHECKVERTICAL_YES, ymax, ymin) != CDRESULT_COLLISION - && (allowonscreen || chrIsPosOffScreen(pos, rooms))) { + if (cd_test_volume(pos, chrradius, rooms, types, CHECKVERTICAL_YES, ymax, ymin) != CDRESULT_COLLISION + && (allowonscreen || chr_is_pos_off_screen(pos, rooms))) { return true; } } @@ -14987,23 +14987,23 @@ bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 testpos.y = pos->y; testpos.z = pos->z + cosf(curangle) * 60; - if ((onlysurrounding && cdTestCylMove04(pos, rooms, &testpos, testrooms, CDTYPE_ALL & ~CDTYPE_PLAYERS, 1, ymax, -200) != CDRESULT_COLLISION) - || (!onlysurrounding && cdTestLos11(pos, rooms, &testpos, testrooms, CDTYPE_BG))) { + if ((onlysurrounding && cd_test_cyl_move04(pos, rooms, &testpos, testrooms, CDTYPE_ALL & ~CDTYPE_PLAYERS, 1, ymax, -200) != CDRESULT_COLLISION) + || (!onlysurrounding && cd_test_los11(pos, rooms, &testpos, testrooms, CDTYPE_BG))) { chr0f021fa8(NULL, &testpos, testrooms); - ground = cdFindGroundAtCyl(&testpos, chrradius, testrooms, 0, 0); + ground = cd_find_ground_at_cyl(&testpos, chrradius, testrooms, 0, 0); ymin = -200; if (ground > -100000 && ground - pos->y < -200) { ymin = ground - pos->y; } - if (cdTestVolume(&testpos, chrradius, testrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax, ymin) != CDRESULT_COLLISION - && (allowonscreen || chrIsPosOffScreen(&testpos, testrooms)) + if (cd_test_volume(&testpos, chrradius, testrooms, CDTYPE_ALL, CHECKVERTICAL_YES, ymax, ymin) != CDRESULT_COLLISION + && (allowonscreen || chr_is_pos_off_screen(&testpos, testrooms)) && (!onlysurrounding || ground > -100000)) { pos->x = testpos.x; pos->y = testpos.y; pos->z = testpos.z; - roomsCopy(testrooms, rooms); + rooms_copy(testrooms, rooms); return true; } } @@ -15022,7 +15022,7 @@ bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 * ntsc-beta's version of this function doesn't have the onlysurrounding argument * nor out of bounds checking, and lacks the reduction for the volume test. */ -bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force) +bool chr_adjust_pos_for_spawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force) { struct coord testpos; s32 i; @@ -15037,8 +15037,8 @@ bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 types = CDTYPE_ALL; } - if (cdTestVolume(pos, chrradius, rooms, types, CHECKVERTICAL_YES, 200, -200) != CDRESULT_COLLISION - && (allowonscreen || chrIsPosOffScreen(pos, rooms))) { + if (cd_test_volume(pos, chrradius, rooms, types, CHECKVERTICAL_YES, 200, -200) != CDRESULT_COLLISION + && (allowonscreen || chr_is_pos_off_screen(pos, rooms))) { return true; } @@ -15047,13 +15047,13 @@ bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 testpos.y = pos->y; testpos.z = cosf(curangle) * 60 + pos->z; - if (cdTestLos11(pos, rooms, &testpos, testrooms, CDTYPE_BG) - && cdTestVolume(&testpos, chrradius, testrooms, CDTYPE_ALL, CHECKVERTICAL_YES, 200, -200.0f) != CDRESULT_COLLISION - && (allowonscreen || chrIsPosOffScreen(&testpos, testrooms))) { + if (cd_test_los11(pos, rooms, &testpos, testrooms, CDTYPE_BG) + && cd_test_volume(&testpos, chrradius, testrooms, CDTYPE_ALL, CHECKVERTICAL_YES, 200, -200.0f) != CDRESULT_COLLISION + && (allowonscreen || chr_is_pos_off_screen(&testpos, testrooms))) { pos->x = testpos.x; pos->y = testpos.y; pos->z = testpos.z; - roomsCopy(testrooms, rooms); + rooms_copy(testrooms, rooms); return true; } @@ -15076,43 +15076,43 @@ bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 * triggered, but the function will not attempt to spawn the chr until the next * time it's called. */ -struct prop *chrSpawnAtCoord(s32 bodynum, s32 headnum, struct coord *pos, RoomNum *rooms, f32 angle, u8 *ailist, u32 spawnflags) +struct prop *chr_spawn_at_coord(s32 bodynum, s32 headnum, struct coord *pos, RoomNum *rooms, f32 angle, u8 *ailist, u32 spawnflags) { struct prop *prop; struct coord pos2; RoomNum rooms2[8]; s32 stack; - if (chrsGetNumFree() > 1) { + if (chrs_get_num_free() > 1) { if (headnum < 0) { - headnum = bodyChooseHead(bodynum); + headnum = body_choose_head(bodynum); } pos2.x = pos->x; pos2.y = pos->y; pos2.z = pos->z; - roomsCopy(rooms, rooms2); + rooms_copy(rooms, rooms2); #if VERSION >= VERSION_NTSC_1_0 - if (chrAdjustPosForSpawn(20, &pos2, rooms2, angle, (spawnflags & SPAWNFLAG_ALLOWONSCREEN) != 0, false, false)) + if (chr_adjust_pos_for_spawn(20, &pos2, rooms2, angle, (spawnflags & SPAWNFLAG_ALLOWONSCREEN) != 0, false, false)) #else - if (chrAdjustPosForSpawn(20, &pos2, rooms2, angle, (spawnflags & SPAWNFLAG_ALLOWONSCREEN) != 0, false)) + if (chr_adjust_pos_for_spawn(20, &pos2, rooms2, angle, (spawnflags & SPAWNFLAG_ALLOWONSCREEN) != 0, false)) #endif { - struct model *model = bodyAllocateModel(bodynum, headnum, spawnflags); + struct model *model = body_allocate_model(bodynum, headnum, spawnflags); struct chrdata *chr; if (model) { - prop = chrAllocate(model, &pos2, rooms2, angle, ailist); + prop = chr_allocate(model, &pos2, rooms2, angle, ailist); if (prop) { - propActivateThisFrame(prop); - propEnable(prop); + prop_activate_this_frame(prop); + prop_enable(prop); chr = prop->chr; chr->headnum = headnum; chr->bodynum = bodynum; - chr->race = bodyGetRace(chr->bodynum); + chr->race = body_get_race(chr->bodynum); chr->flags = 0; chr->flags2 = 0; #if VERSION >= VERSION_NTSC_1_0 @@ -15126,13 +15126,13 @@ struct prop *chrSpawnAtCoord(s32 bodynum, s32 headnum, struct coord *pos, RoomNu return prop; } - modelmgrFreeModel(model); + modelmgr_free_model(model); } } } // Low memory - find a corpse to reap - if (chrsGetNumFree() < 4) { + if (chrs_get_num_free() < 4) { #if VERSION >= VERSION_NTSC_1_0 s32 stack2; struct chrdata *replacechr; @@ -15187,45 +15187,45 @@ struct prop *chrSpawnAtCoord(s32 bodynum, s32 headnum, struct coord *pos, RoomNu return NULL; } -struct prop *chrSpawnAtPad(struct chrdata *basechr, s32 body, s32 head, s32 pad_id, u8 *ailist, u32 spawnflags) +struct prop *chr_spawn_at_pad(struct chrdata *basechr, s32 body, s32 head, s32 pad_id, u8 *ailist, u32 spawnflags) { - s32 resolved_pad_id = chrResolvePadId(basechr, pad_id); + s32 resolved_pad_id = chr_resolve_pad_id(basechr, pad_id); struct pad pad; RoomNum room[2]; f32 fvalue; - padUnpack(resolved_pad_id, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); + pad_unpack(resolved_pad_id, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); fvalue = atan2f(pad.look.x, pad.look.z); room[0] = pad.room; room[1] = -1; - return chrSpawnAtCoord(body, head, &pad.pos, &room[0], fvalue, ailist, spawnflags); + return chr_spawn_at_coord(body, head, &pad.pos, &room[0], fvalue, ailist, spawnflags); } -struct prop *chrSpawnAtChr(struct chrdata *basechr, s32 body, s32 head, u32 chrnum, u8 *ailist, u32 spawnflags) +struct prop *chr_spawn_at_chr(struct chrdata *basechr, s32 body, s32 head, u32 chrnum, u8 *ailist, u32 spawnflags) { - struct chrdata *chr = chrFindById(basechr, chrnum); + struct chrdata *chr = chr_find_by_id(basechr, chrnum); f32 fvalue; if (1) { - fvalue = chrGetInverseTheta(chr); + fvalue = chr_get_inverse_theta(chr); } - return chrSpawnAtCoord(body, head, &chr->prop->pos, chr->prop->rooms, fvalue, ailist, spawnflags); + return chr_spawn_at_coord(body, head, &chr->prop->pos, chr->prop->rooms, fvalue, ailist, spawnflags); } -bool chrIsPropPresetBlockingSightToTarget(struct chrdata *chr) +bool chr_is_prop_preset_blocking_sight_to_target(struct chrdata *chr) { bool result = false; struct prop *prop = chr->prop; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); if (chr->proppreset1 >= 0) { - chrSetPerimEnabled(chr, false); - propSetPerimEnabled(target, false); + chr_set_perim_enabled(chr, false); + prop_set_perim_enabled(target, false); - if (!cdTestLos04(&prop->pos, prop->rooms, &target->pos, + if (!cd_test_los04(&prop->pos, prop->rooms, &target->pos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG)) { - struct prop *obstacle = cdGetObstacleProp(); + struct prop *obstacle = cd_get_obstacle_prop(); if (obstacle && obstacle->type == PROPTYPE_OBJ && chr->proppreset1 == (s16)(obstacle - g_Vars.props)) { @@ -15233,8 +15233,8 @@ bool chrIsPropPresetBlockingSightToTarget(struct chrdata *chr) } } - chrSetPerimEnabled(chr, true); - propSetPerimEnabled(target, true); + chr_set_perim_enabled(chr, true); + prop_set_perim_enabled(target, true); } return result; @@ -15245,7 +15245,7 @@ void func0f04b740(void) // empty } -bool chrMoveToPos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 angle, bool force) +bool chr_move_to_pos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 angle, bool force) { struct coord pos2; RoomNum rooms2[8]; @@ -15259,16 +15259,16 @@ bool chrMoveToPos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 an pos2.y = pos->y; pos2.z = pos->z; - roomsCopy(rooms, rooms2); - propSetPerimEnabled(chr->prop, false); + rooms_copy(rooms, rooms2); + prop_set_perim_enabled(chr->prop, false); #if VERSION >= VERSION_NTSC_1_0 - if (chrAdjustPosForSpawn(chr->radius, &pos2, rooms2, angle, (chr->hidden & CHRHFLAG_WARPONSCREEN) != 0, force, (chr->hidden & CHRHFLAG_SPAWNONLYSURROUNDING) != 0)) + if (chr_adjust_pos_for_spawn(chr->radius, &pos2, rooms2, angle, (chr->hidden & CHRHFLAG_WARPONSCREEN) != 0, force, (chr->hidden & CHRHFLAG_SPAWNONLYSURROUNDING) != 0)) #else - if (chrAdjustPosForSpawn(chr->radius, &pos2, rooms2, angle, (chr->hidden & CHRHFLAG_WARPONSCREEN) != 0, force)) + if (chr_adjust_pos_for_spawn(chr->radius, &pos2, rooms2, angle, (chr->hidden & CHRHFLAG_WARPONSCREEN) != 0, force)) #endif { - ground = cdFindGroundInfoAtCyl(&pos2, chr->radius, rooms2, &chr->floorcol, + ground = cd_find_ground_info_at_cyl(&pos2, chr->radius, rooms2, &chr->floorcol, &chr->floortype, NULL, &chr->floorroom, NULL, NULL); chr->ground = ground; @@ -15278,23 +15278,23 @@ bool chrMoveToPos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 an chr->prop->pos.y = pos2.y; chr->prop->pos.z = pos2.z; - propDeregisterRooms(chr->prop); - roomsCopy(rooms2, chr->prop->rooms); + prop_deregister_rooms(chr->prop); + rooms_copy(rooms2, chr->prop->rooms); chr0f0220ac(chr); - modelSetRootPosition(chr->model, &pos2); + model_set_root_position(chr->model, &pos2); nodetype = chr->model->definition->rootnode->type; if ((nodetype & 0xff) == MODELNODETYPE_CHRINFO) { - rwdata = modelGetNodeRwData(chr->model, chr->model->definition->rootnode); + rwdata = model_get_node_rw_data(chr->model, chr->model->definition->rootnode); rwdata->chrinfo.ground = ground; } chr->chrflags |= CHRCFLAG_FORCETOGROUND; - chrSetLookAngle(chr, angle); + chr_set_look_angle(chr, angle); if (chr->prop->type == PROPTYPE_PLAYER) { - player = g_Vars.players[playermgrGetPlayerNumByProp(chr->prop)]; + player = g_Vars.players[playermgr_get_player_num_by_prop(chr->prop)]; player->vv_manground = ground; player->vv_ground = ground; player->vv_theta = ((M_BADTAU - angle) * 360.0f) / M_BADTAU; @@ -15305,48 +15305,48 @@ bool chrMoveToPos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 an result = true; } - propSetPerimEnabled(chr->prop, true); + prop_set_perim_enabled(chr->prop, true); return result; } -bool chrCheckCoverOutOfSight(struct chrdata *chr, s32 covernum, bool soft) +bool chr_check_cover_out_of_sight(struct chrdata *chr, s32 covernum, bool soft) { struct cover cover; struct prop *target; bool targetcanseecover; - // @bug: Should be >= coverGetCount() - if (covernum < 0 || covernum > coverGetCount() || !coverUnpack(covernum, &cover)) { + // @bug: Should be >= cover_get_count() + if (covernum < 0 || covernum > cover_get_count() || !cover_unpack(covernum, &cover)) { return false; } - target = chrGetTargetProp(chr); + target = chr_get_target_prop(chr); if (!target) { return false; } if (soft) { - targetcanseecover = cdTestLos03(&target->pos, target->rooms, cover.pos, + targetcanseecover = cd_test_los03(&target->pos, target->rooms, cover.pos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_BG, GEOFLAG_BLOCK_SIGHT); } else { - targetcanseecover = cdIsNearlyInSight(&target->pos, target->rooms, cover.pos, 50.0f, + targetcanseecover = cd_is_nearly_in_sight(&target->pos, target->rooms, cover.pos, 50.0f, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_BG); } if (!targetcanseecover != false) { // Target can't see cover - coverSetOutOfSight(covernum, true); + cover_set_out_of_sight(covernum, true); return true; } - coverSetOutOfSight(covernum, false); + cover_set_out_of_sight(covernum, false); return false; } -s32 chrAssignCoverByCriteria(struct chrdata *chr, u16 criteria, s32 refdist) +s32 chr_assign_cover_by_criteria(struct chrdata *chr, u16 criteria, s32 refdist) { RoomNum rooms[8]; struct cover cover; @@ -15354,9 +15354,9 @@ s32 chrAssignCoverByCriteria(struct chrdata *chr, u16 criteria, s32 refdist) s32 oldcover; s32 i; struct prop *roomprop; - s32 numcovers = coverGetCount(); + s32 numcovers = cover_get_count(); s32 numcandidates = 0; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); bool userandomdist = false; bool changed; f32 sqdist; @@ -15381,10 +15381,10 @@ s32 chrAssignCoverByCriteria(struct chrdata *chr, u16 criteria, s32 refdist) // Iterate all cover, filter them by criteria and store them in g_CoverCandidates for (i = 0; i < numcovers; i++) { - if (coverUnpack(i, &cover) - && !coverIsSpecial(&cover) + if (cover_unpack(i, &cover) + && !cover_is_special(&cover) && ((criteria & COVERCRITERIA_2000) == 0 || (cover.flags & COVERFLAG_OMNIDIRECTIONAL)) - && ((criteria & COVERCRITERIA_1000) || (cover.flags & COVERFLAG_AIMDIFFROOM) == 0 || !arrayIntersects(cover.rooms, target->rooms))) { + && ((criteria & COVERCRITERIA_1000) || (cover.flags & COVERFLAG_AIMDIFFROOM) == 0 || !array_intersects(cover.rooms, target->rooms))) { userandomdist = false; if ((criteria & COVERCRITERIA_0001) && (criteria & COVERCRITERIA_FURTHEREST)) { @@ -15393,7 +15393,7 @@ s32 chrAssignCoverByCriteria(struct chrdata *chr, u16 criteria, s32 refdist) } if (((criteria & COVERCRITERIA_FORCENEWCOVER) == 0 || i != oldcover) - && ((criteria & COVERCRITERIA_2000) || !(coverIsInUse(i) || cover.pos->y > y))) { + && ((criteria & COVERCRITERIA_2000) || !(cover_is_in_use(i) || cover.pos->y > y))) { if (criteria & COVERCRITERIA_ROOMSFROMME) { roomprop = chr->prop; } else if (criteria & COVERCRITERIA_ROOMSFROMTARGET) { @@ -15408,23 +15408,23 @@ s32 chrAssignCoverByCriteria(struct chrdata *chr, u16 criteria, s32 refdist) rooms[1] = -1; if (criteria & COVERCRITERIA_ALLOWNEIGHBOURINGROOMS) { - bgRoomGetNeighbours(roomprop->rooms[0], &rooms[1], 6); + bg_room_get_neighbours(roomprop->rooms[0], &rooms[1], 6); } else if (criteria & COVERCRITERIA_ONLYNEIGHBOURINGROOMS) { - bgRoomGetNeighbours(roomprop->rooms[0], &rooms[0], 7); + bg_room_get_neighbours(roomprop->rooms[0], &rooms[0], 7); } - if (((criteria & COVERCRITERIA_0040) == 0 || !arrayIntersects(cover.rooms, rooms)) - && ((criteria & COVERCRITERIA_0020) == 0 || arrayIntersects(cover.rooms, rooms)) + if (((criteria & COVERCRITERIA_0040) == 0 || !array_intersects(cover.rooms, rooms)) + && ((criteria & COVERCRITERIA_0020) == 0 || array_intersects(cover.rooms, rooms)) && (rooms[1] == -1 || chr->oldrooms[0] == -1 || (criteria & COVERCRITERIA_0200) == 0 - || !arrayIntersects(cover.rooms, chr->oldrooms))) { + || !array_intersects(cover.rooms, chr->oldrooms))) { if (criteria & COVERCRITERIA_DISTTOME) { - sqdist = chrGetSquaredDistanceToCoord(chr, cover.pos); + sqdist = chr_get_squared_distance_to_coord(chr, cover.pos); } else if (criteria & COVERCRITERIA_DISTTOTARGET) { - sqdist = coordGetSquaredDistanceToCoord(&target->pos, cover.pos); + sqdist = coord_get_squared_distance_to_coord(&target->pos, cover.pos); } else if (criteria & COVERCRITERIA_DISTTOFETCHPROP) { - sqdist = coordGetSquaredDistanceToCoord(&gotoprop->pos, cover.pos); + sqdist = coord_get_squared_distance_to_coord(&gotoprop->pos, cover.pos); } else if (userandomdist) { sqdist = random() % 0xf000; } else { @@ -15464,14 +15464,14 @@ s32 chrAssignCoverByCriteria(struct chrdata *chr, u16 criteria, s32 refdist) // Assign the first out of sight cover for (i = 0; i < numcandidates; i++) { - if (1 && chrCheckCoverOutOfSight(chr, g_CoverCandidates[i].covernum, criteria & COVERCRITERIA_ALLOWSOFT)) { + if (1 && chr_check_cover_out_of_sight(chr, g_CoverCandidates[i].covernum, criteria & COVERCRITERIA_ALLOWSOFT)) { chr->cover = g_CoverCandidates[i].covernum; if (oldcover != -1) { - coverSetInUse(oldcover, false); + cover_set_in_use(oldcover, false); } - coverSetInUse(chr->cover, true); + cover_set_in_use(chr->cover, true); return g_CoverCandidates[i].covernum; } @@ -15521,7 +15521,7 @@ s32 chrAssignCoverByCriteria(struct chrdata *chr, u16 criteria, s32 refdist) * Preference is given to cover which is the "most opposite", meaning ones * which are directly behind the chr from the perspective of runfrompos. */ -s32 chrAssignCoverAwayFromDanger(struct chrdata *chr, s32 mindist, s32 maxdist) +s32 chr_assign_cover_away_from_danger(struct chrdata *chr, s32 mindist, s32 maxdist) { s32 i; f32 vecfromdanger[2]; @@ -15541,7 +15541,7 @@ s32 chrAssignCoverAwayFromDanger(struct chrdata *chr, s32 mindist, s32 maxdist) bestsqdist = 0; newcover = -1; - numcovers = coverGetCount(); + numcovers = cover_get_count(); prevcover = chr->cover; mindist *= mindist; @@ -15556,8 +15556,8 @@ s32 chrAssignCoverAwayFromDanger(struct chrdata *chr, s32 mindist, s32 maxdist) guNormalize(&vecfromdanger[0], &y, &vecfromdanger[1]); for (i = 0; i < numcovers; i++) { - if (coverUnpack(i, &cover) && !coverIsInUse(i) && !(cover.pos->y > ymax) && !coverIsSpecial(&cover)) { - coversqdistfrompos = coordGetSquaredDistanceToCoord(&chr->runfrompos, cover.pos); + if (cover_unpack(i, &cover) && !cover_is_in_use(i) && !(cover.pos->y > ymax) && !cover_is_special(&cover)) { + coversqdistfrompos = coord_get_squared_distance_to_coord(&chr->runfrompos, cover.pos); if (!(coversqdistfrompos < mindist) && !(coversqdistfrompos > maxdist)) { vectocover[0] = cover.pos->x - chr->prop->pos.x; @@ -15582,16 +15582,16 @@ s32 chrAssignCoverAwayFromDanger(struct chrdata *chr, s32 mindist, s32 maxdist) if (newcover != -1) { if (prevcover != -1) { - coverSetInUse(prevcover, false); + cover_set_in_use(prevcover, false); } - coverSetInUse(chr->cover, true); + cover_set_in_use(chr->cover, true); } return newcover; } -s16 chrGoToCover(struct chrdata *chr, u8 speed) +s16 chr_go_to_cover(struct chrdata *chr, u8 speed) { struct cover cover; @@ -15599,21 +15599,21 @@ s16 chrGoToCover(struct chrdata *chr, u8 speed) return 0; } - if (chrIsReadyForOrders(chr) && chr->cover != -1 && coverUnpack(chr->cover, &cover)) { - chrGoToRoomPos(chr, cover.pos, &cover.rooms[0], speed); + if (chr_is_ready_for_orders(chr) && chr->cover != -1 && cover_unpack(chr->cover, &cover)) { + chr_go_to_room_pos(chr, cover.pos, &cover.rooms[0], speed); return chr->cover; } return -1; } -bool chrRunFromPos(struct chrdata *chr, u32 goposflags, f32 rundist, struct coord *frompos) +bool chr_run_from_pos(struct chrdata *chr, u32 goposflags, f32 rundist, struct coord *frompos) { f32 curdistfrompos; struct coord delta; RoomNum rooms[8]; - if (chrIsReadyForOrders(chr)) { + if (chr_is_ready_for_orders(chr)) { delta.x = chr->prop->pos.x - frompos->x; delta.y = chr->prop->pos.y; delta.z = chr->prop->pos.z - frompos->z; @@ -15629,36 +15629,36 @@ bool chrRunFromPos(struct chrdata *chr, u32 goposflags, f32 rundist, struct coor delta.x *= rundist / curdistfrompos; delta.z *= rundist / curdistfrompos; - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); - if (cdExamLos08(&chr->prop->pos, chr->prop->rooms, &delta, CDTYPE_ALL, GEOFLAG_WALL) == CDRESULT_COLLISION) { + if (cd_exam_los08(&chr->prop->pos, chr->prop->rooms, &delta, CDTYPE_ALL, GEOFLAG_WALL) == CDRESULT_COLLISION) { #if VERSION >= VERSION_JPN_FINAL - cdGetPos(&delta, 18592, "chr/chraction.c"); + cd_get_pos(&delta, 18592, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetPos(&delta, 18555, "chr/chraction.c"); + cd_get_pos(&delta, 18555, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetPos(&delta, 18550, "chraction.c"); + cd_get_pos(&delta, 18550, "chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&delta, 18547, "chraction.c"); + cd_get_pos(&delta, 18547, "chraction.c"); #else - cdGetPos(&delta, 18277, "chraction.c"); + cd_get_pos(&delta, 18277, "chraction.c"); #endif } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); func0f065e74(&chr->prop->pos, chr->prop->rooms, &delta, rooms); - return chrGoToRoomPos(chr, &delta, rooms, goposflags); + return chr_go_to_room_pos(chr, &delta, rooms, goposflags); } return false; } -void chrAddTargetToBdlist(struct chrdata *chr) +void chr_add_target_to_bdlist(struct chrdata *chr) { if (chr->prop) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); s32 i; if (target) { @@ -15675,7 +15675,7 @@ void chrAddTargetToBdlist(struct chrdata *chr) } } -s32 chrGetDistanceLostToTargetInLastSecond(struct chrdata *chr) +s32 chr_get_distance_lost_to_target_in_last_second(struct chrdata *chr) { s32 *bdlist = &chr->bdlist[0]; s32 index = chr->bdstart; @@ -15692,32 +15692,32 @@ s32 chrGetDistanceLostToTargetInLastSecond(struct chrdata *chr) return curdist - olddist; } -bool chrIsTargetNearlyInSight(struct chrdata *chr, u32 distance) +bool chr_is_target_nearly_in_sight(struct chrdata *chr, u32 distance) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); - return cdIsNearlyInSight(&chr->prop->pos, chr->prop->rooms, &target->pos, distance, CDTYPE_BG); + return cd_is_nearly_in_sight(&chr->prop->pos, chr->prop->rooms, &target->pos, distance, CDTYPE_BG); } -bool chrIsNearlyInTargetsSight(struct chrdata *chr, u32 distance) +bool chr_is_nearly_in_targets_sight(struct chrdata *chr, u32 distance) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); - return cdIsNearlyInSight(&target->pos, target->rooms, &chr->prop->pos, distance, CDTYPE_BG); + return cd_is_nearly_in_sight(&target->pos, target->rooms, &chr->prop->pos, distance, CDTYPE_BG); } f32 func0f04c784(struct chrdata *chr) { f32 targetfacingangle = 0; u32 stack; - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); f32 angletotarget; f32 result; if (target->type == PROPTYPE_CHR) { - targetfacingangle = chrGetInverseTheta(target->chr); + targetfacingangle = chr_get_inverse_theta(target->chr); } else if (target->type == PROPTYPE_PLAYER) { - s32 playernum = playermgrGetPlayerNumByProp(target); + s32 playernum = playermgr_get_player_num_by_prop(target); targetfacingangle = g_Vars.players[playernum]->vv_theta; } @@ -15733,7 +15733,7 @@ f32 func0f04c784(struct chrdata *chr) bool chr0f04c874(struct chrdata *chr, u32 angle360, struct coord *pos, u8 arg3, u8 arg4) { - struct prop *target = chrGetTargetProp(chr); + struct prop *target = chr_get_target_prop(chr); f32 sqdist = 0; f32 f24 = func0f04c784(chr); f32 cosine; @@ -15773,9 +15773,9 @@ bool chr0f04c874(struct chrdata *chr, u32 angle360, struct coord *pos, u8 arg3, pos->y = chrpos.y; pos->z = target->pos.z + (xdiff * sine + zdiff * cosine); - chrGetBbox(chr->prop, &radius, &ymax, &ymin); + chr_get_bbox(chr->prop, &radius, &ymax, &ymin); - result = cdExamCylMove03(&chrpos, chr->prop->rooms, pos, + result = cd_exam_cyl_move03(&chrpos, chr->prop->rooms, pos, CDTYPE_BG | CDTYPE_OBJS | CDTYPE_DOORS, 1, ymax - chrpos.f[1], ymin - chrpos.f[1]); @@ -15786,15 +15786,15 @@ bool chr0f04c874(struct chrdata *chr, u32 angle360, struct coord *pos, u8 arg3, f32 tmp; #if VERSION >= VERSION_JPN_FINAL - cdGetPos(pos, 18731, "chr/chraction.c"); + cd_get_pos(pos, 18731, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetPos(pos, 18694, "chr/chraction.c"); + cd_get_pos(pos, 18694, "chr/chraction.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetPos(pos, 18689, "chraction.c"); + cd_get_pos(pos, 18689, "chraction.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(pos, 18686, "chraction.c"); + cd_get_pos(pos, 18686, "chraction.c"); #else - cdGetPos(pos, 18416, "chraction.c"); + cd_get_pos(pos, 18416, "chraction.c"); #endif xdiff = pos->x - chrpos.x; @@ -15850,7 +15850,7 @@ bool chr0f04c874(struct chrdata *chr, u32 angle360, struct coord *pos, u8 arg3, } } - chrGoToPos(chr, pos, arg4); + chr_go_to_pos(chr, pos, arg4); return true; } @@ -15869,9 +15869,9 @@ bool chr0f04c874(struct chrdata *chr, u32 angle360, struct coord *pos, u8 arg3, * * Elements 7 onwards are chrnums. Each team is terminated with -2. */ -void rebuildTeams(void) +void rebuild_teams(void) { - s32 numchrs = chrsGetNumSlots(); + s32 numchrs = chrs_get_num_slots(); s16 index = 7; s32 team; s32 i; @@ -15911,9 +15911,9 @@ void rebuildTeams(void) * * Elements 15 onwards are chrnums. Each squadron is terminated with -2. */ -void rebuildSquadrons(void) +void rebuild_squadrons(void) { - s32 numchrs = chrsGetNumSlots(); + s32 numchrs = chrs_get_num_slots(); s16 index = 15; s32 squadron; s32 i; @@ -15943,7 +15943,7 @@ void rebuildSquadrons(void) } } -s16 *teamGetChrIds(s32 team_id) +s16 *team_get_chr_ids(s32 team_id) { s32 i; u8 lookup[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; @@ -15966,7 +15966,7 @@ s16 *teamGetChrIds(s32 team_id) return &g_TeamList[MAX_TEAMS - 1]; } -s16 *squadronGetChrIds(s32 squadron_id) +s16 *squadron_get_chr_ids(s32 squadron_id) { if (squadron_id < 0 || squadron_id >= MAX_SQUADRONS) { return NULL; @@ -15979,7 +15979,7 @@ s16 *squadronGetChrIds(s32 squadron_id) return &g_SquadronList[MAX_SQUADRONS - 1]; } -void audioMarkAsRecentlyPlayed(s16 audioid) +void audio_mark_as_recently_played(s16 audioid) { g_RecentQuipsPlayed[g_RecentQuipsIndex++] = audioid; @@ -15988,7 +15988,7 @@ void audioMarkAsRecentlyPlayed(s16 audioid) } } -bool audioWasNotPlayedRecently(s16 audioid) +bool audio_was_not_played_recently(s16 audioid) { u8 i; @@ -16002,12 +16002,12 @@ bool audioWasNotPlayedRecently(s16 audioid) } #if VERSION >= VERSION_NTSC_1_0 -Gfx *chrsRenderChrStats(Gfx *gdl, RoomNum *rooms) +Gfx *chrs_render_chr_stats(Gfx *gdl, RoomNum *rooms) { return gdl; } #else -Gfx *chrsRenderChrStats(Gfx *gdl, RoomNum *rooms) +Gfx *chrs_render_chr_stats(Gfx *gdl, RoomNum *rooms) { s32 x; s32 y; @@ -16021,19 +16021,19 @@ Gfx *chrsRenderChrStats(Gfx *gdl, RoomNum *rooms) char aibotbuffer[120]; u8 aibot = 0; s32 i; - s32 numchrs = chrsGetNumSlots(); + s32 numchrs = chrs_get_num_slots(); gdl = text0f153628(gdl); for (i = 0; i < numchrs; i++) { struct chrdata *chr = &g_ChrSlots[i]; - if (chr && chr->prop && arrayIntersects(chr->prop->rooms, rooms)) { + if (chr && chr->prop && array_intersects(chr->prop->rooms, rooms)) { sp20c.x = chr->prop->pos.x; sp20c.y = chr->ground + chr->height - 30; sp20c.z = chr->prop->pos.z; - mtx4TransformVecInPlace(g_Vars.currentplayer->worldtoscreenmtx, &sp20c); + mtx4_transform_vec_in_place(g_Vars.currentplayer->worldtoscreenmtx, &sp20c); if (sp20c.z < -100 && sp20c.z > -1000) { cam0f0b4eb8(&sp20c, sp204, g_Vars.currentplayer->c_perspfovy, g_Vars.currentplayer->c_perspaspect); @@ -16043,7 +16043,7 @@ Gfx *chrsRenderChrStats(Gfx *gdl, RoomNum *rooms) if (chr->aibot) { if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { aibot = 1; - sprintf(aibotbuffer, "\nTEAM %d: Cmd: %s", chr->team, botGetCommandName(chr->aibot->command)); + sprintf(aibotbuffer, "\nTEAM %d: Cmd: %s", chr->team, bot_get_command_name(chr->aibot->command)); } } @@ -16053,15 +16053,15 @@ Gfx *chrsRenderChrStats(Gfx *gdl, RoomNum *rooms) chr->actiontype == ACT_GOPOS || chr->actiontype == ACT_PATROL ? g_ChrLiftActionNames[chr->liftaction] : g_ChrLiftActionNames[0], aibot ? aibotbuffer : ""); - textMeasure(&textheight, &textwidth, fullbuffer, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, fullbuffer, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x2 = x + textwidth; y2 = y + textheight; gdl = text0f153858(gdl, &x, &y, &x2, &y2); - gdl = textRender(gdl, &x, &y, fullbuffer, + gdl = text_render(gdl, &x, &y, fullbuffer, g_CharsHandelGothicXs, g_FontHandelGothicXs, - 0xff8800aa, 0x00000088, viGetWidth(), viGetHeight(), 0, 0); + 0xff8800aa, 0x00000088, vi_get_width(), vi_get_height(), 0, 0); } } } @@ -16072,14 +16072,14 @@ Gfx *chrsRenderChrStats(Gfx *gdl, RoomNum *rooms) } #endif -void chrToggleModelPart(struct chrdata *chr, s32 partnum) +void chr_toggle_model_part(struct chrdata *chr, s32 partnum) { if (chr && chr->model && chr->model->definition) { - struct modelnode *node = modelGetPart(chr->model->definition, partnum); + struct modelnode *node = model_get_part(chr->model->definition, partnum); union modelrwdata *rwdata = NULL; if (node) { - rwdata = modelGetNodeRwData(chr->model, node); + rwdata = model_get_node_rw_data(chr->model, node); } if (rwdata) { @@ -16098,7 +16098,7 @@ void chrToggleModelPart(struct chrdata *chr, s32 partnum) * Collision checks are done, and no animation will be done if there would be a * collision. */ -void chrAvoid(struct chrdata *chr) +void chr_avoid(struct chrdata *chr) { // The first 4 items here are animation numbers // and the second 4 are their corresponding end frames. @@ -16108,8 +16108,8 @@ void chrAvoid(struct chrdata *chr) }; s32 animindex; - struct prop *target = chrGetTargetProp(chr); - f32 relangle = chrGetAngleToPos(chr, &target->pos) / M_BADTAU * 360; + struct prop *target = chr_get_target_prop(chr); + f32 relangle = chr_get_angle_to_pos(chr, &target->pos) / M_BADTAU * 360; u32 chranimflags = 0; f32 ymax; f32 ymin; @@ -16118,16 +16118,16 @@ void chrAvoid(struct chrdata *chr) f32 xdiff; f32 zdiff; f32 halfchrradius; - f32 chrangle = modelGetChrRotY(chr->model); + f32 chrangle = model_get_chr_rot_y(chr->model); RoomNum dstrooms[8]; struct coord dstpos; // @bug: This shouldn't be here, and the perim is not enabled again // if the chr is not ready for orders. - chrSetPerimEnabled(chr, false); + chr_set_perim_enabled(chr, false); - if (chrIsReadyForOrders(chr)) { - chrSetPerimEnabled(chr, false); + if (chr_is_ready_for_orders(chr)) { + chr_set_perim_enabled(chr, false); if (relangle > 45 && relangle <= 135) { animindex = 3; @@ -16158,7 +16158,7 @@ void chrAvoid(struct chrdata *chr) dstpos.y = chr->prop->pos.y; dstpos.z = chr->prop->pos.z + cosf(chrangle) * 100; - chrGetBbox(chr->prop, &radius, &ymax, &ymin); + chr_get_bbox(chr->prop, &radius, &ymax, &ymin); halfchrradius = radius * 0.5f; @@ -16169,19 +16169,19 @@ void chrAvoid(struct chrdata *chr) zdiff = dstpos.z - chr->prop->pos.z; if (xdiff > halfchrradius || zdiff > halfchrradius || xdiff < -halfchrradius || zdiff < -halfchrradius) { - cdresult = cdExamCylMove05(&chr->prop->pos, chr->prop->rooms, &dstpos, dstrooms, CDTYPE_ALL, true, ymax - chr->prop->pos.y, ymin - chr->prop->pos.y); + cdresult = cd_exam_cyl_move05(&chr->prop->pos, chr->prop->rooms, &dstpos, dstrooms, CDTYPE_ALL, true, ymax - chr->prop->pos.y, ymin - chr->prop->pos.y); } if (cdresult == CDRESULT_ERROR) { chr->chrflags &= ~CHRCFLAG_AVOIDING; } else if (cdresult == CDRESULT_NOCOLLISION) { - chrStartAnim(chr, anims[animindex], 0, anims[4 + animindex], chranimflags, 2, 0.6f); + chr_start_anim(chr, anims[animindex], 0, anims[4 + animindex], chranimflags, 2, 0.6f); } else { chr->chrflags &= ~CHRCFLAG_AVOIDING; } } - chrSetPerimEnabled(chr, true); + chr_set_perim_enabled(chr, true); } } @@ -16192,9 +16192,9 @@ void chrAvoid(struct chrdata *chr) * to the side as if avoiding something, then looks at whatever it was that just * went past. */ -bool chrIsAvoiding(struct chrdata *chr) +bool chr_is_avoiding(struct chrdata *chr) { - s32 anim = modelGetAnimNum(chr->model); + s32 anim = model_get_anim_num(chr->model); chr->chrflags &= ~CHRCFLAG_AVOIDING; // Possible @bug or just sloppy code: The flag check below can never pass @@ -16210,10 +16210,10 @@ bool chrIsAvoiding(struct chrdata *chr) return false; } -void chrDrCarollEmitSparks(struct chrdata *chr) +void chr_dr_caroll_emit_sparks(struct chrdata *chr) { if (chr && chr->prop) { - psCreate(0, chr->prop, SFX_SHIELD_DAMAGE, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); - sparksCreate(chr->prop->rooms[0], chr->prop, &chr->prop->pos, NULL, 0, SPARKTYPE_ELECTRICAL); + ps_create(0, chr->prop, SFX_SHIELD_DAMAGE, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); + sparks_create(chr->prop->rooms[0], chr->prop, &chr->prop->pos, NULL, 0, SPARKTYPE_ELECTRICAL); } } diff --git a/src/game/chrai.c b/src/game/chrai.c index a33e65d0e..746e4e82f 100644 --- a/src/game/chrai.c +++ b/src/game/chrai.c @@ -11,355 +11,355 @@ #include "types.h" bool (*g_CommandPointers[])(void) = { - /*0x0000*/ aiGoToNext, - /*0x0001*/ aiGoToFirst, - /*0x0002*/ aiLabel, - /*0x0003*/ aiYield, - /*0x0004*/ aiEndList, - /*0x0005*/ aiSetList, - /*0x0006*/ aiSetReturnList, - /*0x0007*/ aiSetShotList, - /*0x0008*/ aiReturn, - /*0x0009*/ aiStop, - /*0x000a*/ aiKneel, - /*0x000b*/ aiChrDoAnimation, - /*0x000c*/ aiIfIdle, - /*0x000d*/ aiBeSurprisedOneHand, - /*0x000e*/ aiBeSurprisedLookAround, - /*0x000f*/ aiTrySidestep, - /*0x0010*/ aiTryJumpOut, - /*0x0011*/ aiTryRunSideways, - /*0x0012*/ aiTryAttackWalk, - /*0x0013*/ aiTryAttackRun, - /*0x0014*/ aiTryAttackRoll, - /*0x0015*/ aiTryAttackStand, - /*0x0016*/ aiTryAttackKneel, - /*0x0017*/ aiTryModifyAttack, - /*0x0018*/ aiFaceEntity, + /*0x0000*/ ai_go_to_next, + /*0x0001*/ ai_go_to_first, + /*0x0002*/ ai_label, + /*0x0003*/ ai_yield, + /*0x0004*/ ai_end_list, + /*0x0005*/ ai_set_list, + /*0x0006*/ ai_set_return_list, + /*0x0007*/ ai_set_shot_list, + /*0x0008*/ ai_return, + /*0x0009*/ ai_stop, + /*0x000a*/ ai_kneel, + /*0x000b*/ ai_chr_do_animation, + /*0x000c*/ ai_if_idle, + /*0x000d*/ ai_be_surprised_one_hand, + /*0x000e*/ ai_be_surprised_look_around, + /*0x000f*/ ai_try_sidestep, + /*0x0010*/ ai_try_jump_out, + /*0x0011*/ ai_try_run_sideways, + /*0x0012*/ ai_try_attack_walk, + /*0x0013*/ ai_try_attack_run, + /*0x0014*/ ai_try_attack_roll, + /*0x0015*/ ai_try_attack_stand, + /*0x0016*/ ai_try_attack_kneel, + /*0x0017*/ ai_try_modify_attack, + /*0x0018*/ ai_face_entity, /*0x0019*/ ai0019, - /*0x001a*/ aiChrDamageChr, - /*0x001b*/ aiConsiderGrenadeThrow, - /*0x001c*/ aiDropItem, - /*0x001d*/ aiJogToPad, - /*0x001e*/ aiGoToPadPreset, - /*0x001f*/ aiWalkToPad, - /*0x0020*/ aiRunToPad, - /*0x0021*/ aiSetPath, - /*0x0022*/ aiStartPatrol, - /*0x0023*/ aiIfPatrolling, - /*0x0024*/ aiSurrender, - /*0x0025*/ aiFadeOut, - /*0x0026*/ aiRemoveChr, - /*0x0027*/ aiTryStartAlarm, - /*0x0028*/ aiActivateAlarm, - /*0x0029*/ aiDeactivateAlarm, - /*0x002a*/ aiTryRunFromTarget, - /*0x002b*/ aiTryJogToTargetProp, - /*0x002c*/ aiTryWalkToTargetProp, - /*0x002d*/ aiTryRunToTargetProp, - /*0x002e*/ aiTryGoToCoverProp, - /*0x002f*/ aiTryJogToChr, - /*0x0030*/ aiTryWalkToChr, - /*0x0031*/ aiTryRunToChr, - /*0x0032*/ aiIfStopped, - /*0x0033*/ aiIfChrDead, - /*0x0034*/ aiIfChrDeathAnimationFinished, - /*0x0035*/ aiIfCanSeeTarget, - /*0x0036*/ aiRandom, - /*0x0037*/ aiIfRandomLessThan, - /*0x0038*/ aiIfRandomGreaterThan, - /*0x0039*/ aiIfCanHearAlarm, - /*0x003a*/ aiIfAlarmActive, - /*0x003b*/ aiIfGasActive, - /*0x003c*/ aiIfHearsTarget, - /*0x003d*/ aiIfSawInjury, - /*0x003e*/ aiIfSawDeath, - /*0x003f*/ aiIfLosToTarget, - /*0x0040*/ aiIfTargetNearlyInSight, - /*0x0041*/ aiIfNearlyInTargetsSight, - /*0x0042*/ aiSetPadPresetToPadOnRouteToTarget, - /*0x0043*/ aiIfSawTargetRecently, - /*0x0044*/ aiIfHeardTargetRecently, - /*0x0045*/ aiIfLosToChr, - /*0x0046*/ aiIfNeverBeenOnScreen, - /*0x0047*/ aiIfOnScreen, - /*0x0048*/ aiIfChrInOnScreenRoom, - /*0x0049*/ aiIfRoomIsOnScreen, - /*0x004a*/ aiIfTargetAimingAtMe, - /*0x004b*/ aiIfNearMiss, - /*0x004c*/ aiIfSeesSuspiciousItem, - /*0x004d*/ aiIfTargetInFovLeft, - /*0x004e*/ aiIfCheckFovWithTarget, - /*0x004f*/ aiIfTargetOutOfFovLeft, - /*0x0050*/ aiIfTargetInFov, - /*0x0051*/ aiIfTargetOutOfFov, - /*0x0052*/ aiIfDistanceToTargetLessThan, - /*0x0053*/ aiIfDistanceToTargetGreaterThan, - /*0x0054*/ aiIfChrDistanceToPadLessThan, - /*0x0055*/ aiIfChrDistanceToPadGreaterThan, - /*0x0056*/ aiIfDistanceToChrLessThan, - /*0x0057*/ aiIfDistanceToChrGreaterThan, + /*0x001a*/ ai_chr_damage_chr, + /*0x001b*/ ai_consider_grenade_throw, + /*0x001c*/ ai_drop_item, + /*0x001d*/ ai_jog_to_pad, + /*0x001e*/ ai_go_to_pad_preset, + /*0x001f*/ ai_walk_to_pad, + /*0x0020*/ ai_run_to_pad, + /*0x0021*/ ai_set_path, + /*0x0022*/ ai_start_patrol, + /*0x0023*/ ai_if_patrolling, + /*0x0024*/ ai_surrender, + /*0x0025*/ ai_fade_out, + /*0x0026*/ ai_remove_chr, + /*0x0027*/ ai_try_start_alarm, + /*0x0028*/ ai_activate_alarm, + /*0x0029*/ ai_deactivate_alarm, + /*0x002a*/ ai_try_run_from_target, + /*0x002b*/ ai_try_jog_to_target_prop, + /*0x002c*/ ai_try_walk_to_target_prop, + /*0x002d*/ ai_try_run_to_target_prop, + /*0x002e*/ ai_try_go_to_cover_prop, + /*0x002f*/ ai_try_jog_to_chr, + /*0x0030*/ ai_try_walk_to_chr, + /*0x0031*/ ai_try_run_to_chr, + /*0x0032*/ ai_if_stopped, + /*0x0033*/ ai_if_chr_dead, + /*0x0034*/ ai_if_chr_death_animation_finished, + /*0x0035*/ ai_if_can_see_target, + /*0x0036*/ ai_random, + /*0x0037*/ ai_if_random_less_than, + /*0x0038*/ ai_if_random_greater_than, + /*0x0039*/ ai_if_can_hear_alarm, + /*0x003a*/ ai_if_alarm_active, + /*0x003b*/ ai_if_gas_active, + /*0x003c*/ ai_if_hears_target, + /*0x003d*/ ai_if_saw_injury, + /*0x003e*/ ai_if_saw_death, + /*0x003f*/ ai_if_los_to_target, + /*0x0040*/ ai_if_target_nearly_in_sight, + /*0x0041*/ ai_if_nearly_in_targets_sight, + /*0x0042*/ ai_set_pad_preset_to_pad_on_route_to_target, + /*0x0043*/ ai_if_saw_target_recently, + /*0x0044*/ ai_if_heard_target_recently, + /*0x0045*/ ai_if_los_to_chr, + /*0x0046*/ ai_if_never_been_on_screen, + /*0x0047*/ ai_if_on_screen, + /*0x0048*/ ai_if_chr_in_on_screen_room, + /*0x0049*/ ai_if_room_is_on_screen, + /*0x004a*/ ai_if_target_aiming_at_me, + /*0x004b*/ ai_if_near_miss, + /*0x004c*/ ai_if_sees_suspicious_item, + /*0x004d*/ ai_if_target_in_fov_left, + /*0x004e*/ ai_if_check_fov_with_target, + /*0x004f*/ ai_if_target_out_of_fov_left, + /*0x0050*/ ai_if_target_in_fov, + /*0x0051*/ ai_if_target_out_of_fov, + /*0x0052*/ ai_if_distance_to_target_less_than, + /*0x0053*/ ai_if_distance_to_target_greater_than, + /*0x0054*/ ai_if_chr_distance_to_pad_less_than, + /*0x0055*/ ai_if_chr_distance_to_pad_greater_than, + /*0x0056*/ ai_if_distance_to_chr_less_than, + /*0x0057*/ ai_if_distance_to_chr_greater_than, /*0x0058*/ ai0058, - /*0x0059*/ aiIfDistanceFromTargetToPadLessThan, - /*0x005a*/ aiIfDistanceFromTargetToPadGreaterThan, - /*0x005b*/ aiIfChrInRoom, - /*0x005c*/ aiIfTargetInRoom, - /*0x005d*/ aiIfChrHasObject, - /*0x005e*/ aiIfWeaponThrown, - /*0x005f*/ aiIfWeaponThrownOnObject, - /*0x0060*/ aiIfChrHasWeaponEquipped, - /*0x0061*/ aiIfGunUnclaimed, - /*0x0062*/ aiIfObjectHealthy, - /*0x0063*/ aiIfChrActivatedObject, + /*0x0059*/ ai_if_distance_from_target_to_pad_less_than, + /*0x005a*/ ai_if_distance_from_target_to_pad_greater_than, + /*0x005b*/ ai_if_chr_in_room, + /*0x005c*/ ai_if_target_in_room, + /*0x005d*/ ai_if_chr_has_object, + /*0x005e*/ ai_if_weapon_thrown, + /*0x005f*/ ai_if_weapon_thrown_on_object, + /*0x0060*/ ai_if_chr_has_weapon_equipped, + /*0x0061*/ ai_if_gun_unclaimed, + /*0x0062*/ ai_if_object_healthy, + /*0x0063*/ ai_if_chr_activated_object, /*0x0064*/ NULL, - /*0x0065*/ aiObjInteract, - /*0x0066*/ aiDestroyObject, + /*0x0065*/ ai_obj_interact, + /*0x0066*/ ai_destroy_object, /*0x0067*/ ai0067, - /*0x0068*/ aiChrDropItems, - /*0x0069*/ aiChrDropWeapon, - /*0x006a*/ aiGiveObjectToChr, - /*0x006b*/ aiObjectMoveToPad, - /*0x006c*/ aiOpenDoor, - /*0x006d*/ aiCloseDoor, - /*0x006e*/ aiIfDoorState, - /*0x006f*/ aiIfObjectIsDoor, - /*0x0070*/ aiLockDoor, - /*0x0071*/ aiUnlockDoor, - /*0x0072*/ aiIfDoorLocked, - /*0x0073*/ aiIfObjectiveComplete, - /*0x0074*/ aiIfObjectiveFailed, + /*0x0068*/ ai_chr_drop_items, + /*0x0069*/ ai_chr_drop_weapon, + /*0x006a*/ ai_give_object_to_chr, + /*0x006b*/ ai_object_move_to_pad, + /*0x006c*/ ai_open_door, + /*0x006d*/ ai_close_door, + /*0x006e*/ ai_if_door_state, + /*0x006f*/ ai_if_object_is_door, + /*0x0070*/ ai_lock_door, + /*0x0071*/ ai_unlock_door, + /*0x0072*/ ai_if_door_locked, + /*0x0073*/ ai_if_objective_complete, + /*0x0074*/ ai_if_objective_failed, /*0x0075*/ ai0075, - /*0x0076*/ aiSetPadPresetToTargetQuadrant, - /*0x0077*/ aiIfDifficultyLessThan, - /*0x0078*/ aiIfDifficultyGreaterThan, - /*0x0079*/ aiIfStageTimerLessThan, - /*0x007a*/ aiIfStageTimerGreaterThan, - /*0x007b*/ aiIfStageIdLessThan, - /*0x007c*/ aiIfStageIdGreaterThan, - /*0x007d*/ aiIfNumArghsLessThan, - /*0x007e*/ aiIfNumArghsGreaterThan, - /*0x007f*/ aiIfNumCloseArghsLessThan, - /*0x0080*/ aiIfNumCloseArghsGreaterThan, - /*0x0081*/ aiIfChrHealthGreaterThan, - /*0x0082*/ aiIfChrHealthLessThan, - /*0x0083*/ aiIfInjured, - /*0x0084*/ aiSetMorale, - /*0x0085*/ aiAddMorale, - /*0x0086*/ aiChrAddMorale, - /*0x0087*/ aiSubtractMorale, - /*0x0088*/ aiIfMoraleLessThan, - /*0x0089*/ aiIfMoraleLessThanRandom, - /*0x008a*/ aiSetAlertness, - /*0x008b*/ aiAddAlertness, - /*0x008c*/ aiChrAddAlertness, - /*0x008d*/ aiSubtractAlertness, - /*0x008e*/ aiIfAlertness, - /*0x008f*/ aiIfChrAlertnessLessThan, - /*0x0090*/ aiIfAlertnessLessThanRandom, - /*0x0091*/ aiNoOp0091, - /*0x0092*/ aiSetHearDistance, - /*0x0093*/ aiSetViewDistance, - /*0x0094*/ aiSetGrenadeProbability, - /*0x0095*/ aiSetChrNum, - /*0x0096*/ aiSetMaxDamage, - /*0x0097*/ aiAddHealth, - /*0x0098*/ aiSetReactionSpeed, - /*0x0099*/ aiSetRecoverySpeed, - /*0x009a*/ aiSetAccuracy, - /*0x009b*/ aiSetFlag, - /*0x009c*/ aiUnsetFlag, - /*0x009d*/ aiIfHasFlag, - /*0x009e*/ aiChrSetFlag, - /*0x009f*/ aiChrUnsetFlag, - /*0x00a0*/ aiIfChrHasFlag, - /*0x00a1*/ aiSetStageFlag, - /*0x00a2*/ aiUnsetStageFlag, - /*0x00a3*/ aiIfStageFlagEq, - /*0x00a4*/ aiSetChrflag, - /*0x00a5*/ aiUnsetChrflag, - /*0x00a6*/ aiIfHasChrflag, - /*0x00a7*/ aiChrSetChrflag, - /*0x00a8*/ aiChrUnsetChrflag, - /*0x00a9*/ aiIfChrHasChrflag, - /*0x00aa*/ aiSetObjFlag, - /*0x00ab*/ aiUnsetObjFlag, - /*0x00ac*/ aiIfObjHasFlag, - /*0x00ad*/ aiSetObjFlag2, - /*0x00ae*/ aiUnsetObjFlag2, - /*0x00af*/ aiIfObjHasFlag2, - /*0x00b0*/ aiSetChrPreset, - /*0x00b1*/ aiSetChrTarget, - /*0x00b2*/ aiSetPadPreset, - /*0x00b3*/ aiChrSetPadPreset, - /*0x00b4*/ aiChrCopyPadPreset, - /*0x00b5*/ aiPrint, - /*0x00b6*/ aiRestartTimer, - /*0x00b7*/ aiResetTimer, - /*0x00b8*/ aiPauseTimer, - /*0x00b9*/ aiResumeTimer, - /*0x00ba*/ aiIfTimerStopped, - /*0x00bb*/ aiIfTimerGreaterThanRandom, - /*0x00bc*/ aiIfTimerLessThan, - /*0x00bd*/ aiIfTimerGreaterThan, - /*0x00be*/ aiShowCountdownTimer, - /*0x00bf*/ aiHideCountdownTimer, - /*0x00c0*/ aiSetCountdownTimerValue, - /*0x00c1*/ aiStopCountdownTimer, - /*0x00c2*/ aiStartCountdownTimer, - /*0x00c3*/ aiIfCountdownTimerStopped, - /*0x00c4*/ aiIfCountdownTimerLessThan, - /*0x00c5*/ aiIfCountdownTimerGreaterThan, - /*0x00c6*/ aiSpawnChrAtPad, - /*0x00c7*/ aiSpawnChrAtChr, - /*0x00c8*/ aiTryEquipWeapon, - /*0x00c9*/ aiTryEquipHat, - /*0x00ca*/ aiDuplicateChr, - /*0x00cb*/ aiShowHudmsg, - /*0x00cc*/ aiShowHudmsgTopMiddle, - /*0x00cd*/ aiSpeak, - /*0x00ce*/ aiPlaySound, - /*0x00cf*/ aiSetObjectSoundPlaying, - /*0x00d0*/ aiPlayRepeatingSoundFromPad, - /*0x00d1*/ aiSetObjectSoundVolume, - /*0x00d2*/ aiSetObjectSoundVolumeByDistance, - /*0x00d3*/ aiAudioMuteChannel, - /*0x00d4*/ aiIfObjectSoundVolumeLessThan, - /*0x00d5*/ aiHovercarBeginPath, - /*0x00d6*/ aiSetVehicleSpeed, - /*0x00d7*/ aiSetRotorSpeed, - /*0x00d8*/ aiNoOp00d8, - /*0x00d9*/ aiNoOp00d9, - /*0x00da*/ aiSetObjImage, - /*0x00db*/ aiNoOp00db, - /*0x00dc*/ aiEndLevel, + /*0x0076*/ ai_set_pad_preset_to_target_quadrant, + /*0x0077*/ ai_if_difficulty_less_than, + /*0x0078*/ ai_if_difficulty_greater_than, + /*0x0079*/ ai_if_stage_timer_less_than, + /*0x007a*/ ai_if_stage_timer_greater_than, + /*0x007b*/ ai_if_stage_id_less_than, + /*0x007c*/ ai_if_stage_id_greater_than, + /*0x007d*/ ai_if_num_arghs_less_than, + /*0x007e*/ ai_if_num_arghs_greater_than, + /*0x007f*/ ai_if_num_close_arghs_less_than, + /*0x0080*/ ai_if_num_close_arghs_greater_than, + /*0x0081*/ ai_if_chr_health_greater_than, + /*0x0082*/ ai_if_chr_health_less_than, + /*0x0083*/ ai_if_injured, + /*0x0084*/ ai_set_morale, + /*0x0085*/ ai_add_morale, + /*0x0086*/ ai_chr_add_morale, + /*0x0087*/ ai_subtract_morale, + /*0x0088*/ ai_if_morale_less_than, + /*0x0089*/ ai_if_morale_less_than_random, + /*0x008a*/ ai_set_alertness, + /*0x008b*/ ai_add_alertness, + /*0x008c*/ ai_chr_add_alertness, + /*0x008d*/ ai_subtract_alertness, + /*0x008e*/ ai_if_alertness, + /*0x008f*/ ai_if_chr_alertness_less_than, + /*0x0090*/ ai_if_alertness_less_than_random, + /*0x0091*/ ai_noop_0091, + /*0x0092*/ ai_set_hear_distance, + /*0x0093*/ ai_set_view_distance, + /*0x0094*/ ai_set_grenade_probability, + /*0x0095*/ ai_set_chr_num, + /*0x0096*/ ai_set_max_damage, + /*0x0097*/ ai_add_health, + /*0x0098*/ ai_set_reaction_speed, + /*0x0099*/ ai_set_recovery_speed, + /*0x009a*/ ai_set_accuracy, + /*0x009b*/ ai_set_flag, + /*0x009c*/ ai_unset_flag, + /*0x009d*/ ai_if_has_flag, + /*0x009e*/ ai_chr_set_flag, + /*0x009f*/ ai_chr_unset_flag, + /*0x00a0*/ ai_if_chr_has_flag, + /*0x00a1*/ ai_set_stage_flag, + /*0x00a2*/ ai_unset_stage_flag, + /*0x00a3*/ ai_if_stage_flag_eq, + /*0x00a4*/ ai_set_chrflag, + /*0x00a5*/ ai_unset_chrflag, + /*0x00a6*/ ai_if_has_chrflag, + /*0x00a7*/ ai_chr_set_chrflag, + /*0x00a8*/ ai_chr_unset_chrflag, + /*0x00a9*/ ai_if_chr_has_chrflag, + /*0x00aa*/ ai_set_obj_flag, + /*0x00ab*/ ai_unset_obj_flag, + /*0x00ac*/ ai_if_obj_has_flag, + /*0x00ad*/ ai_set_obj_flag2, + /*0x00ae*/ ai_unset_obj_flag2, + /*0x00af*/ ai_if_obj_has_flag2, + /*0x00b0*/ ai_set_chr_preset, + /*0x00b1*/ ai_set_chr_target, + /*0x00b2*/ ai_set_pad_preset, + /*0x00b3*/ ai_chr_set_pad_preset, + /*0x00b4*/ ai_chr_copy_pad_preset, + /*0x00b5*/ ai_print, + /*0x00b6*/ ai_restart_timer, + /*0x00b7*/ ai_reset_timer, + /*0x00b8*/ ai_pause_timer, + /*0x00b9*/ ai_resume_timer, + /*0x00ba*/ ai_if_timer_stopped, + /*0x00bb*/ ai_if_timer_greater_than_random, + /*0x00bc*/ ai_if_timer_less_than, + /*0x00bd*/ ai_if_timer_greater_than, + /*0x00be*/ ai_show_countdown_timer, + /*0x00bf*/ ai_hide_countdown_timer, + /*0x00c0*/ ai_set_countdown_timer_value, + /*0x00c1*/ ai_stop_countdown_timer, + /*0x00c2*/ ai_start_countdown_timer, + /*0x00c3*/ ai_if_countdown_timer_stopped, + /*0x00c4*/ ai_if_countdown_timer_less_than, + /*0x00c5*/ ai_if_countdown_timer_greater_than, + /*0x00c6*/ ai_spawn_chr_at_pad, + /*0x00c7*/ ai_spawn_chr_at_chr, + /*0x00c8*/ ai_try_equip_weapon, + /*0x00c9*/ ai_try_equip_hat, + /*0x00ca*/ ai_duplicate_chr, + /*0x00cb*/ ai_show_hudmsg, + /*0x00cc*/ ai_show_hudmsg_top_middle, + /*0x00cd*/ ai_speak, + /*0x00ce*/ ai_play_sound, + /*0x00cf*/ ai_set_object_sound_playing, + /*0x00d0*/ ai_play_repeating_sound_from_pad, + /*0x00d1*/ ai_set_object_sound_volume, + /*0x00d2*/ ai_set_object_sound_volume_by_distance, + /*0x00d3*/ ai_audio_mute_channel, + /*0x00d4*/ ai_if_object_sound_volume_less_than, + /*0x00d5*/ ai_hovercar_begin_path, + /*0x00d6*/ ai_set_vehicle_speed, + /*0x00d7*/ ai_set_rotor_speed, + /*0x00d8*/ ai_noop_00d8, + /*0x00d9*/ ai_noop_00d9, + /*0x00da*/ ai_set_obj_image, + /*0x00db*/ ai_noop_00db, + /*0x00dc*/ ai_end_level, /*0x00dd*/ ai00dd, - /*0x00de*/ aiMoveCameraToPad, - /*0x00df*/ aiMoveCameraToPreset, - /*0x00e0*/ aiRevokeControl, - /*0x00e1*/ aiGrantControl, - /*0x00e2*/ aiChrMoveToPad, + /*0x00de*/ ai_move_camera_to_pad, + /*0x00df*/ ai_move_camera_to_preset, + /*0x00e0*/ ai_revoke_control, + /*0x00e1*/ ai_grant_control, + /*0x00e2*/ ai_chr_move_to_pad, /*0x00e3*/ ai00e3, /*0x00e4*/ ai00e4, - /*0x00e5*/ aiIfColourFadeComplete, + /*0x00e5*/ ai_if_colour_fade_complete, /*0x00e6*/ NULL, /*0x00e7*/ NULL, - /*0x00e8*/ aiSetDoorOpen, + /*0x00e8*/ ai_set_door_open, /*0x00e9*/ ai00e9, - /*0x00ea*/ aiIfNumPlayersLessThan, - /*0x00eb*/ aiIfChrAmmoQuantityLessThan, - /*0x00ec*/ aiChrDrawWeapon, - /*0x00ed*/ aiChrDrawWeaponInCutscene, + /*0x00ea*/ ai_if_num_players_less_than, + /*0x00eb*/ ai_if_chr_ammo_quantity_less_than, + /*0x00ec*/ ai_chr_draw_weapon, + /*0x00ed*/ ai_chr_draw_weapon_in_cutscene, /*0x00ee*/ ai00ee, - /*0x00ef*/ aiIfObjInRoom, + /*0x00ef*/ ai_if_obj_in_room, /*0x00f0*/ ai00f0, - /*0x00f1*/ aiIfAttacking, - /*0x00f2*/ aiSwitchToAltSky, - /*0x00f3*/ aiChrSetInvincible, - /*0x00f4*/ aiMoveCameraToPos, + /*0x00f1*/ ai_if_attacking, + /*0x00f2*/ ai_switch_to_alt_sky, + /*0x00f3*/ ai_chr_set_invincible, + /*0x00f4*/ ai_move_camera_to_pos, /*0x00f5*/ ai00f5, /*0x00f6*/ ai00f6, - /*0x00f7*/ aiIfAllObjectivesComplete, - /*0x00f8*/ aiIfPlayerIsInvincible, - /*0x00f9*/ aiPlayXTrack, - /*0x00fa*/ aiStopXTrack, - /*0x00fb*/ aiChrExplosions, - /*0x00fc*/ aiIfKillCountGreaterThan, + /*0x00f7*/ ai_if_all_objectives_complete, + /*0x00f8*/ ai_if_player_is_invincible, + /*0x00f9*/ ai_play_x_track, + /*0x00fa*/ ai_stop_x_track, + /*0x00fb*/ ai_chr_explosions, + /*0x00fc*/ ai_if_kill_count_greater_than, /*0x00fd*/ ai00fd, - /*0x00fe*/ aiKillBond, - /*0x00ff*/ aiBeSurprisedSurrender, - /*0x0100*/ aiNoOp0100, - /*0x0101*/ aiNoOp0101, - /*0x0102*/ aiSetLights, - /*0x0103*/ aiIfPropPresetIsBlockingSightToTarget, - /*0x0104*/ aiRemoveObjectAtPropPreset, - /*0x0105*/ aiIfPropPresetHeightLessThan, - /*0x0106*/ aiSetTarget, - /*0x0107*/ aiIfPresetsTargetIsNotMyTarget, - /*0x0108*/ aiIfChrTarget, - /*0x0109*/ aiSetChrPresetToChrNearSelf, - /*0x010a*/ aiSetChrPresetToChrNearPad, - /*0x010b*/ aiChrSetTeam, - /*0x010c*/ aiIfCompareChrPresetsTeam, - /*0x010d*/ aiNoOp010d, - /*0x010e*/ aiSetShield, - /*0x010f*/ aiIfChrShieldLessThan, - /*0x0110*/ aiIfChrShieldGreaterThan, - /*0x0111*/ aiSetCameraAnimation, - /*0x0112*/ aiObjectDoAnimation, - /*0x0113*/ aiIfInCutscene, - /*0x0114*/ aiEnableChr, - /*0x0115*/ aiDisableChr, - /*0x0116*/ aiEnableObj, - /*0x0117*/ aiDisableObj, - /*0x0118*/ aiSetObjFlag3, - /*0x0119*/ aiUnsetObjFlag3, - /*0x011a*/ aiIfObjHasFlag3, - /*0x011b*/ aiChrSetHiddenFlag, - /*0x011c*/ aiChrUnsetHiddenFlag, - /*0x011d*/ aiIfChrHasHiddenFlag, - /*0x011e*/ aiIfHuman, - /*0x011f*/ aiIfSkedar, - /*0x0120*/ aiIfSafety2LessThan, - /*0x0121*/ aiFindCover, - /*0x0122*/ aiFindCoverWithinDist, - /*0x0123*/ aiFindCoverOutsideDist, - /*0x0124*/ aiGoToCover, - /*0x0125*/ aiCheckCoverOutOfSight, - /*0x0126*/ aiIfPlayerUsingCmpOrAr34, - /*0x0127*/ aiDetectEnemyOnSameFloor, - /*0x0128*/ aiDetectEnemy, - /*0x0129*/ aiIfSafetyLessThan, - /*0x012a*/ aiIfTargetMovingSlowly, - /*0x012b*/ aiIfTargetMovingCloser, - /*0x012c*/ aiIfTargetMovingAway, + /*0x00fe*/ ai_kill_bond, + /*0x00ff*/ ai_be_surprised_surrender, + /*0x0100*/ ai_noop_0100, + /*0x0101*/ ai_noop_0101, + /*0x0102*/ ai_set_lights, + /*0x0103*/ ai_if_prop_preset_is_blocking_sight_to_target, + /*0x0104*/ ai_remove_object_at_prop_preset, + /*0x0105*/ ai_if_prop_preset_height_less_than, + /*0x0106*/ ai_set_target, + /*0x0107*/ ai_if_presets_target_is_not_my_target, + /*0x0108*/ ai_if_chr_target, + /*0x0109*/ ai_set_chr_preset_to_chr_near_self, + /*0x010a*/ ai_set_chr_preset_to_chr_near_pad, + /*0x010b*/ ai_chr_set_team, + /*0x010c*/ ai_if_compare_chr_presets_team, + /*0x010d*/ ai_noop_010d, + /*0x010e*/ ai_set_shield, + /*0x010f*/ ai_if_chr_shield_less_than, + /*0x0110*/ ai_if_chr_shield_greater_than, + /*0x0111*/ ai_set_camera_animation, + /*0x0112*/ ai_object_do_animation, + /*0x0113*/ ai_if_in_cutscene, + /*0x0114*/ ai_enable_chr, + /*0x0115*/ ai_disable_chr, + /*0x0116*/ ai_enable_obj, + /*0x0117*/ ai_disable_obj, + /*0x0118*/ ai_set_obj_flag3, + /*0x0119*/ ai_unset_obj_flag3, + /*0x011a*/ ai_if_obj_has_flag3, + /*0x011b*/ ai_chr_set_hidden_flag, + /*0x011c*/ ai_chr_unset_hidden_flag, + /*0x011d*/ ai_if_chr_has_hidden_flag, + /*0x011e*/ ai_if_human, + /*0x011f*/ ai_if_skedar, + /*0x0120*/ ai_if_safety2_less_than, + /*0x0121*/ ai_find_cover, + /*0x0122*/ ai_find_cover_within_dist, + /*0x0123*/ ai_find_cover_outside_dist, + /*0x0124*/ ai_go_to_cover, + /*0x0125*/ ai_check_cover_out_of_sight, + /*0x0126*/ ai_if_player_using_cmp_or_ar34, + /*0x0127*/ ai_detect_enemy_on_same_floor, + /*0x0128*/ ai_detect_enemy, + /*0x0129*/ ai_if_safety_less_than, + /*0x012a*/ ai_if_target_moving_slowly, + /*0x012b*/ ai_if_target_moving_closer, + /*0x012c*/ ai_if_target_moving_away, /*0x012d*/ NULL, /*0x012e*/ NULL, /*0x012f*/ ai012f, - /*0x0130*/ aiSayQuip, - /*0x0131*/ aiIncreaseSquadronAlertness, - /*0x0132*/ aiSetAction, - /*0x0133*/ aiSetTeamOrders, - /*0x0134*/ aiIfOrders, - /*0x0135*/ aiIfHasOrders, - /*0x0136*/ aiRetreat, - /*0x0137*/ aiIfChrInSquadronDoingAction, - /*0x0138*/ aiIfChannelFree, + /*0x0130*/ ai_say_quip, + /*0x0131*/ ai_increase_squadron_alertness, + /*0x0132*/ ai_set_action, + /*0x0133*/ ai_set_team_orders, + /*0x0134*/ ai_if_orders, + /*0x0135*/ ai_if_has_orders, + /*0x0136*/ ai_retreat, + /*0x0137*/ ai_if_chr_in_squadron_doing_action, + /*0x0138*/ ai_if_channel_free, /*0x0139*/ ai0139, - /*0x013a*/ aiSetChrPresetToUnalertedTeammate, - /*0x013b*/ aiSetSquadron, - /*0x013c*/ aiFaceCover, - /*0x013d*/ aiIfDangerousObjectNearby, + /*0x013a*/ ai_set_chr_preset_to_unalerted_teammate, + /*0x013b*/ ai_set_squadron, + /*0x013c*/ ai_face_cover, + /*0x013d*/ ai_if_dangerous_object_nearby, /*0x013e*/ ai013e, - /*0x013f*/ aiIfHeliWeaponsArmed, - /*0x0140*/ aiIfHoverbotNextStep, - /*0x0141*/ aiShuffleInvestigationTerminals, - /*0x0142*/ aiSetPadPresetToInvestigationTerminal, - /*0x0143*/ aiHeliArmWeapons, - /*0x0144*/ aiHeliUnarmWeapons, - /*0x0145*/ aiRebuildTeams, - /*0x0146*/ aiRebuildSquadrons, - /*0x0147*/ aiIfSquadronIsDead, - /*0x0148*/ aiChrSetListening, - /*0x0149*/ aiIfChrListening, - /*0x014a*/ aiIfTrue, - /*0x014b*/ aiIfNotListening, + /*0x013f*/ ai_if_heli_weapons_armed, + /*0x0140*/ ai_if_hoverbot_next_step, + /*0x0141*/ ai_shuffle_investigation_terminals, + /*0x0142*/ ai_set_pad_preset_to_investigation_terminal, + /*0x0143*/ ai_heli_arm_weapons, + /*0x0144*/ ai_heli_unarm_weapons, + /*0x0145*/ ai_rebuild_teams, + /*0x0146*/ ai_rebuild_squadrons, + /*0x0147*/ ai_if_squadron_is_dead, + /*0x0148*/ ai_chr_set_listening, + /*0x0149*/ ai_if_chr_listening, + /*0x014a*/ ai_if_true, + /*0x014b*/ ai_if_not_listening, /*0x014c*/ NULL, /*0x014d*/ NULL, /*0x014e*/ NULL, /*0x014f*/ NULL, /*0x0150*/ NULL, /*0x0151*/ NULL, - /*0x0152*/ aiIfNumChrsInSquadronGreaterThan, + /*0x0152*/ ai_if_num_chrs_in_squadron_greater_than, /*0x0153*/ NULL, /*0x0154*/ NULL, /*0x0155*/ NULL, /*0x0156*/ NULL, - /*0x0157*/ aiSetTintedGlassEnabled, + /*0x0157*/ ai_set_tinted_glass_enabled, /*0x0158*/ NULL, /*0x0159*/ NULL, /*0x015a*/ NULL, - /*0x015b*/ aiPlayTrackIsolated, - /*0x015c*/ aiPlayDefaultTracks, + /*0x015b*/ ai_play_track_isolated, + /*0x015c*/ ai_play_default_tracks, /*0x015d*/ NULL, /*0x015e*/ NULL, /*0x015f*/ NULL, @@ -368,53 +368,53 @@ bool (*g_CommandPointers[])(void) = { /*0x0162*/ NULL, /*0x0163*/ NULL, /*0x0164*/ NULL, - /*0x0165*/ aiIfChrInjured, - /*0x0166*/ aiIfAction, - /*0x0167*/ aiHovercopterFireRocket, - /*0x0168*/ aiIfShieldDamaged, - /*0x0169*/ aiIfNaturalAnim, - /*0x016a*/ aiIfY, - /*0x016b*/ aiPlayRepeatingSoundFromObject, - /*0x016c*/ aiNoOp016c, - /*0x016d*/ aiChrAdjustMotionBlur, - /*0x016e*/ aiDamageChrByAmount, - /*0x016f*/ aiIfChrHasGun, - /*0x0170*/ aiDoGunCommand, - /*0x0171*/ aiIfDistanceToGunLessThan, - /*0x0172*/ aiRecoverGun, - /*0x0173*/ aiChrCopyProperties, - /*0x0174*/ aiIfCutsceneButtonPressed, + /*0x0165*/ ai_if_chr_injured, + /*0x0166*/ ai_if_action, + /*0x0167*/ ai_hovercopter_fire_rocket, + /*0x0168*/ ai_if_shield_damaged, + /*0x0169*/ ai_if_natural_anim, + /*0x016a*/ ai_if_y, + /*0x016b*/ ai_play_repeating_sound_from_object, + /*0x016c*/ ai_noop_016c, + /*0x016d*/ ai_chr_adjust_motion_blur, + /*0x016e*/ ai_damage_chr_by_amount, + /*0x016f*/ ai_if_chr_has_gun, + /*0x0170*/ ai_do_gun_command, + /*0x0171*/ ai_if_distance_to_gun_less_than, + /*0x0172*/ ai_recover_gun, + /*0x0173*/ ai_chr_copy_properties, + /*0x0174*/ ai_if_cutscene_button_pressed, /*0x0175*/ ai0175, - /*0x0176*/ aiIfBotRespawning, - /*0x0177*/ aiPlayerAutoWalk, - /*0x0178*/ aiIfPlayerAutoWalkFinished, - /*0x0179*/ aiPlaySoundFromEntity, - /*0x017a*/ aiIfLosToAttackTarget, - /*0x017b*/ aiIfChrKnockedOut, - /*0x017c*/ aiAssignSound, - /*0x017d*/ aiPlayCutsceneTrack, - /*0x017e*/ aiStopCutsceneTrack, - /*0x017f*/ aiPlayTemporaryTrack, - /*0x0180*/ aiStopAmbientTrack, - /*0x0181*/ aiIfPlayerLookingAtObject, - /*0x0182*/ aiPunchOrKick, - /*0x0183*/ aiIfTargetIsPlayer, + /*0x0176*/ ai_if_bot_respawning, + /*0x0177*/ ai_player_auto_walk, + /*0x0178*/ ai_if_player_auto_walk_finished, + /*0x0179*/ ai_play_sound_from_entity, + /*0x017a*/ ai_if_los_to_attack_target, + /*0x017b*/ ai_if_chr_knocked_out, + /*0x017c*/ ai_assign_sound, + /*0x017d*/ ai_play_cutscene_track, + /*0x017e*/ ai_stop_cutscene_track, + /*0x017f*/ ai_play_temporary_track, + /*0x0180*/ ai_stop_ambient_track, + /*0x0181*/ ai_if_player_looking_at_object, + /*0x0182*/ ai_punch_or_kick, + /*0x0183*/ ai_if_target_is_player, /*0x0184*/ ai0184, - /*0x0185*/ aiMpInitSimulants, - /*0x0186*/ aiIfSoundTimer, - /*0x0187*/ aiSetTargetToEyespyIfInSight, - /*0x0188*/ aiIfLiftStationary, - /*0x0189*/ aiLiftGoToStop, - /*0x018a*/ aiIfLiftAtStop, - /*0x018b*/ aiConfigureRain, - /*0x018c*/ aiChrToggleModelPart, - /*0x018d*/ aiActivateLift, - /*0x018e*/ aiMiniSkedarTryPounce, - /*0x018f*/ aiIfObjectDistanceToPadLessThan, - /*0x0190*/ aiSetSavefileFlag, - /*0x0191*/ aiUnsetSavefileFlag, - /*0x0192*/ aiIfSavefileFlagIsSet, - /*0x0193*/ aiIfSavefileFlagIsUnset, + /*0x0185*/ ai_mp_init_simulants, + /*0x0186*/ ai_if_sound_timer, + /*0x0187*/ ai_set_target_to_eyespy_if_in_sight, + /*0x0188*/ ai_if_lift_stationary, + /*0x0189*/ ai_lift_go_to_stop, + /*0x018a*/ ai_if_lift_at_stop, + /*0x018b*/ ai_configure_rain, + /*0x018c*/ ai_chr_toggle_model_part, + /*0x018d*/ ai_activate_lift, + /*0x018e*/ ai_mini_skedar_try_pounce, + /*0x018f*/ ai_if_object_distance_to_pad_less_than, + /*0x0190*/ ai_set_savefile_flag, + /*0x0191*/ ai_unset_savefile_flag, + /*0x0192*/ ai_if_savefile_flag_is_set, + /*0x0193*/ ai_if_savefile_flag_is_unset, /*0x0194*/ NULL, /*0x0195*/ NULL, /*0x0196*/ NULL, @@ -425,78 +425,78 @@ bool (*g_CommandPointers[])(void) = { /*0x019b*/ NULL, /*0x019c*/ NULL, /*0x019d*/ NULL, - /*0x019e*/ aiIfObjHealthLessThan, - /*0x019f*/ aiSetObjHealth, - /*0x01a0*/ aiSetChrSpecialDeathAnimation, - /*0x01a1*/ aiSetRoomToSearch, - /*0x01a2*/ aiSayCiStaffQuip, - /*0x01a3*/ aiDoPresetAnimation, - /*0x01a4*/ aiShowHudmsgMiddle, - /*0x01a5*/ aiIfUsingLift, - /*0x01a6*/ aiIfTargetYDifferenceLessThan, - /*0x01a7*/ aiIfChrNotTalking, + /*0x019e*/ ai_if_obj_health_less_than, + /*0x019f*/ ai_set_obj_health, + /*0x01a0*/ ai_set_chr_special_death_animation, + /*0x01a1*/ ai_set_room_to_search, + /*0x01a2*/ ai_say_ci_staff_quip, + /*0x01a3*/ ai_do_preset_animation, + /*0x01a4*/ ai_show_hudmsg_middle, + /*0x01a5*/ ai_if_using_lift, + /*0x01a6*/ ai_if_target_y_difference_less_than, + /*0x01a7*/ ai_if_chr_not_talking, /*0x01a8*/ NULL, /*0x01a9*/ NULL, /*0x01aa*/ ai01aa, - /*0x01ab*/ aiIfNumKnockedOutChrs, + /*0x01ab*/ ai_if_num_knocked_out_chrs, /*0x01ac*/ NULL, - /*0x01ad*/ aiReleaseObject, - /*0x01ae*/ aiClearInventory, - /*0x01af*/ aiChrGrabObject, + /*0x01ad*/ ai_release_object, + /*0x01ae*/ ai_clear_inventory, + /*0x01af*/ ai_chr_grab_object, /*0x01b0*/ NULL, - /*0x01b1*/ aiShuffleRuinsPillars, - /*0x01b2*/ aiSetWindSpeed, - /*0x01b3*/ aiToggleP1P2, + /*0x01b1*/ ai_shuffle_ruins_pillars, + /*0x01b2*/ ai_set_wind_speed, + /*0x01b3*/ ai_toggle_p1p2, #if VERSION >= VERSION_NTSC_1_0 /*0x01b4*/ ai01b4, #else /*0x01b4*/ NULL, #endif - /*0x01b5*/ aiChrSetP1P2, - /*0x01b6*/ aiConfigureSnow, - /*0x01b7*/ aiChrSetCloaked, - /*0x01b8*/ aiSetAutogunTargetTeam, - /*0x01b9*/ aiShufflePelagicSwitches, - /*0x01ba*/ aiTryAttackLie, - /*0x01bb*/ aiNoOp01bb, + /*0x01b5*/ ai_chr_set_p1p2, + /*0x01b6*/ ai_configure_snow, + /*0x01b7*/ ai_chr_set_cloaked, + /*0x01b8*/ ai_set_autogun_target_team, + /*0x01b9*/ ai_shuffle_pelagic_switches, + /*0x01ba*/ ai_try_attack_lie, + /*0x01bb*/ ai_noop_01bb, /*0x01bc*/ ai01bc, - /*0x01bd*/ aiIfTrainingPcHolographed, - /*0x01be*/ aiIfPlayerUsingDevice, - /*0x01bf*/ aiChrBeginOrEndTeleport, - /*0x01c0*/ aiIfChrTeleportFullWhite, - /*0x01c1*/ aiSetPunchDodgeList, - /*0x01c2*/ aiSetShootingAtMeList, - /*0x01c3*/ aiSetDarkRoomList, - /*0x01c4*/ aiSetPlayerDeadList, - /*0x01c5*/ aiAvoid, - /*0x01c6*/ aiSetDodgeRating, - /*0x01c7*/ aiSetUnarmedDodgeRating, - /*0x01c8*/ aiTitleInitMode, - /*0x01c9*/ aiTryExitTitle, - /*0x01ca*/ aiChrSetCutsceneWeapon, - /*0x01cb*/ aiFadeScreen, - /*0x01cc*/ aiIfFadeComplete, - /*0x01cd*/ aiSetChrHudpieceVisible, - /*0x01ce*/ aiSetPassiveMode, - /*0x01cf*/ aiChrSetFiringInCutscene, - /*0x01d0*/ aiSetPortalFlag, - /*0x01d1*/ aiObjSetModelPartVisible, - /*0x01d2*/ aiChrEmitSparks, - /*0x01d3*/ aiSetDrCarollImages, - /*0x01d4*/ aiSetRoomFlag, - /*0x01d5*/ aiShowCutsceneChrs, - /*0x01d6*/ aiConfigureEnvironment, - /*0x01d7*/ aiIfDistanceToTarget2LessThan, - /*0x01d8*/ aiIfDistanceToTarget2GreaterThan, - /*0x01d9*/ aiPlaySoundFromProp, - /*0x01da*/ aiPlayTemporaryPrimaryTrack, - /*0x01db*/ aiChrKill, - /*0x01dc*/ aiRemoveWeaponFromInventory, - /*0x01dd*/ aiIfMusicEventQueueIsEmpty, - /*0x01de*/ aiIfCoopMode, + /*0x01bd*/ ai_if_training_pc_holographed, + /*0x01be*/ ai_if_player_using_device, + /*0x01bf*/ ai_chr_begin_or_end_teleport, + /*0x01c0*/ ai_if_chr_teleport_full_white, + /*0x01c1*/ ai_set_punch_dodge_list, + /*0x01c2*/ ai_set_shooting_at_me_list, + /*0x01c3*/ ai_set_dark_room_list, + /*0x01c4*/ ai_set_player_dead_list, + /*0x01c5*/ ai_avoid, + /*0x01c6*/ ai_set_dodge_rating, + /*0x01c7*/ ai_set_unarmed_dodge_rating, + /*0x01c8*/ ai_title_init_mode, + /*0x01c9*/ ai_try_exit_title, + /*0x01ca*/ ai_chr_set_cutscene_weapon, + /*0x01cb*/ ai_fade_screen, + /*0x01cc*/ ai_if_fade_complete, + /*0x01cd*/ ai_set_chr_hudpiece_visible, + /*0x01ce*/ ai_set_passive_mode, + /*0x01cf*/ ai_chr_set_firing_in_cutscene, + /*0x01d0*/ ai_set_portal_flag, + /*0x01d1*/ ai_obj_set_model_part_visible, + /*0x01d2*/ ai_chr_emit_sparks, + /*0x01d3*/ ai_set_dr_caroll_images, + /*0x01d4*/ ai_set_room_flag, + /*0x01d5*/ ai_show_cutscene_chrs, + /*0x01d6*/ ai_configure_environment, + /*0x01d7*/ ai_if_distance_to_target2_less_than, + /*0x01d8*/ ai_if_distance_to_target2_greater_than, + /*0x01d9*/ ai_play_sound_from_prop, + /*0x01da*/ ai_play_temporary_primary_track, + /*0x01db*/ ai_chr_kill, + /*0x01dc*/ ai_remove_weapon_from_inventory, + /*0x01dd*/ ai_if_music_event_queue_is_empty, + /*0x01de*/ ai_if_coop_mode, #if VERSION >= VERSION_NTSC_1_0 - /*0x01df*/ aiIfChrSameFloorDistanceToPadLessThan, - /*0x01e0*/ aiRemoveReferencesToChr, + /*0x01df*/ ai_if_chr_same_floor_distance_to_pad_less_than, + /*0x01e0*/ ai_remove_references_to_chr, #endif }; @@ -627,7 +627,7 @@ u16 g_CommandLengths[] = { #endif }; -s32 chraiGetListIdByList(u8 *ailist, bool *is_global) +s32 chrai_get_list_id_by_list(u8 *ailist, bool *is_global) { s32 i; @@ -650,7 +650,7 @@ s32 chraiGetListIdByList(u8 *ailist, bool *is_global) return -1; } -u32 chraiGoToLabel(u8 *ailist, u32 aioffset, u8 label) +u32 chrai_go_to_label(u8 *ailist, u32 aioffset, u8 label) { do { u8 *cmd = aioffset + ailist; @@ -664,11 +664,11 @@ u32 chraiGoToLabel(u8 *ailist, u32 aioffset, u8 label) return 0; } - aioffset += chraiGetCommandLength(ailist, aioffset); + aioffset += chrai_get_command_length(ailist, aioffset); } while (true); } -void chraiExecute(void *entity, s32 proptype) +void chrai_execute(void *entity, s32 proptype) { g_Vars.chrdata = NULL; g_Vars.truck = NULL; @@ -707,12 +707,12 @@ void chraiExecute(void *entity, s32 proptype) if (g_Vars.ailist) { if (g_Vars.chrdata) { - chrAddTargetToBdlist(g_Vars.chrdata); + chr_add_target_to_bdlist(g_Vars.chrdata); } // Check if the ailist should be switched to a different one if (g_Vars.chrdata && (g_Vars.chrdata->chrflags & CHRCFLAG_TRIGGERSHOTLIST)) { - u32 animnum = modelGetAnimNum(g_Vars.chrdata->model); + u32 animnum = model_get_anim_num(g_Vars.chrdata->model); if (g_Vars.chrdata->aishotlist >= 0 && g_Vars.chrdata->cshield <= 0 && (0 <= g_Vars.chrdata->damage || g_Vars.chrdata->gunprop != NULL) @@ -721,18 +721,18 @@ void chraiExecute(void *entity, s32 proptype) && animnum != ANIM_SNIPING_ONGROUND) { // Set shot list g_Vars.chrdata->chrflags &= ~CHRCFLAG_TRIGGERSHOTLIST; - g_Vars.ailist = ailistFindById(g_Vars.chrdata->aishotlist); + g_Vars.ailist = ailist_find_by_id(g_Vars.chrdata->aishotlist); g_Vars.aioffset = 0; } } else if (g_Vars.chrdata && (g_Vars.chrdata->chrflags & CHRCFLAG_CONSIDER_DODGE)) { g_Vars.chrdata->chrflags &= ~CHRCFLAG_CONSIDER_DODGE; if (g_Vars.chrdata->aishootingatmelist >= 0 - && ailistFindById(g_Vars.chrdata->aishootingatmelist) != g_Vars.chrdata->ailist + && ailist_find_by_id(g_Vars.chrdata->aishootingatmelist) != g_Vars.chrdata->ailist && g_Vars.chrdata->dodgerating > random() % 100 - && chrHasFlag(g_Vars.chrdata, CHRFLAG1_INDARKROOM, BANK_1) == 0 - && chrHasFlag(g_Vars.chrdata, CHRFLAG0_AIVSAI, BANK_0) == 0 - && ailistFindById(g_Vars.chrdata->aishootingatmelist) != g_Vars.chrdata->ailist + && chr_has_flag(g_Vars.chrdata, CHRFLAG1_INDARKROOM, BANK_1) == 0 + && chr_has_flag(g_Vars.chrdata, CHRFLAG0_AIVSAI, BANK_0) == 0 + && ailist_find_by_id(g_Vars.chrdata->aishootingatmelist) != g_Vars.chrdata->ailist && g_Vars.chrdata->actiontype != ACT_ATTACK && g_Vars.chrdata->actiontype != ACT_ATTACKWALK && g_Vars.chrdata->actiontype != ACT_DIE @@ -741,7 +741,7 @@ void chraiExecute(void *entity, s32 proptype) && g_Vars.chrdata->actiontype != ACT_PREARGH && g_Vars.chrdata->actiontype != ACT_ATTACKROLL) { // Set shooting at me list - g_Vars.ailist = ailistFindById(g_Vars.chrdata->aishootingatmelist); + g_Vars.ailist = ailist_find_by_id(g_Vars.chrdata->aishootingatmelist); g_Vars.aioffset = 0; g_Vars.chrdata->dodgerating = 0; } else { @@ -754,8 +754,8 @@ void chraiExecute(void *entity, s32 proptype) } } else if (g_Vars.chrdata && g_Vars.chrdata->darkroomthing - && chrHasFlag(g_Vars.chrdata, CHRFLAG1_INDARKROOM, BANK_1) == 0 - && ailistFindById(g_Vars.chrdata->aidarkroomlist) != g_Vars.chrdata->ailist + && chr_has_flag(g_Vars.chrdata, CHRFLAG1_INDARKROOM, BANK_1) == 0 + && ailist_find_by_id(g_Vars.chrdata->aidarkroomlist) != g_Vars.chrdata->ailist && g_Vars.stagenum != STAGE_CRASHSITE) { g_Vars.chrdata->darkroomthing = 0; @@ -764,10 +764,10 @@ void chraiExecute(void *entity, s32 proptype) && g_Vars.chrdata->actiontype != ACT_DEAD && g_Vars.chrdata->actiontype != ACT_ARGH) { // Set darkroom list - chrSetFlags(g_Vars.chrdata, CHRFLAG1_INDARKROOM, BANK_1); - chrSetFlags(g_Vars.chrdata, CHRFLAG1_SEARCHSAMEROOM, BANK_1); + chr_set_flags(g_Vars.chrdata, CHRFLAG1_INDARKROOM, BANK_1); + chr_set_flags(g_Vars.chrdata, CHRFLAG1_SEARCHSAMEROOM, BANK_1); g_Vars.chrdata->alertness = 0; - g_Vars.ailist = ailistFindById(g_Vars.chrdata->aidarkroomlist); + g_Vars.ailist = ailist_find_by_id(g_Vars.chrdata->aidarkroomlist); g_Vars.aioffset = 0; } } else { @@ -787,13 +787,13 @@ void chraiExecute(void *entity, s32 proptype) // This is attempting to handle situations where the command // type is invalid by passing over them and continuing // execution. This would very likely result in a crash though. - g_Vars.aioffset += chraiGetCommandLength(g_Vars.ailist, g_Vars.aioffset); + g_Vars.aioffset += chrai_get_command_length(g_Vars.ailist, g_Vars.aioffset); } } } } -u32 chraiGetCommandLength(u8 *ailist, u32 aioffset) +u32 chrai_get_command_length(u8 *ailist, u32 aioffset) { u8 *cmd = aioffset + ailist; s32 type = (cmd[0] << 8) + cmd[1]; diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c index 7eb7756c9..53980d699 100644 --- a/src/game/chraicommands.c +++ b/src/game/chraicommands.c @@ -55,10 +55,10 @@ /** * @cmd 0000 */ -bool aiGoToNext(void) +bool ai_go_to_next(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); osSyncPrintf(" (%d)\n", cmd[2]); return false; @@ -67,10 +67,10 @@ bool aiGoToNext(void) /** * @cmd 0001 */ -bool aiGoToFirst(void) +bool ai_go_to_first(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, 0, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, 0, cmd[2]); osSyncPrintf(" (%d)\n", cmd[2]); return false; @@ -79,7 +79,7 @@ bool aiGoToFirst(void) /** * @cmd 0002 */ -bool aiLabel(void) +bool ai_label(void) { g_Vars.aioffset += 3; return false; @@ -88,7 +88,7 @@ bool aiLabel(void) /** * @cmd 0003 */ -bool aiYield(void) +bool ai_yield(void) { g_Vars.aioffset += 2; @@ -112,11 +112,11 @@ bool aiYield(void) /** * @cmd 0005 */ -bool aiSetList(void) +bool ai_set_list(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 ailistid = cmd[4] | (cmd[3] << 8); - u8 *ailist = ailistFindById(ailistid & 0xffff); + u8 *ailist = ailist_find_by_id(ailistid & 0xffff); struct chrdata *chr = g_Vars.chrdata; @@ -124,7 +124,7 @@ bool aiSetList(void) g_Vars.ailist = ailist; g_Vars.aioffset = 0; } else { - chr = chrFindById(chr, cmd[2]); + chr = chr_find_by_id(chr, cmd[2]); if (chr) { chr->ailist = ailist; @@ -141,7 +141,7 @@ bool aiSetList(void) /** * @cmd 0006 */ -bool aiSetReturnList(void) +bool ai_set_return_list(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 ailistid = cmd[4] | (cmd[3] << 8); @@ -151,7 +151,7 @@ bool aiSetReturnList(void) if (cmd[2] == CHR_SELF) { g_Vars.chrdata->aireturnlist = ailistid; } else { - chr = chrFindById(g_Vars.chrdata, cmd[2]); + chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { chr->aireturnlist = ailistid; @@ -173,7 +173,7 @@ bool aiSetReturnList(void) /** * @cmd 0007 */ -bool aiSetShotList(void) +bool ai_set_shot_list(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 ailistid = cmd[3] | (cmd[2] << 8); @@ -257,7 +257,7 @@ const char var7f1a9c18[] = "IVE FOUND MY PAD %d \n"; /** * @cmd 01c1 */ -bool aiSetPunchDodgeList(void) +bool ai_set_punch_dodge_list(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 ailistid = cmd[3] | (cmd[2] << 8); @@ -274,7 +274,7 @@ bool aiSetPunchDodgeList(void) /** * @cmd 01c2 */ -bool aiSetShootingAtMeList(void) +bool ai_set_shooting_at_me_list(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 ailistid = cmd[3] | (cmd[2] << 8); @@ -291,7 +291,7 @@ bool aiSetShootingAtMeList(void) /** * @cmd 01c3 */ -bool aiSetDarkRoomList(void) +bool ai_set_dark_room_list(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 ailistid = cmd[3] | (cmd[2] << 8); @@ -308,7 +308,7 @@ bool aiSetDarkRoomList(void) /** * @cmd 01c4 */ -bool aiSetPlayerDeadList(void) +bool ai_set_player_dead_list(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 ailistid = cmd[3] | (cmd[2] << 8); @@ -325,18 +325,18 @@ bool aiSetPlayerDeadList(void) /** * @cmd 0008 */ -bool aiReturn(void) +bool ai_return(void) { u8 *ailist = NULL; if (g_Vars.chrdata) { - ailist = ailistFindById(g_Vars.chrdata->aireturnlist); + ailist = ailist_find_by_id(g_Vars.chrdata->aireturnlist); } else if (g_Vars.truck) { - ailist = ailistFindById(g_Vars.truck->aireturnlist); + ailist = ailist_find_by_id(g_Vars.truck->aireturnlist); } else if (g_Vars.heli) { - ailist = ailistFindById(g_Vars.heli->aireturnlist); + ailist = ailist_find_by_id(g_Vars.heli->aireturnlist); } else if (g_Vars.hovercar) { - ailist = ailistFindById(g_Vars.hovercar->aireturnlist); + ailist = ailist_find_by_id(g_Vars.hovercar->aireturnlist); } g_Vars.ailist = ailist; @@ -348,11 +348,11 @@ bool aiReturn(void) /** * @cmd 0004 */ -bool aiEndList(void) +bool ai_end_list(void) { s32 ailistid; bool is_global; - ailistid = chraiGetListIdByList(g_Vars.ailist, &is_global); + ailistid = chrai_get_list_id_by_list(g_Vars.ailist, &is_global); return true; } @@ -360,12 +360,12 @@ bool aiEndList(void) /** * @cmd 0009 */ -bool aiStop(void) +bool ai_stop(void) { if (g_Vars.chrdata) { - chrTryStop(g_Vars.chrdata); + chr_try_stop(g_Vars.chrdata); } else if (g_Vars.hovercar) { - chopperStop(g_Vars.hovercar); + chopper_stop(g_Vars.hovercar); } g_Vars.aioffset += 2; @@ -376,9 +376,9 @@ bool aiStop(void) /** * @cmd 000a */ -bool aiKneel(void) +bool ai_kneel(void) { - chrTryKneel(g_Vars.chrdata); + chr_try_kneel(g_Vars.chrdata); g_Vars.aioffset += 2; return false; @@ -387,7 +387,7 @@ bool aiKneel(void) /** * @cmd 000b */ -bool aiChrDoAnimation(void) +bool ai_chr_do_animation(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 anim_id = cmd[3] | (cmd[2] << 8); @@ -398,13 +398,13 @@ bool aiChrDoAnimation(void) f32 fendframe; if (g_Vars.chrdata) { - chr = chrFindById(g_Vars.chrdata, cmd[10]); + chr = chr_find_by_id(g_Vars.chrdata, cmd[10]); } if (startframe == 0xffff) { fstartframe = 0; } else if (startframe == 0xfffe) { - fstartframe = animGetNumFrames(anim_id) - 1; + fstartframe = anim_get_num_frames(anim_id) - 1; } else { fstartframe = startframe; } @@ -430,13 +430,13 @@ bool aiChrDoAnimation(void) chr->prop->propupdate240 = 0; } - chrTryStartAnim(chr, anim_id, fstartframe, fendframe, cmd[8], cmd[9], speed); + chr_try_start_anim(chr, anim_id, fstartframe, fendframe, cmd[8], cmd[9], speed); if (startframe == 0xfffe) { chr0f0220ec(chr, 1, true); if (chr->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); struct player *player = g_Vars.players[playernum]; player->vv_ground = chr->ground; player->vv_manground = chr->ground; @@ -452,11 +452,11 @@ bool aiChrDoAnimation(void) /** * @cmd 000c */ -bool aiIfIdle(void) +bool ai_if_idle(void) { if (g_Vars.chrdata->actiontype == ACT_ANIM) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -472,9 +472,9 @@ bool func0f04e418(void) /** * @cmd 000d */ -bool aiBeSurprisedOneHand(void) +bool ai_be_surprised_one_hand(void) { - chrTrySurprisedOneHand(g_Vars.chrdata); + chr_try_surprised_one_hand(g_Vars.chrdata); g_Vars.aioffset += 2; return false; @@ -483,9 +483,9 @@ bool aiBeSurprisedOneHand(void) /** * @cmd 000e */ -bool aiBeSurprisedLookAround(void) +bool ai_be_surprised_look_around(void) { - chrTrySurprisedLookAround(g_Vars.chrdata); + chr_try_surprised_look_around(g_Vars.chrdata); g_Vars.aioffset += 2; return false; @@ -494,11 +494,11 @@ bool aiBeSurprisedLookAround(void) /** * @cmd 0032 */ -bool aiIfStopped(void) +bool ai_if_stopped(void) { - if (chrIsStopped(g_Vars.chrdata)) { + if (chr_is_stopped(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -509,13 +509,13 @@ bool aiIfStopped(void) /** * @cmd 0033 */ -bool aiIfChrDead(void) +bool ai_if_chr_dead(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); - if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) && (!chr || !chr->model || chrIsDead(chr))) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) && (!chr || !chr->model || chr_is_dead(chr))) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -526,17 +526,17 @@ bool aiIfChrDead(void) /** * @cmd 0034 */ -bool aiIfChrDeathAnimationFinished(void) +bool ai_if_chr_death_animation_finished(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); bool pass; if (!chr || !chr->prop) { pass = true; } else { if (chr->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); pass = g_Vars.players[playernum]->isdead; } else { pass = (chr->actiontype == ACT_DEAD); @@ -544,7 +544,7 @@ bool aiIfChrDeathAnimationFinished(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -555,14 +555,14 @@ bool aiIfChrDeathAnimationFinished(void) /** * @cmd 017b */ -bool aiIfChrKnockedOut(void) +bool ai_if_chr_knocked_out(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if ((!chr || !chr->prop || chr->prop->type != PROPTYPE_PLAYER) && (!chr || !chr->model || chr->actiontype == ACT_DRUGGEDKO || chr->actiontype == ACT_DRUGGEDDROP || chr->actiontype == ACT_DRUGGEDCOMINGUP)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -573,11 +573,11 @@ bool aiIfChrKnockedOut(void) /** * @cmd 0035 */ -bool aiIfCanSeeTarget(void) +bool ai_if_can_see_target(void) { - if (chrCheckCanSeeTarget(g_Vars.chrdata)) { + if (chr_check_can_see_target(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -588,11 +588,11 @@ bool aiIfCanSeeTarget(void) /** * @cmd 000f */ -bool aiTrySidestep(void) +bool ai_try_sidestep(void) { - if (chrTrySidestep(g_Vars.chrdata)) { + if (chr_try_sidestep(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -603,11 +603,11 @@ bool aiTrySidestep(void) /** * @cmd 0010 */ -bool aiTryJumpOut(void) +bool ai_try_jump_out(void) { - if (chrTryJumpOut(g_Vars.chrdata)) { + if (chr_try_jump_out(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -618,11 +618,11 @@ bool aiTryJumpOut(void) /** * @cmd 0011 */ -bool aiTryRunSideways(void) +bool ai_try_run_sideways(void) { - if (chrTryRunSideways(g_Vars.chrdata)) { + if (chr_try_run_sideways(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -633,11 +633,11 @@ bool aiTryRunSideways(void) /** * @cmd 0012 */ -bool aiTryAttackWalk(void) +bool ai_try_attack_walk(void) { - if (chrTryAttackWalk(g_Vars.chrdata)) { + if (chr_try_attack_walk(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -648,11 +648,11 @@ bool aiTryAttackWalk(void) /** * @cmd 0013 */ -bool aiTryAttackRun(void) +bool ai_try_attack_run(void) { - if (chrTryAttackRun(g_Vars.chrdata)) { + if (chr_try_attack_run(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -663,11 +663,11 @@ bool aiTryAttackRun(void) /** * @cmd 0014 */ -bool aiTryAttackRoll(void) +bool ai_try_attack_roll(void) { - if (chrTryAttackRoll(g_Vars.chrdata)) { + if (chr_try_attack_roll(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -678,14 +678,14 @@ bool aiTryAttackRoll(void) /** * @cmd 0015 */ -bool aiTryAttackStand(void) +bool ai_try_attack_stand(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 thingid = cmd[5] | (cmd[4] << 8); u32 thingtype = cmd[3] | (cmd[2] << 8); - if (chrTryAttackStand(g_Vars.chrdata, thingtype, thingid)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if (chr_try_attack_stand(g_Vars.chrdata, thingtype, thingid)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -696,14 +696,14 @@ bool aiTryAttackStand(void) /** * @cmd 0016 */ -bool aiTryAttackKneel(void) +bool ai_try_attack_kneel(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 thingid = cmd[5] | (cmd[4] << 8); u32 thingtype = cmd[3] | (cmd[2] << 8); - if (chrTryAttackKneel(g_Vars.chrdata, thingtype, thingid)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if (chr_try_attack_kneel(g_Vars.chrdata, thingtype, thingid)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -714,14 +714,14 @@ bool aiTryAttackKneel(void) /** * @cmd 01ba */ -bool aiTryAttackLie(void) +bool ai_try_attack_lie(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 thingid = cmd[5] | (cmd[4] << 8); u32 thingtype = cmd[3] | (cmd[2] << 8); - if (chrTryAttackLie(g_Vars.chrdata, thingtype, thingid)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if (chr_try_attack_lie(g_Vars.chrdata, thingtype, thingid)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -739,7 +739,7 @@ bool ai00f0(void) if (g_Vars.chrdata->actiontype == ACT_ATTACK && !g_Vars.chrdata->act_attack.reaim && g_Vars.chrdata->act_attack.flags & ATTACKFLAG_DONTTURN) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -750,12 +750,12 @@ bool ai00f0(void) /** * @cmd 00f1 */ -bool aiIfAttacking(void) +bool ai_if_attacking(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.chrdata->actiontype == ACT_ATTACK) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -766,15 +766,15 @@ bool aiIfAttacking(void) /** * @cmd 0017 */ -bool aiTryModifyAttack(void) +bool ai_try_modify_attack(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 thingid = cmd[5] | (cmd[4] << 8); u32 thingtype = cmd[3] | (cmd[2] << 8); - if ((g_Vars.chrdata && chrTryModifyAttack(g_Vars.chrdata, thingtype, thingid)) || - (g_Vars.hovercar && chopperAttack(g_Vars.hovercar))) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if ((g_Vars.chrdata && chr_try_modify_attack(g_Vars.chrdata, thingtype, thingid)) || + (g_Vars.hovercar && chopper_attack(g_Vars.hovercar))) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -785,14 +785,14 @@ bool aiTryModifyAttack(void) /** * @cmd 0018 */ -bool aiFaceEntity(void) +bool ai_face_entity(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 thingid = cmd[5] | (cmd[4] << 8); u32 thingtype = cmd[3] | (cmd[2] << 8); - if (chrFaceEntity(g_Vars.chrdata, thingtype, thingid)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if (chr_face_entity(g_Vars.chrdata, thingtype, thingid)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -806,12 +806,12 @@ bool aiFaceEntity(void) bool ai0019(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); struct coord pos = {0, 0, 0}; if (chr && chr->prop) { - f32 damage = gsetGetDamage((struct gset *)&cmd[4]); - chrDamageByImpact(chr, damage, &pos, (struct gset *)&cmd[4], NULL, (s8)cmd[3]); + f32 damage = gset_get_damage((struct gset *)&cmd[4]); + chr_damage_by_impact(chr, damage, &pos, (struct gset *)&cmd[4], NULL, (s8)cmd[3]); } g_Vars.aioffset += 8; @@ -822,20 +822,20 @@ bool ai0019(void) /** * @cmd 001a */ -bool aiChrDamageChr(void) +bool ai_chr_damage_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr1 = chrFindById(g_Vars.chrdata, cmd[2]); - struct chrdata *chr2 = chrFindById(g_Vars.chrdata, cmd[3]); + struct chrdata *chr1 = chr_find_by_id(g_Vars.chrdata, cmd[2]); + struct chrdata *chr2 = chr_find_by_id(g_Vars.chrdata, cmd[3]); if (chr1 && chr2 && chr1->prop && chr2->prop) { - struct prop *prop = chrGetHeldUsableProp(chr1, HAND_RIGHT); + struct prop *prop = chr_get_held_usable_prop(chr1, HAND_RIGHT); f32 damage; struct coord vector = {0, 0, 0}; struct weaponobj *weapon; if (!prop) { - prop = chrGetHeldUsableProp(chr1, HAND_LEFT); + prop = chr_get_held_usable_prop(chr1, HAND_LEFT); } if (prop) { @@ -844,8 +844,8 @@ bool aiChrDamageChr(void) vector.z = chr2->prop->pos.z - chr1->prop->pos.z; guNormalize(&vector.x, &vector.y, &vector.z); weapon = prop->weapon; - damage = gsetGetDamage(&weapon->gset); - chrDamageByImpact(chr2, damage, &vector, &weapon->gset, chr1->prop, (s8)cmd[4]); + damage = gset_get_damage(&weapon->gset); + chr_damage_by_impact(chr2, damage, &vector, &weapon->gset, chr1->prop, (s8)cmd[4]); } } @@ -857,14 +857,14 @@ bool aiChrDamageChr(void) /** * @cmd 001b */ -bool aiConsiderGrenadeThrow(void) +bool ai_consider_grenade_throw(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 value2 = cmd[5] | (cmd[4] << 8); u32 value1 = cmd[3] | (cmd[2] << 8); - if (chrConsiderGrenadeThrow(g_Vars.chrdata, value1, value2)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if (chr_consider_grenade_throw(g_Vars.chrdata, value1, value2)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -875,13 +875,13 @@ bool aiConsiderGrenadeThrow(void) /** * @cmd 001c */ -bool aiDropItem(void) +bool ai_drop_item(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 modelnum = cmd[3] | (cmd[2] << 8); - if (chrDropItem(g_Vars.chrdata, modelnum & 0xffff, cmd[4] & 0xff)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if (chr_drop_item(g_Vars.chrdata, modelnum & 0xffff, cmd[4] & 0xff)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -892,9 +892,9 @@ bool aiDropItem(void) /** * @cmd 0024 */ -bool aiSurrender(void) +bool ai_surrender(void) { - chrTrySurrender(g_Vars.chrdata); + chr_try_surrender(g_Vars.chrdata); g_Vars.aioffset += 2; return false; @@ -903,9 +903,9 @@ bool aiSurrender(void) /** * @cmd 0025 */ -bool aiFadeOut(void) +bool ai_fade_out(void) { - chrFadeOut(g_Vars.chrdata); + chr_fade_out(g_Vars.chrdata); g_Vars.aioffset += 2; return false; @@ -914,11 +914,11 @@ bool aiFadeOut(void) /** * @cmd 0026 */ -bool aiRemoveChr(void) +bool ai_remove_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop) { chr->hidden |= 0x20; @@ -932,13 +932,13 @@ bool aiRemoveChr(void) /** * @cmd 0027 */ -bool aiTryStartAlarm(void) +bool ai_try_start_alarm(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad_id = cmd[3] | (cmd[2] << 8); - if (chrTryStartAlarm(g_Vars.chrdata, pad_id)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (chr_try_start_alarm(g_Vars.chrdata, pad_id)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -949,9 +949,9 @@ bool aiTryStartAlarm(void) /** * @cmd 0028 */ -bool aiActivateAlarm(void) +bool ai_activate_alarm(void) { - alarmActivate(); + alarm_activate(); g_Vars.aioffset += 2; return false; @@ -960,9 +960,9 @@ bool aiActivateAlarm(void) /** * @cmd 0029 */ -bool aiDeactivateAlarm(void) +bool ai_deactivate_alarm(void) { - alarmDeactivate(); + alarm_deactivate(); g_Vars.aioffset += 2; return false; @@ -971,11 +971,11 @@ bool aiDeactivateAlarm(void) /** * @cmd 002a */ -bool aiTryRunFromTarget(void) +bool ai_try_run_from_target(void) { - if (chrTryRunFromTarget(g_Vars.chrdata)) { + if (chr_try_run_from_target(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -986,11 +986,11 @@ bool aiTryRunFromTarget(void) /** * @cmd 002b */ -bool aiTryJogToTargetProp(void) +bool ai_try_jog_to_target_prop(void) { - if (chrGoToTarget(g_Vars.chrdata, GOPOSFLAG_JOG)) { + if (chr_go_to_target(g_Vars.chrdata, GOPOSFLAG_JOG)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1001,11 +1001,11 @@ bool aiTryJogToTargetProp(void) /** * @cmd 002c */ -bool aiTryWalkToTargetProp(void) +bool ai_try_walk_to_target_prop(void) { - if (chrGoToTarget(g_Vars.chrdata, GOPOSFLAG_WALK)) { + if (chr_go_to_target(g_Vars.chrdata, GOPOSFLAG_WALK)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1016,11 +1016,11 @@ bool aiTryWalkToTargetProp(void) /** * @cmd 002d */ -bool aiTryRunToTargetProp(void) +bool ai_try_run_to_target_prop(void) { - if (chrGoToTarget(g_Vars.chrdata, GOPOSFLAG_RUN)) { + if (chr_go_to_target(g_Vars.chrdata, GOPOSFLAG_RUN)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1031,11 +1031,11 @@ bool aiTryRunToTargetProp(void) /** * @cmd 002e */ -bool aiTryGoToCoverProp(void) +bool ai_try_go_to_cover_prop(void) { - if (chrGoToCoverProp(g_Vars.chrdata)) { + if (chr_go_to_cover_prop(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist,g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist,g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1046,12 +1046,12 @@ bool aiTryGoToCoverProp(void) /** * @cmd 002f */ -bool aiTryJogToChr(void) +bool ai_try_jog_to_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGoToChr(g_Vars.chrdata, cmd[2], GOPOSFLAG_JOG)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_go_to_chr(g_Vars.chrdata, cmd[2], GOPOSFLAG_JOG)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1062,12 +1062,12 @@ bool aiTryJogToChr(void) /** * @cmd 0030 */ -bool aiTryWalkToChr(void) +bool ai_try_walk_to_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGoToChr(g_Vars.chrdata, cmd[2], GOPOSFLAG_WALK)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_go_to_chr(g_Vars.chrdata, cmd[2], GOPOSFLAG_WALK)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1078,12 +1078,12 @@ bool aiTryWalkToChr(void) /** * @cmd 0031 */ -bool aiTryRunToChr(void) +bool ai_try_run_to_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGoToChr(g_Vars.chrdata, cmd[2], GOPOSFLAG_RUN)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_go_to_chr(g_Vars.chrdata, cmd[2], GOPOSFLAG_RUN)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1094,7 +1094,7 @@ bool aiTryRunToChr(void) /** * @cmd 0036 */ -bool aiRandom(void) +bool ai_random(void) { g_Vars.chrdata->random = random() & 0xff; g_Vars.aioffset += 2; @@ -1105,13 +1105,13 @@ bool aiRandom(void) /** * @cmd 0037 */ -bool aiIfRandomLessThan(void) +bool ai_if_random_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if ((g_Vars.chrdata && g_Vars.chrdata->random < cmd[2]) || (g_Vars.hovercar && ((u8)random()) < cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1122,13 +1122,13 @@ bool aiIfRandomLessThan(void) /** * @cmd 0038 */ -bool aiIfRandomGreaterThan(void) +bool ai_if_random_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if ((g_Vars.chrdata && g_Vars.chrdata->random > cmd[2]) || (g_Vars.hovercar && ((u8)random()) > cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1139,12 +1139,12 @@ bool aiIfRandomGreaterThan(void) /** * @cmd 001d */ -bool aiJogToPad(void) +bool ai_jog_to_pad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad = cmd[3] | (cmd[2] << 8); - chrGoToPad(g_Vars.chrdata, pad, GOPOSFLAG_JOG); + chr_go_to_pad(g_Vars.chrdata, pad, GOPOSFLAG_JOG); g_Vars.aioffset += 4; return false; @@ -1153,19 +1153,19 @@ bool aiJogToPad(void) /** * @cmd 001e */ -bool aiGoToPadPreset(void) +bool ai_go_to_pad_preset(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; switch (cmd[2]) { case 0: - chrGoToPad(g_Vars.chrdata, g_Vars.chrdata->padpreset1, GOPOSFLAG_WALK); + chr_go_to_pad(g_Vars.chrdata, g_Vars.chrdata->padpreset1, GOPOSFLAG_WALK); break; case 1: - chrGoToPad(g_Vars.chrdata, g_Vars.chrdata->padpreset1, GOPOSFLAG_JOG); + chr_go_to_pad(g_Vars.chrdata, g_Vars.chrdata->padpreset1, GOPOSFLAG_JOG); break; default: - chrGoToPad(g_Vars.chrdata, g_Vars.chrdata->padpreset1, GOPOSFLAG_RUN); + chr_go_to_pad(g_Vars.chrdata, g_Vars.chrdata->padpreset1, GOPOSFLAG_RUN); break; } @@ -1177,12 +1177,12 @@ bool aiGoToPadPreset(void) /** * @cmd 001f */ -bool aiWalkToPad(void) +bool ai_walk_to_pad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad = cmd[3] | (cmd[2] << 8); - chrGoToPad(g_Vars.chrdata, pad, GOPOSFLAG_WALK); + chr_go_to_pad(g_Vars.chrdata, pad, GOPOSFLAG_WALK); g_Vars.aioffset += 4; return false; @@ -1191,12 +1191,12 @@ bool aiWalkToPad(void) /** * @cmd 0020 */ -bool aiRunToPad(void) +bool ai_run_to_pad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad = cmd[3] | (cmd[2] << 8); - chrGoToPad(g_Vars.chrdata, pad, GOPOSFLAG_RUN); + chr_go_to_pad(g_Vars.chrdata, pad, GOPOSFLAG_RUN); g_Vars.aioffset += 4; return false; @@ -1205,11 +1205,11 @@ bool aiRunToPad(void) /** * @cmd 0021 */ -bool aiSetPath(void) +bool ai_set_path(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - chrSetPath(g_Vars.chrdata, cmd[2]); + chr_set_path(g_Vars.chrdata, cmd[2]); g_Vars.aioffset += 3; return false; @@ -1218,9 +1218,9 @@ bool aiSetPath(void) /** * @cmd 0022 */ -bool aiStartPatrol(void) +bool ai_start_patrol(void) { - chrTryStartPatrol(g_Vars.chrdata); + chr_try_start_patrol(g_Vars.chrdata); g_Vars.aioffset += 2; return false; @@ -1229,11 +1229,11 @@ bool aiStartPatrol(void) /** * @cmd 0039 */ -bool aiIfCanHearAlarm(void) +bool ai_if_can_hear_alarm(void) { - if (chrCanHearAlarm(g_Vars.chrdata)) { + if (chr_can_hear_alarm(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1244,13 +1244,13 @@ bool aiIfCanHearAlarm(void) /** * @cmd 0023 */ -bool aiIfPatrolling(void) +bool ai_if_patrolling(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.chrdata->actiontype == ACT_PATROL || (g_Vars.chrdata->actiontype == ACT_GOPOS && g_Vars.chrdata->act_gopos.flags & GOPOSFLAG_FORPATHSTART)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1261,11 +1261,11 @@ bool aiIfPatrolling(void) /** * @cmd 003a */ -bool aiIfAlarmActive(void) +bool ai_if_alarm_active(void) { - if (alarmIsActive()) { + if (alarm_is_active()) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1276,11 +1276,11 @@ bool aiIfAlarmActive(void) /** * @cmd 003b */ -bool aiIfGasActive(void) +bool ai_if_gas_active(void) { - if (gasIsActive()) { + if (gas_is_active()) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1291,11 +1291,11 @@ bool aiIfGasActive(void) /** * @cmd 003c */ -bool aiIfHearsTarget(void) +bool ai_if_hears_target(void) { - if (chrIsHearingTarget(g_Vars.chrdata)) { + if (chr_is_hearing_target(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1306,12 +1306,12 @@ bool aiIfHearsTarget(void) /** * @cmd 003d */ -bool aiIfSawInjury(void) +bool ai_if_saw_injury(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrSawInjury(g_Vars.chrdata, cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_saw_injury(g_Vars.chrdata, cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1322,12 +1322,12 @@ bool aiIfSawInjury(void) /** * @cmd 003e */ -bool aiIfSawDeath(void) +bool ai_if_saw_death(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrSawDeath(g_Vars.chrdata, cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_saw_death(g_Vars.chrdata, cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1338,12 +1338,12 @@ bool aiIfSawDeath(void) /** * @cmd 003f */ -bool aiIfLosToTarget(void) +bool ai_if_los_to_target(void) { - if ((g_Vars.chrdata && chrHasLosToTarget(g_Vars.chrdata)) || - (g_Vars.hovercar && chopperCheckTargetInFov(g_Vars.hovercar, 64) && chopperCheckTargetInSight(g_Vars.hovercar))) { + if ((g_Vars.chrdata && chr_has_los_to_target(g_Vars.chrdata)) || + (g_Vars.hovercar && chopper_check_target_in_fov(g_Vars.hovercar, 64) && chopper_check_target_in_sight(g_Vars.hovercar))) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1354,12 +1354,12 @@ bool aiIfLosToTarget(void) /** * @cmd 017a */ -bool aiIfLosToAttackTarget(void) +bool ai_if_los_to_attack_target(void) { - if ((g_Vars.chrdata && g_Vars.chrdata->prop && chrHasLosToAttackTarget(g_Vars.chrdata, &g_Vars.chrdata->prop->pos, g_Vars.chrdata->prop->rooms, true)) - || (g_Vars.hovercar && chopperCheckTargetInFov(g_Vars.hovercar, 64) && chopperCheckTargetInSight(g_Vars.hovercar))) { + if ((g_Vars.chrdata && g_Vars.chrdata->prop && chr_has_los_to_attack_target(g_Vars.chrdata, &g_Vars.chrdata->prop->pos, g_Vars.chrdata->prop->rooms, true)) + || (g_Vars.hovercar && chopper_check_target_in_fov(g_Vars.hovercar, 64) && chopper_check_target_in_sight(g_Vars.hovercar))) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1370,14 +1370,14 @@ bool aiIfLosToAttackTarget(void) /** * @cmd 0040 */ -bool aiIfTargetNearlyInSight(void) +bool ai_if_target_nearly_in_sight(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 distance = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - if (chrIsTargetNearlyInSight(g_Vars.chrdata, distance)) { + if (chr_is_target_nearly_in_sight(g_Vars.chrdata, distance)) { cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -1388,14 +1388,14 @@ bool aiIfTargetNearlyInSight(void) /** * @cmd 0041 */ -bool aiIfNearlyInTargetsSight(void) +bool ai_if_nearly_in_targets_sight(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 distance = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - if (chrIsNearlyInTargetsSight(g_Vars.chrdata, distance)) { + if (chr_is_nearly_in_targets_sight(g_Vars.chrdata, distance)) { cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -1406,11 +1406,11 @@ bool aiIfNearlyInTargetsSight(void) /** * @cmd 0042 */ -bool aiSetPadPresetToPadOnRouteToTarget(void) +bool ai_set_pad_preset_to_pad_on_route_to_target(void) { - if (chrSetPadPresetToPadOnRouteToTarget(g_Vars.chrdata)) { + if (chr_set_pad_preset_to_pad_on_route_to_target(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1421,11 +1421,11 @@ bool aiSetPadPresetToPadOnRouteToTarget(void) /** * @cmd 0043 */ -bool aiIfSawTargetRecently(void) +bool ai_if_saw_target_recently(void) { - if (chrSawTargetRecently(g_Vars.chrdata)) { + if (chr_saw_target_recently(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1436,11 +1436,11 @@ bool aiIfSawTargetRecently(void) /** * @cmd 0044 */ -bool aiIfHeardTargetRecently(void) +bool ai_if_heard_target_recently(void) { - if (chrHeardTargetRecently(g_Vars.chrdata)) { + if (chr_heard_target_recently(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1451,13 +1451,13 @@ bool aiIfHeardTargetRecently(void) /** * @cmd 0045 */ -bool aiIfLosToChr(void) +bool ai_if_los_to_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); - if (chr && chr->prop && chrHasLosToPos(g_Vars.chrdata, &chr->prop->pos, chr->prop->rooms)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr && chr->prop && chr_has_los_to_pos(g_Vars.chrdata, &chr->prop->pos, chr->prop->rooms)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1468,11 +1468,11 @@ bool aiIfLosToChr(void) /** * @cmd 0046 */ -bool aiIfNeverBeenOnScreen(void) +bool ai_if_never_been_on_screen(void) { if ((g_Vars.chrdata->chrflags & CHRCFLAG_EVERONSCREEN) == 0) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1483,11 +1483,11 @@ bool aiIfNeverBeenOnScreen(void) /** * @cmd 0047 */ -bool aiIfOnScreen(void) +bool ai_if_on_screen(void) { if (g_Vars.chrdata->prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1498,16 +1498,16 @@ bool aiIfOnScreen(void) /** * @cmd 0048 */ -bool aiIfChrInOnScreenRoom(void) +bool ai_if_chr_in_on_screen_room(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u8 pass = false; s32 i; if (chr && chr->prop) { for (i = 0; chr->prop->rooms[i] != -1; i++) { - if (bgRoomIsOnscreen(chr->prop->rooms[i])) { + if (bg_room_is_onscreen(chr->prop->rooms[i])) { pass = true; } } @@ -1515,7 +1515,7 @@ bool aiIfChrInOnScreenRoom(void) if (pass) { cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1526,14 +1526,14 @@ bool aiIfChrInOnScreenRoom(void) /** * @cmd 0049 */ -bool aiIfRoomIsOnScreen(void) +bool ai_if_room_is_on_screen(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad_id = cmd[3] | (cmd[2] << 8); - s32 room_id = chrGetPadRoom(g_Vars.chrdata, pad_id); + s32 room_id = chr_get_pad_room(g_Vars.chrdata, pad_id); - if (room_id >= 0 && bgRoomIsOnscreen(room_id)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (room_id >= 0 && bg_room_is_onscreen(room_id)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -1544,11 +1544,11 @@ bool aiIfRoomIsOnScreen(void) /** * @cmd 004a */ -bool aiIfTargetAimingAtMe(void) +bool ai_if_target_aiming_at_me(void) { - if (chrIsTargetAimingAtMe(g_Vars.chrdata)) { + if (chr_is_target_aiming_at_me(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1559,11 +1559,11 @@ bool aiIfTargetAimingAtMe(void) /** * @cmd 004b */ -bool aiIfNearMiss(void) +bool ai_if_near_miss(void) { - if (chrResetNearMiss(g_Vars.chrdata)) { + if (chr_reset_near_miss(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1574,7 +1574,7 @@ bool aiIfNearMiss(void) /** * @cmd 004c */ -bool aiIfSeesSuspiciousItem(void) +bool ai_if_sees_suspicious_item(void) { s16 *ptr; ubool pass = false; @@ -1583,7 +1583,7 @@ bool aiIfSeesSuspiciousItem(void) s16 propnums[256]; struct prop *chrprop = g_Vars.chrdata->prop; - roomGetProps(chrprop->rooms, &propnums[0], 256); + room_get_props(chrprop->rooms, &propnums[0], 256); ptr = &propnums[0]; @@ -1592,16 +1592,16 @@ bool aiIfSeesSuspiciousItem(void) obj = prop->obj; if (prop->type == PROPTYPE_WEAPON) { - if ((obj->hidden & OBJHFLAG_SUSPICIOUS) && chrHasLosToProp(g_Vars.chrdata, prop)) { + if ((obj->hidden & OBJHFLAG_SUSPICIOUS) && chr_has_los_to_prop(g_Vars.chrdata, prop)) { pass = true; } } else if (prop->type == PROPTYPE_OBJ) { - if (((obj->hidden & OBJHFLAG_SUSPICIOUS) || !objIsHealthy(obj)) - && chrHasLosToProp(g_Vars.chrdata, prop)) { + if (((obj->hidden & OBJHFLAG_SUSPICIOUS) || !obj_is_healthy(obj)) + && chr_has_los_to_prop(g_Vars.chrdata, prop)) { pass = true; } } else if (prop->type == PROPTYPE_EXPLOSION) { - if (chrHasLosToProp(g_Vars.chrdata, prop)) { + if (chr_has_los_to_prop(g_Vars.chrdata, prop)) { pass = true; } } @@ -1611,7 +1611,7 @@ bool aiIfSeesSuspiciousItem(void) if (pass) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -1622,23 +1622,23 @@ bool aiIfSeesSuspiciousItem(void) /** * @cmd 004e */ -bool aiIfCheckFovWithTarget(void) +bool ai_if_check_fov_with_target(void) { bool pass; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (cmd[4] == 0) { if (cmd[3]) { - pass = chrIsInTargetsFovX(g_Vars.chrdata, cmd[2]); + pass = chr_is_in_targets_fov_x(g_Vars.chrdata, cmd[2]); } else { - pass = chrIsVerticalAngleToTargetWithin(g_Vars.chrdata, cmd[2]); + pass = chr_is_vertical_angle_to_target_within(g_Vars.chrdata, cmd[2]); } } else { - pass = g_Vars.chrdata->yvisang && chrIsVerticalAngleToTargetWithin(g_Vars.chrdata, g_Vars.chrdata->yvisang) == 0; + pass = g_Vars.chrdata->yvisang && chr_is_vertical_angle_to_target_within(g_Vars.chrdata, g_Vars.chrdata->yvisang) == 0; } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -1649,12 +1649,12 @@ bool aiIfCheckFovWithTarget(void) /** * @cmd 004d */ -bool aiIfTargetInFovLeft(void) +bool ai_if_target_in_fov_left(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGetAngleToTarget(g_Vars.chrdata) < cmd[2] * M_BADTAU * 0.00390625f) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_get_angle_to_target(g_Vars.chrdata) < cmd[2] * M_BADTAU * 0.00390625f) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1665,12 +1665,12 @@ bool aiIfTargetInFovLeft(void) /** * @cmd 004f */ -bool aiIfTargetOutOfFovLeft(void) +bool ai_if_target_out_of_fov_left(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGetAngleToTarget(g_Vars.chrdata) > cmd[2] * M_BADTAU * 0.00390625f) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_get_angle_to_target(g_Vars.chrdata) > cmd[2] * M_BADTAU * 0.00390625f) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1681,12 +1681,12 @@ bool aiIfTargetOutOfFovLeft(void) /** * @cmd 0050 */ -bool aiIfTargetInFov(void) +bool ai_if_target_in_fov(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrIsTargetInFov(g_Vars.chrdata, cmd[2], 0)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_is_target_in_fov(g_Vars.chrdata, cmd[2], 0)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1697,12 +1697,12 @@ bool aiIfTargetInFov(void) /** * @cmd 0051 */ -bool aiIfTargetOutOfFov(void) +bool ai_if_target_out_of_fov(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (!chrIsTargetInFov(g_Vars.chrdata, cmd[2], 0)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (!chr_is_target_in_fov(g_Vars.chrdata, cmd[2], 0)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -1713,13 +1713,13 @@ bool aiIfTargetOutOfFov(void) /** * @cmd 0052 */ -bool aiIfDistanceToTargetLessThan(void) +bool ai_if_distance_to_target_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[3] | (cmd[2] << 8)) * (f32)10; - if (chrGetDistanceToTarget(g_Vars.chrdata) < distance) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (chr_get_distance_to_target(g_Vars.chrdata) < distance) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -1730,13 +1730,13 @@ bool aiIfDistanceToTargetLessThan(void) /** * @cmd 0053 */ -bool aiIfDistanceToTargetGreaterThan(void) +bool ai_if_distance_to_target_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[3] | (cmd[2] << 8)) * (f32)10; - if (chrGetDistanceToTarget(g_Vars.chrdata) > distance) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (chr_get_distance_to_target(g_Vars.chrdata) > distance) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -1747,10 +1747,10 @@ bool aiIfDistanceToTargetGreaterThan(void) /** * @cmd 0054 */ -bool aiIfChrDistanceToPadLessThan(void) +bool ai_if_chr_distance_to_pad_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); #if VERSION >= VERSION_NTSC_1_0 s32 padnum = (cmd[6] | (cmd[5] << 8)) & 0xffff; @@ -1761,8 +1761,8 @@ bool aiIfChrDistanceToPadLessThan(void) realpadnum = (u16) g_Vars.chrdata->padpreset1; } - if (chr && realpadnum < 9000 && chrGetDistanceToPad(chr, realpadnum) < value) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + if (chr && realpadnum < 9000 && chr_get_distance_to_pad(chr, realpadnum) < value) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -1774,8 +1774,8 @@ bool aiIfChrDistanceToPadLessThan(void) padnum = g_Vars.chrdata->padpreset1; } - if (chr && chrGetDistanceToPad(chr, padnum) < value) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + if (chr && chr_get_distance_to_pad(chr, padnum) < value) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -1788,10 +1788,10 @@ bool aiIfChrDistanceToPadLessThan(void) /** * @cmd 01df */ -bool aiIfChrSameFloorDistanceToPadLessThan(void) +bool ai_if_chr_same_floor_distance_to_pad_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u16 padnum = cmd[6] | (cmd[5] << 8); f32 distance = (cmd[4] | (cmd[3] << 8)) * 10.0f; s32 padnum2; @@ -1802,8 +1802,8 @@ bool aiIfChrSameFloorDistanceToPadLessThan(void) padnum2 = padnum; - if (chr && chrGetSameFloorDistanceToPad(chr, padnum2 & 0xffffffff) < distance) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + if (chr && chr_get_same_floor_distance_to_pad(chr, padnum2 & 0xffffffff) < distance) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -1815,10 +1815,10 @@ bool aiIfChrSameFloorDistanceToPadLessThan(void) /** * @cmd 0055 */ -bool aiIfChrDistanceToPadGreaterThan(void) +bool ai_if_chr_distance_to_pad_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u16 padnum = cmd[6] | (cmd[5] << 8); f32 distance = (cmd[4] | (cmd[3] << 8)) * 10.0f; @@ -1827,12 +1827,12 @@ bool aiIfChrDistanceToPadGreaterThan(void) } #if VERSION >= VERSION_NTSC_1_0 - if (chr && padnum < 9000 && chrGetDistanceToPad(chr, padnum) > distance) + if (chr && padnum < 9000 && chr_get_distance_to_pad(chr, padnum) > distance) #else - if (chr && chrGetDistanceToPad(chr, padnum) > distance) + if (chr && chr_get_distance_to_pad(chr, padnum) > distance) #endif { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -1843,13 +1843,13 @@ bool aiIfChrDistanceToPadGreaterThan(void) /** * @cmd 0056 */ -bool aiIfDistanceToChrLessThan(void) +bool ai_if_distance_to_chr_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 cutoff = (cmd[3] | (cmd[2] << 8)) * 10.0f; - if (chrGetDistanceToChr(g_Vars.chrdata, cmd[4]) < cutoff) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if (chr_get_distance_to_chr(g_Vars.chrdata, cmd[4]) < cutoff) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -1860,13 +1860,13 @@ bool aiIfDistanceToChrLessThan(void) /** * @cmd 0057 */ -bool aiIfDistanceToChrGreaterThan(void) +bool ai_if_distance_to_chr_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 cutoff = (cmd[3] | (cmd[2] << 8)) * 10.0f; - if (chrGetDistanceToChr(g_Vars.chrdata, cmd[4]) > cutoff) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if (chr_get_distance_to_chr(g_Vars.chrdata, cmd[4]) > cutoff) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -1882,8 +1882,8 @@ bool ai0058(void) u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[3] | (cmd[2] << 8)) * 10.0f; - if (chrSetChrPresetToAnyChrNearSelf(g_Vars.chrdata, distance)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (chr_set_chr_preset_to_any_chr_near_self(g_Vars.chrdata, distance)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -1894,14 +1894,14 @@ bool ai0058(void) /** * @cmd 0059 */ -bool aiIfDistanceFromTargetToPadLessThan(void) +bool ai_if_distance_from_target_to_pad_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad = cmd[5] | (cmd[4] << 8); f32 value = (cmd[3] | (cmd[2] << 8)) * 10.0f; - if (chrGetDistanceFromTargetToPad(g_Vars.chrdata, pad) < value) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if (chr_get_distance_from_target_to_pad(g_Vars.chrdata, pad) < value) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -1912,14 +1912,14 @@ bool aiIfDistanceFromTargetToPadLessThan(void) /** * @cmd 005a */ -bool aiIfDistanceFromTargetToPadGreaterThan(void) +bool ai_if_distance_from_target_to_pad_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad = cmd[5] | (cmd[4] << 8); f32 value = (cmd[3] | (cmd[2] << 8)) * 10.0f; - if (chrGetDistanceFromTargetToPad(g_Vars.chrdata, pad) > value) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if (chr_get_distance_from_target_to_pad(g_Vars.chrdata, pad) > value) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -1930,29 +1930,29 @@ bool aiIfDistanceFromTargetToPadGreaterThan(void) /** * @cmd 005b */ -bool aiIfChrInRoom(void) +bool ai_if_chr_in_room(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u16 pad_id = cmd[5] | (cmd[4] << 8); - s32 room = chrGetPadRoom(g_Vars.chrdata, pad_id); + s32 room = chr_get_pad_room(g_Vars.chrdata, pad_id); if ((cmd[3] == 0 && room >= 0 && chr && chr->prop && chr->prop->rooms[0] == room) || (cmd[3] == 1 && chr && chr->prop && chr->prop->rooms[0] == g_Vars.chrdata->roomtosearch)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); return false; } - if (cmd[3] == 2 && stageGetIndex(g_Vars.stagenum) == STAGEINDEX_G5BUILDING) { + if (cmd[3] == 2 && stage_get_index(g_Vars.stagenum) == STAGEINDEX_G5BUILDING) { s32 i; bool pass = false; for (i = 0; i < PLAYERCOUNT(); i++) { if (g_Vars.players[i]->eyespy && g_Vars.players[i]->eyespy->prop #if VERSION >= VERSION_NTSC_1_0 - && chrGetDistanceToPad(g_Vars.players[i]->eyespy->prop->chr, pad_id) < 150.0f + && chr_get_distance_to_pad(g_Vars.players[i]->eyespy->prop->chr, pad_id) < 150.0f #else - && chrGetDistanceToPad(g_Vars.players[i]->eyespy->prop->chr, 0x4d) < 150.0f + && chr_get_distance_to_pad(g_Vars.players[i]->eyespy->prop->chr, 0x4d) < 150.0f #endif ) { pass = true; @@ -1960,7 +1960,7 @@ bool aiIfChrInRoom(void) } if (pass == true) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -1976,15 +1976,15 @@ bool aiIfChrInRoom(void) /** * @cmd 005c */ -bool aiIfTargetInRoom(void) +bool ai_if_target_in_room(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct prop *prop = chrGetTargetProp(g_Vars.chrdata); + struct prop *prop = chr_get_target_prop(g_Vars.chrdata); u16 pad_id = cmd[3] | (cmd[2] << 8); - s32 room_id = chrGetPadRoom(g_Vars.chrdata, pad_id); + s32 room_id = chr_get_pad_room(g_Vars.chrdata, pad_id); if (room_id >= 0 && prop && room_id == prop->rooms[0]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -1995,22 +1995,22 @@ bool aiIfTargetInRoom(void) /** * @cmd 005d */ -bool aiIfChrHasObject(void) +bool ai_if_chr_has_object(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[3]); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); s32 hasprop = false; if (obj && obj->prop && chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(chr->prop)); - hasprop = invHasProp(obj->prop); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playermgr_get_player_num_by_prop(chr->prop)); + hasprop = inv_has_prop(obj->prop); + set_current_player_num(prevplayernum); } if (hasprop) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2021,12 +2021,12 @@ bool aiIfChrHasObject(void) /** * @cmd 005e */ -bool aiIfWeaponThrown(void) +bool ai_if_weapon_thrown(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (weaponFindLanded(cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (weapon_find_landed(cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2037,10 +2037,10 @@ bool aiIfWeaponThrown(void) /** * @cmd 005f */ -bool aiIfWeaponThrownOnObject(void) +bool ai_if_weapon_thrown_on_object(void) { struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); - struct defaultobj *obj = objFindByTagId(cmd->b3); + struct defaultobj *obj = obj_find_by_tag_id(cmd->b3); bool pass = false; if (obj && obj->prop) { @@ -2060,7 +2060,7 @@ bool aiIfWeaponThrownOnObject(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b4); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b4); } else { g_Vars.aioffset += 5; } @@ -2071,26 +2071,26 @@ bool aiIfWeaponThrownOnObject(void) /** * @cmd 0060 */ -bool aiIfChrHasWeaponEquipped(void) +bool ai_if_chr_has_weapon_equipped(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); bool passes = false; if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); - if (bgunGetWeaponNum(HAND_RIGHT) == cmd[3]) { + if (bgun_get_weapon_num(HAND_RIGHT) == cmd[3]) { passes = true; } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (passes) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2101,15 +2101,15 @@ bool aiIfChrHasWeaponEquipped(void) /** * @cmd 0061 */ -bool aiIfGunUnclaimed(void) +bool ai_if_gun_unclaimed(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (cmd[3] == 0) { - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2118,7 +2118,7 @@ bool aiIfGunUnclaimed(void) if (weapon && weapon->base.prop) { weapon->base.flags |= OBJFLAG_FORCENOBOUNCE; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2130,13 +2130,13 @@ bool aiIfGunUnclaimed(void) /** * @cmd 0062 */ -bool aiIfObjectHealthy(void) +bool ai_if_object_healthy(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); - if (obj && obj->prop && objIsHealthy(obj)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (obj && obj->prop && obj_is_healthy(obj)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2147,10 +2147,10 @@ bool aiIfObjectHealthy(void) /** * @cmd 0063 */ -bool aiIfChrActivatedObject(void) +bool ai_if_chr_activated_object(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[3]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); u32 stack[1]; bool pass = false; @@ -2161,7 +2161,7 @@ bool aiIfChrActivatedObject(void) obj->hidden &= ~(OBJHFLAG_ACTIVATED_BY_BOND | OBJHFLAG_ACTIVATED_BY_COOP); } } else { - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop) { if (chr->prop == g_Vars.bond->prop && (obj->hidden & OBJHFLAG_ACTIVATED_BY_BOND)) { @@ -2176,7 +2176,7 @@ bool aiIfChrActivatedObject(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2187,16 +2187,16 @@ bool aiIfChrActivatedObject(void) /** * @cmd 0065 */ -bool aiObjInteract(void) +bool ai_obj_interact(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { if (obj->prop->type == PROPTYPE_DOOR) { - doorsActivate(obj->prop, false); + doors_activate(obj->prop, false); } else if (obj->prop->type == PROPTYPE_OBJ || obj->prop->type == PROPTYPE_WEAPON) { - propobjInteract(obj->prop); + propobj_interact(obj->prop); } } @@ -2208,21 +2208,21 @@ bool aiObjInteract(void) /** * @cmd 0066 */ -bool aiDestroyObject(void) +bool ai_destroy_object(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); - if (obj && obj->prop && objGetDestroyedLevel(obj) == 0) { + if (obj && obj->prop && obj_get_destroyed_level(obj) == 0) { struct defaultobj *entity = obj->prop->obj; if (entity->modelnum == MODEL_ELVIS_SAUCER) { obj->flags = (obj->flags & ~OBJFLAG_FORCEMORTAL) | OBJFLAG_INVINCIBLE; - explosionCreateSimple(entity->prop, &entity->prop->pos, entity->prop->rooms, EXPLOSIONTYPE_LAPTOP, 0); - smokeCreateAtProp(entity->prop, SMOKETYPE_UFO); + explosion_create_simple(entity->prop, &entity->prop->pos, entity->prop->rooms, EXPLOSIONTYPE_LAPTOP, 0); + smoke_create_at_prop(entity->prop, SMOKETYPE_UFO); } else { f32 damage = ((obj->maxdamage - obj->damage) + 1) / 250.0f; - objDamage(obj, damage, &obj->prop->pos, WEAPON_REMOTEMINE, -1); + obj_damage(obj, damage, &obj->prop->pos, WEAPON_REMOTEMINE, -1); } } @@ -2237,11 +2237,11 @@ bool aiDestroyObject(void) bool ai0067(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->prop->parent && obj->prop->parent->type == PROPTYPE_CHR) { struct chrdata *chr = obj->prop->parent->chr; - objSetDropped(obj->prop, DROPTYPE_SURRENDER); + obj_set_dropped(obj->prop, DROPTYPE_SURRENDER); chr->hidden |= CHRHFLAG_DROPPINGITEM; } @@ -2253,13 +2253,13 @@ bool ai0067(void) /** * @cmd 0068 */ -bool aiChrDropItems(void) +bool ai_chr_drop_items(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop) { - chrDropConcealedItems(chr); + chr_drop_concealed_items(chr); } g_Vars.aioffset += 3; @@ -2270,28 +2270,28 @@ bool aiChrDropItems(void) /** * @cmd 0069 */ -bool aiChrDropWeapon(void) +bool ai_chr_drop_weapon(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); u32 weaponnum; - setCurrentPlayerNum(playernum); - weaponnum = bgunGetWeaponNum(HAND_RIGHT); - invRemoveItemByNum(weaponnum); - bgunCycleBack(); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playernum); + weaponnum = bgun_get_weapon_num(HAND_RIGHT); + inv_remove_item_by_num(weaponnum); + bgun_cycle_back(); + set_current_player_num(prevplayernum); } else if (chr && chr->prop) { if (chr->weapons_held[0]) { - objSetDropped(chr->weapons_held[0], DROPTYPE_DEFAULT); + obj_set_dropped(chr->weapons_held[0], DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } if (chr->weapons_held[1]) { - objSetDropped(chr->weapons_held[1], DROPTYPE_DEFAULT); + obj_set_dropped(chr->weapons_held[1], DROPTYPE_DEFAULT); chr->hidden |= CHRHFLAG_DROPPINGITEM; } } @@ -2304,44 +2304,44 @@ bool aiChrDropWeapon(void) /** * @cmd 006a */ -bool aiGiveObjectToChr(void) +bool ai_give_object_to_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[3]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[3]); if (obj && obj->prop && chr && chr->prop) { if (chr->prop->type == PROPTYPE_PLAYER) { u32 something; u32 prevplayernum = g_Vars.currentplayernum; struct defaultobj *obj2 = obj->prop->obj; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); #if VERSION >= VERSION_NTSC_1_0 if (obj->prop->parent) { - objDetach(obj->prop); - objFreeEmbedmentOrProjectile(obj->prop); - propActivate(obj->prop); + obj_detach(obj->prop); + obj_free_embedment_or_projectile(obj->prop); + prop_activate(obj->prop); } #endif - something = propPickupByPlayer(obj->prop, 0); - propExecuteTickOperation(obj->prop, something); - playernum = playermgrGetPlayerNumByProp(chr->prop); + something = prop_pickup_by_player(obj->prop, 0); + prop_execute_tick_operation(obj->prop, something); + playernum = playermgr_get_player_num_by_prop(chr->prop); obj2->hidden = (playernum << 28) | (obj2->hidden & 0x0fffffff); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } else { if (obj->prop->parent) { - objDetach(obj->prop); + obj_detach(obj->prop); } else { - propDeregisterRooms(obj->prop); - propDelist(obj->prop); - propDisable(obj->prop); + prop_deregister_rooms(obj->prop); + prop_delist(obj->prop); + prop_disable(obj->prop); } - if (obj->type != OBJTYPE_WEAPON || chrEquipWeapon((struct weaponobj *) obj, chr) == 0) { - propReparent(obj->prop, chr->prop); + if (obj->type != OBJTYPE_WEAPON || chr_equip_weapon((struct weaponobj *) obj, chr) == 0) { + prop_reparent(obj->prop, chr->prop); } } } @@ -2354,17 +2354,17 @@ bool aiGiveObjectToChr(void) /** * @cmd 006b */ -bool aiObjectMoveToPad(void) +bool ai_object_move_to_pad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); u16 padnum = cmd[4] | (cmd[3] << 8); Mtxf matrix; struct pad pad; RoomNum rooms[2]; if (obj && obj->prop) { - padUnpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_ROOM, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_ROOM, &pad); mtx00016d58(&matrix, 0, 0, 0, -pad.look.x, -pad.look.y, -pad.look.z, @@ -2387,15 +2387,15 @@ bool aiObjectMoveToPad(void) /** * @cmd 006c */ -bool aiOpenDoor(void) +bool ai_open_door(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->prop->type == PROPTYPE_DOOR) { - if (!doorCallLift(obj->prop, false)) { + if (!door_call_lift(obj->prop, false)) { struct doorobj *door = (struct doorobj *) obj; - doorsRequestMode(door, DOORMODE_OPENING); + doors_request_mode(door, DOORMODE_OPENING); } } @@ -2407,14 +2407,14 @@ bool aiOpenDoor(void) /** * @cmd 006d */ -bool aiCloseDoor(void) +bool ai_close_door(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->prop->type == PROPTYPE_DOOR) { struct doorobj *door = (struct doorobj *) obj; - doorsRequestMode(door, DOORMODE_CLOSING); + doors_request_mode(door, DOORMODE_CLOSING); } g_Vars.aioffset += 3; @@ -2425,10 +2425,10 @@ bool aiCloseDoor(void) /** * @cmd 006e */ -bool aiIfDoorState(void) +bool ai_if_door_state(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); bool pass = false; if (obj && obj->prop && obj->type == OBJTYPE_DOOR) { @@ -2448,7 +2448,7 @@ bool aiIfDoorState(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2459,13 +2459,13 @@ bool aiIfDoorState(void) /** * @cmd 006f */ -bool aiIfObjectIsDoor(void) +bool ai_if_object_is_door(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->type == OBJTYPE_DOOR && (obj->hidden & 0x200)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2476,10 +2476,10 @@ bool aiIfObjectIsDoor(void) /** * @cmd 0070 */ -bool aiLockDoor(void) +bool ai_lock_door(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->prop->type == PROPTYPE_DOOR) { struct doorobj *door = (struct doorobj *) obj; @@ -2495,10 +2495,10 @@ bool aiLockDoor(void) /** * @cmd 0071 */ -bool aiUnlockDoor(void) +bool ai_unlock_door(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->prop->type == PROPTYPE_DOOR) { struct doorobj *door = (struct doorobj *) obj; @@ -2514,10 +2514,10 @@ bool aiUnlockDoor(void) /** * @cmd 0072 */ -bool aiIfDoorLocked(void) +bool ai_if_door_locked(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); bool pass = false; if (obj && obj->prop && obj->prop->type == PROPTYPE_DOOR) { @@ -2531,7 +2531,7 @@ bool aiIfDoorLocked(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2542,14 +2542,14 @@ bool aiIfDoorLocked(void) /** * @cmd 0073 */ -bool aiIfObjectiveComplete(void) +bool ai_if_objective_complete(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (cmd[2] < objectiveGetCount() && - objectiveCheck(cmd[2]) == OBJECTIVE_COMPLETE && - objectiveGetDifficultyBits(cmd[2]) & (1 << lvGetDifficulty())) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (cmd[2] < objective_get_count() && + objective_check(cmd[2]) == OBJECTIVE_COMPLETE && + objective_get_difficulty_bits(cmd[2]) & (1 << lv_get_difficulty())) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2560,14 +2560,14 @@ bool aiIfObjectiveComplete(void) /** * @cmd 0074 */ -bool aiIfObjectiveFailed(void) +bool ai_if_objective_failed(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (cmd[2] < objectiveGetCount() && - objectiveCheck(cmd[2]) == OBJECTIVE_FAILED && - objectiveGetDifficultyBits(cmd[2]) & (1 << lvGetDifficulty())) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (cmd[2] < objective_get_count() && + objective_check(cmd[2]) == OBJECTIVE_FAILED && + objective_get_difficulty_bits(cmd[2]) & (1 << lv_get_difficulty())) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2583,7 +2583,7 @@ bool ai0075(void) u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (func0f04a4ec(g_Vars.chrdata, cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2594,12 +2594,12 @@ bool ai0075(void) /** * @cmd 0076 */ -bool aiSetPadPresetToTargetQuadrant(void) +bool ai_set_pad_preset_to_target_quadrant(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrSetPadPresetToWaypointWithinTargetQuadrant(g_Vars.chrdata, cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_set_pad_preset_to_waypoint_within_target_quadrant(g_Vars.chrdata, cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2610,12 +2610,12 @@ bool aiSetPadPresetToTargetQuadrant(void) /** * @cmd 007d */ -bool aiIfNumArghsLessThan(void) +bool ai_if_num_arghs_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGetNumArghs(g_Vars.chrdata) < cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_get_num_arghs(g_Vars.chrdata) < cmd[2]) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2626,12 +2626,12 @@ bool aiIfNumArghsLessThan(void) /** * @cmd 007e */ -bool aiIfNumArghsGreaterThan(void) +bool ai_if_num_arghs_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGetNumArghs(g_Vars.chrdata) > cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_get_num_arghs(g_Vars.chrdata) > cmd[2]) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2642,12 +2642,12 @@ bool aiIfNumArghsGreaterThan(void) /** * @cmd 007f */ -bool aiIfNumCloseArghsLessThan(void) +bool ai_if_num_close_arghs_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGetNumCloseArghs(g_Vars.chrdata) < cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_get_num_close_arghs(g_Vars.chrdata) < cmd[2]) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2658,12 +2658,12 @@ bool aiIfNumCloseArghsLessThan(void) /** * @cmd 0080 */ -bool aiIfNumCloseArghsGreaterThan(void) +bool ai_if_num_close_arghs_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGetNumCloseArghs(g_Vars.chrdata) > cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_get_num_close_arghs(g_Vars.chrdata) > cmd[2]) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2674,16 +2674,16 @@ bool aiIfNumCloseArghsGreaterThan(void) /** * @cmd 0081 */ -bool aiIfChrHealthGreaterThan(void) +bool ai_if_chr_health_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 value = cmd[3] * 0.1f; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u32 pass = false; if (chr && chr->prop) { if (chr->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); pass = (value > g_Vars.players[playernum]->bondhealth * 8.0f); } else { @@ -2692,7 +2692,7 @@ bool aiIfChrHealthGreaterThan(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2703,16 +2703,16 @@ bool aiIfChrHealthGreaterThan(void) /** * @cmd 0082 */ -bool aiIfChrHealthLessThan(void) +bool ai_if_chr_health_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 value = cmd[3] * 0.1f; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u32 pass = false; if (chr && chr->prop) { if (chr->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); pass = (value < g_Vars.players[playernum]->bondhealth * 8.0f); } else { @@ -2721,7 +2721,7 @@ bool aiIfChrHealthLessThan(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2732,14 +2732,14 @@ bool aiIfChrHealthLessThan(void) /** * @cmd 010f */ -bool aiIfChrShieldLessThan(void) +bool ai_if_chr_shield_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 value = (cmd[4] | (cmd[3] << 8)) * 0.1f; - struct chrdata *chr = chrFindById(g_Vars.chrdata,cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata,cmd[2]); - if (chr && chrGetShield(chr) < value) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if (chr && chr_get_shield(chr) < value) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset = g_Vars.aioffset + 6; } @@ -2750,14 +2750,14 @@ bool aiIfChrShieldLessThan(void) /** * @cmd 0110 */ -bool aiIfChrShieldGreaterThan(void) +bool ai_if_chr_shield_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 value = (cmd[4] | (cmd[3] << 8)) * 0.1f; - struct chrdata *chr = chrFindById(g_Vars.chrdata,cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata,cmd[2]); - if (chr && chrGetShield(chr) > value) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if (chr && chr_get_shield(chr) > value) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset = g_Vars.aioffset + 6; } @@ -2768,14 +2768,14 @@ bool aiIfChrShieldGreaterThan(void) /** * @cmd 0083 */ -bool aiIfInjured(void) +bool ai_if_injured(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && (chr->chrflags & CHRCFLAG_JUST_INJURED)) { chr->chrflags &= ~CHRCFLAG_JUST_INJURED; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset = g_Vars.aioffset + 4; } @@ -2786,14 +2786,14 @@ bool aiIfInjured(void) /** * @cmd 0168 */ -bool aiIfShieldDamaged(void) +bool ai_if_shield_damaged(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && (chr->chrflags & CHRCFLAG_SHIELDDAMAGED)) { chr->chrflags &= ~CHRCFLAG_SHIELDDAMAGED; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset = g_Vars.aioffset + 4; } @@ -2804,12 +2804,12 @@ bool aiIfShieldDamaged(void) /** * @cmd 0077 */ -bool aiIfDifficultyLessThan(void) +bool ai_if_difficulty_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (lvGetDifficulty() < cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (lv_get_difficulty() < cmd[2]) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2820,12 +2820,12 @@ bool aiIfDifficultyLessThan(void) /** * @cmd 0078 */ -bool aiIfDifficultyGreaterThan(void) +bool ai_if_difficulty_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (lvGetDifficulty() > cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (lv_get_difficulty() > cmd[2]) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2836,14 +2836,14 @@ bool aiIfDifficultyGreaterThan(void) /** * @cmd 0079 */ -bool aiIfStageTimerLessThan(void) +bool ai_if_stage_timer_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 target = (f32)(cmd[3] | (cmd[2] << 8)); - f32 time = lvGetStageTimeInSeconds(); + f32 time = lv_get_stage_time_in_seconds(); if (time < target) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2854,14 +2854,14 @@ bool aiIfStageTimerLessThan(void) /** * @cmd 007a */ -bool aiIfStageTimerGreaterThan(void) +bool ai_if_stage_timer_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 target = (f32)(cmd[3] | (cmd[2] << 8)); - f32 time = lvGetStageTimeInSeconds(); + f32 time = lv_get_stage_time_in_seconds(); if (time > target) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -2872,12 +2872,12 @@ bool aiIfStageTimerGreaterThan(void) /** * @cmd 007b */ -bool aiIfStageIdLessThan(void) +bool ai_if_stage_id_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (cmd[2] > mainGetStageNum()) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (cmd[2] > main_get_stage_num()) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2888,12 +2888,12 @@ bool aiIfStageIdLessThan(void) /** * @cmd 007c */ -bool aiIfStageIdGreaterThan(void) +bool ai_if_stage_id_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (mainGetStageNum() > cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (main_get_stage_num() > cmd[2]) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2904,7 +2904,7 @@ bool aiIfStageIdGreaterThan(void) /** * @cmd 0084 */ -bool aiSetMorale(void) +bool ai_set_morale(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.chrdata->morale = cmd[2]; @@ -2916,10 +2916,10 @@ bool aiSetMorale(void) /** * @cmd 0085 */ -bool aiAddMorale(void) +bool ai_add_morale(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - incrementByte(&g_Vars.chrdata->morale, cmd[2]); + increment_byte(&g_Vars.chrdata->morale, cmd[2]); g_Vars.aioffset += 3; return false; @@ -2928,11 +2928,11 @@ bool aiAddMorale(void) /** * @cmd 0086 */ -bool aiChrAddMorale(void) +bool ai_chr_add_morale(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[3]); - incrementByte(&chr->morale, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[3]); + increment_byte(&chr->morale, cmd[2]); g_Vars.aioffset += 4; return false; @@ -2941,10 +2941,10 @@ bool aiChrAddMorale(void) /** * @cmd 0087 */ -bool aiSubtractMorale(void) +bool ai_subtract_morale(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - decrementByte(&g_Vars.chrdata->morale, cmd[2]); + decrement_byte(&g_Vars.chrdata->morale, cmd[2]); g_Vars.aioffset += 3; return false; @@ -2953,12 +2953,12 @@ bool aiSubtractMorale(void) /** * @cmd 0088 */ -bool aiIfMoraleLessThan(void) +bool ai_if_morale_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.chrdata->morale < cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -2969,12 +2969,12 @@ bool aiIfMoraleLessThan(void) /** * @cmd 0089 */ -bool aiIfMoraleLessThanRandom(void) +bool ai_if_morale_less_than_random(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.chrdata->morale < g_Vars.chrdata->random) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -2985,7 +2985,7 @@ bool aiIfMoraleLessThanRandom(void) /** * @cmd 008a */ -bool aiSetAlertness(void) +bool ai_set_alertness(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.chrdata->alertness = cmd[2]; @@ -2997,10 +2997,10 @@ bool aiSetAlertness(void) /** * @cmd 008b */ -bool aiAddAlertness(void) +bool ai_add_alertness(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - incrementByte(&g_Vars.chrdata->alertness, cmd[2]); + increment_byte(&g_Vars.chrdata->alertness, cmd[2]); g_Vars.aioffset += 3; return false; @@ -3009,13 +3009,13 @@ bool aiAddAlertness(void) /** * @cmd 008c */ -bool aiChrAddAlertness(void) +bool ai_chr_add_alertness(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[3]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[3]); if (chr && chr->prop) { - incrementByte(&chr->alertness, cmd[2]); + increment_byte(&chr->alertness, cmd[2]); } g_Vars.aioffset += 4; @@ -3026,10 +3026,10 @@ bool aiChrAddAlertness(void) /** * @cmd 008d */ -bool aiSubtractAlertness(void) +bool ai_subtract_alertness(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - decrementByte(&g_Vars.chrdata->alertness, cmd[2]); + decrement_byte(&g_Vars.chrdata->alertness, cmd[2]); g_Vars.aioffset += 3; return false; @@ -3038,13 +3038,13 @@ bool aiSubtractAlertness(void) /** * @cmd 008e */ -bool aiIfAlertness(void) +bool ai_if_alertness(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if ((g_Vars.chrdata->alertness < cmd[2] && cmd[3] == 0) || (cmd[2] < g_Vars.chrdata->alertness && cmd[3] == 1)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -3055,13 +3055,13 @@ bool aiIfAlertness(void) /** * @cmd 008f */ -bool aiIfChrAlertnessLessThan(void) +bool ai_if_chr_alertness_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[3]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[3]); if (chr && chr->alertness < cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -3072,12 +3072,12 @@ bool aiIfChrAlertnessLessThan(void) /** * @cmd 0090 */ -bool aiIfAlertnessLessThanRandom(void) +bool ai_if_alertness_less_than_random(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.chrdata->alertness < g_Vars.chrdata->random) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -3088,7 +3088,7 @@ bool aiIfAlertnessLessThanRandom(void) /** * @cmd 0092 */ -bool aiSetHearDistance(void) +bool ai_set_hear_distance(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[3] | (cmd[2] << 8)) / 1000.0f; @@ -3102,11 +3102,11 @@ bool aiSetHearDistance(void) /** * @cmd 0093 */ -bool aiSetViewDistance(void) +bool ai_set_view_distance(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (!cheatIsActive(CHEAT_PERFECTDARKNESS)) { + if (!cheat_is_active(CHEAT_PERFECTDARKNESS)) { g_Vars.chrdata->visionrange = cmd[2]; } @@ -3118,7 +3118,7 @@ bool aiSetViewDistance(void) /** * @cmd 0094 */ -bool aiSetGrenadeProbability(void) +bool ai_set_grenade_probability(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.chrdata->grenadeprob = cmd[2]; @@ -3130,11 +3130,11 @@ bool aiSetGrenadeProbability(void) /** * @cmd 0095 */ -bool aiSetChrNum(void) +bool ai_set_chr_num(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - chrSetChrnum(g_Vars.chrdata, cmd[2]); + chr_set_chrnum(g_Vars.chrdata, cmd[2]); g_Vars.chrdata->chrnum = cmd[2]; g_Vars.aioffset += 3; @@ -3144,23 +3144,23 @@ bool aiSetChrNum(void) /** * @cmd 0096 */ -bool aiSetMaxDamage(void) +bool ai_set_max_damage(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 maxdamage = (cmd[4] | (cmd[3] << 8)) * 0.1f; if (g_Vars.hovercar) { - chopperSetMaxDamage(g_Vars.hovercar, maxdamage); + chopper_set_max_damage(g_Vars.hovercar, maxdamage); } else { - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); - if (chr && chr->prop && !chrIsDead(chr) + if (chr && chr->prop && !chr_is_dead(chr) && chr->actiontype != ACT_DEAD && chr->actiontype != ACT_DIE && chr->actiontype != ACT_DRUGGEDKO && chr->actiontype != ACT_DRUGGEDDROP && chr->actiontype != ACT_DRUGGEDCOMINGUP) { - chrSetMaxDamage(chr, maxdamage); + chr_set_max_damage(chr, maxdamage); } } @@ -3172,12 +3172,12 @@ bool aiSetMaxDamage(void) /** * @cmd 0097 */ -bool aiAddHealth() +bool ai_add_health() { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 amount = (cmd[3] | (cmd[2] << 8)) * 0.1f; - chrAddHealth(g_Vars.chrdata, amount); + chr_add_health(g_Vars.chrdata, amount); g_Vars.aioffset += 4; @@ -3187,16 +3187,16 @@ bool aiAddHealth() /** * @cmd 010e */ -bool aiSetShield(void) +bool ai_set_shield(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 amount = (cmd[3] | (cmd[2] << 8)) * 0.1f; - if (cheatIsActive(CHEAT_ENEMYSHIELDS)) { + if (cheat_is_active(CHEAT_ENEMYSHIELDS)) { amount = amount < 8 ? 8 : amount; } - chrSetShield(g_Vars.chrdata, amount); + chr_set_shield(g_Vars.chrdata, amount); g_Vars.aioffset += 4; @@ -3206,7 +3206,7 @@ bool aiSetShield(void) /** * @cmd 0098 */ -bool aiSetReactionSpeed(void) +bool ai_set_reaction_speed(void) { s8 *cmd = (s8 *)g_Vars.ailist + g_Vars.aioffset; @@ -3219,7 +3219,7 @@ bool aiSetReactionSpeed(void) /** * @cmd 0099 */ -bool aiSetRecoverySpeed(void) +bool ai_set_recovery_speed(void) { s8 *cmd = (s8 *)g_Vars.ailist + g_Vars.aioffset; @@ -3232,7 +3232,7 @@ bool aiSetRecoverySpeed(void) /** * @cmd 009a */ -bool aiSetAccuracy(void) +bool ai_set_accuracy(void) { s8 *cmd = (s8 *)g_Vars.ailist + g_Vars.aioffset; @@ -3245,7 +3245,7 @@ bool aiSetAccuracy(void) /** * @cmd 01c6 */ -bool aiSetDodgeRating(void) +bool ai_set_dodge_rating(void) { s8 *cmd = (s8 *)g_Vars.ailist + g_Vars.aioffset; @@ -3266,7 +3266,7 @@ bool aiSetDodgeRating(void) /** * @cmd 01c7 */ -bool aiSetUnarmedDodgeRating(void) +bool ai_set_unarmed_dodge_rating(void) { s8 *cmd = (s8 *)g_Vars.ailist + g_Vars.aioffset; @@ -3279,11 +3279,11 @@ bool aiSetUnarmedDodgeRating(void) /** * @cmd 009b */ -bool aiSetFlag(void) +bool ai_set_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - chrSetFlags(g_Vars.chrdata, flags, cmd[6]); + chr_set_flags(g_Vars.chrdata, flags, cmd[6]); g_Vars.aioffset += 7; @@ -3293,11 +3293,11 @@ bool aiSetFlag(void) /** * @cmd 009c */ -bool aiUnsetFlag(void) +bool ai_unset_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - chrUnsetFlags(g_Vars.chrdata, flags, cmd[6]); + chr_unset_flags(g_Vars.chrdata, flags, cmd[6]); g_Vars.aioffset += 7; @@ -3307,20 +3307,20 @@ bool aiUnsetFlag(void) /** * @cmd 009d */ -bool aiIfHasFlag(void) +bool ai_if_has_flag(void) { bool result; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - result = chrHasFlag(g_Vars.chrdata, flags, cmd[7]); + result = chr_has_flag(g_Vars.chrdata, flags, cmd[7]); if (cmd[6] == 0) { result = !result; } if (result) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[8]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[8]); } else { g_Vars.aioffset += 9; } @@ -3331,11 +3331,11 @@ bool aiIfHasFlag(void) /** * @cmd 009e */ -bool aiChrSetFlag(void) +bool ai_chr_set_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - chrSetFlagsById(g_Vars.chrdata, cmd[2], flags, cmd[7]); + chr_set_flags_by_id(g_Vars.chrdata, cmd[2], flags, cmd[7]); g_Vars.aioffset += 8; return false; @@ -3344,11 +3344,11 @@ bool aiChrSetFlag(void) /** * @cmd 009f */ -bool aiChrUnsetFlag(void) +bool ai_chr_unset_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - chrUnsetFlagsById(g_Vars.chrdata, cmd[2], flags, cmd[7]); + chr_unset_flags_by_id(g_Vars.chrdata, cmd[2], flags, cmd[7]); g_Vars.aioffset += 8; return false; @@ -3357,13 +3357,13 @@ bool aiChrUnsetFlag(void) /** * @cmd 00a0 */ -bool aiIfChrHasFlag(void) +bool ai_if_chr_has_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - if (chrHasFlagById(g_Vars.chrdata, cmd[2], flags, cmd[7])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[8]); + if (chr_has_flag_by_id(g_Vars.chrdata, cmd[2], flags, cmd[7])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[8]); } else { g_Vars.aioffset += 9; } @@ -3374,11 +3374,11 @@ bool aiIfChrHasFlag(void) /** * @cmd 00a1 */ -bool aiSetStageFlag(void) +bool ai_set_stage_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - chrSetStageFlag(g_Vars.chrdata, flags); + chr_set_stage_flag(g_Vars.chrdata, flags); g_Vars.aioffset += 6; return false; @@ -3387,11 +3387,11 @@ bool aiSetStageFlag(void) /** * @cmd 00a2 */ -bool aiUnsetStageFlag(void) +bool ai_unset_stage_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - chrUnsetStageFlag(g_Vars.chrdata, flags); + chr_unset_stage_flag(g_Vars.chrdata, flags); g_Vars.aioffset += 6; return false; @@ -3400,14 +3400,14 @@ bool aiUnsetStageFlag(void) /** * @cmd 00a3 */ -bool aiIfStageFlagEq(void) +bool ai_if_stage_flag_eq(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); - if ((chrHasStageFlag(g_Vars.chrdata, flags) && cmd[6] == 1) || - (!chrHasStageFlag(g_Vars.chrdata, flags) && cmd[6] == 0)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + if ((chr_has_stage_flag(g_Vars.chrdata, flags) && cmd[6] == 1) || + (!chr_has_stage_flag(g_Vars.chrdata, flags) && cmd[6] == 0)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -3418,7 +3418,7 @@ bool aiIfStageFlagEq(void) /** * @cmd 00a4 */ -bool aiSetChrflag(void) +bool ai_set_chrflag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); @@ -3432,7 +3432,7 @@ bool aiSetChrflag(void) /** * @cmd 00a5 */ -bool aiUnsetChrflag(void) +bool ai_unset_chrflag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); @@ -3446,13 +3446,13 @@ bool aiUnsetChrflag(void) /** * @cmd 00a6 */ -bool aiIfHasChrflag(void) +bool ai_if_has_chrflag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); if ((g_Vars.chrdata->chrflags & flags) == flags) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -3463,11 +3463,11 @@ bool aiIfHasChrflag(void) /** * @cmd 00a7 */ -bool aiChrSetChrflag(void) +bool ai_chr_set_chrflag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { chr->chrflags |= flags; @@ -3481,11 +3481,11 @@ bool aiChrSetChrflag(void) /** * @cmd 00a8 */ -bool aiChrUnsetChrflag(void) +bool ai_chr_unset_chrflag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { chr->chrflags &= ~flags; @@ -3499,14 +3499,14 @@ bool aiChrUnsetChrflag(void) /** * @cmd 00a9 */ -bool aiIfChrHasChrflag(void) +bool ai_if_chr_has_chrflag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && (chr->chrflags & flags) == flags) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -3517,11 +3517,11 @@ bool aiIfChrHasChrflag(void) /** * @cmd 011b */ -bool aiChrSetHiddenFlag(void) +bool ai_chr_set_hidden_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { chr->hidden |= flags; @@ -3535,11 +3535,11 @@ bool aiChrSetHiddenFlag(void) /** * @cmd 011c */ -bool aiChrUnsetHiddenFlag(void) +bool ai_chr_unset_hidden_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { chr->hidden &= ~flags; @@ -3553,14 +3553,14 @@ bool aiChrUnsetHiddenFlag(void) /** * @cmd 011d */ -bool aiIfChrHasHiddenFlag(void) +bool ai_if_chr_has_hidden_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && (chr->hidden & flags) == flags) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -3571,11 +3571,11 @@ bool aiIfChrHasHiddenFlag(void) /** * @cmd 00aa */ -bool aiSetObjFlag(void) +bool ai_set_obj_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { obj->flags |= flags; @@ -3589,11 +3589,11 @@ bool aiSetObjFlag(void) /** * @cmd 00ab */ -bool aiUnsetObjFlag(void) +bool ai_unset_obj_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { obj->flags &= ~flags; @@ -3607,14 +3607,14 @@ bool aiUnsetObjFlag(void) /** * @cmd 00ac */ -bool aiIfObjHasFlag(void) +bool ai_if_obj_has_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && (obj->flags & flags) == flags) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -3625,11 +3625,11 @@ bool aiIfObjHasFlag(void) /** * @cmd 00ad */ -bool aiSetObjFlag2(void) +bool ai_set_obj_flag2(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { obj->flags2 |= flags; @@ -3643,11 +3643,11 @@ bool aiSetObjFlag2(void) /** * @cmd 00ae */ -bool aiUnsetObjFlag2(void) +bool ai_unset_obj_flag2(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { obj->flags2 &= ~flags; @@ -3661,14 +3661,14 @@ bool aiUnsetObjFlag2(void) /** * @cmd 00af */ -bool aiIfObjHasFlag2(void) +bool ai_if_obj_has_flag2(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && (obj->flags2 & flags) == flags) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -3679,11 +3679,11 @@ bool aiIfObjHasFlag2(void) /** * @cmd 0118 */ -bool aiSetObjFlag3(void) +bool ai_set_obj_flag3(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { obj->flags3 |= flags; @@ -3697,11 +3697,11 @@ bool aiSetObjFlag3(void) /** * @cmd 0119 */ -bool aiUnsetObjFlag3(void) +bool ai_unset_obj_flag3(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { obj->flags3 &= ~flags; @@ -3715,14 +3715,14 @@ bool aiUnsetObjFlag3(void) /** * @cmd 011a */ -bool aiIfObjHasFlag3(void) +bool ai_if_obj_has_flag3(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[4] << 16) | (cmd[5] << 8) | cmd[6] | (cmd[3] << 24); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && (obj->flags3 & flags) == flags) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -3733,10 +3733,10 @@ bool aiIfObjHasFlag3(void) /** * @cmd 00b0 */ -bool aiSetChrPreset(void) +bool ai_set_chr_preset(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - chrSetChrPreset(g_Vars.chrdata, cmd[2]); + chr_set_chr_preset(g_Vars.chrdata, cmd[2]); g_Vars.aioffset += 3; return false; @@ -3745,10 +3745,10 @@ bool aiSetChrPreset(void) /** * @cmd 00b1 */ -bool aiSetChrTarget(void) +bool ai_set_chr_target(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - chrSetChrPresetByChrnum(g_Vars.chrdata, cmd[2], cmd[3]); + chr_set_chr_preset_by_chrnum(g_Vars.chrdata, cmd[2], cmd[3]); g_Vars.aioffset += 4; return false; @@ -3757,13 +3757,13 @@ bool aiSetChrTarget(void) /** * @cmd 00b2 */ -bool aiSetPadPreset(void) +bool ai_set_pad_preset(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad_id = cmd[3] | (cmd[2] << 8); if (g_Vars.chrdata) { - chrSetPadPreset(g_Vars.chrdata, pad_id); + chr_set_pad_preset(g_Vars.chrdata, pad_id); } else if (g_Vars.heli) { g_Vars.heli->base.pad = pad_id; } @@ -3776,12 +3776,12 @@ bool aiSetPadPreset(void) /** * @cmd 00b3 */ -bool aiChrSetPadPreset(void) +bool ai_chr_set_pad_preset(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad_id = cmd[4] | (cmd[3] << 8); - chrSetPadPresetByChrnum(g_Vars.chrdata, cmd[2], pad_id); + chr_set_pad_preset_by_chrnum(g_Vars.chrdata, cmd[2], pad_id); g_Vars.aioffset += 5; @@ -3791,11 +3791,11 @@ bool aiChrSetPadPreset(void) /** * @cmd 00b4 */ -bool aiChrCopyPadPreset(void) +bool ai_chr_copy_pad_preset(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chrsrc = chrFindById(g_Vars.chrdata, cmd[2]); - struct chrdata *chrdst = chrFindById(g_Vars.chrdata, cmd[3]); + struct chrdata *chrsrc = chr_find_by_id(g_Vars.chrdata, cmd[2]); + struct chrdata *chrdst = chr_find_by_id(g_Vars.chrdata, cmd[3]); chrdst->padpreset1 = chrsrc->padpreset1; g_Vars.aioffset += 4; @@ -3809,7 +3809,7 @@ bool aiChrCopyPadPreset(void) * The weirdness to do with result is required for a match. * The original source likely had something similar and probably used ifdefs. */ -bool aiPrint(void) +bool ai_print(void) { u32 len; u32 result = dprint(); @@ -3822,7 +3822,7 @@ bool aiPrint(void) // empty } - len = chraiGetCommandLength(g_Vars.ailist, g_Vars.aioffset); + len = chrai_get_command_length(g_Vars.ailist, g_Vars.aioffset); g_Vars.aioffset += len; @@ -3832,7 +3832,7 @@ bool aiPrint(void) /** * @cmd 0091 */ -bool aiNoOp0091(void) +bool ai_noop_0091(void) { g_Vars.aioffset += 2; return false; @@ -3841,12 +3841,12 @@ bool aiNoOp0091(void) /** * @cmd 00b6 */ -bool aiRestartTimer(void) +bool ai_restart_timer(void) { if (g_Vars.chrdata) { - chrRestartTimer(g_Vars.chrdata); + chr_restart_timer(g_Vars.chrdata); } else if (g_Vars.hovercar) { - chopperRestartTimer(g_Vars.hovercar); + chopper_restart_timer(g_Vars.hovercar); } g_Vars.aioffset += 2; @@ -3857,7 +3857,7 @@ bool aiRestartTimer(void) /** * @cmd 00b7 */ -bool aiResetTimer(void) +bool ai_reset_timer(void) { g_Vars.chrdata->timer60 = 0; g_Vars.aioffset += 2; @@ -3868,7 +3868,7 @@ bool aiResetTimer(void) /** * @cmd 00b8 */ -bool aiPauseTimer(void) +bool ai_pause_timer(void) { g_Vars.chrdata->hidden &= ~CHRHFLAG_TIMER_RUNNING; g_Vars.aioffset += 2; @@ -3879,7 +3879,7 @@ bool aiPauseTimer(void) /** * @cmd 00b9 */ -bool aiResumeTimer(void) +bool ai_resume_timer(void) { g_Vars.chrdata->hidden |= CHRHFLAG_TIMER_RUNNING; g_Vars.aioffset += 2; @@ -3890,12 +3890,12 @@ bool aiResumeTimer(void) /** * @cmd 00ba */ -bool aiIfTimerStopped(void) +bool ai_if_timer_stopped(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if ((g_Vars.chrdata->hidden & CHRHFLAG_TIMER_RUNNING) == 0) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -3906,13 +3906,13 @@ bool aiIfTimerStopped(void) /** * @cmd 00bb */ -bool aiIfTimerGreaterThanRandom(void) +bool ai_if_timer_greater_than_random(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - f32 timer = chrGetTimer(g_Vars.chrdata); + f32 timer = chr_get_timer(g_Vars.chrdata); if (g_Vars.chrdata->random < timer) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -3923,14 +3923,14 @@ bool aiIfTimerGreaterThanRandom(void) /** * @cmd 00bc */ -bool aiIfTimerLessThan(void) +bool ai_if_timer_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 value = (u32)((cmd[3] << 8) | cmd[4] | (cmd[2] << 16)) / 60.0f; - if ((g_Vars.chrdata && chrGetTimer(g_Vars.chrdata) < value) || - (g_Vars.hovercar && chopperGetTimer(g_Vars.hovercar) < value)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if ((g_Vars.chrdata && chr_get_timer(g_Vars.chrdata) < value) || + (g_Vars.hovercar && chopper_get_timer(g_Vars.hovercar) < value)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -3941,23 +3941,23 @@ bool aiIfTimerLessThan(void) /** * @cmd 00bd */ -bool aiIfTimerGreaterThan(void) +bool ai_if_timer_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 value = (u32)((cmd[3] << 8) | cmd[4] | (cmd[2] << 16)) / 60.0f; // These two function calls were likely used in a debug print statement if (g_Vars.chrdata) { - chrGetTimer(g_Vars.chrdata); + chr_get_timer(g_Vars.chrdata); } if (g_Vars.hovercar) { - chopperGetTimer(g_Vars.hovercar); + chopper_get_timer(g_Vars.hovercar); } - if ((g_Vars.chrdata && chrGetTimer(g_Vars.chrdata) > value) || - (g_Vars.hovercar && chopperGetTimer(g_Vars.hovercar) > value)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if ((g_Vars.chrdata && chr_get_timer(g_Vars.chrdata) > value) || + (g_Vars.hovercar && chopper_get_timer(g_Vars.hovercar) > value)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -3968,9 +3968,9 @@ bool aiIfTimerGreaterThan(void) /** * @cmd 00be */ -bool aiShowCountdownTimer(void) +bool ai_show_countdown_timer(void) { - countdownTimerSetVisible(COUNTDOWNTIMERREASON_AI, true); + countdown_timer_set_visible(COUNTDOWNTIMERREASON_AI, true); g_Vars.aioffset += 2; return false; @@ -3979,9 +3979,9 @@ bool aiShowCountdownTimer(void) /** * @cmd 00bf */ -bool aiHideCountdownTimer(void) +bool ai_hide_countdown_timer(void) { - countdownTimerSetVisible(COUNTDOWNTIMERREASON_AI, false); + countdown_timer_set_visible(COUNTDOWNTIMERREASON_AI, false); g_Vars.aioffset += 2; return false; @@ -3990,12 +3990,12 @@ bool aiHideCountdownTimer(void) /** * @cmd 00c0 */ -bool aiSetCountdownTimerValue(void) +bool ai_set_countdown_timer_value(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 seconds = cmd[3] | (cmd[2] << 8); - countdownTimerSetValue60(seconds * 60); + countdown_timer_set_value60(seconds * 60); g_Vars.aioffset += 4; return false; @@ -4004,9 +4004,9 @@ bool aiSetCountdownTimerValue(void) /** * @cmd 00c1 */ -bool aiStopCountdownTimer(void) +bool ai_stop_countdown_timer(void) { - countdownTimerSetRunning(false); + countdown_timer_set_running(false); g_Vars.aioffset += 2; return false; @@ -4015,9 +4015,9 @@ bool aiStopCountdownTimer(void) /** * @cmd 00c2 */ -bool aiStartCountdownTimer(void) +bool ai_start_countdown_timer(void) { - countdownTimerSetRunning(true); + countdown_timer_set_running(true); g_Vars.aioffset += 2; return false; @@ -4026,12 +4026,12 @@ bool aiStartCountdownTimer(void) /** * @cmd 00c3 */ -bool aiIfCountdownTimerStopped(void) +bool ai_if_countdown_timer_stopped(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (!countdownTimerIsRunning()) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (!countdown_timer_is_running()) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -4042,13 +4042,13 @@ bool aiIfCountdownTimerStopped(void) /** * @cmd 00c4 */ -bool aiIfCountdownTimerLessThan(void) +bool ai_if_countdown_timer_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 value = cmd[3] | (cmd[2] << 8); - if (countdownTimerGetValue60() < value * 60) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (countdown_timer_get_value60() < value * 60) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -4059,13 +4059,13 @@ bool aiIfCountdownTimerLessThan(void) /** * @cmd 00c5 */ -bool aiIfCountdownTimerGreaterThan(void) +bool ai_if_countdown_timer_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 value = cmd[3] | (cmd[2] << 8); - if (countdownTimerGetValue60() > value * 60) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (countdown_timer_get_value60() > value * 60) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -4076,18 +4076,18 @@ bool aiIfCountdownTimerGreaterThan(void) /** * @cmd 00c6 */ -bool aiSpawnChrAtPad(void) +bool ai_spawn_chr_at_pad(void) { struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); u16 pad = cmd->b4 << 8 | cmd->b5; u32 spawnflags = cmd->b8 << 24 | cmd->b9 << 16 | cmd->b10 << 8 | cmd->b11; u16 ailistid = cmd->b6 << 8 | cmd->b7; - u8 *ailist = ailistFindById(ailistid); + u8 *ailist = ailist_find_by_id(ailistid); if (spawnflags); - if (chrSpawnAtPad(g_Vars.chrdata, cmd->b2, (s8)cmd->b3, pad, ailist, spawnflags)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b12); + if (chr_spawn_at_pad(g_Vars.chrdata, cmd->b2, (s8)cmd->b3, pad, ailist, spawnflags)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b12); } else { g_Vars.aioffset += 13; } @@ -4098,15 +4098,15 @@ bool aiSpawnChrAtPad(void) /** * @cmd 00c7 */ -bool aiSpawnChrAtChr(void) +bool ai_spawn_chr_at_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 spawnflags = (cmd[8] << 16) | (cmd[9] << 8) | cmd[10] | (cmd[7] << 24); u16 ailistid = cmd[6] | (cmd[5] << 8); - u8 *ailist = ailistFindById(ailistid); + u8 *ailist = ailist_find_by_id(ailistid); - if (chrSpawnAtChr(g_Vars.chrdata, cmd[2], (s8)cmd[3], cmd[4], ailist, spawnflags)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[11]); + if (chr_spawn_at_chr(g_Vars.chrdata, cmd[2], (s8)cmd[3], cmd[4], ailist, spawnflags)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[11]); } else { g_Vars.aioffset += 12; } @@ -4117,7 +4117,7 @@ bool aiSpawnChrAtChr(void) /** * @cmd 00c8 */ -bool aiTryEquipWeapon(void) +bool ai_try_equip_weapon(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[6] << 16) | (cmd[7] << 8) | cmd[8] | (cmd[5] << 24); @@ -4130,11 +4130,11 @@ bool aiTryEquipWeapon(void) #if VERSION < VERSION_NTSC_1_0 // On NTSC beta, Marquis is disabled entirely on MBR, and the K7 guard // on Investigation PA is excluded here (ie. is given his weapon). - if (cheatIsActive(CHEAT_MARQUIS) && g_Vars.stagenum != STAGE_MBR) { + if (cheat_is_active(CHEAT_MARQUIS) && g_Vars.stagenum != STAGE_MBR) { if (g_Vars.stagenum == STAGE_INVESTIGATION - && lvGetDifficulty() == DIFF_PA + && lv_get_difficulty() == DIFF_PA && cmd[4] == WEAPON_K7AVENGER) { - prop = chrGiveWeapon(g_Vars.chrdata, model, cmd[4], flags); + prop = chr_give_weapon(g_Vars.chrdata, model, cmd[4], flags); } } #elif VERSION < VERSION_PAL_BETA @@ -4143,24 +4143,24 @@ bool aiTryEquipWeapon(void) // Additionally, NTSC Final changes the logic so the chrs are given // their weapon but they cannot equip them. This means the K7 guard // no longer needs to be handled. - if (cheatIsActive(CHEAT_MARQUIS)) { + if (cheat_is_active(CHEAT_MARQUIS)) { flags &= ~OBJFLAG_WEAPON_LEFTHANDED; flags |= OBJFLAG_WEAPON_AICANNOTUSE; - prop = chrGiveWeapon(g_Vars.chrdata, model, cmd[4], flags); + prop = chr_give_weapon(g_Vars.chrdata, model, cmd[4], flags); } #else // PAL fixes Cass on MBR by allowing her to equip her weapon - if (cheatIsActive(CHEAT_MARQUIS)) { - if (g_Vars.chrdata->bodynum != BODY_CASSANDRA || mainGetStageNum() != STAGE_MBR) { + if (cheat_is_active(CHEAT_MARQUIS)) { + if (g_Vars.chrdata->bodynum != BODY_CASSANDRA || main_get_stage_num() != STAGE_MBR) { flags &= ~OBJFLAG_WEAPON_LEFTHANDED; flags |= OBJFLAG_WEAPON_AICANNOTUSE; } - prop = chrGiveWeapon(g_Vars.chrdata, model, cmd[4], flags); + prop = chr_give_weapon(g_Vars.chrdata, model, cmd[4], flags); } #endif - else if (cheatIsActive(CHEAT_ENEMYROCKETS)) { + else if (cheat_is_active(CHEAT_ENEMYROCKETS)) { switch (cmd[4]) { case WEAPON_FALCON2: case WEAPON_FALCON2_SILENCER: @@ -4193,26 +4193,26 @@ bool aiTryEquipWeapon(void) case WEAPON_TIMEDMINE: case WEAPON_PROXIMITYMINE: case WEAPON_REMOTEMINE: - prop = chrGiveWeapon(g_Vars.chrdata, MODEL_CHRDYROCKET, WEAPON_ROCKETLAUNCHER, flags); + prop = chr_give_weapon(g_Vars.chrdata, MODEL_CHRDYROCKET, WEAPON_ROCKETLAUNCHER, flags); break; case WEAPON_K7AVENGER: - if (g_Vars.stagenum == STAGE_INVESTIGATION && lvGetDifficulty() == DIFF_PA) { - prop = chrGiveWeapon(g_Vars.chrdata, model, cmd[4], flags); + if (g_Vars.stagenum == STAGE_INVESTIGATION && lv_get_difficulty() == DIFF_PA) { + prop = chr_give_weapon(g_Vars.chrdata, model, cmd[4], flags); } else { - prop = chrGiveWeapon(g_Vars.chrdata, MODEL_CHRDYROCKET, WEAPON_ROCKETLAUNCHER, flags); + prop = chr_give_weapon(g_Vars.chrdata, MODEL_CHRDYROCKET, WEAPON_ROCKETLAUNCHER, flags); } break; default: - prop = chrGiveWeapon(g_Vars.chrdata, model, cmd[4], flags); + prop = chr_give_weapon(g_Vars.chrdata, model, cmd[4], flags); break; } } else { - prop = chrGiveWeapon(g_Vars.chrdata, model, cmd[4], flags); + prop = chr_give_weapon(g_Vars.chrdata, model, cmd[4], flags); } } if (prop) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[9]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[9]); } else { g_Vars.aioffset += 10; } @@ -4223,7 +4223,7 @@ bool aiTryEquipWeapon(void) /** * @cmd 00c9 */ -bool aiTryEquipHat(void) +bool ai_try_equip_hat(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 flags = (cmd[5] << 16) | (cmd[6] << 8) | cmd[7] | (cmd[4] << 24); @@ -4231,11 +4231,11 @@ bool aiTryEquipHat(void) struct prop *prop = NULL; if (g_Vars.chrdata && g_Vars.chrdata->prop && g_Vars.chrdata->model) { - prop = hatCreateForChr(g_Vars.chrdata, modelnum, flags); + prop = hat_create_for_chr(g_Vars.chrdata, modelnum, flags); } if (prop) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[8]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[8]); } else { g_Vars.aioffset += 9; } @@ -4246,14 +4246,14 @@ bool aiTryEquipHat(void) /** * @cmd 00ca */ -bool aiDuplicateChr(void) +bool ai_duplicate_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 spawnflags = (cmd[6] << 16) | (cmd[7] << 8) | cmd[8] | (cmd[5] << 24); u16 ailistid = cmd[4] | (cmd[3] << 8); - u8 *ailist = ailistFindById(ailistid); + u8 *ailist = ailist_find_by_id(ailistid); bool pass = false; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); struct chrdata *clone = NULL; struct weaponobj *srcweapon1 = NULL; struct prop *cloneprop = NULL; @@ -4266,29 +4266,29 @@ bool aiDuplicateChr(void) struct prop *cloneweapon1prop = NULL; if (chr && (chr->chrflags & CHRCFLAG_CLONEABLE)) { - cloneprop = chrSpawnAtChr(g_Vars.chrdata, chr->bodynum, -1, chr->chrnum, ailist, spawnflags); + cloneprop = chr_spawn_at_chr(g_Vars.chrdata, chr->bodynum, -1, chr->chrnum, ailist, spawnflags); if (cloneprop) { clone = cloneprop->chr; - chrSetChrnum(clone, chrsGetNextUnusedChrnum()); + chr_set_chrnum(clone, chrs_get_next_unused_chrnum()); chr->chrdup = clone->chrnum; - srcweapon0prop = chrGetHeldProp(chr, 0); + srcweapon0prop = chr_get_held_prop(chr, 0); if (srcweapon0prop) { srcweapon0 = srcweapon0prop->weapon; - cloneweapon0prop = chrGiveWeapon(clone, srcweapon0->base.modelnum, srcweapon0->weaponnum, 0); + cloneweapon0prop = chr_give_weapon(clone, srcweapon0->base.modelnum, srcweapon0->weaponnum, 0); if (cloneweapon0prop) { cloneweapon0 = cloneweapon0prop->weapon; } } - srcweapon1prop = chrGetHeldProp(chr, 1); + srcweapon1prop = chr_get_held_prop(chr, 1); if (srcweapon1prop) { srcweapon1 = srcweapon1prop->weapon; - cloneweapon1prop = chrGiveWeapon(clone, srcweapon1->base.modelnum, srcweapon1->weaponnum, OBJFLAG_WEAPON_LEFTHANDED); + cloneweapon1prop = chr_give_weapon(clone, srcweapon1->base.modelnum, srcweapon1->weaponnum, OBJFLAG_WEAPON_LEFTHANDED); if (cloneweapon1prop) { cloneweapon1 = cloneweapon1prop->weapon; @@ -4298,12 +4298,12 @@ bool aiDuplicateChr(void) if (srcweapon1 && srcweapon0 && cloneweapon1 && cloneweapon0 && srcweapon0 == srcweapon1->dualweapon && srcweapon1 == srcweapon0->dualweapon) { - propweaponSetDual(cloneweapon1, cloneweapon0); + propweapon_set_dual(cloneweapon1, cloneweapon0); } if (chr->weapons_held[2]) { struct defaultobj *obj = chr->weapons_held[2]->obj; - hatCreateForChr(clone, obj->modelnum, 0); + hat_create_for_chr(clone, obj->modelnum, 0); } clone->flags = chr->flags; @@ -4324,15 +4324,15 @@ bool aiDuplicateChr(void) clone->squadron = chr->squadron; clone->voicebox = chr->voicebox; - rebuildTeams(); - rebuildSquadrons(); + rebuild_teams(); + rebuild_squadrons(); pass = true; } } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[9]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[9]); } else { g_Vars.aioffset += 10; } @@ -4343,22 +4343,22 @@ bool aiDuplicateChr(void) /** * @cmd 00cb */ -bool aiShowHudmsg(void) +bool ai_show_hudmsg(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - char *text = langGet(cmd[4] | (cmd[3] << 8)); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + char *text = lang_get(cmd[4] | (cmd[3] << 8)); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u32 prevplayernum = g_Vars.currentplayernum; u32 playernum = g_Vars.currentplayernum; if (chr && chr->prop && (chr->prop->type & 0xff) == PROPTYPE_PLAYER) { - playernum = playermgrGetPlayerNumByProp(chr->prop); + playernum = playermgr_get_player_num_by_prop(chr->prop); } - setCurrentPlayerNum(playernum); - hudmsgCreate(text, HUDMSGTYPE_DEFAULT); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playernum); + hudmsg_create(text, HUDMSGTYPE_DEFAULT); + set_current_player_num(prevplayernum); g_Vars.aioffset += 5; @@ -4368,20 +4368,20 @@ bool aiShowHudmsg(void) /** * @cmd 01a4 */ -bool aiShowHudmsgMiddle(void) +bool ai_show_hudmsg_middle(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (cmd[2] == 0) { u32 text_id = cmd[5] | (cmd[4] << 8); - char *text = langGet(text_id); - hudmsgCreateWithColour(text, HUDMSGTYPE_7, cmd[3]); + char *text = lang_get(text_id); + hudmsg_create_with_colour(text, HUDMSGTYPE_7, cmd[3]); } else if (cmd[2] == 1) { u32 text_id = cmd[5] | (cmd[4] << 8); - char *text = langGet(text_id); - hudmsgCreateWithColour(text, HUDMSGTYPE_8, cmd[3]); + char *text = lang_get(text_id); + hudmsg_create_with_colour(text, HUDMSGTYPE_8, cmd[3]); } else { - hudmsgRemoveAll(); + hudmsg_remove_all(); } g_Vars.aioffset += 6; @@ -4392,22 +4392,22 @@ bool aiShowHudmsgMiddle(void) /** * @cmd 00cc */ -bool aiShowHudmsgTopMiddle(void) +bool ai_show_hudmsg_top_middle(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - char *text = langGet(cmd[4] | (cmd[3] << 8)); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + char *text = lang_get(cmd[4] | (cmd[3] << 8)); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u32 prevplayernum = g_Vars.currentplayernum; u32 playernum = g_Vars.currentplayernum; if (chr && chr->prop && (chr->prop->type & 0xff) == PROPTYPE_PLAYER) { - playernum = playermgrGetPlayerNumByProp(chr->prop); + playernum = playermgr_get_player_num_by_prop(chr->prop); } - setCurrentPlayerNum(playernum); - hudmsgCreateWithColour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[5]); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playernum); + hudmsg_create_with_colour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[5]); + set_current_player_num(prevplayernum); g_Vars.aioffset += 6; @@ -4417,38 +4417,38 @@ bool aiShowHudmsgTopMiddle(void) /** * @cmd 00cd */ -bool aiSpeak(void) +bool ai_speak(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); s16 audio_id = cmd[6] | (cmd[5] << 8); s16 text_id = cmd[4] | (cmd[3] << 8); s32 prevplayernum = g_Vars.currentplayernum; s32 playernum = prevplayernum; u32 channelnum; - char *text = text_id >= 0 ? langGet(cmd[4] | (cmd[3] << 8)) : NULL; + char *text = text_id >= 0 ? lang_get(cmd[4] | (cmd[3] << 8)) : NULL; if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { - playernum = playermgrGetPlayerNumByProp(chr->prop); + playernum = playermgr_get_player_num_by_prop(chr->prop); } - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); if (text && cmd[2] != CHR_P1P2) { - psStopSound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); + ps_stop_sound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); } if (cmd[2] == CHR_P1P2) { - channelnum = psPlayFromProp((s8)cmd[7], audio_id, 0, g_Vars.chrdata->prop, PSTYPE_NONE, PSFLAG_FORHUDMSG); + channelnum = ps_play_from_prop((s8)cmd[7], audio_id, 0, g_Vars.chrdata->prop, PSTYPE_NONE, PSFLAG_FORHUDMSG); } else { - channelnum = psPlayFromProp((s8)cmd[7], audio_id, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, PSFLAG_FORHUDMSG); + channelnum = ps_play_from_prop((s8)cmd[7], audio_id, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, PSFLAG_FORHUDMSG); } - if (text && !sndIsFiltered(audio_id)) { - hudmsgCreateAsSubtitle(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[8], channelnum); + if (text && !snd_is_filtered(audio_id)) { + hudmsg_create_as_subtitle(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[8], channelnum); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); g_Vars.aioffset += 9; @@ -4458,12 +4458,12 @@ bool aiSpeak(void) /** * @cmd 00ce */ -bool aiPlaySound(void) +bool ai_play_sound(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 audio_id = cmd[3] | (cmd[2] << 8); - psPlayFromProp((s8)cmd[4], audio_id, 0, NULL, PSTYPE_NONE, 0); + ps_play_from_prop((s8)cmd[4], audio_id, 0, NULL, PSTYPE_NONE, 0); g_Vars.aioffset += 5; @@ -4473,12 +4473,12 @@ bool aiPlaySound(void) /** * @cmd 017c */ -bool aiAssignSound(void) +bool ai_assign_sound(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 audio_id = cmd[3] | (cmd[2] << 8); - psPlayFromProp((s8)cmd[4], audio_id, -1, NULL, PSTYPE_MARKER, 0); + ps_play_from_prop((s8)cmd[4], audio_id, -1, NULL, PSTYPE_MARKER, 0); g_Vars.aioffset += 5; @@ -4488,12 +4488,12 @@ bool aiAssignSound(void) /** * @cmd 00d3 */ -bool aiAudioMuteChannel(void) +bool ai_audio_mute_channel(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s8 channel = (s8)cmd[2]; - psMuteChannel(channel); + ps_mute_channel(channel); g_Vars.aioffset += 3; return false; @@ -4502,13 +4502,13 @@ bool aiAudioMuteChannel(void) /** * @cmd 0138 */ -bool aiIfChannelFree(void) +bool ai_if_channel_free(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s8 channel = (s8) cmd[2]; - if (psIsChannelFree(channel)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (ps_is_channel_free(channel)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -4519,13 +4519,13 @@ bool aiIfChannelFree(void) /** * @cmd 00d1 */ -bool aiSetObjectSoundVolume(void) +bool ai_set_object_sound_volume(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 volume = cmd[4] | (cmd[3] << 8); u16 volchangetimer60 = cmd[6] | (cmd[5] << 8); - psModify((s8)cmd[2], volume, -1, NULL, volchangetimer60, 2500, 3000, 0); + ps_modify((s8)cmd[2], volume, -1, NULL, volchangetimer60, 2500, 3000, 0); g_Vars.aioffset += 7; @@ -4535,14 +4535,14 @@ bool aiSetObjectSoundVolume(void) /** * @cmd 00d2 */ -bool aiSetObjectSoundVolumeByDistance(void) +bool ai_set_object_sound_volume_by_distance(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 playerdist = cmd[4] | (cmd[3] << 8); u16 volchangetimer60 = cmd[6] | (cmd[5] << 8); - s32 volume = psCalculateVolumeFromDistance(playerdist, 400, 2500, 3000, AL_VOL_FULL); + s32 volume = ps_calculate_volume_from_distance(playerdist, 400, 2500, 3000, AL_VOL_FULL); - psModify((s8)cmd[2], volume, -1, NULL, volchangetimer60, 2500, 3000, 0); + ps_modify((s8)cmd[2], volume, -1, NULL, volchangetimer60, 2500, 3000, 0); g_Vars.aioffset += 7; @@ -4552,14 +4552,14 @@ bool aiSetObjectSoundVolumeByDistance(void) /** * @cmd 00cf */ -bool aiSetObjectSoundPlaying(void) +bool ai_set_object_sound_playing(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[3]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); u16 volchangetimer60 = cmd[5] | (cmd[4] << 8); if (obj && obj->prop) { - psModify((s8)cmd[2], -1, -1, obj->prop, volchangetimer60, 2500, 3000, 0); + ps_modify((s8)cmd[2], -1, -1, obj->prop, volchangetimer60, 2500, 3000, 0); } g_Vars.aioffset += 6; @@ -4570,10 +4570,10 @@ bool aiSetObjectSoundPlaying(void) /** * @cmd 016b */ -bool aiPlayRepeatingSoundFromObject(void) +bool ai_play_repeating_sound_from_object(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[3]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); u16 thing1 = cmd[5] | (cmd[4] << 8); u16 dist2 = cmd[7] | (cmd[6] << 8); u16 dist3 = cmd[9] | (cmd[8] << 8); @@ -4587,7 +4587,7 @@ bool aiPlayRepeatingSoundFromObject(void) volchangetimer60 = thing1; } - psModify((s8)cmd[2], -1, -1, obj->prop, volchangetimer60, dist2, dist3, PSFLAG_REPEATING); + ps_modify((s8)cmd[2], -1, -1, obj->prop, volchangetimer60, dist2, dist3, PSFLAG_REPEATING); } g_Vars.aioffset += 10; @@ -4598,7 +4598,7 @@ bool aiPlayRepeatingSoundFromObject(void) /** * @cmd 0179 */ -bool aiPlaySoundFromEntity(void) +bool ai_play_sound_from_entity(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 volchangetimer60 = cmd[5] | (cmd[4] << 8); @@ -4606,16 +4606,16 @@ bool aiPlaySoundFromEntity(void) u16 dist3 = cmd[9] | (cmd[8] << 8); if (cmd[10] == 0) { - struct defaultobj *obj = objFindByTagId(cmd[3]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); if (obj && obj->prop) { - psModify((s8)cmd[2], -1, -1, obj->prop, volchangetimer60, dist2, dist3, 0); + ps_modify((s8)cmd[2], -1, -1, obj->prop, volchangetimer60, dist2, dist3, 0); } } else { - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[3]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[3]); if (chr && chr->prop) { - psModify((s8)cmd[2], -1, -1, chr->prop, volchangetimer60, dist2, dist3, 0); + ps_modify((s8)cmd[2], -1, -1, chr->prop, volchangetimer60, dist2, dist3, 0); } } @@ -4627,13 +4627,13 @@ bool aiPlaySoundFromEntity(void) /** * @cmd 00d0 */ -bool aiPlayRepeatingSoundFromPad(void) +bool ai_play_repeating_sound_from_pad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 padnum = cmd[4] | (cmd[3] << 8); s16 sound = cmd[6] | (cmd[5] << 8); - psCreate(0, NULL, sound, padnum, -1, PSFLAG_REPEATING, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); + ps_create(0, NULL, sound, padnum, -1, PSFLAG_REPEATING, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); g_Vars.aioffset += 7; @@ -4643,13 +4643,13 @@ bool aiPlayRepeatingSoundFromPad(void) /** * @cmd 00d4 */ -bool aiIfObjectSoundVolumeLessThan(void) +bool ai_if_object_sound_volume_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 value = cmd[4] | (cmd[3] << 8); - if (psGetVolume((s8)cmd[2]) < value) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if (ps_get_volume((s8)cmd[2]) < value) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -4660,10 +4660,10 @@ bool aiIfObjectSoundVolumeLessThan(void) /** * @cmd 00d5 */ -bool aiHovercarBeginPath(void) +bool ai_hovercar_begin_path(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct path *path = pathFindById(cmd[2]); + struct path *path = path_find_by_id(cmd[2]); if (g_Vars.truck) { g_Vars.truck->path = path; @@ -4671,7 +4671,7 @@ bool aiHovercarBeginPath(void) } if (g_Vars.hovercar) { - struct chopperobj *chopper = chopperFromHovercar(g_Vars.hovercar); + struct chopperobj *chopper = chopper_from_hovercar(g_Vars.hovercar); g_Vars.hovercar->path = path; g_Vars.hovercar->nextstep = 0; g_Vars.hovercar->path->flags |= PATHFLAG_INUSE; @@ -4713,7 +4713,7 @@ bool aiHovercarBeginPath(void) /** * @cmd 00d6 */ -bool aiSetVehicleSpeed(void) +bool ai_set_vehicle_speed(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 speedtime = cmd[5] | (cmd[4] << 8); @@ -4737,7 +4737,7 @@ bool aiSetVehicleSpeed(void) /** * @cmd 00d7 */ -bool aiSetRotorSpeed(void) +bool ai_set_rotor_speed(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 speedtime = cmd[5] | (cmd[4] << 8); @@ -4756,7 +4756,7 @@ bool aiSetRotorSpeed(void) /** * @cmd 00d8 */ -bool aiNoOp00d8(void) +bool ai_noop_00d8(void) { g_Vars.aioffset += 3; return false; @@ -4765,7 +4765,7 @@ bool aiNoOp00d8(void) /** * @cmd 00d9 */ -bool aiNoOp00d9(void) +bool ai_noop_00d9(void) { g_Vars.aioffset += 3; return false; @@ -4774,21 +4774,21 @@ bool aiNoOp00d9(void) /** * @cmd 00da */ -bool aiSetObjImage(void) +bool ai_set_obj_image(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { if (obj->type == OBJTYPE_SINGLEMONITOR) { struct singlemonitorobj *sm = (struct singlemonitorobj *) obj; - tvscreenSetImageByNum(&sm->screen, cmd[4]); + tvscreen_set_image_by_num(&sm->screen, cmd[4]); } else if (obj->type == OBJTYPE_MULTIMONITOR) { struct multimonitorobj *mm = (struct multimonitorobj *) obj; u8 slot = cmd[3]; if (slot < ARRAYCOUNT(mm->screens)) { - tvscreenSetImageByNum(&mm->screens[slot], cmd[4]); + tvscreen_set_image_by_num(&mm->screens[slot], cmd[4]); } } } @@ -4801,7 +4801,7 @@ bool aiSetObjImage(void) /** * @cmd 00db */ -bool aiNoOp00db(void) +bool ai_noop_00db(void) { g_Vars.aioffset += 3; return false; @@ -4810,11 +4810,11 @@ bool aiNoOp00db(void) /** * @cmd 00dc */ -bool aiEndLevel(void) +bool ai_end_level(void) { - if (debugAllowEndLevel()) { + if (debug_allow_end_level()) { if (g_IsTitleDemo) { - mainChangeToStage(STAGE_TITLE); + main_change_to_stage(STAGE_TITLE); } else if (g_Vars.autocutplaying) { g_Vars.autocutfinished = true; } else { @@ -4832,7 +4832,7 @@ bool aiEndLevel(void) */ bool ai00dd(void) { - playerEndCutscene(); + player_end_cutscene(); g_Vars.aioffset += 2; return false; } @@ -4840,12 +4840,12 @@ bool ai00dd(void) /** * @cmd 00de */ -bool aiMoveCameraToPad(void) +bool ai_move_camera_to_pad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad_id = cmd[3] | (cmd[2] << 8); - playerPrepareMoveCameraToPad(pad_id); + player_prepare_move_camera_to_pad(pad_id); g_Vars.aioffset += 4; @@ -4855,7 +4855,7 @@ bool aiMoveCameraToPad(void) /** * @cmd 010d */ -bool aiNoOp010d(void) +bool ai_noop_010d(void) { g_Vars.aioffset += 2; return false; @@ -4864,12 +4864,12 @@ bool aiNoOp010d(void) /** * @cmd 0111 */ -bool aiSetCameraAnimation(void) +bool ai_set_camera_animation(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 anim_id = cmd[3] | (cmd[2] << 8); - playerStartCutscene(anim_id); + player_start_cutscene(anim_id); if (g_Vars.currentplayer->haschrbody == false) { return true; @@ -4883,12 +4883,12 @@ bool aiSetCameraAnimation(void) /** * @cmd 0113 */ -bool aiIfInCutscene(void) +bool ai_if_in_cutscene(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.in_cutscene) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -4899,13 +4899,13 @@ bool aiIfInCutscene(void) /** * @cmd 0174 */ -bool aiIfCutsceneButtonPressed(void) +bool ai_if_cutscene_button_pressed(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if ((g_Vars.in_cutscene && g_CutsceneSkipRequested) || (g_Vars.stagenum == STAGE_CITRAINING && var80087260 > 0)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -4919,7 +4919,7 @@ bool aiIfCutsceneButtonPressed(void) bool ai0175(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - playerReorientForCutsceneStop(cmd[2]); + player_reorient_for_cutscene_stop(cmd[2]); g_Vars.aioffset += 3; return false; @@ -4928,7 +4928,7 @@ bool ai0175(void) /** * @cmd 0112 */ -bool aiObjectDoAnimation(void) +bool ai_object_do_animation(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 anim_id = cmd[3] | (cmd[2] << 8); @@ -4940,7 +4940,7 @@ bool aiObjectDoAnimation(void) if (startframe == 0xffff) { fstartframe = 0; } else if (startframe == 0xfffe) { - fstartframe = animGetNumFrames(anim_id) - 2; + fstartframe = anim_get_num_frames(anim_id) - 2; if (fstartframe < 0) { fstartframe = 0; @@ -4951,17 +4951,17 @@ bool aiObjectDoAnimation(void) if (cmd[4] == 255) { if (g_Vars.chrdata && g_Vars.chrdata->myspecial >= 0) { - obj = objFindByTagId(g_Vars.chrdata->myspecial); + obj = obj_find_by_tag_id(g_Vars.chrdata->myspecial); } } else { - obj = objFindByTagId(cmd[4]); + obj = obj_find_by_tag_id(cmd[4]); } if (obj && obj->prop) { struct anim *anim = obj->model->anim; if (obj->model->anim == NULL) { - obj->model->anim = modelmgrInstantiateAnim(); + obj->model->anim = modelmgr_instantiate_anim(); } if (obj->model->anim) { @@ -4975,14 +4975,14 @@ bool aiObjectDoAnimation(void) #endif } - animInit(obj->model->anim); + anim_init(obj->model->anim); #if VERSION >= VERSION_JPN_FINAL - modelSetAnimPlaySpeed(obj->model, 1, 0); + model_set_anim_play_speed(obj->model, 1, 0); #elif VERSION >= VERSION_PAL_BETA - modelSetAnimPlaySpeed(obj->model, 1.2, 0); + model_set_anim_play_speed(obj->model, 1.2, 0); #endif - modelSetAnimation(obj->model, anim_id, 0, fstartframe, thing, 0); - modelSetAnimScale(obj->model, bgGetStageTranslationThing() * obj->model->scale * 100.0f); + model_set_animation(obj->model, anim_id, 0, fstartframe, thing, 0); + model_set_anim_scale(obj->model, bg_get_stage_translation_thing() * obj->model->scale * 100.0f); } } @@ -4994,14 +4994,14 @@ bool aiObjectDoAnimation(void) /** * @cmd 0114 */ -bool aiEnableChr(void) +bool ai_enable_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->model) { - propActivate(chr->prop); - propEnable(chr->prop); + prop_activate(chr->prop); + prop_enable(chr->prop); chr0f0220ac(chr); } @@ -5013,15 +5013,15 @@ bool aiEnableChr(void) /** * @cmd 0115 */ -bool aiDisableChr(void) +bool ai_disable_chr(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->model) { - propDeregisterRooms(chr->prop); - propDelist(chr->prop); - propDisable(chr->prop); + prop_deregister_rooms(chr->prop); + prop_delist(chr->prop); + prop_disable(chr->prop); } g_Vars.aioffset += 3; @@ -5032,20 +5032,20 @@ bool aiDisableChr(void) /** * @cmd 0116 */ -bool aiEnableObj(void) +bool ai_enable_obj(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->model) { - propActivate(obj->prop); - propEnable(obj->prop); + prop_activate(obj->prop); + prop_enable(obj->prop); if (g_Vars.currentplayer->eyespy == NULL && obj->type == OBJTYPE_WEAPON) { struct weaponobj *weapon = (struct weaponobj *) obj; if (weapon->weaponnum == WEAPON_EYESPY) { - playerInitEyespy(); + player_init_eyespy(); } } } @@ -5058,33 +5058,33 @@ bool aiEnableObj(void) /** * @cmd 0117 */ -bool aiDisableObj(void) +bool ai_disable_obj(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->model) { #if VERSION >= VERSION_PAL_FINAL if (g_Vars.autocutplaying - && mainGetStageNum() == STAGE_AIRFORCEONE + && main_get_stage_num() == STAGE_AIRFORCEONE && (obj->modelnum == MODEL_AIRFORCE1 || obj->modelnum == MODEL_SK_SHUTTLE)) { // ignore } else { if (obj->prop->parent) { - objDetach(obj->prop); + obj_detach(obj->prop); } else { - propDeregisterRooms(obj->prop); - propDelist(obj->prop); - propDisable(obj->prop); + prop_deregister_rooms(obj->prop); + prop_delist(obj->prop); + prop_disable(obj->prop); } } #else if (obj->prop->parent) { - objDetach(obj->prop); + obj_detach(obj->prop); } else { - propDeregisterRooms(obj->prop); - propDelist(obj->prop); - propDisable(obj->prop); + prop_deregister_rooms(obj->prop); + prop_delist(obj->prop); + prop_disable(obj->prop); } #endif } @@ -5097,17 +5097,17 @@ bool aiDisableObj(void) /** * @cmd 00df */ -bool aiMoveCameraToPreset(void) +bool ai_move_camera_to_preset(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct tag *tag = tagFindById(cmd[2]); + struct tag *tag = tag_find_by_id(cmd[2]); if (tag) { - s32 cmdindex = setupGetCmdIndexByTag(tag); + s32 cmdindex = setup_get_cmd_index_by_tag(tag); if (cmdindex >= 0) { - struct camerapresetobj *preset = (struct camerapresetobj *) setupGetCmdByIndex(cmdindex + tag->cmdoffset); - playerPrepareMoveCameraToPreset(preset, cmd[4] | (cmd[3] << 8), cmd[6] | (cmd[5] << 8)); + struct camerapresetobj *preset = (struct camerapresetobj *) setup_get_cmd_by_index(cmdindex + tag->cmdoffset); + player_prepare_move_camera_to_preset(preset, cmd[4] | (cmd[3] << 8), cmd[6] | (cmd[5] << 8)); } } @@ -5119,28 +5119,28 @@ bool aiMoveCameraToPreset(void) /** * @cmd 00e0 */ -bool aiRevokeControl(void) +bool ai_revoke_control(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); - bgunSetSightVisible(GUNSIGHTREASON_NOCONTROL, false); - bgunSetGunAmmoVisible(GUNAMMOREASON_NOCONTROL, false); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); + bgun_set_sight_visible(GUNSIGHTREASON_NOCONTROL, false); + bgun_set_gun_ammo_visible(GUNAMMOREASON_NOCONTROL, false); if ((cmd[3] & 2) == 0) { - hudmsgsSetOff(HUDMSGREASON_NOCONTROL); + hudmsgs_set_off(HUDMSGREASON_NOCONTROL); } if ((cmd[3] & 4) == 0) { - countdownTimerSetVisible(COUNTDOWNTIMERREASON_NOCONTROL, false); + countdown_timer_set_visible(COUNTDOWNTIMERREASON_NOCONTROL, false); } g_PlayersWithControl[g_Vars.currentplayernum] = false; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 4; @@ -5151,20 +5151,20 @@ bool aiRevokeControl(void) /** * @cmd 00e1 */ -bool aiGrantControl(void) +bool ai_grant_control(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(chr->prop)); - bgunSetSightVisible(GUNSIGHTREASON_NOCONTROL, true); - bgunSetGunAmmoVisible(GUNAMMOREASON_NOCONTROL, true); - hudmsgsSetOn(HUDMSGREASON_NOCONTROL); - countdownTimerSetVisible(COUNTDOWNTIMERREASON_NOCONTROL, true); + set_current_player_num(playermgr_get_player_num_by_prop(chr->prop)); + bgun_set_sight_visible(GUNSIGHTREASON_NOCONTROL, true); + bgun_set_gun_ammo_visible(GUNAMMOREASON_NOCONTROL, true); + hudmsgs_set_on(HUDMSGREASON_NOCONTROL); + countdown_timer_set_visible(COUNTDOWNTIMERREASON_NOCONTROL, true); g_PlayersWithControl[g_Vars.currentplayernum] = true; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 3; @@ -5175,13 +5175,13 @@ bool aiGrantControl(void) /** * @cmd 00e2 */ -bool aiChrMoveToPad(void) +bool ai_chr_move_to_pad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; #if VERSION < VERSION_NTSC_1_0 s32 padnum = cmd[4] | (cmd[3] << 8); #endif - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); bool pass = false; f32 theta; struct pad pad; @@ -5191,39 +5191,39 @@ bool aiChrMoveToPad(void) if (chr && chr->prop) { #if VERSION >= VERSION_NTSC_1_0 if (cmd[5] == 88) { - chr2 = chrFindById(g_Vars.chrdata, cmd[4]); + chr2 = chr_find_by_id(g_Vars.chrdata, cmd[4]); if (chr2 && chr2->prop) { - theta = chrGetInverseTheta(chr2); - pass = chrMoveToPos(chr, &chr2->prop->pos, chr2->prop->rooms, theta, false); + theta = chr_get_inverse_theta(chr2); + pass = chr_move_to_pos(chr, &chr2->prop->pos, chr2->prop->rooms, theta, false); } } else { s32 padnum = cmd[4] | (cmd[3] << 8); - padnum = chrResolvePadId(chr, padnum); + padnum = chr_resolve_pad_id(chr, padnum); if (padnum >= 0) { - padUnpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); theta = atan2f(pad.look.x, pad.look.z); rooms[0] = pad.room; rooms[1] = -1; - pass = chrMoveToPos(chr, &pad.pos, rooms, theta, cmd[5]); + pass = chr_move_to_pos(chr, &pad.pos, rooms, theta, cmd[5]); } } #else - padnum = chrResolvePadId(chr, padnum); + padnum = chr_resolve_pad_id(chr, padnum); - padUnpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); theta = atan2f(pad.look.x, pad.look.z); rooms[0] = pad.room; rooms[1] = -1; - pass = chrMoveToPos(chr, &pad.pos, rooms, theta, cmd[5]); + pass = chr_move_to_pos(chr, &pad.pos, rooms, theta, cmd[5]); #endif } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -5237,19 +5237,19 @@ bool aiChrMoveToPad(void) bool ai00e3(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); if (var8007074c != 2) { - playerSetFadeColour(0, 0, 0, 0); - playerSetFadeFrac(60, 1); + player_set_fade_colour(0, 0, 0, 0); + player_set_fade_frac(60, 1); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 3; @@ -5266,15 +5266,15 @@ bool ai00e4(void) u32 prevplayernum = g_Vars.currentplayernum; for (playernum = 0; playernum < PLAYERCOUNT(); playernum++) { - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); if (var8007074c != 2) { - playerSetFadeColour(0, 0, 0, 1); - playerSetFadeFrac(60, 0); + player_set_fade_colour(0, 0, 0, 1); + player_set_fade_frac(60, 0); } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); g_Vars.aioffset += 3; return false; @@ -5283,14 +5283,14 @@ bool ai00e4(void) /** * @cmd 00e5 */ -bool aiIfColourFadeComplete(void) +bool ai_if_colour_fade_complete(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; bool pass = false; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); if (g_Vars.players[playernum]->colourfadetimemax60 < 0) { pass = true; @@ -5298,7 +5298,7 @@ bool aiIfColourFadeComplete(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -5309,10 +5309,10 @@ bool aiIfColourFadeComplete(void) /** * @cmd 00e8 */ -bool aiSetDoorOpen(void) +bool ai_set_door_open(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { struct doorobj *door = (struct doorobj *) obj; @@ -5320,9 +5320,9 @@ bool aiSetDoorOpen(void) door->fracspeed = 0; door->lastopen60 = g_Vars.lvframe60; door->mode = 0; - doorUpdateTiles(door); - doorActivatePortal(door); - psStopSound(door->base.prop, PSTYPE_GENERAL, 0xffff); + door_update_tiles(door); + door_activate_portal(door); + ps_stop_sound(door->base.prop, PSTYPE_GENERAL, 0xffff); } g_Vars.aioffset += 3; @@ -5336,10 +5336,10 @@ bool aiSetDoorOpen(void) bool ai00e9(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { - weaponDeleteFromChr(chr, cmd[3]); + weapon_delete_from_chr(chr, cmd[3]); } g_Vars.aioffset += 4; @@ -5350,12 +5350,12 @@ bool ai00e9(void) /** * @cmd 00ea */ -bool aiIfNumPlayersLessThan(void) +bool ai_if_num_players_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if ((s8)cmd[2] > PLAYERCOUNT()) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -5366,26 +5366,26 @@ bool aiIfNumPlayersLessThan(void) /** * @cmd 00eb */ -bool aiIfChrAmmoQuantityLessThan(void) +bool ai_if_chr_ammo_quantity_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); bool passes = false; if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); - if (bgunGetAmmoCount((s8)cmd[3]) < (s8)cmd[4]) { + if (bgun_get_ammo_count((s8)cmd[3]) < (s8)cmd[4]) { passes = true; } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (passes) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -5396,18 +5396,18 @@ bool aiIfChrAmmoQuantityLessThan(void) /** * @cmd 00ec */ -bool aiChrDrawWeapon(void) +bool ai_chr_draw_weapon(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); - bgunEquipWeapon2(0, (s8)cmd[3]); - bgunEquipWeapon2(1, 0); - setCurrentPlayerNum(prevplayernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); + bgun_equip_weapon2(0, (s8)cmd[3]); + bgun_equip_weapon2(1, 0); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 4; @@ -5418,17 +5418,17 @@ bool aiChrDrawWeapon(void) /** * @cmd 00ed */ -bool aiChrDrawWeaponInCutscene(void) +bool ai_chr_draw_weapon_in_cutscene(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); - bgunEquipWeapon((s8)cmd[3]); - setCurrentPlayerNum(prevplayernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); + bgun_equip_weapon((s8)cmd[3]); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 4; @@ -5442,18 +5442,18 @@ bool aiChrDrawWeaponInCutscene(void) bool ai00ee(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); g_Vars.currentplayer->bondforcespeed.x = (s8)cmd[3]; g_Vars.currentplayer->bondforcespeed.y = 0; g_Vars.currentplayer->bondforcespeed.z = (s8)cmd[4]; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 5; @@ -5464,15 +5464,15 @@ bool ai00ee(void) /** * @cmd 00ef */ -bool aiIfObjInRoom(void) +bool ai_if_obj_in_room(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); u16 room_id = cmd[4] | (cmd[3] << 8); - s32 room_something = chrGetPadRoom(g_Vars.chrdata, room_id); + s32 room_something = chr_get_pad_room(g_Vars.chrdata, room_id); if (room_something >= 0 && obj && obj->prop && room_something == obj->prop->rooms[0]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -5483,9 +5483,9 @@ bool aiIfObjInRoom(void) /** * @cmd 00f2 */ -bool aiSwitchToAltSky(void) +bool ai_switch_to_alt_sky(void) { - envApplyTransitionFrac(1); + env_apply_transition_frac(1); g_Vars.aioffset += 2; return false; @@ -5494,17 +5494,17 @@ bool aiSwitchToAltSky(void) /** * @cmd 00f3 */ -bool aiChrSetInvincible(void) +bool ai_chr_set_invincible(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); g_PlayerInvincible = true; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 3; @@ -5515,7 +5515,7 @@ bool aiChrSetInvincible(void) /** * @cmd 00f4 */ -bool aiMoveCameraToPos(void) +bool ai_move_camera_to_pos(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; @@ -5526,7 +5526,7 @@ bool aiMoveCameraToPos(void) s16 height2 = cmd[11] | (cmd[10] << 8); s32 posangle = cmd[13] | (cmd[12] << 8); - playerPrepareMoveCameraToPos(posangle * M_BADTAU / 65536, rotangle * M_BADTAU / 65536, range, height1, height2, padnum); + player_prepare_move_camera_to_pos(posangle * M_BADTAU / 65536, rotangle * M_BADTAU / 65536, range, height1, height2, padnum); g_Vars.aioffset += 14; @@ -5552,7 +5552,7 @@ bool ai00f6(void) u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (var8007073c == 2) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -5563,12 +5563,12 @@ bool ai00f6(void) /** * @cmd 00f7 */ -bool aiIfAllObjectivesComplete(void) +bool ai_if_all_objectives_complete(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (objectiveIsAllComplete()) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (objective_is_all_complete()) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset = g_Vars.aioffset + 3; } @@ -5579,22 +5579,22 @@ bool aiIfAllObjectivesComplete(void) /** * @cmd 00f8 */ -bool aiIfPlayerIsInvincible(void) +bool ai_if_player_is_invincible(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; bool pass = false; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); pass = g_PlayerInvincible; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -5605,11 +5605,11 @@ bool aiIfPlayerIsInvincible(void) /** * @cmd 00f9 */ -bool aiPlayXTrack(void) +bool ai_play_x_track(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.aioffset += 5; - musicSetXReason((s8)cmd[2], cmd[3], cmd[4]); + music_set_x_reason((s8)cmd[2], cmd[3], cmd[4]); return false; } @@ -5617,11 +5617,11 @@ bool aiPlayXTrack(void) /** * @cmd 00fa */ -bool aiStopXTrack(void) +bool ai_stop_x_track(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.aioffset += 3; - musicUnsetXReason((s8)cmd[2]); + music_unset_x_reason((s8)cmd[2]); return false; } @@ -5629,16 +5629,16 @@ bool aiStopXTrack(void) /** * @cmd 015b */ -bool aiPlayTrackIsolated(void) +bool ai_play_track_isolated(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (cmd[2] == MUSIC_CI_TRAINING) { - u16 volume = optionsGetMusicVolume(); - musicPlayTrackIsolated(cmd[2]); - optionsSetMusicVolume(volume); + u16 volume = options_get_music_volume(); + music_play_track_isolated(cmd[2]); + options_set_music_volume(volume); } else { - musicPlayTrackIsolated(cmd[2]); + music_play_track_isolated(cmd[2]); } g_Vars.aioffset += 3; @@ -5649,10 +5649,10 @@ bool aiPlayTrackIsolated(void) /** * @cmd 015c */ -bool aiPlayDefaultTracks(void) +bool ai_play_default_tracks(void) { g_Vars.aioffset += 2; - musicPlayDefaultTracks(); + music_play_default_tracks(); return false; } @@ -5660,10 +5660,10 @@ bool aiPlayDefaultTracks(void) /** * @cmd 017d */ -bool aiPlayCutsceneTrack(void) +bool ai_play_cutscene_track(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - musicStartCutscene(cmd[2]); + music_start_cutscene(cmd[2]); g_Vars.aioffset += 3; return false; @@ -5672,10 +5672,10 @@ bool aiPlayCutsceneTrack(void) /** * @cmd 017e */ -bool aiStopCutsceneTrack(void) +bool ai_stop_cutscene_track(void) { g_Vars.aioffset += 2; - musicEndCutscene(); + music_end_cutscene(); return false; } @@ -5683,10 +5683,10 @@ bool aiStopCutsceneTrack(void) /** * @cmd 017f */ -bool aiPlayTemporaryTrack(void) +bool ai_play_temporary_track(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - musicStartTemporaryAmbient(cmd[2]); + music_start_temporary_ambient(cmd[2]); g_Vars.aioffset += 3; return false; @@ -5695,10 +5695,10 @@ bool aiPlayTemporaryTrack(void) /** * @cmd 0180 */ -bool aiStopAmbientTrack(void) +bool ai_stop_ambient_track(void) { g_Vars.aioffset += 2; - musicEndTemporaryAmbient(); + music_end_temporary_ambient(); return false; } @@ -5706,17 +5706,17 @@ bool aiStopAmbientTrack(void) /** * @cmd 00fb */ -bool aiChrExplosions(void) +bool ai_chr_explosions(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); - playerSurroundWithExplosions(0); - setCurrentPlayerNum(prevplayernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); + player_surround_with_explosions(0); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 3; @@ -5727,12 +5727,12 @@ bool aiChrExplosions(void) /** * @cmd 00fc */ -bool aiIfKillCountGreaterThan(void) +bool ai_if_kill_count_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.killcount > cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -5743,14 +5743,14 @@ bool aiIfKillCountGreaterThan(void) /** * @cmd 01ab */ -bool aiIfNumKnockedOutChrs(void) +bool ai_if_num_knocked_out_chrs(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (cmd[2] < mpstatsGetTotalKnockoutCount() && cmd[3] == 0) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); - } else if (mpstatsGetTotalKnockoutCount() < cmd[2] && cmd[3] == 1) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (cmd[2] < mpstats_get_total_knockout_count() && cmd[3] == 0) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + } else if (mpstats_get_total_knockout_count() < cmd[2] && cmd[3] == 1) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -5764,11 +5764,11 @@ bool aiIfNumKnockedOutChrs(void) bool ai00fd(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && (chr->chrflags & CHRCFLAG_TRIGGERSHOTLIST)) { chr->chrflags &= ~CHRCFLAG_TRIGGERSHOTLIST; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -5779,7 +5779,7 @@ bool ai00fd(void) /** * @cmd 00fe */ -bool aiKillBond(void) +bool ai_kill_bond(void) { g_Vars.bond->isdead = true; g_Vars.aioffset += 2; @@ -5790,9 +5790,9 @@ bool aiKillBond(void) /** * @cmd 00ff */ -bool aiBeSurprisedSurrender(void) +bool ai_be_surprised_surrender(void) { - chrTrySurprisedSurrender(g_Vars.chrdata); + chr_try_surprised_surrender(g_Vars.chrdata); g_Vars.aioffset += 2; return false; @@ -5801,7 +5801,7 @@ bool aiBeSurprisedSurrender(void) /** * @cmd 0100 */ -bool aiNoOp0100(void) +bool ai_noop_0100(void) { g_Vars.aioffset += 3; return false; @@ -5810,7 +5810,7 @@ bool aiNoOp0100(void) /** * @cmd 0101 */ -bool aiNoOp0101(void) +bool ai_noop_0101(void) { g_Vars.aioffset += 3; return false; @@ -5819,22 +5819,22 @@ bool aiNoOp0101(void) /** * @cmd 0102 */ -bool aiSetLights(void) +bool ai_set_lights(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 padnum = cmd[3] | (cmd[2] << 8); - s32 roomnum = chrGetPadRoom(g_Vars.chrdata, padnum); + s32 roomnum = chr_get_pad_room(g_Vars.chrdata, padnum); if (roomnum >= 0) { switch (cmd[4]) { case LIGHTOP_TURNOFF: - roomSetLightsOn(roomnum, false); + room_set_lights_on(roomnum, false); break; case LIGHTOP_TURNON: - roomSetLightsOn(roomnum, true); + room_set_lights_on(roomnum, true); break; default: - roomSetLightOp(roomnum, cmd[4], cmd[5], cmd[6], TICKS(cmd[7])); + room_set_light_op(roomnum, cmd[4], cmd[5], cmd[6], TICKS(cmd[7])); break; } } @@ -5847,11 +5847,11 @@ bool aiSetLights(void) /** * @cmd 0103 */ -bool aiIfPropPresetIsBlockingSightToTarget(void) +bool ai_if_prop_preset_is_blocking_sight_to_target(void) { - if (chrIsPropPresetBlockingSightToTarget(g_Vars.chrdata)) { + if (chr_is_prop_preset_blocking_sight_to_target(g_Vars.chrdata)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -5862,7 +5862,7 @@ bool aiIfPropPresetIsBlockingSightToTarget(void) /** * @cmd 0104 */ -bool aiRemoveObjectAtPropPreset(void) +bool ai_remove_object_at_prop_preset(void) { if (g_Vars.chrdata->proppreset1 >= 0) { struct defaultobj *obj = (g_Vars.props + g_Vars.chrdata->proppreset1)->obj; @@ -5878,7 +5878,7 @@ bool aiRemoveObjectAtPropPreset(void) /** * @cmd 0105 */ -bool aiIfPropPresetHeightLessThan(void) +bool ai_if_prop_preset_height_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; struct prop *prop = &g_Vars.props[g_Vars.chrdata->proppreset1]; @@ -5887,10 +5887,10 @@ bool aiIfPropPresetHeightLessThan(void) f32 ymin; f32 radius; - propGetBbox(prop, &radius, &ymax, &ymin); + prop_get_bbox(prop, &radius, &ymax, &ymin); if (ymax - ymin < value) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -5901,7 +5901,7 @@ bool aiIfPropPresetHeightLessThan(void) /** * @cmd 0106 */ -bool aiSetTarget(void) +bool ai_set_target(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; @@ -5909,9 +5909,9 @@ bool aiSetTarget(void) s16 newtarget; if (!cmd[3] && !cmd[4]) { - newtarget = propGetIndexByChrId(g_Vars.chrdata, cmd[2]); + newtarget = prop_get_index_by_chr_id(g_Vars.chrdata, cmd[2]); } else if (!cmd[4]) { - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); newtarget = chr->target; } @@ -5931,7 +5931,7 @@ bool aiSetTarget(void) g_Vars.chrdata->target = newtarget; } } else if (g_Vars.hovercar) { - chopperSetTarget(g_Vars.hovercar, cmd[2]); + chopper_set_target(g_Vars.hovercar, cmd[2]); } g_Vars.aioffset += 5; @@ -5942,17 +5942,17 @@ bool aiSetTarget(void) /** * @cmd 0107 */ -bool aiIfPresetsTargetIsNotMyTarget(void) +bool ai_if_presets_target_is_not_my_target(void) { s32 mypresetchrstarget; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.chrdata->chrpreset1 != -1) { - mypresetchrstarget = propGetIndexByChrId(g_Vars.chrdata, g_Vars.chrdata->chrpreset1); + mypresetchrstarget = prop_get_index_by_chr_id(g_Vars.chrdata, g_Vars.chrdata->chrpreset1); } if (g_Vars.chrdata->target != -1 && mypresetchrstarget != g_Vars.chrdata->target) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -5963,19 +5963,19 @@ bool aiIfPresetsTargetIsNotMyTarget(void) /** * @cmd 0108 */ -bool aiIfChrTarget(void) +bool ai_if_chr_target(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); bool pass = false; if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { // empty } else if (cmd[2] != CHR_BOND) { if (cmd[4] == 0) { - struct chrdata *chr2 = chrFindById(g_Vars.chrdata, cmd[3]); + struct chrdata *chr2 = chr_find_by_id(g_Vars.chrdata, cmd[3]); - if (chr2 && chr2->prop && chrGetTargetProp(chr) == chr2->prop) { + if (chr2 && chr2->prop && chr_get_target_prop(chr) == chr2->prop) { pass = true; } } else { @@ -5986,7 +5986,7 @@ bool aiIfChrTarget(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -5997,13 +5997,13 @@ bool aiIfChrTarget(void) /** * @cmd 0109 */ -bool aiSetChrPresetToChrNearSelf(void) +bool ai_set_chr_preset_to_chr_near_self(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[4] | (cmd[3] << 8)) * 10.0f; - if (chrSetChrPresetToChrNearSelf(cmd[2], g_Vars.chrdata, distance)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + if (chr_set_chr_preset_to_chr_near_self(cmd[2], g_Vars.chrdata, distance)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -6014,14 +6014,14 @@ bool aiSetChrPresetToChrNearSelf(void) /** * @cmd 010a */ -bool aiSetChrPresetToChrNearPad(void) +bool ai_set_chr_preset_to_chr_near_pad(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[4] | (cmd[3] << 8)) * 10.0f; u16 padnum = cmd[6] | (cmd[5] << 8); - if (chrSetChrPresetToChrNearPad(cmd[2], g_Vars.chrdata, distance, padnum)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + if (chr_set_chr_preset_to_chr_near_pad(cmd[2], g_Vars.chrdata, distance, padnum)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -6032,10 +6032,10 @@ bool aiSetChrPresetToChrNearPad(void) /** * @cmd 010b */ -bool aiChrSetTeam(void) +bool ai_chr_set_team(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { chr->team = cmd[3]; @@ -6049,18 +6049,18 @@ bool aiChrSetTeam(void) /** * @cmd 010c */ -bool aiIfCompareChrPresetsTeam(void) +bool ai_if_compare_chr_presets_team(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, CHR_PRESET); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, CHR_PRESET); if (!chr || (!chr->model && chr->prop->type != PROPTYPE_PLAYER)) { - chrSetChrPreset(g_Vars.chrdata, CHR_BOND); - chr = chrFindById(g_Vars.chrdata, CHR_PRESET); + chr_set_chr_preset(g_Vars.chrdata, CHR_BOND); + chr = chr_find_by_id(g_Vars.chrdata, CHR_PRESET); } - if (chrCompareTeams(chr, g_Vars.chrdata, cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_compare_teams(chr, g_Vars.chrdata, cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -6071,13 +6071,13 @@ bool aiIfCompareChrPresetsTeam(void) /** * @cmd 011e */ -bool aiIfHuman(void) +bool ai_if_human(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && CHRRACE(chr) == RACE_HUMAN) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -6088,13 +6088,13 @@ bool aiIfHuman(void) /** * @cmd 011f */ -bool aiIfSkedar(void) +bool ai_if_skedar(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && CHRRACE(chr) == RACE_SKEDAR) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -6105,21 +6105,21 @@ bool aiIfSkedar(void) /** * @cmd 0120 */ -bool aiIfSafety2LessThan(void) +bool ai_if_safety2_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u8 score; u8 numnearby; - s16 *chrnums = teamGetChrIds(g_Vars.chrdata->team); + s16 *chrnums = team_get_chr_ids(g_Vars.chrdata->team); score = 6; numnearby = 0; - if (chrGetNumArghs(g_Vars.chrdata) > 0) { + if (chr_get_num_arghs(g_Vars.chrdata) > 0) { score -= 2; } - switch (bgunGetWeaponNum(HAND_RIGHT)) { + switch (bgun_get_weapon_num(HAND_RIGHT)) { case WEAPON_FALCON2: case WEAPON_FALCON2_SILENCER: case WEAPON_FALCON2_SCOPE: @@ -6156,15 +6156,15 @@ bool aiIfSafety2LessThan(void) } while (*chrnums != -2) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); if (chr && chr->model - && !chrIsDead(chr) + && !chr_is_dead(chr) && chr->actiontype != ACT_DEAD && chr->alertness > 100 && g_Vars.chrdata->squadron == chr->squadron && g_Vars.chrdata->chrnum != chr->chrnum - && chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum) < 3500) { + && chr_get_distance_to_chr(g_Vars.chrdata, chr->chrnum) < 3500) { numnearby++; } @@ -6182,7 +6182,7 @@ bool aiIfSafety2LessThan(void) } if (score < cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -6193,13 +6193,13 @@ bool aiIfSafety2LessThan(void) /** * @cmd 0121 */ -bool aiFindCover(void) +bool ai_find_cover(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 criteria = cmd[3] | (cmd[2] << 8); - if (g_Vars.chrdata && g_Vars.chrdata->prop && chrAssignCoverByCriteria(g_Vars.chrdata, criteria, 0) != -1) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (g_Vars.chrdata && g_Vars.chrdata->prop && chr_assign_cover_by_criteria(g_Vars.chrdata, criteria, 0) != -1) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -6210,14 +6210,14 @@ bool aiFindCover(void) /** * @cmd 0122 */ -bool aiFindCoverWithinDist(void) +bool ai_find_cover_within_dist(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 criteria = cmd[3] | (cmd[2] << 8); u32 flags = (cmd[5] << 16) | (cmd[6] << 8) | cmd[7] | (cmd[4] << 24); - if (g_Vars.chrdata && g_Vars.chrdata->prop && chrAssignCoverByCriteria(g_Vars.chrdata, criteria, flags) != -1) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[8]); + if (g_Vars.chrdata && g_Vars.chrdata->prop && chr_assign_cover_by_criteria(g_Vars.chrdata, criteria, flags) != -1) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[8]); } else { g_Vars.aioffset += 9; } @@ -6228,14 +6228,14 @@ bool aiFindCoverWithinDist(void) /** * @cmd 0123 */ -bool aiFindCoverOutsideDist(void) +bool ai_find_cover_outside_dist(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 criteria = cmd[3] | (cmd[2] << 8); u32 flags = (cmd[5] << 16) | (cmd[6] << 8) | cmd[7] | (cmd[4] << 24); - if (g_Vars.chrdata && g_Vars.chrdata->prop && chrAssignCoverByCriteria(g_Vars.chrdata, criteria, -flags) != -1) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[8]); + if (g_Vars.chrdata && g_Vars.chrdata->prop && chr_assign_cover_by_criteria(g_Vars.chrdata, criteria, -flags) != -1) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[8]); } else { g_Vars.aioffset += 9; } @@ -6246,10 +6246,10 @@ bool aiFindCoverOutsideDist(void) /** * @cmd 0124 */ -bool aiGoToCover(void) +bool ai_go_to_cover(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - chrGoToCover(g_Vars.chrdata, cmd[2]); + chr_go_to_cover(g_Vars.chrdata, cmd[2]); g_Vars.aioffset += 3; return false; @@ -6258,12 +6258,12 @@ bool aiGoToCover(void) /** * @cmd 0125 */ -bool aiCheckCoverOutOfSight(void) +bool ai_check_cover_out_of_sight(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrCheckCoverOutOfSight(g_Vars.chrdata, g_Vars.chrdata->cover, false)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (chr_check_cover_out_of_sight(g_Vars.chrdata, g_Vars.chrdata->cover, false)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -6274,15 +6274,15 @@ bool aiCheckCoverOutOfSight(void) /** * @cmd 0126 */ -bool aiIfPlayerUsingCmpOrAr34(void) +bool ai_if_player_using_cmp_or_ar34(void) { u32 hand = HAND_RIGHT; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - switch (bgunGetWeaponNum(hand)) { + switch (bgun_get_weapon_num(hand)) { case WEAPON_CMP150: case WEAPON_AR34: - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); break; default: g_Vars.aioffset += 3; @@ -6295,7 +6295,7 @@ bool aiIfPlayerUsingCmpOrAr34(void) /** * @cmd 0127 */ -bool aiDetectEnemyOnSameFloor(void) +bool ai_detect_enemy_on_same_floor(void) { \ s32 team = 0; f32 closestdist = 9999.9; @@ -6304,7 +6304,7 @@ bool aiDetectEnemyOnSameFloor(void) f32 y; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 scandist; - s16 *chrnums = teamGetChrIds(1); + s16 *chrnums = team_get_chr_ids(1); struct chrdata *chr; s16 newtarget = -1; @@ -6319,17 +6319,17 @@ bool aiDetectEnemyOnSameFloor(void) y = g_Vars.chrdata->prop->pos.y; while (team < 8) { - chr = chrFindByLiteralId(*chrnums); + chr = chr_find_by_literal_id(*chrnums); if (*chrnums != -2) { if (chr && chr->prop && chr->team != TEAM_NONCOMBAT - && !chrIsDead(chr) + && !chr_is_dead(chr) && chr->actiontype != ACT_DEAD && chr->actiontype != ACT_DRUGGEDKO && chr->actiontype != ACT_DRUGGEDDROP && chr->actiontype != ACT_DRUGGEDCOMINGUP - && chrCompareTeams(g_Vars.chrdata, chr, COMPARE_ENEMIES) + && chr_compare_teams(g_Vars.chrdata, chr, COMPARE_ENEMIES) && (chr->hidden & CHRHFLAG_CLOAKED) == 0 && (chr->chrflags & CHRCFLAG_HIDDEN) == 0 && (chr->hidden & CHRHFLAG_ANTINONINTERACTABLE) == 0 @@ -6339,10 +6339,10 @@ bool aiDetectEnemyOnSameFloor(void) || (chr->hidden & CHRHFLAG_ANTINONINTERACTABLE) == 0 || (chr->hidden & CHRHFLAG_DONTSHOOTME)) && g_Vars.chrdata->chrnum != chr->chrnum) { - distance = chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum); + distance = chr_get_distance_to_chr(g_Vars.chrdata, chr->chrnum); if (distance < closestdist) { - if (distance < scandist || stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MAIANSOS) { + if (distance < scandist || stage_get_index(g_Vars.stagenum) == STAGEINDEX_MAIANSOS) { if (distance < closestdist) { closestdist = distance; newtarget = chr->chrnum; @@ -6359,8 +6359,8 @@ bool aiDetectEnemyOnSameFloor(void) } if (newtarget != -1) { - g_Vars.chrdata->target = propGetIndexByChrId(g_Vars.chrdata, newtarget); - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.chrdata->target = prop_get_index_by_chr_id(g_Vars.chrdata, newtarget); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset = g_Vars.aioffset + 3; } @@ -6371,7 +6371,7 @@ bool aiDetectEnemyOnSameFloor(void) /** * @cmd 0128 */ -bool aiDetectEnemy(void) +bool ai_detect_enemy(void) { s16 *chrnums; s32 team = 0; @@ -6381,7 +6381,7 @@ bool aiDetectEnemy(void) f32 maxdist = (s32)cmd[2] * 10.0f; s16 closesttarg = -1; - chrnums = teamGetChrIds(1); + chrnums = team_get_chr_ids(1); if (!g_Vars.chrdata) { g_Vars.aioffset = g_Vars.aioffset + 4; @@ -6394,7 +6394,7 @@ bool aiDetectEnemy(void) * chr's current team the inner loop won't iterate so the outer loop handles * it. * - * The chrnums list returned by teamGetChrIds is an array of chrnums in + * The chrnums list returned by team_get_chr_ids is an array of chrnums in * team 1 terminated by a -2, then an array of chrnums in team 2 terminated * by -2, and so on. */ @@ -6402,16 +6402,16 @@ bool aiDetectEnemy(void) u8 teamvalue = (1 << team); while (*chrnums != -2 && g_Vars.chrdata->team != teamvalue) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); if (chr && chr->prop - && !chrIsDead(chr) + && !chr_is_dead(chr) && chr->actiontype != ACT_DEAD && chr->actiontype != ACT_DIE && chr->actiontype != ACT_DRUGGEDKO && chr->actiontype != ACT_DRUGGEDDROP && chr->actiontype != ACT_DRUGGEDCOMINGUP - && chrCompareTeams(g_Vars.chrdata, chr, COMPARE_ENEMIES) + && chr_compare_teams(g_Vars.chrdata, chr, COMPARE_ENEMIES) && chr != g_Vars.chrdata && (chr->hidden & CHRHFLAG_CLOAKED) == 0 && (chr->chrflags & CHRCFLAG_HIDDEN) == 0 @@ -6421,19 +6421,19 @@ bool aiDetectEnemy(void) (g_Vars.chrdata->hidden & CHRHFLAG_PSYCHOSISED) == 0 || (chr->hidden & CHRHFLAG_ANTINONINTERACTABLE) == 0 || (chr->hidden & CHRHFLAG_DONTSHOOTME))) { - f32 distance = chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum); + f32 distance = chr_get_distance_to_chr(g_Vars.chrdata, chr->chrnum); if (distance < maxdist && distance != 0 && distance < closestdist - && chrHasLosToProp(g_Vars.chrdata, chr->prop) + && chr_has_los_to_prop(g_Vars.chrdata, chr->prop) && (chr->chrflags & CHRCFLAG_HIDDEN) == 0) { if (g_Vars.chrdata->yvisang == 0) { closestdist = distance; closesttarg = chr->chrnum; } else { s16 prevtarget = g_Vars.chrdata->target; - g_Vars.chrdata->target = propGetIndexByChrId(g_Vars.chrdata, chr->chrnum); + g_Vars.chrdata->target = prop_get_index_by_chr_id(g_Vars.chrdata, chr->chrnum); - if (chrIsVerticalAngleToTargetWithin(g_Vars.chrdata, g_Vars.chrdata->yvisang)) { + if (chr_is_vertical_angle_to_target_within(g_Vars.chrdata, g_Vars.chrdata->yvisang)) { closestdist = distance; closesttarg = chr->chrnum; } @@ -6457,8 +6457,8 @@ bool aiDetectEnemy(void) } while (team < 8); if (closesttarg != -1) { - g_Vars.chrdata->target = propGetIndexByChrId(g_Vars.chrdata, closesttarg); - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.chrdata->target = prop_get_index_by_chr_id(g_Vars.chrdata, closesttarg); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset = g_Vars.aioffset + 4; } @@ -6469,25 +6469,25 @@ bool aiDetectEnemy(void) /** * @cmd 0129 */ -bool aiIfSafetyLessThan(void) +bool ai_if_safety_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - s16 *chrnums = teamGetChrIds(g_Vars.chrdata->team); + s16 *chrnums = team_get_chr_ids(g_Vars.chrdata->team); u8 safety = 6; u8 numnearby = 0; - if (chrGetNumArghs(g_Vars.chrdata) > 0) { + if (chr_get_num_arghs(g_Vars.chrdata) > 0) { safety--; } while (*chrnums != -2) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); if (chr && chr->model - && !chrIsDead(chr) + && !chr_is_dead(chr) && chr->actiontype != ACT_DEAD && g_Vars.chrdata->chrnum != chr->chrnum - && chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum) < 3500) { + && chr_get_distance_to_chr(g_Vars.chrdata, chr->chrnum) < 3500) { numnearby++; } @@ -6501,7 +6501,7 @@ bool aiIfSafetyLessThan(void) } if (safety < cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -6512,23 +6512,23 @@ bool aiIfSafetyLessThan(void) /** * @cmd 012a */ -bool aiIfTargetMovingSlowly(void) +bool ai_if_target_moving_slowly(void) { s32 delta; s32 absdelta; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (cmd[2] == 0) { - delta = chrGetDistanceLostToTargetInLastSecond(g_Vars.chrdata); + delta = chr_get_distance_lost_to_target_in_last_second(g_Vars.chrdata); } else { - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); - delta = chrGetDistanceLostToTargetInLastSecond(chr); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); + delta = chr_get_distance_lost_to_target_in_last_second(chr); } absdelta = delta > 0 ? delta : -delta; if (absdelta < 50) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -6539,12 +6539,12 @@ bool aiIfTargetMovingSlowly(void) /** * @cmd 012b */ -bool aiIfTargetMovingCloser(void) +bool ai_if_target_moving_closer(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGetDistanceLostToTargetInLastSecond(g_Vars.chrdata) < -50) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (chr_get_distance_lost_to_target_in_last_second(g_Vars.chrdata) < -50) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -6555,12 +6555,12 @@ bool aiIfTargetMovingCloser(void) /** * @cmd 012c */ -bool aiIfTargetMovingAway(void) +bool ai_if_target_moving_away(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrGetDistanceLostToTargetInLastSecond(g_Vars.chrdata) > 50) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (chr_get_distance_lost_to_target_in_last_second(g_Vars.chrdata) > 50) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -6574,7 +6574,7 @@ bool aiIfTargetMovingAway(void) bool ai012f(void) { if (g_Vars.chrdata->cover >= 0) { - coverSetInUse(g_Vars.chrdata->cover, 0); + cover_set_in_use(g_Vars.chrdata->cover, 0); } g_Vars.aioffset += 2; @@ -6860,7 +6860,7 @@ s16 g_MaianQuipBank[][4] = { /** * @cmd 0130 */ -bool aiSayQuip(void) +bool ai_say_quip(void) { u8 column; s16 audioid; @@ -6873,7 +6873,7 @@ bool aiSayQuip(void) s16 *chrnums; s16 *bank; char *text; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); u32 prevplayernum = g_Vars.currentplayernum; s32 distance; s32 row = cmd[3]; @@ -6915,7 +6915,7 @@ bool aiSayQuip(void) return false; } - chrnums = teamGetChrIds(g_Vars.chrdata->team); + chrnums = team_get_chr_ids(g_Vars.chrdata->team); numnearbychrs = 0; issomeonetalking = false; probability = cmd[4]; @@ -6932,7 +6932,7 @@ bool aiSayQuip(void) // If the person talking is a player, and they've just died, // try using the other coop player. if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { - playernum = playermgrGetPlayerNumByProp(chr->prop); + playernum = playermgr_get_player_num_by_prop(chr->prop); if (g_Vars.coopplayernum >= 0 && g_Vars.players[playernum]->isdead) { if (playernum == g_Vars.bondplayernum) { @@ -6942,7 +6942,7 @@ bool aiSayQuip(void) } } - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); } // If soundgap permits talking at this time and probability passes @@ -6950,15 +6950,15 @@ bool aiSayQuip(void) if (probability > (s32) (random() % 256)) { // Try and find a chr in the same squadron who is currently talking while (*chrnums != -2) { - loopchr = chrFindByLiteralId(*chrnums); + loopchr = chr_find_by_literal_id(*chrnums); if (loopchr && loopchr->model - && !chrIsDead(loopchr) + && !chr_is_dead(loopchr) && loopchr->actiontype != ACT_DEAD && g_Vars.chrdata->squadron == loopchr->squadron && loopchr->alertness >= 100 && g_Vars.chrdata->chrnum != loopchr->chrnum - && chrGetDistanceToChr(g_Vars.chrdata, loopchr->chrnum) < 7000) { + && chr_get_distance_to_chr(g_Vars.chrdata, loopchr->chrnum) < 7000) { numnearbychrs++; if (loopchr->soundtimer < TICKS(60) && cmd[6] != 0 && cmd[6] != 255) { @@ -6980,8 +6980,8 @@ bool aiSayQuip(void) audioid = rowptr[1 + g_Vars.chrdata->tude]; } - if (audioWasNotPlayedRecently(audioid) || CHRRACE(g_Vars.chrdata) == RACE_SKEDAR) { - audioMarkAsRecentlyPlayed(audioid); + if (audio_was_not_played_recently(audioid) || CHRRACE(g_Vars.chrdata) == RACE_SKEDAR) { + audio_mark_as_recently_played(audioid); if (audioid == SFX_M1_CHOKING && !headshotted) { audioid = SFX_M1_WHY_ME; @@ -6992,15 +6992,15 @@ bool aiSayQuip(void) g_Vars.chrdata->propsoundcount++; if (!AUDIO_NEEDS_MOVEMENT(audioid)) { - psStopSound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); - psCreate(0, g_Vars.chrdata->prop, audioid, -1, + ps_stop_sound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); + ps_create(0, g_Vars.chrdata->prop, audioid, -1, -1, PSFLAG_FORPROP, 0, PSTYPE_CHRTALK, 0, -1, 0, -1, -1, -1, -1); } else { - distance = chrGetDistanceLostToTargetInLastSecond(g_Vars.chrdata); + distance = chr_get_distance_lost_to_target_in_last_second(g_Vars.chrdata); if (ABS(distance) > 50) { - psStopSound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); - psCreate(0, g_Vars.chrdata->prop, audioid, -1, + ps_stop_sound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); + ps_create(0, g_Vars.chrdata->prop, audioid, -1, -1, PSFLAG_FORPROP, 0, PSTYPE_CHRTALK, 0, -1, 0, -1, -1, -1, -1); } } @@ -7013,22 +7013,22 @@ bool aiSayQuip(void) column = 2; } - text = langGet(g_QuipTexts[cmd[8] - 1][1 + column]); + text = lang_get(g_QuipTexts[cmd[8] - 1][1 + column]); #if VERSION >= VERSION_NTSC_1_0 - if (!sndIsFiltered(audioid)) + if (!snd_is_filtered(audioid)) #endif { - hudmsgCreateWithColour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]); + hudmsg_create_with_colour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]); } } else if (cmd[8]) { - text = langGet(g_QuipTexts[cmd[8] - 1][1 + g_Vars.chrdata->tude]); + text = lang_get(g_QuipTexts[cmd[8] - 1][1 + g_Vars.chrdata->tude]); #if VERSION >= VERSION_NTSC_1_0 - if (!sndIsFiltered(audioid)) + if (!snd_is_filtered(audioid)) #endif { - hudmsgCreateWithColour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]); + hudmsg_create_with_colour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]); } } } else { @@ -7036,15 +7036,15 @@ bool aiSayQuip(void) audioid = 0; for (i = 1; i < ARRAYCOUNT(g_GuardQuipBank[row]); i++) { - if (audioWasNotPlayedRecently(g_GuardQuipBank[row][i]) - && audioWasNotPlayedRecently(rowptr[i])) { + if (audio_was_not_played_recently(g_GuardQuipBank[row][i]) + && audio_was_not_played_recently(rowptr[i])) { audioid = rowptr[i]; break; } } if (audioid) { - audioMarkAsRecentlyPlayed(audioid); + audio_mark_as_recently_played(audioid); if (audioid == SFX_M1_CHOKING && !headshotted) { audioid = SFX_M1_WHY_ME; @@ -7055,47 +7055,47 @@ bool aiSayQuip(void) g_Vars.chrdata->propsoundcount++; if (!AUDIO_NEEDS_MOVEMENT(audioid)) { - psStopSound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); - psCreate(0, g_Vars.chrdata->prop, audioid, -1, + ps_stop_sound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); + ps_create(0, g_Vars.chrdata->prop, audioid, -1, -1, PSFLAG_FORPROP, 0, PSTYPE_CHRTALK, 0, -1, 0, -1, -1, -1, -1); } else { - distance = chrGetDistanceLostToTargetInLastSecond(g_Vars.chrdata); + distance = chr_get_distance_lost_to_target_in_last_second(g_Vars.chrdata); if (ABS(distance) > 50) { - psStopSound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); - psCreate(0, g_Vars.chrdata->prop, audioid, -1, + ps_stop_sound(g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0xffff); + ps_create(0, g_Vars.chrdata->prop, audioid, -1, -1, PSFLAG_FORPROP, 0, PSTYPE_CHRTALK, 0, -1, 0, -1, -1, -1, -1); } } if (cmd[8]) { - text = langGet(g_QuipTexts[cmd[8] - 1][i]); + text = lang_get(g_QuipTexts[cmd[8] - 1][i]); #if VERSION >= VERSION_NTSC_1_0 - if (!sndIsFiltered(audioid)) + if (!snd_is_filtered(audioid)) #endif { - hudmsgCreateWithColour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]); + hudmsg_create_with_colour(text, HUDMSGTYPE_INGAMESUBTITLE, cmd[9]); } } } else { g_Vars.chrdata->soundtimer = 0; g_Vars.chrdata->soundgap = cmd[5]; - chrUnsetFlags(g_Vars.chrdata, CHRFLAG1_TALKINGTODISGUISE, BANK_1); + chr_unset_flags(g_Vars.chrdata, CHRFLAG1_TALKINGTODISGUISE, BANK_1); } } } } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); g_Vars.aioffset += 10; return false; } -void propDecrementSoundCount(struct prop *prop) +void prop_decrement_sound_count(struct prop *prop) { if (prop && prop->chr && prop->chr->model && prop->chr->propsoundcount > 0) { prop->chr->propsoundcount--; @@ -7105,13 +7105,13 @@ void propDecrementSoundCount(struct prop *prop) /** * @cmd 01a7 */ -bool aiIfChrNotTalking(void) +bool ai_if_chr_not_talking(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindByLiteralId(cmd[2]); + struct chrdata *chr = chr_find_by_literal_id(cmd[2]); if (chr && chr->propsoundcount == 0) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset = g_Vars.aioffset + 4; } @@ -7122,22 +7122,22 @@ bool aiIfChrNotTalking(void) /** * @cmd 0131 */ -bool aiIncreaseSquadronAlertness(void) +bool ai_increase_squadron_alertness(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - s16 *chrnums = teamGetChrIds(g_Vars.chrdata->team); + s16 *chrnums = team_get_chr_ids(g_Vars.chrdata->team); for (; *chrnums != -2; chrnums++) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); if (chr && chr->model && - !chrIsDead(chr) && + !chr_is_dead(chr) && chr->actiontype != ACT_DEAD && (g_Vars.chrdata->squadron == chr->squadron || g_Vars.chrdata->squadron == 255) && g_Vars.chrdata->chrnum != chr->chrnum && - (chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum) < 1000 || chrHasFlag(g_Vars.chrdata, CHRFLAG0_SQUADALERTANYDIST, BANK_0))) { - incrementByte(&chr->alertness, cmd[2]); + (chr_get_distance_to_chr(g_Vars.chrdata, chr->chrnum) < 1000 || chr_has_flag(g_Vars.chrdata, CHRFLAG0_SQUADALERTANYDIST, BANK_0))) { + increment_byte(&chr->alertness, cmd[2]); } } @@ -7149,7 +7149,7 @@ bool aiIncreaseSquadronAlertness(void) /** * @cmd 0132 */ -bool aiSetAction(void) +bool ai_set_action(void) { struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); g_Vars.chrdata->myaction = cmd->b2; @@ -7166,7 +7166,7 @@ bool aiSetAction(void) /** * @cmd 0133 */ -bool aiSetTeamOrders(void) +bool ai_set_team_orders(void) { struct chrnumaction *chraction; s32 chrcount = 1; @@ -7177,7 +7177,7 @@ bool aiSetTeamOrders(void) u8 *cmd = g_Vars.ailist + g_Vars.aioffset; // Get list of chrs in the current chr's squadron - chrnums = squadronGetChrIds(g_Vars.chrdata->squadron); + chrnums = squadron_get_chr_ids(g_Vars.chrdata->squadron); // Iterate chrs in squadron and build list of their actions. // Put the current chr's action first. @@ -7188,18 +7188,18 @@ bool aiSetTeamOrders(void) if (chrnums) { while (*chrnums != -2) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); if (chr && chr->model - && !chrIsDead(chr) + && !chr_is_dead(chr) && chr->actiontype != ACT_DEAD - && chrCompareTeams(g_Vars.chrdata, chr, COMPARE_FRIENDS) + && chr_compare_teams(g_Vars.chrdata, chr, COMPARE_FRIENDS) && g_Vars.chrdata->chrnum != chr->chrnum) { if (chr->myaction == MA_COVERWAIT || chr->myaction == MA_NORMAL || chr->myaction == MA_WAITING || chr->myaction == MA_SHOOTING) { - if (chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum) < 3500) { + if (chr_get_distance_to_chr(g_Vars.chrdata, chr->chrnum) < 3500) { chrcount++; chraction->chrnum = chr->chrnum; chraction->myaction = chr->myaction; @@ -7221,29 +7221,29 @@ bool aiSetTeamOrders(void) num = 1; while (chraction->myaction != MA_END) { - struct chrdata *chr = chrFindByLiteralId(chraction->chrnum); + struct chrdata *chr = chr_find_by_literal_id(chraction->chrnum); switch (chractions[0].myaction) { case MA_COVERGOTO: - if (!chrIsInTargetsFovX(chr, 45)) { + if (!chr_is_in_targets_fov_x(chr, 45)) { chr->orders = MA_SHOOTING; } break; case MA_COVERBREAK: - if (!chrIsInTargetsFovX(chr, 30)) { + if (!chr_is_in_targets_fov_x(chr, 30)) { chr->orders = MA_SHOOTING; } num++; break; case MA_COVERSEEN: - if (!chrIsInTargetsFovX(chr, 30)) { + if (!chr_is_in_targets_fov_x(chr, 30)) { chr->orders = MA_SHOOTING; g_Vars.chrdata->orders = MA_COVERGOTO; } num++; break; case MA_FLANKLEFT: - if (chrIsInTargetsFovX(chr, 50)) { + if (chr_is_in_targets_fov_x(chr, 50)) { chr->orders = MA_FLANKRIGHT; } else { chr->orders = MA_SHOOTING; @@ -7252,7 +7252,7 @@ bool aiSetTeamOrders(void) g_Vars.chrdata->orders = MA_FLANKLEFT; break; case MA_FLANKRIGHT: - if (chrIsInTargetsFovX(chr, 50)) { + if (chr_is_in_targets_fov_x(chr, 50)) { chr->orders = MA_FLANKLEFT; } else { chr->orders = MA_SHOOTING; @@ -7261,8 +7261,8 @@ bool aiSetTeamOrders(void) g_Vars.chrdata->orders = MA_FLANKRIGHT; break; case MA_DODGE: - if (!chrIsInTargetsFovX(chr, 30) && - chrHasFlagById(chr, CHR_SELF, CHRFLAG0_CAN_BACKOFF, BANK_0)) { + if (!chr_is_in_targets_fov_x(chr, 30) && + chr_has_flag_by_id(chr, CHR_SELF, CHRFLAG0_CAN_BACKOFF, BANK_0)) { chr->orders = MA_WITHDRAW; } else { chr->orders = MA_SHOOTING; @@ -7272,14 +7272,14 @@ bool aiSetTeamOrders(void) case MA_GRENADE: if (num < 2) { chr->orders = MA_WAITING; - } else if (chrHasFlagById(chr, CHR_SELF, CHRFLAG0_CAN_BACKOFF, BANK_0)) { + } else if (chr_has_flag_by_id(chr, CHR_SELF, CHRFLAG0_CAN_BACKOFF, BANK_0)) { chr->orders = MA_WITHDRAW; } num++; break; case MA_WAITSEEN: - if (chrIsInTargetsFovX(chr, 30) && - chrHasFlagById(chr, CHR_SELF, CHRFLAG0_CAN_BACKOFF, BANK_0)) { + if (chr_is_in_targets_fov_x(chr, 30) && + chr_has_flag_by_id(chr, CHR_SELF, CHRFLAG0_CAN_BACKOFF, BANK_0)) { chr->orders = MA_WITHDRAW; } else { chr->orders = MA_SHOOTING; @@ -7287,7 +7287,7 @@ bool aiSetTeamOrders(void) num++; break; case MA_WITHDRAW: - if (chrHasFlagById(chr, CHR_SELF, CHRFLAG0_CAN_BACKOFF, BANK_0)) { + if (chr_has_flag_by_id(chr, CHR_SELF, CHRFLAG0_CAN_BACKOFF, BANK_0)) { chr->orders = MA_WITHDRAW; } break; @@ -7297,7 +7297,7 @@ bool aiSetTeamOrders(void) } if (num != 1) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -7311,12 +7311,12 @@ bool aiSetTeamOrders(void) /** * @cmd 0134 */ -bool aiIfOrders(void) +bool ai_if_orders(void) { struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); if (g_Vars.chrdata->orders == cmd->b3) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b4); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b4); if (g_Vars.chrdata->orders == MA_WITHDRAW) { // empty @@ -7331,12 +7331,12 @@ bool aiIfOrders(void) /** * @cmd 0135 */ -bool aiIfHasOrders(void) +bool ai_if_has_orders(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.chrdata->orders) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -7347,22 +7347,22 @@ bool aiIfHasOrders(void) /** * @cmd 0136 */ -bool aiRetreat(void) +bool ai_retreat(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (cmd[3] == 0) { - chrRunFromPos(g_Vars.chrdata, cmd[2], (cmd[2] & 0x10) ? 400.0f : 10000.0f, &g_Vars.chrdata->runfrompos); + chr_run_from_pos(g_Vars.chrdata, cmd[2], (cmd[2] & 0x10) ? 400.0f : 10000.0f, &g_Vars.chrdata->runfrompos); } else if (cmd[3] == 1) { - struct prop *target = chrGetTargetProp(g_Vars.chrdata); - chrRunFromPos(g_Vars.chrdata, cmd[2], 10000, &target->pos); + struct prop *target = chr_get_target_prop(g_Vars.chrdata); + chr_run_from_pos(g_Vars.chrdata, cmd[2], 10000, &target->pos); } else { - chrAssignCoverByCriteria(g_Vars.chrdata, + chr_assign_cover_by_criteria(g_Vars.chrdata, COVERCRITERIA_FURTHEREST | COVERCRITERIA_DISTTOTARGET | COVERCRITERIA_ONLYNEIGHBOURINGROOMS | COVERCRITERIA_ROOMSFROMME, 0); - chrGoToCover(g_Vars.chrdata, cmd[2]); + chr_go_to_cover(g_Vars.chrdata, cmd[2]); } g_Vars.aioffset += 4; @@ -7373,22 +7373,22 @@ bool aiRetreat(void) /** * @cmd 0137 */ -bool aiIfChrInSquadronDoingAction(void) +bool ai_if_chr_in_squadron_doing_action(void) { s32 ret; - s16 *chrnums = squadronGetChrIds(g_Vars.chrdata->squadron); + s16 *chrnums = squadron_get_chr_ids(g_Vars.chrdata->squadron); struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); ret = 1; if (chrnums) { for (; *chrnums != -2; chrnums++) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); - if (chr && chr->model && chrIsDead(chr) == false && + if (chr && chr->model && chr_is_dead(chr) == false && chr->actiontype != ACT_DEAD && - chrCompareTeams(g_Vars.chrdata, chr, COMPARE_FRIENDS) && + chr_compare_teams(g_Vars.chrdata, chr, COMPARE_FRIENDS) && g_Vars.chrdata->chrnum != chr->chrnum && - chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum) < 3500 && + chr_get_distance_to_chr(g_Vars.chrdata, chr->chrnum) < 3500 && chr->myaction == cmd->b2) { ret = 2; break; @@ -7397,7 +7397,7 @@ bool aiIfChrInSquadronDoingAction(void) } if (ret != 1) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b3); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b3); } else { g_Vars.aioffset += 4; } @@ -7424,22 +7424,22 @@ bool ai0139(void) /** * @cmd 013a */ -bool aiSetChrPresetToUnalertedTeammate(void) +bool ai_set_chr_preset_to_unalerted_teammate(void) { f32 closest_distance = 30999.9; s16 candidate_chrnum = -1; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - s16 *chrnums = teamGetChrIds(g_Vars.chrdata->team); + s16 *chrnums = team_get_chr_ids(g_Vars.chrdata->team); if (g_Vars.chrdata->talktimer > TICKS(480) && g_Vars.chrdata->listening) { g_Vars.chrdata->listening = 0; } for (; *chrnums != -2; chrnums++) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); if (cmd[3] == 0 && chr && chr->model && - chrIsDead(chr) == false && + chr_is_dead(chr) == false && chr->actiontype != ACT_DEAD && chr->actiontype != ACT_DIE && chr->actiontype != ACT_DRUGGEDKO && @@ -7449,7 +7449,7 @@ bool aiSetChrPresetToUnalertedTeammate(void) (g_Vars.chrdata->squadron == chr->squadron || g_Vars.chrdata->squadron == 0xff) && g_Vars.chrdata->chrnum != chr->chrnum) { - f32 distance = chrGetDistanceToChr(g_Vars.chrdata, chr->chrnum); + f32 distance = chr_get_distance_to_chr(g_Vars.chrdata, chr->chrnum); if (distance < closest_distance && (distance < 100.0f * (s32)cmd[2] || cmd[2] == 0) && @@ -7466,8 +7466,8 @@ bool aiSetChrPresetToUnalertedTeammate(void) } if (candidate_chrnum != -1) { - chrSetChrPreset(g_Vars.chrdata, candidate_chrnum); - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + chr_set_chr_preset(g_Vars.chrdata, candidate_chrnum); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -7478,7 +7478,7 @@ bool aiSetChrPresetToUnalertedTeammate(void) /** * @cmd 013b */ -bool aiSetSquadron(void) +bool ai_set_squadron(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.chrdata->squadron = cmd[2]; @@ -7490,12 +7490,12 @@ bool aiSetSquadron(void) /** * @cmd 013c */ -bool aiFaceCover(void) +bool ai_face_cover(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrFaceCover(g_Vars.chrdata)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (chr_face_cover(g_Vars.chrdata)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -7506,12 +7506,12 @@ bool aiFaceCover(void) /** * @cmd 013d */ -bool aiIfDangerousObjectNearby(void) +bool ai_if_dangerous_object_nearby(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrDetectDangerousObject(g_Vars.chrdata, cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (chr_detect_dangerous_object(g_Vars.chrdata, cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -7524,8 +7524,8 @@ bool aiIfDangerousObjectNearby(void) */ bool ai013e(void) { - if (func0f03aca0(g_Vars.chrdata, 400, true) == 0 && chrAssignCoverAwayFromDanger(g_Vars.chrdata, 1000, 12000) != -1) { - chrGoToCover(g_Vars.chrdata, GOPOSFLAG_RUN); + if (func0f03aca0(g_Vars.chrdata, 400, true) == 0 && chr_assign_cover_away_from_danger(g_Vars.chrdata, 1000, 12000) != -1) { + chr_go_to_cover(g_Vars.chrdata, GOPOSFLAG_RUN); } g_Vars.aioffset += 2; @@ -7536,13 +7536,13 @@ bool ai013e(void) /** * @cmd 013f */ -bool aiIfHeliWeaponsArmed(void) +bool ai_if_heli_weapons_armed(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.hovercar) { if (g_Vars.hovercar->weaponsarmed) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -7556,14 +7556,14 @@ bool aiIfHeliWeaponsArmed(void) /** * @cmd 0140 */ -bool aiIfHoverbotNextStep(void) +bool ai_if_hoverbot_next_step(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.hovercar) { if ((g_Vars.hovercar->nextstep > cmd[3] && cmd[2] == 1) || (g_Vars.hovercar->nextstep < cmd[3] && cmd[2] == 0)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -7577,7 +7577,7 @@ bool aiIfHoverbotNextStep(void) /** * @cmd 0141 */ -bool aiShuffleInvestigationTerminals(void) +bool ai_shuffle_investigation_terminals(void) { // 2 = goodtag // 3 = badtag @@ -7590,8 +7590,8 @@ bool aiShuffleInvestigationTerminals(void) u8 rand1; u8 rand2; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct tag *goodtag = tagFindById(cmd[2]); - struct tag *badtag = tagFindById(cmd[3]); + struct tag *goodtag = tag_find_by_id(cmd[2]); + struct tag *badtag = tag_find_by_id(cmd[3]); struct tag *pc; /** @@ -7605,19 +7605,19 @@ bool aiShuffleInvestigationTerminals(void) if (cmd[8] == 0) { // Place the good terminal if (rand1 == 0) { - pc = tagFindById(cmd[4]); + pc = tag_find_by_id(cmd[4]); goodtag->cmdoffset = pc->cmdoffset; goodtag->obj = pc->obj; } else if (rand1 == 1) { - pc = tagFindById(cmd[5]); + pc = tag_find_by_id(cmd[5]); goodtag->cmdoffset = pc->cmdoffset; goodtag->obj = pc->obj; } else if (rand1 == 2) { - pc = tagFindById(cmd[6]); + pc = tag_find_by_id(cmd[6]); goodtag->cmdoffset = pc->cmdoffset; goodtag->obj = pc->obj; } else { - pc = tagFindById(cmd[7]); + pc = tag_find_by_id(cmd[7]); goodtag->cmdoffset = pc->cmdoffset; goodtag->obj = pc->obj; } @@ -7631,19 +7631,19 @@ bool aiShuffleInvestigationTerminals(void) // Place the alarm terminal if (rand2 == 0) { - pc = tagFindById(cmd[4]); + pc = tag_find_by_id(cmd[4]); badtag->cmdoffset = pc->cmdoffset; badtag->obj = pc->obj; } else if (rand2 == 1) { - pc = tagFindById(cmd[5]); + pc = tag_find_by_id(cmd[5]); badtag->cmdoffset = pc->cmdoffset; badtag->obj = pc->obj; } else if (rand2 == 2) { - pc = tagFindById(cmd[6]); + pc = tag_find_by_id(cmd[6]); badtag->cmdoffset = pc->cmdoffset; badtag->obj = pc->obj; } else { - pc = tagFindById(cmd[7]); + pc = tag_find_by_id(cmd[7]); badtag->cmdoffset = pc->cmdoffset; badtag->obj = pc->obj; } @@ -7686,10 +7686,10 @@ u16 g_InvestigationPadMap[] = { /** * @cmd 0142 */ -bool aiSetPadPresetToInvestigationTerminal(void) +bool ai_set_pad_preset_to_investigation_terminal(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj) { s16 objpad = obj->pad; @@ -7697,7 +7697,7 @@ bool aiSetPadPresetToInvestigationTerminal(void) for (i = 0; i < sizeof(g_InvestigationPadMap) / sizeof(g_InvestigationPadMap[0]); i += 2) { if (objpad == g_InvestigationPadMap[i]) { - chrSetPadPreset(g_Vars.chrdata, g_InvestigationPadMap[i + 1]); + chr_set_pad_preset(g_Vars.chrdata, g_InvestigationPadMap[i + 1]); } } } @@ -7710,10 +7710,10 @@ bool aiSetPadPresetToInvestigationTerminal(void) /** * @cmd 0143 */ -bool aiHeliArmWeapons(void) +bool ai_heli_arm_weapons(void) { if (g_Vars.hovercar) { - chopperSetArmed(g_Vars.hovercar, true); + chopper_set_armed(g_Vars.hovercar, true); } g_Vars.aioffset += 2; @@ -7724,10 +7724,10 @@ bool aiHeliArmWeapons(void) /** * @cmd 0144 */ -bool aiHeliUnarmWeapons(void) +bool ai_heli_unarm_weapons(void) { if (g_Vars.hovercar) { - chopperSetArmed(g_Vars.hovercar, false); + chopper_set_armed(g_Vars.hovercar, false); } g_Vars.aioffset += 2; @@ -7738,9 +7738,9 @@ bool aiHeliUnarmWeapons(void) /** * @cmd 0145 */ -bool aiRebuildTeams(void) +bool ai_rebuild_teams(void) { - rebuildTeams(); + rebuild_teams(); g_Vars.aioffset += 2; return false; @@ -7749,9 +7749,9 @@ bool aiRebuildTeams(void) /** * @cmd 0146 */ -bool aiRebuildSquadrons(void) +bool ai_rebuild_squadrons(void) { - rebuildSquadrons(); + rebuild_squadrons(); g_Vars.aioffset += 2; return false; @@ -7760,7 +7760,7 @@ bool aiRebuildSquadrons(void) /** * @cmd 0147 */ -bool aiIfSquadronIsDead(void) +bool ai_if_squadron_is_dead(void) { /** * @bug: anyalive is initialised to true here, and reset to false in each @@ -7769,16 +7769,16 @@ bool aiIfSquadronIsDead(void) u32 stack[2]; u8 *cmd = g_Vars.ailist + g_Vars.aioffset; bool anyalive = true; - s16 *chrnums = squadronGetChrIds(cmd[2]); + s16 *chrnums = squadron_get_chr_ids(cmd[2]); if (chrnums) { while (*chrnums != -2) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); if (chr && chr->model) { anyalive = false; - if (!chrIsDead(chr) && chr->actiontype != ACT_DEAD) { + if (!chr_is_dead(chr) && chr->actiontype != ACT_DEAD) { anyalive = true; } } @@ -7788,7 +7788,7 @@ bool aiIfSquadronIsDead(void) } if (!anyalive) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -7799,10 +7799,10 @@ bool aiIfSquadronIsDead(void) /** * @cmd 0148 */ -bool aiChrSetListening(void) +bool ai_chr_set_listening(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->listening == 0) { chr->listening = cmd[3]; @@ -7816,20 +7816,20 @@ bool aiChrSetListening(void) /** * @cmd 0149 */ -bool aiIfChrListening(void) +bool ai_if_chr_listening(void) { struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd->b2); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd->b2); if (cmd->b4 == 0) { if (chr->listening == cmd->b3) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b5); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b5); } else { g_Vars.aioffset += 6; } } else { if (g_Vars.chrdata->convtalk == 0) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b5); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b5); } else { g_Vars.aioffset += 6; } @@ -7841,10 +7841,10 @@ bool aiIfChrListening(void) /** * @cmd 014a */ -bool aiIfTrue(void) +bool ai_if_true(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); return false; } @@ -7852,12 +7852,12 @@ bool aiIfTrue(void) /** * @cmd 014b */ -bool aiIfNotListening(void) +bool ai_if_not_listening(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.chrdata->listening == 0) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -7868,7 +7868,7 @@ bool aiIfNotListening(void) /** * @cmd 0157 */ -bool aiSetTintedGlassEnabled(void) +bool ai_set_tinted_glass_enabled(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_TintedGlassEnabled = cmd[2]; @@ -7880,17 +7880,17 @@ bool aiSetTintedGlassEnabled(void) /** * @cmd 0152 */ -bool aiIfNumChrsInSquadronGreaterThan(void) +bool ai_if_num_chrs_in_squadron_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s32 count = 0; - s16 *chrnums = squadronGetChrIds(cmd[3]); + s16 *chrnums = squadron_get_chr_ids(cmd[3]); if (chrnums) { while (*chrnums != -2) { - struct chrdata *chr = chrFindByLiteralId(*chrnums); + struct chrdata *chr = chr_find_by_literal_id(*chrnums); - if (chr && chr->prop && chrIsDead(chr) == false + if (chr && chr->prop && chr_is_dead(chr) == false && chr->actiontype != ACT_DEAD && chr->actiontype != ACT_DRUGGEDKO && chr->actiontype != ACT_DRUGGEDDROP @@ -7903,7 +7903,7 @@ bool aiIfNumChrsInSquadronGreaterThan(void) } if (count > cmd[2]) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -7914,14 +7914,14 @@ bool aiIfNumChrsInSquadronGreaterThan(void) /** * @cmd 0165 */ -bool aiIfChrInjured(void) +bool ai_if_chr_injured(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && (chr->chrflags & CHRCFLAG_INJUREDTARGET)) { chr->chrflags &= ~CHRCFLAG_INJUREDTARGET; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -7932,12 +7932,12 @@ bool aiIfChrInjured(void) /** * @cmd 0166 */ -bool aiIfAction(void) +bool ai_if_action(void) { struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); if (g_Vars.chrdata->myaction == cmd->b2) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b3); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b3); } else { g_Vars.aioffset += 4; } @@ -7948,10 +7948,10 @@ bool aiIfAction(void) /** * @cmd 0167 */ -bool aiHovercopterFireRocket(void) +bool ai_hovercopter_fire_rocket(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - chopperFireRocket(g_Vars.hovercar, cmd[2]); + chopper_fire_rocket(g_Vars.hovercar, cmd[2]); g_Vars.aioffset += 3; return false; @@ -7960,12 +7960,12 @@ bool aiHovercopterFireRocket(void) /** * @cmd 0169 */ -bool aiIfNaturalAnim(void) +bool ai_if_natural_anim(void) { struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); if (g_Vars.chrdata->naturalanim == cmd->b2) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b3); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b3); } else { g_Vars.aioffset += 4; } @@ -7976,30 +7976,30 @@ bool aiIfNaturalAnim(void) /** * @cmd 016a */ -bool aiIfY(void) +bool ai_if_y(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; struct chrdata *chr = NULL; f32 cutoff_y = ((cmd[4] | (cmd[3] << 8)) << 16) >> 16; if (cmd[2] == CHR_TARGET && g_Vars.hovercar) { - struct chopperobj *chopper = chopperFromHovercar(g_Vars.hovercar); + struct chopperobj *chopper = chopper_from_hovercar(g_Vars.hovercar); if (chopper) { - struct prop *target = chopperGetTargetProp(chopper); + struct prop *target = chopper_get_target_prop(chopper); if (target && (target->type == PROPTYPE_CHR || target->type == PROPTYPE_PLAYER)) { chr = target->chr; } } } else { - chr = chrFindById(g_Vars.chrdata, cmd[2]); + chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); } if (chr && chr->prop && ( (chr->prop->pos.y < cutoff_y && cmd[5] == 0) || (chr->prop->pos.y > cutoff_y && cmd[5] == 1))) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; } @@ -8010,7 +8010,7 @@ bool aiIfY(void) /** * @cmd 016c */ -bool aiNoOp016c(void) +bool ai_noop_016c(void) { g_Vars.aioffset += 2; return false; @@ -8019,10 +8019,10 @@ bool aiNoOp016c(void) /** * @cmd 016d */ -bool aiChrAdjustMotionBlur(void) +bool ai_chr_adjust_motion_blur(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { if (cmd[4] == 0) { @@ -8040,20 +8040,20 @@ bool aiChrAdjustMotionBlur(void) /** * @cmd 016e */ -bool aiDamageChrByAmount(void) +bool ai_damage_chr_by_amount(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; struct coord coord = {0, 0, 0}; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop) { if (cmd[4] == 2) { struct gset gset = {WEAPON_COMBATKNIFE, 0, 0, FUNC_POISON}; - chrDamageByMisc(chr, (s32)cmd[3] * 0.03125f, &coord, &gset, NULL); + chr_damage_by_misc(chr, (s32)cmd[3] * 0.03125f, &coord, &gset, NULL); } else if (cmd[4] == 0) { - chrDamageByMisc(chr, (s32)cmd[3] * 0.03125f, &coord, NULL, NULL); + chr_damage_by_misc(chr, (s32)cmd[3] * 0.03125f, &coord, NULL, NULL); } else { - chrDamageByMisc(chr, (s32)cmd[3] * -0.03125f, &coord, NULL, NULL); + chr_damage_by_misc(chr, (s32)cmd[3] * -0.03125f, &coord, NULL, NULL); } } @@ -8065,13 +8065,13 @@ bool aiDamageChrByAmount(void) /** * @cmd 016f */ -bool aiIfChrHasGun(void) +bool ai_if_chr_has_gun(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->model && chr->gunprop == NULL) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -8082,17 +8082,17 @@ bool aiIfChrHasGun(void) /** * @cmd 0170 */ -bool aiDoGunCommand(void) +bool ai_do_gun_command(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; struct weaponobj *weapon = g_Vars.chrdata->gunprop->weapon; if (cmd[2] == 0 || ((weapon->base.hidden & OBJHFLAG_PROJECTILE) == 0 && cmd[2] == 1)) { if (cmd[2] == 0) { - chrGoToProp(g_Vars.chrdata, g_Vars.chrdata->gunprop, GOPOSFLAG_JOG); + chr_go_to_prop(g_Vars.chrdata, g_Vars.chrdata->gunprop, GOPOSFLAG_JOG); } - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -8103,7 +8103,7 @@ bool aiDoGunCommand(void) /** * @cmd 0171 */ -bool aiIfDistanceToGunLessThan(void) +bool ai_if_distance_to_gun_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[3] | (cmd[2] << 8)) * 10.0f; @@ -8120,7 +8120,7 @@ bool aiIfDistanceToGunLessThan(void) if (ydiff < 200 && ydiff > -200 && xdiff < distance && xdiff > -distance && zdiff < distance && zdiff > -distance) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -8131,20 +8131,20 @@ bool aiIfDistanceToGunLessThan(void) /** * @cmd 0172 */ -bool aiRecoverGun(void) +bool ai_recover_gun(void) { \ u8 *cmd = g_Vars.ailist + g_Vars.aioffset; struct prop *prop = g_Vars.chrdata->gunprop; g_Vars.chrdata->gunprop = NULL; if (prop && prop->obj && prop->parent == NULL && prop->type == PROPTYPE_WEAPON) { - propDeregisterRooms(prop); - propDelist(prop); - propDisable(prop); - chrEquipWeapon(prop->weapon, g_Vars.chrdata); + prop_deregister_rooms(prop); + prop_delist(prop); + prop_disable(prop); + chr_equip_weapon(prop->weapon, g_Vars.chrdata); } - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); if (1); @@ -8154,10 +8154,10 @@ bool aiRecoverGun(void) /** * @cmd 0173 */ -bool aiChrCopyProperties(void) +bool ai_chr_copy_properties(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->model) { g_Vars.chrdata->hearingscale = chr->hearingscale; @@ -8178,7 +8178,7 @@ bool aiChrCopyProperties(void) g_Vars.chrdata->yvisang = chr->yvisang; g_Vars.chrdata->teamscandist = chr->teamscandist; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -8189,18 +8189,18 @@ bool aiChrCopyProperties(void) /** * @cmd 0177 */ -bool aiPlayerAutoWalk(void) +bool ai_player_auto_walk(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 pad_id = cmd[4] | (cmd[3] << 8); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); - playerAutoWalk(pad_id, cmd[5], cmd[6], cmd[7], cmd[8]); - setCurrentPlayerNum(prevplayernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); + player_auto_walk(pad_id, cmd[5], cmd[6], cmd[7], cmd[8]); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 9; @@ -8211,28 +8211,28 @@ bool aiPlayerAutoWalk(void) /** * @cmd 0178 */ -bool aiIfPlayerAutoWalkFinished(void) +bool ai_if_player_auto_walk_finished(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; bool walking = false; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); if (g_Vars.tickmode == TICKMODE_AUTOWALK) { walking = true; } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (walking) { g_Vars.aioffset += 4; } else { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } return false; @@ -8241,27 +8241,27 @@ bool aiIfPlayerAutoWalkFinished(void) /** * @cmd 0181 */ -bool aiIfPlayerLookingAtObject(void) +bool ai_if_player_looking_at_object(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[3]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); bool pass = false; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); if (g_Vars.currentplayer->lookingatprop.prop == obj->prop) { pass = true; } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -8272,12 +8272,12 @@ bool aiIfPlayerLookingAtObject(void) /** * @cmd 0182 */ -bool aiPunchOrKick(void) +bool ai_punch_or_kick(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (g_Vars.chrdata && chrTryPunch(g_Vars.chrdata, cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (g_Vars.chrdata && chr_try_punch(g_Vars.chrdata, cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -8288,13 +8288,13 @@ bool aiPunchOrKick(void) /** * @cmd 0183 */ -bool aiIfTargetIsPlayer(void) +bool ai_if_target_is_player(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct prop *target = chrGetTargetProp(g_Vars.chrdata); + struct prop *target = chr_get_target_prop(g_Vars.chrdata); if (target->type == PROPTYPE_EYESPY || target->type == PROPTYPE_PLAYER) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -8308,7 +8308,7 @@ bool aiIfTargetIsPlayer(void) bool ai0184(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - chrTryAttackAmount(g_Vars.chrdata, 512, 0, cmd[2], cmd[3]); + chr_try_attack_amount(g_Vars.chrdata, 512, 0, cmd[2], cmd[3]); g_Vars.aioffset += 4; return false; @@ -8317,14 +8317,14 @@ bool ai0184(void) /** * @cmd 0186 */ -bool aiIfSoundTimer(void) +bool ai_if_sound_timer(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s32 value = TICKS(cmd[3] | (cmd[2] << 8)); if ((g_Vars.chrdata->soundtimer > value && cmd[4] == 0) || (g_Vars.chrdata->soundtimer < value && cmd[4] == 1)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -8335,7 +8335,7 @@ bool aiIfSoundTimer(void) /** * @cmd 0187 */ -bool aiSetTargetToEyespyIfInSight(void) +bool ai_set_target_to_eyespy_if_in_sight(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 prevtarget = g_Vars.chrdata->target; @@ -8343,10 +8343,10 @@ bool aiSetTargetToEyespyIfInSight(void) if (eyespy) { struct chrdata *chr = eyespy->prop->chr; - g_Vars.chrdata->target = propGetIndexByChrId(g_Vars.chrdata, chr->chrnum); + g_Vars.chrdata->target = prop_get_index_by_chr_id(g_Vars.chrdata, chr->chrnum); - if (chrCheckCanSeeTarget(g_Vars.chrdata)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (chr_check_can_see_target(g_Vars.chrdata)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; g_Vars.chrdata->target = prevtarget; @@ -8361,10 +8361,10 @@ bool aiSetTargetToEyespyIfInSight(void) /** * @cmd 0188 */ -bool aiIfLiftStationary(void) +bool ai_if_lift_stationary(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); bool pass = false; if (obj && obj->prop && obj->type == OBJTYPE_LIFT) { @@ -8376,7 +8376,7 @@ bool aiIfLiftStationary(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -8387,14 +8387,14 @@ bool aiIfLiftStationary(void) /** * @cmd 0189 */ -bool aiLiftGoToStop(void) +bool ai_lift_go_to_stop(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->type == OBJTYPE_LIFT) { struct liftobj *lift = (struct liftobj *)obj; - liftGoToStop(lift, cmd[3]); + lift_go_to_stop(lift, cmd[3]); } g_Vars.aioffset += 4; @@ -8405,10 +8405,10 @@ bool aiLiftGoToStop(void) /** * @cmd 018a */ -bool aiIfLiftAtStop(void) +bool ai_if_lift_at_stop(void) { struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); - struct defaultobj *obj = objFindByTagId(cmd->b2); + struct defaultobj *obj = obj_find_by_tag_id(cmd->b2); bool pass = false; if (obj && obj->prop && obj->type == OBJTYPE_LIFT) { @@ -8420,7 +8420,7 @@ bool aiIfLiftAtStop(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b4); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b4); } else { g_Vars.aioffset += 5; } @@ -8431,10 +8431,10 @@ bool aiIfLiftAtStop(void) /** * @cmd 018b */ -bool aiConfigureRain(void) +bool ai_configure_rain(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - weatherConfigureRain(cmd[2]); + weather_configure_rain(cmd[2]); g_Vars.aioffset += 3; return false; @@ -8443,10 +8443,10 @@ bool aiConfigureRain(void) /** * @cmd 01b6 */ -bool aiConfigureSnow(void) +bool ai_configure_snow(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - weatherConfigureSnow(cmd[2]); + weather_configure_snow(cmd[2]); g_Vars.aioffset += 3; return false; @@ -8455,13 +8455,13 @@ bool aiConfigureSnow(void) /** * @cmd 018c */ -bool aiChrToggleModelPart(void) +bool ai_chr_toggle_model_part(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { - chrToggleModelPart(chr, cmd[3]); + chr_toggle_model_part(chr, cmd[3]); } g_Vars.aioffset += 4; @@ -8472,13 +8472,13 @@ bool aiChrToggleModelPart(void) /** * @cmd 018d */ -bool aiActivateLift(void) +bool ai_activate_lift(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[3]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); if (obj && obj->prop) { - liftActivate(obj->prop, cmd[2]); + lift_activate(obj->prop, cmd[2]); } g_Vars.aioffset += 4; @@ -8489,13 +8489,13 @@ bool aiActivateLift(void) /** * @cmd 018e */ -bool aiMiniSkedarTryPounce(void) +bool ai_mini_skedar_try_pounce(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 thing = cmd[4] | (cmd[3] << 8); - if (chrTrySkJump(g_Vars.chrdata, g_Vars.chrdata->pouncebits, cmd[2], thing, cmd[5])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[6]); + if (chr_try_sk_jump(g_Vars.chrdata, g_Vars.chrdata->pouncebits, cmd[2], thing, cmd[5])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[6]); } else { g_Vars.aioffset += 7; @@ -8507,7 +8507,7 @@ bool aiMiniSkedarTryPounce(void) /** * @cmd 018f */ -bool aiIfObjectDistanceToPadLessThan(void) +bool ai_if_object_distance_to_pad_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (f32)(cmd[4] | (cmd[3] << 8)) * 10; @@ -8519,18 +8519,18 @@ bool aiIfObjectDistanceToPadLessThan(void) #else u16 pad_id = cmd[6] | (cmd[5] << 8); #endif - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); struct pad pad; bool pass = false; if (obj && obj->prop) { - pad_id = chrResolvePadId(g_Vars.chrdata, pad_id); + pad_id = chr_resolve_pad_id(g_Vars.chrdata, pad_id); #if VERSION >= VERSION_NTSC_1_0 if (pad_id >= 0) #endif { - padUnpack(pad_id, PADFIELD_POS, &pad); + pad_unpack(pad_id, PADFIELD_POS, &pad); xdiff = obj->prop->pos.x - pad.pos.x; ydiff = obj->prop->pos.y - pad.pos.y; zdiff = obj->prop->pos.z - pad.pos.z; @@ -8544,7 +8544,7 @@ bool aiIfObjectDistanceToPadLessThan(void) } if (pass) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[7]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[7]); } else { g_Vars.aioffset += 8; } @@ -8555,10 +8555,10 @@ bool aiIfObjectDistanceToPadLessThan(void) /** * @cmd 0190 */ -bool aiSetSavefileFlag(void) +bool ai_set_savefile_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - gamefileSetFlag(cmd[2]); + gamefile_set_flag(cmd[2]); g_Vars.aioffset += 3; return false; @@ -8567,10 +8567,10 @@ bool aiSetSavefileFlag(void) /** * @cmd 0191 */ -bool aiUnsetSavefileFlag(void) +bool ai_unset_savefile_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - gamefileUnsetFlag(cmd[2]); + gamefile_unset_flag(cmd[2]); g_Vars.aioffset += 3; return false; @@ -8579,12 +8579,12 @@ bool aiUnsetSavefileFlag(void) /** * @cmd 0192 */ -bool aiIfSavefileFlagIsSet(void) +bool ai_if_savefile_flag_is_set(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (gamefileHasFlag(cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (gamefile_has_flag(cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -8595,12 +8595,12 @@ bool aiIfSavefileFlagIsSet(void) /** * @cmd 0193 */ -bool aiIfSavefileFlagIsUnset(void) +bool ai_if_savefile_flag_is_unset(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (!gamefileHasFlag(cmd[2])) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + if (!gamefile_has_flag(cmd[2])) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -8611,11 +8611,11 @@ bool aiIfSavefileFlagIsUnset(void) /** * @cmd 019e */ -bool aiIfObjHealthLessThan(void) +bool ai_if_obj_health_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s32 damage = cmd[4] | (cmd[3] << 8); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); bool condition_passes = false; @@ -8624,7 +8624,7 @@ bool aiIfObjHealthLessThan(void) } if (condition_passes) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[5]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[5]); } else { g_Vars.aioffset += 6; } @@ -8635,11 +8635,11 @@ bool aiIfObjHealthLessThan(void) /** * @cmd 019f */ -bool aiSetObjHealth(void) +bool ai_set_obj_health(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s32 damage = cmd[4] | (cmd[3] << 8); - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { obj->damage = damage; @@ -8653,10 +8653,10 @@ bool aiSetObjHealth(void) /** * @cmd 01a0 */ -bool aiSetChrSpecialDeathAnimation(void) +bool ai_set_chr_special_death_animation(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { chr->specialdie = cmd[3]; @@ -8670,9 +8670,9 @@ bool aiSetChrSpecialDeathAnimation(void) /** * @cmd 01a1 */ -bool aiSetRoomToSearch(void) +bool ai_set_room_to_search(void) { - struct chrdata *target = chrFindById(g_Vars.chrdata, CHR_TARGET); + struct chrdata *target = chr_find_by_id(g_Vars.chrdata, CHR_TARGET); if (target && target->prop) { g_Vars.chrdata->roomtosearch = target->prop->rooms[0]; @@ -8734,29 +8734,29 @@ s16 g_CiThanksQuips[] = { /** * @cmd 01a2 */ -bool aiSayCiStaffQuip(void) +bool ai_say_ci_staff_quip(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 quip; if (cmd[2] == CIQUIP_GREETING) { quip = g_CiGreetingQuips[g_Vars.chrdata->morale][random() % 3]; - psPlayFromProp((s8)cmd[3], quip, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0); + ps_play_from_prop((s8)cmd[3], quip, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0); } if (cmd[2] == CIQUIP_MAIN) { quip = g_CiMainQuips[g_Vars.chrdata->morale][random() % 3]; - psPlayFromProp((s8)cmd[3], quip, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0); + ps_play_from_prop((s8)cmd[3], quip, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0); } if (cmd[2] == CIQUIP_ANNOYED) { quip = g_CiAnnoyedQuips[g_Vars.chrdata->morale][random() % 3]; - psPlayFromProp((s8)cmd[3], quip, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0); + ps_play_from_prop((s8)cmd[3], quip, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0); } if (cmd[2] == CIQUIP_THANKS) { quip = g_CiThanksQuips[g_Vars.chrdata->morale]; - psPlayFromProp((s8)cmd[3], quip, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0); + ps_play_from_prop((s8)cmd[3], quip, 0, g_Vars.chrdata->prop, PSTYPE_CHRTALK, 0); } g_Vars.aioffset += 4; @@ -8767,7 +8767,7 @@ bool aiSayCiStaffQuip(void) /** * @cmd 01a3 */ -bool aiDoPresetAnimation(void) +bool ai_do_preset_animation(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; @@ -8791,20 +8791,20 @@ bool aiDoPresetAnimation(void) }; if (cmd[2] == 255) { - chrTryStartAnim(g_Vars.chrdata, anims[7 + (random() % 8)], 0, -1, 0, 15, 0.5); + chr_try_start_anim(g_Vars.chrdata, anims[7 + (random() % 8)], 0, -1, 0, 15, 0.5); } else if (cmd[2] == 254) { - struct prop *prop0 = chrGetHeldProp(g_Vars.chrdata, 1); - struct prop *prop1 = chrGetHeldProp(g_Vars.chrdata, 0); + struct prop *prop0 = chr_get_held_prop(g_Vars.chrdata, 1); + struct prop *prop1 = chr_get_held_prop(g_Vars.chrdata, 0); - if (weaponIsOneHanded(prop0) || weaponIsOneHanded(prop1)) { - chrTryStartAnim(g_Vars.chrdata, ANIM_FIX_GUN_JAM_EASY, 0, -1, 0, 5, 0.5); + if (weapon_is_one_handed(prop0) || weapon_is_one_handed(prop1)) { + chr_try_start_anim(g_Vars.chrdata, ANIM_FIX_GUN_JAM_EASY, 0, -1, 0, 5, 0.5); } else { - chrTryStartAnim(g_Vars.chrdata, ANIM_FIX_GUN_JAM_HARD, 0, -1, 0, 5, 0.5); + chr_try_start_anim(g_Vars.chrdata, ANIM_FIX_GUN_JAM_HARD, 0, -1, 0, 5, 0.5); } } else if (cmd[2] == 3) { - chrTryStartAnim(g_Vars.chrdata, anims[3 + (random() & 1)], 0, -1, 0, 15, 0.5); + chr_try_start_anim(g_Vars.chrdata, anims[3 + (random() & 1)], 0, -1, 0, 15, 0.5); } else { - chrTryStartAnim(g_Vars.chrdata, anims[cmd[2]], 0, -1, 0, 15, 0.5); + chr_try_start_anim(g_Vars.chrdata, anims[cmd[2]], 0, -1, 0, 15, 0.5); } g_Vars.aioffset += 3; @@ -8815,12 +8815,12 @@ bool aiDoPresetAnimation(void) /** * @cmd 01a5 */ -bool aiIfUsingLift(void) +bool ai_if_using_lift(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (chrIsUsingLift(g_Vars.chrdata)) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (chr_is_using_lift(g_Vars.chrdata)) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -8831,10 +8831,10 @@ bool aiIfUsingLift(void) /** * @cmd 01a6 */ -bool aiIfTargetYDifferenceLessThan(void) +bool ai_if_target_y_difference_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct prop *prop = chrGetTargetProp(g_Vars.chrdata); + struct prop *prop = chr_get_target_prop(g_Vars.chrdata); f32 diff = prop->pos.y - g_Vars.chrdata->prop->pos.y; if (diff < 0) { @@ -8842,7 +8842,7 @@ bool aiIfTargetYDifferenceLessThan(void) } if (diff < (s32)cmd[2] * 10.0f) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } else { g_Vars.aioffset += 4; } @@ -8866,7 +8866,7 @@ bool ai01aa(void) 0, &a, 0); if (a < 3000) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -8877,26 +8877,26 @@ bool ai01aa(void) /** * @cmd 01ae */ -bool aiClearInventory(void) +bool ai_clear_inventory(void) { u32 stackpadding[2]; u32 prevplayernum = g_Vars.currentplayernum; s32 playernum; for (playernum = 0; playernum < PLAYERCOUNT(); playernum++) { - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); if (g_Vars.currentplayer == g_Vars.bond || g_Vars.currentplayer == g_Vars.coop) { - invClear(); + inv_clear(); #if VERSION >= VERSION_NTSC_1_0 g_Vars.currentplayer->devicesactive = 0; #endif - invGiveSingleWeapon(WEAPON_UNARMED); - bgunEquipWeapon(WEAPON_UNARMED); + inv_give_single_weapon(WEAPON_UNARMED); + bgun_equip_weapon(WEAPON_UNARMED); } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); g_Vars.aioffset += 3; return false; @@ -8905,9 +8905,9 @@ bool aiClearInventory(void) /** * @cmd 01ad */ -bool aiReleaseObject(void) +bool ai_release_object(void) { - bmoveSetModeForAllPlayers(MOVEMODE_WALK); + bmove_set_mode_for_all_players(MOVEMODE_WALK); g_Vars.aioffset += 3; return false; @@ -8916,24 +8916,24 @@ bool aiReleaseObject(void) /** * @cmd 01af */ -bool aiChrGrabObject(void) +bool ai_chr_grab_object(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[3]); - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER && obj && obj->prop) { u32 prevplayernum = g_Vars.currentplayernum; - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK - && bmoveGetCrouchPos() == CROUCHPOS_STAND + && bmove_get_crouch_pos() == CROUCHPOS_STAND && g_Vars.currentplayer->crouchoffset == 0) { - bmoveGrabProp(obj->prop); + bmove_grab_prop(obj->prop); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } g_Vars.aioffset += 4; @@ -8944,12 +8944,12 @@ bool aiChrGrabObject(void) /** * @cmd 01b1 */ -bool aiShuffleRuinsPillars(void) +bool ai_shuffle_ruins_pillars(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct tag *ptr1 = tagFindById(cmd[2]); - struct tag *ptr2 = tagFindById(cmd[3]); - struct tag *ptr3 = tagFindById(cmd[4]); + struct tag *ptr1 = tag_find_by_id(cmd[2]); + struct tag *ptr2 = tag_find_by_id(cmd[3]); + struct tag *ptr3 = tag_find_by_id(cmd[4]); struct tag *src; u8 marked1index = random() % 5; u8 marked2index = random() % 5; @@ -8976,32 +8976,32 @@ bool aiShuffleRuinsPillars(void) } // Pillar/mine 1 - src = tagFindById(pillars[marked1index]); + src = tag_find_by_id(pillars[marked1index]); ptr1->cmdoffset = src->cmdoffset; ptr1->obj = src->obj; - ptr1 = tagFindById(cmd[10]); - src = tagFindById(mines[marked1index]); + ptr1 = tag_find_by_id(cmd[10]); + src = tag_find_by_id(mines[marked1index]); ptr1->cmdoffset = src->cmdoffset; ptr1->obj = src->obj; // Pillar/mine 2 - src = tagFindById(pillars[marked2index]); + src = tag_find_by_id(pillars[marked2index]); ptr2->cmdoffset = src->cmdoffset; ptr2->obj = src->obj; - ptr2 = tagFindById(cmd[11]); - src = tagFindById(mines[marked2index]); + ptr2 = tag_find_by_id(cmd[11]); + src = tag_find_by_id(mines[marked2index]); ptr2->cmdoffset = src->cmdoffset; ptr2->obj = src->obj; // Pillar/mine 3 - src = tagFindById(pillars[marked3index]); + src = tag_find_by_id(pillars[marked3index]); ptr3->cmdoffset = src->cmdoffset; ptr3->obj = src->obj; - ptr3 = tagFindById(cmd[12]); - src = tagFindById(mines[marked3index]); + ptr3 = tag_find_by_id(cmd[12]); + src = tag_find_by_id(mines[marked3index]); ptr3->cmdoffset = src->cmdoffset; ptr3->obj = src->obj; @@ -9013,7 +9013,7 @@ bool aiShuffleRuinsPillars(void) /** * @cmd 01b2 */ -bool aiSetWindSpeed(void) +bool ai_set_wind_speed(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; @@ -9026,12 +9026,12 @@ bool aiSetWindSpeed(void) /** * @cmd 01b3 */ -bool aiToggleP1P2(void) +bool ai_toggle_p1p2(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.coopplayernum >= 0) { - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { if (chr->p1p2 == g_Vars.bondplayernum && !g_Vars.coop->isdead) { @@ -9050,16 +9050,16 @@ bool aiToggleP1P2(void) /** * @cmd 01b5 */ -bool aiChrSetP1P2(void) +bool ai_chr_set_p1p2(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; if (g_Vars.coopplayernum >= 0) { - struct chrdata *chr1 = chrFindById(g_Vars.chrdata, cmd[2]); - struct chrdata *chr2 = chrFindById(g_Vars.chrdata, cmd[3]); + struct chrdata *chr1 = chr_find_by_id(g_Vars.chrdata, cmd[2]); + struct chrdata *chr2 = chr_find_by_id(g_Vars.chrdata, cmd[3]); if (chr1 && chr2 && chr2->prop && chr2->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr2->prop); + u32 playernum = playermgr_get_player_num_by_prop(chr2->prop); if (!g_Vars.players[playernum]->isdead) { if (chr2->prop == g_Vars.coop->prop) { @@ -9079,17 +9079,17 @@ bool aiChrSetP1P2(void) /** * @cmd 01b7 */ -bool aiChrSetCloaked(void) +bool ai_chr_set_cloaked(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop) { - if (!chrIsDead(chr)) { + if (!chr_is_dead(chr)) { if (cmd[3]) { - chrCloak(chr, cmd[4]); + chr_cloak(chr, cmd[4]); } else { - chrUncloak(chr, cmd[4]); + chr_uncloak(chr, cmd[4]); } } } @@ -9102,10 +9102,10 @@ bool aiChrSetCloaked(void) /** * @cmd 01b8 */ -bool aiSetAutogunTargetTeam(void) +bool ai_set_autogun_target_team(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop && obj->type == OBJTYPE_AUTOGUN) { struct autogunobj *autogun = (struct autogunobj *)obj; @@ -9121,7 +9121,7 @@ bool aiSetAutogunTargetTeam(void) /** * @cmd 01b9 */ -bool aiShufflePelagicSwitches(void) +bool ai_shuffle_pelagic_switches(void) { u8 buttonsdone[] = {0, 0, 0, 0, 0, 0, 0, 0}; u8 i; @@ -9131,12 +9131,12 @@ bool aiShufflePelagicSwitches(void) u8 index; for (i = 8; i < 16; i++) { - tag = tagFindById(i); + tag = tag_find_by_id(i); index = random() & 7; if (buttonsdone[index] == 0) { // Switch has not yet been mapped - button = tagFindById(index); + button = tag_find_by_id(index); tag->cmdoffset = button->cmdoffset; tag->obj = button->obj; buttonsdone[index] = 1; @@ -9144,7 +9144,7 @@ bool aiShufflePelagicSwitches(void) // Switch is already mapped - find first unmapped switch for (j = 0; buttonsdone[j]; j++); - button = tagFindById(j); + button = tag_find_by_id(j); tag->cmdoffset = button->cmdoffset; tag->obj = button->obj; buttonsdone[j] = 1; @@ -9159,7 +9159,7 @@ bool aiShufflePelagicSwitches(void) /** * @cmd 01bb */ -bool aiNoOp01bb(void) +bool ai_noop_01bb(void) { g_Vars.aioffset += 4; return false; @@ -9173,7 +9173,7 @@ bool ai01bc(void) struct bytelist *cmd = (struct bytelist *)(g_Vars.ailist + g_Vars.aioffset); if (g_Vars.chrdata->pouncebits == cmd->b2) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd->b3); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd->b3); } else { g_Vars.aioffset += 4; } @@ -9184,13 +9184,13 @@ bool ai01bc(void) /** * @cmd 01bd */ -bool aiIfTrainingPcHolographed(void) +bool ai_if_training_pc_holographed(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct trainingdata *data = dtGetData(); + struct trainingdata *data = dt_get_data(); if (data->holographedpc) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -9201,27 +9201,27 @@ bool aiIfTrainingPcHolographed(void) /** * @cmd 01be */ -bool aiIfPlayerUsingDevice(void) +bool ai_if_player_using_device(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); struct prop *prop = chr ? chr->prop : NULL; u8 active = false; if (prop && prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(prop); + u32 playernum = playermgr_get_player_num_by_prop(prop); u32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); - if (currentPlayerGetDeviceState(cmd[3]) == DEVICESTATE_ACTIVE) { + if (current_player_get_device_state(cmd[3]) == DEVICESTATE_ACTIVE) { active = true; } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (active) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -9232,7 +9232,7 @@ bool aiIfPlayerUsingDevice(void) /** * @cmd 01bf */ -bool aiChrBeginOrEndTeleport(void) +bool ai_chr_begin_or_end_teleport(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u16 pad_id = cmd[3] | (cmd[2] << 8); @@ -9248,12 +9248,12 @@ bool aiChrBeginOrEndTeleport(void) #endif struct sndstate *handle; fvalue = 0.4; - chr = chrFindById(g_Vars.chrdata, cmd[4]); + chr = chr_find_by_id(g_Vars.chrdata, cmd[4]); prevplayernum = g_Vars.currentplayernum; if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { - playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); } if (pad_id == 0) { @@ -9271,7 +9271,7 @@ bool aiChrBeginOrEndTeleport(void) osSetThreadPri(0, audiopri + 1); #endif - handle = sndStart(var80095200, SFX_RELOAD_FARSIGHT, NULL, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, SFX_RELOAD_FARSIGHT, NULL, -1, -1, -1, -1, -1); if (handle) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(u32 *)&fvalue); @@ -9284,7 +9284,7 @@ bool aiChrBeginOrEndTeleport(void) g_Vars.aioffset += 5; - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); return false; } @@ -9292,10 +9292,10 @@ bool aiChrBeginOrEndTeleport(void) /** * @cmd 01c0 */ -bool aiIfChrTeleportFullWhite(void) +bool ai_if_chr_teleport_full_white(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[3]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[3]); u32 prevplayernum = g_Vars.currentplayernum; #if VERSION >= VERSION_NTSC_1_0 s32 mainpri; @@ -9307,8 +9307,8 @@ bool aiIfChrTeleportFullWhite(void) struct sndstate *handle; if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { - u32 playernum = playermgrGetPlayerNumByProp(chr->prop); - setCurrentPlayerNum(playernum); + u32 playernum = playermgr_get_player_num_by_prop(chr->prop); + set_current_player_num(playernum); } if (g_Vars.currentplayer->teleportstate < TELEPORTSTATE_WHITE) { @@ -9322,7 +9322,7 @@ bool aiIfChrTeleportFullWhite(void) osSetThreadPri(0, audiopri + 1); #endif - handle = sndStart(var80095200, SFX_FIRE_SHOTGUN, NULL, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, SFX_FIRE_SHOTGUN, NULL, -1, -1, -1, -1, -1); if (handle) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(u32 *)&fvalue); @@ -9333,10 +9333,10 @@ bool aiIfChrTeleportFullWhite(void) #endif g_Vars.currentplayer->teleportstate = TELEPORTSTATE_WHITE; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); return false; } @@ -9344,9 +9344,9 @@ bool aiIfChrTeleportFullWhite(void) /** * @cmd 01c5 */ -bool aiAvoid(void) +bool ai_avoid(void) { - chrAvoid(g_Vars.chrdata); + chr_avoid(g_Vars.chrdata); g_Vars.aioffset += 2; return false; @@ -9355,11 +9355,11 @@ bool aiAvoid(void) /** * @cmd 01c8 */ -bool aiTitleInitMode(void) +bool ai_title_init_mode(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.aioffset += 3; - titleInitFromAiCmd(cmd[2]); + title_init_from_ai_cmd(cmd[2]); return false; } @@ -9367,13 +9367,13 @@ bool aiTitleInitMode(void) /** * @cmd 01c9 */ -bool aiTryExitTitle(void) +bool ai_try_exit_title(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (titleIsChangingMode()) { - titleExit(); - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (title_is_changing_mode()) { + title_exit(); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset = g_Vars.aioffset + 3; } @@ -9384,12 +9384,12 @@ bool aiTryExitTitle(void) /** * @cmd 01ca */ -bool aiChrSetCutsceneWeapon(void) +bool ai_chr_set_cutscene_weapon(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); - s32 model_id = playermgrGetModelOfWeapon(cmd[3]); - s32 fallback_model_id = playermgrGetModelOfWeapon(cmd[4]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); + s32 model_id = playermgr_get_model_of_weapon(cmd[3]); + s32 fallback_model_id = playermgr_get_model_of_weapon(cmd[4]); if (chr) { if (cmd[3] == 0xff) { @@ -9412,25 +9412,25 @@ bool aiChrSetCutsceneWeapon(void) } if (valid) { - weaponDeleteFromChr(chr, HAND_LEFT); - weaponDeleteFromChr(chr, HAND_RIGHT); + weapon_delete_from_chr(chr, HAND_LEFT); + weapon_delete_from_chr(chr, HAND_RIGHT); } } } else { if (chr->weapons_held[0] == NULL && chr->weapons_held[1] == NULL && fallback_model_id >= 0) { - weaponCreateForChr(chr, fallback_model_id, cmd[4], 0, NULL, NULL); + weapon_create_for_chr(chr, fallback_model_id, cmd[4], 0, NULL, NULL); } } } else { - weaponDeleteFromChr(chr, HAND_LEFT); - weaponDeleteFromChr(chr, HAND_RIGHT); + weapon_delete_from_chr(chr, HAND_LEFT); + weapon_delete_from_chr(chr, HAND_RIGHT); if (model_id >= 0) { - weaponCreateForChr(chr, model_id, cmd[3], 0, NULL, NULL); + weapon_create_for_chr(chr, model_id, cmd[3], 0, NULL, NULL); } if (fallback_model_id >= 0) { - weaponCreateForChr(chr, fallback_model_id, cmd[4], OBJFLAG_WEAPON_LEFTHANDED, NULL, NULL); + weapon_create_for_chr(chr, fallback_model_id, cmd[4], OBJFLAG_WEAPON_LEFTHANDED, NULL, NULL); } } } @@ -9443,12 +9443,12 @@ bool aiChrSetCutsceneWeapon(void) /** * @cmd 01cb */ -bool aiFadeScreen(void) +bool ai_fade_screen(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; u32 color = (cmd[3] << 16) | (cmd[4] << 8) | cmd[5] | (cmd[2] << 24); s16 num_frames = (cmd[7] | (cmd[6] << 8)); - lvConfigureFade(color, num_frames); + lv_configure_fade(color, num_frames); g_Vars.aioffset += 8; return false; @@ -9457,12 +9457,12 @@ bool aiFadeScreen(void) /** * @cmd 01cc */ -bool aiIfFadeComplete(void) +bool ai_if_fade_complete(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - if (lvIsFadeActive() == false) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + if (lv_is_fade_active() == false) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -9473,13 +9473,13 @@ bool aiIfFadeComplete(void) /** * @cmd 01cd */ -bool aiSetChrHudpieceVisible(void) +bool ai_set_chr_hudpiece_visible(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr && chr->prop && chr->model) { - chrSetHudpieceVisible(chr, cmd[3]); + chr_set_hudpiece_visible(chr, cmd[3]); } g_Vars.aioffset += 4; @@ -9490,10 +9490,10 @@ bool aiSetChrHudpieceVisible(void) /** * @cmd 01ce */ -bool aiSetPassiveMode(void) +bool ai_set_passive_mode(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - bgunSetPassiveMode(cmd[2]); + bgun_set_passive_mode(cmd[2]); g_Vars.aioffset += 3; return false; @@ -9502,19 +9502,19 @@ bool aiSetPassiveMode(void) /** * @cmd 01cf */ -bool aiChrSetFiringInCutscene(void) +bool ai_chr_set_firing_in_cutscene(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); struct coord from = {0, 0, 0}; struct coord to = {0, 0, 0}; if (chr && chr->weapons_held[HAND_RIGHT]) { if (cmd[3]) { - chrSetFiring(chr, HAND_RIGHT, true); - chrUpdateFireslot(chr, HAND_RIGHT, true, false, &from, &to); + chr_set_firing(chr, HAND_RIGHT, true); + chr_update_fireslot(chr, HAND_RIGHT, true, false, &from, &to); } else { - chrSetFiring(chr, HAND_RIGHT, false); + chr_set_firing(chr, HAND_RIGHT, false); } } @@ -9526,7 +9526,7 @@ bool aiChrSetFiringInCutscene(void) /** * @cmd 01d0 */ -bool aiSetPortalFlag(void) +bool ai_set_portal_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 portalnum = cmd[3] | (cmd[2] << 8); @@ -9540,13 +9540,13 @@ bool aiSetPortalFlag(void) /** * @cmd 01d1 */ -bool aiObjSetModelPartVisible(void) +bool ai_obj_set_model_part_visible(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct defaultobj *obj = objFindByTagId(cmd[2]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[2]); if (obj && obj->prop) { - objSetModelPartVisible(obj, cmd[3], cmd[4]); + obj_set_model_part_visible(obj, cmd[3], cmd[4]); } g_Vars.aioffset += 5; @@ -9557,13 +9557,13 @@ bool aiObjSetModelPartVisible(void) /** * @cmd 01d2 */ -bool aiChrEmitSparks(void) +bool ai_chr_emit_sparks(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { - chrDrCarollEmitSparks(chr); + chr_dr_caroll_emit_sparks(chr); } g_Vars.aioffset += 3; @@ -9574,10 +9574,10 @@ bool aiChrEmitSparks(void) /** * @cmd 01d3 */ -bool aiSetDrCarollImages(void) +bool ai_set_dr_caroll_images(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *drcaroll = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *drcaroll = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (drcaroll) { if (cmd[4] == 7) { @@ -9609,7 +9609,7 @@ bool aiSetDrCarollImages(void) /** * @cmd 01d4 */ -bool aiSetRoomFlag(void) +bool ai_set_room_flag(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; RoomNum roomnum = cmd[3] | cmd[2] << 8; @@ -9625,21 +9625,21 @@ bool aiSetRoomFlag(void) /** * @cmd 01d5 */ -bool aiShowCutsceneChrs(void) +bool ai_show_cutscene_chrs(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; bool show = cmd[2]; s32 i; if (show) { - for (i = chrsGetNumSlots() - 1; i >= 0; i--) { + for (i = chrs_get_num_slots() - 1; i >= 0; i--) { if (g_ChrSlots[i].chrnum >= 0 && g_ChrSlots[i].prop && (g_ChrSlots[i].hidden2 & CHRH2FLAG_HIDDENFORCUTSCENE)) { g_ChrSlots[i].hidden2 &= ~CHRH2FLAG_HIDDENFORCUTSCENE; g_ChrSlots[i].chrflags &= ~CHRCFLAG_HIDDEN; } } } else { - for (i = chrsGetNumSlots() - 1; i >= 0; i--) { + for (i = chrs_get_num_slots() - 1; i >= 0; i--) { if (g_ChrSlots[i].chrnum >= 0 && g_ChrSlots[i].prop && (g_ChrSlots[i].chrflags & (CHRCFLAG_UNPLAYABLE | CHRCFLAG_HIDDEN)) == 0) { g_ChrSlots[i].hidden2 |= CHRH2FLAG_HIDDENFORCUTSCENE; @@ -9656,7 +9656,7 @@ bool aiShowCutsceneChrs(void) /** * @cmd 01d6 */ -bool aiConfigureEnvironment(void) +bool ai_configure_environment(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; RoomNum room_id = (cmd[3] | (cmd[2] << 8)); @@ -9707,22 +9707,22 @@ bool aiConfigureEnvironment(void) } break; case AIENVCMD_PLAYNOSEDIVE: - sndPlayNosedive(value); + snd_play_nosedive(value); break; case AIENVCMD_TICKMUSICQUEUE: - musicTickEvents(); + music_tick_events(); break; case AIENVCMD_ROOM_SETFAULTYLIGHTS: - roomSetLightsFaulty(room_id, value); + room_set_lights_faulty(room_id, value); break; case AIENVCMD_STOPNOSEDIVE: - sndStopNosedive(); + snd_stop_nosedive(); break; case AIENVCMD_PLAYUFOHUM: - sndPlayUfo(value); + snd_play_ufo(value); break; case AIENVCMD_STOPUFOHUM: - sndStopUfo(); + snd_stop_ufo(); break; } @@ -9734,13 +9734,13 @@ bool aiConfigureEnvironment(void) /** * @cmd 01d7 */ -bool aiIfDistanceToTarget2LessThan(void) +bool ai_if_distance_to_target2_less_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[3] | (cmd[2] << 8)) * 10.0f; - if (chrGetDistanceToTarget2(g_Vars.chrdata) < distance) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (chr_get_distance_to_target2(g_Vars.chrdata) < distance) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -9751,13 +9751,13 @@ bool aiIfDistanceToTarget2LessThan(void) /** * @cmd 01d8 */ -bool aiIfDistanceToTarget2GreaterThan(void) +bool ai_if_distance_to_target2_greater_than(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; f32 distance = (cmd[3] | (cmd[2] << 8)) * 10.0f; - if (chrGetDistanceToTarget2(g_Vars.chrdata) > distance) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]); + if (chr_get_distance_to_target2(g_Vars.chrdata) > distance) { + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[4]); } else { g_Vars.aioffset += 5; } @@ -9768,7 +9768,7 @@ bool aiIfDistanceToTarget2GreaterThan(void) /** * @cmd 01d9 */ -bool aiPlaySoundFromProp(void) +bool ai_play_sound_from_prop(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; s16 audio_id = cmd[5] | (cmd[4] << 8); @@ -9776,9 +9776,9 @@ bool aiPlaySoundFromProp(void) u16 flags = cmd[10] | (cmd[10] << 8); // @bug: Using 10 twice s32 channel = (s8)cmd[2]; s16 type = cmd[8]; - struct defaultobj *obj = objFindByTagId(cmd[3]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[3]); - psPlayFromProp(channel, audio_id, volume, obj->prop, type, flags); + ps_play_from_prop(channel, audio_id, volume, obj->prop, type, flags); g_Vars.aioffset += 11; @@ -9788,10 +9788,10 @@ bool aiPlaySoundFromProp(void) /** * @cmd 01da */ -bool aiPlayTemporaryPrimaryTrack(void) +bool ai_play_temporary_primary_track(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - musicStartTemporaryPrimary(cmd[2]); + music_start_temporary_primary(cmd[2]); g_Vars.aioffset += 3; return false; @@ -9800,10 +9800,10 @@ bool aiPlayTemporaryPrimaryTrack(void) /** * @cmd 01db */ -bool aiChrKill(void) +bool ai_chr_kill(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - struct chrdata *chr = chrFindById(g_Vars.chrdata, cmd[2]); + struct chrdata *chr = chr_find_by_id(g_Vars.chrdata, cmd[2]); if (chr) { chr->actiontype = ACT_DEAD; @@ -9824,10 +9824,10 @@ bool aiChrKill(void) /** * @cmd 01dc */ -bool aiRemoveWeaponFromInventory(void) +bool ai_remove_weapon_from_inventory(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - invRemoveItemByNum(cmd[2]); + inv_remove_item_by_num(cmd[2]); g_Vars.aioffset += 3; return false; @@ -9836,7 +9836,7 @@ bool aiRemoveWeaponFromInventory(void) /** * @cmd 01dd */ -bool aiIfMusicEventQueueIsEmpty(void) +bool ai_if_music_event_queue_is_empty(void) { f32 value = (u64)osGetCount() * 64 / 3000; @@ -9844,7 +9844,7 @@ bool aiIfMusicEventQueueIsEmpty(void) g_Vars.aioffset += 4; } else { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[3]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[3]); } return false; @@ -9853,11 +9853,11 @@ bool aiIfMusicEventQueueIsEmpty(void) /** * @cmd 01de */ -bool aiIfCoopMode(void) +bool ai_if_coop_mode(void) { if (g_Vars.normmplayerisrunning == false && g_MissionConfig.iscoop) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } @@ -9869,11 +9869,11 @@ bool aiIfCoopMode(void) /** * @cmd 01e0 */ -bool aiRemoveReferencesToChr(void) +bool ai_remove_references_to_chr(void) { if (g_Vars.chrdata && g_Vars.chrdata->prop) { u32 index = g_Vars.chrdata->prop - g_Vars.props; - chrClearReferences(index); + chr_clear_references(index); } g_Vars.aioffset += 2; @@ -9891,7 +9891,7 @@ bool ai01b4(void) if (g_Vars.chrdata && g_Vars.chrdata->prop && chr0f01f264(g_Vars.chrdata, &g_Vars.chrdata->prop->pos, g_Vars.chrdata->prop->rooms, 0, false)) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { g_Vars.aioffset += 3; } diff --git a/src/game/chrmgr.c b/src/game/chrmgr.c index 08dec6d76..f0f3ff7b2 100644 --- a/src/game/chrmgr.c +++ b/src/game/chrmgr.c @@ -7,7 +7,7 @@ #include "data.h" #include "types.h" -void chrmgrReset(void) +void chrmgr_reset(void) { s32 i; @@ -21,7 +21,7 @@ void chrmgrReset(void) g_ChrSlots = NULL; g_NumChrSlots = 0; - g_ShieldHits = mempAlloc(sizeof(struct shieldhit) * 20, MEMPOOL_STAGE); + g_ShieldHits = memp_alloc(sizeof(struct shieldhit) * 20, MEMPOOL_STAGE); for (i = 0; i < 20; i++) { g_ShieldHits[i].prop = NULL; @@ -31,21 +31,21 @@ void chrmgrReset(void) g_NumChrs = 0; g_Chrnums = NULL; g_ChrIndexes = NULL; - var80062960 = mempAlloc(ALIGN16(15 * sizeof(struct var80062960)), MEMPOOL_STAGE); + var80062960 = memp_alloc(ALIGN16(15 * sizeof(struct var80062960)), MEMPOOL_STAGE); for (i = 0; i < ARRAYCOUNT(var8009ccc0); i++) { - var8009ccc0[i] = (void *)ALIGN64(mempAlloc(16 * 16 * sizeof(u16) + 0x40, MEMPOOL_STAGE)); + var8009ccc0[i] = (void *)ALIGN64(memp_alloc(16 * 16 * sizeof(u16) + 0x40, MEMPOOL_STAGE)); } - resetSomeStageThings(); + reset_some_stage_things(); } -void chrmgrConfigure(s32 numchrs) +void chrmgr_configure(s32 numchrs) { s32 i; g_NumChrSlots = PLAYERCOUNT() + numchrs + 10; - g_ChrSlots = mempAlloc(ALIGN16(g_NumChrSlots * sizeof(struct chrdata)), MEMPOOL_STAGE); + g_ChrSlots = memp_alloc(ALIGN16(g_NumChrSlots * sizeof(struct chrdata)), MEMPOOL_STAGE); for (i = 0; i < g_NumChrSlots; i++) { g_ChrSlots[i].chrnum = -1; @@ -54,8 +54,8 @@ void chrmgrConfigure(s32 numchrs) } g_NumChrs = 0; - g_Chrnums = mempAlloc(ALIGN16(g_NumChrSlots * sizeof(g_Chrnums[0])), MEMPOOL_STAGE); - g_ChrIndexes = mempAlloc(ALIGN16(g_NumChrSlots * sizeof(g_ChrIndexes[0])), MEMPOOL_STAGE); + g_Chrnums = memp_alloc(ALIGN16(g_NumChrSlots * sizeof(g_Chrnums[0])), MEMPOOL_STAGE); + g_ChrIndexes = memp_alloc(ALIGN16(g_NumChrSlots * sizeof(g_ChrIndexes[0])), MEMPOOL_STAGE); for (i = 0; i < g_NumChrSlots; i++) { g_Chrnums[i] = -1; diff --git a/src/game/chrmgrstop.c b/src/game/chrmgrstop.c index c206b9d39..05b7697e8 100644 --- a/src/game/chrmgrstop.c +++ b/src/game/chrmgrstop.c @@ -7,7 +7,7 @@ #include "data.h" #include "types.h" -void chrmgrStop(void) +void chrmgr_stop(void) { s32 i; @@ -15,10 +15,10 @@ void chrmgrStop(void) if (g_ChrSlots[i].chrnum >= 0 && g_ChrSlots[i].prop && g_ChrSlots[i].prop->type == PROPTYPE_CHR) { - chrRemove(g_ChrSlots[i].prop, true); - propDelist(g_ChrSlots[i].prop); - propDisable(g_ChrSlots[i].prop); - propFree(g_ChrSlots[i].prop); + chr_remove(g_ChrSlots[i].prop, true); + prop_delist(g_ChrSlots[i].prop); + prop_disable(g_ChrSlots[i].prop); + prop_free(g_ChrSlots[i].prop); } } } diff --git a/src/game/crc.c b/src/game/crc.c index d2ef792d8..9cbafdc5a 100644 --- a/src/game/crc.c +++ b/src/game/crc.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void crcCalculateU32Pair(u8 *start, u8 *end, u32 *checksum) +void crc_calculate_u32_pair(u8 *start, u8 *end, u32 *checksum) { u8 *ptr; u32 salt = 0; @@ -15,19 +15,19 @@ void crcCalculateU32Pair(u8 *start, u8 *end, u32 *checksum) for (ptr = start; ptr < end; ptr++, salt += 7) { seed += *ptr << (salt & 0x0f); - sum1 ^= rngRotateSeed(&seed); + sum1 ^= rng_rotate_seed(&seed); } for (ptr = end - 1; ptr >= start; ptr--, salt += 3) { seed += *ptr << (salt & 0x0f); - sum2 ^= rngRotateSeed(&seed); + sum2 ^= rng_rotate_seed(&seed); } checksum[0] = sum1; checksum[1] = sum2; } -void crcCalculateU16Pair(u8 *start, u8 *end, u16 *checksum) +void crc_calculate_u16_pair(u8 *start, u8 *end, u16 *checksum) { u8 *ptr; u32 salt = 0; @@ -37,12 +37,12 @@ void crcCalculateU16Pair(u8 *start, u8 *end, u16 *checksum) for (ptr = start; ptr < end; ptr++, salt += 7) { seed += *ptr << (salt & 0x0f); - sum1 ^= rngRotateSeed(&seed); + sum1 ^= rng_rotate_seed(&seed); } for (ptr = end - 1; ptr >= start; ptr--, salt += 3) { seed += *ptr << (salt & 0x0f); - sum2 ^= rngRotateSeed(&seed); + sum2 ^= rng_rotate_seed(&seed); } checksum[0] = sum1 & 0xffff; diff --git a/src/game/credits.c b/src/game/credits.c index 74a6f854d..d3305eab6 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -30,12 +30,12 @@ * * This file handles both the credits sequence and the alternative title screen. * - * For the alternative title screen, title code calls creditsRequestAltTitle + * For the alternative title screen, title code calls credits_request_alt_title * before switching the stage to STAGE_CREDITS. For the proper credits, the - * stage is switched to STAGE_CREDITS without calling creditsRequestAltTitle. + * stage is switched to STAGE_CREDITS without calling credits_request_alt_title. * - * Credits are then initialised using creditsReset, then called on each tick - * using creditsDraw. creditsTick is called from creditsDraw. + * Credits are then initialised using credits_reset, then called on each tick + * using credits_draw. credits_tick is called from credits_draw. * * For the main part of the credits, the scene is composed of: * - Two visible background layers @@ -184,7 +184,7 @@ bool g_CreditsScrollStarted = false; bool g_CreditsAltTitleRequested = false; bool g_CreditsUsingAltTitle = false; -void creditsMap4BgVertices(Vtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) +void credits_map_4_bg_vertices(Vtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { f32 a = arg2 * sinf(arg1) + arg3 * cosf(arg1); f32 b = arg2 * cosf(arg1) - arg3 * sinf(arg1); @@ -202,7 +202,7 @@ void creditsMap4BgVertices(Vtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg4 vertices[3].t = (cosf(arg4 + RAD(270, 4.7123889923096f)) - sinf(arg4 + RAD(270, 4.7123889923096f))) * arg6 + b; } -void creditsMap9BgVertices(Vtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) +void credits_map_9_bg_vertices(Vtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { f32 a = arg2 * sinf(arg1) + arg3 * cosf(arg1); f32 b = arg2 * cosf(arg1) - arg3 * sinf(arg1); @@ -248,7 +248,7 @@ void creditsMap9BgVertices(Vtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg4 * 7: 0 1800 * 8: 1800 1800 */ -void creditsInitBgVertices(Vtx *vertices, s32 z) +void credits_init_bg_vertices(Vtx *vertices, s32 z) { s32 i; @@ -276,7 +276,7 @@ struct bgconfig g_CreditsBgConfigs[] = { { 0.01, { 2, 1, 2, 1, 0, 1, 2, 1, 2 }, { { 0x00ffff, 0x0000ff, 0x000000 }, { 0xffffff, 0xffffff, 0xffffff }, { 0xffffff, 0xffffff, 0xffffff } } }, }; -void creditsChooseBgColours(Vtx *vertices, Col *colours, s32 confignum, s32 alpha, s32 arg4) +void credits_choose_bg_colours(Vtx *vertices, Col *colours, s32 confignum, s32 alpha, s32 arg4) { #if PAL s32 iVar1 = (s32)(g_CreditsBgConfigs[confignum].unk00 * g_CreditsCurFrame2 / (10.0f / 3.0f) + arg4) % 180; @@ -307,15 +307,15 @@ void creditsChooseBgColours(Vtx *vertices, Col *colours, s32 confignum, s32 alph weightfrac = (iVar1 % 60) / 60.0f; weight = 255.0f * weightfrac; - colours[0].word = colourBlend( + colours[0].word = colour_blend( g_CreditsBgConfigs[confignum].colours[colour2index][0] << 8, g_CreditsBgConfigs[confignum].colours[colour1index][0] << 8, weight) | alpha; - colours[1].word = colourBlend( + colours[1].word = colour_blend( g_CreditsBgConfigs[confignum].colours[colour2index][1] << 8, g_CreditsBgConfigs[confignum].colours[colour1index][1] << 8, weight) | alpha; - colours[2].word = colourBlend( + colours[2].word = colour_blend( g_CreditsBgConfigs[confignum].colours[colour2index][2] << 8, g_CreditsBgConfigs[confignum].colours[colour1index][2] << 8, weight) | alpha; } @@ -344,7 +344,7 @@ struct creditsbgtype g_CreditsBgTypes[] = { { 10000, 1000, -200, 0x2d, 220, 0 }, }; -Gfx *creditsDrawBackgroundLayer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 alpha, s32 arg5) +Gfx *credits_draw_background_layer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 alpha, s32 arg5) { Vtx *vertices; Col *colours; @@ -362,14 +362,14 @@ Gfx *creditsDrawBackgroundLayer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 al gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI); gSPClearGeometryMode(gdl++, G_CULL_BOTH); - texSelect(&gdl, &g_TexGeneralConfigs[g_CreditsBgTypes[type].texturenum], 1, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[g_CreditsBgTypes[type].texturenum], 1, 1, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - colours = gfxAllocateColours(3); - vertices = gfxAllocateVertices(9); + colours = gfx_allocate_colours(3); + vertices = gfx_allocate_vertices(9); - creditsInitBgVertices(vertices, (s32)((g_CreditsBgTypes[type].unk04 + 2000) * arg3) - 2000); + credits_init_bg_vertices(vertices, (s32)((g_CreditsBgTypes[type].unk04 + 2000) * arg3) - 2000); #if PAL rotation = g_CreditsData->bglayers[layernum].rotspeed * g_CreditsCurFrame2 / (10.0f / 3.0f); @@ -381,7 +381,7 @@ Gfx *creditsDrawBackgroundLayer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 al b = g_CreditsBgTypes[type].unk0c * 32.0f; c = g_CreditsBgTypes[type].unk10 * 32.0f; - creditsMap9BgVertices(vertices, pan, b, c, rotation, g_CreditsBgTypes[type].unk00, g_CreditsBgTypes[type].unk02); + credits_map_9_bg_vertices(vertices, pan, b, c, rotation, g_CreditsBgTypes[type].unk00, g_CreditsBgTypes[type].unk02); if (g_CreditsBgTypes[type].texturenum == 4) { alpha = alpha * 2 / 3; @@ -391,7 +391,7 @@ Gfx *creditsDrawBackgroundLayer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 al alpha = alpha * 2 / 3; } - creditsChooseBgColours(vertices, colours, g_CreditsData->bglayers[layernum].confignum, alpha, arg5 * 90); + credits_choose_bg_colours(vertices, colours, g_CreditsData->bglayers[layernum].confignum, alpha, arg5 * 90); gSPColor(gdl++, osVirtualToPhysical(colours), 3); gSPVertex(gdl++, osVirtualToPhysical(vertices), 9, 0); @@ -402,7 +402,7 @@ Gfx *creditsDrawBackgroundLayer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32 al return gdl; } -void creditsCopyBackgroundLayer(s32 srcindex, s32 dstindex, bool move) +void credits_copy_background_layer(s32 srcindex, s32 dstindex, bool move) { g_CreditsData->bglayers[dstindex].type = g_CreditsData->bglayers[srcindex].type; g_CreditsData->bglayers[dstindex].rotspeed = g_CreditsData->bglayers[srcindex].rotspeed; @@ -414,7 +414,7 @@ void creditsCopyBackgroundLayer(s32 srcindex, s32 dstindex, bool move) } } -Gfx *creditsDrawBackground(Gfx *gdl) +Gfx *credits_draw_background(Gfx *gdl) { s32 s1[4] = {-1, -1, -1, -1}; u32 s5[4]; @@ -458,7 +458,7 @@ Gfx *creditsDrawBackground(Gfx *gdl) len += 2; } else { if (g_CreditsData->unk41b0[i] == 1) { - creditsCopyBackgroundLayer(i + 2, i, true); + credits_copy_background_layer(i + 2, i, true); } g_CreditsData->unk41b0[i] = 0; @@ -484,7 +484,7 @@ Gfx *creditsDrawBackground(Gfx *gdl) } if (bestindex >= 0) { - gdl = creditsDrawBackgroundLayer(gdl, g_CreditsData->bglayers[s1[bestindex]].type, + gdl = credits_draw_background_layer(gdl, g_CreditsData->bglayers[s1[bestindex]].type, s1[bestindex], s4[bestindex], s2[bestindex], s5[bestindex]); s1[bestindex] = -1; @@ -534,7 +534,7 @@ struct g_CreditParticleConfigs g_CreditParticleConfigs[] = { * * This is only called with max = 0.00223f. */ -f32 creditsRandInRange(f32 range) +f32 credits_rand_in_range(f32 range) { f32 value; @@ -546,7 +546,7 @@ f32 creditsRandInRange(f32 range) return value; } -void creditsCreatePendingBgLayers(u32 mask) +void credits_create_pending_bg_layers(u32 mask) { s32 i; @@ -555,8 +555,8 @@ void creditsCreatePendingBgLayers(u32 mask) if (g_CreditsData->unk41b0[i] == 0) { g_CreditsData->bglayers[i + 2].type = random() % 12; - g_CreditsData->bglayers[i + 2].rotspeed = creditsRandInRange(0.00223f); - g_CreditsData->bglayers[i + 2].panspeed = creditsRandInRange(0.00223f); + g_CreditsData->bglayers[i + 2].rotspeed = credits_rand_in_range(0.00223f); + g_CreditsData->bglayers[i + 2].panspeed = credits_rand_in_range(0.00223f); if (((u8)(mask >> shift) & 2)) { g_CreditsData->bglayers[i + 2].confignum = random() % 6; @@ -565,13 +565,13 @@ void creditsCreatePendingBgLayers(u32 mask) } } -Gfx *creditsFillFramebuffer(Gfx *gdl, u32 colour) +Gfx *credits_fill_framebuffer(Gfx *gdl, u32 colour) { gSPDisplayList(gdl++, &var800613a0); - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); - gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight()); + gDPFillRectangle(gdl++, 0, 0, vi_get_width(), vi_get_height()); gdl = text0f153838(gdl); @@ -582,13 +582,13 @@ Gfx *creditsFillFramebuffer(Gfx *gdl, u32 colour) * An unused function. Renders a white line between two 3D coordinates. * The line would be 10 units high, though I'm not sure if that's big or not. */ -Gfx *creditsRenderLine(Gfx *gdl, struct coord *from, struct coord *to) +Gfx *credits_render_line(Gfx *gdl, struct coord *from, struct coord *to) { Vtx *vertices; Col *colours; - colours = gfxAllocateColours(2); - vertices = gfxAllocateVertices(4); + colours = gfx_allocate_colours(2); + vertices = gfx_allocate_vertices(4); vertices[0].x = from->x; vertices[0].y = from->y; @@ -622,7 +622,7 @@ Gfx *creditsRenderLine(Gfx *gdl, struct coord *from, struct coord *to) return gdl; } -void creditsResetParticles(void) +void credits_reset_particles(void) { f32 tmp; s32 i; @@ -665,7 +665,7 @@ void creditsResetParticles(void) } } -void creditsTickParticles(void) +void credits_tick_particles(void) { s32 i; f32 amount; @@ -684,7 +684,7 @@ void creditsTickParticles(void) } } else { #if VERSION >= VERSION_NTSC_1_0 - if (RANDOMFRAC() < 0.007f && joyGetButtons(0, L_TRIG | R_TRIG) == 0) { + if (RANDOMFRAC() < 0.007f && joy_get_buttons(0, L_TRIG | R_TRIG) == 0) { g_CreditsData->particlecolourindex1 = random() % 4; g_CreditsData->particlecolourweight = 0; } @@ -697,7 +697,7 @@ void creditsTickParticles(void) } #if VERSION >= VERSION_NTSC_1_0 - if (RANDOMFRAC() < 0.002f && joyGetButtons(0, L_TRIG | R_TRIG) == 0) { + if (RANDOMFRAC() < 0.002f && joy_get_buttons(0, L_TRIG | R_TRIG) == 0) { g_CreditsData->particlemovetype = random() % 5; } #else @@ -707,7 +707,7 @@ void creditsTickParticles(void) #endif #if VERSION >= VERSION_NTSC_1_0 - if (joyGetButtonsPressedThisFrame(0, R_TRIG)) { + if (joy_get_buttons_pressed_this_frame(0, R_TRIG)) { g_CreditsData->particlemovetype = random() % 5; if (g_CreditsData->particlecolourindex1 < 0) { @@ -770,7 +770,7 @@ void creditsTickParticles(void) } } -void creditsGetParticlePos(struct coord *pos, struct particle *particle, s32 particlenum) +void credits_get_particle_pos(struct coord *pos, struct particle *particle, s32 particlenum) { f32 sp4c; f32 sp48; @@ -852,7 +852,7 @@ void creditsGetParticlePos(struct coord *pos, struct particle *particle, s32 par } } -Gfx *creditsDrawParticles(Gfx *gdl) +Gfx *credits_draw_particles(Gfx *gdl) { Col *colours; u32 colour; @@ -865,15 +865,15 @@ Gfx *creditsDrawParticles(Gfx *gdl) static u32 tload = 0x25; static u32 dump = 0; - mainOverrideVariable("tload", &tload); - mainOverrideVariable("dump", &dump); + main_override_variable("tload", &tload); + main_override_variable("dump", &dump); - colours = gfxAllocateColours(60); + colours = gfx_allocate_colours(60); for (i = 0; i < 4; i++) { if (g_CreditsData->particlecolourindex1 >= 0) { u32 weight = g_CreditsData->particlecolourweight * 255.0f; - colour = colourBlend(g_CreditColourPalette[g_CreditsData->particlecolourindex1][i], g_CreditColourPalette[g_CreditsData->particlecolourindex2][i], weight); + colour = colour_blend(g_CreditColourPalette[g_CreditsData->particlecolourindex1][i], g_CreditColourPalette[g_CreditsData->particlecolourindex2][i], weight); } else { colour = g_CreditColourPalette[g_CreditsData->particlecolourindex2][i]; } @@ -904,7 +904,7 @@ Gfx *creditsDrawParticles(Gfx *gdl) f32 frac; if (!donetexture) { - texSelect(&gdl, &g_TexGeneralConfigs[g_CreditParticleConfigs[confignum].texturenum], 2, 1, 2, 1, 0); + tex_select(&gdl, &g_TexGeneralConfigs[g_CreditParticleConfigs[confignum].texturenum], 2, 1, 2, 1, 0); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); @@ -921,7 +921,7 @@ Gfx *creditsDrawParticles(Gfx *gdl) donetexture = true; } - creditsGetParticlePos(&pos, &g_CreditsData->particles[i], i); + credits_get_particle_pos(&pos, &g_CreditsData->particles[i], i); frac = 1.0f - (pos.f[2] - -4500.0f) / 3500.0f; @@ -936,7 +936,7 @@ Gfx *creditsDrawParticles(Gfx *gdl) invsine = -sine; invcosine = -cosine; - vertices = gfxAllocateVertices(4); + vertices = gfx_allocate_vertices(4); vertices[0].x = pos.f[0] + radius * (sine + cosine); vertices[0].y = pos.f[1] + radius * (cosine + -sine); @@ -981,7 +981,7 @@ Gfx *creditsDrawParticles(Gfx *gdl) return gdl; } -Gfx *creditsDrawBackgroundText(Gfx *gdl, s32 x, s32 y, char *text, struct fontchar *chars, struct font *font, f32 opacity, f32 speed, f32 spread) +Gfx *credits_draw_background_text(Gfx *gdl, s32 x, s32 y, char *text, struct fontchar *chars, struct font *font, f32 opacity, f32 speed, f32 spread) { f32 sp98; u32 colour1; @@ -991,8 +991,8 @@ Gfx *creditsDrawBackgroundText(Gfx *gdl, s32 x, s32 y, char *text, struct fontch sp98 = ((y / 2) % 100) * M_BADTAU / 100.0f; - colour1 = colourBlend(0x00ffff00, 0xffffff00, 255.0f * spread); - colour2 = colourBlend(0x0000af00, 0xffffff00, 255.0f * spread); + colour1 = colour_blend(0x00ffff00, 0xffffff00, 255.0f * spread); + colour2 = colour_blend(0x0000af00, 0xffffff00, 255.0f * spread); for (i = 4; i >= 0; i--) { f32 f24 = i * 0.2f + g_CreditsParticleRotationFrac * 10.0f * M_BADTAU + sp98; @@ -1002,7 +1002,7 @@ Gfx *creditsDrawBackgroundText(Gfx *gdl, s32 x, s32 y, char *text, struct fontch f26 *= 10.0f; } - colour3 = colourBlend(colour2, colour1, 63 * i); + colour3 = colour_blend(colour2, colour1, 63 * i); colour3 |= (u32)((63.0f + ((4 - i) * 16)) * opacity); if (colour3 & 0x000000ff) { @@ -1017,7 +1017,7 @@ Gfx *creditsDrawBackgroundText(Gfx *gdl, s32 x, s32 y, char *text, struct fontch return gdl; } -Gfx *creditsDrawForegroundText(Gfx *gdl, s32 x, s32 y, char *text, struct fontchar *chars, struct font *font, f32 transfrac, s32 hdir, s32 vdir, s32 stretchtype) +Gfx *credits_draw_foreground_text(Gfx *gdl, s32 x, s32 y, char *text, struct fontchar *chars, struct font *font, f32 transfrac, s32 hdir, s32 vdir, s32 stretchtype) { f32 widthscale; f32 heightscale; @@ -1064,7 +1064,7 @@ Gfx *creditsDrawForegroundText(Gfx *gdl, s32 x, s32 y, char *text, struct fontch return gdl; } -void creditsResetSlides(void) +void credits_reset_slides(void) { u8 pool[NUM_CORE_TEAM]; s32 i; @@ -1282,7 +1282,7 @@ struct credit g_Credits[] = { * core team and are in a random order. The rest are in the same order as * defined in the g_Credits array. */ -struct credit *creditGetByRow(s32 row) +struct credit *credit_get_by_row(s32 row) { // If core team, use the mapping if (g_CreditsData->creditnum > 0 && g_CreditsData->creditnum < ARRAYCOUNT(g_CreditsData->coreteammap)) { @@ -1296,9 +1296,9 @@ struct credit *creditGetByRow(s32 row) return &g_Credits[g_CreditsData->creditnum + row]; } -void creditsTickSlide(void) +void credits_tick_slide(void) { - struct credit *credit = creditGetByRow(0); + struct credit *credit = credit_get_by_row(0); s32 i; f32 durations[] = {4, 8, 12, 16}; // in seconds f32 loadat = durations[credit->durationindex] + 2.0f + 0.142f * (g_CreditsData->numthisslide * 2 - 1); @@ -1319,7 +1319,7 @@ void creditsTickSlide(void) g_CreditsData->numthisslide = 1; do { - credit = creditGetByRow(g_CreditsData->numthisslide - 1); + credit = credit_get_by_row(g_CreditsData->numthisslide - 1); if (credit->more) { g_CreditsData->numthisslide++; @@ -1337,8 +1337,8 @@ void creditsTickSlide(void) g_CreditsData->blacktimer60 = 0; g_CreditsData->unk4208 = 0; - musicEndMenu(); - musicStartPrimary(0); + music_end_menu(); + music_start_primary(0); } } while (credit && credit->more && g_CreditsData->numthisslide < 4); @@ -1346,11 +1346,11 @@ void creditsTickSlide(void) g_CreditsData->unk41a8[i] = random() % 3 | random() % 3 << 2 | random() % 16 << 4; } - creditsCreatePendingBgLayers(0xffffffff); + credits_create_pending_bg_layers(0xffffffff); } } -Gfx *creditsDrawSlide(Gfx *gdl) +Gfx *credits_draw_slide(Gfx *gdl) { s32 i; struct credit *credits[4]; @@ -1375,7 +1375,7 @@ Gfx *creditsDrawSlide(Gfx *gdl) // Iterate the credits on this slide and populate the arrays for (i = 0; i < g_CreditsData->numthisslide; i++) { index = i * 2; - credits[i] = creditGetByRow(i); + credits[i] = credit_get_by_row(i); if (credits[i] == NULL) { g_CreditsData->creditnum = 0; @@ -1384,8 +1384,8 @@ Gfx *creditsDrawSlide(Gfx *gdl) return gdl; } - texts[index + 0] = langGet(credits[i]->text1); - texts[index + 1] = langGet(credits[i]->text2); + texts[index + 0] = lang_get(credits[i]->text1); + texts[index + 1] = lang_get(credits[i]->text2); // Choose first font switch (credits[i]->style) { @@ -1441,11 +1441,11 @@ Gfx *creditsDrawSlide(Gfx *gdl) prevstyle = credits[i]->style; #if VERSION >= VERSION_JPN_FINAL - textMeasure(&textheights[index + 0], &textwidths[index + 0], texts[index + 0], chars[index + 0], fonts[index + 0], -1); - textMeasure(&textheights[index + 1], &textwidths[index + 1], texts[index + 1], chars[index + 1], fonts[index + 1], -1); + text_measure(&textheights[index + 0], &textwidths[index + 0], texts[index + 0], chars[index + 0], fonts[index + 0], -1); + text_measure(&textheights[index + 1], &textwidths[index + 1], texts[index + 1], chars[index + 1], fonts[index + 1], -1); #else - textMeasure(&textheights[index + 0], &textwidths[index + 0], texts[index + 0], chars[index + 0], fonts[index + 0], 0); - textMeasure(&textheights[index + 1], &textwidths[index + 1], texts[index + 1], chars[index + 1], fonts[index + 1], 0); + text_measure(&textheights[index + 0], &textwidths[index + 0], texts[index + 0], chars[index + 0], fonts[index + 0], 0); + text_measure(&textheights[index + 1], &textwidths[index + 1], texts[index + 1], chars[index + 1], fonts[index + 1], 0); #endif // Choose first position @@ -1566,7 +1566,7 @@ Gfx *creditsDrawSlide(Gfx *gdl) speed = 1.0f; } - gdl = creditsDrawBackgroundText(gdl, x[i], y[i] + extray, texts[i], chars[i], fonts[i], opacity, speed, spread); + gdl = credits_draw_background_text(gdl, x[i], y[i] + extray, texts[i], chars[i], fonts[i], opacity, speed, spread); } } @@ -1658,7 +1658,7 @@ Gfx *creditsDrawSlide(Gfx *gdl) } extray = 120 - cury / 2; - gdl = creditsDrawForegroundText(gdl, x[i], y[i] + extray, texts[i], chars[i], fonts[i], + gdl = credits_draw_foreground_text(gdl, x[i], y[i] + extray, texts[i], chars[i], fonts[i], transfrac, hdir, vdir, stretchtype); } } @@ -1674,19 +1674,19 @@ void credits0f13ae04(Mtxf *mtx) // empty } -void creditsTick(void) +void credits_tick(void) { s32 i; static bool flick = false; static u32 type = 0xffff; #if VERSION >= VERSION_NTSC_1_0 - if (joyGetButtonsPressedThisFrame(0, L_TRIG)) { - creditsCreatePendingBgLayers(0xffffffff); + if (joy_get_buttons_pressed_this_frame(0, L_TRIG)) { + credits_create_pending_bg_layers(0xffffffff); } #endif - mainOverrideVariable("for", &type); + main_override_variable("for", &type); if (type < 0xffff) { for (i = 0; i < ARRAYCOUNT(g_CreditsData->bglayers); i++) { @@ -1694,20 +1694,20 @@ void creditsTick(void) } } - mainOverrideVariable("flick", &flick); + main_override_variable("flick", &flick); if (flick) { - creditsCreatePendingBgLayers(0xffffffff); + credits_create_pending_bg_layers(0xffffffff); flick = false; } if (g_CreditsCurFrame2 == 0) { if (g_CreditsUsingAltTitle) { - musicSetStage(STAGE_CREDITS); - musicStartPrimary(0); + music_set_stage(STAGE_CREDITS); + music_start_primary(0); } else { - musicSetStage(STAGE_CREDITS); - musicStartTrackAsMenu(MUSIC_CREDITS); + music_set_stage(STAGE_CREDITS); + music_start_track_as_menu(MUSIC_CREDITS); } } @@ -1717,35 +1717,35 @@ void creditsTick(void) g_CreditsCurFrame2 += g_Vars.diffframe240; g_CreditsParticleRotationFrac = (g_CreditsCurFrame2 % TICKS(4800)) / TICKS(4800.0f); - creditsTickParticles(); + credits_tick_particles(); if (g_CreditsData->slidesenabled) { - creditsTickSlide(); - } else if (RANDOMFRAC() < 0.01f && !joyGetButtons(0, L_TRIG | R_TRIG)) { - creditsCreatePendingBgLayers(0xffffffff); + credits_tick_slide(); + } else if (RANDOMFRAC() < 0.01f && !joy_get_buttons(0, L_TRIG | R_TRIG)) { + credits_create_pending_bg_layers(0xffffffff); } if (!g_CreditsData->slidesenabled && g_CreditsData->blacktimer60 < (PAL ? 1150 : 1360)) { g_CreditsData->blacktimer60 += g_Vars.diffframe60; } #else - if (joyGetButtons(0, R_TRIG) == 0) { + if (joy_get_buttons(0, R_TRIG) == 0) { g_CreditsPrevFrame = g_CreditsCurFrame; g_CreditsCurFrame += g_Vars.diffframe240; g_CreditsCurFrame2 += g_Vars.diffframe240; } - joyGetButtonsPressedThisFrame(0, Z_TRIG); + joy_get_buttons_pressed_this_frame(0, Z_TRIG); g_CreditsParticleRotationFrac = (g_CreditsCurFrame2 % TICKS(4800)) / TICKS(4800.0f); - if (joyGetButtons(0, R_TRIG) == 0) { - creditsTickParticles(); + if (joy_get_buttons(0, R_TRIG) == 0) { + credits_tick_particles(); if (g_CreditsData->slidesenabled) { - creditsTickSlide(); + credits_tick_slide(); } else if (RANDOMFRAC() < 0.01f) { - creditsCreatePendingBgLayers(0xffffffff); + credits_create_pending_bg_layers(0xffffffff); } if (!g_CreditsData->slidesenabled && g_CreditsData->blacktimer60 < TICKS(1360)) { @@ -1755,10 +1755,10 @@ void creditsTick(void) #endif } -Gfx *creditsDraw(Gfx *gdl) +Gfx *credits_draw(Gfx *gdl) { Mtxf sp68; - Mtxf *matrix = gfxAllocateMatrix(); + Mtxf *matrix = gfx_allocate_matrix(); struct coord sp58[1]; struct coord sp4c[1]; @@ -1772,13 +1772,13 @@ Gfx *creditsDraw(Gfx *gdl) g_ScaleX = 1; - gdl = viPrepareZbuf(gdl); + gdl = vi_prepare_zbuf(gdl); gdl = vi0000b1d0(gdl); - gdl = creditsFillFramebuffer(gdl, 0x000000ff); + gdl = credits_fill_framebuffer(gdl, 0x000000ff); - gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 120, viGetWidth() * 4.0f, (viGetHeight() - 30) * 4.0f); + gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 120, vi_get_width() * 4.0f, (vi_get_height() - 30) * 4.0f); - creditsTick(); + credits_tick(); // blacktimer60 is set to 0 when slides are finished, then ticks up // * 0 to 60 is fading to black @@ -1796,7 +1796,7 @@ Gfx *creditsDraw(Gfx *gdl) g_CreditsScrollStarted = true; scrolltimer240 = 0; - menuUnsetModel(&g_CreditsData->menumodel); + menu_unset_model(&g_CreditsData->menumodel); } scrolltimer240 += g_Vars.diffframe240; @@ -1820,16 +1820,16 @@ Gfx *creditsDraw(Gfx *gdl) g_CreditsData->menumodel.drawbehinddialog = true; g_CreditsData->menumodel.partvisibility = NULL; - gdl = menuRenderModel(gdl, &g_CreditsData->menumodel, MENUMODELTYPE_CREDITSLOGO); + gdl = menu_render_model(gdl, &g_CreditsData->menumodel, MENUMODELTYPE_CREDITSLOGO); gSPMatrix(gdl++, osVirtualToPhysical(matrix), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gdl = creditsFillFramebuffer(gdl, 0x000000d8); + gdl = credits_fill_framebuffer(gdl, 0x000000d8); } - mtx4LoadIdentity(&sp68); - mtxF2L(&sp68, matrix); - camSetWorldToScreenMtxf(&sp68); + mtx4_load_identity(&sp68); + mtx_f2l(&sp68, matrix); + cam_set_world_to_screen_mtxf(&sp68); gSPMatrix(gdl++, osVirtualToPhysical(matrix), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -1841,11 +1841,11 @@ Gfx *creditsDraw(Gfx *gdl) sp4c[0].y = 0; sp4c[0].z = -100; - gdl = creditsDrawBackground(gdl); - gdl = creditsDrawParticles(gdl); + gdl = credits_draw_background(gdl); + gdl = credits_draw_particles(gdl); if (g_CreditsData->slidesenabled) { - gdl = creditsDrawSlide(func0f0d479c(gdl)); + gdl = credits_draw_slide(func0f0d479c(gdl)); } if (!g_CreditsData->slidesenabled) { @@ -1862,29 +1862,29 @@ Gfx *creditsDraw(Gfx *gdl) } if (alpha) { - gdl = creditsFillFramebuffer(gdl, alpha); + gdl = credits_fill_framebuffer(gdl, alpha); } } } // Exit the alternative title if a button is pressed (other than L or R) #if VERSION >= VERSION_NTSC_1_0 - if (g_CreditsUsingAltTitle && joyGetButtonsPressedThisFrame(0, 0xffcf)) + if (g_CreditsUsingAltTitle && joy_get_buttons_pressed_this_frame(0, 0xffcf)) #else - if (g_CreditsUsingAltTitle && joyGetButtons(0, 0xffff)) + if (g_CreditsUsingAltTitle && joy_get_buttons(0, 0xffff)) #endif { g_TitleNextStage = STAGE_CITRAINING; - setNumPlayers(1); - mainChangeToStage(g_TitleNextStage); + set_num_players(1); + main_change_to_stage(g_TitleNextStage); g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - lvSetDifficulty(DIFF_A); - viBlack(true); + lv_set_difficulty(DIFF_A); + vi_black(true); } return gdl; @@ -1893,33 +1893,33 @@ Gfx *creditsDraw(Gfx *gdl) /** * Initialise the credits structures and variables. */ -void creditsReset(void) +void credits_reset(void) { g_CreditsCurFrame = 0; g_CreditsCurFrame2 = 0; g_CreditsScrollStarted = false; - g_CreditsData = mempAlloc(sizeof(struct creditsdata), MEMPOOL_STAGE); + g_CreditsData = memp_alloc(sizeof(struct creditsdata), MEMPOOL_STAGE); g_CreditsData->unk2eec = 0; g_CreditsData->unk41b0[0] = 0; g_CreditsData->unk41b0[1] = 0; - creditsCreatePendingBgLayers(0xffffffff); + credits_create_pending_bg_layers(0xffffffff); // Move layers 2 and 3 to 0 and 1 - creditsCopyBackgroundLayer(2, 0, true); - creditsCopyBackgroundLayer(3, 1, true); + credits_copy_background_layer(2, 0, true); + credits_copy_background_layer(3, 1, true); g_CreditsData->slidesenabled = true; - creditsResetParticles(); - creditsResetSlides(); - menuResetModel(&g_CreditsData->menumodel, 0x25800, true); + credits_reset_particles(); + credits_reset_slides(); + menu_reset_model(&g_CreditsData->menumodel, 0x25800, true); g_CreditsData->menumodel.removingpiece = false; - menuConfigureModel(&g_CreditsData->menumodel, 0, 0, 0, 0, 0, 0, 1, MENUMODELFLAG_HASSCALE | MENUMODELFLAG_HASROTATION); + menu_configure_model(&g_CreditsData->menumodel, 0, 0, 0, 0, 0, 0, 1, MENUMODELFLAG_HASSCALE | MENUMODELFLAG_HASROTATION); g_CreditsData->menumodel.newposy = 90; g_CreditsData->menumodel.curposx = 8.2; @@ -1937,14 +1937,14 @@ void creditsReset(void) g_CreditsData->blacktimer60 = TICKS(1140); } - playerConfigureVi(); + player_configure_vi(); } /** * Instruct the credits system to display the alternative title * instead of the regular credits. */ -void creditsRequestAltTitle(void) +void credits_request_alt_title(void) { g_CreditsAltTitleRequested = true; } diff --git a/src/game/debug1.c b/src/game/debug1.c index 892c80ef4..290eab29c 100644 --- a/src/game/debug1.c +++ b/src/game/debug1.c @@ -25,14 +25,14 @@ void dmenu0f118c80nb(void) } #endif -void dmenuSetScaleIndex(s32 index) +void dmenu_set_scale_index(s32 index) { #ifdef DEBUG g_DMenuScaleIndex = index; #endif } -void dmenuSetMenu(char **labels, s32 (*positions)[2], s32 *offsets) +void dmenu_set_menu(char **labels, s32 (*positions)[2], s32 *offsets) { #ifdef DEBUG s32 numgroups; @@ -48,7 +48,7 @@ void dmenuSetMenu(char **labels, s32 (*positions)[2], s32 *offsets) #endif } -Gfx *dmenuRender(Gfx *gdl) +Gfx *dmenu_render(Gfx *gdl) { #ifdef DEBUG s32 xscale = g_DMenuXScales[g_DMenuScaleIndex]; @@ -62,9 +62,9 @@ Gfx *dmenuRender(Gfx *gdl) dmenu0f118c80nb(); if (i != g_DMenuSelectedOption) { - dhudSetFgColour(0xc0, 0xc0, 0xc0, 0xc0); - dhudSetPos((g_DMenuCurPositions[i][0] * xscale - 20) / 4, (g_DMenuCurPositions[i][1] * yscale - 8) / 7); - dhudPrintString(g_DMenuCurLabels[i]); + dhud_set_fg_colour(0xc0, 0xc0, 0xc0, 0xc0); + dhud_set_pos((g_DMenuCurPositions[i][0] * xscale - 20) / 4, (g_DMenuCurPositions[i][1] * yscale - 8) / 7); + dhud_print_string(g_DMenuCurLabels[i]); } } @@ -73,9 +73,9 @@ Gfx *dmenuRender(Gfx *gdl) dmenu0f118c80nb(); if (i == g_DMenuSelectedOption) { - dhudSetFgColour(0xc0, 0, 0, 0xc0); - dhudSetPos((g_DMenuCurPositions[i][0] * xscale - 20) / 4, (g_DMenuCurPositions[i][1] * yscale - 8) / 7); - dhudPrintString(g_DMenuCurLabels[i]); + dhud_set_fg_colour(0xc0, 0, 0, 0xc0); + dhud_set_pos((g_DMenuCurPositions[i][0] * xscale - 20) / 4, (g_DMenuCurPositions[i][1] * yscale - 8) / 7); + dhud_print_string(g_DMenuCurLabels[i]); } } #endif @@ -90,7 +90,7 @@ void debug0f11ed10(s32 arg0, s32 arg1, s32 arg2) } #endif -s32 dmenuGetSelectedOption(void) +s32 dmenu_get_selected_option(void) { #ifdef DEBUG return g_DMenuSelectedOption; @@ -99,14 +99,14 @@ s32 dmenuGetSelectedOption(void) #endif } -void dmenuSetSelectedOption(s32 option) +void dmenu_set_selected_option(s32 option) { #ifdef DEBUG g_DMenuSelectedOption = option; #endif } -void dmenuNavigateUp(void) +void dmenu_navigate_up(void) { #ifdef DEBUG s32 i; @@ -131,7 +131,7 @@ void dmenuNavigateUp(void) #endif } -void dmenuNavigateDown(void) +void dmenu_navigate_down(void) { #ifdef DEBUG s32 i; @@ -156,7 +156,7 @@ void dmenuNavigateDown(void) #endif } -void dmenuNavigateRight(void) +void dmenu_navigate_right(void) { #ifdef DEBUG s32 i; @@ -193,7 +193,7 @@ void dmenuNavigateRight(void) #endif } -void dmenuNavigateLeft(void) +void dmenu_navigate_left(void) { #ifdef DEBUG s32 i; diff --git a/src/game/debug2.c b/src/game/debug2.c index c54053039..8ae62b064 100644 --- a/src/game/debug2.c +++ b/src/game/debug2.c @@ -291,7 +291,7 @@ char *g_DebugMenuLabels[] = { "-", // "cameras" "-", // "ai print" "-", // "eye spy" - "-", // "aiEndLevel off" + "-", // "ai_end_level off" "-", // "bot wzone" "-", // "show patrols" @@ -472,13 +472,13 @@ f32 var80075dd0 = 0; f32 var80075dd4 = 0; f32 var80075dd8 = 1; -void debugUpdateMenu(void) +void debug_update_menu(void) { #ifdef DEBUG s32 i; if (g_DebugCurMenu == DEBUGMENU_MAIN) { - dmenuSetMenu(g_DebugMenuLabels, g_DebugMenuPositions, g_DebugMenuOffsets); + dmenu_set_menu(g_DebugMenuLabels, g_DebugMenuPositions, g_DebugMenuOffsets); } else if (g_DebugCurMenu == DEBUGMENU_CUTSCENE) { for (i = 0; i < ARRAYCOUNT(g_DebugCutsceneLabelPtrs); i++) { g_DebugCutsceneLabelPtrs[i] = g_DebugCutsceneLabelBuffers[i]; @@ -490,7 +490,7 @@ void debugUpdateMenu(void) g_DebugCutsceneOffsets[0]++; for (i = 0; ; i++) { - if (ailistFindById(0xc00 + i) == NULL) { + if (ailist_find_by_id(0xc00 + i) == NULL) { break; } @@ -498,17 +498,17 @@ void debugUpdateMenu(void) g_DebugCutsceneOffsets[0]++; } - dmenuSetMenu(g_DebugCutsceneLabelPtrs, g_DebugCutscenePositions, g_DebugCutsceneOffsets); + dmenu_set_menu(g_DebugCutsceneLabelPtrs, g_DebugCutscenePositions, g_DebugCutsceneOffsets); } - dmenuSetSelectedOption(g_DebugSelectedOptionsByMenu[g_DebugCurMenu]); + dmenu_set_selected_option(g_DebugSelectedOptionsByMenu[g_DebugCurMenu]); #endif } #ifdef DEBUG -void debugSaveSelectedOption(void) +void debug_save_selected_option(void) { - g_DebugSelectedOptionsByMenu[g_DebugCurMenu] = dmenuGetSelectedOption(); + g_DebugSelectedOptionsByMenu[g_DebugCurMenu] = dmenu_get_selected_option(); } void debug0f1193e4nb(void) // not called @@ -538,22 +538,22 @@ void debug0f11944cnb(void) // not called } #endif -bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) +bool debug_process_input(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) { #ifdef DEBUG s32 i; s32 prev; s32 tmp = 3; - debugUpdateMenu(); + debug_update_menu(); if (g_DebugScreenshotRgb) { prev = g_DebugScreenshotRgb++; if (tmp == prev) { - viGrabRgb32(); + vi_grab_rgb32(); g_DebugScreenshotRgb = 0; - viSet16Bit(); + vi_set_16bit(); osViBlack(false); } } @@ -562,9 +562,9 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) prev = g_DebugScreenshotJpg++; if (tmp == prev) { - viGrabJpg32(); + vi_grab_jpg32(); g_DebugScreenshotJpg = 0; - viSet16Bit(); + vi_set_16bit(); osViBlack(false); } } @@ -581,37 +581,37 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) } if (buttonsthisframe & L_JPAD) { - dmenuNavigateLeft(); + dmenu_navigate_left(); var80075d68 = -2; } if (buttonsthisframe & R_JPAD) { - dmenuNavigateRight(); + dmenu_navigate_right(); var80075d68 = -2; } if (buttonsthisframe & U_JPAD) { - dmenuNavigateUp(); + dmenu_navigate_up(); var80075d68 = -2; } if (buttonsthisframe & D_JPAD) { - dmenuNavigateDown(); + dmenu_navigate_down(); var80075d68 = -2; } if (buttonsthisframe & (A_BUTTON | START_BUTTON)) { if (g_DebugCurMenu == DEBUGMENU_CUTSCENE) { - if (dmenuGetSelectedOption() == 0) { + if (dmenu_get_selected_option() == 0) { // Selected "main" from cutscene menu g_DebugCurMenu = DEBUGMENU_MAIN; - dhudClear(); - debugUpdateMenu(); + dhud_clear(); + debug_update_menu(); } else { - cutsceneStart(0xc00 + dmenuGetSelectedOption() - 1); + cutscene_start(0xc00 + dmenu_get_selected_option() - 1); } } else if (g_DebugCurMenu == DEBUGMENU_MAIN) { - switch (dmenuGetSelectedOption()) { + switch (dmenu_get_selected_option()) { #if VERSION == VERSION_PAL_BETA case DEBUGOPT_MANPOS: g_DebugManPos ^= 1; @@ -639,7 +639,7 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) break; case DEBUGOPT_ALLCHALLENGES: g_DebugAllChallenges ^= 1; - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); break; case DEBUGOPT_ALLTRAINING: g_DebugAllTraining ^= 1; @@ -648,16 +648,16 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) g_GameFile.firingrangescores[i] = 0xff; } - gamefileSetFlag(GAMEFILEFLAG_CI_CLOAK_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_DISGUISE_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_XRAY_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_IR_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_RTRACKER_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_DOORDECODER_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_NIGHTVISION_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_CAMSPY_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_ECMMINE_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_UPLINK_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_CLOAK_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_DISGUISE_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_XRAY_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_IR_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_RTRACKER_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_DOORDECODER_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_NIGHTVISION_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_CAMSPY_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_ECMMINE_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_UPLINK_DONE); break; #else case DEBUGOPT_MANPOS: @@ -680,7 +680,7 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) break; case DEBUGOPT_ALLCHALLENGES: g_DebugAllChallenges ^= 1; - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); break; case DEBUGOPT_ALLBUDDIES: g_DebugAllBuddies ^= 1; @@ -692,16 +692,16 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) g_GameFile.firingrangescores[i] = 0xff; } - gamefileSetFlag(GAMEFILEFLAG_CI_CLOAK_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_DISGUISE_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_XRAY_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_IR_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_RTRACKER_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_DOORDECODER_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_NIGHTVISION_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_CAMSPY_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_ECMMINE_DONE); - gamefileSetFlag(GAMEFILEFLAG_CI_UPLINK_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_CLOAK_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_DISGUISE_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_XRAY_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_IR_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_RTRACKER_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_DOORDECODER_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_NIGHTVISION_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_CAMSPY_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_ECMMINE_DONE); + gamefile_set_flag(GAMEFILEFLAG_CI_UPLINK_DONE); break; case DEBUGOPT_CUTDEBUG: g_DebugCutDebug ^= 1; @@ -725,13 +725,13 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) if (buttonsthisframe & START_BUTTON) { if (g_DebugIsMenuOpen == true) { - dhudClear(); + dhud_clear(); } g_DebugIsMenuOpen = false; } - debugSaveSelectedOption(); + debug_save_selected_option(); return g_DebugIsMenuOpen; #else @@ -739,17 +739,17 @@ bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe) #endif } -s32 debugGetProfileMode(void) +s32 debug_get_profile_mode(void) { return DEBUG_VALUE(g_DebugProfileMode, 0); } -bool debugIsBgRenderingEnabled(void) +bool debug_is_bg_rendering_enabled(void) { return DEBUG_VALUE(g_DebugRenderBg, true); } -bool debugIsPropRenderingEnabled(void) +bool debug_is_prop_rendering_enabled(void) { return DEBUG_VALUE(g_DebugRenderProps, true); } @@ -759,12 +759,12 @@ bool debug0f11ed88(void) return DEBUG_VALUE(var80078708nb, false); } -bool debugIsManPosEnabled(void) +bool debug_is_man_pos_enabled(void) { return DEBUG_VALUE(g_DebugManPos, false); } -void debugSetManPos(bool enabled) +void debug_set_man_pos(bool enabled) { #ifdef DEBUG g_DebugManPos = enabled; @@ -781,27 +781,27 @@ bool debug0f11eda8(void) // not called return DEBUG_VALUE(var80078714nb, false); } -bool debugIsRoomGfxExtraMemEnabled(void) +bool debug_is_room_gfx_extra_mem_enabled(void) { return DEBUG_VALUE(g_DebugRoomGfxExtraMem, false); } -bool debugIsObjDeformDebugEnabled(void) +bool debug_is_obj_deform_debug_enabled(void) { return DEBUG_VALUE(g_DebugObjDeform, false); } -bool debugIsRoomStateDebugEnabled(void) +bool debug_is_room_state_debug_enabled(void) { return DEBUG_VALUE(g_DebugRoomState, false); } -bool debugIsLineModeEnabled(void) +bool debug_is_line_mode_enabled(void) { return g_DebugLineMode; } -void debugSetLineModeEnabled(bool enabled) +void debug_set_line_mode_enabled(bool enabled) { g_DebugLineMode = enabled; } @@ -833,22 +833,22 @@ void debug0f11ee00(void) // not called } #endif -bool debugIsTurboModeEnabled(void) +bool debug_is_turbo_mode_enabled(void) { return g_DebugTurboMode; } -void debugSetTurboMode(bool enabled) +void debug_set_turbo_mode(bool enabled) { g_DebugTurboMode = enabled; } -bool debugForceAllObjectivesComplete(void) +bool debug_force_all_objectives_complete(void) { return DEBUG_VALUE(g_DebugObjectives, false); } -bool debugIsZBufferDisabled(void) +bool debug_is_z_buffer_disabled(void) { return DEBUG_VALUE(g_DebugZBufferDisabled, false); } @@ -941,7 +941,7 @@ bool debug0f11ee68(void) // not called //------------------------------------------------------------------------------ -s32 debugGetSlowMotion(void) +s32 debug_get_slow_motion(void) { return DEBUG_VALUE(g_DebugSlowMotion, SLOWMOTION_OFF); } @@ -956,12 +956,12 @@ bool debug0f11ee80(void) // not called return DEBUG_VALUE(var80078760nb, false); } -s32 debugGetTilesDebugMode(void) +s32 debug_get_tiles_debug_mode(void) { return DEBUG_VALUE(g_DebugTiles, 0); } -s32 debugGetPadsDebugMode(void) +s32 debug_get_pads_debug_mode(void) { return DEBUG_VALUE(g_DebugPads, 0); } @@ -995,7 +995,7 @@ bool debug0f119aa4nb(void) } #endif -bool debugDangerousProps(void) +bool debug_dangerous_props(void) { return DEBUG_VALUE(var800787ecnb, false); } @@ -1043,7 +1043,7 @@ bool debug0f11eed0(void) // not called //------------------------------------------------------------------------------ -s32 debugGetMotionBlur(void) +s32 debug_get_motion_blur(void) { return DEBUG_VALUE(var80078784nb, 0); } @@ -1067,7 +1067,7 @@ bool debug0f119b00nb(void) // not called return var800787c0nb; } -bool debugAllowEndLevel(void) +bool debug_allow_end_level(void) { return var800787c4nb; } @@ -1092,34 +1092,34 @@ bool debug0f119b3cnb(void) // not called return var800787d4nb; } -bool debugIsFootstepsEnabled(void) +bool debug_is_footsteps_enabled(void) { return g_DebugFootsteps; } -bool debugIsAllChallengesEnabled(void) +bool debug_is_all_challenges_enabled(void) { return g_DebugAllChallenges; } -bool debugIsAllBuddiesEnabled(void) +bool debug_is_all_buddies_enabled(void) { return g_DebugAllBuddies; } #if VERSION >= VERSION_NTSC_1_0 -bool debugIsSetCompleteEnabled(void) +bool debug_is_set_complete_enabled(void) { return g_DebugSetComplete; } #endif -bool debugIsAllTrainingEnabled(void) +bool debug_is_all_training_enabled(void) { return g_DebugAllTraining; } -bool debugGetCutDebug(void) // not called +bool debug_get_cut_debug(void) // not called { return g_DebugCutDebug; } @@ -1129,7 +1129,7 @@ bool debug0f119b84nb(void) // not called return var800787a8nb; } -bool debugIsMemInfoEnabled(void) +bool debug_is_mem_info_enabled(void) { return g_DebugMemInfo; } @@ -1144,7 +1144,7 @@ bool debug0f119ba8nb(void) // not called return var800787bcnb; } -bool debugIsChrStatsEnabled(void) +bool debug_is_chr_stats_enabled(void) { return g_DebugChrStats; } @@ -1169,7 +1169,7 @@ bool debug0f11eef0(void) // not called return false; } -bool debugIsFootstepsEnabled(void) +bool debug_is_footsteps_enabled(void) { return true; } @@ -1219,7 +1219,7 @@ bool debug0f11ef40(void) // not called return false; } -bool debugAllowEndLevel(void) +bool debug_allow_end_level(void) { return true; } @@ -1249,7 +1249,7 @@ bool debug0f11ef70(void) // not called return false; } -bool debugIsChrStatsEnabled(void) +bool debug_is_chr_stats_enabled(void) { return false; } diff --git a/src/game/dlights.c b/src/game/dlights.c index c00836a0a..30f33e749 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -99,12 +99,12 @@ u32 func0f000920(s32 portalnum1, s32 portalnum2) return 0; } -struct light *roomGetLight(s32 roomnum, s32 lightnum) +struct light *room_get_light(s32 roomnum, s32 lightnum) { return (struct light *)&g_BgLightsFileData[(g_Rooms[roomnum].lightindex + lightnum) * 0x22]; } -u8 roomGetFinalBrightness(s32 roomnum) +u8 room_get_final_brightness(s32 roomnum) { s32 brightness = g_Rooms[roomnum].br_flash + g_Rooms[roomnum].br_settled_regional; @@ -119,7 +119,7 @@ u8 roomGetFinalBrightness(s32 roomnum) return brightness; } -u8 roomGetFinalBrightnessForPlayer(s32 roomnum) +u8 room_get_final_brightness_for_player(s32 roomnum) { s32 brightness = g_Rooms[roomnum].br_flash; @@ -145,7 +145,7 @@ u8 func0f000b18(u32 arg0) return 255; } -u8 roomGetSettledRegionalBrightnessForPlayer(s32 roomnum) +u8 room_get_settled_regional_brightness_for_player(s32 roomnum) { u32 brightness; @@ -162,12 +162,12 @@ u8 roomGetSettledRegionalBrightnessForPlayer(s32 roomnum) return brightness; } -u8 roomGetSettledLocalBrightness(s32 room) +u8 room_get_settled_local_brightness(s32 room) { return g_Rooms[room].br_settled_local & 0xff; } -s32 roomGetFlashBrightness(s32 roomnum) +s32 room_get_flash_brightness(s32 roomnum) { if (g_Rooms[roomnum].br_flash > 255) { return 255; @@ -180,12 +180,12 @@ s32 roomGetFlashBrightness(s32 roomnum) return (g_Rooms[roomnum].flags & ROOMFLAG_BRIGHTNESS_CALCED) ? g_Rooms[roomnum].br_flash : 0; } -f32 roomGetLightOpCurFrac(s32 roomnum) +f32 room_get_light_op_cur_frac(s32 roomnum) { return g_Rooms[roomnum].lightop_cur_frac; } -f32 roomGetFinalBrightnessFrac(s32 roomnum) +f32 room_get_final_brightness_frac(s32 roomnum) { f32 frac = (g_Rooms[roomnum].br_flash + g_Rooms[roomnum].br_settled_regional) / (1.0f / 255.0f); @@ -200,12 +200,12 @@ f32 roomGetFinalBrightnessFrac(s32 roomnum) return frac; } -f32 roomGetSettledRegionalBrightnessFrac(s32 roomnum) +f32 room_get_settled_regional_brightness_frac(s32 roomnum) { return g_Rooms[roomnum].br_settled_regional / 255.0f; } -f32 roomGetSettledLocalBrightnessFrac(s32 roomnum) +f32 room_get_settled_local_brightness_frac(s32 roomnum) { return g_Rooms[roomnum].br_settled_local / 255.0f; } @@ -213,7 +213,7 @@ f32 roomGetSettledLocalBrightnessFrac(s32 roomnum) /** * The resulting position is not a world position. It is relative to the room. */ -bool lightGetBboxCentre(s32 roomnum, u32 lightnum, struct coord *pos) +bool light_get_bbox_centre(s32 roomnum, u32 lightnum, struct coord *pos) { struct light *light = (struct light *)&g_BgLightsFileData[g_Rooms[roomnum].lightindex * 0x22]; s32 i; @@ -236,11 +236,11 @@ bool lightGetBboxCentre(s32 roomnum, u32 lightnum, struct coord *pos) return true; } -bool lightIsHealthy(s32 roomnum, s32 lightnum) +bool light_is_healthy(s32 roomnum, s32 lightnum) { bool healthy; - if (roomnum && roomGetLight(roomnum, lightnum)->healthy) { + if (roomnum && room_get_light(roomnum, lightnum)->healthy) { healthy = true; } else { healthy = false; @@ -249,18 +249,18 @@ bool lightIsHealthy(s32 roomnum, s32 lightnum) return healthy; } -bool lightIsVulnerable(s32 roomnum, s32 lightnum) +bool light_is_vulnerable(s32 roomnum, s32 lightnum) { - struct light *light = roomGetLight(roomnum, lightnum); + struct light *light = room_get_light(roomnum, lightnum); return light->vulnerable; } -bool lightIsOn(s32 roomnum, s32 lightnum) +bool light_is_on(s32 roomnum, s32 lightnum) { bool on; - if (roomnum && roomGetLight(roomnum, lightnum)->on) { + if (roomnum && room_get_light(roomnum, lightnum)->on) { on = true; } else { on = false; @@ -269,12 +269,12 @@ bool lightIsOn(s32 roomnum, s32 lightnum) return on; } -void roomSetFlashBrightness(s32 roomnum, s32 value) +void room_set_flash_brightness(s32 roomnum, s32 value) { g_Rooms[roomnum].br_flash = value; } -void lightGetDirection(s32 roomnum, u32 lightnum, struct coord *dir) +void light_get_direction(s32 roomnum, u32 lightnum, struct coord *dir) { struct light *light = (struct light *)&g_BgLightsFileData[g_Rooms[roomnum].lightindex * 0x22]; light += lightnum; @@ -293,7 +293,7 @@ void func0f0010b4(void) var80061424 = 1; } -void roomSetDefaults(struct room *room) +void room_set_defaults(struct room *room) { room->br_light_min = 0; room->br_light_max = 255; @@ -311,11 +311,11 @@ void roomSetDefaults(struct room *room) room->lightop_duration240 = 0; } -Gfx *lightsSetForRoom(Gfx *gdl, RoomNum roomnum) +Gfx *lights_set_for_room(Gfx *gdl, RoomNum roomnum) { - Lights1 *lights = gfxAllocate(sizeof(Lights1)); + Lights1 *lights = gfx_allocate(sizeof(Lights1)); - u8 brightness = roomGetFinalBrightnessForPlayer(roomnum); + u8 brightness = room_get_final_brightness_for_player(roomnum); u8 a0 = (u32)(brightness * 0.5882353f); lights->a.l.col[0] = a0; @@ -337,31 +337,31 @@ Gfx *lightsSetForRoom(Gfx *gdl, RoomNum roomnum) gSPSetLights1(gdl++, (*lights)); - gSPLookAtX(gdl++, &camGetLookAt()->l[0]); - gSPLookAtY(gdl++, &camGetLookAt()->l[1]); + gSPLookAtX(gdl++, &cam_get_look_at()->l[0]); + gSPLookAtY(gdl++, &cam_get_look_at()->l[1]); return gdl; } -Gfx *lightsSetDefault(Gfx *gdl) +Gfx *lights_set_default(Gfx *gdl) { static Lights1 var80061460 = gdSPDefLights1(0x96, 0x96, 0x96, 0xff, 0xff, 0xff, 0x4d, 0x4d, 0x2e); gSPSetLights1(gdl++, var80061460); - gSPLookAtX(gdl++, &camGetLookAt()->l[0]); - gSPLookAtY(gdl++, &camGetLookAt()->l[1]); + gSPLookAtX(gdl++, &cam_get_look_at()->l[0]); + gSPLookAtY(gdl++, &cam_get_look_at()->l[1]); return gdl; } -void roomInitLights(s32 roomnum) +void room_init_lights(s32 roomnum) { struct room *room = &g_Rooms[roomnum]; struct light *light; s32 i; - bgGetRoomBrightnessRange(roomnum, &room->br_light_min, &room->br_light_max); + bg_get_room_brightness_range(roomnum, &room->br_light_min, &room->br_light_max); room->br_light_min = room->br_light_min / 4; @@ -412,7 +412,7 @@ void roomInitLights(s32 roomnum) room->flags |= ROOMFLAG_LIGHTS_DIRTY; #if VERSION < VERSION_NTSC_1_0 - if (cheatIsActive(CHEAT_PERFECTDARKNESS) && (room->flags & ROOMFLAG_RENDERALWAYS) == 0) { + if (cheat_is_active(CHEAT_PERFECTDARKNESS) && (room->flags & ROOMFLAG_RENDERALWAYS) == 0) { room->lightop = LIGHTOP_SET; room->lightop_to_frac = 0.0f; } @@ -422,7 +422,7 @@ void roomInitLights(s32 roomnum) for (i = 0; i < room->numlights; i++) { #if VERSION < VERSION_NTSC_1_0 - if (cheatIsActive(CHEAT_PERFECTDARKNESS)) { + if (cheat_is_active(CHEAT_PERFECTDARKNESS)) { light->brightness = 0; light->sparkable = (random() % 2) ? true : false; light->healthy = false; @@ -459,7 +459,7 @@ void roomInitLights(s32 roomnum) } } -bool lightsHandleHit(struct coord *gunpos, struct coord *hitpos, s32 roomnum) +bool lights_handle_hit(struct coord *gunpos, struct coord *hitpos, s32 roomnum) { s32 i; f32 f2; @@ -506,8 +506,8 @@ bool lightsHandleHit(struct coord *gunpos, struct coord *hitpos, s32 roomnum) soundpos.y = light->bbox[0].y; soundpos.z = light->bbox[0].z; - roomSetLightBroken(roomnum, i); - psCreate(0, 0, SFX_HIT_GLASS, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, &soundpos, -1.0f, 0, roomnum, -1.0f, -1.0f, -1.0f); + room_set_light_broken(roomnum, i); + ps_create(0, 0, SFX_HIT_GLASS, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, &soundpos, -1.0f, 0, roomnum, -1.0f, -1.0f, -1.0f); return true; } } @@ -518,7 +518,7 @@ bool lightsHandleHit(struct coord *gunpos, struct coord *hitpos, s32 roomnum) return false; } -void roomSetLightsFaulty(s32 roomnum, s32 chance) +void room_set_lights_faulty(s32 roomnum, s32 chance) { struct light *light = (struct light *)&g_BgLightsFileData[g_Rooms[roomnum].lightindex * 0x22]; s32 i; @@ -543,16 +543,16 @@ void roomSetLightsFaulty(s32 roomnum, s32 chance) g_Rooms[roomnum].flags |= ROOMFLAG_LIGHTS_DIRTY; } -void roomSetLightBroken(s32 roomnum, s32 lightnum) +void room_set_light_broken(s32 roomnum, s32 lightnum) { - struct light *light = roomGetLight(roomnum, lightnum); + struct light *light = room_get_light(roomnum, lightnum); light->healthy = false; light->on = false; g_Rooms[roomnum].flags |= ROOMFLAG_LIGHTS_DIRTY; } -void lightsReset(void) +void lights_reset(void) { if (var80061444) { func0f004c6c(); @@ -579,7 +579,7 @@ void func0f001c0c(void) var80061440 = 0; - lightsCalculateRoomDimensions(); + lights_calculate_room_dimensions(); if (1); for (g_NumPortals = 0; g_BgPortals[g_NumPortals].verticesoffset != 0; g_NumPortals++); @@ -594,7 +594,7 @@ void func0f001c0c(void) table4size = align16((u32)var8009cae0 * (u32)var8009cae0); sp68 = align16(g_Vars.roomcount * 8); - mempGetStageFree(); + memp_get_stage_free(); /** * This lighting initialisation needs to build temporary tables in memory. @@ -608,7 +608,7 @@ void func0f001c0c(void) * Note that for some stages the z-buffer allocation must be higher than the * lo-res size to support the lighting needs here. */ - ptr = zbufGetAllocation(); + ptr = zbuf_get_allocation(); var80061434 = (f32 *)ptr; ptr += table1size; @@ -624,7 +624,7 @@ void func0f001c0c(void) s5 = (u8 *)ptr; - var80061420 = mempAlloc(sp68, MEMPOOL_STAGE); + var80061420 = memp_alloc(sp68, MEMPOOL_STAGE); for (i = 0; i < g_NumPortals; i++) { if (PORTAL_IS_CLOSED(i)) { @@ -647,7 +647,7 @@ void func0f001c0c(void) table3size += align4(sp44[i]); } - ptr = mempAlloc(align16(table3size), MEMPOOL_STAGE); + ptr = memp_alloc(align16(table3size), MEMPOOL_STAGE); sp68 += align16(table3size); @@ -674,7 +674,7 @@ void func0f001c0c(void) table3size += align4(sp44[i]); } - ptr = mempAlloc(align16(table3size), MEMPOOL_STAGE); + ptr = memp_alloc(align16(table3size), MEMPOOL_STAGE); align16(table3size); @@ -692,7 +692,7 @@ void func0f001c0c(void) g_Rooms[i].flags |= ROOMFLAG_ONSCREEN; } - lightingTick(); + lighting_tick(); for (i = 1; i < g_Vars.roomcount; i++) { g_Rooms[i].flags &= ~ROOMFLAG_ONSCREEN; @@ -741,14 +741,14 @@ f32 func0f002334(s32 roomnum, f32 mult, s32 portalnum1, s32 portalnum2) f32 result; if (portalnum1 != -1) { - surfacearea = bgCalculatePortalSurfaceArea(portalnum1); + surfacearea = bg_calculate_portal_surface_area(portalnum1); } - result = (bgCalculatePortalSurfaceArea(portalnum2) / (g_Rooms[roomnum].surfacearea - surfacearea)) * mult; + result = (bg_calculate_portal_surface_area(portalnum2) / (g_Rooms[roomnum].surfacearea - surfacearea)) * mult; return result; } -void lightsCalculateRoomDimensions(void) +void lights_calculate_room_dimensions(void) { s32 i; s32 j; @@ -819,7 +819,7 @@ void func0f00259c(s32 roomnum) } for (i = 0; i < g_Rooms[roomnum].numportals; i++) { - f20 += bgCalculatePortalSurfaceArea(g_RoomPortals[g_Rooms[roomnum].roomportallistoffset + i]); + f20 += bg_calculate_portal_surface_area(g_RoomPortals[g_Rooms[roomnum].roomportallistoffset + i]); } sp58 = (g_Rooms[roomnum].surfacearea - f20) / g_Rooms[roomnum].surfacearea; @@ -893,8 +893,8 @@ void func0f002a98(void) g_Vars.remakewallhitvtx = 0; for (i = 1; i < g_Vars.roomcount; i++) { - roomSetDefaults(&g_Rooms[i]); - roomInitLights(i); + room_set_defaults(&g_Rooms[i]); + room_init_lights(i); } var80061420 = NULL; @@ -904,7 +904,7 @@ void func0f002a98(void) } } -void roomSetLightsOn(s32 roomnum, s32 enable) +void room_set_lights_on(s32 roomnum, s32 enable) { struct light *light = (struct light *)&g_BgLightsFileData[g_Rooms[roomnum].lightindex * 0x22]; s32 i; @@ -933,9 +933,9 @@ void roomSetLightsOn(s32 roomnum, s32 enable) * They should be duration60 * 4. This only affects LIGHTOP_TRANSITION, * which makes it start the transition 3/4 of the way into it. */ -void roomSetLightOp(s32 roomnum, s32 operation, u8 br_to, u8 br_from, u8 duration60) +void room_set_light_op(s32 roomnum, s32 operation, u8 br_to, u8 br_from, u8 duration60) { - if (cheatIsActive(CHEAT_PERFECTDARKNESS) == false) { + if (cheat_is_active(CHEAT_PERFECTDARKNESS) == false) { g_Rooms[roomnum].lightop = operation; switch (operation) { @@ -966,7 +966,7 @@ void roomSetLightOp(s32 roomnum, s32 operation, u8 br_to, u8 br_from, u8 duratio } } -bool lightTickBroken(s32 roomnum, s32 lightnum) +bool light_tick_broken(s32 roomnum, s32 lightnum) { struct light *light = (struct light *)(g_BgLightsFileData + ((g_Rooms[roomnum].lightindex + lightnum) * 0x22)); @@ -1047,24 +1047,24 @@ bool lightTickBroken(s32 roomnum, s32 lightnum) break; } - lightGetBboxCentre(roomnum, lightnum, ¢re); + light_get_bbox_centre(roomnum, lightnum, ¢re); room = (void *) ((u8 *) g_BgRooms + (u32) room); centre.x += room->pos.x; centre.y += room->pos.y; centre.z += room->pos.z; - sparksCreate(roomnum, NULL, ¢re, &spa4, &sp8c, sparktype); + sparks_create(roomnum, NULL, ¢re, &spa4, &sp8c, sparktype); if ((random() % 4) == 0) { smokerooms[0] = roomnum; smokerooms[1] = -1; - smokeCreateSimple(¢re, smokerooms, SMOKETYPE_BULLETIMPACT); + smoke_create_simple(¢re, smokerooms, SMOKETYPE_BULLETIMPACT); } - roomFlashLighting(roomnum, 64, 80); - psCreate(NULL, NULL, psGetRandomSparkSound(), -1, -1, PSFLAG_0400, 0, PSTYPE_FOOTSTEP, ¢re, -1.0f, 0, roomnum, -1.0f, -1.0f, -1.0f); + room_flash_lighting(roomnum, 64, 80); + ps_create(NULL, NULL, ps_get_random_spark_sound(), -1, -1, PSFLAG_0400, 0, PSTYPE_FOOTSTEP, ¢re, -1.0f, 0, roomnum, -1.0f, -1.0f, -1.0f); return true; } } else { @@ -1091,14 +1091,14 @@ const char var7f1a7d10[] = "L2 -> Allocated %uK for the compressed acoustic shad const char var7f1a7d50[] = "L2(%d) -> "; const char var7f1a7d5c[] = "L2 -> Finished building portal range table\n"; -void lightingTick(void) +void lighting_tick(void) { s32 i; - roomsTickLighting(); + rooms_tick_lighting(); if (g_Vars.remakewallhitvtx) { - wallhitsRecolour(); + wallhits_recolour(); g_Vars.remakewallhitvtx = false; @@ -1109,7 +1109,7 @@ void lightingTick(void) } #if VERSION >= VERSION_NTSC_1_0 -void lightsConfigureForPerfectDarknessCutscene(void) +void lights_configure_for_perfect_darkness_cutscene(void) { s32 i; s32 j; @@ -1134,7 +1134,7 @@ void lightsConfigureForPerfectDarknessCutscene(void) #endif #if VERSION >= VERSION_NTSC_1_0 -void lightsConfigureForPerfectDarknessGameplay(void) +void lights_configure_for_perfect_darkness_gameplay(void) { s32 i; s32 j; @@ -1159,13 +1159,13 @@ void lightsConfigureForPerfectDarknessGameplay(void) #endif #if VERSION >= VERSION_NTSC_1_0 -void lightsTickPerfectDarkness(void) +void lights_tick_perfect_darkness(void) { if (g_Vars.tickmode != g_LightsPrevTickMode) { if (TICKMODE_CUTSCENE == g_Vars.tickmode && TICKMODE_CUTSCENE != g_LightsPrevTickMode) { - lightsConfigureForPerfectDarknessCutscene(); + lights_configure_for_perfect_darkness_cutscene(); } else if (TICKMODE_NORMAL == g_Vars.tickmode && TICKMODE_NORMAL != g_LightsPrevTickMode) { - lightsConfigureForPerfectDarknessGameplay(); + lights_configure_for_perfect_darkness_gameplay(); } g_LightsPrevTickMode = g_Vars.tickmode; @@ -1173,7 +1173,7 @@ void lightsTickPerfectDarkness(void) } #endif -void roomsTickLighting(void) +void rooms_tick_lighting(void) { #if VERSION >= VERSION_NTSC_1_0 s32 i; @@ -1192,8 +1192,8 @@ void roomsTickLighting(void) u32 stack; #if VERSION >= VERSION_NTSC_1_0 - if (cheatIsActive(CHEAT_PERFECTDARKNESS)) { - lightsTickPerfectDarkness(); + if (cheat_is_active(CHEAT_PERFECTDARKNESS)) { + lights_tick_perfect_darkness(); } #else static s32 prevtickmode = 0; @@ -1228,7 +1228,7 @@ void roomsTickLighting(void) } g_Rooms[i].flags |= ROOMFLAG_LIGHTS_DIRTY; - roomSetLightOp(i, LIGHTOP_NONE, 0, 0, 0); + room_set_light_op(i, LIGHTOP_NONE, 0, 0, 0); break; case LIGHTOP_SETRANDOM: if (g_Rooms[i].lightop_timer240 < 0) { @@ -1255,7 +1255,7 @@ void roomsTickLighting(void) g_Rooms[i].lightop_cur_frac = 0.0f; } } else { - roomSetLightOp(i, LIGHTOP_NONE, 0, 0, 0); + room_set_light_op(i, LIGHTOP_NONE, 0, 0, 0); } g_Rooms[i].flags |= ROOMFLAG_LIGHTS_DIRTY; @@ -1420,17 +1420,17 @@ void roomsTickLighting(void) g_Rooms[i].flags &= ~(ROOMFLAG_BRIGHTNESS_DIRTY_PERM | ROOMFLAG_BRIGHTNESS_DIRTY_TEMP); if (g_Rooms[i].lightop == LIGHTOP_HIGHLIGHT) { - s32 r = roomGetFinalBrightnessForPlayer(i); + s32 r = room_get_final_brightness_for_player(i); s32 g = r; s32 b = r; - scenarioHighlightRoom(i, &r, &g, &b); + scenario_highlight_room(i, &r, &g, &b); g_Rooms[i].highlightfrac_r = r * (1.0f / 255.0f); g_Rooms[i].highlightfrac_g = g * (1.0f / 255.0f); g_Rooms[i].highlightfrac_b = b * (1.0f / 255.0f); } else { - g_Rooms[i].highlightfrac_r = roomGetFinalBrightnessForPlayer(i) * (1.0f / 255.0f); + g_Rooms[i].highlightfrac_r = room_get_final_brightness_for_player(i) * (1.0f / 255.0f); g_Rooms[i].highlightfrac_g = g_Rooms[i].highlightfrac_r; g_Rooms[i].highlightfrac_b = g_Rooms[i].highlightfrac_r; } @@ -1450,7 +1450,7 @@ void roomsTickLighting(void) if (g_Rooms[prop->rooms[i]].flags & ROOMFLAG_NEEDRESHADE) { if (2 == g_IsSwitchingGoggles) { struct chrdata *chr = prop->chr; - propCalculateShadeColour(chr->prop, chr->nextcol, chr->floorcol); + prop_calculate_shade_colour(chr->prop, chr->nextcol, chr->floorcol); } else { struct chrdata *chr = prop->chr; chr->unk32c_18 = true; @@ -1470,7 +1470,7 @@ void roomsTickLighting(void) } } -void lightsTick(void) +void lights_tick(void) { struct hand *hand1 = &g_Vars.currentplayer->hands[0]; struct hand *hand2 = &g_Vars.currentplayer->hands[1]; @@ -1478,7 +1478,7 @@ void lightsTick(void) func0f005bb0(); if (hand1->flashon || hand2->flashon) { - roomFlashLighting(g_Vars.currentplayer->prop->rooms[0], 64, 80); + room_flash_lighting(g_Vars.currentplayer->prop->rooms[0], 64, 80); } } @@ -1492,7 +1492,7 @@ void func0f004384(void) * * The room must not have ROOMFLAG_OUTDOORS. */ -void roomFlashLighting(s32 roomnum, s32 start, s32 limit) +void room_flash_lighting(s32 roomnum, s32 start, s32 limit) { if (var80061420 && !(g_Rooms[roomnum].flags & ROOMFLAG_OUTDOORS ? 1 : 0)) { s32 value; @@ -1516,7 +1516,7 @@ void roomFlashLighting(s32 roomnum, s32 start, s32 limit) // @bug: Should be checking neighbournum flags, not roomnum if (!(g_Rooms[roomnum].flags & ROOMFLAG_OUTDOORS ? 1 : 0)) { - roomFlashLocalLighting(neighbournum, increment, limit); + room_flash_local_lighting(neighbournum, increment, limit); } value = func0f177c8c(var80061420[roomnum].unk04, &sp78, &neighbournum); @@ -1524,7 +1524,7 @@ void roomFlashLighting(s32 roomnum, s32 start, s32 limit) } } -void roomFlashLocalLighting(s32 roomnum, s32 increment, s32 limit) +void room_flash_local_lighting(s32 roomnum, s32 increment, s32 limit) { if (roomnum) { if (g_Rooms[roomnum].flags & ROOMFLAG_ONSCREEN) { @@ -1551,7 +1551,7 @@ void roomFlashLocalLighting(s32 roomnum, s32 increment, s32 limit) } } -void roomHighlight(s32 roomnum) +void room_highlight(s32 roomnum) { s32 i; s32 tmpr; @@ -1577,9 +1577,9 @@ void roomHighlight(s32 roomnum) g_Rooms[roomnum].flags |= ROOMFLAG_BRIGHTNESS_DIRTY_PERM; } - br_settled_regional = roomGetSettledRegionalBrightnessForPlayer(roomnum); + br_settled_regional = room_get_settled_regional_brightness_for_player(roomnum); numcolours = g_Rooms[roomnum].gfxdata->numcolours; - dst = gfxAllocateColours(numcolours); + dst = gfx_allocate_colours(numcolours); g_Rooms[roomnum].colours = dst; extra = g_Rooms[roomnum].br_flash; @@ -1646,7 +1646,7 @@ void roomHighlight(s32 roomnum) } if (g_Rooms[roomnum].lightop == LIGHTOP_HIGHLIGHT) { - scenarioHighlightRoom(roomnum, &red, &green, &blue); + scenario_highlight_room(roomnum, &red, &green, &blue); } if (red > 255) { @@ -1708,7 +1708,7 @@ void func0f004c6c(void) } s4 = align16(s4); - ptr = mempAlloc(align16(s4), MEMPOOL_STAGE); + ptr = memp_alloc(align16(s4), MEMPOOL_STAGE); var80061430 = (void *)ptr; ptr += sp38; @@ -1730,7 +1730,7 @@ void func0f004c6c(void) align16((s32)s4); - ptr = mempGetNextStageAllocation(); + ptr = memp_get_next_stage_allocation(); var8009cad0 = (void *)ptr; ptr += sp44; @@ -1759,9 +1759,9 @@ void func0f004c6c(void) } for (i = 0; i < g_NumPortals; i++) { - var8009cad8[i] = portalGetXluFrac(i) > 0.5f; + var8009cad8[i] = portal_get_xlu_frac(i) > 0.5f; - portalGetAvgVertexPos(i, &var80061428[i]); + portal_get_avg_vertex_pos(i, &var80061428[i]); } if (g_Vars.stagenum == STAGE_INVESTIGATION) { @@ -1877,7 +1877,7 @@ f32 func0f0053d0(s32 roomnum1, struct coord *pos1, s32 portalnum1, s32 roomnum2, f32 xdiff2; f32 zdiff2; - portalGetAvgVertexPos(portalnum1, &sp44); + portal_get_avg_vertex_pos(portalnum1, &sp44); sp64 -= sp50; xdiff2 = sp44.x - pos1->x; @@ -1895,7 +1895,7 @@ f32 func0f0053d0(s32 roomnum1, struct coord *pos1, s32 portalnum1, s32 roomnum2, f32 xdiff3; f32 zdiff3; - portalGetAvgVertexPos(portalnum2, &sp2c); + portal_get_avg_vertex_pos(portalnum2, &sp2c); sp64 -= sp38; xdiff3 = sp2c.x - pos2->x; @@ -1998,7 +1998,7 @@ void func0f0059fc(s32 roomnum1, struct coord *pos1, s32 roomnum2, struct coord * *result = 32767; if (roomnum1 == roomnum2) { - *result = coordsGetDistance(pos1, pos2); + *result = coords_get_distance(pos1, pos2); return; } @@ -2028,7 +2028,7 @@ void func0f0059fc(s32 roomnum1, struct coord *pos1, s32 roomnum2, struct coord * */ void func0f005bb0(void) { - s32 brightness = roomGetFinalBrightness(g_Vars.currentplayer->prop->rooms[0]); + s32 brightness = room_get_final_brightness(g_Vars.currentplayer->prop->rooms[0]); if (((USINGDEVICE(DEVICE_NIGHTVISION) || USINGDEVICE(DEVICE_IRSCANNER)) && !g_Vars.currentplayer->usinggoggles) || ((!USINGDEVICE(DEVICE_NIGHTVISION) && !USINGDEVICE(DEVICE_IRSCANNER)) && g_Vars.currentplayer->usinggoggles)) { @@ -2037,16 +2037,16 @@ void func0f005bb0(void) g_Vars.currentplayer->usinggoggles = USINGDEVICE(DEVICE_NIGHTVISION) || USINGDEVICE(DEVICE_IRSCANNER); - if (USINGDEVICE(DEVICE_NIGHTVISION) && !lvIsPaused()) { + if (USINGDEVICE(DEVICE_NIGHTVISION) && !lv_is_paused()) { // Play the goggle's hum sound if (g_Vars.currentplayer->nvhum == NULL) { - sndStart(var80095200, SFX_0505, &g_Vars.currentplayer->nvhum, -1, -1, -1.0f, -1, -1); + snd_start(var80095200, SFX_0505, &g_Vars.currentplayer->nvhum, -1, -1, -1.0f, -1, -1); } if (brightness > 128) { // Room is too bright for night vision - play overload sound if (g_Vars.currentplayer->nvoverload == NULL) { - sndStart(var80095200, SFX_01BE, &g_Vars.currentplayer->nvoverload, -1, -1, -1.0f, -1, -1); + snd_start(var80095200, SFX_01BE, &g_Vars.currentplayer->nvoverload, -1, -1, -1.0f, -1, -1); } } else { // Room is dark enough for night vision - stop overload sound if active diff --git a/src/game/dyntex.c b/src/game/dyntex.c index 97ebf827c..414a54d5e 100644 --- a/src/game/dyntex.c +++ b/src/game/dyntex.c @@ -27,9 +27,9 @@ * Vertices contain an offset to the graphics vertex, as well as a copy of its * S and T values. * - * The caller should call dyntexSetCurrentRoom and dyntexSetCurrentType, then - * add vertices with dyntexAddVertex. Lastly, dyntexTickRoom should be called - * on each tick for each nearby room. dyntexTickRoom can be called multiple + * The caller should call dyntex_set_current_room and dyntex_set_current_type, then + * add vertices with dyntex_add_vertex. Lastly, dyntex_tick_room should be called + * on each tick for each nearby room. dyntex_tick_room can be called multiple * times on the same frame (such as if there's two players), as dyntex will * ensure it's only updated once per frame. * @@ -73,7 +73,7 @@ s32 g_DyntexRoomsCount = 0; s32 g_DyntexTypesCount = 0; s32 g_DyntexVerticesCount = 0; -void dyntexUpdateLinear(Vtx *vertices, struct dyntextype *type) +void dyntex_update_linear(Vtx *vertices, struct dyntextype *type) { s16 tmp = (s32) (g_Lv80SecIntervalFrac * 10.0f * 4096.0f) % 4096; s32 i; @@ -86,7 +86,7 @@ void dyntexUpdateLinear(Vtx *vertices, struct dyntextype *type) } } -void dyntexUpdateReset(Vtx *vertices, struct dyntextype *type) +void dyntex_update_reset(Vtx *vertices, struct dyntextype *type) { s32 i; @@ -98,7 +98,7 @@ void dyntexUpdateReset(Vtx *vertices, struct dyntextype *type) } } -void dyntexUpdateMonitor(Vtx *vertices, struct dyntextype *type) +void dyntex_update_monitor(Vtx *vertices, struct dyntextype *type) { s16 tmp = (s32) (g_Lv80SecIntervalFrac * 4.0f * 4096.0f) % 4096; s32 i; @@ -111,7 +111,7 @@ void dyntexUpdateMonitor(Vtx *vertices, struct dyntextype *type) } } -void dyntexUpdateOcean(Vtx *vertices, struct dyntextype *type) +void dyntex_update_ocean(Vtx *vertices, struct dyntextype *type) { f32 f24 = g_Lv80SecIntervalFrac * 5.0f; f32 angle; @@ -120,8 +120,8 @@ void dyntexUpdateOcean(Vtx *vertices, struct dyntextype *type) static u32 ripsize = 65; static u32 modula = 22; - mainOverrideVariable("modula", &modula); - mainOverrideVariable("ripsize", &ripsize); + main_override_variable("modula", &modula); + main_override_variable("ripsize", &ripsize); for (i = 0; i < type->numvertices; i++) { Vtx *vertex = (Vtx *)((s32)vertices + g_DyntexVertices[type->vertexlistoffset + i].offset); @@ -134,7 +134,7 @@ void dyntexUpdateOcean(Vtx *vertices, struct dyntextype *type) } } -void dyntexUpdateArrows(Vtx *vertices, struct dyntextype *type) +void dyntex_update_arrows(Vtx *vertices, struct dyntextype *type) { s32 tmp = ((s32) ((1.0f - g_Lv80SecIntervalFrac) * 60.0f * 8.0f) % 8) * 256; s32 i; @@ -147,7 +147,7 @@ void dyntexUpdateArrows(Vtx *vertices, struct dyntextype *type) } } -void dyntexTickRoom(s32 roomnum, Vtx *vertices) +void dyntex_tick_room(s32 roomnum, Vtx *vertices) { s32 index = -1; s32 i; @@ -232,36 +232,36 @@ void dyntexTickRoom(s32 roomnum, Vtx *vertices) switch (g_DyntexTypes[g_DyntexRooms[index].typelistoffset + i].type) { case DYNTEXTYPE_RIVER: - dyntexUpdateLinear(vertices, type); + dyntex_update_linear(vertices, type); break; case DYNTEXTYPE_MONITOR: - dyntexUpdateMonitor(vertices, type); + dyntex_update_monitor(vertices, type); break; case DYNTEXTYPE_OCEAN: - dyntexUpdateOcean(vertices, type); + dyntex_update_ocean(vertices, type); break; case DYNTEXTYPE_ARROWS: - dyntexUpdateArrows(vertices, type); + dyntex_update_arrows(vertices, type); break; case DYNTEXTYPE_TELEPORTAL: // Deep Sea - teleports enabled and not SA disabled - if (chrHasStageFlag(0, 0x00000100) && !chrHasStageFlag(0, 0x00010000)) { - dyntexUpdateLinear(vertices, type); + if (chr_has_stage_flag(0, 0x00000100) && !chr_has_stage_flag(0, 0x00010000)) { + dyntex_update_linear(vertices, type); } break; case DYNTEXTYPE_POWERRING: - if (chrHasStageFlag(0, 0x00010000)) { + if (chr_has_stage_flag(0, 0x00010000)) { // Attack Ship engines are destroyed - dyntexUpdateReset(vertices, type); + dyntex_update_reset(vertices, type); } else { // Attack Ship engines are healthy - dyntexUpdateLinear(vertices, type); + dyntex_update_linear(vertices, type); } break; case DYNTEXTYPE_POWERJUICE: - if (!chrHasStageFlag(0, 0x00010000)) { + if (!chr_has_stage_flag(0, 0x00010000)) { // Attack Ship engines are healthy - dyntexUpdateLinear(vertices, type); + dyntex_update_linear(vertices, type); } break; } @@ -270,7 +270,7 @@ void dyntexTickRoom(s32 roomnum, Vtx *vertices) g_DyntexRooms[index].updatedframe = g_Vars.lvframenum; } -void dyntexAddVertex(Vtx *vertex) +void dyntex_add_vertex(Vtx *vertex) { if (g_DyntexCurRoom < 0) { return; @@ -317,7 +317,7 @@ void dyntexAddVertex(Vtx *vertex) g_DyntexTypes[g_DyntexTypesCount - 1].numvertices++; } -void dyntexSetCurrentType(s16 type) +void dyntex_set_current_type(s16 type) { // Air Base - don't animate anything (exterior water) if (g_StageIndex == STAGEINDEX_AIRBASE) { @@ -354,7 +354,7 @@ void dyntexSetCurrentType(s16 type) g_DyntexCurType = type; } -void dyntexSetCurrentRoom(RoomNum roomnum) +void dyntex_set_current_room(RoomNum roomnum) { s32 i; @@ -374,7 +374,7 @@ void dyntexSetCurrentRoom(RoomNum roomnum) } } -void dyntexReset(void) +void dyntex_reset(void) { u32 size3; u32 size2; @@ -392,13 +392,13 @@ void dyntexReset(void) g_DyntexRoomsMax = 50; size1 = ALIGN64(g_DyntexTypesMax * sizeof(struct dyntextype)); - g_DyntexTypes = mempAlloc(size1, MEMPOOL_STAGE); + g_DyntexTypes = memp_alloc(size1, MEMPOOL_STAGE); size2 = ALIGN64(g_DyntexVerticesMax * sizeof(struct dyntexvtx)); - g_DyntexVertices = mempAlloc(size2, MEMPOOL_STAGE); + g_DyntexVertices = memp_alloc(size2, MEMPOOL_STAGE); size3 = ALIGN64(g_DyntexRoomsMax * sizeof(struct dyntexroom)); - g_DyntexRooms = mempAlloc(size3, MEMPOOL_STAGE); + g_DyntexRooms = memp_alloc(size3, MEMPOOL_STAGE); if (g_DyntexVerticesMax); if (g_DyntexTypesMax); @@ -423,7 +423,7 @@ void dyntex0f13c4e8(void) // empty } -bool dyntexHasRoom(void) +bool dyntex_has_room(void) { return g_DyntexCurRoom >= 0; } diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 545e52f64..d837e2860 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -42,17 +42,17 @@ #define CHEATINFO_SET_TIMED_CHEATNUM(cheatnum) (cheatnum) #define CHEATINFO_SET_COMPL_CHEATNUM(cheatnum) ((cheatnum) << 16) -MenuItemHandlerResult endscreenHandleDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreen_handle_decline_mission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - menuPopDialog(); + menu_pop_dialog(); + menu_pop_dialog(); } return 0; } -MenuDialogHandlerResult endscreenHandleRetryMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult endscreen_handle_retry_mission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_TICK: @@ -72,8 +72,8 @@ MenuDialogHandlerResult endscreenHandleRetryMission(s32 operation, struct menudi bool accept = false; if (inputs->back) { - menuPopDialog(); - menuPopDialog(); + menu_pop_dialog(); + menu_pop_dialog(); } inputs->back = false; @@ -94,7 +94,7 @@ MenuDialogHandlerResult endscreenHandleRetryMission(s32 operation, struct menudi if (accept) { union handlerdata data2; - menuhandlerAcceptMission(MENUOP_SET, &dialogdef->items[1], &data2); + menuhandler_accept_mission(MENUOP_SET, &dialogdef->items[1], &data2); } #if VERSION >= VERSION_NTSC_FINAL } @@ -106,48 +106,48 @@ MenuDialogHandlerResult endscreenHandleRetryMission(s32 operation, struct menudi return menudialog00103608(operation, dialogdef, data); } -char *endscreenMenuTitleRetryMission(struct menudialogdef *dialogdef) +char *endscreen_menu_title_retry_mission(struct menudialogdef *dialogdef) { char *name; char *prefix; if (g_Menus[g_MpPlayerNum].curdialog->definition != dialogdef) { - return langGet(L_OPTIONS_300); // "Objectives" + return lang_get(L_OPTIONS_300); // "Objectives" } - prefix = langGet(L_OPTIONS_296); // "Retry" - name = langGet(g_SoloStages[g_MissionConfig.stageindex].name3); + prefix = lang_get(L_OPTIONS_296); // "Retry" + name = lang_get(g_SoloStages[g_MissionConfig.stageindex].name3); sprintf(g_StringPointer, "%s: %s\n", prefix, name); return g_StringPointer; } -char *endscreenMenuTitleNextMission(struct menudialogdef *dialogdef) +char *endscreen_menu_title_next_mission(struct menudialogdef *dialogdef) { char *name; char *prefix; if (g_Menus[g_MpPlayerNum].curdialog->definition != dialogdef) { - return langGet(L_OPTIONS_300); // "Objectives" + return lang_get(L_OPTIONS_300); // "Objectives" } - prefix = langGet(L_OPTIONS_297); // "Next Mission" - name = langGet(g_SoloStages[g_MissionConfig.stageindex].name3); + prefix = lang_get(L_OPTIONS_297); // "Next Mission" + name = lang_get(g_SoloStages[g_MissionConfig.stageindex].name3); sprintf(g_StringPointer, "%s: %s\n", prefix, name); return g_StringPointer; } -MenuItemHandlerResult endscreenHandleReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreen_handle_replay_previous_mission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.stageindex--; g_MissionConfig.stagenum = g_SoloStages[g_MissionConfig.stageindex].stagenum; } - return menuhandlerAcceptMission(operation, NULL, data); + return menuhandler_accept_mission(operation, NULL, data); } struct menuitem g_RetryMissionMenuItems[] = { @@ -165,7 +165,7 @@ struct menuitem g_RetryMissionMenuItems[] = { 0, L_OPTIONS_298, // "Accept" 0, - menuhandlerAcceptMission, + menuhandler_accept_mission, }, { MENUITEMTYPE_SELECTABLE, @@ -173,16 +173,16 @@ struct menuitem g_RetryMissionMenuItems[] = { 0, L_OPTIONS_299, // "Decline" 0, - endscreenHandleDeclineMission, + endscreen_handle_decline_mission, }, { MENUITEMTYPE_END }, }; struct menudialogdef g_RetryMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&endscreenMenuTitleRetryMission, + (uintptr_t)&endscreen_menu_title_retry_mission, g_RetryMissionMenuItems, - endscreenHandleRetryMission, + endscreen_handle_retry_mission, MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, &g_PreAndPostMissionBriefingMenuDialog, }; @@ -202,7 +202,7 @@ struct menuitem g_NextMissionMenuItems[] = { 0, L_OPTIONS_298, // "Accept" 0, - menuhandlerAcceptMission, + menuhandler_accept_mission, }, { MENUITEMTYPE_SELECTABLE, @@ -210,7 +210,7 @@ struct menuitem g_NextMissionMenuItems[] = { 0, L_OPTIONS_299, // "Decline" 0, - endscreenHandleDeclineMission, + endscreen_handle_decline_mission, }, { MENUITEMTYPE_SEPARATOR, @@ -226,66 +226,66 @@ struct menuitem g_NextMissionMenuItems[] = { 0, L_MISC_470, // "Replay Previous Mission" 0, - endscreenHandleReplayPreviousMission, + endscreen_handle_replay_previous_mission, }, { MENUITEMTYPE_END }, }; struct menudialogdef g_NextMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&endscreenMenuTitleNextMission, + (uintptr_t)&endscreen_menu_title_next_mission, g_NextMissionMenuItems, - endscreenHandleRetryMission, + endscreen_handle_retry_mission, MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, &g_PreAndPostMissionBriefingMenuDialog, }; -char *endscreenMenuTextNumKills(struct menuitem *item) +char *endscreen_menu_text_num_kills(struct menuitem *item) { - sprintf(g_StringPointer, "%d", mpstatsGetPlayerKillCount()); + sprintf(g_StringPointer, "%d", mpstats_get_player_kill_count()); return g_StringPointer; } -char *endscreenMenuTextNumShots(struct menuitem *item) +char *endscreen_menu_text_num_shots(struct menuitem *item) { - sprintf(g_StringPointer, "%d", mpstatsGetPlayerShotCountByRegion(SHOTREGION_TOTAL)); + sprintf(g_StringPointer, "%d", mpstats_get_player_shot_count_by_region(SHOTREGION_TOTAL)); return g_StringPointer; } -char *endscreenMenuTextNumHeadShots(struct menuitem *item) +char *endscreen_menu_text_num_head_shots(struct menuitem *item) { - sprintf(g_StringPointer, "%d", mpstatsGetPlayerShotCountByRegion(SHOTREGION_HEAD)); + sprintf(g_StringPointer, "%d", mpstats_get_player_shot_count_by_region(SHOTREGION_HEAD)); return g_StringPointer; } -char *endscreenMenuTextNumBodyShots(struct menuitem *item) +char *endscreen_menu_text_num_body_shots(struct menuitem *item) { - sprintf(g_StringPointer, "%d", mpstatsGetPlayerShotCountByRegion(SHOTREGION_BODY)); + sprintf(g_StringPointer, "%d", mpstats_get_player_shot_count_by_region(SHOTREGION_BODY)); return g_StringPointer; } -char *endscreenMenuTextNumLimbShots(struct menuitem *item) +char *endscreen_menu_text_num_limb_shots(struct menuitem *item) { - sprintf(g_StringPointer, "%d", mpstatsGetPlayerShotCountByRegion(SHOTREGION_LIMB)); + sprintf(g_StringPointer, "%d", mpstats_get_player_shot_count_by_region(SHOTREGION_LIMB)); return g_StringPointer; } -char *endscreenMenuTextNumOtherShots(struct menuitem *item) +char *endscreen_menu_text_num_other_shots(struct menuitem *item) { - u32 total = mpstatsGetPlayerShotCountByRegion(SHOTREGION_GUN) + mpstatsGetPlayerShotCountByRegion(SHOTREGION_HAT); + u32 total = mpstats_get_player_shot_count_by_region(SHOTREGION_GUN) + mpstats_get_player_shot_count_by_region(SHOTREGION_HAT); sprintf(g_StringPointer, "%d", total); return g_StringPointer; } -char *endscreenMenuTextAccuracy(struct menuitem *item) +char *endscreen_menu_text_accuracy(struct menuitem *item) { - s32 total = mpstatsGetPlayerShotCountByRegion(SHOTREGION_TOTAL); - s32 numhead = mpstatsGetPlayerShotCountByRegion(SHOTREGION_HEAD); - s32 numbody = mpstatsGetPlayerShotCountByRegion(SHOTREGION_BODY); - s32 numlimb = mpstatsGetPlayerShotCountByRegion(SHOTREGION_LIMB); - s32 numgun = mpstatsGetPlayerShotCountByRegion(SHOTREGION_GUN); - s32 numhat = mpstatsGetPlayerShotCountByRegion(SHOTREGION_HAT); - s32 numobject = mpstatsGetPlayerShotCountByRegion(SHOTREGION_OBJECT); + s32 total = mpstats_get_player_shot_count_by_region(SHOTREGION_TOTAL); + s32 numhead = mpstats_get_player_shot_count_by_region(SHOTREGION_HEAD); + s32 numbody = mpstats_get_player_shot_count_by_region(SHOTREGION_BODY); + s32 numlimb = mpstats_get_player_shot_count_by_region(SHOTREGION_LIMB); + s32 numgun = mpstats_get_player_shot_count_by_region(SHOTREGION_GUN); + s32 numhat = mpstats_get_player_shot_count_by_region(SHOTREGION_HAT); + s32 numobject = mpstats_get_player_shot_count_by_region(SHOTREGION_OBJECT); f32 accuracy; if (total > 0) { @@ -303,135 +303,135 @@ char *endscreenMenuTextAccuracy(struct menuitem *item) return g_StringPointer; } -char *endscreenMenuTextMissionStatus(struct menuitem *item) +char *endscreen_menu_text_mission_status(struct menuitem *item) { if (g_CheatsActiveBank0 || g_CheatsActiveBank1) { - return langGet(L_MPWEAPONS_135); // "Cheated" + return lang_get(L_MPWEAPONS_135); // "Cheated" } if (g_Vars.coopplayernum >= 0) { if (g_Vars.bond->aborted || g_Vars.coop->aborted) { - return langGet(L_OPTIONS_295); // "Aborted" + return lang_get(L_OPTIONS_295); // "Aborted" } if (g_Vars.bond->isdead && g_Vars.coop->isdead) { - return langGet(L_OPTIONS_293); // "Failed" + return lang_get(L_OPTIONS_293); // "Failed" } } else if (g_Vars.antiplayernum >= 0) { if (g_Vars.currentplayer == g_Vars.bond) { if (g_Vars.bond->aborted) { - return langGet(L_OPTIONS_295); // "Aborted" + return lang_get(L_OPTIONS_295); // "Aborted" } if (g_Vars.anti->aborted) { - return langGet(L_OPTIONS_295); // "Aborted" + return lang_get(L_OPTIONS_295); // "Aborted" } if (g_Vars.bond->isdead) { - return langGet(L_OPTIONS_293); // "Failed" + return lang_get(L_OPTIONS_293); // "Failed" } } else { if (g_Vars.anti->aborted) { - return langGet(L_OPTIONS_295); // "Aborted" + return lang_get(L_OPTIONS_295); // "Aborted" } if (!g_Vars.bond->aborted && !g_Vars.bond->isdead) { - return langGet(L_OPTIONS_293); // "Failed" + return lang_get(L_OPTIONS_293); // "Failed" } } } else { if (g_Vars.bond->aborted) { - return langGet(L_OPTIONS_295); // "Aborted" + return lang_get(L_OPTIONS_295); // "Aborted" } if (g_Vars.bond->isdead) { - return langGet(L_OPTIONS_293); // "Failed" + return lang_get(L_OPTIONS_293); // "Failed" } } - if (objectiveIsAllComplete() == false) { - return langGet(L_OPTIONS_293); // "Failed" + if (objective_is_all_complete() == false) { + return lang_get(L_OPTIONS_293); // "Failed" } if (g_StageIndex == STAGEINDEX_DEFENSE) { - return langGet(L_MPWEAPONS_062); // "Unknown" + return lang_get(L_MPWEAPONS_062); // "Unknown" } - return langGet(L_OPTIONS_294); // "Completed" + return lang_get(L_OPTIONS_294); // "Completed" } -char *endscreenMenuTextAgentStatus(struct menuitem *item) +char *endscreen_menu_text_agent_status(struct menuitem *item) { if (g_CheatsActiveBank0 || g_CheatsActiveBank1) { - return langGet(L_MPWEAPONS_134); // "Dishonored" + return lang_get(L_MPWEAPONS_134); // "Dishonored" } if (g_Vars.currentplayer->aborted) { - return langGet(L_OPTIONS_292); // "Disavowed" + return lang_get(L_OPTIONS_292); // "Disavowed" } if (g_Vars.currentplayer->isdead) { - return langGet(L_OPTIONS_290); // "Deceased" + return lang_get(L_OPTIONS_290); // "Deceased" } if (g_StageIndex == STAGEINDEX_DEFENSE) { - return langGet(L_MPWEAPONS_063); // "Missing" + return lang_get(L_MPWEAPONS_063); // "Missing" } - return langGet(L_OPTIONS_291); // "Active" + return lang_get(L_OPTIONS_291); // "Active" } -char *endscreenMenuTitleStageCompleted(struct menuitem *item) +char *endscreen_menu_title_stage_completed(struct menuitem *item) { #if VERSION >= VERSION_NTSC_1_0 sprintf(g_StringPointer, "%s: %s\n", - langGet(g_SoloStages[g_Menus[g_MpPlayerNum].endscreen.stageindex].name3), - langGet(L_OPTIONS_276)); // "Completed" + lang_get(g_SoloStages[g_Menus[g_MpPlayerNum].endscreen.stageindex].name3), + lang_get(L_OPTIONS_276)); // "Completed" #else sprintf(g_StringPointer, "%s: %s\n", - langGet(g_SoloStages[g_MissionConfig.stageindex].name3), - langGet(L_OPTIONS_276)); // "Completed" + lang_get(g_SoloStages[g_MissionConfig.stageindex].name3), + lang_get(L_OPTIONS_276)); // "Completed" #endif return g_StringPointer; } #if VERSION >= VERSION_NTSC_1_0 -char *endscreenMenuTextCurrentStageName3(struct menuitem *item) +char *endscreen_menu_text_current_stage_name3(struct menuitem *item) { - char *name = langGet(g_SoloStages[g_MissionConfig.stageindex].name3); + char *name = lang_get(g_SoloStages[g_MissionConfig.stageindex].name3); sprintf(g_StringPointer, "%s\n", name); return g_StringPointer; } #endif -char *endscreenMenuTitleStageFailed(struct menuitem *item) +char *endscreen_menu_title_stage_failed(struct menuitem *item) { sprintf(g_StringPointer, "%s: %s\n", - langGet(g_SoloStages[g_MissionConfig.stageindex].name3), - langGet(L_OPTIONS_277)); // "Failed" + lang_get(g_SoloStages[g_MissionConfig.stageindex].name3), + lang_get(L_OPTIONS_277)); // "Failed" return g_StringPointer; } -char *endscreenMenuTextMissionTime(struct menuitem *item) +char *endscreen_menu_text_mission_time(struct menuitem *item) { - formatTime(g_StringPointer, playerGetMissionTime(), TIMEPRECISION_SECONDS); + format_time(g_StringPointer, player_get_mission_time(), TIMEPRECISION_SECONDS); strcat(g_StringPointer, "\n"); return g_StringPointer; } -struct menudialogdef *endscreenAdvance(void) +struct menudialogdef *endscreen_advance(void) { #if VERSION < VERSION_NTSC_1_0 if (g_MissionConfig.stagenum == STAGE_SKEDARRUINS) { g_MissionConfig.stagenum = STAGE_CREDITS; - titleSetNextStage(g_MissionConfig.stagenum); - lvSetDifficulty(g_MissionConfig.difficulty); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(g_MissionConfig.stagenum); + title_set_next_stage(g_MissionConfig.stagenum); + lv_set_difficulty(g_MissionConfig.difficulty); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(g_MissionConfig.stagenum); return NULL; } @@ -443,27 +443,27 @@ struct menudialogdef *endscreenAdvance(void) return &g_NextMissionMenuDialog; } -void endscreenResetModels(void) +void endscreen_reset_models(void) { - menuResetModel(&g_Menus[0].menumodel, bgunCalculateGunMemCapacity() - menugfxGetParticleArraySize(), false); - g_Menus[0].menumodel.allocstart = bgunGetGunMem() + menugfxGetParticleArraySize(); + menu_reset_model(&g_Menus[0].menumodel, bgun_calculate_gun_mem_capacity() - menugfx_get_particle_array_size(), false); + g_Menus[0].menumodel.allocstart = bgun_get_gun_mem() + menugfx_get_particle_array_size(); - menuResetModel(&g_Menus[1].menumodel, bgunCalculateGunMemCapacity() - menugfxGetParticleArraySize(), false); - g_Menus[1].menumodel.allocstart = bgunGetGunMem() + menugfxGetParticleArraySize(); + menu_reset_model(&g_Menus[1].menumodel, bgun_calculate_gun_mem_capacity() - menugfx_get_particle_array_size(), false); + g_Menus[1].menumodel.allocstart = bgun_get_gun_mem() + menugfx_get_particle_array_size(); - menuResetModel(&g_Menus[2].menumodel, bgunCalculateGunMemCapacity() - menugfxGetParticleArraySize(), false); - g_Menus[2].menumodel.allocstart = bgunGetGunMem() + menugfxGetParticleArraySize(); + menu_reset_model(&g_Menus[2].menumodel, bgun_calculate_gun_mem_capacity() - menugfx_get_particle_array_size(), false); + g_Menus[2].menumodel.allocstart = bgun_get_gun_mem() + menugfx_get_particle_array_size(); - menuResetModel(&g_Menus[3].menumodel, bgunCalculateGunMemCapacity() - menugfxGetParticleArraySize(), false); - g_Menus[3].menumodel.allocstart = bgunGetGunMem() + menugfxGetParticleArraySize(); + menu_reset_model(&g_Menus[3].menumodel, bgun_calculate_gun_mem_capacity() - menugfx_get_particle_array_size(), false); + g_Menus[3].menumodel.allocstart = bgun_get_gun_mem() + menugfx_get_particle_array_size(); } #if VERSION >= VERSION_NTSC_1_0 -MenuItemHandlerResult endscreenHandleReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreen_handle_replay_last_level(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.stagenum = g_SoloStages[g_MissionConfig.stageindex].stagenum; - return menuhandlerAcceptMission(operation, NULL, data); + return menuhandler_accept_mission(operation, NULL, data); } return 0; @@ -530,7 +530,7 @@ struct menudialogdef g_SoloEndscreenObjectivesFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS_300, // "Objectives" g_SoloEndscreenObjectivesMenuItems, - soloMenuDialogPauseStatus, + solo_menu_dialog_pause_status, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -539,7 +539,7 @@ struct menudialogdef g_SoloEndscreenObjectivesCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS_300, // "Objectives" g_SoloEndscreenObjectivesMenuItems, - soloMenuDialogPauseStatus, + solo_menu_dialog_pause_status, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -548,7 +548,7 @@ struct menudialogdef g_2PMissionEndscreenObjectivesFailedVMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS_300, // "Objectives" g_2PMissionEndscreenObjectivesVMenuItems, - soloMenuDialogPauseStatus, + solo_menu_dialog_pause_status, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -557,7 +557,7 @@ struct menudialogdef g_2PMissionEndscreenObjectivesCompletedVMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS_300, // "Objectives" g_2PMissionEndscreenObjectivesVMenuItems, - soloMenuDialogPauseStatus, + solo_menu_dialog_pause_status, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, NULL, }; @@ -566,10 +566,10 @@ struct menudialogdef g_2PMissionEndscreenObjectivesCompletedVMenuDialog = { /** * Displayed after Defense and Skedar Ruins completion screens. */ -MenuItemHandlerResult endscreenHandleContinueMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreen_handle_continue_mission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - endscreenContinue(2); + endscreen_continue(2); } return 0; @@ -584,7 +584,7 @@ struct menuitem g_MissionContinueOrReplyMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_244, // "Continue" 0, - endscreenHandleContinueMission, + endscreen_handle_continue_mission, }, { MENUITEMTYPE_SELECTABLE, @@ -592,14 +592,14 @@ struct menuitem g_MissionContinueOrReplyMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_245, // "Replay Last Level" 0, - endscreenHandleReplayLastLevel, + endscreen_handle_replay_last_level, }, { MENUITEMTYPE_END }, }; struct menudialogdef g_MissionContinueOrReplyMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&endscreenMenuTextCurrentStageName3, + (uintptr_t)&endscreen_menu_text_current_stage_name3, g_MissionContinueOrReplyMenuItems, NULL, MENUDIALOGFLAG_STARTSELECTS, @@ -612,98 +612,98 @@ struct menudialogdef g_MissionContinueOrReplyMenuDialog = { * Context is: * * 0 when closing a completed endscreen - * 1 unsure - is invoked directly by menuTick + * 1 unsure - is invoked directly by menu_tick * 2 when pressing continue */ -void endscreenContinue(s32 context) +void endscreen_continue(s32 context) { if (g_Vars.antiplayernum >= 0) { - menuPopDialog(); + menu_pop_dialog(); } else if (g_Vars.coopplayernum >= 0 && PLAYERCOUNT() >= 2 && context == 0) { - menuPopDialog(); + menu_pop_dialog(); } else { if (g_Vars.stagenum == STAGE_DEEPSEA || g_Vars.stagenum == STAGE_SKEDARRUINS) { if (context == 2 || g_Menus[g_MpPlayerNum].endscreen.isfirstcompletion) { // Pressed continue if (g_Vars.stagenum == STAGE_DEEPSEA) { - if (!isStageDifficultyUnlocked(g_MissionConfig.stageindex + 1, g_MissionConfig.difficulty)) { - menuPopDialog(); - menuPopDialog(); + if (!is_stage_difficulty_unlocked(g_MissionConfig.stageindex + 1, g_MissionConfig.difficulty)) { + menu_pop_dialog(); + menu_pop_dialog(); } else { // Commit to starting next stage g_MissionConfig.stageindex++; g_MissionConfig.stagenum = g_SoloStages[g_MissionConfig.stageindex].stagenum; - titleSetNextStage(g_MissionConfig.stagenum); + title_set_next_stage(g_MissionConfig.stagenum); if (g_MissionConfig.iscoop) { if (g_Vars.numaibuddies == 0) { g_Vars.bondplayernum = 0; g_Vars.coopplayernum = 1; g_Vars.antiplayernum = -1; - setNumPlayers(2); + set_num_players(2); } else { g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - setNumPlayers(1); + set_num_players(1); } } else { g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - setNumPlayers(1); + set_num_players(1); } - lvSetDifficulty(g_MissionConfig.difficulty); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(g_MissionConfig.stagenum); - viBlack(true); + lv_set_difficulty(g_MissionConfig.difficulty); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(g_MissionConfig.stagenum); + vi_black(true); } } else if (g_Vars.stagenum == STAGE_SKEDARRUINS) { // Commit to starting credits g_MissionConfig.stagenum = STAGE_CREDITS; - titleSetNextStage(g_MissionConfig.stagenum); - lvSetDifficulty(g_MissionConfig.difficulty); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(g_MissionConfig.stagenum); - viBlack(true); + title_set_next_stage(g_MissionConfig.stagenum); + lv_set_difficulty(g_MissionConfig.difficulty); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(g_MissionConfig.stagenum); + vi_black(true); } } else { if (context == 1) { - menuPushRootDialog(&g_MissionContinueOrReplyMenuDialog, MENUROOT_COOPCONTINUE); + menu_push_root_dialog(&g_MissionContinueOrReplyMenuDialog, MENUROOT_COOPCONTINUE); } else { - menuPushDialog(&g_MissionContinueOrReplyMenuDialog); + menu_push_dialog(&g_MissionContinueOrReplyMenuDialog); } } } else { if (context == 2) { - menuPopDialog(); + menu_pop_dialog(); } - if (isStageDifficultyUnlocked(g_MissionConfig.stageindex + 1, g_MissionConfig.difficulty) == 0) { + if (is_stage_difficulty_unlocked(g_MissionConfig.stageindex + 1, g_MissionConfig.difficulty) == 0) { if (context == 2) { - menuPopDialog(); - menuPopDialog(); + menu_pop_dialog(); + menu_pop_dialog(); } else { - menuPushDialog(&g_MissionContinueOrReplyMenuDialog); + menu_push_dialog(&g_MissionContinueOrReplyMenuDialog); } - } else if (stageGetIndex(g_MissionConfig.stagenum) < 0 + } else if (stage_get_index(g_MissionConfig.stagenum) < 0 || g_Vars.stagenum == STAGE_CITRAINING || g_MissionConfig.stageindex >= SOLOSTAGEINDEX_MBR) { if (context == 2) { - menuPopDialog(); - menuPopDialog(); + menu_pop_dialog(); + menu_pop_dialog(); } else { - menuPushDialog(&g_MissionContinueOrReplyMenuDialog); + menu_push_dialog(&g_MissionContinueOrReplyMenuDialog); } } else { - endscreenResetModels(); + endscreen_reset_models(); if (context == 1) { - menuPushRootDialog(endscreenAdvance(), MENUROOT_COOPCONTINUE); + menu_push_root_dialog(endscreen_advance(), MENUROOT_COOPCONTINUE); } else { - menuPushDialog(endscreenAdvance()); + menu_push_dialog(endscreen_advance()); } } } @@ -711,7 +711,7 @@ void endscreenContinue(s32 context) } #endif -MenuDialogHandlerResult endscreenHandle2PCompleted(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult endscreen_handle_2p_completed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].endscreen.unke1c = 0; @@ -734,31 +734,31 @@ MenuDialogHandlerResult endscreenHandle2PCompleted(s32 operation, struct menudia if (g_Menus[g_MpPlayerNum].endscreen.unke1c == 0) { #if VERSION >= VERSION_NTSC_1_0 - endscreenContinue(0); + endscreen_continue(0); #else if (g_Vars.stagenum == STAGE_DEEPSEA) { if (g_Vars.antiplayernum >= 0 || (g_Vars.coopplayernum >= 0 && PLAYERCOUNT() >= 2)) { - menuPopDialog(); + menu_pop_dialog(); } else { g_MissionConfig.stageindex++; g_MissionConfig.stagenum = g_SoloStages[g_MissionConfig.stageindex].stagenum; - titleSetNextStage(g_MissionConfig.stagenum); - lvSetDifficulty(g_MissionConfig.difficulty); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(g_MissionConfig.stagenum); + title_set_next_stage(g_MissionConfig.stagenum); + lv_set_difficulty(g_MissionConfig.difficulty); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(g_MissionConfig.stagenum); } } else if (g_Vars.antiplayernum >= 0 || (g_Vars.coopplayernum >= 0 && PLAYERCOUNT() >= 2) - || (stageGetIndex(g_MissionConfig.stagenum) < 0 + || (stage_get_index(g_MissionConfig.stagenum) < 0 || g_Vars.stagenum == STAGE_CITRAINING || g_MissionConfig.stageindex > SOLOSTAGEINDEX_SKEDARRUINS || ((g_CheatsActiveBank0 || g_CheatsActiveBank1) - && !isStageDifficultyUnlocked(g_MissionConfig.stageindex + 1, g_MissionConfig.difficulty)))) { - menuPopDialog(); + && !is_stage_difficulty_unlocked(g_MissionConfig.stageindex + 1, g_MissionConfig.difficulty)))) { + menu_pop_dialog(); } else { - endscreenResetModels(); - menuPushDialog(endscreenAdvance()); + endscreen_reset_models(); + menu_push_dialog(endscreen_advance()); } #endif } @@ -772,7 +772,7 @@ MenuDialogHandlerResult endscreenHandle2PCompleted(s32 operation, struct menudia return 0; } -MenuDialogHandlerResult endscreenHandle2PFailed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult endscreen_handle_2p_failed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].endscreen.unke1c = 0; @@ -796,12 +796,12 @@ MenuDialogHandlerResult endscreenHandle2PFailed(s32 operation, struct menudialog if (g_Menus[g_MpPlayerNum].endscreen.unke1c == 0) { if (g_Vars.antiplayernum >= 0 || (g_Vars.coopplayernum >= 0 && PLAYERCOUNT() >= 2) - || stageGetIndex(g_MissionConfig.stagenum) < 0 + || stage_get_index(g_MissionConfig.stagenum) < 0 || g_Vars.stagenum == STAGE_CITRAINING) { - menuPopDialog(); + menu_pop_dialog(); } else { - endscreenResetModels(); - menuPushDialog(&g_RetryMissionMenuDialog); + endscreen_reset_models(); + menu_push_dialog(&g_RetryMissionMenuDialog); } } } @@ -827,7 +827,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&endscreenMenuTextMissionStatus, + (uintptr_t)&endscreen_menu_text_mission_status, 0, NULL, }, @@ -843,7 +843,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&endscreenMenuTextAgentStatus, + (uintptr_t)&endscreen_menu_text_agent_status, 0, NULL, }, @@ -859,7 +859,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&endscreenMenuTextMissionTime, + (uintptr_t)&endscreen_menu_text_mission_time, 0, NULL, }, @@ -875,7 +875,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)soloMenuTextDifficulty, + (uintptr_t)solo_menu_text_difficulty, 0, NULL, }, @@ -899,7 +899,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&mpMenuTextWeaponOfChoiceName, + (uintptr_t)&mp_menu_text_weapon_of_choice_name, 0, NULL, }, @@ -916,7 +916,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, 0, L_OPTIONS_282, // "Kills:" - (uintptr_t)&endscreenMenuTextNumKills, + (uintptr_t)&endscreen_menu_text_num_kills, NULL, }, { @@ -924,7 +924,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, 0, L_OPTIONS_283, // "Accuracy:" - (uintptr_t)&endscreenMenuTextAccuracy, + (uintptr_t)&endscreen_menu_text_accuracy, NULL, }, { @@ -940,7 +940,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, 0, L_OPTIONS_284, // "Shot Total:" - (uintptr_t)&endscreenMenuTextNumShots, + (uintptr_t)&endscreen_menu_text_num_shots, NULL, }, { @@ -948,7 +948,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, MENUITEMFLAG_SMALLFONT, L_OPTIONS_285, // "Head Shots:" - (uintptr_t)&endscreenMenuTextNumHeadShots, + (uintptr_t)&endscreen_menu_text_num_head_shots, NULL, }, { @@ -956,7 +956,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, MENUITEMFLAG_SMALLFONT, L_OPTIONS_286, // "Body Shots:" - (uintptr_t)&endscreenMenuTextNumBodyShots, + (uintptr_t)&endscreen_menu_text_num_body_shots, NULL, }, { @@ -964,7 +964,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, MENUITEMFLAG_SMALLFONT, L_OPTIONS_287, // "Limb Shots:" - (uintptr_t)&endscreenMenuTextNumLimbShots, + (uintptr_t)&endscreen_menu_text_num_limb_shots, NULL, }, { @@ -972,7 +972,7 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { 0, MENUITEMFLAG_SMALLFONT, L_OPTIONS_288, // "Others:" - (uintptr_t)&endscreenMenuTextNumOtherShots, + (uintptr_t)&endscreen_menu_text_num_other_shots, NULL, }, { @@ -1007,30 +1007,30 @@ struct menuitem g_2PMissionEndscreenVMenuItems[] = { * 5 = timed cheat name * 6 = limb shots */ -MenuItemHandlerResult endscreenHandleCheatInfo(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult endscreen_handle_cheat_info(s32 operation, struct menuitem *item, union handlerdata *data) { static u32 cheatcolour = 0xff7f7fff; if (operation == MENUOP_GETCOLOUR && ((g_Menus[g_MpPlayerNum].endscreen.cheatinfo & CHEATINFO_TIMED_UNLOCKING) || item->param == 5)) { // Timed cheat just got unlocked, or this item is the timed cheat name - u32 weight = menuGetSinOscFrac(40) * 255; + u32 weight = menu_get_sin_osc_frac(40) * 255; - mainOverrideVariable("ctcol", &cheatcolour); + main_override_variable("ctcol", &cheatcolour); if (item->param == 0 - && cheatGetTime(CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)) == 0) { + && cheat_get_time(CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)) == 0) { return 0; } - data->label.colour2 = colourBlend(data->label.colour2, cheatcolour, weight); + data->label.colour2 = colour_blend(data->label.colour2, cheatcolour, weight); if (item->param == 3) { // completion cheat name - data->label.colour1 = colourBlend(data->label.colour1, cheatcolour, weight); + data->label.colour1 = colour_blend(data->label.colour1, cheatcolour, weight); } if (item->param == 5) { // timed cheat name - data->label.colour1 = colourBlend(data->label.colour1, cheatcolour, weight); + data->label.colour1 = colour_blend(data->label.colour1, cheatcolour, weight); } } @@ -1044,7 +1044,7 @@ MenuItemHandlerResult endscreenHandleCheatInfo(s32 operation, struct menuitem *i if ((info & CHEATINFO_TIMED_EXISTS) && (info & (CHEATINFO_TIMED_UNLOCKING | CHEATINFO_TIMED_PREVUNLOCKED)) == 0 - && cheatGetTime(CHEATINFO_GET_TIMED_CHEATNUM(info)) > 0) { + && cheat_get_time(CHEATINFO_GET_TIMED_CHEATNUM(info)) > 0) { return false; } @@ -1077,7 +1077,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_278, // "Mission Status:" - (uintptr_t)&endscreenMenuTextMissionStatus, + (uintptr_t)&endscreen_menu_text_mission_status, NULL, }, { @@ -1085,7 +1085,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_279, // "Agent Status:" - (uintptr_t)&endscreenMenuTextAgentStatus, + (uintptr_t)&endscreen_menu_text_agent_status, NULL, }, #if VERSION >= VERSION_NTSC_1_0 @@ -1094,23 +1094,23 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, MENUITEMFLAG_LABEL_CUSTOMCOLOUR, L_OPTIONS_280, // "Mission Time:" - (uintptr_t)&endscreenMenuTextMissionTime, - endscreenHandleCheatInfo, + (uintptr_t)&endscreen_menu_text_mission_time, + endscreen_handle_cheat_info, }, { MENUITEMTYPE_LABEL, 1, MENUITEMFLAG_LABEL_CUSTOMCOLOUR, L_MPWEAPONS_242, // "Target Time:" - (uintptr_t)&endscreenMenuTextTargetTime, - endscreenHandleCheatInfo, + (uintptr_t)&endscreen_menu_text_target_time, + endscreen_handle_cheat_info, }, { MENUITEMTYPE_LABEL, 0, 0, L_MPWEAPONS_129, // "Difficulty:" - (uintptr_t)&soloMenuTextDifficulty, + (uintptr_t)&solo_menu_text_difficulty, NULL, }, { @@ -1119,7 +1119,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, 0, - endscreenHandleCheatInfo, + endscreen_handle_cheat_info, }, { MENUITEMTYPE_LABEL, @@ -1127,23 +1127,23 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, L_MPWEAPONS_243, // "New Cheat Available!:" 0, - endscreenHandleCheatInfo, + endscreen_handle_cheat_info, }, { MENUITEMTYPE_LABEL, 3, MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_CUSTOMCOLOUR, - (uintptr_t)&endscreenMenuTextTimedCheatName, + (uintptr_t)&endscreen_menu_text_timed_cheat_name, 0, - endscreenHandleCheatInfo, + endscreen_handle_cheat_info, }, { MENUITEMTYPE_LABEL, 5, MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_CUSTOMCOLOUR, - (uintptr_t)&endscreenMenuTextCompletionCheatName, + (uintptr_t)&endscreen_menu_text_completion_cheat_name, 0, - endscreenHandleCheatInfo, + endscreen_handle_cheat_info, }, { MENUITEMTYPE_SEPARATOR, @@ -1158,7 +1158,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_281, // "Weapon of Choice:" - (uintptr_t)&mpMenuTextWeaponOfChoiceName, + (uintptr_t)&mp_menu_text_weapon_of_choice_name, NULL, }, { @@ -1166,7 +1166,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_282, // "Kills:" - (uintptr_t)&endscreenMenuTextNumKills, + (uintptr_t)&endscreen_menu_text_num_kills, NULL, }, { @@ -1174,7 +1174,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_283, // "Accuracy:" - (uintptr_t)&endscreenMenuTextAccuracy, + (uintptr_t)&endscreen_menu_text_accuracy, NULL, }, { @@ -1190,7 +1190,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_284, // "Shot Total:" - (uintptr_t)&endscreenMenuTextNumShots, + (uintptr_t)&endscreen_menu_text_num_shots, NULL, }, { @@ -1198,7 +1198,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_285, // "Head Shots:" - (uintptr_t)&endscreenMenuTextNumHeadShots, + (uintptr_t)&endscreen_menu_text_num_head_shots, NULL, }, { @@ -1206,7 +1206,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_286, // "Body Shots:" - (uintptr_t)&endscreenMenuTextNumBodyShots, + (uintptr_t)&endscreen_menu_text_num_body_shots, NULL, }, { @@ -1214,16 +1214,16 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 6, 0, L_OPTIONS_287, // "Limb Shots:" - (uintptr_t)&endscreenMenuTextNumLimbShots, - endscreenHandleCheatInfo, + (uintptr_t)&endscreen_menu_text_num_limb_shots, + endscreen_handle_cheat_info, }, { MENUITEMTYPE_LABEL, 4, 0, L_OPTIONS_288, // "Others:" - (uintptr_t)&endscreenMenuTextNumOtherShots, - endscreenHandleCheatInfo, + (uintptr_t)&endscreen_menu_text_num_other_shots, + endscreen_handle_cheat_info, }, #else // NTSC beta's endscreen dialog lacks cheat information @@ -1232,7 +1232,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_280, // "Mission Time:" - (uintptr_t)&endscreenMenuTextMissionTime, + (uintptr_t)&endscreen_menu_text_mission_time, NULL, }, { @@ -1240,7 +1240,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_MPWEAPONS_129, // "Difficulty:" - (uintptr_t)&soloMenuTextDifficulty, + (uintptr_t)&solo_menu_text_difficulty, NULL, }, { @@ -1256,7 +1256,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_281, // "Weapon of Choice:" - (uintptr_t)&mpMenuTextWeaponOfChoiceName, + (uintptr_t)&mp_menu_text_weapon_of_choice_name, NULL, }, { @@ -1264,7 +1264,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_282, // "Kills:" - (uintptr_t)&endscreenMenuTextNumKills, + (uintptr_t)&endscreen_menu_text_num_kills, NULL, }, { @@ -1272,7 +1272,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_283, // "Accuracy:" - (uintptr_t)&endscreenMenuTextAccuracy, + (uintptr_t)&endscreen_menu_text_accuracy, NULL, }, { @@ -1288,7 +1288,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_284, // "Shot Total:" - (uintptr_t)&endscreenMenuTextNumShots, + (uintptr_t)&endscreen_menu_text_num_shots, NULL, }, { @@ -1296,7 +1296,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_285, // "Head Shots:" - (uintptr_t)&endscreenMenuTextNumHeadShots, + (uintptr_t)&endscreen_menu_text_num_head_shots, NULL, }, { @@ -1304,7 +1304,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_286, // "Body Shots:" - (uintptr_t)&endscreenMenuTextNumBodyShots, + (uintptr_t)&endscreen_menu_text_num_body_shots, NULL, }, { @@ -1312,7 +1312,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_287, // "Limb Shots:" - (uintptr_t)&endscreenMenuTextNumLimbShots, + (uintptr_t)&endscreen_menu_text_num_limb_shots, NULL, }, { @@ -1320,7 +1320,7 @@ struct menuitem g_MissionEndscreenMenuItems[] = { 0, 0, L_OPTIONS_288, // "Others:" - (uintptr_t)&endscreenMenuTextNumOtherShots, + (uintptr_t)&endscreen_menu_text_num_other_shots, NULL, }, #endif @@ -1344,10 +1344,10 @@ struct menuitem g_MissionEndscreenMenuItems[] = { }; #if VERSION >= VERSION_NTSC_1_0 -char *endscreenMenuTextTimedCheatName(struct menuitem *item) +char *endscreen_menu_text_timed_cheat_name(struct menuitem *item) { if (g_Menus[g_MpPlayerNum].endscreen.cheatinfo & (CHEATINFO_TIMED_EXISTS | CHEATINFO_TIMED_UNLOCKING)) { - return cheatGetName(CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); + return cheat_get_name(CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); } return NULL; @@ -1355,10 +1355,10 @@ char *endscreenMenuTextTimedCheatName(struct menuitem *item) #endif #if VERSION >= VERSION_NTSC_1_0 -char *endscreenMenuTextCompletionCheatName(struct menuitem *item) +char *endscreen_menu_text_completion_cheat_name(struct menuitem *item) { if (g_Menus[g_MpPlayerNum].endscreen.cheatinfo & CHEATINFO_COMPL_UNLOCKING) { - return cheatGetName(CHEATINFO_GET_COMPL_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); + return cheat_get_name(CHEATINFO_GET_COMPL_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); } return NULL; @@ -1366,7 +1366,7 @@ char *endscreenMenuTextCompletionCheatName(struct menuitem *item) #endif #if VERSION >= VERSION_NTSC_1_0 -char *endscreenMenuTextTargetTime(struct menuitem *item) +char *endscreen_menu_text_target_time(struct menuitem *item) { s32 time; @@ -1375,19 +1375,19 @@ char *endscreenMenuTextTargetTime(struct menuitem *item) } time = CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo); - time = cheatGetTime(time); + time = cheat_get_time(time); if (!time) { return NULL; } - formatTime(g_StringPointer, time * 60, TIMEPRECISION_SECONDS); + format_time(g_StringPointer, time * 60, TIMEPRECISION_SECONDS); strcat(g_StringPointer, "\n"); return g_StringPointer; } #endif -void endscreenSetCoopCompleted(void) +void endscreen_set_coop_completed(void) { if (g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0) { #if VERSION >= VERSION_NTSC_1_0 @@ -1402,18 +1402,18 @@ void endscreenSetCoopCompleted(void) struct menudialogdef g_SoloMissionEndscreenCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, - (uintptr_t)&endscreenMenuTitleStageCompleted, + (uintptr_t)&endscreen_menu_title_stage_completed, g_MissionEndscreenMenuItems, - endscreenHandle2PCompleted, + endscreen_handle_2p_completed, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloEndscreenObjectivesCompletedMenuDialog, }; struct menudialogdef g_SoloMissionEndscreenFailedMenuDialog = { MENUDIALOGTYPE_DANGER, - (uintptr_t)&endscreenMenuTitleStageFailed, + (uintptr_t)&endscreen_menu_title_stage_failed, g_MissionEndscreenMenuItems, - endscreenHandle2PFailed, + endscreen_handle_2p_failed, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloEndscreenObjectivesFailedMenuDialog, }; @@ -1425,7 +1425,7 @@ struct menudialogdef g_SoloMissionEndscreenFailedMenuDialog = { * NTSC beta doesn't have cheats implemented, and has a different autostageindex * and thumbnail calculation. */ -void endscreenPrepare(void) +void endscreen_prepare(void) { s32 timedcheatid; s32 complcheatid; @@ -1451,8 +1451,8 @@ void endscreenPrepare(void) if (g_MissionConfig.iscoop == false && g_MissionConfig.isanti == false && g_MissionConfig.pdmode == false) { - timedcheatid = cheatGetByTimedStageIndex(g_MissionConfig.stageindex, g_MissionConfig.difficulty); - complcheatid = cheatGetByCompletedStageIndex(g_MissionConfig.stageindex); + timedcheatid = cheat_get_by_timed_stage_index(g_MissionConfig.stageindex, g_MissionConfig.difficulty); + complcheatid = cheat_get_by_completed_stage_index(g_MissionConfig.stageindex); if (timedcheatid >= 0) { g_Menus[g_MpPlayerNum].endscreen.cheatinfo = CHEATINFO_TIMED_EXISTS | CHEATINFO_SET_TIMED_CHEATNUM(timedcheatid); @@ -1468,17 +1468,17 @@ void endscreenPrepare(void) // Push the endscreen #if VERSION >= VERSION_NTSC_1_0 && defined(DEBUG) - if ((g_Vars.currentplayer->isdead || g_Vars.currentplayer->aborted || !objectiveIsAllComplete()) && !debugIsSetCompleteEnabled()) + if ((g_Vars.currentplayer->isdead || g_Vars.currentplayer->aborted || !objective_is_all_complete()) && !debug_is_set_complete_enabled()) #else - if (g_Vars.currentplayer->isdead || g_Vars.currentplayer->aborted || !objectiveIsAllComplete()) + if (g_Vars.currentplayer->isdead || g_Vars.currentplayer->aborted || !objective_is_all_complete()) #endif { - menuPushRootDialog(&g_SoloMissionEndscreenFailedMenuDialog, MENUROOT_ENDSCREEN); + menu_push_root_dialog(&g_SoloMissionEndscreenFailedMenuDialog, MENUROOT_ENDSCREEN); } else { - menuPushRootDialog(&g_SoloMissionEndscreenCompletedMenuDialog, MENUROOT_ENDSCREEN); + menu_push_root_dialog(&g_SoloMissionEndscreenCompletedMenuDialog, MENUROOT_ENDSCREEN); if (g_MissionConfig.iscoop) { - endscreenSetCoopCompleted(); + endscreen_set_coop_completed(); } } @@ -1488,7 +1488,7 @@ void endscreenPrepare(void) complalreadyunlocked = false; if (g_Menus[g_MpPlayerNum].endscreen.cheatinfo & CHEATINFO_TIMED_EXISTS) { - timedalreadyunlocked = cheatIsUnlocked(CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); + timedalreadyunlocked = cheat_is_unlocked(CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); if (timedalreadyunlocked) { g_Menus[g_MpPlayerNum].endscreen.cheatinfo |= CHEATINFO_TIMED_PREVUNLOCKED; @@ -1497,14 +1497,14 @@ void endscreenPrepare(void) // If there's a completion cheat for this stage (ie. not a special stage) if (g_Menus[g_MpPlayerNum].endscreen.cheatinfo & CHEATINFO_COMPL_EXISTS) { - complalreadyunlocked = cheatIsUnlocked(CHEATINFO_GET_COMPL_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); + complalreadyunlocked = cheat_is_unlocked(CHEATINFO_GET_COMPL_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); } #else - playerGetMissionTime(); + player_get_mission_time(); #endif // Update total mission time - secs = playerGetMissionTime() / 60; + secs = player_get_mission_time() / 60; if (secs != 0) { if (secs >= S32_MAX || S32_MAX - secs <= g_GameFile.totaltime) { @@ -1523,24 +1523,24 @@ void endscreenPrepare(void) && g_MissionConfig.pdmode == false && ((g_Vars.currentplayer->isdead == false && g_Vars.currentplayer->aborted == false - && objectiveIsAllComplete()) - || debugIsSetCompleteEnabled())) + && objective_is_all_complete()) + || debug_is_set_complete_enabled())) #elif VERSION >= VERSION_NTSC_1_0 if (g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0 && g_MissionConfig.pdmode == false && g_Vars.currentplayer->isdead == false && g_Vars.currentplayer->aborted == false - && objectiveIsAllComplete()) + && objective_is_all_complete()) #else if (g_Vars.currentplayer->isdead == false && g_Vars.currentplayer->aborted == false - && objectiveIsAllComplete() + && objective_is_all_complete() && g_CheatsActiveBank0 == 0 && g_CheatsActiveBank1 == 0) #endif { - secs = playerGetMissionTime() / 60; + secs = player_get_mission_time() / 60; // The save file allows 12 bits per time, which is up to // 1h 8m 16s. If the timer is higher than this, reduce it. @@ -1593,7 +1593,7 @@ void endscreenPrepare(void) } if (g_Menus[g_MpPlayerNum].endscreen.cheatinfo & CHEATINFO_TIMED_EXISTS) { - nowunlocked = cheatIsUnlocked(CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); + nowunlocked = cheat_is_unlocked(CHEATINFO_GET_TIMED_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); if (!timedalreadyunlocked && nowunlocked) { g_Menus[g_MpPlayerNum].endscreen.cheatinfo |= CHEATINFO_TIMED_UNLOCKING; @@ -1601,7 +1601,7 @@ void endscreenPrepare(void) } if (g_Menus[g_MpPlayerNum].endscreen.cheatinfo & CHEATINFO_COMPL_EXISTS) { - nowunlocked = cheatIsUnlocked(CHEATINFO_GET_COMPL_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); + nowunlocked = cheat_is_unlocked(CHEATINFO_GET_COMPL_CHEATNUM(g_Menus[g_MpPlayerNum].endscreen.cheatinfo)); if (!complalreadyunlocked && nowunlocked) { g_Menus[g_MpPlayerNum].endscreen.cheatinfo |= CHEATINFO_COMPL_UNLOCKING; @@ -1619,7 +1619,7 @@ void endscreenPrepare(void) } #endif - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); if (g_MissionConfig.stagenum == STAGE_SKEDARRUINS && g_AltTitleUnlocked == false) { g_AltTitleUnlocked = true; @@ -1628,34 +1628,34 @@ void endscreenPrepare(void) #else g_AltTitleEnabled = true; #endif - bossfileSave(); + bossfile_save(); } } } - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); } if (g_MenuData.root == MENUROOT_ENDSCREEN) { - lvSetPaused(true); + lv_set_paused(true); g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED; } } struct menudialogdef g_2PMissionEndscreenCompletedHMenuDialog = { MENUDIALOGTYPE_SUCCESS, - (uintptr_t)&endscreenMenuTitleStageCompleted, + (uintptr_t)&endscreen_menu_title_stage_completed, g_MissionEndscreenMenuItems, - endscreenHandle2PCompleted, + endscreen_handle_2p_completed, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloEndscreenObjectivesCompletedMenuDialog, }; struct menudialogdef g_2PMissionEndscreenFailedHMenuDialog = { MENUDIALOGTYPE_DANGER, - (uintptr_t)&endscreenMenuTitleStageFailed, + (uintptr_t)&endscreen_menu_title_stage_failed, g_MissionEndscreenMenuItems, - endscreenHandle2PFailed, + endscreen_handle_2p_failed, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloEndscreenObjectivesFailedMenuDialog, }; @@ -1664,7 +1664,7 @@ struct menudialogdef g_2PMissionEndscreenCompletedVMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_OPTIONS_276, // "Completed" g_2PMissionEndscreenVMenuItems, - endscreenHandle2PCompleted, + endscreen_handle_2p_completed, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_2PMissionEndscreenObjectivesCompletedVMenuDialog, }; @@ -1673,16 +1673,16 @@ struct menudialogdef g_2PMissionEndscreenFailedVMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS_277, // "Failed" g_2PMissionEndscreenVMenuItems, - endscreenHandle2PFailed, + endscreen_handle_2p_failed, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_2PMissionEndscreenObjectivesFailedVMenuDialog, }; -void endscreenPushCoop(void) +void endscreen_push_coop(void) { u32 prevplayernum = g_MpPlayerNum; - lvSetPaused(true); + lv_set_paused(true); g_MpPlayerNum = g_Vars.currentplayerstats->mpindex; @@ -1698,33 +1698,33 @@ void endscreenPushCoop(void) if (((g_Vars.bond->isdead && g_Vars.coop->isdead) || g_Vars.bond->aborted || g_Vars.coop->aborted - || !objectiveIsAllComplete()) && !debugIsSetCompleteEnabled()) + || !objective_is_all_complete()) && !debug_is_set_complete_enabled()) #else if ((g_Vars.bond->isdead && g_Vars.coop->isdead) || g_Vars.bond->aborted || g_Vars.coop->aborted - || !objectiveIsAllComplete()) + || !objective_is_all_complete()) #endif { // Failed or aborted - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); + if (options_get_screen_split() == SCREENSPLIT_VERTICAL) { + menu_push_root_dialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); } } else { // Completed - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); + if (options_get_screen_split() == SCREENSPLIT_VERTICAL) { + menu_push_root_dialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); } - endscreenSetCoopCompleted(); + endscreen_set_coop_completed(); } if (g_Vars.currentplayer == g_Vars.bond) { - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); } g_MpPlayerNum = prevplayernum; @@ -1735,9 +1735,9 @@ void endscreenPushCoop(void) * (ie. retry, next mission or continue), and it looks like it might be for coop * only but I'm not 100% sure. * - * This function is only called from menuTick, which is a bit weird... + * This function is only called from menu_tick, which is a bit weird... */ -void endscreenPushSolo(void) +void endscreen_push_solo(void) { u32 prevplayernum = g_MpPlayerNum; @@ -1748,27 +1748,27 @@ void endscreenPushSolo(void) if (((g_Vars.bond->isdead && g_Vars.coop->isdead) || g_Vars.bond->aborted || g_Vars.coop->aborted - || !objectiveIsAllComplete()) && !debugIsSetCompleteEnabled()) + || !objective_is_all_complete()) && !debug_is_set_complete_enabled()) #else if ((g_Vars.bond->isdead && g_Vars.coop->isdead) || g_Vars.bond->aborted || g_Vars.coop->aborted - || !objectiveIsAllComplete()) + || !objective_is_all_complete()) #endif { // Failed or aborted - endscreenResetModels(); - menuPushRootDialog(&g_RetryMissionMenuDialog, MENUROOT_COOPCONTINUE); + endscreen_reset_models(); + menu_push_root_dialog(&g_RetryMissionMenuDialog, MENUROOT_COOPCONTINUE); } else { // Completed #if VERSION >= VERSION_NTSC_1_0 - endscreenContinue(1); + endscreen_continue(1); #else - struct menudialogdef *definition = endscreenAdvance(); + struct menudialogdef *definition = endscreen_advance(); if (definition) { - endscreenResetModels(); - menuPushRootDialog(definition, MENUROOT_COOPCONTINUE); + endscreen_reset_models(); + menu_push_root_dialog(definition, MENUROOT_COOPCONTINUE); } #endif } @@ -1776,11 +1776,11 @@ void endscreenPushSolo(void) g_MpPlayerNum = prevplayernum; } -void endscreenPushAnti(void) +void endscreen_push_anti(void) { u32 prevplayernum = g_MpPlayerNum; - lvSetPaused(true); + lv_set_paused(true); g_MpPlayerNum = g_Vars.currentplayerstats->mpindex; @@ -1794,46 +1794,46 @@ void endscreenPushAnti(void) if (g_Vars.currentplayer == g_Vars.bond) { #if VERSION >= VERSION_NTSC_1_0 && defined(DEBUG) - if (!g_Vars.anti->aborted && (g_Vars.bond->isdead || g_Vars.bond->aborted || !objectiveIsAllComplete()) && !debugIsSetCompleteEnabled()) + if (!g_Vars.anti->aborted && (g_Vars.bond->isdead || g_Vars.bond->aborted || !objective_is_all_complete()) && !debug_is_set_complete_enabled()) #else - if (!g_Vars.anti->aborted && (g_Vars.bond->isdead || g_Vars.bond->aborted || !objectiveIsAllComplete())) + if (!g_Vars.anti->aborted && (g_Vars.bond->isdead || g_Vars.bond->aborted || !objective_is_all_complete())) #endif { // Bond - failed or aborted - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); + if (options_get_screen_split() == SCREENSPLIT_VERTICAL) { + menu_push_root_dialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); } } else { // Bond - completed - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); + if (options_get_screen_split() == SCREENSPLIT_VERTICAL) { + menu_push_root_dialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); } } - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); } else { #if VERSION >= VERSION_NTSC_1_0 && defined(DEBUG) - if (!g_Vars.anti->aborted && (g_Vars.bond->isdead || g_Vars.bond->aborted || !objectiveIsAllComplete()) && !debugIsSetCompleteEnabled()) + if (!g_Vars.anti->aborted && (g_Vars.bond->isdead || g_Vars.bond->aborted || !objective_is_all_complete()) && !debug_is_set_complete_enabled()) #else - if (!g_Vars.anti->aborted && (g_Vars.bond->isdead || g_Vars.bond->aborted || !objectiveIsAllComplete())) + if (!g_Vars.anti->aborted && (g_Vars.bond->isdead || g_Vars.bond->aborted || !objective_is_all_complete())) #endif { // Anti - completed - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); + if (options_get_screen_split() == SCREENSPLIT_VERTICAL) { + menu_push_root_dialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); } } else { // Anti - failed or aborted - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); + if (options_get_screen_split() == SCREENSPLIT_VERTICAL) { + menu_push_root_dialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); } } } diff --git a/src/game/env.c b/src/game/env.c index 99bcd5b0f..286876df1 100644 --- a/src/game/env.c +++ b/src/game/env.c @@ -134,22 +134,22 @@ void env0f1657c0(s32 arg0, s32 arg1) // empty } -struct environment *envGetCurrent(void) +struct environment *env_get_current(void) { return &g_Env; } -f32 envGetFogMax(void) +f32 env_get_fog_max(void) { return g_EnvFogMax; } -f32 envGetSquaredFogMax(void) +f32 env_get_squared_fog_max(void) { return g_EnvFogMax * g_EnvFogMax; } -void envTick(void) +void env_tick(void) { struct zrange zrange; f32 scale; @@ -162,9 +162,9 @@ void envTick(void) return; } - viGetZRange(&zrange); + vi_get_z_range(&zrange); - scale = bgGetScaleBg2Gfx(); + scale = bg_get_scale_bg2gfx(); zrange.near /= scale; zrange.far /= scale; @@ -189,12 +189,12 @@ void envTick(void) g_EnvShadeSettings.alphanear = (sp28 * (zfar + 1.0f) / (zfar - znear) + sp24) / 255.0f; } -void envApplyFogEnvironment(struct fogenvironment *env) +void env_apply_fog_environment(struct fogenvironment *env) { g_FogEnabled = true; g_EnvHasTransparency = false; - viSetZRange(env->near, env->far); + vi_set_z_range(env->near, env->far); g_Env.fogmin = env->fogmin; g_Env.fogmax = env->fogmax; @@ -233,14 +233,14 @@ void envApplyFogEnvironment(struct fogenvironment *env) g_EnvDistFadeSettingsPtr = &g_EnvDistFadeSettings; } - envTick(); + env_tick(); } -void envApplyNoFogEnvironment(struct nofogenvironment *env) +void env_apply_no_fog_environment(struct nofogenvironment *env) { struct zrange zrange; - viSetZRange(env->near, env->far); + vi_set_z_range(env->near, env->far); g_Env.sky_r = env->sky_r; g_Env.sky_g = env->sky_g; @@ -283,7 +283,7 @@ void envApplyNoFogEnvironment(struct nofogenvironment *env) g_EnvHasTransparency = env->transparency; } -void envDisableSky(void) +void env_disable_sky(void) { g_Env.sky_r = 0; g_Env.sky_g = 0; @@ -294,12 +294,12 @@ void envDisableSky(void) g_Env.skybluefrac = 0; } -void envSetStageNum(s32 stagenum) +void env_set_stage_num(s32 stagenum) { // empty } -void envChooseAndApply(s32 stagenum, bool allowoverride) +void env_choose_and_apply(s32 stagenum, bool allowoverride) { struct nofogenvironment *finalenv = NULL; struct nofogenvironment *env2; @@ -318,7 +318,7 @@ void envChooseAndApply(s32 stagenum, bool allowoverride) g_EnvOrigFogEnvironment = env1; g_EnvTransitionFrom = env1; g_EnvTransitionTo = env1 + 1; - envApplyFogEnvironment(g_EnvOrigFogEnvironment); + env_apply_fog_environment(g_EnvOrigFogEnvironment); return; } } @@ -330,7 +330,7 @@ void envChooseAndApply(s32 stagenum, bool allowoverride) g_EnvOrigFogEnvironment = env1; g_EnvTransitionFrom = env1; g_EnvTransitionTo = env1 + 1; - envApplyFogEnvironment(g_EnvOrigFogEnvironment); + env_apply_fog_environment(g_EnvOrigFogEnvironment); return; } } @@ -348,12 +348,12 @@ void envChooseAndApply(s32 stagenum, bool allowoverride) finalenv = &g_NoFogEnvironments[0]; } - envApplyNoFogEnvironment(finalenv); + env_apply_no_fog_environment(finalenv); g_EnvOrigFogEnvironment = NULL; } -void envApplyTransitionFrac(f32 frac) +void env_apply_transition_frac(f32 frac) { static struct fogenvironment tmp; @@ -372,10 +372,10 @@ void envApplyTransitionFrac(f32 frac) tmp.sky_g &= 0xf8; tmp.sky_b &= 0xf8; - envApplyFogEnvironment(&tmp); + env_apply_fog_environment(&tmp); } -Gfx *envStartFog(Gfx *gdl, bool xlupass) +Gfx *env_start_fog(Gfx *gdl, bool xlupass) { if (!g_FogEnabled) { return gdl; @@ -395,7 +395,7 @@ Gfx *envStartFog(Gfx *gdl, bool xlupass) return gdl; } -Gfx *envStopFog(Gfx *gdl) +Gfx *env_stop_fog(Gfx *gdl) { if (!g_FogEnabled) { return gdl; @@ -406,7 +406,7 @@ Gfx *envStopFog(Gfx *gdl) return gdl; } -bool envIsPosInFogMaxDistance(struct coord *pos, f32 tolerance) +bool env_is_pos_in_fog_max_distance(struct coord *pos, f32 tolerance) { struct coord sp24; Mtxf *mtx; @@ -423,7 +423,7 @@ bool envIsPosInFogMaxDistance(struct coord *pos, f32 tolerance) return true; } - mtx = camGetWorldToScreenMtxf(); + mtx = cam_get_world_to_screen_mtxf(); sp24.x = pos->x - campos->x; sp24.y = pos->y - campos->y; @@ -438,12 +438,12 @@ bool envIsPosInFogMaxDistance(struct coord *pos, f32 tolerance) return true; } -struct distfadesettings *envGetDistFadeSettings(void) +struct distfadesettings *env_get_dist_fade_settings(void) { return g_EnvDistFadeSettingsPtr; } -s32 envGetObjShadeMode(struct prop *prop, f32 out[4]) +s32 env_get_obj_shade_mode(struct prop *prop, f32 out[4]) { if (!g_FogEnabled) { return SHADEMODE_OPA; diff --git a/src/game/explosions.c b/src/game/explosions.c index c0d35d271..039f5565e 100644 --- a/src/game/explosions.c +++ b/src/game/explosions.c @@ -81,12 +81,12 @@ struct explosiontype g_ExplosionTypes[] = { /*25*/ { 640, 480, 32, 11.2, 1600, 1000, 1000, 180, 2, 5, SMOKETYPE_NONE, SFX_80A4, 4 }, }; -bool explosionCreateSimple(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum) +bool explosion_create_simple(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum) { - return explosionCreate(prop, pos, rooms, type, playernum, false, NULL, 0, NULL); + return explosion_create(prop, pos, rooms, type, playernum, false, NULL, 0, NULL); } -bool explosionCreateComplex(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) { struct coord sp100; struct coord sp88; @@ -101,12 +101,12 @@ bool explosionCreateComplex(struct prop *prop, struct coord *pos, RoomNum *rooms } if (prop) { - room = cdFindFloorRoomYColourNormalPropAtPos(&prop->pos, prop->rooms, &y, NULL, &sp88, &collisionprop); + room = cd_find_floor_room_y_colour_normal_prop_at_pos(&prop->pos, prop->rooms, &y, NULL, &sp88, &collisionprop); sp100.x = prop->pos.x; sp100.y = y; sp100.z = prop->pos.z; } else { - room = cdFindFloorRoomYColourNormalPropAtPos(pos, rooms, &y, NULL, &sp88, &collisionprop); + room = cd_find_floor_room_y_colour_normal_prop_at_pos(pos, rooms, &y, NULL, &sp88, &collisionprop); sp100.x = pos->x; sp100.y = y; sp100.z = pos->z; @@ -119,10 +119,10 @@ bool explosionCreateComplex(struct prop *prop, struct coord *pos, RoomNum *rooms makescorch = false; } - return explosionCreate(prop, pos, rooms, type, playernum, makescorch, &sp100, room, &sp88); + return explosion_create(prop, pos, rooms, type, playernum, makescorch, &sp100, room, &sp88); } -f32 explosionGetHorizontalRangeAtFrame(struct explosion *exp, s32 frame) +f32 explosion_get_horizontal_range_at_frame(struct explosion *exp, s32 frame) { struct explosiontype *type = &g_ExplosionTypes[exp->type]; f32 changerate = PALUPF(type->changerateh); @@ -141,7 +141,7 @@ f32 explosionGetHorizontalRangeAtFrame(struct explosion *exp, s32 frame) return result; } -f32 explosionGetVerticalRangeAtFrame(struct explosion *exp, s32 frame) +f32 explosion_get_vertical_range_at_frame(struct explosion *exp, s32 frame) { struct explosiontype *type = &g_ExplosionTypes[exp->type]; f32 changerate = PALUPF(type->changeratev); @@ -156,13 +156,13 @@ f32 explosionGetVerticalRangeAtFrame(struct explosion *exp, s32 frame) return result; } -void explosionGetBboxAtFrame(struct coord *lower, struct coord *upper, s32 frame, struct prop *prop) +void explosion_get_bbox_at_frame(struct coord *lower, struct coord *upper, s32 frame, struct prop *prop) { struct explosion *exp = prop->explosion; struct explosiontype *type = &g_ExplosionTypes[exp->type]; - f32 rangeh = explosionGetHorizontalRangeAtFrame(exp, frame); - f32 rangev = explosionGetVerticalRangeAtFrame(exp, frame); + f32 rangeh = explosion_get_horizontal_range_at_frame(exp, frame); + f32 rangev = explosion_get_vertical_range_at_frame(exp, frame); rangeh = rangeh * 0.5f + type->innersize * 1.5f; rangev = rangev * 0.5f + type->innersize * 1.5f; @@ -176,19 +176,19 @@ void explosionGetBboxAtFrame(struct coord *lower, struct coord *upper, s32 frame upper->z = prop->pos.z + rangeh; } -void explosionAlertChrs(f32 *radius, struct coord *noisepos) +void explosion_alert_chrs(f32 *radius, struct coord *noisepos) { u32 stack[2]; - s32 *end = (s32 *)&doorDestroyGlass; + s32 *end = (s32 *)&door_destroy_glass; s32 i; for (i = 0; i < g_NumChrSlots; i++) { if (g_ChrSlots[i].model - && chrGetTargetProp(&g_ChrSlots[i]) == g_Vars.currentplayer->prop + && chr_get_target_prop(&g_ChrSlots[i]) == g_Vars.currentplayer->prop && g_ChrSlots[i].prop && g_ChrSlots[i].prop->type == PROPTYPE_CHR && (g_ChrSlots[i].prop->flags & PROPFLAG_ENABLED)) { - f32 distance = chrGetDistanceToCoord(&g_ChrSlots[i], noisepos); + f32 distance = chr_get_distance_to_coord(&g_ChrSlots[i], noisepos); if (distance == 0) { distance = 2; @@ -197,7 +197,7 @@ void explosionAlertChrs(f32 *radius, struct coord *noisepos) } if (distance > 1) { - chrRecordLastHearTargetTime(&g_ChrSlots[i]); + chr_record_last_hear_target_time(&g_ChrSlots[i]); } } } @@ -205,7 +205,7 @@ void explosionAlertChrs(f32 *radius, struct coord *noisepos) #if PIRACYCHECKS { u32 checksum = 0; - s32 *ptr = (s32 *)&glassDestroy; + s32 *ptr = (s32 *)&glass_destroy; while (ptr < end) { checksum ^= *ptr; @@ -232,7 +232,7 @@ void explosionAlertChrs(f32 *radius, struct coord *noisepos) #endif } -bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exprooms, +bool explosion_create(struct prop *sourceprop, struct coord *exppos, RoomNum *exprooms, s16 type, s32 playernum, bool makescorch, struct coord *arg6, RoomNum room, struct coord *arg8) { u32 stack; @@ -245,7 +245,7 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp // Bullet holes: only crate the flame (explosion) if within 4 metres if (type == EXPLOSIONTYPE_BULLETHOLE) { - f32 lodscale = camGetLodScaleZ(); + f32 lodscale = cam_get_lod_scale_z(); struct coord *campos = &g_Vars.currentplayer->cam_pos; f32 xdist = exppos->x - campos->x; f32 ydist = exppos->y - campos->y; @@ -255,9 +255,9 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp if (sum * lodscale * lodscale > 400 * 400) { if (random() % 2 == 0) { if (sourceprop) { - smokeCreateSimple(&sourceprop->pos, sourceprop->rooms, g_ExplosionTypes[type].smoketype); + smoke_create_simple(&sourceprop->pos, sourceprop->rooms, g_ExplosionTypes[type].smoketype); } else { - smokeCreateSimple(exppos, exprooms, g_ExplosionTypes[type].smoketype); + smoke_create_simple(exppos, exprooms, g_ExplosionTypes[type].smoketype); } } @@ -286,14 +286,14 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp } if (index >= 0) { - propExecuteTickOperation(g_Explosions[index].prop, TICKOP_FREE); + prop_execute_tick_operation(g_Explosions[index].prop, TICKOP_FREE); g_Explosions[index].prop = NULL; exp = &g_Explosions[index]; } } if (exp) { - struct prop *expprop = propAllocate(); + struct prop *expprop = prop_allocate(); if (type != EXPLOSIONTYPE_16 && type != EXPLOSIONTYPE_BULLETHOLE) { g_ExplosionShakeTotalTimer = 6; @@ -333,13 +333,13 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp for (i = 0; exprooms[i] != -1 && i < ARRAYCOUNT(expprop->rooms) - 1; i++) { expprop->rooms[i] = exprooms[i]; - roomFlashLighting(exprooms[i], g_ExplosionTypes[type].rangeh, 255); + room_flash_lighting(exprooms[i], g_ExplosionTypes[type].rangeh, 255); } expprop->rooms[i] = -1; - propActivateThisFrame(expprop); - propEnable(expprop); + prop_activate_this_frame(expprop); + prop_enable(expprop); exp->type = type; exp->prop = expprop; @@ -349,12 +349,12 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp exp->owner = playernum; if (type != EXPLOSIONTYPE_BULLETHOLE && type != EXPLOSIONTYPE_PHOENIX) { - propSetDangerous(expprop); + prop_set_dangerous(expprop); } exproom = expprop->rooms[0]; - explosionGetBboxAtFrame(&spd4, &spc8, g_ExplosionTypes[type].duration, expprop); + explosion_get_bbox_at_frame(&spd4, &spc8, g_ExplosionTypes[type].duration, expprop); spd4.x *= mult; spd4.y *= mult; @@ -390,9 +390,9 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp for (k = 0; k < g_Rooms[exproom].numportals; k++) { portalnum = g_RoomPortals[g_Rooms[exproom].roomportallistoffset + k]; - bgCalculatePortalBbox(portalnum, &portalbbmin, &portalbbmax); + bg_calculate_portal_bbox(portalnum, &portalbbmin, &portalbbmax); - if (bgIsBboxOverlapping(&portalbbmin, &portalbbmax, &spd4, &spc8)) { + if (bg_is_bbox_overlapping(&portalbbmin, &portalbbmax, &spd4, &spc8)) { otherroom2 = -1; index = 0; @@ -459,7 +459,7 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp portalnum2 = g_RoomPortals[g_Rooms[otherroom].roomportallistoffset + j]; if (portalnum2 != portalnum) { - bgCalculatePortalBbox(portalnum2, &portal2bbmin, &portal2bbmax); + bg_calculate_portal_bbox(portalnum2, &portal2bbmin, &portal2bbmax); if (portal2bbmin.f[indexplus1] <= portalbbmin.f[indexplus1] + 10.0f * mult && portal2bbmin.f[indexplus2] <= portalbbmin.f[indexplus2] + 10.0f * mult @@ -537,10 +537,10 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp exp->parts[0].bb = 0; if (g_Vars.mplayerisrunning) { - smokeClearSomeTypes(); + smoke_clear_some_types(); } - explosionAlertChrs(&g_ExplosionTypes[type].rangeh, exppos); + explosion_alert_chrs(&g_ExplosionTypes[type].rangeh, exppos); } } @@ -552,13 +552,13 @@ bool explosionCreate(struct prop *sourceprop, struct coord *exppos, RoomNum *exp * * This function is unused. */ -void explosionShake(void) +void explosion_shake(void) { g_ExplosionShakeTotalTimer = 6; g_ExplosionShakeIntensityTimer = 6; } -void explosionsUpdateShake(struct coord *arg0, struct coord *arg1, struct coord *arg2) +void explosions_update_shake(struct coord *arg0, struct coord *arg1, struct coord *arg2) { u32 stack[4]; f32 sp54; @@ -567,7 +567,7 @@ void explosionsUpdateShake(struct coord *arg0, struct coord *arg1, struct coord f32 intensity; if (g_ExplosionShakeTotalTimer == 0) { - viShake(0); + vi_shake(0); return; } @@ -614,7 +614,7 @@ void explosionsUpdateShake(struct coord *arg0, struct coord *arg1, struct coord arg2->x = intensity * sp54; arg2->z = intensity * sp50; - viShake(g_ExplosionShakeTotalTimer * intensity); + vi_shake(g_ExplosionShakeTotalTimer * intensity); } /** @@ -622,7 +622,7 @@ void explosionsUpdateShake(struct coord *arg0, struct coord *arg1, struct coord * * minpos and maxpos are the bounding boxes of the prop. */ -bool explosionOverlapsProp(struct explosion *exp, struct prop *prop, struct coord *minpos, struct coord *maxpos) +bool explosion_overlaps_prop(struct explosion *exp, struct prop *prop, struct coord *minpos, struct coord *maxpos) { bool result = false; s32 i; @@ -642,7 +642,7 @@ bool explosionOverlapsProp(struct explosion *exp, struct prop *prop, struct coor rooms[2] = -1; - if (arrayIntersects(prop->rooms, rooms) + if (array_intersects(prop->rooms, rooms) && minpos->x <= exp->bbs[i].bbmax.x && minpos->y <= exp->bbs[i].bbmax.y && minpos->z <= exp->bbs[i].bbmax.z @@ -658,7 +658,7 @@ bool explosionOverlapsProp(struct explosion *exp, struct prop *prop, struct coor return result; } -void explosionInflictDamage(struct prop *expprop) +void explosion_inflict_damage(struct prop *expprop) { s32 stack; struct explosion *exp = expprop->explosion; @@ -706,7 +706,7 @@ void explosionInflictDamage(struct prop *expprop) // Flicker room lighting for (i = 0; expprop->rooms[i] != -1; i++) { if (random() % 2048 <= 240) { - roomFlashLighting(expprop->rooms[i], type->rangeh, 255); + room_flash_lighting(expprop->rooms[i], type->rangeh, 255); } } @@ -726,9 +726,9 @@ void explosionInflictDamage(struct prop *expprop) zdist -= g_BgRooms[roomnum].pos.f[2]; for (j = 0; j < numlights; j++) { - if (lightIsHealthy(roomnum, j) - && lightIsVulnerable(roomnum, j) - && lightGetBboxCentre(roomnum, j, &sp164)) { + if (light_is_healthy(roomnum, j) + && light_is_vulnerable(roomnum, j) + && light_get_bbox_centre(roomnum, j, &sp164)) { struct coord sp158; struct coord sp14c; @@ -741,7 +741,7 @@ void explosionInflictDamage(struct prop *expprop) sp158.f[2] = damageradius; if (func0f1773c8(&sp14c, &sp158)) { - roomSetLightBroken(roomnum, j); + room_set_light_broken(roomnum, j); } } } @@ -749,7 +749,7 @@ void explosionInflictDamage(struct prop *expprop) } // Damage props - roomGetProps(expprop->rooms, propnums, 256); + room_get_props(expprop->rooms, propnums, 256); propnumptr = propnums; @@ -781,7 +781,7 @@ void explosionInflictDamage(struct prop *expprop) && zdist <= damageradius && zdist >= -damageradius) { if (setup0f092304(obj, &sp130, &sp124)) { - if (explosionOverlapsProp(exp, prop, &sp130, &sp124)) { + if (explosion_overlaps_prop(exp, prop, &sp130, &sp124)) { candamage = true; } } else { @@ -846,7 +846,7 @@ void explosionInflictDamage(struct prop *expprop) // anti cannot damage this obj } else if (isfirstframe) { // Unblock path if this object is a path blocker - objUpdateLinkedScenery(obj, expprop); + obj_update_linked_scenery(obj, expprop); // Damage the object if ((obj->hidden & OBJHFLAG_00001000) == 0 @@ -874,9 +874,9 @@ void explosionInflictDamage(struct prop *expprop) } } - objApplyMomentum(obj, &spf4, 0.0f, true, true); + obj_apply_momentum(obj, &spf4, 0.0f, true, true); } - } else if (objIsHealthy(obj)) { + } else if (obj_is_healthy(obj)) { // Sustained damage minfrac *= 0.05f * g_Vars.lvupdate60freal; @@ -905,7 +905,7 @@ void explosionInflictDamage(struct prop *expprop) if (xdist <= damageradius && xdist >= -damageradius && ydist <= damageradius && ydist >= -damageradius && zdist <= damageradius && zdist >= -damageradius) { - propGetBbox(prop, &radius, &ymax, &ymin); + prop_get_bbox(prop, &radius, &ymax, &ymin); radius -= 20.0f; @@ -921,7 +921,7 @@ void explosionInflictDamage(struct prop *expprop) spc0.f[1] = ymax; spc0.f[2] = prop->pos.f[2] + radius; - if (explosionOverlapsProp(exp, prop, &spcc, &spc0)) { + if (explosion_overlaps_prop(exp, prop, &spcc, &spc0)) { candamage = true; } } @@ -982,7 +982,7 @@ void explosionInflictDamage(struct prop *expprop) } if (g_Vars.normmplayerisrunning) { - struct chrdata *ownerchr = mpGetChrFromPlayerIndex(exp->owner); + struct chrdata *ownerchr = mp_get_chr_from_player_index(exp->owner); if (ownerchr) { ownerprop = ownerchr->prop; @@ -995,10 +995,10 @@ void explosionInflictDamage(struct prop *expprop) ownerprop = g_Vars.anti->prop; } - chrDamageByExplosion(chr, minfrac, &spa0, ownerprop, &expprop->pos); + chr_damage_by_explosion(chr, minfrac, &spa0, ownerprop, &expprop->pos); if (prop->type == PROPTYPE_CHR && !isfirstframe) { - chrDisfigure(chr, &expprop->pos, damageradius); + chr_disfigure(chr, &expprop->pos, damageradius); } } } @@ -1008,7 +1008,7 @@ void explosionInflictDamage(struct prop *expprop) } } -u32 explosionTick(struct prop *prop) +u32 explosion_tick(struct prop *prop) { struct explosion *exp = prop->explosion; struct explosiontype *type = &g_ExplosionTypes[exp->type]; @@ -1047,8 +1047,8 @@ u32 explosionTick(struct prop *prop) if (exp->age >= 8 && exp->age < maxage) #endif { - hrange = explosionGetHorizontalRangeAtFrame(exp, exp->age); - vrange = explosionGetVerticalRangeAtFrame(exp, exp->age); + hrange = explosion_get_horizontal_range_at_frame(exp, exp->age); + vrange = explosion_get_vertical_range_at_frame(exp, exp->age); sp11c.x = prop->pos.x - hrange * 0.5f; sp11c.y = prop->pos.y - vrange * 0.5f; @@ -1164,13 +1164,13 @@ u32 explosionTick(struct prop *prop) } } - explosionGetBboxAtFrame(&bbmin, &bbmax, exp->age, prop); - bgFindEnteredRooms(&bbmin, &bbmax, prop->rooms, 7, false); - explosionInflictDamage(prop); + explosion_get_bbox_at_frame(&bbmin, &bbmax, exp->age, prop); + bg_find_entered_rooms(&bbmin, &bbmax, prop->rooms, 7, false); + explosion_inflict_damage(prop); // Play boom sound if this is the first frame if (exp->age == 0) { - psCreate(NULL, NULL, type->sound, -1, -1, 0, 0, PSTYPE_NONE, &exp->prop->pos, -1.0f, exp->prop->rooms, -1, -1.0f, -1.0f, -1.0f); + ps_create(NULL, NULL, type->sound, -1, -1, 0, 0, PSTYPE_NONE, &exp->prop->pos, -1.0f, exp->prop->rooms, -1, -1.0f, -1.0f, -1.0f); } for (k = 0; k < (s32)lvupdate; k++) { @@ -1187,9 +1187,9 @@ u32 explosionTick(struct prop *prop) || (exp->age == maxage - TICKS(20) && exp->type != EXPLOSIONTYPE_GASBARREL)) && (exp->type != EXPLOSIONTYPE_BULLETHOLE || (random() % 2) == 0)) { if (exp->source) { - smokeCreateSimple(&exp->source->pos, exp->source->rooms, type->smoketype); + smoke_create_simple(&exp->source->pos, exp->source->rooms, type->smoketype); } else { - smokeCreateSimple(&prop->pos, prop->rooms, type->smoketype); + smoke_create_simple(&prop->pos, prop->rooms, type->smoketype); } } @@ -1205,7 +1205,7 @@ u32 explosionTick(struct prop *prop) scorchsize *= 0.8f + 0.2f * RANDOMFRAC(); if (g_Vars.normmplayerisrunning) { - chr = mpGetChrFromPlayerIndex(exp->owner); + chr = mp_get_chr_from_player_index(exp->owner); } else if (g_Vars.antiplayernum >= 0 && exp->owner == g_Vars.antiplayernum) { chr = g_Vars.anti->prop->chr; } else if (g_Vars.coopplayernum >= 0 && exp->owner == g_Vars.coopplayernum) { @@ -1215,11 +1215,11 @@ u32 explosionTick(struct prop *prop) } if (g_Rooms[exp->room].gfxdata) { - if (g_Rooms[exp->room].gfxdata->xlublocks && bgTestHitInRoom(&prop->pos, &exp->unk3d0, exp->room, &hitthing)) { + if (g_Rooms[exp->room].gfxdata->xlublocks && bg_test_hit_in_room(&prop->pos, &exp->unk3d0, exp->room, &hitthing)) { xlu = hitthing.unk2c == 2; } - wallhitCreateWith20Args(&exp->unk3d0, &exp->unk3dc, &prop->pos, NULL, + wallhit_create_with_20_args(&exp->unk3d0, &exp->unk3dc, &prop->pos, NULL, 0, WALLHITTEX_SCORCH, exp->room, 0, 0, -1, 0, chr, scorchsize, scorchsize, 0xff, 0xff, @@ -1236,7 +1236,7 @@ u32 explosionTick(struct prop *prop) #endif { if (exp->type != EXPLOSIONTYPE_BULLETHOLE) { - propUnsetDangerous(exp->prop); + prop_unset_dangerous(exp->prop); } exp->prop = NULL; @@ -1246,9 +1246,9 @@ u32 explosionTick(struct prop *prop) return TICKOP_NONE; } -u32 explosionTickPlayer(struct prop *prop) +u32 explosion_tick_player(struct prop *prop) { - Mtxf *matrix = camGetWorldToScreenMtxf(); + Mtxf *matrix = cam_get_world_to_screen_mtxf(); prop->z = -(matrix->m[0][2] * prop->pos.x + matrix->m[1][2] * prop->pos.y + matrix->m[2][2] * prop->pos.z + matrix->m[3][2]); @@ -1263,7 +1263,7 @@ u32 explosionTickPlayer(struct prop *prop) return TICKOP_NONE; } -Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool xlupass) +Gfx *explosion_render(struct prop *prop, Gfx *gdl, bool xlupass) { struct explosion *exp = prop->explosion; s32 roomnum; @@ -1288,24 +1288,24 @@ Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool xlupass) if (roomnum != -1) { struct screenbox screenbox; - struct coord *coord = roomGetPosPtr(roomnum); + struct coord *coord = room_get_pos_ptr(roomnum); Col *colours; s32 tmp; if (func0f08e5a8(prop->rooms, &screenbox) > 0) { - gdl = bgScissorWithinViewport(gdl, screenbox.xmin, screenbox.ymin, screenbox.xmax, screenbox.ymax); + gdl = bg_scissor_within_viewport(gdl, screenbox.xmin, screenbox.ymin, screenbox.xmax, screenbox.ymax); } else { - gdl = bgScissorToViewport(gdl); + gdl = bg_scissor_to_viewport(gdl); } gSPClearGeometryMode(gdl++, G_CULL_BOTH | G_FOG); - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = roomApplyMtx(gdl, roomnum); + gdl = room_apply_mtx(gdl, roomnum); gSPDisplayList(gdl++, g_TexGdl2); - colours = gfxAllocateColours(1); + colours = gfx_allocate_colours(1); if (USINGDEVICE(DEVICE_NIGHTVISION) || USINGDEVICE(DEVICE_IRSCANNER)) { colours[0].word = 0xffffffff; @@ -1335,7 +1335,7 @@ Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool xlupass) colours[0].word = red << 24 | green << 16 | alpha | 0x80800000; } else { static u32 var8007e93c = 0xffffffff; - mainOverrideVariable("ecol", &var8007e93c); + main_override_variable("ecol", &var8007e93c); colours[0].word = 0xffffffff; colours[0].word = var8007e93c; } @@ -1357,18 +1357,18 @@ Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool xlupass) if (exp->parts[j].frame > 0) { #if PAL if (i == (s32)((f32)(exp->parts[j].frame - 1) / (g_ExplosionTypes[exp->type].flarespeed * 0.83333331346512f))) { - gdl = explosionRenderPart(exp, &exp->parts[j], gdl, coord, i); + gdl = explosion_render_part(exp, &exp->parts[j], gdl, coord, i); } #else if (i == (s32)((f32)(exp->parts[j].frame - 1) / g_ExplosionTypes[exp->type].flarespeed)) { - gdl = explosionRenderPart(exp, &exp->parts[j], gdl, coord, i); + gdl = explosion_render_part(exp, &exp->parts[j], gdl, coord, i); } #endif } } } - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); #if PAL tmp = (g_ExplosionTypes[exp->type].flarespeed * 15.0f) * 0.83333331346512f; @@ -1386,10 +1386,10 @@ Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool xlupass) return gdl; } -Gfx *explosionRenderPart(struct explosion *exp, struct explosionpart *part, Gfx *gdl, struct coord *coord, s32 arg4) +Gfx *explosion_render_part(struct explosion *exp, struct explosionpart *part, Gfx *gdl, struct coord *coord, s32 arg4) { - Vtx *vertices = gfxAllocateVertices(4); - Mtxf *mtx = camGetProjectionMtxF(); + Vtx *vertices = gfx_allocate_vertices(4); + Mtxf *mtx = cam_get_projection_mtxf(); struct coord spbc; struct coord spb0; struct coord spa4; diff --git a/src/game/explosionsreset.c b/src/game/explosionsreset.c index 666f099ca..a1855ffcf 100644 --- a/src/game/explosionsreset.c +++ b/src/game/explosionsreset.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void explosionsReset(void) +void explosions_reset(void) { s32 i; s32 j; @@ -23,7 +23,7 @@ void explosionsReset(void) if (g_MaxExplosions == 0) { g_Explosions = NULL; } else { - g_Explosions = mempAlloc((g_MaxExplosions * sizeof(struct explosion) + 0xf) & ~0xf, MEMPOOL_STAGE); + g_Explosions = memp_alloc((g_MaxExplosions * sizeof(struct explosion) + 0xf) & ~0xf, MEMPOOL_STAGE); for (i = 0; i < g_MaxExplosions; i++) { g_Explosions[i].prop = NULL; diff --git a/src/game/explosionsstop.c b/src/game/explosionsstop.c index f23ad575b..8fece4bbc 100644 --- a/src/game/explosionsstop.c +++ b/src/game/explosionsstop.c @@ -6,19 +6,19 @@ #include "data.h" #include "types.h" -void explosionsStop(void) +void explosions_stop(void) { s32 i; g_ExplosionShakeTotalTimer = 0; - viShake(0); + vi_shake(0); if (g_Explosions) { for (i = 0; i < MAX_EXPLOSIONS; i++) { if (g_Explosions[i].prop) { - propDelist(g_Explosions[i].prop); - propDisable(g_Explosions[i].prop); - propFree(g_Explosions[i].prop); + prop_delist(g_Explosions[i].prop); + prop_disable(g_Explosions[i].prop); + prop_free(g_Explosions[i].prop); g_Explosions[i].prop = NULL; } diff --git a/src/game/file.c b/src/game/file.c index 1f110e2c5..65c37ce72 100644 --- a/src/game/file.c +++ b/src/game/file.c @@ -39,7 +39,7 @@ * perspect they just call a load function and they receive an inflated file. * Exceptions to this are: * - BG files, which contain multiple compressed parts. The caller uses - * fileLoadPartToAddr which loads a slice of the file without inflation. + * file_load_part_to_addr which loads a slice of the file without inflation. * - MP3 files, which are not compressed. The caller retrieves the ROM start and * end addresses from the file system, then gives that to the MP3 system which * does its own DMA operations. @@ -4100,12 +4100,12 @@ u32 g_FileTable[] = { (uintptr_t) &_filenamesSegmentRomStart, }; -romptr_t fileGetRomAddress(s32 filenum) +romptr_t file_get_rom_address(s32 filenum) { return (romptr_t) g_FileTable[filenum]; } -u32 fileGetRomSizeByTableAddress(u32 *filetableaddr) +u32 file_get_rom_size_by_table_address(u32 *filetableaddr) { u32 size; @@ -4118,9 +4118,9 @@ u32 fileGetRomSizeByTableAddress(u32 *filetableaddr) return size; } -s32 fileGetRomSize(s32 filenum) +s32 file_get_rom_size(s32 filenum) { - return fileGetRomSizeByTableAddress((u32 *)&g_FileTable[filenum]); + return file_get_rom_size_by_table_address((u32 *)&g_FileTable[filenum]); } u32 file0f166ea8(u32 *filetableaddr) @@ -4128,14 +4128,14 @@ u32 file0f166ea8(u32 *filetableaddr) return 0; } -void fileLoad(u8 *dst, u32 allocationlen, u32 *romaddrptr, struct fileinfo *info) +void file_load(u8 *dst, u32 allocationlen, u32 *romaddrptr, struct fileinfo *info) { - u32 romsize = fileGetRomSizeByTableAddress(romaddrptr); + u32 romsize = file_get_rom_size_by_table_address(romaddrptr); u8 buffer[5 * 1024]; if (allocationlen == 0) { // DMA with no inflate - dmaExec(dst, *romaddrptr, romsize); + dma_exec(dst, *romaddrptr, romsize); } else { // DMA the compressed data to scratch space then inflate u8 *scratch = (dst + allocationlen) - ((romsize + 7) & 0xfffffff8); @@ -4149,15 +4149,15 @@ void fileLoad(u8 *dst, u32 allocationlen, u32 *romaddrptr, struct fileinfo *info u32 stack[2]; #endif - dmaExec(scratch, *romaddrptr, romsize); - result = rzipInflate(scratch, dst, buffer); + dma_exec(scratch, *romaddrptr, romsize); + result = rzip_inflate(scratch, dst, buffer); #if VERSION < VERSION_NTSC_1_0 if (result == 0) { sprintf(sp54, "DMA-Crash %s %d Ram: %02x%02x%02x%02x%02x%02x%02x%02x", "ob.c", 204, scratch[0], scratch[1], scratch[2], scratch[3], scratch[4], scratch[5], scratch[6], scratch[7]); - crashSetMessage(sp54); + crash_set_message(sp54); CRASH(); } #endif @@ -4169,7 +4169,7 @@ void fileLoad(u8 *dst, u32 allocationlen, u32 *romaddrptr, struct fileinfo *info } } -void filesInit(void) +void files_init(void) { s32 i; s32 j = 0; @@ -4181,7 +4181,7 @@ void filesInit(void) info->loadedsize = 0; info->allocsize = 0; - fileGetRomSizeByTableAddress((u32 *)(g_FileTable + i)); + file_get_rom_size_by_table_address((u32 *)(g_FileTable + i)); if (g_FileTable); if (g_FileInfo); @@ -4190,16 +4190,16 @@ void filesInit(void) if (j); } -void fileLoadPartToAddr(u16 filenum, void *memaddr, s32 offset, u32 len) +void file_load_part_to_addr(u16 filenum, void *memaddr, s32 offset, u32 len) { u32 stack[2]; - if (fileGetRomSizeByTableAddress((u32 *)&g_FileTable[filenum])) { - dmaExec(memaddr, (romptr_t) g_FileTable[filenum] + offset, len); + if (file_get_rom_size_by_table_address((u32 *)&g_FileTable[filenum])) { + dma_exec(memaddr, (romptr_t) g_FileTable[filenum] + offset, len); } } -u32 fileGetInflatedSize(s32 filenum) +u32 file_get_inflated_size(s32 filenum) { u8 *ptr; u8 buffer[0x50]; @@ -4219,10 +4219,10 @@ u32 fileGetInflatedSize(s32 filenum) if (romaddr == 0) { stub0f175f58(file0f166ea8(&g_FileTable[filenum]), ptr, 16); } else { - dmaExec(ptr, romaddr, 0x40); + dma_exec(ptr, romaddr, 0x40); } - if (rzipIs1173(ptr)) { + if (rzip_is_1173(ptr)) { return (ptr[2] << 16) | (ptr[3] << 8) | ptr[4]; } @@ -4233,14 +4233,14 @@ u32 fileGetInflatedSize(s32 filenum) ptr[0x04], ptr[0x05], ptr[0x06], ptr[0x07], ptr[0x08], ptr[0x09], ptr[0x0a], ptr[0x0b], ptr[0x0c], ptr[0x0d], ptr[0x0e], ptr[0x0f]); - crashSetMessage(message); + crash_set_message(message); CRASH(); #endif return 0; } -void *fileLoadToNew(s32 filenum, u32 method) +void *file_load_to_new(s32 filenum, u32 method) { struct fileinfo *info = &g_FileInfo[filenum]; u32 stack; @@ -4248,19 +4248,19 @@ void *fileLoadToNew(s32 filenum, u32 method) if (method == FILELOADMETHOD_EXTRAMEM || method == FILELOADMETHOD_DEFAULT) { if (info->loadedsize == 0) { - info->loadedsize = (fileGetInflatedSize(filenum) + 0x20) & 0xfffffff0; + info->loadedsize = (file_get_inflated_size(filenum) + 0x20) & 0xfffffff0; if (method == FILELOADMETHOD_EXTRAMEM) { info->loadedsize += 0x8000; } } - ptr = mempAlloc(info->loadedsize, MEMPOOL_STAGE); + ptr = memp_alloc(info->loadedsize, MEMPOOL_STAGE); info->allocsize = info->loadedsize; - fileLoad(ptr, info->loadedsize, (u32 *)&g_FileTable[filenum], info); + file_load(ptr, info->loadedsize, (u32 *)&g_FileTable[filenum], info); if (method != FILELOADMETHOD_EXTRAMEM) { - mempRealloc(ptr, info->loadedsize, MEMPOOL_STAGE); + memp_realloc(ptr, info->loadedsize, MEMPOOL_STAGE); } } else { while (1); @@ -4269,18 +4269,18 @@ void *fileLoadToNew(s32 filenum, u32 method) return ptr; } -void fileRemove(s32 filenum) +void file_remove(s32 filenum) { g_FileTable[filenum] = 0; } -void *fileLoadToAddr(s32 filenum, s32 method, u8 *ptr, u32 size) +void *file_load_to_addr(s32 filenum, s32 method, u8 *ptr, u32 size) { struct fileinfo *info = &g_FileInfo[filenum]; if (method == FILELOADMETHOD_EXTRAMEM || method == FILELOADMETHOD_DEFAULT) { info->allocsize = size; - fileLoad(ptr, size, (u32 *)&g_FileTable[filenum], info); + file_load(ptr, size, (u32 *)&g_FileTable[filenum], info); } else { while (1); } @@ -4288,27 +4288,27 @@ void *fileLoadToAddr(s32 filenum, s32 method, u8 *ptr, u32 size) return ptr; } -u32 fileGetLoadedSize(s32 filenum) +u32 file_get_loaded_size(s32 filenum) { return g_FileInfo[filenum].loadedsize; } -u32 fileGetAllocationSize(s32 filenum) +u32 file_get_allocation_size(s32 filenum) { return g_FileInfo[filenum].allocsize; } -void fileSetSize(s32 filenum, void *ptr, u32 size, bool reallocate) +void file_set_size(s32 filenum, void *ptr, u32 size, bool reallocate) { g_FileInfo[filenum].loadedsize = size; g_FileInfo[filenum].allocsize = size; if (reallocate) { - mempRealloc(ptr, g_FileInfo[filenum].loadedsize, MEMPOOL_STAGE); + memp_realloc(ptr, g_FileInfo[filenum].loadedsize, MEMPOOL_STAGE); } } -void filesStop(u8 arg0) +void files_stop(u8 arg0) { s32 i; @@ -4322,5 +4322,5 @@ void filesStop(u8 arg0) void func0f167330(void) { - filesStop(5); + files_stop(5); } diff --git a/src/game/filelist.c b/src/game/filelist.c index 1cfe79936..feeb5f420 100644 --- a/src/game/filelist.c +++ b/src/game/filelist.c @@ -40,7 +40,7 @@ void func0f110bf8(void) for (i = 0; i < ARRAYCOUNT(g_FileLists); i++) { if (g_FileLists[i] != NULL) { - memaFree(g_FileLists[i], align16(sizeof(struct filelist))); + mema_free(g_FileLists[i], align16(sizeof(struct filelist))); g_FileLists[i] = NULL; } } @@ -49,24 +49,24 @@ void func0f110bf8(void) /** * Allocate and build a file list. */ -void filelistCreate(s32 listnum, u8 filetype) +void filelist_create(s32 listnum, u8 filetype) { if (g_FileLists[listnum] == NULL) { - bgGarbageCollectRooms(align16(sizeof(struct filelist)), 1); - g_FileLists[listnum] = memaAlloc(align16(sizeof(struct filelist))); + bg_garbage_collect_rooms(align16(sizeof(struct filelist)), 1); + g_FileLists[listnum] = mema_alloc(align16(sizeof(struct filelist))); } g_FileLists[listnum]->timeuntilupdate = 1; g_FileLists[listnum]->filetype = filetype; if (var80062944 == 0) { - joySetPfsPollInterval(3); + joy_set_pfs_poll_interval(3); } var80062944 = 1; } -s32 filelistFindOrCreate(u8 filetype) +s32 filelist_find_or_create(u8 filetype) { s32 bestindex = -1; s32 i; @@ -84,7 +84,7 @@ s32 filelistFindOrCreate(u8 filetype) } if (bestindex >= 0) { - filelistCreate(bestindex, filetype); + filelist_create(bestindex, filetype); return bestindex; } @@ -92,13 +92,13 @@ s32 filelistFindOrCreate(u8 filetype) } #if VERSION >= VERSION_NTSC_1_0 -void filelistInvalidatePak(s32 device) +void filelist_invalidate_pak(s32 device) { g_FilelistKnownPlugCounts[device] = -1; } #endif -void filelistsTick(void) +void filelists_tick(void) { u32 updateall; u32 update; @@ -115,14 +115,14 @@ void filelistsTick(void) #if VERSION >= VERSION_NTSC_1_0 for (i = 0, updateall = false; i < ARRAYCOUNT(g_FilelistKnownPlugCounts); i++) { - if (pak0f1167d8(i) && pakGetPlugCount(i) != g_FilelistKnownPlugCounts[i]) { + if (pak0f1167d8(i) && pak_get_plug_count(i) != g_FilelistKnownPlugCounts[i]) { updateall = true; - g_FilelistKnownPlugCounts[i] = pakGetPlugCount(i); + g_FilelistKnownPlugCounts[i] = pak_get_plug_count(i); } } #else for (i = 0, updateall = false; i < ARRAYCOUNT(g_FilelistKnownPlugCounts); i++) { - s32 plugcount = pakGetPlugCount(i); + s32 plugcount = pak_get_plug_count(i); pak0f11698c(i); @@ -157,7 +157,7 @@ void filelistsTick(void) if (update) { osSyncPrintf("Rebuilding pakWad %d:\n", i); - filelistUpdate(g_FileLists[i]); + filelist_update(g_FileLists[i]); g_FileLists[i]->updatedthisframe = true; } } @@ -168,7 +168,7 @@ void filelistsTick(void) } } -void filelistUpdate(struct filelist *list) +void filelist_update(struct filelist *list) { const u32 sp3a88[] = { PAKFILETYPE_GAME, @@ -207,7 +207,7 @@ void filelistUpdate(struct filelist *list) list->unk305[dis2dev[i]] = 0; list->devicestartindexes[i] = -1; - ret = pakGetFileIdsByType(dis2dev[i], sp3a88[list->filetype], spa88); + ret = pak_get_file_ids_by_type(dis2dev[i], sp3a88[list->filetype], spa88); if (ret == 0) { // No error @@ -220,11 +220,11 @@ void filelistUpdate(struct filelist *list) list->spacesfree[dis2dev[i]] = 0; if (list->filetype == FILETYPE_CAMERA) { - list->spacesfree[dis2dev[i]] = pakGetNumFreeCameraSpacesInPak(dis2dev[i]); + list->spacesfree[dis2dev[i]] = pak_get_num_free_camera_spaces_in_pak(dis2dev[i]); } list->deviceguids[dis2dev[i]].fileid = 0; - list->deviceguids[dis2dev[i]].deviceserial = pakGetSerial(dis2dev[i]); + list->deviceguids[dis2dev[i]].deviceserial = pak_get_serial(dis2dev[i]); } else { // PFS error? list->spacesfree[dis2dev[i]] = -1; @@ -242,7 +242,7 @@ void filelistUpdate(struct filelist *list) // Iterating files for (i = 0; i < len; i++) { struct filelistfile *file = &list->files[list->numfiles]; - s32 ret = pakReadBodyAtGuid(filedevices[i], sp1288[i], file->name, sizeof(file->name)); + s32 ret = pak_read_body_at_guid(filedevices[i], sp1288[i], file->name, sizeof(file->name)); if (ret); @@ -253,7 +253,7 @@ void filelistUpdate(struct filelist *list) list->devicestartindexes[dev2dis[filedevices[i]]] = list->numfiles; } - file->deviceserial = pakGetSerial(filedevices[i]); + file->deviceserial = pak_get_serial(filedevices[i]); file->fileid = sp1288[i]; list->numfiles++; @@ -266,14 +266,14 @@ void filelistUpdate(struct filelist *list) if (list->deviceguids[filedevices[i]].fileid == 0) { list->deviceguids[filedevices[i]].fileid = sp1288[i]; - list->deviceguids[filedevices[i]].deviceserial = pakGetSerial(filedevices[i]); + list->deviceguids[filedevices[i]].deviceserial = pak_get_serial(filedevices[i]); } } } } } -void pheadAllocateTextures(s32 playernum, struct perfectheadtexturelist *textures) +void phead_allocate_textures(s32 playernum, struct perfectheadtexturelist *textures) { s32 i; s32 j; @@ -282,8 +282,8 @@ void pheadAllocateTextures(s32 playernum, struct perfectheadtexturelist *texture if (g_Menus[playernum].fm.headtextures == NULL) { if (textures == NULL) { g_Menus[playernum].fm.unke40_01 = true; - bgGarbageCollectRooms(align16(sizeof(struct perfectheadtexturelist)), 1); - g_Menus[playernum].fm.headtextures = memaAlloc(align16(sizeof(struct perfectheadtexturelist))); + bg_garbage_collect_rooms(align16(sizeof(struct perfectheadtexturelist)), 1); + g_Menus[playernum].fm.headtextures = mema_alloc(align16(sizeof(struct perfectheadtexturelist))); } else { g_Menus[playernum].fm.headtextures = textures; g_Menus[playernum].fm.unke40_01 = false; @@ -292,9 +292,9 @@ void pheadAllocateTextures(s32 playernum, struct perfectheadtexturelist *texture if (g_Menus[playernum].fm.headtextures == NULL) { #if VERSION >= VERSION_NTSC_1_0 - faultAssert("tc != NULL", "gamefile.c", 458); + fault_assert("tc != NULL", "gamefile.c", 458); #else - faultAssert("tc != NULL", "gamefile.c", 450); + fault_assert("tc != NULL", "gamefile.c", 450); #endif } @@ -321,18 +321,18 @@ void pheadAllocateTextures(s32 playernum, struct perfectheadtexturelist *texture } } -void pheadFreeTextures(s32 playernum) +void phead_free_textures(s32 playernum) { if (g_Menus[playernum].fm.headtextures != NULL) { if (g_Menus[playernum].fm.unke40_01) { - memaFree(g_Menus[playernum].fm.headtextures, align16(sizeof(struct perfectheadtexturelist))); + mema_free(g_Menus[playernum].fm.headtextures, align16(sizeof(struct perfectheadtexturelist))); } g_Menus[playernum].fm.headtextures = NULL; } } -struct textureconfig *pheadGetTexture(s32 playernum, s32 fileid, u16 deviceserial) +struct textureconfig *phead_get_texture(s32 playernum, s32 fileid, u16 deviceserial) { s32 i; s32 freeslot = -1; @@ -353,7 +353,7 @@ struct textureconfig *pheadGetTexture(s32 playernum, s32 fileid, u16 deviceseria } if (indextouse == -1) { - s8 device = pakFindBySerial(deviceserial); + s8 device = pak_find_by_serial(deviceserial); if (device < 0) { return NULL; diff --git a/src/game/filemgr.c b/src/game/filemgr.c index d39f51c5c..62c1d277d 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -62,12 +62,12 @@ struct menudialogdef g_FilemgrRenameMenuDialog; #endif #if PAL -MenuItemHandlerResult filemgrHandleSetLanguage(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_handle_set_language(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.language = item->param; - langSetEuropean(g_Vars.language); - menuPopDialog(); + lang_set_european(g_Vars.language); + menu_pop_dialog(); } return 0; @@ -96,7 +96,7 @@ struct menuitem g_ChooseLanguageMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_262, // "English" 0, - filemgrHandleSetLanguage, + filemgr_handle_set_language, }, { MENUITEMTYPE_SELECTABLE, @@ -104,7 +104,7 @@ struct menuitem g_ChooseLanguageMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_263, // "French" 0, - filemgrHandleSetLanguage, + filemgr_handle_set_language, }, { MENUITEMTYPE_SELECTABLE, @@ -112,7 +112,7 @@ struct menuitem g_ChooseLanguageMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_264, // "German" 0, - filemgrHandleSetLanguage, + filemgr_handle_set_language, }, { MENUITEMTYPE_SELECTABLE, @@ -120,7 +120,7 @@ struct menuitem g_ChooseLanguageMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_265, // "Italian" 0, - filemgrHandleSetLanguage, + filemgr_handle_set_language, }, { MENUITEMTYPE_SELECTABLE, @@ -128,7 +128,7 @@ struct menuitem g_ChooseLanguageMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_266, // "Spanish" 0, - filemgrHandleSetLanguage, + filemgr_handle_set_language, }, { MENUITEMTYPE_END }, }; @@ -143,7 +143,7 @@ struct menudialogdef g_ChooseLanguageMenuDialog = { }; #endif -char *filemgrGetDeviceName(s32 index) +char *filemgr_get_device_name(s32 index) { u16 names[] = { L_OPTIONS_112, // "Controller Pak 1" @@ -157,13 +157,13 @@ char *filemgrGetDeviceName(s32 index) }; if (index < ARRAYCOUNT(names)) { - return langGet(names[index]); + return lang_get(names[index]); } return NULL; } -MenuItemHandlerResult filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_device_name_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if ((g_Menus[g_MpPlayerNum].fm.device1 & 0x7f) >= SAVEDEVICE_INVALID) { @@ -174,12 +174,12 @@ MenuItemHandlerResult filemgrDeviceNameMenuHandler(s32 operation, struct menuite return 0; } -char *filemgrMenuTextDeviceName(struct menuitem *item) +char *filemgr_menu_text_device_name(struct menuitem *item) { - return filemgrGetDeviceName(g_Menus[g_MpPlayerNum].fm.device1 & 0x7f); + return filemgr_get_device_name(g_Menus[g_MpPlayerNum].fm.device1 & 0x7f); } -void filemgrGetSelectName(char *buffer, struct filelistfile *file, u32 filetype) +void filemgr_get_select_name(char *buffer, struct filelistfile *file, u32 filetype) { s32 days; char tmpbuffer1[28]; @@ -198,7 +198,7 @@ void filemgrGetSelectName(char *buffer, struct filelistfile *file, u32 filetype) break; case FILETYPE_MPPLAYER: // MP Player filenames have the play duration appended to the name - mpplayerfileGetOverview(file->name, namebuffer, &totalinseconds); + mpplayerfile_get_overview(file->name, namebuffer, &totalinseconds); pos = sprintf(tmpbuffer1, "%s-", namebuffer); if (totalinseconds >= 0x7ffffff) { // about 4.25 years @@ -231,7 +231,7 @@ const char var7f1b2f28[] = "Setup: item = %x\n"; // game, mpsetup, mpplayer, perfect head const u32 g_FileTypeSizes[] = {0xa0, 0x31, 0x4e, 0x4a0}; -MenuItemHandlerResult filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_file_name_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_Menus[g_MpPlayerNum].fm.filetodelete == 0) { @@ -242,10 +242,10 @@ MenuItemHandlerResult filemgrFileNameMenuHandler(s32 operation, struct menuitem return 0; } -char *filemgrMenuTextDeleteFileName(struct menuitem *item) +char *filemgr_menu_text_delete_file_name(struct menuitem *item) { if (g_Menus[g_MpPlayerNum].fm.filetodelete) { - filemgrGetSelectName(g_StringPointer, + filemgr_get_select_name(g_StringPointer, g_Menus[g_MpPlayerNum].fm.filetodelete, g_Menus[g_MpPlayerNum].fm.filetypetodelete); return g_StringPointer; @@ -254,9 +254,9 @@ char *filemgrMenuTextDeleteFileName(struct menuitem *item) return NULL; } -void filemgrSetDevice1BySerial(s32 deviceserial) +void filemgr_set_device1_by_serial(s32 deviceserial) { - s32 device = pakFindBySerial(deviceserial); + s32 device = pak_find_by_serial(deviceserial); if (device >= 0) { g_Menus[g_MpPlayerNum].fm.device1 = device; @@ -269,19 +269,19 @@ void filemgrSetDevice1BySerial(s32 deviceserial) } } -void filemgrSetDevice1ByFile(struct filelistfile *file) +void filemgr_set_device1_by_file(struct filelistfile *file) { - filemgrSetDevice1BySerial(file->deviceserial); + filemgr_set_device1_by_serial(file->deviceserial); } -void filemgrSetFileToDelete(struct filelistfile *file, s32 filetype) +void filemgr_set_file_to_delete(struct filelistfile *file, s32 filetype) { g_Menus[g_MpPlayerNum].fm.filetypetodelete = filetype; g_Menus[g_MpPlayerNum].fm.filetodelete = file; - filemgrSetDevice1ByFile(file); + filemgr_set_device1_by_file(file); } -char *filemgrMenuTextFailReason(struct menuitem *item) +char *filemgr_menu_text_fail_reason(struct menuitem *item) { static u16 reasons[] = { L_OPTIONS_322, // "The Controller Pak was not found in any controller." @@ -295,7 +295,7 @@ char *filemgrMenuTextFailReason(struct menuitem *item) L_OPTIONS_330, // "Game note delete failed." }; - return langGet(reasons[g_Menus[g_MpPlayerNum].fm.errno]); + return lang_get(reasons[g_Menus[g_MpPlayerNum].fm.errno]); } /** @@ -307,7 +307,7 @@ char *filemgr0f108484(struct menuitem *item) return g_StringPointer; } -MenuItemHandlerResult filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_device_name_for_error_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if ((g_Menus[g_MpPlayerNum].fm.device1 & 0x7f) >= SAVEDEVICE_INVALID) { @@ -332,9 +332,9 @@ MenuItemHandlerResult filemgrDeviceNameForErrorMenuHandler(s32 operation, struct return false; } -char *filemgrMenuTextDeviceNameForError(struct menuitem *item) +char *filemgr_menu_text_device_name_for_error(struct menuitem *item) { - sprintf(g_StringPointer, "%s", filemgrGetDeviceName(g_Menus[g_MpPlayerNum].fm.device1 & 0x7f)); + sprintf(g_StringPointer, "%s", filemgr_get_device_name(g_Menus[g_MpPlayerNum].fm.device1 & 0x7f)); if (g_Menus[g_MpPlayerNum].fm.errno != FILEERROR_PAKREMOVED) { s32 i = 0; @@ -363,11 +363,11 @@ const char var7f1b3024[] = "MyResult: %d\n"; const char var7f1b3034[] = "PakOperationSearch>> Search for pak: %x = %d\n"; #endif -void filemgrPushErrorDialog(u16 errno) +void filemgr_push_error_dialog(u16 errno) { g_Menus[g_MpPlayerNum].fm.errno = errno; - menuPushDialog(&g_FilemgrErrorMenuDialog); + menu_push_dialog(&g_FilemgrErrorMenuDialog); } struct menuitem g_FilemgrErrorMenuItems[] = { @@ -375,15 +375,15 @@ struct menuitem g_FilemgrErrorMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (uintptr_t) &filemgrMenuTextDeviceNameForError, + (uintptr_t) &filemgr_menu_text_device_name_for_error, 0, - filemgrDeviceNameForErrorMenuHandler, + filemgr_device_name_for_error_menu_handler, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (uintptr_t) &filemgrMenuTextFailReason, + (uintptr_t) &filemgr_menu_text_fail_reason, 0, NULL, }, @@ -411,7 +411,7 @@ struct menudialogdef g_FilemgrErrorMenuDialog = { * For a file listing, iterate the devices until the one at optionindex is found. * Depending on operation, return the device name or index of the first file. */ -s32 filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex) +s32 filemgr_get_device_name_or_start_index(s32 listnum, s32 operation, s32 optionindex) { u16 names[] = { L_OPTIONS_111, // "Game Pak" @@ -428,7 +428,7 @@ s32 filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex if (g_FileLists[listnum]->devicestartindexes[i] != -1) { if (remaining == 0) { if (operation == MENUOP_GETOPTGROUPTEXT) { - return (s32)langGet(names[i]); + return (s32)lang_get(names[i]); } return g_FileLists[listnum]->devicestartindexes[i]; @@ -441,7 +441,7 @@ s32 filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex return 0; } -char *filemgrMenuTextErrorTitle(struct menuitem *item) +char *filemgr_menu_text_error_title(struct menuitem *item) { u16 messages[] = { L_OPTIONS_331, // "Error Loading Game" @@ -458,31 +458,31 @@ char *filemgrMenuTextErrorTitle(struct menuitem *item) switch (g_Menus[g_MpPlayerNum].fm.fileop) { case FILEOP_LOAD_GAME: case FILEOP_LOAD_MPSETUP: - return langGet(messages[0]); + return lang_get(messages[0]); case FILEOP_SAVE_GAME_000: case FILEOP_SAVE_GAME_001: case FILEOP_SAVE_GAME_002: case FILEOP_SAVE_MPSETUP: - return langGet(messages[1]); + return lang_get(messages[1]); case FILEOP_LOAD_MPPLAYER: - return langGet(messages[2]); + return lang_get(messages[2]); case FILEOP_SAVE_MPPLAYER: - return langGet(messages[3]); + return lang_get(messages[3]); case FILEOP_READ_GAME: case FILEOP_READ_MPSETUP: case FILEOP_READ_MPPLAYER: - return langGet(messages[6]); + return lang_get(messages[6]); case FILEOP_WRITE_GAME: case FILEOP_WRITE_MPSETUP: case FILEOP_WRITE_MPPLAYER: - return langGet(messages[7]); + return lang_get(messages[7]); } - return langGet(messages[8]); + return lang_get(messages[8]); } #if VERSION >= VERSION_NTSC_1_0 -char *filemgrMenuTextFileType(struct menuitem *item) +char *filemgr_menu_text_file_type(struct menuitem *item) { u16 names[] = { L_OPTIONS_103, // "Single Player Agent File" @@ -498,26 +498,26 @@ char *filemgrMenuTextFileType(struct menuitem *item) case FILEOP_WRITE_GAME: case FILEOP_LOAD_GAME: case FILEOP_READ_GAME: - return langGet(names[0]); + return lang_get(names[0]); case FILEOP_SAVE_MPSETUP: case FILEOP_WRITE_MPSETUP: case FILEOP_LOAD_MPSETUP: case FILEOP_READ_MPSETUP: - return langGet(names[1]); + return lang_get(names[1]); case FILEOP_SAVE_MPPLAYER: case FILEOP_WRITE_MPPLAYER: case FILEOP_LOAD_MPPLAYER: case FILEOP_READ_MPPLAYER: - return langGet(names[2]); + return lang_get(names[2]); } - return langGet(names[0]); + return lang_get(names[0]); } #endif void func0f10898c(void) { - menuSetBanner(-1, false); + menu_set_banner(-1, false); switch (g_Menus[g_MpPlayerNum].fm.fileop) { case FILEOP_WRITE_GAME: @@ -526,7 +526,7 @@ void func0f10898c(void) case FILEOP_READ_GAME: case FILEOP_READ_MPSETUP: case FILEOP_READ_MPPLAYER: - memaFree(g_Menus[g_MpPlayerNum].fm.unke44, align16(g_FileTypeSizes[g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1])); + mema_free(g_Menus[g_MpPlayerNum].fm.unke44, align16(g_FileTypeSizes[g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1])); break; case FILEOP_LOAD_GAME: case FILEOP_LOAD_MPPLAYER: @@ -542,21 +542,21 @@ void func0f10898c(void) } } -void filemgrHandleSuccess(void) +void filemgr_handle_success(void) { - menuSetBanner(-1, false); + menu_set_banner(-1, false); switch (g_Menus[g_MpPlayerNum].fm.fileop) { case FILEOP_WRITE_GAME: case FILEOP_WRITE_MPSETUP: case FILEOP_WRITE_MPPLAYER: - memaFree(g_Menus[g_MpPlayerNum].fm.unke44, + mema_free(g_Menus[g_MpPlayerNum].fm.unke44, align16(g_FileTypeSizes[g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1])); break; case FILEOP_LOAD_GAME: g_Vars.bossfileid = g_Menus[g_MpPlayerNum].fm.fileid; g_Vars.bossdeviceserial = g_Menus[g_MpPlayerNum].fm.deviceserial; - bossfileSave(); + bossfile_save(); if (IS4MB()) { func0f0f820c(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); @@ -567,7 +567,7 @@ void filemgrHandleSuccess(void) case FILEOP_READ_GAME: case FILEOP_READ_MPSETUP: case FILEOP_READ_MPPLAYER: - filemgrSaveOrLoad(&var800a21e8, + filemgr_save_or_load(&var800a21e8, g_Menus[g_MpPlayerNum].fm.fileop - 98, g_Menus[g_MpPlayerNum].fm.mpplayernum); break; @@ -584,21 +584,21 @@ void filemgrHandleSuccess(void) } } -MenuItemHandlerResult filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_retry_save_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - filemgrRetrySave(2); + filemgr_retry_save(2); } return 0; } -MenuItemHandlerResult filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_save_elsewhere_yes_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 filetype; - menuCloseDialog(); + menu_close_dialog(); switch (g_Menus[g_MpPlayerNum].fm.fileop) { case FILEOP_SAVE_GAME_000: @@ -617,18 +617,18 @@ MenuItemHandlerResult filemgrSaveElsewhereYesMenuHandler(s32 operation, struct m break; } - filemgrPushSelectLocationDialog(g_Menus[g_MpPlayerNum].fm.fileop + 9, filetype); + filemgr_push_select_location_dialog(g_Menus[g_MpPlayerNum].fm.fileop + 9, filetype); } return 0; } -MenuItemHandlerResult filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_cancel_save2_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuCloseDialog(); + menu_close_dialog(); func0f10898c(); - menuUpdateCurFrame(); + menu_update_cur_frame(); } return 0; @@ -640,33 +640,33 @@ MenuItemHandlerResult filemgrCancelSave2MenuHandler(s32 operation, struct menuit MenuItemHandlerResult filemgr0f108d14(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - filemgrRetrySave(2); + filemgr_retry_save(2); } return 0; } -MenuItemHandlerResult filemgrAcknowledgeFileLostMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_acknowledge_file_lost_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuCloseDialog(); + menu_close_dialog(); func0f10898c(); - menuUpdateCurFrame(); + menu_update_cur_frame(); } return 0; } #if VERSION >= VERSION_NTSC_1_0 -void filemgrEraseCorruptFile(void) +void filemgr_erase_corrupt_file(void) { s32 device; s32 i; - device = pakFindBySerial(g_Menus[g_MpPlayerNum].fm.deviceserial); + device = pak_find_by_serial(g_Menus[g_MpPlayerNum].fm.deviceserial); if (device >= 0) { - pakDeleteFile(device, g_Menus[g_MpPlayerNum].fm.fileid); + pak_delete_file(device, g_Menus[g_MpPlayerNum].fm.fileid); } for (i = 0; i < ARRAYCOUNT(g_FileLists); i++) { @@ -675,39 +675,39 @@ void filemgrEraseCorruptFile(void) } } - menuPushDialog(&g_FilemgrFileLostMenuDialog); + menu_push_dialog(&g_FilemgrFileLostMenuDialog); } #endif -MenuDialogHandlerResult filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult filemgr_insert_original_pak_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) { - filemgrRetrySave(0); + filemgr_retry_save(0); } } return false; } -MenuItemHandlerResult filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_reinserted_ok_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - pakExecuteDebugOperations(); - filemgrRetrySave(1); + pak_execute_debug_operations(); + filemgr_retry_save(1); } return 0; } -MenuItemHandlerResult filemgrReinsertedCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_reinserted_cancel_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (FILEOP_IS_SAVE(g_Menus[g_MpPlayerNum].fm.fileop) && g_Menus[g_MpPlayerNum].fm.fileop != FILEOP_SAVE_GAME_001) { func0f0f3704(&g_FilemgrSaveElsewhereMenuDialog); } else { - menuPopDialog(); + menu_pop_dialog(); } } @@ -715,13 +715,13 @@ MenuItemHandlerResult filemgrReinsertedCancelMenuHandler(s32 operation, struct m } #if VERSION >= VERSION_NTSC_1_0 -char *filemgrMenuTextInsertOriginalPak(struct menuitem *item) +char *filemgr_menu_text_insert_original_pak(struct menuitem *item) { char fullbuffer[100]; char namebuffer[100]; s32 i; - sprintf(namebuffer, filemgrMenuTextFileType(item)); + sprintf(namebuffer, filemgr_menu_text_file_type(item)); // Replace first line break in namebuffer with a terminator i = 0; @@ -735,9 +735,9 @@ char *filemgrMenuTextInsertOriginalPak(struct menuitem *item) } // "Please insert the Controller Pak containing your %s into any controller." - sprintf(fullbuffer, langGet(L_OPTIONS_363), namebuffer); + sprintf(fullbuffer, lang_get(L_OPTIONS_363), namebuffer); - textWrap(120, fullbuffer, g_StringPointer, g_CharsHandelGothicSm, g_FontHandelGothicSm); + text_wrap(120, fullbuffer, g_StringPointer, g_CharsHandelGothicSm, g_FontHandelGothicSm); return g_StringPointer; } @@ -749,35 +749,35 @@ char *filemgrMenuTextInsertOriginalPak(struct menuitem *item) * 1 when user selects OK on reinsert dialog * 2 when user selects Retry Save on error dialog */ -void filemgrRetrySave(s32 context) +void filemgr_retry_save(s32 context) { - s32 device = pakFindBySerial(g_Menus[g_MpPlayerNum].fm.deviceserial); + s32 device = pak_find_by_serial(g_Menus[g_MpPlayerNum].fm.deviceserial); if (device == -1) { if (context == 1) { - filemgrPushErrorDialog(FILEERROR_NOPAK); + filemgr_push_error_dialog(FILEERROR_NOPAK); } if (context == 2) { func0f0f3704(&g_PakNotOriginalMenuDialog); } - } else if (filemgrAttemptOperation(device, true)) { + } else if (filemgr_attempt_operation(device, true)) { if (context == 2) { g_Menus[g_MpPlayerNum].fm.device1 = device; if (FILEOP_IS_SAVE(g_Menus[g_MpPlayerNum].fm.fileop)) { - filemgrPushErrorDialog(FILEERROR_SAVEFAILED); + filemgr_push_error_dialog(FILEERROR_SAVEFAILED); } else { - filemgrPushErrorDialog(FILEERROR_LOADFAILED); + filemgr_push_error_dialog(FILEERROR_LOADFAILED); } } else { - filemgrSetDevice1BySerial(g_Menus[g_MpPlayerNum].fm.deviceserial); + filemgr_set_device1_by_serial(g_Menus[g_MpPlayerNum].fm.deviceserial); if (FILEOP_IS_SAVE(g_Menus[g_MpPlayerNum].fm.fileop)) { func0f0f3704(&g_FilemgrSaveErrorMenuDialog); } else { #if VERSION >= VERSION_NTSC_1_0 - filemgrEraseCorruptFile(); + filemgr_erase_corrupt_file(); #else func0f0f3704(&g_FilemgrFileLostMenuDialog); #endif @@ -786,7 +786,7 @@ void filemgrRetrySave(s32 context) } } -bool filemgrAttemptOperation(s32 device, bool closeonsuccess) +bool filemgr_attempt_operation(s32 device, bool closeonsuccess) { s32 errno = 0; bool showfilesaved = (g_Menus[g_MpPlayerNum].fm.isretryingsave & 1) != 0; @@ -806,18 +806,18 @@ bool filemgrAttemptOperation(s32 device, bool closeonsuccess) // fall through case FILEOP_SAVE_GAME_000: case FILEOP_SAVE_GAME_001: - errno = gamefileSave(device, + errno = gamefile_save(device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.deviceserial); break; case FILEOP_SAVE_MPPLAYER: - errno = mpplayerfileSave( + errno = mpplayerfile_save( (s32) g_Menus[g_MpPlayerNum].fm.unke44, device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.deviceserial); break; case FILEOP_SAVE_MPSETUP: - errno = mpsetupfileSave(device, + errno = mpsetupfile_save(device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.deviceserial); showfilesaved = true; @@ -829,24 +829,24 @@ bool filemgrAttemptOperation(s32 device, bool closeonsuccess) #if VERSION >= VERSION_NTSC_1_0 func0f0d5690(g_Menus[g_MpPlayerNum].fm.unke44, g_Menus[g_MpPlayerNum].fm.filename); #endif - errno = pakSaveAtGuid(device, + errno = pak_save_at_guid(device, g_Menus[g_MpPlayerNum].fm.fileid, filetypes[g_Menus[g_MpPlayerNum].fm.fileop - 6], g_Menus[g_MpPlayerNum].fm.unke44, &newfileid, NULL); var80075bd0[g_Menus[g_MpPlayerNum].fm.fileop - 6] = 1; break; case FILEOP_LOAD_GAME: - errno = gamefileLoad(device); + errno = gamefile_load(device); break; case FILEOP_LOAD_MPPLAYER: - errno = mpplayerfileLoad( + errno = mpplayerfile_load( (s32) g_Menus[g_MpPlayerNum].fm.unke44, device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.deviceserial); break; case FILEOP_LOAD_MPSETUP: - errno = mpsetupfileLoad(device, + errno = mpsetupfile_load(device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.deviceserial); break; @@ -854,33 +854,33 @@ bool filemgrAttemptOperation(s32 device, bool closeonsuccess) case FILEOP_READ_MPSETUP: case FILEOP_READ_MPPLAYER: #if VERSION >= VERSION_NTSC_1_0 - errno = pakReadBodyAtGuid(device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.unke44, 0); + errno = pak_read_body_at_guid(device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.unke44, 0); #else - errno = pakReadBodyAtGuid(device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.unke44, + errno = pak_read_body_at_guid(device, g_Menus[g_MpPlayerNum].fm.fileid, g_Menus[g_MpPlayerNum].fm.unke44, g_FileTypeSizes[g_Menus[g_MpPlayerNum].fm.fileop - FILEOP_READ_GAME]); #endif break; } if (errno == 0 && closeonsuccess) { - menuCloseDialog(); + menu_close_dialog(); } if (FILEOP_IS_SAVE(g_Menus[g_MpPlayerNum].fm.fileop)) { if (errno == 0) { - filemgrHandleSuccess(); + filemgr_handle_success(); } if (showfilesaved && errno == 0) { - menuPushDialog(&g_FilemgrFileSavedMenuDialog); + menu_push_dialog(&g_FilemgrFileSavedMenuDialog); } } else { if (errno == 0) { - filemgrHandleSuccess(); + filemgr_handle_success(); } } - menuUpdateCurFrame(); + menu_update_cur_frame(); return errno; } @@ -913,7 +913,7 @@ const char var7f1b31ec[] = "Multiplayer %d was using that file...\n"; * * Return true if it worked, otherwise false. */ -bool filemgrSaveOrLoad(struct fileguid *guid, s32 fileop, u32 playernum) +bool filemgr_save_or_load(struct fileguid *guid, s32 fileop, u32 playernum) { s32 device; @@ -932,28 +932,28 @@ bool filemgrSaveOrLoad(struct fileguid *guid, s32 fileop, u32 playernum) // empty } - device = pakFindBySerial(g_Menus[g_MpPlayerNum].fm.deviceserial); + device = pak_find_by_serial(g_Menus[g_MpPlayerNum].fm.deviceserial); if (device == -1) { // Original pak is no longer connected g_Menus[g_MpPlayerNum].fm.isretryingsave |= 1; - menuPushDialog(&g_PakNotOriginalMenuDialog); + menu_push_dialog(&g_PakNotOriginalMenuDialog); return false; } - if (filemgrAttemptOperation(device, false) != 0) { + if (filemgr_attempt_operation(device, false) != 0) { // Operation failed g_Menus[g_MpPlayerNum].fm.isretryingsave |= 1; - filemgrSetDevice1BySerial(g_Menus[g_MpPlayerNum].fm.deviceserial); + filemgr_set_device1_by_serial(g_Menus[g_MpPlayerNum].fm.deviceserial); if (FILEOP_IS_SAVE(g_Menus[g_MpPlayerNum].fm.fileop)) { - menuPushDialog(&g_FilemgrSaveErrorMenuDialog); + menu_push_dialog(&g_FilemgrSaveErrorMenuDialog); } else { // File couldn't be loaded #if VERSION >= VERSION_NTSC_1_0 - filemgrEraseCorruptFile(); + filemgr_erase_corrupt_file(); #else - menuPushDialog(&g_FilemgrFileLostMenuDialog); + menu_push_dialog(&g_FilemgrFileLostMenuDialog); #endif } @@ -963,16 +963,16 @@ bool filemgrSaveOrLoad(struct fileguid *guid, s32 fileop, u32 playernum) return true; } -void filemgrDeleteCurrentFile(void) +void filemgr_delete_current_file(void) { #if VERSION >= VERSION_JPN_FINAL // JPN uses an array for g_FilemgrFileToDelete bool error = false; - s8 device = pakFindBySerial(g_FilemgrFileToDelete[g_MpPlayerNum].deviceserial); + s8 device = pak_find_by_serial(g_FilemgrFileToDelete[g_MpPlayerNum].deviceserial); s32 i; if (device >= 0) { - if (pakDeleteFile(device, g_FilemgrFileToDelete[g_MpPlayerNum].fileid) != 0) { + if (pak_delete_file(device, g_FilemgrFileToDelete[g_MpPlayerNum].fileid) != 0) { error = true; } } else { @@ -983,23 +983,23 @@ void filemgrDeleteCurrentFile(void) if (error) { g_Menus[g_MpPlayerNum].fm.device1 = device; - filemgrPushErrorDialog(FILEERROR_DELETEFAILED); + filemgr_push_error_dialog(FILEERROR_DELETEFAILED); } else { // If deleting a loaded MP player, reset them to default for (i = 0; i < MAX_PLAYERS; i++) { if (g_FilemgrFileToDelete[g_MpPlayerNum].fileid == g_PlayerConfigsArray[i].fileguid.fileid && g_FilemgrFileToDelete[g_MpPlayerNum].deviceserial == g_PlayerConfigsArray[i].fileguid.deviceserial) { - mpPlayerSetDefaults(i, true); + mp_player_set_defaults(i, true); } } } #else bool error = false; - s8 device = pakFindBySerial(g_FilemgrFileToDelete.deviceserial); + s8 device = pak_find_by_serial(g_FilemgrFileToDelete.deviceserial); s32 i; if (device >= 0) { - if (pakDeleteFile(device, g_FilemgrFileToDelete.fileid) != 0) { + if (pak_delete_file(device, g_FilemgrFileToDelete.fileid) != 0) { error = true; } } else { @@ -1010,13 +1010,13 @@ void filemgrDeleteCurrentFile(void) if (error) { g_Menus[g_MpPlayerNum].fm.device1 = device; - filemgrPushErrorDialog(FILEERROR_DELETEFAILED); + filemgr_push_error_dialog(FILEERROR_DELETEFAILED); } else { // If deleting a loaded MP player, reset them to default for (i = 0; i < MAX_PLAYERS; i++) { if (g_FilemgrFileToDelete.fileid == g_PlayerConfigsArray[i].fileguid.fileid && g_FilemgrFileToDelete.deviceserial == g_PlayerConfigsArray[i].fileguid.deviceserial) { - mpPlayerSetDefaults(i, true); + mp_player_set_defaults(i, true); } } } @@ -1057,9 +1057,9 @@ struct menuitem g_FilemgrSaveErrorMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (uintptr_t) &filemgrMenuTextDeviceName, + (uintptr_t) &filemgr_menu_text_device_name, 0, - filemgrDeviceNameMenuHandler, + filemgr_device_name_menu_handler, }, { MENUITEMTYPE_LABEL, @@ -1075,7 +1075,7 @@ struct menuitem g_FilemgrSaveErrorMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_349, // "Try Again" 0, - filemgrRetrySaveMenuHandler, + filemgr_retry_save_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -1083,7 +1083,7 @@ struct menuitem g_FilemgrSaveErrorMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_350, // "Save Elsewhere" 0, - filemgrSaveElsewhereYesMenuHandler, + filemgr_save_elsewhere_yes_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -1091,14 +1091,14 @@ struct menuitem g_FilemgrSaveErrorMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_351, // "Cancel" 0, - filemgrCancelSave2MenuHandler, + filemgr_cancel_save2_menu_handler, }, { MENUITEMTYPE_END }, }; struct menudialogdef g_FilemgrSaveErrorMenuDialog = { MENUDIALOGTYPE_DANGER, - (uintptr_t) &filemgrMenuTextErrorTitle, + (uintptr_t) &filemgr_menu_text_error_title, g_FilemgrSaveErrorMenuItems, NULL, MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, @@ -1110,9 +1110,9 @@ struct menuitem g_FilemgrFileLostMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (uintptr_t) &filemgrMenuTextDeviceName, + (uintptr_t) &filemgr_menu_text_device_name, 0, - filemgrDeviceNameMenuHandler, + filemgr_device_name_menu_handler, }, #if VERSION >= VERSION_NTSC_1_0 { @@ -1147,14 +1147,14 @@ struct menuitem g_FilemgrFileLostMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_354, // "Cancel" 0, - filemgrAcknowledgeFileLostMenuHandler, + filemgr_acknowledge_file_lost_menu_handler, }, { MENUITEMTYPE_END }, }; struct menudialogdef g_FilemgrFileLostMenuDialog = { MENUDIALOGTYPE_DANGER, - (uintptr_t) &filemgrMenuTextErrorTitle, + (uintptr_t) &filemgr_menu_text_error_title, g_FilemgrFileLostMenuItems, NULL, MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, @@ -1176,7 +1176,7 @@ struct menuitem g_FilemgrSaveElsewhereMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_361, // "Yes" 0, - filemgrSaveElsewhereYesMenuHandler, + filemgr_save_elsewhere_yes_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -1184,7 +1184,7 @@ struct menuitem g_FilemgrSaveElsewhereMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_362, // "No" 0, - filemgrCancelSave2MenuHandler, + filemgr_cancel_save2_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -1204,7 +1204,7 @@ struct menuitem g_PakNotOriginalMenuItems[] = { 0, MENUITEMFLAG_LESSLEFTPADDING, #if VERSION >= VERSION_NTSC_1_0 - (uintptr_t) &filemgrMenuTextInsertOriginalPak, + (uintptr_t) &filemgr_menu_text_insert_original_pak, #else L_OPTIONS_363, // "Please insert the Controller Pak containing your %s into any controller." #endif @@ -1217,7 +1217,7 @@ struct menuitem g_PakNotOriginalMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_365, // "OK" 0, - filemgrReinsertedOkMenuHandler, + filemgr_reinserted_ok_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -1225,16 +1225,16 @@ struct menuitem g_PakNotOriginalMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_366, // "Cancel" 0, - filemgrReinsertedCancelMenuHandler, + filemgr_reinserted_cancel_menu_handler, }, { MENUITEMTYPE_END }, }; struct menudialogdef g_PakNotOriginalMenuDialog = { MENUDIALOGTYPE_DANGER, - (uintptr_t) &filemgrMenuTextErrorTitle, + (uintptr_t) &filemgr_menu_text_error_title, g_PakNotOriginalMenuItems, - filemgrInsertOriginalPakMenuDialog, + filemgr_insert_original_pak_menu_dialog, MENUDIALOGFLAG_IGNOREBACK | MENUDIALOGFLAG_DISABLEBANNER, NULL, }; @@ -1249,12 +1249,12 @@ void func0f1097d0(s32 device) var800a21e8.fileid = g_FileLists[0]->deviceguids[device].fileid; var800a21e8.deviceserial = g_FileLists[0]->deviceguids[device].deviceserial; - thing = memaAlloc(align16(g_FileTypeSizes[g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1])); + thing = mema_alloc(align16(g_FileTypeSizes[g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1])); if (thing) { - filemgrSaveOrLoad(&g_FilemgrFileToCopy, g_Menus[g_MpPlayerNum].fm.filetypeplusone + 103, (s32) thing); + filemgr_save_or_load(&g_FilemgrFileToCopy, g_Menus[g_MpPlayerNum].fm.filetypeplusone + 103, (s32) thing); } else { - filemgrPushErrorDialog(FILEERROR_OUTOFMEMORY); + filemgr_push_error_dialog(FILEERROR_OUTOFMEMORY); } var80075bd0[g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1] = 1; @@ -1268,18 +1268,18 @@ const char var7f1b326c[] = "COULDNT GET THE RAM!\n"; const char var7f1b3284[] = "Saving...\n"; #endif -void filemgrSaveGameToDevice(s32 device) +void filemgr_save_game_to_device(s32 device) { if (g_FileLists[0]) { g_GameFileGuid.fileid = g_FileLists[0]->deviceguids[device].fileid; g_GameFileGuid.deviceserial = g_FileLists[0]->deviceguids[device].deviceserial; - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); } } #if VERSION >= VERSION_NTSC_1_0 -void filemgrGetFileName(char *dst, struct filelistfile *file) +void filemgr_get_file_name(char *dst, struct filelistfile *file) { char localbuffer[20]; u32 playtime; @@ -1292,7 +1292,7 @@ void filemgrGetFileName(char *dst, struct filelistfile *file) func0f0d564c(file->name, localbuffer, false); break; case FILETYPE_MPPLAYER: - mpplayerfileGetOverview(file->name, localbuffer, &playtime); + mpplayerfile_get_overview(file->name, localbuffer, &playtime); break; } @@ -1303,7 +1303,7 @@ void filemgrGetFileName(char *dst, struct filelistfile *file) #if VERSION >= VERSION_NTSC_1_0 const char var7f1b3294[] = "GETFileNameForThePurposesOfTheFileRenamingChecker: Unknown type %d\n"; -void filemgrGetRenameName(char *buffer) +void filemgr_get_rename_name(char *buffer) { s32 i; s32 j; @@ -1349,7 +1349,7 @@ void filemgrGetRenameName(char *buffer) #endif #if VERSION >= VERSION_NTSC_1_0 -void filemgrSetRenameName(char *name) +void filemgr_set_rename_name(char *name) { switch (g_Menus[g_MpPlayerNum].fm.unke3e) { case 0: @@ -1382,7 +1382,7 @@ const char var7f1b32dc[] = "SetFileNameForThePurposesOfTheFileRenamingChecker: U #endif #if VERSION >= VERSION_NTSC_1_0 -bool filemgrIsNameAvailable(s32 device) +bool filemgr_is_name_available(s32 device) { static u8 lookup[] = {1, 2, 3, 4, 0}; @@ -1420,9 +1420,9 @@ bool filemgrIsNameAvailable(s32 device) } // Get the filename to search for, make it uppercase and remove trailing line break. - // @dangerous: findname can overflow if filemgrGetRenameName returns a long name. + // @dangerous: findname can overflow if filemgr_get_rename_name returns a long name. findname[0] = '\0'; - filemgrGetRenameName(findname); + filemgr_get_rename_name(findname); for (j = 0; findname[j] != '\0';) { if (findname[j] >= 'a' && findname[j] <= 'z') { @@ -1440,10 +1440,10 @@ bool filemgrIsNameAvailable(s32 device) // Iterate files for (i = startindex; i < endindex; i++) { - filemgrGetFileName(loopname, &g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->files[i]); + filemgr_get_file_name(loopname, &g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->files[i]); // Convert loop filename to uppercase and remove trailing line break - // @dangerous: loopname can overflow if filemgrGetFileName returns a long name. + // @dangerous: loopname can overflow if filemgr_get_file_name returns a long name. for (j = 0; loopname[j] != '\0';) { if (loopname[j] >= 'a' && loopname[j] <= 'z') { loopname[j] -= 32; @@ -1478,33 +1478,33 @@ const char var7f1b33d8[] = "decided location: %d\n"; /** * Used for both saving new files and copying files. */ -void filemgrSaveToDevice(void) +void filemgr_save_to_device(void) { if (g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->spacesfree[g_Menus[g_MpPlayerNum].fm.device2] > 0) { - if (!filemgrIsNameAvailable(g_Menus[g_MpPlayerNum].fm.device2)) { - menuPushDialog(&g_FilemgrDuplicateNameMenuDialog); + if (!filemgr_is_name_available(g_Menus[g_MpPlayerNum].fm.device2)) { + menu_push_dialog(&g_FilemgrDuplicateNameMenuDialog); } else { - menuPopDialog(); + menu_pop_dialog(); if (g_Menus[g_MpPlayerNum].fm.unke3e == 0) { - filemgrSaveGameToDevice(g_Menus[g_MpPlayerNum].fm.device2); + filemgr_save_game_to_device(g_Menus[g_MpPlayerNum].fm.device2); } else if (g_Menus[g_MpPlayerNum].fm.unke3e == 5) { // empty } else if (g_Menus[g_MpPlayerNum].fm.unke3e == 6) { struct fileguid guid; guid.fileid = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[g_Menus[g_MpPlayerNum].fm.device2].fileid; guid.deviceserial = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[g_Menus[g_MpPlayerNum].fm.device2].deviceserial; - filemgrSaveOrLoad(&guid, FILEOP_SAVE_MPPLAYER, (u32)g_MpPlayerNum); + filemgr_save_or_load(&guid, FILEOP_SAVE_MPPLAYER, (u32)g_MpPlayerNum); } else if (g_Menus[g_MpPlayerNum].fm.unke3e == 7) { struct fileguid guid; guid.fileid = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[g_Menus[g_MpPlayerNum].fm.device2].fileid; guid.deviceserial = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[g_Menus[g_MpPlayerNum].fm.device2].deviceserial; - filemgrSaveOrLoad(&guid, FILEOP_SAVE_MPSETUP, 0); + filemgr_save_or_load(&guid, FILEOP_SAVE_MPSETUP, 0); } else if (g_Menus[g_MpPlayerNum].fm.unke3e >= 9) { struct fileguid guid; guid.fileid = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[g_Menus[g_MpPlayerNum].fm.device2].fileid; guid.deviceserial = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[g_Menus[g_MpPlayerNum].fm.device2].deviceserial; - filemgrSaveOrLoad(&guid, -1, 0); + filemgr_save_or_load(&guid, -1, 0); } else { func0f1097d0(g_Menus[g_MpPlayerNum].fm.device2); } @@ -1514,19 +1514,19 @@ void filemgrSaveToDevice(void) #endif #if VERSION >= VERSION_NTSC_1_0 -MenuItemHandlerResult filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_confirm_rename_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; switch (operation) { case MENUOP_GETTEXT: - filemgrGetRenameName(name); + filemgr_get_rename_name(name); break; case MENUOP_SETTEXT: - filemgrSetRenameName(name); + filemgr_set_rename_name(name); break; case MENUOP_SET: - filemgrSaveToDevice(); + filemgr_save_to_device(); break; } @@ -1535,11 +1535,11 @@ MenuItemHandlerResult filemgrConfirmRenameMenuHandler(s32 operation, struct menu #endif #if VERSION >= VERSION_NTSC_1_0 -MenuItemHandlerResult filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_duplicate_rename_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - menuPushDialog(&g_FilemgrRenameMenuDialog); + menu_pop_dialog(); + menu_push_dialog(&g_FilemgrRenameMenuDialog); } return 0; @@ -1547,11 +1547,11 @@ MenuItemHandlerResult filemgrDuplicateRenameMenuHandler(s32 operation, struct me #endif #if VERSION >= VERSION_NTSC_1_0 -MenuItemHandlerResult filemgrDuplicateCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_duplicate_cancel_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - menuPopDialog(); + menu_pop_dialog(); + menu_pop_dialog(); } return 0; @@ -1559,18 +1559,18 @@ MenuItemHandlerResult filemgrDuplicateCancelMenuHandler(s32 operation, struct me #endif #if VERSION >= VERSION_NTSC_1_0 -char *filemgrMenuTextDeviceNameContainingDuplicateFile(struct menuitem *item) +char *filemgr_menu_text_device_name_containing_duplicate_file(struct menuitem *item) { - return filemgrGetDeviceName(g_Menus[g_MpPlayerNum].fm.device2); + return filemgr_get_device_name(g_Menus[g_MpPlayerNum].fm.device2); } #endif #if VERSION >= VERSION_NTSC_1_0 -char *filemgrMenuTextDuplicateFileName(struct menuitem *item) +char *filemgr_menu_text_duplicate_file_name(struct menuitem *item) { char buffer[32]; - filemgrGetRenameName(buffer); + filemgr_get_rename_name(buffer); sprintf(g_StringPointer, "%s\n", buffer); return g_StringPointer; @@ -1593,7 +1593,7 @@ struct menuitem g_FilemgrRenameMenuItems[] = { 0, 0, 0, - filemgrConfirmRenameMenuHandler, + filemgr_confirm_rename_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -1614,7 +1614,7 @@ struct menuitem g_FilemgrDuplicateMenuMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t) &filemgrMenuTextDeviceNameContainingDuplicateFile, + (uintptr_t) &filemgr_menu_text_device_name_containing_duplicate_file, 0, NULL, }, @@ -1638,7 +1638,7 @@ struct menuitem g_FilemgrDuplicateMenuMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LESSHEIGHT, - (uintptr_t) &filemgrMenuTextDuplicateFileName, + (uintptr_t) &filemgr_menu_text_duplicate_file_name, 0, NULL, }, @@ -1648,7 +1648,7 @@ struct menuitem g_FilemgrDuplicateMenuMenuItems[] = { 0, L_MPWEAPONS_235, // "Rename File" 0, - filemgrDuplicateRenameMenuHandler, + filemgr_duplicate_rename_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -1664,7 +1664,7 @@ struct menuitem g_FilemgrDuplicateMenuMenuItems[] = { 0, L_MPWEAPONS_237, // "Cancel" 0, - filemgrDuplicateCancelMenuHandler, + filemgr_duplicate_cancel_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -1679,7 +1679,7 @@ struct menudialogdef g_FilemgrDuplicateNameMenuDialog = { }; #endif -char *filemgrMenuTextLocationName2(struct menuitem *item) +char *filemgr_menu_text_location_name2(struct menuitem *item) { u16 names[] = { L_OPTIONS_112, // "Controller Pak 1" @@ -1696,18 +1696,18 @@ char *filemgrMenuTextLocationName2(struct menuitem *item) #if VERSION >= VERSION_NTSC_1_0 if (g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->spacesfree[item->param] < 0) { - return langGet(names[5]); + return lang_get(names[5]); } #else if (g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->spacesfree[item->param] <= 0) { - return langGet(names[5]); + return lang_get(names[5]); } #endif - return langGet(names[item->param]); + return lang_get(names[item->param]); } -char *filemgrMenuTextSaveLocationSpaces(struct menuitem *item) +char *filemgr_menu_text_save_location_spaces(struct menuitem *item) { s32 spacesfree; @@ -1722,7 +1722,7 @@ char *filemgrMenuTextSaveLocationSpaces(struct menuitem *item) } if (spacesfree == 0) { - return langGet(L_OPTIONS_372); // "Full" + return lang_get(L_OPTIONS_372); // "Full" } sprintf(g_StringPointer, "%d", spacesfree); @@ -1744,7 +1744,7 @@ const char var7f1b34ac[] = "Deleting files, wad %d\n"; /** * item->param is a SAVEDEVICE constant. */ -MenuItemHandlerResult filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_select_location_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum] == NULL) { return 0; @@ -1759,29 +1759,29 @@ MenuItemHandlerResult filemgrSelectLocationMenuHandler(s32 operation, struct men if (operation == MENUOP_SET) { #if VERSION >= VERSION_NTSC_1_0 g_Menus[g_MpPlayerNum].fm.device2 = item->param; - filemgrSaveToDevice(); + filemgr_save_to_device(); #else - menuPopDialog(); + menu_pop_dialog(); if (g_Menus[g_MpPlayerNum].fm.unke3e == 0) { - filemgrSaveGameToDevice(item->param); + filemgr_save_game_to_device(item->param); } else if (g_Menus[g_MpPlayerNum].fm.unke3e == 5) { // empty } else if (g_Menus[g_MpPlayerNum].fm.unke3e == 6) { struct fileguid guid; guid.fileid = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[item->param].fileid; guid.deviceserial = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[item->param].deviceserial; - filemgrSaveOrLoad(&guid, FILEOP_SAVE_MPPLAYER, (u32)g_MpPlayerNum); + filemgr_save_or_load(&guid, FILEOP_SAVE_MPPLAYER, (u32)g_MpPlayerNum); } else if (g_Menus[g_MpPlayerNum].fm.unke3e == 7) { struct fileguid guid; guid.fileid = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[item->param].fileid; guid.deviceserial = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[item->param].deviceserial; - filemgrSaveOrLoad(&guid, FILEOP_SAVE_MPSETUP, 0); + filemgr_save_or_load(&guid, FILEOP_SAVE_MPSETUP, 0); } else if (g_Menus[g_MpPlayerNum].fm.unke3e >= 9) { struct fileguid guid; guid.fileid = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[item->param].fileid; guid.deviceserial = g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->deviceguids[item->param].deviceserial; - filemgrSaveOrLoad(&guid, -1, 0); + filemgr_save_or_load(&guid, -1, 0); } else { func0f1097d0(item->param); } @@ -1791,49 +1791,49 @@ MenuItemHandlerResult filemgrSelectLocationMenuHandler(s32 operation, struct men return 0; } -MenuItemHandlerResult filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_cancel_save_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); + menu_pop_dialog(); } return 0; } -MenuItemHandlerResult filemgrDeleteFilesForSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_delete_files_for_save_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - filemgrPushDeleteFileDialog(g_Menus[g_MpPlayerNum].fm.listnum); + filemgr_push_delete_file_dialog(g_Menus[g_MpPlayerNum].fm.listnum); g_Menus[g_MpPlayerNum].fm.isdeletingforsave = true; } return 0; } -void filemgrPushSelectLocationDialog(s32 arg0, u32 filetype) +void filemgr_push_select_location_dialog(s32 arg0, u32 filetype) { g_Menus[g_MpPlayerNum].fm.unke3e = arg0; - g_Menus[g_MpPlayerNum].fm.listnum = filelistFindOrCreate(filetype); + g_Menus[g_MpPlayerNum].fm.listnum = filelist_find_or_create(filetype); #if VERSION >= VERSION_NTSC_1_0 - filelistsTick(); + filelists_tick(); #endif - menuPushDialog(&g_FilemgrSelectLocationMenuDialog); + menu_push_dialog(&g_FilemgrSelectLocationMenuDialog); } #if VERSION >= VERSION_JPN_FINAL -bool filemgrIsFileInUse(struct filelistfile *file) +bool filemgr_is_file_in_use(struct filelistfile *file) { s32 i; - if (menuIsDialogOpen(&g_FilemgrCopyMenuDialog) + if (menu_is_dialog_open(&g_FilemgrCopyMenuDialog) && file->fileid == g_FilemgrFileToCopy.fileid && file->deviceserial == g_FilemgrFileToCopy.deviceserial) { return true; } - if (menuIsDialogOpen(&g_FilemgrFileSelect4MbMenuDialog)) { + if (menu_is_dialog_open(&g_FilemgrFileSelect4MbMenuDialog)) { return false; } @@ -1872,7 +1872,7 @@ bool filemgrIsFileInUse(struct filelistfile *file) } #endif -MenuItemHandlerResult filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_confirm_delete_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { #if VERSION >= VERSION_JPN_FINAL @@ -1880,16 +1880,16 @@ MenuItemHandlerResult filemgrConfirmDeleteMenuHandler(s32 operation, struct menu file.fileid = g_FilemgrFileToDelete[g_MpPlayerNum].fileid; file.deviceserial = g_FilemgrFileToDelete[g_MpPlayerNum].deviceserial; - menuPopDialog(); + menu_pop_dialog(); - if (filemgrIsFileInUse(&file)) { - filemgrPushErrorDialog(FILEERROR_DELETEFAILED); + if (filemgr_is_file_in_use(&file)) { + filemgr_push_error_dialog(FILEERROR_DELETEFAILED); } else { - filemgrDeleteCurrentFile(); + filemgr_delete_current_file(); } #else - menuPopDialog(); - filemgrDeleteCurrentFile(); + menu_pop_dialog(); + filemgr_delete_current_file(); #endif } @@ -1897,28 +1897,28 @@ MenuItemHandlerResult filemgrConfirmDeleteMenuHandler(s32 operation, struct menu } #if VERSION >= VERSION_NTSC_1_0 -char *filemgrMenuTextFileInUseDescription(struct menuitem *item) +char *filemgr_menu_text_file_in_use_description(struct menuitem *item) { - if (menuIsDialogOpen(&g_FilemgrCopyMenuDialog)) { - return langGet(L_MPWEAPONS_240); // "The file you are copying cannot be deleted." + if (menu_is_dialog_open(&g_FilemgrCopyMenuDialog)) { + return lang_get(L_MPWEAPONS_240); // "The file you are copying cannot be deleted." } - return langGet(L_MPWEAPONS_160); // "Cannot delete file as it is being used." + return lang_get(L_MPWEAPONS_160); // "Cannot delete file as it is being used." } #endif /** * This is a dirty decomp hack where we intentionally declare * an incorrect function signature in order to get a match. - * pheadGetTexture uses u16 as its last argument - * but filemgrRenderPerfectHeadThumbnail will only match if + * phead_get_texture uses u16 as its last argument + * but filemgr_render_perfect_head_thumbnail will only match if * it's an s32 with a 0xffff mask. */ -struct textureconfig *pheadGetTexture(s32 playernum, s32 fileid, s32 deviceserial); +struct textureconfig *phead_get_texture(s32 playernum, s32 fileid, s32 deviceserial); -Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, s32 fileid, s32 deviceserial) +Gfx *filemgr_render_perfect_head_thumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, s32 fileid, s32 deviceserial) { - struct textureconfig *texture = pheadGetTexture(g_MpPlayerNum, fileid, deviceserial & 0xffff); + struct textureconfig *texture = phead_get_texture(g_MpPlayerNum, fileid, deviceserial & 0xffff); if (texture) { gSPDisplayList(gdl++, &var800613a0); @@ -1930,7 +1930,7 @@ Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *rend gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, texture, 1, 0, 2, 1, NULL); + tex_select(&gdl, texture, 1, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -1963,23 +1963,23 @@ Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *rend } #if VERSION < VERSION_JPN_FINAL -bool filemgrIsFileInUse(struct filelistfile *file) +bool filemgr_is_file_in_use(struct filelistfile *file) { s32 i; #if VERSION >= VERSION_NTSC_1_0 - if (menuIsDialogOpen(&g_FilemgrCopyMenuDialog) + if (menu_is_dialog_open(&g_FilemgrCopyMenuDialog) && file->fileid == g_FilemgrFileToCopy.fileid && file->deviceserial == g_FilemgrFileToCopy.deviceserial) { return true; } - if (menuIsDialogOpen(&g_FilemgrFileSelect4MbMenuDialog)) { + if (menu_is_dialog_open(&g_FilemgrFileSelect4MbMenuDialog)) { return false; } #else if (g_MenuData.root == MENUROOT_FILEMGR - && menuIsDialogOpen(&g_FilemgrCopyMenuDialog) + && menu_is_dialog_open(&g_FilemgrCopyMenuDialog) && file->fileid == g_FilemgrFileToCopy.fileid && file->deviceserial == g_FilemgrFileToCopy.deviceserial) { return true; @@ -2013,7 +2013,7 @@ bool filemgrIsFileInUse(struct filelistfile *file) /** * item->param is 0 if copying, 1 if deleting. */ -MenuItemHandlerResult filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete) +MenuItemHandlerResult filemgr_file_to_copy_or_delete_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete) { s32 x; s32 y; @@ -2043,12 +2043,12 @@ MenuItemHandlerResult filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, st struct filelistfile *file = &list->files[data->list.unk04]; if (g_Menus[g_MpPlayerNum].fm.filetypeplusone == 4) { - gdl = filemgrRenderPerfectHeadThumbnail(gdl, renderdata, file->fileid, file->deviceserial); + gdl = filemgr_render_perfect_head_thumbnail(gdl, renderdata, file->fileid, file->deviceserial); } else { u32 colour = renderdata->colour; char text[32]; - if (isdelete && filemgrIsFileInUse(file)) { + if (isdelete && filemgr_is_file_in_use(file)) { colour = 0xff333300 | (colour & 0xff); } @@ -2058,9 +2058,9 @@ MenuItemHandlerResult filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, st gdl = text0f153628(gdl); if (file) { - filemgrGetSelectName(text, file, g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, - colour, viGetWidth(), viGetHeight(), 0, 1); + filemgr_get_select_name(text, file, g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, + colour, vi_get_width(), vi_get_height(), 0, 1); y = renderdata->y + 12; x = renderdata->x + 2; } @@ -2077,16 +2077,16 @@ MenuItemHandlerResult filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, st data->list.value = list->numdevices; break; case MENUOP_GETOPTGROUPTEXT: - return filemgrGetDeviceNameOrStartIndex(listnum, operation, data->list.value); + return filemgr_get_device_name_or_start_index(listnum, operation, data->list.value); case MENUOP_GETGROUPSTARTINDEX: - data->list.groupstartindex = filemgrGetDeviceNameOrStartIndex(listnum, operation, data->list.value); + data->list.groupstartindex = filemgr_get_device_name_or_start_index(listnum, operation, data->list.value); return 0; } return 0; } -MenuItemHandlerResult filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_file_to_delete_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum] == NULL) { return 0; @@ -2096,11 +2096,11 @@ MenuItemHandlerResult filemgrFileToDeleteListMenuHandler(s32 operation, struct m struct filelistfile *file = &g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->files[data->list.value]; if (file) { - if (filemgrIsFileInUse(file)) { - filemgrSetFileToDelete(file, g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->filetype); - menuPushDialog(&g_FilemgrFileInUseMenuDialog); + if (filemgr_is_file_in_use(file)) { + filemgr_set_file_to_delete(file, g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->filetype); + menu_push_dialog(&g_FilemgrFileInUseMenuDialog); } else { - filemgrSetFileToDelete(file, g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->filetype); + filemgr_set_file_to_delete(file, g_FileLists[g_Menus[g_MpPlayerNum].fm.listnum]->filetype); #if VERSION >= VERSION_JPN_FINAL g_FilemgrFileToDelete[g_MpPlayerNum].fileid = file->fileid; g_FilemgrFileToDelete[g_MpPlayerNum].deviceserial = file->deviceserial; @@ -2108,15 +2108,15 @@ MenuItemHandlerResult filemgrFileToDeleteListMenuHandler(s32 operation, struct m g_FilemgrFileToDelete.fileid = file->fileid; g_FilemgrFileToDelete.deviceserial = file->deviceserial; #endif - menuPushDialog(&g_FilemgrConfirmDeleteMenuDialog); + menu_push_dialog(&g_FilemgrConfirmDeleteMenuDialog); } } } - return filemgrFileToCopyOrDeleteListMenuHandler(operation, item, data, true); + return filemgr_file_to_copy_or_delete_list_menu_handler(operation, item, data, true); } -MenuItemHandlerResult filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_file_to_copy_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { struct filelist *list = g_FileLists[0]; @@ -2132,22 +2132,22 @@ MenuItemHandlerResult filemgrFileToCopyListMenuHandler(s32 operation, struct men g_FilemgrFileToCopy.deviceserial = file->deviceserial; #if VERSION >= VERSION_NTSC_1_0 - filemgrGetFileName(g_Menus[g_MpPlayerNum].fm.filename, file); + filemgr_get_file_name(g_Menus[g_MpPlayerNum].fm.filename, file); #endif - filemgrPushSelectLocationDialog(g_Menus[g_MpPlayerNum].fm.filetypeplusone, g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1); + filemgr_push_select_location_dialog(g_Menus[g_MpPlayerNum].fm.filetypeplusone, g_Menus[g_MpPlayerNum].fm.filetypeplusone - 1); } } - return filemgrFileToCopyOrDeleteListMenuHandler(operation, item, data, false); + return filemgr_file_to_copy_or_delete_list_menu_handler(operation, item, data, false); } -MenuDialogHandlerResult filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult filemgr_copy_or_delete_list_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_CLOSE) { if (g_Menus[g_MpPlayerNum].fm.isdeletingforsave == true) { g_Menus[g_MpPlayerNum].fm.isdeletingforsave = false; } else { - filelistCreate(0, FILETYPE_GAME); + filelist_create(0, FILETYPE_GAME); g_Menus[g_MpPlayerNum].fm.filetypeplusone = 0; } } @@ -2155,7 +2155,7 @@ MenuDialogHandlerResult filemgrCopyOrDeleteListMenuDialog(s32 operation, struct return 0; } -void filemgrPushDeleteFileDialog(s32 listnum) +void filemgr_push_delete_file_dialog(s32 listnum) { struct filelist *list; @@ -2169,10 +2169,10 @@ void filemgrPushDeleteFileDialog(s32 listnum) g_Menus[g_MpPlayerNum].fm.filetypeplusone = list->filetype + 1; } - menuPushDialog(&g_FilemgrDeleteMenuDialog); + menu_push_dialog(&g_FilemgrDeleteMenuDialog); } -MenuItemHandlerResult pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult pak_delete_game_note_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { OSPfsState *note = &g_EditingPak->notes[g_Menus[g_MpPlayerNum].fm.noteindex]; @@ -2180,15 +2180,15 @@ MenuItemHandlerResult pakDeleteGameNoteMenuHandler(s32 operation, struct menuite g_Menus[g_MpPlayerNum].fm.unke24 = g_Menus[g_MpPlayerNum].fm.unke24 | (1 << g_Menus[g_MpPlayerNum].fm.device); - menuPopDialog(); + menu_pop_dialog(); - result = pakDeleteGameNote(g_Menus[g_MpPlayerNum].fm.device, + result = pak_delete_game_note(g_Menus[g_MpPlayerNum].fm.device, note->company_code, note->game_code, note->game_name, note->ext_name); g_Menus[g_MpPlayerNum].fm.device1 = g_Menus[g_MpPlayerNum].fm.device; if (result != PAK_ERR1_OK) { - filemgrPushErrorDialog(FILEERROR_DELETENOTEFAILED); + filemgr_push_error_dialog(FILEERROR_DELETENOTEFAILED); } } @@ -2198,7 +2198,7 @@ MenuItemHandlerResult pakDeleteGameNoteMenuHandler(s32 operation, struct menuite /** * Handler for the note listing in the controller pak menu. */ -MenuItemHandlerResult pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult pak_game_note_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 x; s32 y; @@ -2247,13 +2247,13 @@ MenuItemHandlerResult pakGameNoteListMenuHandler(s32 operation, struct menuitem sprintf(generalbuffer, "%d:\n", data->list.unk04 + 1); x = renderdata->x + 4; y = renderdata->y + 1; - gdl = textRenderProjected(gdl, &x, &y, generalbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, - renderdata->colour, viGetWidth(), viGetHeight(), 0, 1); + gdl = text_render_projected(gdl, &x, &y, generalbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + renderdata->colour, vi_get_width(), vi_get_height(), 0, 1); // Prepare buffers for remaining text if (g_EditingPak->notesinuse[data->list.unk04] == 1) { - pakN64FontCodeToAscii(note->game_name, tmpname, 16); - pakN64FontCodeToAscii(note->ext_name, tmpext, 4); + pak_n64_font_code_to_ascii(note->game_name, tmpname, 16); + pak_n64_font_code_to_ascii(note->ext_name, tmpext, 4); tmpext[1] = '\0'; @@ -2261,30 +2261,30 @@ MenuItemHandlerResult pakGameNoteListMenuHandler(s32 operation, struct menuitem sprintf(extbuffer, "%s\n", tmpext); sprintf(pagesbuffer, "%d\n", note->file_size / 256); } else { - sprintf(generalbuffer, langGet(L_OPTIONS_392)); // "Empty" - sprintf(pagesbuffer, langGet(L_OPTIONS_393)); // "--" + sprintf(generalbuffer, lang_get(L_OPTIONS_392)); // "Empty" + sprintf(pagesbuffer, lang_get(L_OPTIONS_393)); // "--" sprintf(extbuffer, "", tmpname, tmpext); } // Render note name x = renderdata->x + 20; y = renderdata->y + 1; - gdl = textRenderProjected(gdl, &x, &y, generalbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, - renderdata->colour, viGetWidth(), viGetHeight(), 0, 1); + gdl = text_render_projected(gdl, &x, &y, generalbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + renderdata->colour, vi_get_width(), vi_get_height(), 0, 1); // Render ext character (for when a game has multiple notes) x = renderdata->x + (VERSION == VERSION_JPN_FINAL ? 220 : 190); y = renderdata->y + 1; - gdl = textRenderProjected(gdl, &x, &y, extbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, - renderdata->colour, viGetWidth(), viGetHeight(), 0, 1); + gdl = text_render_projected(gdl, &x, &y, extbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + renderdata->colour, vi_get_width(), vi_get_height(), 0, 1); // Render number of pages - textMeasure(&textheight, &textwidth, pagesbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, pagesbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = renderdata->x + renderdata->width - textwidth - 6; y = renderdata->y + 1; - gdl = textRenderProjected(gdl, &x, &y, pagesbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, - renderdata->colour, viGetWidth(), viGetHeight(), 0, 1); + gdl = text_render_projected(gdl, &x, &y, pagesbuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + renderdata->colour, vi_get_width(), vi_get_height(), 0, 1); return (uintptr_t) gdl; case MENUOP_GETOPTIONHEIGHT: @@ -2293,7 +2293,7 @@ MenuItemHandlerResult pakGameNoteListMenuHandler(s32 operation, struct menuitem case MENUOP_SET: if (g_EditingPak->notesinuse[data->list.value] == true) { g_Menus[g_MpPlayerNum].fm.noteindex = data->list.value; - menuPushDialog(&g_PakDeleteNoteMenuDialog); + menu_push_dialog(&g_PakDeleteNoteMenuDialog); } break; } @@ -2309,7 +2309,7 @@ const char var7f1b34e8[] = "Try to find last opened file...\n"; /** * Controller pak note listing dialog. */ -MenuDialogHandlerResult pakGameNotesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult pak_game_notes_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog @@ -2317,15 +2317,15 @@ MenuDialogHandlerResult pakGameNotesMenuDialog(s32 operation, struct menudialogd PakErr1 ret = pak0f1168c4(g_Menus[g_MpPlayerNum].fm.device, &g_EditingPak); if (ret != PAK_ERR1_OK) { - menuCloseDialog(); + menu_close_dialog(); g_EditingPak = NULL; g_Menus[g_MpPlayerNum].fm.device1 = g_Menus[g_MpPlayerNum].fm.device; if (ret == PAK_ERR1_NOPAK) { - filemgrPushErrorDialog(FILEERROR_PAKREMOVED); + filemgr_push_error_dialog(FILEERROR_PAKREMOVED); } - menuUpdateCurFrame(); + menu_update_cur_frame(); } } } @@ -2333,36 +2333,36 @@ MenuDialogHandlerResult pakGameNotesMenuDialog(s32 operation, struct menudialogd return 0; } -char *pakMenuTextPagesFree(struct menuitem *item) +char *pak_menu_text_pages_free(struct menuitem *item) { if (g_EditingPak == NULL) { - sprintf(g_StringPointer, langGet(L_OPTIONS_394)); // "Pages Free: " + sprintf(g_StringPointer, lang_get(L_OPTIONS_394)); // "Pages Free: " } else { - sprintf(g_StringPointer, langGet(L_OPTIONS_395), g_EditingPak->pagesfree); // "Pages Free: %d" + sprintf(g_StringPointer, lang_get(L_OPTIONS_395), g_EditingPak->pagesfree); // "Pages Free: %d" } return g_StringPointer; } -char *pakMenuTextPagesUsed(struct menuitem *item) +char *pak_menu_text_pages_used(struct menuitem *item) { if (g_EditingPak == NULL) { - sprintf(g_StringPointer2, langGet(L_OPTIONS_396)); // "Pages Used: " + sprintf(g_StringPointer2, lang_get(L_OPTIONS_396)); // "Pages Used: " } else { - sprintf(g_StringPointer2, langGet(L_OPTIONS_397), g_EditingPak->pagesused); // "Pages Used: %d" + sprintf(g_StringPointer2, lang_get(L_OPTIONS_397), g_EditingPak->pagesused); // "Pages Used: %d" } return g_StringPointer2; } -char *pakMenuTextStatusMessage(struct menuitem *item) +char *pak_menu_text_status_message(struct menuitem *item) { ubool haspdnote = false; ubool hasemptynote = false; s32 i; if (g_EditingPak == NULL) { - return langGet(L_OPTIONS_398); // "Perfect Dark note already exists on this Controller Pak." + return lang_get(L_OPTIONS_398); // "Perfect Dark note already exists on this Controller Pak." } for (i = 0; i < ARRAYCOUNT(g_EditingPak->notes); i++) { @@ -2377,22 +2377,22 @@ char *pakMenuTextStatusMessage(struct menuitem *item) } if (haspdnote) { - return langGet(L_OPTIONS_398); // "Perfect Dark note already exists on this Controller Pak." + return lang_get(L_OPTIONS_398); // "Perfect Dark note already exists on this Controller Pak." } if (g_EditingPak->pagesfree < 28 || !hasemptynote) { - return langGet(L_OPTIONS_400); // "Controller Pak is too full to save note- 1 note and 28 pages required to save to Controller Pak." + return lang_get(L_OPTIONS_400); // "Controller Pak is too full to save note- 1 note and 28 pages required to save to Controller Pak." } - return langGet(L_OPTIONS_399); // "There is enough space for Perfect Dark note." + return lang_get(L_OPTIONS_399); // "There is enough space for Perfect Dark note." } /** * Title for the note listing dialog. */ -char *pakMenuTextEditingPakName(struct menuitem *item) +char *pak_menu_text_editing_pak_name(struct menuitem *item) { - return filemgrGetDeviceName(g_Menus[g_MpPlayerNum].fm.device); + return filemgr_get_device_name(g_Menus[g_MpPlayerNum].fm.device); } /** @@ -2400,17 +2400,17 @@ char *pakMenuTextEditingPakName(struct menuitem *item) * * Selecting one takes you to the note listing dialog. */ -MenuItemHandlerResult pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult pak_selection_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { - if (!mempakIsOkay((s8)item->param)) { + if (!mempak_is_okay((s8)item->param)) { return true; } } if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].fm.device = item->param; - menuPushDialog(&g_PakGameNotesMenuDialog); + menu_push_dialog(&g_PakGameNotesMenuDialog); } return 0; @@ -2421,12 +2421,12 @@ MenuItemHandlerResult pakSelectionMenuHandler(s32 operation, struct menuitem *it * * Lists the connected controller paks. */ -MenuDialogHandlerResult pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult pak_choose_pak_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { #if VERSION >= VERSION_NTSC_1_0 switch (operation) { case MENUOP_OPEN: - joySetPfsPollInterval(3); + joy_set_pfs_poll_interval(3); g_Menus[g_MpPlayerNum].fm.unke24 = 0; break; case MENUOP_TICK: @@ -2444,14 +2444,14 @@ MenuDialogHandlerResult pakChoosePakMenuDialog(s32 operation, struct menudialogd } } } - joySetDefaultPfsPollInterval(); + joy_set_default_pfs_poll_interval(); break; } #else switch (operation) { case MENUOP_OPEN: - joySetPfsPollInterval(3); - joySetPfsPollInterval(-1); + joy_set_pfs_poll_interval(3); + joy_set_pfs_poll_interval(-1); g_Menus[g_MpPlayerNum].fm.unke24 = 0; break; case MENUOP_TICK: @@ -2467,7 +2467,7 @@ MenuDialogHandlerResult pakChoosePakMenuDialog(s32 operation, struct menudialogd } } } - joySetDefaultPfsPollInterval(); + joy_set_default_pfs_poll_interval(); pak0f1189d0(); break; } @@ -2476,36 +2476,36 @@ MenuDialogHandlerResult pakChoosePakMenuDialog(s32 operation, struct menudialogd return 0; } -MenuItemHandlerResult filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_open_copy_file_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].fm.filetypeplusone = item->param + 1; - filelistCreate(0, item->param); + filelist_create(0, item->param); #if VERSION >= VERSION_NTSC_1_0 g_Menus[g_MpPlayerNum].fm.listnum = 0; #endif g_Menus[g_MpPlayerNum].fm.isdeletingforsave = false; - menuPushDialog(&g_FilemgrCopyMenuDialog); + menu_push_dialog(&g_FilemgrCopyMenuDialog); } return 0; } -MenuItemHandlerResult filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_open_delete_file_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].fm.filetypeplusone = item->param + 1; - filelistCreate(0, item->param); + filelist_create(0, item->param); g_Menus[g_MpPlayerNum].fm.unke3e = -1; - filemgrPushDeleteFileDialog(0); + filemgr_push_delete_file_dialog(0); } return 0; } -MenuItemHandlerResult filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_agent_name_keyboard_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; @@ -2521,7 +2521,7 @@ MenuItemHandlerResult filemgrAgentNameKeyboardMenuHandler(s32 operation, struct strcpy(g_GameFile.name, name); break; case MENUOP_SET: - filemgrPushSelectLocationDialog(0, FILETYPE_GAME); + filemgr_push_select_location_dialog(0, FILETYPE_GAME); g_Menus[g_MpPlayerNum].fm.unke2c = 1; break; } @@ -2529,7 +2529,7 @@ MenuItemHandlerResult filemgrAgentNameKeyboardMenuHandler(s32 operation, struct return 0; } -MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult filemgr_choose_agent_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 x; s32 y; @@ -2610,7 +2610,7 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me file = &g_FileLists[0]->files[data->list.unk04]; if (file) { - gamefileGetOverview(file->name, name, &stage, &difficulty, &time); + gamefile_get_overview(file->name, name, &stage, &difficulty, &time); seconds = time % 60; time = time / 60; @@ -2642,7 +2642,7 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, &g_TexGeneralConfigs[texturenum], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[texturenum], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -2664,12 +2664,12 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me if (data->list.unk04 == g_FileLists[0]->numfiles) { // "New Agent..." - gdl = textRenderProjected(gdl, &x, &y, langGet(L_OPTIONS_403), - g_CharsHandelGothicMd, g_FontHandelGothicMd, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(L_OPTIONS_403), + g_CharsHandelGothicMd, g_FontHandelGothicMd, renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); } else if (file) { // Render file name - gdl = textRenderProjected(gdl, &x, &y, name, - g_CharsHandelGothicMd, g_FontHandelGothicMd, renderdata->colour, viGetWidth(), viGetHeight(), 0, 1); + gdl = text_render_projected(gdl, &x, &y, name, + g_CharsHandelGothicMd, g_FontHandelGothicMd, renderdata->colour, vi_get_width(), vi_get_height(), 0, 1); // Prepare and render stage name y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 16 : 18); @@ -2677,16 +2677,16 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me if (stage > 0) { sprintf(buffer, "%s %s", - langGet(g_SoloStages[stage - 1].name1), - langGet(g_SoloStages[stage - 1].name2)); + lang_get(g_SoloStages[stage - 1].name1), + lang_get(g_SoloStages[stage - 1].name2)); } else { // "New Recruit" - strcpy(buffer, langGet(L_OPTIONS_404)); + strcpy(buffer, lang_get(L_OPTIONS_404)); } strcat(buffer, "\n"); - gdl = textRenderProjected(gdl, &x, &y, buffer, - g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, buffer, + g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); // Prepare and render mission time x = renderdata->x + 62; @@ -2698,28 +2698,28 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me if (days > 0) { // "Mission Time:" - sprintf(buffer, "%s %d:%02d:%02d", langGet(L_OPTIONS_405), days, hours, minutes); + sprintf(buffer, "%s %d:%02d:%02d", lang_get(L_OPTIONS_405), days, hours, minutes); } else { // "Mission Time:" - sprintf(buffer, "%s %02d:%02d", langGet(L_OPTIONS_405), hours, minutes); + sprintf(buffer, "%s %02d:%02d", lang_get(L_OPTIONS_405), hours, minutes); } // Useless - textwidth and textheight are not used #if VERSION >= VERSION_JPN_FINAL - textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, -1); + text_measure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, -1); #else - textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); #endif - gdl = textRenderProjected(gdl, &x, &y, buffer, - g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, buffer, + g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); // Render seconds part of mission time (uses a smaller font) y += (VERSION == VERSION_JPN_FINAL) ? 3 : 1; x++; sprintf(buffer, ".%02d", seconds); - gdl = textRenderProjected(gdl, &x, &y, buffer, - g_CharsHandelGothicXs, g_FontHandelGothicXs, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, buffer, + g_CharsHandelGothicXs, g_FontHandelGothicXs, renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); } gdl = text0f153780(gdl); return (uintptr_t) gdl; @@ -2729,15 +2729,15 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me case MENUOP_SET: if (data->list.value == g_FileLists[0]->numfiles) { // New agent - gamefileLoadDefaults(&g_GameFile); - menuPushDialog(&g_FilemgrEnterNameMenuDialog); + gamefile_load_defaults(&g_GameFile); + menu_push_dialog(&g_FilemgrEnterNameMenuDialog); } else { struct filelistfile *file = &g_FileLists[0]->files[data->list.value]; if (file) { g_GameFileGuid.fileid = file->fileid; g_GameFileGuid.deviceserial = file->deviceserial; - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_LOAD_GAME, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_LOAD_GAME, 0); } } break; @@ -2746,14 +2746,14 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me break; case MENUOP_GETOPTGROUPTEXT: if (data->list.value >= g_FileLists[0]->numdevices) { - return (uintptr_t) langGet(L_OPTIONS_402); // "New..." + return (uintptr_t) lang_get(L_OPTIONS_402); // "New..." } - return filemgrGetDeviceNameOrStartIndex(0, operation, data->list.value); + return filemgr_get_device_name_or_start_index(0, operation, data->list.value); case MENUOP_GETGROUPSTARTINDEX: if (data->list.value >= g_FileLists[0]->numdevices) { data->list.groupstartindex = g_FileLists[0]->numfiles; } else { - data->list.groupstartindex = filemgrGetDeviceNameOrStartIndex(0, operation, data->list.value); + data->list.groupstartindex = filemgr_get_device_name_or_start_index(0, operation, data->list.value); } return 0; } @@ -2761,7 +2761,7 @@ MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct me return 0; } -MenuDialogHandlerResult filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult filemgr_main_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { s32 i; @@ -2769,13 +2769,13 @@ MenuDialogHandlerResult filemgrMainMenuDialog(s32 operation, struct menudialogde case MENUOP_OPEN: g_Menus[g_MpPlayerNum].fm.filetypeplusone = 0; - filelistCreate(0, FILETYPE_GAME); - mpInit(); + filelist_create(0, FILETYPE_GAME); + mp_init(); // Set MP player names to "Player 1" through 4 if blank for (i = 0; i < MAX_PLAYERS; i++) { if (g_PlayerConfigsArray[i].base.name[0] == '\0') { - sprintf(g_PlayerConfigsArray[i].base.name, "%s %d\n", langGet(L_MISC_437), i + 1); + sprintf(g_PlayerConfigsArray[i].base.name, "%s %d\n", lang_get(L_MISC_437), i + 1); } } break; @@ -2784,7 +2784,7 @@ MenuDialogHandlerResult filemgrMainMenuDialog(s32 operation, struct menudialogde break; #if VERSION < VERSION_NTSC_1_0 case MENUOP_TICK: - filelistsTick(); + filelists_tick(); break; #endif } @@ -2792,15 +2792,15 @@ MenuDialogHandlerResult filemgrMainMenuDialog(s32 operation, struct menudialogde return 0; } -bool filemgrConsiderPushingFileSelectDialog(void) +bool filemgr_consider_pushing_file_select_dialog(void) { if (g_Menus[g_MpPlayerNum].openinhibit == 0) { g_Menus[g_MpPlayerNum].playernum = 0; - menuPushRootDialog(&g_FilemgrFileSelectMenuDialog, MENUROOT_FILEMGR); + menu_push_root_dialog(&g_FilemgrFileSelectMenuDialog, MENUROOT_FILEMGR); #if PAL if (g_Vars.language >= 6) { - menuPushDialog(&g_ChooseLanguageMenuDialog); + menu_push_dialog(&g_ChooseLanguageMenuDialog); } #endif @@ -2810,11 +2810,11 @@ bool filemgrConsiderPushingFileSelectDialog(void) return false; } -void bootmenuReset(void) +void bootmenu_reset(void) { s32 prevplayernum = g_MpPlayerNum; g_MpPlayerNum = 0; - menuPushRootDialog(&g_PakChoosePakMenuDialog, MENUROOT_BOOTPAKMGR); + menu_push_root_dialog(&g_PakChoosePakMenuDialog, MENUROOT_BOOTPAKMGR); g_MpPlayerNum = prevplayernum; } @@ -2839,41 +2839,41 @@ struct menuitem g_FilemgrSelectLocationMenuItems[] = { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_GAMEPAK, 0, - (uintptr_t)&filemgrMenuTextLocationName2, - (uintptr_t)&filemgrMenuTextSaveLocationSpaces, - filemgrSelectLocationMenuHandler, + (uintptr_t)&filemgr_menu_text_location_name2, + (uintptr_t)&filemgr_menu_text_save_location_spaces, + filemgr_select_location_menu_handler, }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK1, 0, - (uintptr_t)&filemgrMenuTextLocationName2, - (uintptr_t)&filemgrMenuTextSaveLocationSpaces, - filemgrSelectLocationMenuHandler, + (uintptr_t)&filemgr_menu_text_location_name2, + (uintptr_t)&filemgr_menu_text_save_location_spaces, + filemgr_select_location_menu_handler, }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK2, 0, - (uintptr_t)&filemgrMenuTextLocationName2, - (uintptr_t)&filemgrMenuTextSaveLocationSpaces, - filemgrSelectLocationMenuHandler, + (uintptr_t)&filemgr_menu_text_location_name2, + (uintptr_t)&filemgr_menu_text_save_location_spaces, + filemgr_select_location_menu_handler, }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK3, 0, - (uintptr_t)&filemgrMenuTextLocationName2, - (uintptr_t)&filemgrMenuTextSaveLocationSpaces, - filemgrSelectLocationMenuHandler, + (uintptr_t)&filemgr_menu_text_location_name2, + (uintptr_t)&filemgr_menu_text_save_location_spaces, + filemgr_select_location_menu_handler, }, { MENUITEMTYPE_SELECTABLE, SAVEDEVICE_CONTROLLERPAK4, 0, - (uintptr_t)&filemgrMenuTextLocationName2, - (uintptr_t)&filemgrMenuTextSaveLocationSpaces, - filemgrSelectLocationMenuHandler, + (uintptr_t)&filemgr_menu_text_location_name2, + (uintptr_t)&filemgr_menu_text_save_location_spaces, + filemgr_select_location_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -2889,7 +2889,7 @@ struct menuitem g_FilemgrSelectLocationMenuItems[] = { 0, L_OPTIONS_370, // "Delete Files..." 0, - filemgrDeleteFilesForSaveMenuHandler, + filemgr_delete_files_for_save_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -2897,7 +2897,7 @@ struct menuitem g_FilemgrSelectLocationMenuItems[] = { 0, L_OPTIONS_371, // "Cancel" 0, - filemgrCancelSaveMenuHandler, + filemgr_cancel_save_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -2916,17 +2916,17 @@ struct menuitem g_FilemgrConfirmDeleteMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&filemgrMenuTextDeleteFileName, + (uintptr_t)&filemgr_menu_text_delete_file_name, 0, - filemgrFileNameMenuHandler, + filemgr_file_name_menu_handler, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, - (uintptr_t)&filemgrMenuTextDeviceName, + (uintptr_t)&filemgr_menu_text_device_name, 0, - filemgrDeviceNameMenuHandler, + filemgr_device_name_menu_handler, }, { MENUITEMTYPE_LABEL, @@ -2950,7 +2950,7 @@ struct menuitem g_FilemgrConfirmDeleteMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_382, // "OK" 0, - filemgrConfirmDeleteMenuHandler, + filemgr_confirm_delete_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -2969,24 +2969,24 @@ struct menuitem g_FilemgrFileInUseMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&filemgrMenuTextDeleteFileName, + (uintptr_t)&filemgr_menu_text_delete_file_name, 0, - filemgrFileNameMenuHandler, + filemgr_file_name_menu_handler, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, - (uintptr_t)&filemgrMenuTextDeviceName, + (uintptr_t)&filemgr_menu_text_device_name, 0, - filemgrDeviceNameMenuHandler, + filemgr_device_name_menu_handler, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, #if VERSION >= VERSION_NTSC_1_0 - (uintptr_t)&filemgrMenuTextFileInUseDescription, + (uintptr_t)&filemgr_menu_text_file_in_use_description, #else 0x54a0, #endif @@ -3028,7 +3028,7 @@ struct menuitem g_FilemgrDeleteMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0, 0, - filemgrFileToDeleteListMenuHandler, + filemgr_file_to_delete_list_menu_handler, }, { MENUITEMTYPE_LABEL, @@ -3045,7 +3045,7 @@ struct menudialogdef g_FilemgrDeleteMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_376, // "Delete File" g_FilemgrDeleteMenuItems, - filemgrCopyOrDeleteListMenuDialog, + filemgr_copy_or_delete_list_menu_dialog, 0, NULL, }; @@ -3065,7 +3065,7 @@ struct menuitem g_FilemgrCopyMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0, 0, - filemgrFileToCopyListMenuHandler, + filemgr_file_to_copy_list_menu_handler, }, { MENUITEMTYPE_LABEL, @@ -3082,7 +3082,7 @@ struct menudialogdef g_FilemgrCopyMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_373, // "Copy File" g_FilemgrCopyMenuItems, - filemgrCopyOrDeleteListMenuDialog, + filemgr_copy_or_delete_list_menu_dialog, 0, NULL, }; @@ -3112,7 +3112,7 @@ struct menuitem g_PakDeleteNoteMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_386, // "Yes" 0, - pakDeleteGameNoteMenuHandler, + pak_delete_game_note_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -3132,7 +3132,7 @@ struct menuitem g_PakGameNotesMenuItems[] = { 0, MENUITEMFLAG_LESSLEFTPADDING, L_OPTIONS_388, // "Delete Game Notes:" - (uintptr_t)&pakMenuTextEditingPakName, + (uintptr_t)&pak_menu_text_editing_pak_name, NULL, }, { @@ -3157,21 +3157,21 @@ struct menuitem g_PakGameNotesMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x000000c8, 0x0000006e, - pakGameNoteListMenuHandler, + pak_game_note_list_menu_handler, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (uintptr_t)&pakMenuTextPagesFree, - (uintptr_t)&pakMenuTextPagesUsed, + (uintptr_t)&pak_menu_text_pages_free, + (uintptr_t)&pak_menu_text_pages_used, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING, - (uintptr_t)&pakMenuTextStatusMessage, + (uintptr_t)&pak_menu_text_status_message, 0, NULL, }, @@ -3190,7 +3190,7 @@ struct menudialogdef g_PakGameNotesMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_387, // "Game Notes" g_PakGameNotesMenuItems, - pakGameNotesMenuDialog, + pak_game_notes_menu_dialog, 0, NULL, }; @@ -3226,7 +3226,7 @@ struct menuitem g_PakChoosePakMenuItems[] = { 0, L_OPTIONS_112, // "Controller Pak 1" 0, - pakSelectionMenuHandler, + pak_selection_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -3234,7 +3234,7 @@ struct menuitem g_PakChoosePakMenuItems[] = { 0, L_OPTIONS_113, // "Controller Pak 2" 0, - pakSelectionMenuHandler, + pak_selection_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -3242,7 +3242,7 @@ struct menuitem g_PakChoosePakMenuItems[] = { 0, L_OPTIONS_114, // "Controller Pak 3" 0, - pakSelectionMenuHandler, + pak_selection_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -3250,7 +3250,7 @@ struct menuitem g_PakChoosePakMenuItems[] = { 0, L_OPTIONS_115, // "Controller Pak 4" 0, - pakSelectionMenuHandler, + pak_selection_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -3275,7 +3275,7 @@ struct menudialogdef g_PakChoosePakMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_107, // "Controller Pak Menu" g_PakChoosePakMenuItems, - pakChoosePakMenuDialog, + pak_choose_pak_menu_dialog, 0, NULL, }; @@ -3295,7 +3295,7 @@ struct menuitem g_FilemgrOperationsMenuItems[] = { 0, L_OPTIONS_103, // "Single Player Agent File" 0, - filemgrOpenCopyFileMenuHandler, + filemgr_open_copy_file_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -3303,7 +3303,7 @@ struct menuitem g_FilemgrOperationsMenuItems[] = { 0, L_OPTIONS_104, // "Combat Simulator Settings File" 0, - filemgrOpenCopyFileMenuHandler, + filemgr_open_copy_file_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -3311,7 +3311,7 @@ struct menuitem g_FilemgrOperationsMenuItems[] = { 0, L_OPTIONS_105, // "Combat Simulator Player File" 0, - filemgrOpenCopyFileMenuHandler, + filemgr_open_copy_file_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -3335,7 +3335,7 @@ struct menuitem g_FilemgrOperationsMenuItems[] = { 0, L_OPTIONS_103, // "Single Player Agent File" 0, - filemgrOpenDeleteFileMenuHandler, + filemgr_open_delete_file_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -3343,7 +3343,7 @@ struct menuitem g_FilemgrOperationsMenuItems[] = { 0, L_OPTIONS_104, // "Combat Simulator Settings File" 0, - filemgrOpenDeleteFileMenuHandler, + filemgr_open_delete_file_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -3351,7 +3351,7 @@ struct menuitem g_FilemgrOperationsMenuItems[] = { 0, L_OPTIONS_105, // "Combat Simulator Player File" 0, - filemgrOpenDeleteFileMenuHandler, + filemgr_open_delete_file_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -3388,7 +3388,7 @@ struct menuitem g_FilemgrEnterNameMenuItems[] = { 0, 0, 0x00000001, - filemgrAgentNameKeyboardMenuHandler, + filemgr_agent_name_keyboard_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -3417,7 +3417,7 @@ struct menuitem g_FilemgrFileSelectMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x000000f5, 0, - filemgrChooseAgentListMenuHandler, + filemgr_choose_agent_list_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -3426,7 +3426,7 @@ struct menudialogdef g_FilemgrFileSelectMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_095, // "Perfect Dark" g_FilemgrFileSelectMenuItems, - filemgrMainMenuDialog, + filemgr_main_menu_dialog, MENUDIALOGFLAG_IGNOREBACK, &g_FilemgrOperationsMenuDialog, }; diff --git a/src/game/fmb.c b/src/game/fmb.c index 2fe4c2c05..8c36fb7f1 100644 --- a/src/game/fmb.c +++ b/src/game/fmb.c @@ -12,13 +12,13 @@ #include "data.h" #include "types.h" -MenuItemHandlerResult fmbHandleDropOut(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fmb_handle_drop_out(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - menuPopDialog(); + menu_pop_dialog(); + menu_pop_dialog(); - if (mpGetNumChrs() == 1) { + if (mp_get_num_chrs() == 1) { func0f0f820c(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); } } @@ -26,7 +26,7 @@ MenuItemHandlerResult fmbHandleDropOut(s32 operation, struct menuitem *item, uni return 0; } -MenuItemHandlerResult fmdHandleAbortGame(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fmd_handle_abort_game(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Vars.stagenum == STAGE_4MBMENU) { @@ -39,7 +39,7 @@ MenuItemHandlerResult fmdHandleAbortGame(s32 operation, struct menuitem *item, u return 0; } -MenuItemHandlerResult fmbHandleAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fmb_handle_advanced_setup(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(&g_AdvancedSetup4MbMenuDialog, MENUROOT_4MBMAINMENU); @@ -48,17 +48,17 @@ MenuItemHandlerResult fmbHandleAdvancedSetup(s32 operation, struct menuitem *ite return 0; } -MenuItemHandlerResult fmbHandleAcceptChallenge(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fmb_handle_accept_challenge(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - challengeSetCurrentBySlot(g_Menus[g_MpPlayerNum].main4mb.slotindex); + challenge_set_current_by_slot(g_Menus[g_MpPlayerNum].main4mb.slotindex); func0f0f820c(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); } return 0; } -void fmbReset(void) +void fmb_reset(void) { s32 i; u32 prevplayernum = g_MpPlayerNum; @@ -67,26 +67,26 @@ void fmbReset(void) if (g_FileState != FILESTATE_UNSELECTED) { if (var80087260 == 0) { g_Vars.mpsetupmenu = MPSETUPMENU_GENERAL; - menuPushRootDialog(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); + menu_push_root_dialog(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); } } else { g_FileState = FILESTATE_SELECTED; for (i = 0; i != MAX_MPPLAYERCONFIGS; i++) { - mpPlayerSetDefaults(i, true); + mp_player_set_defaults(i, true); } g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); - menuPushRootDialog(&g_FilemgrFileSelect4MbMenuDialog, MENUROOT_4MBFILEMGR); + menu_push_root_dialog(&g_FilemgrFileSelect4MbMenuDialog, MENUROOT_4MBFILEMGR); #if PAL if (g_Vars.language >= 6) { - menuPushDialog(&g_ChooseLanguageMenuDialog); + menu_push_dialog(&g_ChooseLanguageMenuDialog); } #endif } @@ -94,7 +94,7 @@ void fmbReset(void) g_MpPlayerNum = prevplayernum; } -MenuDialogHandlerResult fmbHandleMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult fmb_handle_main_menu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.waitingtojoin[0] = false; @@ -109,8 +109,8 @@ MenuDialogHandlerResult fmbHandleMainMenu(s32 operation, struct menudialogdef *d g_Vars.mpsetupmenu = MPSETUPMENU_GENERAL; g_Vars.mpquickteam = MPQUICKTEAM_NONE; g_Vars.usingadvsetup = false; - challengeUnsetCurrent(); - challengeRemovePlayerLock(); + challenge_unset_current(); + challenge_remove_player_lock(); } return false; @@ -131,7 +131,7 @@ struct menuitem g_GameFiles4MbMenuItems[] = { 0, L_OPTIONS_103, // "Single Player Agent File" 0, - filemgrOpenCopyFileMenuHandler, + filemgr_open_copy_file_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -139,7 +139,7 @@ struct menuitem g_GameFiles4MbMenuItems[] = { 0, L_OPTIONS_104, // "Combat Simulator Settings File" 0, - filemgrOpenCopyFileMenuHandler, + filemgr_open_copy_file_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -147,7 +147,7 @@ struct menuitem g_GameFiles4MbMenuItems[] = { 0, L_OPTIONS_105, // "Combat Simulator Player File" 0, - filemgrOpenCopyFileMenuHandler, + filemgr_open_copy_file_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -171,7 +171,7 @@ struct menuitem g_GameFiles4MbMenuItems[] = { 0, L_OPTIONS_103, // "Single Player Agent File" 0, - filemgrOpenDeleteFileMenuHandler, + filemgr_open_delete_file_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -179,7 +179,7 @@ struct menuitem g_GameFiles4MbMenuItems[] = { 0, L_OPTIONS_104, // "Combat Simulator Settings File" 0, - filemgrOpenDeleteFileMenuHandler, + filemgr_open_delete_file_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -187,7 +187,7 @@ struct menuitem g_GameFiles4MbMenuItems[] = { 0, L_OPTIONS_105, // "Combat Simulator Player File" 0, - filemgrOpenDeleteFileMenuHandler, + filemgr_open_delete_file_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -232,7 +232,7 @@ struct menuitem g_FilemgrFileSelect4MbMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x000000f5, 0, - filemgrChooseAgentListMenuHandler, + filemgr_choose_agent_list_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -241,7 +241,7 @@ struct menudialogdef g_FilemgrFileSelect4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_095, // "Perfect Dark" g_FilemgrFileSelect4MbMenuItems, - filemgrMainMenuDialog, + filemgr_main_menu_dialog, MENUDIALOGFLAG_IGNOREBACK, &g_GameFiles4MbMenuDialog, }; @@ -254,7 +254,7 @@ struct menuitem g_AudioVideo4MbMenuItems[] = { MENUITEMFLAG_SLIDER_FAST | MENUITEMFLAG_SLIDER_HIDEVALUE, L_OPTIONS_308, // "Sound" L_MPMENU_000, // "" - menuhandlerSfxVolume, + menuhandler_sfx_volume, }, { MENUITEMTYPE_SLIDER, @@ -262,7 +262,7 @@ struct menuitem g_AudioVideo4MbMenuItems[] = { MENUITEMFLAG_SLIDER_FAST | MENUITEMFLAG_SLIDER_HIDEVALUE, L_OPTIONS_309, // "Music" L_MPMENU_000, // "" - menuhandlerMusicVolume, + menuhandler_music_volume, }, #else { @@ -271,7 +271,7 @@ struct menuitem g_AudioVideo4MbMenuItems[] = { MENUITEMFLAG_SLIDER_FAST | MENUITEMFLAG_SLIDER_HIDEVALUE, L_OPTIONS_308, // "Sound" 0x7fff, - menuhandlerSfxVolume, + menuhandler_sfx_volume, }, { MENUITEMTYPE_SLIDER, @@ -279,7 +279,7 @@ struct menuitem g_AudioVideo4MbMenuItems[] = { MENUITEMFLAG_SLIDER_FAST | MENUITEMFLAG_SLIDER_HIDEVALUE, L_OPTIONS_309, // "Music" 0x7fff, - menuhandlerMusicVolume, + menuhandler_music_volume, }, #endif { @@ -288,7 +288,7 @@ struct menuitem g_AudioVideo4MbMenuItems[] = { 0, L_OPTIONS_310, // "Sound Mode" 0, - menuhandlerSoundMode, + menuhandler_sound_mode, }, { MENUITEMTYPE_SEPARATOR, @@ -304,7 +304,7 @@ struct menuitem g_AudioVideo4MbMenuItems[] = { 0, L_OPTIONS_311, // "Ratio" 0, - menuhandlerScreenRatio, + menuhandler_screen_ratio, }, #if PAL { @@ -313,7 +313,7 @@ struct menuitem g_AudioVideo4MbMenuItems[] = { 0, L_MPWEAPONS_269, // "" 0, - menuhandlerLanguage, + menuhandler_language, }, #endif { @@ -350,7 +350,7 @@ struct menuitem g_MpPlayerSetup4MbMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_030, // "Name" - (uintptr_t)&mpGetCurrentPlayerName, + (uintptr_t)&mp_get_current_player_name, (void *)&g_MpPlayerNameMenuDialog, }, { @@ -397,9 +397,9 @@ struct menuitem g_MpPlayerSetup4MbMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, 0, - (uintptr_t)&mpMenuTextSavePlayerOrCopy, + (uintptr_t)&mp_menu_text_save_player_or_copy, 0, - menuhandlerMpSavePlayer, + menuhandler_mp_save_player, }, { MENUITEMTYPE_END }, }; @@ -457,7 +457,7 @@ struct menudialogdef g_MpQuickGo4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC_460, // "Quick Go" g_MpQuickGo4MbMenuItems, - menudialogMpQuickGo, + menudialog_mp_quick_go, 0, NULL, }; @@ -485,7 +485,7 @@ struct menuitem g_MpConfirmChallenge4MbMenuItems[] = { 0, L_MPMENU_057, // "Accept" 0, - fmbHandleAcceptChallenge, + fmb_handle_accept_challenge, }, { MENUITEMTYPE_SELECTABLE, @@ -514,7 +514,7 @@ struct menuitem g_MpChallenges4MbMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x00000078, 0x0000004d, - mpChallengesListMenuHandler, + mp_challenges_list_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -523,7 +523,7 @@ struct menudialogdef g_MpChallenges4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_050, // "Combat Challenges" g_MpChallenges4MbMenuItems, - mpCombatChallengesMenuDialog, + mp_combat_challenges_menu_dialog, 0, NULL, }; @@ -559,7 +559,7 @@ struct menuitem g_MainMenu4MbMenuItems[] = { MENUITEMFLAG_BIGFONT, L_MISC_444, // "Advanced Setup" 0x00000003, - fmbHandleAdvancedSetup, + fmb_handle_advanced_setup, }, { MENUITEMTYPE_SELECTABLE, @@ -592,7 +592,7 @@ struct menudialogdef g_MainMenu4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_302, // "Small but Perfect Menu" g_MainMenu4MbMenuItems, - fmbHandleMainMenu, + fmb_handle_main_menu, MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_IGNOREBACK, NULL, }; @@ -612,7 +612,7 @@ struct menuitem g_MpDropOut4MbMenuItems[] = { 0, L_MPMENU_197, // "Drop Out" 0, - fmbHandleDropOut, + fmb_handle_drop_out, }, { MENUITEMTYPE_SELECTABLE, @@ -649,7 +649,7 @@ struct menuitem g_UnusedAbortMenuItems[] = { 0, L_MPMENU_054, // "Abort" 0, - fmdHandleAbortGame, + fmd_handle_abort_game, }, { MENUITEMTYPE_SELECTABLE, @@ -678,7 +678,7 @@ struct menuitem g_MpEditSimulant4MbMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_095, // "Difficulty:" 0, - mpBotDifficultyMenuHandler, + mp_bot_difficulty_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -686,7 +686,7 @@ struct menuitem g_MpEditSimulant4MbMenuItems[] = { 0, L_MPMENU_096, // "Change Type..." 0, - menuhandlerMpChangeSimulantType, + menuhandler_mp_change_simulant_type, }, { MENUITEMTYPE_SEPARATOR, @@ -702,7 +702,7 @@ struct menuitem g_MpEditSimulant4MbMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_098, // "Delete Simulant" 0, - menuhandlerMpDeleteSimulant, + menuhandler_mp_delete_simulant, }, { MENUITEMTYPE_SELECTABLE, @@ -717,9 +717,9 @@ struct menuitem g_MpEditSimulant4MbMenuItems[] = { struct menudialogdef g_MpEditSimulant4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&mpMenuTitleEditSimulant, + (uintptr_t)&mp_menu_title_edit_simulant, g_MpEditSimulant4MbMenuItems, - menudialogMpSimulant, + menudialog_mp_simulant, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -730,7 +730,7 @@ struct menuitem g_AdvancedSetup4MbMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_019, // "Scenario" - (uintptr_t)&mpMenuTextScenarioShortName, + (uintptr_t)&mp_menu_text_scenario_short_name, (void *)&g_MpScenarioMenuDialog, }, { @@ -739,14 +739,14 @@ struct menuitem g_AdvancedSetup4MbMenuItems[] = { 0, L_MPMENU_021, // "Options" 0, - menuhandlerMpOpenOptions, + menuhandler_mp_open_options, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_020, // "Arena" - (uintptr_t)&mpMenuTextArenaName, + (uintptr_t)&mp_menu_text_arena_name, (void *)&g_MpArenaMenuDialog, }, { @@ -755,7 +755,7 @@ struct menuitem g_AdvancedSetup4MbMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_044, // "Lock" 0, - menuhandlerMpLock, + menuhandler_mp_lock, }, { MENUITEMTYPE_SEPARATOR, @@ -835,7 +835,7 @@ struct menuitem g_AdvancedSetup4MbMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LOCKABLEMAJOR, L_MPMENU_026, // "Save Settings" 0, - menuhandlerMpSaveSettings, + menuhandler_mp_save_settings, }, { MENUITEMTYPE_END }, }; @@ -844,7 +844,7 @@ struct menudialogdef g_AdvancedSetup4MbMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_017, // "Game Setup" g_AdvancedSetup4MbMenuItems, - menudialogMpGameSetup, + menudialog_mp_game_setup, MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpPlayerSetup4MbMenuDialog, }; diff --git a/src/game/footstep.c b/src/game/footstep.c index c81ef8cc2..b2265a16c 100644 --- a/src/game/footstep.c +++ b/src/game/footstep.c @@ -67,7 +67,7 @@ struct footstepframe g_FootstepAnims[] = { { ANIM_SKEDAR_RUNNING, 0x00, 0x00 }, }; -bool footstepIsRunning(s32 animnum) +bool footstep_is_running(s32 animnum) { switch (animnum) { case ANIM_001D: @@ -97,7 +97,7 @@ bool footstepIsRunning(s32 animnum) return false; } -s32 footstepChooseSound(struct chrdata *chr, s32 footstepindex) +s32 footstep_choose_sound(struct chrdata *chr, s32 footstepindex) { s32 floortype; s32 running; @@ -135,7 +135,7 @@ s32 footstepChooseSound(struct chrdata *chr, s32 footstepindex) return result; } - running = footstepIsRunning(g_FootstepAnims[footstepindex].animnum); + running = footstep_is_running(g_FootstepAnims[footstepindex].animnum); do { rand = random() % 8; @@ -152,9 +152,9 @@ s32 footstepChooseSound(struct chrdata *chr, s32 footstepindex) * * It is assumed that the chr is moving normally and not via magic. */ -void footstepCheckDefault(struct chrdata *chr) +void footstep_check_default(struct chrdata *chr) { - if (debugIsFootstepsEnabled() && PLAYERCOUNT() == 1 && chr) { + if (debug_is_footsteps_enabled() && PLAYERCOUNT() == 1 && chr) { chr->footstep = 0; chr->magicanim = -1; chr->magicframe = 0; @@ -168,7 +168,7 @@ void footstepCheckDefault(struct chrdata *chr) chr->oldframe = frame; for (i = 0; i < ARRAYCOUNT(g_FootstepAnims); i++) { - if (modelGetAnimNum(chr->model) == g_FootstepAnims[i].animnum) { + if (model_get_anim_num(chr->model) == g_FootstepAnims[i].animnum) { if (CHRRACE(chr) == RACE_SKEDAR && g_FootstepAnims[i].animnum == ANIM_SKEDAR_RUNNING) { if ((frame >= 2 && prevframe < 2) || (frame >= 17 && prevframe < 17)) { \ chr->footstep = 1; @@ -183,13 +183,13 @@ void footstepCheckDefault(struct chrdata *chr) } } - soundnum = footstepChooseSound(chr, i); + soundnum = footstep_choose_sound(chr, i); if (soundnum != -1 && chr->footstep != 0) { #if VERSION >= VERSION_NTSC_1_0 - psCreate(NULL, chr->prop, soundnum, -1, -1, PSFLAG_0400, 0, PSTYPE_FOOTSTEP, NULL, -1, NULL, -1, -1, -1, -1); + ps_create(NULL, chr->prop, soundnum, -1, -1, PSFLAG_0400, 0, PSTYPE_FOOTSTEP, NULL, -1, NULL, -1, -1, -1, -1); #else - psCreate(NULL, chr->prop, soundnum, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); + ps_create(NULL, chr->prop, soundnum, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); #endif } @@ -213,7 +213,7 @@ void footstepCheckDefault(struct chrdata *chr) * The "magic" method of movement applies when the chr is off-screen. * It uses a computationally simple approach to movement. */ -void footstepCheckMagic(struct chrdata *chr) +void footstep_check_magic(struct chrdata *chr) { s32 index; f32 frame; @@ -224,7 +224,7 @@ void footstepCheckMagic(struct chrdata *chr) f32 zdiff; s32 soundnum; - if (debugIsFootstepsEnabled() && PLAYERCOUNT() == 1 && chr->magicanim >= 0) { + if (debug_is_footsteps_enabled() && PLAYERCOUNT() == 1 && chr->magicanim >= 0) { #if VERSION >= VERSION_PAL_BETA chr->magicframe += g_Vars.lvupdate60freal * chr->magicspeed; #else @@ -263,20 +263,20 @@ void footstepCheckMagic(struct chrdata *chr) } } - soundnum = footstepChooseSound(chr, index); + soundnum = footstep_choose_sound(chr, index); if (soundnum != -1 && chr->footstep != 0) { #if VERSION >= VERSION_NTSC_1_0 - psCreate(NULL, chr->prop, soundnum, -1, + ps_create(NULL, chr->prop, soundnum, -1, -1, PSFLAG_0400, 0, PSTYPE_FOOTSTEP, NULL, -1, NULL, -1, -1, -1, -1); #else - psCreate(NULL, chr->prop, soundnum, -1, + ps_create(NULL, chr->prop, soundnum, -1, -1, 0, 0, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); #endif } } - if (footstepIsRunning(g_FootstepAnims[index].animnum)) { + if (footstep_is_running(g_FootstepAnims[index].animnum)) { if (chr->magicframe > 22) { chr->magicframe -= 22; } diff --git a/src/game/game_006900.c b/src/game/game_006900.c index cdc523269..34d8d95a2 100644 --- a/src/game/game_006900.c +++ b/src/game/game_006900.c @@ -30,7 +30,7 @@ f32 g_Lv80SecIntervalFrac = 0; * The aweight argument is how much weight is given to colour A, on a scale of * 0 to 255. */ -u32 colourBlend(u32 a, u32 b, u32 aweight) +u32 colour_blend(u32 a, u32 b, u32 aweight) { u32 bweight = 0xff - aweight; @@ -40,7 +40,7 @@ u32 colourBlend(u32 a, u32 b, u32 aweight) | ((aweight * (a & 0xff) + bweight * (b & 0xff)) >> 8); } -void menuTickTimers(void) +void menu_tick_timers(void) { #if VERSION >= VERSION_PAL_BETA g_20SecIntervalFrac = g_20SecIntervalFrac + g_Vars.diffframe240freal / 4800.0f; @@ -60,8 +60,8 @@ void menuTickTimers(void) #if PIRACYCHECKS { - u32 *ptr = (u32 *)&mtxGetObfuscatedRomBase; - u32 *end = (u32 *)&mtxF2L; + u32 *ptr = (u32 *)&mtx_get_obfuscated_rom_base; + u32 *end = (u32 *)&mtx_f2l; u32 checksum = 0; while (ptr < end) { @@ -71,7 +71,7 @@ void menuTickTimers(void) } if (checksum != CHECKSUM_PLACEHOLDER) { - u32 *ptr = (u32 *)&bgReset; + u32 *ptr = (u32 *)&bg_reset; ptr += random() % 0x40; end = &ptr[4]; @@ -91,7 +91,7 @@ void menuTickTimers(void) * * freq is the amount of oscillations per 20 seconds. */ -f32 menuGetSinOscFrac(f32 freq) +f32 menu_get_sin_osc_frac(f32 freq) { return sinf((freq * g_20SecIntervalFrac + freq * g_20SecIntervalFrac) * M_PI) / 2.0f + 0.5f; } @@ -103,7 +103,7 @@ f32 menuGetSinOscFrac(f32 freq) * * freq is the amount of oscillations per 20 seconds. */ -f32 menuGetCosOscFrac(f32 freq) +f32 menu_get_cos_osc_frac(f32 freq) { return cosf((freq * g_20SecIntervalFrac + freq * g_20SecIntervalFrac) * M_PI) / 2.0f + 0.5f; } @@ -116,7 +116,7 @@ f32 menuGetCosOscFrac(f32 freq) * * freq is the amount of intervals per 20 seconds. */ -f32 menuGetLinearIntervalFrac(f32 freq) +f32 menu_get_linear_interval_frac(f32 freq) { f32 tmp = g_20SecIntervalFrac * freq; @@ -136,7 +136,7 @@ f32 menuGetLinearIntervalFrac(f32 freq) * It's used on the Combat Simulator's character selection menu * to determine the camera's zoom. */ -f32 menuGetLinearOscPauseFrac(f32 frac) +f32 menu_get_linear_osc_pause_frac(f32 frac) { s32 ival = frac * 4.0f; f32 fval = frac * 4.0f - (f32)(ival / 4) * 4.0f; diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c index 222b1df6f..5be764965 100644 --- a/src/game/game_00b820.c +++ b/src/game/game_00b820.c @@ -14,7 +14,7 @@ struct prop *g_DangerousProps[12]; -void resetSomeStageThings(void) +void reset_some_stage_things(void) { s32 i; @@ -32,7 +32,7 @@ void resetSomeStageThings(void) g_NumChrsSeenPlayerRecently2 = 0; } -void stageAllocateBgChrs(void) +void stage_allocate_bg_chrs(void) { bool modified; struct chrdata tmp; @@ -65,8 +65,8 @@ void stageAllocateBgChrs(void) struct chrdata blankchr = {0}; // Allocate BG chrs - g_BgChrs = mempAlloc(ALIGN16(g_NumBgChrs * sizeof(struct chrdata)), MEMPOOL_STAGE); - g_BgChrnums = mempAlloc(ALIGN16(g_NumBgChrs * sizeof(s16)), MEMPOOL_STAGE); + g_BgChrs = memp_alloc(ALIGN16(g_NumBgChrs * sizeof(struct chrdata)), MEMPOOL_STAGE); + g_BgChrnums = memp_alloc(ALIGN16(g_NumBgChrs * sizeof(s16)), MEMPOOL_STAGE); // Initialise BG chrs i = 0; @@ -123,11 +123,11 @@ void stageAllocateBgChrs(void) } } - g_TeamList = mempAlloc((MAX_CHRSPERTEAM + 1) * MAX_TEAMS * sizeof(s16), MEMPOOL_STAGE); - g_SquadronList = mempAlloc((MAX_CHRSPERSQUADRON + 1) * MAX_SQUADRONS * sizeof(s16), MEMPOOL_STAGE); + g_TeamList = memp_alloc((MAX_CHRSPERTEAM + 1) * MAX_TEAMS * sizeof(s16), MEMPOOL_STAGE); + g_SquadronList = memp_alloc((MAX_CHRSPERSQUADRON + 1) * MAX_SQUADRONS * sizeof(s16), MEMPOOL_STAGE); } -void stageLoadAllAilistModels(void) +void stage_load_all_ailist_models(void) { u8 *cmd = g_StageSetup.ailists[0].list; s32 i = 0; @@ -146,26 +146,26 @@ void stageLoadAllAilistModels(void) switch (cmd[0]) { case AICMD_DROPITEM: id = cmd[3] | (cmd[2] << 8); - if (setupLoadModeldef(id)); + if (setup_load_modeldef(id)); break; case AICMD_SPAWNCHRATPAD: - bodyLoad(cmd[2]); - if ((s8)cmd[3] >= 0 && bodyLoad((s8)cmd[3])); + body_load(cmd[2]); + if ((s8)cmd[3] >= 0 && body_load((s8)cmd[3])); break; case AICMD_SPAWNCHRATCHR: - bodyLoad(cmd[2]); - if ((s8)cmd[3] >= 0 && bodyLoad((s8)cmd[3])); + body_load(cmd[2]); + if ((s8)cmd[3] >= 0 && body_load((s8)cmd[3])); break; case AICMD_EQUIPWEAPON: - setupLoadModeldef(cmd[3] | (cmd[2] << 8)); - if (modelmgrLoadProjectileModeldefs(cmd[4])); + setup_load_modeldef(cmd[3] | (cmd[2] << 8)); + if (modelmgr_load_projectile_modeldefs(cmd[4])); break; case AICMD_EQUIPHAT: - setupLoadModeldef(cmd[3] | (cmd[2] << 8)); + setup_load_modeldef(cmd[3] | (cmd[2] << 8)); break; } - cmd += chraiGetCommandLength(cmd, 0); + cmd += chrai_get_command_length(cmd, 0); } i++; diff --git a/src/game/game_096360.c b/src/game/game_096360.c index 0832ff89a..3733c4ccd 100644 --- a/src/game/game_096360.c +++ b/src/game/game_096360.c @@ -11,7 +11,7 @@ #include "data.h" #include "types.h" -void mtxLoadRandomRotation(Mtxf *mtx) +void mtx_load_random_rotation(Mtxf *mtx) { struct coord coord = {0, 0, 0}; @@ -19,7 +19,7 @@ void mtxLoadRandomRotation(Mtxf *mtx) coord.y = RANDOMFRAC() * PALUPF(M_BADTAU) * 0.0078125f - PALUPF(0.024539785459638f); coord.z = RANDOMFRAC() * PALUPF(M_BADTAU) * 0.0078125f - PALUPF(0.024539785459638f); - mtx4LoadRotation(&coord, mtx); + mtx4_load_rotation(&coord, mtx); } void func0f0964b4(struct coord *coord, Mtxf *mtx) @@ -28,7 +28,7 @@ void func0f0964b4(struct coord *coord, Mtxf *mtx) coord->y = RANDOMFRAC() * 1.6666666269302f * 4.0f; coord->z = RANDOMFRAC() * 1.6666666269302f * 4.0f - 3.3333332538605f; - mtxLoadRandomRotation(mtx); + mtx_load_random_rotation(mtx); } void func0f0965e4(f32 *arg0, f32 *arg1, f32 arg2) diff --git a/src/game/game_0b0fd0.c b/src/game/game_0b0fd0.c index 49c7bd777..37022d34a 100644 --- a/src/game/game_0b0fd0.c +++ b/src/game/game_0b0fd0.c @@ -16,7 +16,7 @@ #include "data.h" #include "types.h" -struct weapon *weaponFindById(s32 itemid) +struct weapon *weapon_find_by_id(s32 itemid) { if (itemid < 0) { return NULL; @@ -29,9 +29,9 @@ struct weapon *weaponFindById(s32 itemid) return g_Weapons[itemid]; } -struct weaponfunc *weaponGetFunctionById(u32 weaponnum, u32 which) +struct weaponfunc *weapon_get_function_by_id(u32 weaponnum, u32 which) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); if (weapon) { return weapon->functions[which]; @@ -40,9 +40,9 @@ struct weaponfunc *weaponGetFunctionById(u32 weaponnum, u32 which) return NULL; } -struct weaponfunc *gsetGetWeaponFunction2(struct gset *gset) +struct weaponfunc *gset_get_weapon_function2(struct gset *gset) { - struct weapon *weapon = weaponFindById(gset->weaponnum); + struct weapon *weapon = weapon_find_by_id(gset->weaponnum); if (weapon) { return weapon->functions[gset->weaponfunc]; @@ -51,7 +51,7 @@ struct weaponfunc *gsetGetWeaponFunction2(struct gset *gset) return NULL; } -struct weaponfunc *gsetGetWeaponFunction(struct gset *gset) +struct weaponfunc *gset_get_weapon_function(struct gset *gset) { struct weapon *weapon = g_Weapons[gset->weaponnum]; @@ -62,7 +62,7 @@ struct weaponfunc *gsetGetWeaponFunction(struct gset *gset) return NULL; } -struct weaponfunc *weaponGetFunction(struct gset *gset, s32 which) +struct weaponfunc *weapon_get_function(struct gset *gset, s32 which) { struct weapon *weapon = g_Weapons[gset->weaponnum]; @@ -73,9 +73,9 @@ struct weaponfunc *weaponGetFunction(struct gset *gset, s32 which) return NULL; } -struct weaponfunc *currentPlayerGetWeaponFunction(u32 hand) +struct weaponfunc *current_player_get_weapon_function(u32 hand) { - struct weapon *weapon = weaponFindById(g_Vars.currentplayer->hands[hand].gset.weaponnum); + struct weapon *weapon = weapon_find_by_id(g_Vars.currentplayer->hands[hand].gset.weaponnum); if (weapon) { return weapon->functions[g_Vars.currentplayer->hands[hand].gset.weaponfunc]; @@ -84,9 +84,9 @@ struct weaponfunc *currentPlayerGetWeaponFunction(u32 hand) return NULL; } -u32 weaponGetNumFunctions(u32 weaponnum) +u32 weapon_get_num_functions(u32 weaponnum) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); s32 i; if (!weapon) { @@ -102,9 +102,9 @@ u32 weaponGetNumFunctions(u32 weaponnum) return 2; } -struct invaimsettings *gsetGetAimSettings(struct gset *gset) +struct invaimsettings *gset_get_aim_settings(struct gset *gset) { - struct weapon *weapon = weaponFindById(gset->weaponnum); + struct weapon *weapon = weapon_find_by_id(gset->weaponnum); if (weapon) { return weapon->aimsettings; @@ -113,10 +113,10 @@ struct invaimsettings *gsetGetAimSettings(struct gset *gset) return &invaimsettings_default; } -struct inventory_ammo *weaponGetAmmoByFunction(u32 weaponnum, u32 funcnum) +struct inventory_ammo *weapon_get_ammo_by_function(u32 weaponnum, u32 funcnum) { - struct weapon *weapon = weaponFindById(weaponnum); - struct weaponfunc *func = weaponGetFunctionById(weaponnum, funcnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); + struct weaponfunc *func = weapon_get_function_by_id(weaponnum, funcnum); if (func && weapon && func->ammoindex >= 0) { return weapon->ammos[func->ammoindex]; @@ -125,9 +125,9 @@ struct inventory_ammo *weaponGetAmmoByFunction(u32 weaponnum, u32 funcnum) return NULL; } -void currentPlayerGetWeaponPos(struct coord *pos) +void current_player_get_weapon_pos(struct coord *pos) { - struct weapon *weapon = weaponFindById(bgunGetWeaponNum(HAND_RIGHT)); + struct weapon *weapon = weapon_find_by_id(bgun_get_weapon_num(HAND_RIGHT)); if (weapon) { pos->x = weapon->posx; @@ -136,9 +136,9 @@ void currentPlayerGetWeaponPos(struct coord *pos) } } -void currentPlayerSetWeaponPos(struct coord *pos) +void current_player_set_weapon_pos(struct coord *pos) { - struct weapon *weapon = weaponFindById(bgunGetWeaponNum(HAND_RIGHT)); + struct weapon *weapon = weapon_find_by_id(bgun_get_weapon_num(HAND_RIGHT)); if (weapon) { weapon->posx = pos->x; @@ -147,7 +147,7 @@ void currentPlayerSetWeaponPos(struct coord *pos) } } -f32 handGetXShift(s32 handnum) +f32 hand_get_x_shift(s32 handnum) { return g_Vars.currentplayer->hands[handnum].xshift; } @@ -158,10 +158,10 @@ f32 func0f0b131c(s32 hand) struct weapon *weapon; if (hand == 0) { - weapon = weaponFindById(bgunGetWeaponNum2(0)); + weapon = weapon_find_by_id(bgun_get_weapon_num2(0)); x = weapon->posx; - if (PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { + if (PLAYERCOUNT() == 2 && options_get_screen_split() == SCREENSPLIT_VERTICAL) { x -= 3.5f; if (g_Vars.currentplayernum == 0) { @@ -169,10 +169,10 @@ f32 func0f0b131c(s32 hand) } } } else { - weapon = weaponFindById(bgunGetWeaponNum2(1)); + weapon = weapon_find_by_id(bgun_get_weapon_num2(1)); x = -weapon->posx; - if (PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { + if (PLAYERCOUNT() == 2 && options_get_screen_split() == SCREENSPLIT_VERTICAL) { x += 3.5f; if (g_Vars.currentplayernum == 0) { @@ -184,12 +184,12 @@ f32 func0f0b131c(s32 hand) return x; } -f32 currentPlayerGetGunZoomFov(void) +f32 current_player_get_gun_zoom_fov(void) { s32 index = -1; struct weapon *weapon; - switch (bgunGetWeaponNum2(0)) { + switch (bgun_get_weapon_num2(0)) { case WEAPON_SNIPERRIFLE: index = 0; break; @@ -205,7 +205,7 @@ f32 currentPlayerGetGunZoomFov(void) return g_Vars.currentplayer->gunzoomfovs[index]; } - weapon = weaponFindById(bgunGetWeaponNum2(0)); + weapon = weapon_find_by_id(bgun_get_weapon_num2(0)); if (weapon) { f32 fov = weapon->aimsettings->zoomfov; @@ -215,11 +215,11 @@ f32 currentPlayerGetGunZoomFov(void) return 0; } -void currentPlayerZoomOut(f32 fovpersec) +void current_player_zoom_out(f32 fovpersec) { s32 index = -1; - switch (bgunGetWeaponNum2(0)) { + switch (bgun_get_weapon_num2(0)) { case WEAPON_SNIPERRIFLE: index = 0; break; @@ -234,7 +234,7 @@ void currentPlayerZoomOut(f32 fovpersec) if (index >= 0) { f32 amount = fovpersec * 0.25f * LVUPDATE60FREAL(); - if (bgunGetWeaponNum2(0) == WEAPON_FARSIGHT) { + if (bgun_get_weapon_num2(0) == WEAPON_FARSIGHT) { amount *= 0.5f; } @@ -246,11 +246,11 @@ void currentPlayerZoomOut(f32 fovpersec) } } -void currentPlayerZoomIn(f32 fovpersec) +void current_player_zoom_in(f32 fovpersec) { s32 index = -1; - switch (bgunGetWeaponNum2(0)) { + switch (bgun_get_weapon_num2(0)) { case WEAPON_SNIPERRIFLE: index = 0; break; @@ -265,7 +265,7 @@ void currentPlayerZoomIn(f32 fovpersec) if (index >= 0) { f32 amount = fovpersec * 0.25f * LVUPDATE60FREAL(); - if (bgunGetWeaponNum2(0) == WEAPON_FARSIGHT) { + if (bgun_get_weapon_num2(0) == WEAPON_FARSIGHT) { amount *= 0.5f; } @@ -277,9 +277,9 @@ void currentPlayerZoomIn(f32 fovpersec) } } -bool weaponHasFlag(s32 itemid, u32 flag) +bool weapon_has_flag(s32 itemid, u32 flag) { - struct weapon *weapon = weaponFindById(itemid); + struct weapon *weapon = weapon_find_by_id(itemid); if (!weapon) { return false; @@ -288,9 +288,9 @@ bool weaponHasFlag(s32 itemid, u32 flag) return (weapon->flags & flag) != 0; } -bool weaponHasAimFlag(s32 weaponnum, u32 flag) +bool weapon_has_aim_flag(s32 weaponnum, u32 flag) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); if (!weapon) { return false; @@ -299,9 +299,9 @@ bool weaponHasAimFlag(s32 weaponnum, u32 flag) return (weapon->aimsettings->flags & flag) != 0; } -bool weaponHasAmmoFlag(s32 weaponnum, s32 funcnum, u32 flag) +bool weapon_has_ammo_flag(s32 weaponnum, s32 funcnum, u32 flag) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); struct inventory_ammo *ammo; if (weapon == NULL) { @@ -327,9 +327,9 @@ void func0f0b18b4(s32 arg0) // empty } -s32 currentPlayerGetDeviceState(s32 weaponnum) +s32 current_player_get_device_state(s32 weaponnum) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); s32 i; if (!weapon) { @@ -353,9 +353,9 @@ s32 currentPlayerGetDeviceState(s32 weaponnum) return DEVICESTATE_UNEQUIPPED; } -void currentPlayerSetDeviceActive(s32 weaponnum, bool active) +void current_player_set_device_active(s32 weaponnum, bool active) { - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); s32 i; if (!weapon) { @@ -383,7 +383,7 @@ void currentPlayerSetDeviceActive(s32 weaponnum, bool active) } } -u16 weaponGetFileNum(s32 weaponnum) +u16 weapon_get_file_num(s32 weaponnum) { struct weapon *weapon = NULL; @@ -402,12 +402,12 @@ u16 weaponGetFileNum(s32 weaponnum) return 0; } -u16 weaponGetFileNum2(s32 weaponnum) +u16 weapon_get_file_num2(s32 weaponnum) { - return weaponGetFileNum(weaponnum); + return weapon_get_file_num(weaponnum); } -void gsetPopulateFromCurrentPlayer(s32 handnum, struct gset *gset) +void gset_populate_from_current_player(s32 handnum, struct gset *gset) { gset->weaponnum = g_Vars.currentplayer->gunctrl.weaponnum; gset->weaponfunc = g_Vars.currentplayer->hands[handnum].gset.weaponfunc; @@ -423,10 +423,10 @@ void gsetPopulateFromCurrentPlayer(s32 handnum, struct gset *gset) } } -struct inventory_ammo *gsetGetAmmoDefinition(struct gset *gset) +struct inventory_ammo *gset_get_ammo_definition(struct gset *gset) { - struct weaponfunc *func = gsetGetWeaponFunction(gset); - struct weapon *weapon = weaponFindById(gset->weaponnum); + struct weaponfunc *func = gset_get_weapon_function(gset); + struct weapon *weapon = weapon_find_by_id(gset->weaponnum); if (func && func->ammoindex >= 0) { return weapon->ammos[func->ammoindex]; @@ -435,9 +435,9 @@ struct inventory_ammo *gsetGetAmmoDefinition(struct gset *gset) return NULL; } -u8 gsetGetSinglePenetration(struct gset *gset) +u8 gset_get_single_penetration(struct gset *gset) { - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_SHOOT) { struct weaponfunc_shoot *funcshoot = (struct weaponfunc_shoot *)func; @@ -447,10 +447,10 @@ u8 gsetGetSinglePenetration(struct gset *gset) return 0; } -s32 handGetCasingEject(struct gset *gset) +s32 hand_get_casing_eject(struct gset *gset) { s32 result = 0; - struct inventory_ammo *ammo = gsetGetAmmoDefinition(gset); + struct inventory_ammo *ammo = gset_get_ammo_definition(gset); if (ammo) { result = ammo->casingeject; @@ -459,9 +459,9 @@ s32 handGetCasingEject(struct gset *gset) return result; } -f32 gsetGetImpactForce(struct gset *gset) +f32 gset_get_impact_force(struct gset *gset) { - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); f32 result = 0; if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_SHOOT) { @@ -472,9 +472,9 @@ f32 gsetGetImpactForce(struct gset *gset) return result; } -f32 gsetGetDamage(struct gset *gset) +f32 gset_get_damage(struct gset *gset) { - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); f32 damage = 0; if (func) { @@ -502,17 +502,17 @@ f32 gsetGetDamage(struct gset *gset) damage = (gset->unk063a / 3.0f + 1.0f) * damage; } - if (bgunIsFiring(HAND_LEFT) && bgunIsFiring(HAND_RIGHT)) { + if (bgun_is_firing(HAND_LEFT) && bgun_is_firing(HAND_RIGHT)) { damage += damage; } return damage; } -u8 gsetGetFireslotDuration(struct gset *gset) +u8 gset_get_fireslot_duration(struct gset *gset) { #if VERSION >= VERSION_PAL_FINAL - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); u8 result = 0; if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_SHOOT) { @@ -526,7 +526,7 @@ u8 gsetGetFireslotDuration(struct gset *gset) return result; #else - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_SHOOT) { struct weaponfunc_shoot *funcshoot = (struct weaponfunc_shoot *)func; @@ -537,9 +537,9 @@ u8 gsetGetFireslotDuration(struct gset *gset) #endif } -u16 gsetGetSingleShootSound(struct gset *gset) +u16 gset_get_single_shoot_sound(struct gset *gset) { - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_SHOOT) { struct weaponfunc_shoot *funcshoot = (struct weaponfunc_shoot *)func; @@ -549,9 +549,9 @@ u16 gsetGetSingleShootSound(struct gset *gset) return 0; } -bool gsetHasFunctionFlags(struct gset *gset, u32 flags) +bool gset_has_function_flags(struct gset *gset, u32 flags) { - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); if (func) { return (func->flags & flags) == flags; @@ -560,11 +560,11 @@ bool gsetHasFunctionFlags(struct gset *gset, u32 flags) return false; } -s8 weaponGetNumTicksPerShot(u32 weaponnum, u32 funcindex) +s8 weapon_get_num_ticks_per_shot(u32 weaponnum, u32 funcindex) { u32 stack[2]; s32 result = 0; - struct weapon *weapon = weaponFindById(weaponnum); + struct weapon *weapon = weapon_find_by_id(weaponnum); struct weaponfunc *func = weapon->functions[funcindex]; if (func && func->type == INVENTORYFUNCTYPE_SHOOT_AUTOMATIC) { @@ -583,9 +583,9 @@ s8 weaponGetNumTicksPerShot(u32 weaponnum, u32 funcindex) return result; } -u32 currentPlayerGetSight(void) +u32 current_player_get_sight(void) { - struct weaponfunc *func = weaponGetFunctionById( + struct weaponfunc *func = weapon_get_function_by_id( g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponnum, g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponfunc); @@ -593,7 +593,7 @@ u32 currentPlayerGetSight(void) return SIGHT_NONE; } - if (cheatIsActive(CHEAT_CLASSICSIGHT)) { + if (cheat_is_active(CHEAT_CLASSICSIGHT)) { return SIGHT_CLASSIC; } @@ -654,10 +654,10 @@ u32 currentPlayerGetSight(void) return SIGHT_DEFAULT; } -void gsetGetNoiseSettings(struct gset *gset, struct noisesettings *dst) +void gset_get_noise_settings(struct gset *gset, struct noisesettings *dst) { struct noisesettings *settings = NULL; - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); if (func != NULL) { settings = func->noisesettings; @@ -674,7 +674,7 @@ void gsetGetNoiseSettings(struct gset *gset, struct noisesettings *dst) dst->decremspeed = settings->decremspeed; } -struct guncmd *handGetEquipAnim(struct gset *gset) +struct guncmd *hand_get_equip_anim(struct gset *gset) { struct weapon *weapon = g_Weapons[gset->weaponnum]; @@ -685,7 +685,7 @@ struct guncmd *handGetEquipAnim(struct gset *gset) return NULL; } -struct guncmd *handGetUnequipAnim(struct gset *gset) +struct guncmd *hand_get_unequip_anim(struct gset *gset) { struct weapon *weapon = g_Weapons[gset->weaponnum]; @@ -696,7 +696,7 @@ struct guncmd *handGetUnequipAnim(struct gset *gset) return NULL; } -struct guncmd *gsetGetPriToSecAnim(struct gset *gset) +struct guncmd *gset_get_pri_to_sec_anim(struct gset *gset) { struct weapon *weapon = g_Weapons[gset->weaponnum]; @@ -707,7 +707,7 @@ struct guncmd *gsetGetPriToSecAnim(struct gset *gset) return NULL; } -struct guncmd *gsetGetSecToPriAnim(struct gset *gset) +struct guncmd *gset_get_sec_to_pri_anim(struct gset *gset) { struct weapon *weapon = g_Weapons[gset->weaponnum]; diff --git a/src/game/game_0b2150.c b/src/game/game_0b2150.c index 4f58cbd29..f08b10bea 100644 --- a/src/game/game_0b2150.c +++ b/src/game/game_0b2150.c @@ -69,8 +69,8 @@ void func0f0b2150(Gfx **gdlptr, f32 *arg1, f32 *arg2, s32 width, s32 height, s32 yl = 0; } - widthx4 = viGetWidth() * 4; - heightx4 = viGetHeight() * 4; + widthx4 = vi_get_width() * 4; + heightx4 = vi_get_height() * 4; if (widthx4 < xh) { xh = widthx4; diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 1360b5ed6..71120fb70 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -22,9 +22,9 @@ u32 var800a41a4; u32 var800a41a8; u32 var800a41ac; -void artifactsClear(void) +void artifacts_clear(void) { - struct artifact *artifacts = schedGetWriteArtifacts(); + struct artifact *artifacts = sched_get_write_artifacts(); s32 i; for (i = 0; i < MAX_ARTIFACTS; i++) { @@ -32,10 +32,10 @@ void artifactsClear(void) } } -void artifactsTick(void) +void artifacts_tick(void) { - schedIncrementWriteArtifacts(); - schedIncrementFrontArtifacts(); + sched_increment_write_artifacts(); + sched_increment_front_artifacts(); } u16 func0f13c574(f32 arg0) @@ -96,7 +96,7 @@ s32 func0f13c710(f32 arg0) return arg0; } -void artifactsCalculateGlaresForRoom(s32 roomnum) +void artifacts_calculate_glares_for_room(s32 roomnum) { s32 i; s32 j; @@ -130,7 +130,7 @@ void artifactsCalculateGlaresForRoom(s32 roomnum) struct coord spc4; struct light *roomlights; s32 index; - struct artifact *artifacts = schedGetWriteArtifacts(); + struct artifact *artifacts = sched_get_write_artifacts(); struct coord *campos = &g_Vars.currentplayer->cam_pos; struct artifact *artifact; @@ -141,14 +141,14 @@ void artifactsCalculateGlaresForRoom(s32 roomnum) roomlights = (struct light *)&g_BgLightsFileData[g_Rooms[roomnum].gfxdata->lightsindex * 0x22]; s1 = &var800a41a0[g_Rooms[roomnum].gfxdata->lightsindex * 3]; - roomPopulateMtx(&sp138, roomnum); - mtx00015f88(bgGetScaleBg2Gfx(), &sp138); - mtx4MultMtx4(camGetMtxF006c(), &sp138, &spf8); + room_populate_mtx(&sp138, roomnum); + mtx00015f88(bg_get_scale_bg2gfx(), &sp138); + mtx4_mult_mtx4(cam_get_mtxf006c(), &sp138, &spf8); - viewwidth = viGetViewWidth(); - viewheight = viGetViewHeight(); - viewleft = viGetViewLeft(); - viewtop = viGetViewTop(); + viewwidth = vi_get_view_width(); + viewheight = vi_get_view_height(); + viewleft = vi_get_view_left(); + viewtop = vi_get_view_top(); for (i = 0; i < numlights; i++) { origin.x = 0.0f; @@ -311,7 +311,7 @@ void artifactsCalculateGlaresForRoom(s32 roomnum) && yi >= (s32)viewtop && yi < (s32)(viewtop + viewheight) && f0 < 32576.0f) { - index = envGetCurrent()->numsuns; + index = env_get_current()->numsuns; index *= 8; artifact = artifacts; artifact += index; @@ -323,7 +323,7 @@ void artifactsCalculateGlaresForRoom(s32 roomnum) if (index < MAX_ARTIFACTS) { artifact->unk04 = func0f13c574(f0) >> 2; - artifact->unk08 = &g_ZbufPtr1[viGetWidth() * yi + xi]; + artifact->unk08 = &g_ZbufPtr1[vi_get_width() * yi + xi]; artifact->light = &roomlights[i]; artifact->type = ARTIFACTTYPE_GLARE; artifact->unk0c.u16_2 = xi; @@ -351,11 +351,11 @@ u8 func0f13d3c4(u8 arg0, u8 arg1) return arg1; } -Gfx *artifactsConfigureForGlares(Gfx *gdl) +Gfx *artifacts_configure_for_glares(Gfx *gdl) { - struct stagetableentry *stage = stageGetCurrent(); + struct stagetableentry *stage = stage_get_current(); - texSelect(&gdl, &g_TexLightGlareConfigs[stage->light_type], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexLightGlareConfigs[stage->light_type], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2); @@ -370,14 +370,14 @@ Gfx *artifactsConfigureForGlares(Gfx *gdl) return gdl; } -Gfx *artifactsUnconfigureForGlares(Gfx *gdl) +Gfx *artifacts_unconfigure_for_glares(Gfx *gdl) { gDPSetTexturePersp(gdl++, G_TP_PERSP); return gdl; } -Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) +Gfx *artifacts_render_glares_for_room(Gfx *gdl, s32 roomnum) { s32 i; s32 j; @@ -412,14 +412,14 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) bool extra; f32 f26; - artifacts = schedGetFrontArtifacts(); - lightop_cur_frac = roomGetLightOpCurFrac(roomnum); + artifacts = sched_get_front_artifacts(); + lightop_cur_frac = room_get_light_op_cur_frac(roomnum); if (g_Rooms[roomnum].gfxdata == NULL || g_Rooms[roomnum].loaded240 == 0) { return gdl; } - for (i = envGetCurrent()->numsuns * 8; i < MAX_ARTIFACTS; i++) { + for (i = env_get_current()->numsuns * 8; i < MAX_ARTIFACTS; i++) { struct light *light2 = artifacts[i].light; count = 0; @@ -474,16 +474,16 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) s3[0] = func0f13d3c4(s3[0], t2 * 2); if (t2 > 0) { - brightness = viGetFovY() * 0.017453292f; + brightness = vi_get_fov_y() * 0.017453292f; add = cosf(brightness) / sinf(brightness) * 14.6f; - if (lightIsHealthy(roomnum, lightindex - g_Rooms[roomnum].gfxdata->lightsindex)) { - if (!lightIsOn(roomnum, lightindex - g_Rooms[roomnum].gfxdata->lightsindex)) { + if (light_is_healthy(roomnum, lightindex - g_Rooms[roomnum].gfxdata->lightsindex)) { + if (!light_is_on(roomnum, lightindex - g_Rooms[roomnum].gfxdata->lightsindex)) { continue; } brightness = 1.0f; - } else if (lightTickBroken(roomnum, lightindex - g_Rooms[roomnum].gfxdata->lightsindex)) { + } else if (light_tick_broken(roomnum, lightindex - g_Rooms[roomnum].gfxdata->lightsindex)) { brightness = 0.4f; } else { continue; @@ -505,7 +505,7 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) f0 = s3[2] * (1.0f / 255.0f); - skySetOverexposure((s32) ((f32)f0 * r), (s32) ((f32)f0 * g), (s32) ((f32)f0 * b)); + sky_set_overexposure((s32) ((f32)f0 * r), (s32) ((f32)f0 * g), (s32) ((f32)f0 * b)); for (l = 0; l < 3; l++) { lightroompos[l] = (light->bbox[0].s[l] + light->bbox[1].s[l] + light->bbox[2].s[l] + light->bbox[3].s[l]) / 4; @@ -513,7 +513,7 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) lightscreenpos.f[l] = lightworldpos.f[l] - g_Vars.currentplayer->cam_pos.f[l]; } - mtx4RotateVecInPlace(camGetWorldToScreenMtxf(), &lightscreenpos); + mtx4_rotate_vec_in_place(cam_get_world_to_screen_mtxf(), &lightscreenpos); cam0f0b4d04(&lightscreenpos, spdc); @@ -530,17 +530,17 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) } brightness += add; - brightness *= 2.0f * roomGetSettledLocalBrightnessFrac(roomnum); + brightness *= 2.0f * room_get_settled_local_brightness_frac(roomnum); if (brightness > 750.0f) { brightness = 750.0f; } - f24 = stageGetCurrent()->light_width * brightness * 0.01f; - f26 = stageGetCurrent()->light_height * brightness * 0.01f; + f24 = stage_get_current()->light_width * brightness * 0.01f; + f26 = stage_get_current()->light_height * brightness * 0.01f; - f24 *= viGetViewWidth() * (1.0f / 240.0f) / camGetPerspAspect(); - f26 *= viGetViewHeight() * (1.0f / 240.0f); + f24 *= vi_get_view_width() * (1.0f / 240.0f) / cam_get_persp_aspect(); + f26 *= vi_get_view_height() * (1.0f / 240.0f); if (brightness > 3.0f) { f32 alpha = (light->colour & 0xf) * 17; @@ -549,7 +549,7 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) colour[1] = g; colour[2] = b; - alpha *= stageGetCurrent()->light_alpha / 255.0f; + alpha *= stage_get_current()->light_alpha / 255.0f; alpha *= (s3[1] / 255.0f); alpha *= (s3[0] / 8.0f); @@ -574,7 +574,7 @@ Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum) colour[0] = 0xff; colour[1] = 0xff; colour[2] = 0xff; - colour[3] = stageGetCurrent()->light_alpha; + colour[3] = stage_get_current()->light_alpha; colour[3] = s3[0] * colour[3] / 8; gDPSetEnvColor(gdl++, colour[0], colour[1], colour[2], colour[3]); diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index a6b5cc00a..003bca224 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -141,7 +141,7 @@ u32 var8007fbbc = 0x0000003c; u32 var8007fbc0 = 0x44444400; u32 var8007fbc4 = 0xffffff00; -void textInit(void) +void text_init(void) { // empty } @@ -151,12 +151,12 @@ void text0f1531a8(s32 arg0) var8007fac4 = -arg0; } -void textSetRotation90(bool rotated) +void text_set_rotation90(bool rotated) { g_TextRotated90 = rotated; } -void textSetWrapIndent(s32 count) +void text_set_wrap_indent(s32 count) { g_WrapIndentCount = count; } @@ -179,7 +179,7 @@ void text0f1531dc(bool arg0) #endif } -void textLoadFont(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace) +void text_load_font(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace) { extern u8 _fonthandelgothicsmSegmentRomStart; extern u8 _fonthandelgothicxsSegmentRomStart; @@ -208,10 +208,10 @@ void textLoadFont(u8 *romstart, u8 *romend, struct font **fontptr, struct fontch #endif len = (romptr_t)romend - (romptr_t)romstart; - font = mempAlloc(len, MEMPOOL_STAGE); + font = memp_alloc(len, MEMPOOL_STAGE); chars = font->chars; - dmaExec(font, (romptr_t) romstart, len); + dma_exec(font, (romptr_t) romstart, len); // Convert pointers for (i = 0; i < NUMCHARS(); i++) { @@ -259,7 +259,7 @@ void textLoadFont(u8 *romstart, u8 *romend, struct font **fontptr, struct fontch #endif } -void textReset(void) +void text_reset(void) { extern u8 _fontbankgothicSegmentRomStart, _fontbankgothicSegmentRomEnd; extern u8 _fontzurichSegmentRomStart, _fontzurichSegmentRomEnd; @@ -305,17 +305,17 @@ void textReset(void) var8007fae8 = 0; if (g_Vars.stagenum == STAGE_TITLE) { - textLoadFont(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); - textLoadFont(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); - textLoadFont(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); + text_load_font(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); + text_load_font(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); + text_load_font(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); } else if (g_Vars.stagenum == STAGE_CREDITS) { - textLoadFont(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false); - textLoadFont(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); - textLoadFont(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); - textLoadFont(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); + text_load_font(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false); + text_load_font(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); + text_load_font(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); + text_load_font(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); } else { #if VERSION >= VERSION_JPN_FINAL - textLoadFont(&_fontnumericSegmentRomStart, &_fontnumericSegmentRomEnd, &g_FontNumeric, &g_CharsNumeric, false); + text_load_font(&_fontnumericSegmentRomStart, &_fontnumericSegmentRomEnd, &g_FontNumeric, &g_CharsNumeric, false); if (g_Vars.normmplayerisrunning) { if (IS4MB()) { @@ -330,40 +330,40 @@ void textReset(void) } } - textLoadFont(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); + text_load_font(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); if (!g_Vars.normmplayerisrunning || IS8MB()) { - textLoadFont(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); + text_load_font(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); } if (g_Vars.stagenum == STAGE_TEST_OLD) { - textLoadFont(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); + text_load_font(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); } - textLoadFont(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false); + text_load_font(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false); #elif VERSION >= VERSION_PAL_BETA - textLoadFont(&_fontnumericSegmentRomStart, &_fontnumericSegmentRomEnd, &g_FontNumeric, &g_CharsNumeric, false); - textLoadFont(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false); - textLoadFont(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); + text_load_font(&_fontnumericSegmentRomStart, &_fontnumericSegmentRomEnd, &g_FontNumeric, &g_CharsNumeric, false); + text_load_font(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false); + text_load_font(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); if (!g_Vars.normmplayerisrunning) { - textLoadFont(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); + text_load_font(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); } if (g_Vars.stagenum == STAGE_TEST_OLD) { - textLoadFont(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); + text_load_font(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); } #else // This unused GE font exists in NTSC but was removed in the PAL version - textLoadFont(&_fonttahomaSegmentRomStart, &_fonttahomaSegmentRomEnd, &g_FontTahoma2, &g_FontTahoma1, false); + text_load_font(&_fonttahomaSegmentRomStart, &_fonttahomaSegmentRomEnd, &g_FontTahoma2, &g_FontTahoma1, false); - textLoadFont(&_fontnumericSegmentRomStart, &_fontnumericSegmentRomEnd, &g_FontNumeric, &g_CharsNumeric, false); - textLoadFont(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false); - textLoadFont(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); - textLoadFont(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); + text_load_font(&_fontnumericSegmentRomStart, &_fontnumericSegmentRomEnd, &g_FontNumeric, &g_CharsNumeric, false); + text_load_font(&_fonthandelgothicxsSegmentRomStart, &_fonthandelgothicxsSegmentRomEnd, &g_FontHandelGothicXs, &g_CharsHandelGothicXs, false); + text_load_font(&_fonthandelgothicsmSegmentRomStart, &_fonthandelgothicsmSegmentRomEnd, &g_FontHandelGothicSm, &g_CharsHandelGothicSm, false); + text_load_font(&_fonthandelgothicmdSegmentRomStart, &_fonthandelgothicmdSegmentRomEnd, &g_FontHandelGothicMd, &g_CharsHandelGothicMd, false); if (g_Vars.stagenum == STAGE_TEST_OLD) { - textLoadFont(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); + text_load_font(&_fonthandelgothiclgSegmentRomStart, &_fonthandelgothiclgSegmentRomEnd, &g_FontHandelGothicLg, &g_CharsHandelGothicLg, false); } #endif } @@ -409,7 +409,7 @@ Gfx *text0f153780(Gfx *gdl) return gdl; } -Gfx *textSetPrimColour(Gfx *gdl, u32 colour) +Gfx *text_set_prim_colour(Gfx *gdl, u32 colour) { gDPPipeSync(gdl++); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); @@ -429,7 +429,7 @@ Gfx *text0f153838(Gfx *gdl) Gfx *text0f153858(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2) { - gdl = textSetPrimColour(gdl, 0x00000000); + gdl = text_set_prim_colour(gdl, 0x00000000); gDPFillRectangle(gdl++, *x1, *y1, *x2, *y2); @@ -440,7 +440,7 @@ Gfx *text0f153858(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2) Gfx *text0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2) { - gdl = textSetPrimColour(gdl, 0x00000000); + gdl = text_set_prim_colour(gdl, 0x00000000); gDPFillRectangleScaled(gdl++, *x1, *y1, *x2, *y2); @@ -452,7 +452,7 @@ Gfx *text0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2) #if VERSION >= VERSION_NTSC_1_0 Gfx *text0f153990(Gfx *gdl, s32 left, s32 top, s32 width, s32 height) { - gdl = textSetPrimColour(gdl, 0x00000000); + gdl = text_set_prim_colour(gdl, 0x00000000); #if VERSION >= VERSION_JPN_FINAL gDPFillRectangle(gdl++, left - 1, top - 1, width * var8007fad0 + left + 1, top + height * var80080108jf + 1); @@ -468,7 +468,7 @@ 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) { - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); gDPFillRectangle(gdl++, x1, y1, x2, y2); @@ -483,7 +483,7 @@ Gfx *text0f153ab0(Gfx *gdl) var8007fb9c = true; - allocation = gfxAllocate(sizeof(Gfx) * 530); + allocation = gfx_allocate(sizeof(Gfx) * 530); var800a4634 = allocation; var800a4638 = allocation + 530; @@ -520,7 +520,7 @@ void text0f153b6c(s32 arg0) } } -void textSetDiagonalBlend(s32 x, s32 y, f32 timer, u8 mode) +void text_set_diagonal_blend(s32 x, s32 y, f32 timer, u8 mode) { g_Blend.types |= BLENDTYPE_DIAGONAL; g_Blend.diagrefx = x; @@ -529,7 +529,7 @@ void textSetDiagonalBlend(s32 x, s32 y, f32 timer, u8 mode) g_Blend.diagmode = mode; } -void textBackupDiagonalBlendSettings(void) +void text_backup_diagonal_blend_settings(void) { g_Blend.backupdiagrefx = g_Blend.diagrefx; g_Blend.backupdiagrefy = g_Blend.diagrefy; @@ -538,7 +538,7 @@ void textBackupDiagonalBlendSettings(void) g_Blend.backupdiagtypes = g_Blend.types & BLENDTYPE_DIAGONAL; } -void textRestoreDiagonalBlendSettings(void) +void text_restore_diagonal_blend_settings(void) { g_Blend.diagrefx = g_Blend.backupdiagrefx; g_Blend.diagrefy = g_Blend.backupdiagrefy; @@ -547,7 +547,7 @@ void textRestoreDiagonalBlendSettings(void) g_Blend.types |= g_Blend.backupdiagtypes; } -void textSetVerticalBlend(s32 y1, s32 y2, u32 arg2) +void text_set_vertical_blend(s32 y1, s32 y2, u32 arg2) { g_Blend.types |= BLENDTYPE_VERTICAL; g_Blend.vertrefy1 = y1; @@ -555,7 +555,7 @@ void textSetVerticalBlend(s32 y1, s32 y2, u32 arg2) g_Blend.vert34 = arg2; } -void textSetHorizontalBlend(s32 x1, s32 x2, u32 arg2) +void text_set_horizontal_blend(s32 x1, s32 x2, u32 arg2) { g_Blend.types |= BLENDTYPE_HORIZONTAL; g_Blend.horizrefx1 = x1; @@ -563,28 +563,28 @@ void textSetHorizontalBlend(s32 x1, s32 x2, u32 arg2) g_Blend.horiz40 = arg2; } -void textResetBlends2(void) +void text_reset_blends2(void) { g_Blend.types = 0; } -void textResetBlends3(void) +void text_reset_blends3(void) { g_Blend.types = 0; } -void textBackupAndResetBlends(void) +void text_backup_and_reset_blends(void) { g_Blend.backuptypes = g_Blend.types; g_Blend.types = 0; } -void textRestoreBlends(void) +void text_restore_blends(void) { g_Blend.types = g_Blend.backuptypes; } -void textSetWaveBlend(s32 arg0, s32 arg1, s32 cthresh) +void text_set_wave_blend(s32 arg0, s32 arg1, s32 cthresh) { g_Blend.types |= BLENDTYPE_WAVE; g_Blend.wave4c = arg0; @@ -594,30 +594,30 @@ void textSetWaveBlend(s32 arg0, s32 arg1, s32 cthresh) g_Blend.wavecolour2 = 0xffffff00; } -void textSetMenuBlend(f32 arg0) +void text_set_menu_blend(f32 arg0) { g_Blend.types |= BLENDTYPE_MENU; g_Blend.menuweight = arg0 * arg0 * 110.0f; } -void textSetWaveColours(u32 colour1, u32 colour2) +void text_set_wave_colours(u32 colour1, u32 colour2) { g_Blend.wavecolour1 = colour1; g_Blend.wavecolour2 = colour2; } -void textResetBlends(void) +void text_reset_blends(void) { g_Blend.types = 0; } -bool textHasDiagonalBlend(void) +bool text_has_diagonal_blend(void) { return (g_Blend.types & BLENDTYPE_DIAGONAL) && (g_Blend.diagmode == DIAGMODE_FADEIN || g_Blend.diagmode == DIAGMODE_FADEOUT); } -u32 textApplyProjectionColour(s32 x, s32 y, u32 colour) +u32 text_apply_projection_colour(s32 x, s32 y, u32 colour) { u32 stack[3]; u32 result = colour; @@ -653,7 +653,7 @@ u32 textApplyProjectionColour(s32 x, s32 y, u32 colour) } else if ((g_Blend.diagtimer - (f14 + f18 + f16)) < f12) { u32 colour2 = (((colour & 0xff) + 0xff) / 2) | (colour & 0xffffff00); weightf = (f12 - (g_Blend.diagtimer - (f14 + f18 + f16))) / f18 * 255.0f; - result = colourBlend(colour, colour2, 0xff - (u32) weightf); + result = colour_blend(colour, colour2, 0xff - (u32) weightf); } } else if (g_Blend.diagmode == 2) { f16 = 0.0f; @@ -662,12 +662,12 @@ u32 textApplyProjectionColour(s32 x, s32 y, u32 colour) result = 0x00000000; } else if (g_Blend.diagtimer - f14 < f12) { weightf = (f12 - (g_Blend.diagtimer - f14)) / f14 * 255.0f; - result = colourBlend(0x00000000, colour & 0xff, weightf); + result = colour_blend(0x00000000, colour & 0xff, weightf); } else if (g_Blend.diagtimer - (f14 + f16) < f12) { result = colour & 0xff; } else if ((g_Blend.diagtimer - (f14 + f18 + f16)) < f12) { weightf = (f12 - (g_Blend.diagtimer - (f14 + f18 + f16))) / f18 * 255.0f; - result = colourBlend(colour & 0xff, colour, weightf); + result = colour_blend(colour & 0xff, colour, weightf); } } } @@ -683,7 +683,7 @@ u32 text0f1543ac(s32 x, s32 y, u32 colourarg) u32 colour = colourarg; if (g_Blend.types & BLENDTYPE_MENU) { - colour = (colourBlend(0x00000000, colour, g_Blend.menuweight) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(0x00000000, colour, g_Blend.menuweight) & 0xffffff00) | (colour & 0xff); } if (g_Blend.types & BLENDTYPE_VERTICAL) { @@ -703,7 +703,7 @@ u32 text0f1543ac(s32 x, s32 y, u32 colourarg) } if (g_Blend.vert34 >= v0) { - colour = colourBlend(colour, 0x00000000, v0 * 255 / g_Blend.vert34); + colour = colour_blend(colour, 0x00000000, v0 * 255 / g_Blend.vert34); } } @@ -724,7 +724,7 @@ u32 text0f1543ac(s32 x, s32 y, u32 colourarg) } if (g_Blend.horiz40 >= v0) { - colour = colourBlend(colour, 0x00000000, v0 * 255 / g_Blend.horiz40); + colour = colour_blend(colour, 0x00000000, v0 * 255 / g_Blend.horiz40); } } @@ -776,12 +776,12 @@ u32 text0f1543ac(s32 x, s32 y, u32 colourarg) colour = 0x00000000; } else if (g_Blend.diagtimer - f14 < f12) { f32 weightf = (f12 - (g_Blend.diagtimer - f14)) / f14 * 255.0f; - colour = colourBlend(0x00000000, colour & 0xff, weightf); + colour = colour_blend(0x00000000, colour & 0xff, weightf); } else if (g_Blend.diagtimer - (f14 + f16) < f12) { colour &= 0xff; } else if (g_Blend.diagtimer - (f14 + f18 + f16) < f12) { f32 weightf = (f12 - (g_Blend.diagtimer - (f14 + f18 + f16))) / f18 * 255.0f; - colour = colourBlend(0x00000000, colour, weightf); + colour = colour_blend(0x00000000, colour, weightf); } } else { u32 alpha[4]; @@ -792,24 +792,24 @@ u32 text0f1543ac(s32 x, s32 y, u32 colourarg) f18 = 50.0f; f16 = 22.0f; - mainOverrideVariable("burncol", &burncol); + main_override_variable("burncol", &burncol); if (g_Blend.diagtimer < f12) { - colour = colourBlend(alpha[0], colour, 110); + colour = colour_blend(alpha[0], colour, 110); } else if (g_Blend.diagtimer - f14 < f12) { f32 weightf = (f12 - (g_Blend.diagtimer - f14)) / f14 * 255.0f; - colour = colourBlend( - colourBlend(burncol | (colour & 0xff), colour, 0xc0), - colourBlend(alpha[0], colour, 110), + colour = colour_blend( + colour_blend(burncol | (colour & 0xff), colour, 0xc0), + colour_blend(alpha[0], colour, 110), 255 - (u32) weightf); } else if (g_Blend.diagtimer - (f14 + f16) < f12) { u32 stack; - colour = colourBlend(burncol | (colour & 0xff), colour, 0xc0); + colour = colour_blend(burncol | (colour & 0xff), colour, 0xc0); } else if (g_Blend.diagtimer - (f14 + f18 + f16) < f12) { f32 weightf = (f12 - (g_Blend.diagtimer - (f14 + f18 + f16))) / f18 * 255.0f; - colour = colourBlend( + colour = colour_blend( colour, - colourBlend(burncol | (colour & 0xff), colour, 0xc0), + colour_blend(burncol | (colour & 0xff), colour, 0xc0), 255 - (u32) weightf); } } @@ -828,10 +828,10 @@ u32 text0f1543ac(s32 x, s32 y, u32 colourarg) if (f0 < 0.0f) { s32 weight = var8007fbbc * (0 - f0); - colour = colourBlend(g_Blend.wavecolour1 | (colour & 0xff), colour, weight); + colour = colour_blend(g_Blend.wavecolour1 | (colour & 0xff), colour, weight); } else { s32 weight = var8007fbb8 * f0; - colour = colourBlend(g_Blend.wavecolour2 | (colour & 0xff), colour, weight); + colour = colour_blend(g_Blend.wavecolour2 | (colour & 0xff), colour, weight); } } @@ -852,7 +852,7 @@ Gfx *text0f154ecc(Gfx *gdl, u32 arg1, u32 arg2) } #if VERSION >= VERSION_PAL_BETA -void textMapCodeUnitToChar2(u8 *c) +void text_map_code_unit_to_char2(u8 *c) { switch (*c) { case 0xc0: @@ -1043,12 +1043,12 @@ u16 func0f154968jf(u8 value) } #endif -void textMapCodeUnitToChar(char **text, struct fontchar **arg1, struct fontchar **arg2, struct fontchar *chars, u8 *prevchar); +void text_map_code_unit_to_char(char **text, struct fontchar **arg1, struct fontchar **arg2, struct fontchar *chars, u8 *prevchar); #if VERSION == VERSION_JPN_FINAL #if MATCHING GLOBAL_ASM( -glabel textMapCodeUnitToChar +glabel text_map_code_unit_to_char /* f154b00: 27bdffd0 */ addiu $sp,$sp,-48 /* f154b04: afbf001c */ sw $ra,0x1c($sp) /* f154b08: afb00018 */ sw $s0,0x18($sp) @@ -1140,7 +1140,7 @@ glabel textMapCodeUnitToChar /* f154c50: 018d4825 */ or $t1,$t4,$t5 /* f154c54: a7a9002a */ sh $t1,0x2a($sp) /* f154c58: afa90024 */ sw $t1,0x24($sp) -/* f154c5c: 0c0036b4 */ jal mainOverrideVariable +/* f154c5c: 0c0036b4 */ jal main_override_variable /* f154c60: a3a00029 */ sb $zero,0x29($sp) /* f154c64: 3c0e8008 */ lui $t6,%hi(ope) /* f154c68: 8dce0228 */ lw $t6,%lo(ope)($t6) @@ -1196,7 +1196,7 @@ u32 ope = 0; const char var7f1b8068jf[] = "ope"; #else -void textMapCodeUnitToChar(char **text, struct fontchar **arg1, struct fontchar **arg2, struct fontchar *chars, u8 *prevchar) +void text_map_code_unit_to_char(char **text, struct fontchar **arg1, struct fontchar **arg2, struct fontchar *chars, u8 *prevchar) { u16 c; u8 c1; @@ -1246,7 +1246,7 @@ void textMapCodeUnitToChar(char **text, struct fontchar **arg1, struct fontchar sp2a = ((c1 & 0x7f) << 7) | (c2 & 0x7f); sp29 = 0; - mainOverrideVariable("ope", &ope); + main_override_variable("ope", &ope); if (ope) { sp29 = func0f154784jf(sp2a); @@ -1268,7 +1268,7 @@ void textMapCodeUnitToChar(char **text, struct fontchar **arg1, struct fontchar } #endif #elif VERSION >= VERSION_PAL_BETA -void textMapCodeUnitToChar(char **text, struct fontchar **arg1, struct fontchar **arg2, struct fontchar *chars, u8 *prevchar) +void text_map_code_unit_to_char(char **text, struct fontchar **arg1, struct fontchar **arg2, struct fontchar *chars, u8 *prevchar) { u8 c; u8 index; @@ -1336,7 +1336,7 @@ void textMapCodeUnitToChar(char **text, struct fontchar **arg1, struct fontchar case 0xaa: index = 0x86; break; } } else { - textMapCodeUnitToChar2(&c); + text_map_code_unit_to_char2(&c); } if (index > 0) { @@ -1356,7 +1356,7 @@ void textMapCodeUnitToChar(char **text, struct fontchar **arg1, struct fontchar *arg2 = &chars[*prevchar - 0x21]; if (index > 0) { - textMapCodeUnitToChar2(&c); + text_map_code_unit_to_char2(&c); } *prevchar = c; @@ -1385,7 +1385,7 @@ Gfx *text0f154f38(Gfx *gdl, s32 *arg1, struct fontchar *curchar, struct fontchar #if VERSION >= VERSION_JPN_FINAL if (curchar->pixeldata == NULL) { - curchar->pixeldata = (void *) langGetJpnCharPixels(curchar->index - 0x80); + curchar->pixeldata = (void *) lang_get_jpn_char_pixels(curchar->index - 0x80); } if (curchar->index >= 0x80) { @@ -1425,9 +1425,9 @@ Gfx *text0f154f38(Gfx *gdl, s32 *arg1, struct fontchar *curchar, struct fontchar sp34 = sp36 + ((sp34 + 1) << 6); sp30 = sp32 + ((sp30 + 1) << 6); - vertices = gfxAllocateVertices(4); + vertices = gfx_allocate_vertices(4); - colours = gfxAllocateColours(1); + colours = gfx_allocate_colours(1); colours[0].word = 0xff0000ff; vertices[0].z = -10; @@ -1495,7 +1495,7 @@ Gfx *text0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, } #endif - textMeasure(&textheight, &textwidth, text, chars, font, 0); + text_measure(&textheight, &textwidth, text, chars, font, 0); ptr = &x; fx = *ptr - (widthscale - 1.0f) * textwidth * 0.5f * hdir; @@ -1547,7 +1547,7 @@ Gfx *text0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, struct fontchar *sp84; struct fontchar *sp80; - textMapCodeUnitToChar(&text, &sp84, &sp80, chars, &prevchar); + text_map_code_unit_to_char(&text, &sp84, &sp80, chars, &prevchar); gdl = text0f154f38(gdl, &relx, sp84, sp80, font, widthscale, heightscale, fx, fy); } } @@ -1591,7 +1591,7 @@ Gfx *text0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, } tmpchar.index = codepoint + 0x80; - tmpchar.pixeldata = (void *) langGetJpnCharPixels(codepoint); + tmpchar.pixeldata = (void *) lang_get_jpn_char_pixels(codepoint); text += 2; } @@ -1623,13 +1623,13 @@ Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fon width *= xscale; height *= yscale; - if (g_TextRotated90 || (*x > 0 && *x <= viGetWidth() && sp90 + curchar->baseline <= viGetHeight())) { + if (g_TextRotated90 || (*x > 0 && *x <= vi_get_width() && sp90 + curchar->baseline <= vi_get_height())) { if (savedx + width >= *x && savedy + height >= curchar->baseline + sp90 && *x >= savedx && curchar->baseline + sp90 + curchar->height >= savedy) { if (curchar->pixeldata == NULL) { - curchar->pixeldata = (void *)langGetJpnCharPixels(curchar->index - 0x80); + curchar->pixeldata = (void *)lang_get_jpn_char_pixels(curchar->index - 0x80); } if (curchar->index >= 0x80) { @@ -1693,7 +1693,7 @@ Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fon text0f153b6c(*y + arg10); if (var8007fba0 >= *x / g_ScaleX && *x / g_ScaleX + curchar->width * var8007fad0 >= var8007fba0) { - var800a4634 = menugfxDrawPlane(var800a4634, + var800a4634 = menugfx_draw_plane(var800a4634, var8007fba0, curchar->baseline * var80080108jf + sp90, var8007fba0, @@ -1704,7 +1704,7 @@ Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fon } if (var8007fba0 - 3 >= *x / g_ScaleX && *x / g_ScaleX + curchar->width * var8007fad0 >= var8007fba0 - 3) { - var800a4634 = menugfxDrawPlane(var800a4634, + var800a4634 = menugfx_draw_plane(var800a4634, var8007fba0, curchar->baseline * var80080108jf + sp90, var8007fba0, @@ -1762,7 +1762,7 @@ Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fon *x -= (tmp - 1) * xscale; width *= xscale; - if (g_TextRotated90 || (*x > 0 && *x <= viGetWidth() && sp90 + curchar->baseline <= viGetHeight())) { + if (g_TextRotated90 || (*x > 0 && *x <= vi_get_width() && sp90 + curchar->baseline <= vi_get_height())) { if (savedx + width >= *x && savedy + height >= curchar->baseline + sp90 && *x >= savedx @@ -1808,7 +1808,7 @@ Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fon text0f153b6c(*y + arg10); if (var8007fba0 >= *x / g_ScaleX && *x / g_ScaleX + curchar->width * var8007fad0 >= var8007fba0) { - var800a4634 = menugfxDrawPlane(var800a4634, + var800a4634 = menugfx_draw_plane(var800a4634, var8007fba0, curchar->baseline + sp90, var8007fba0, @@ -1819,7 +1819,7 @@ Gfx *text0f15568c(Gfx *gdl, s32 *x, s32 *y, struct fontchar *curchar, struct fon } if (var8007fba0 - 3 >= *x / g_ScaleX && *x / g_ScaleX + curchar->width * var8007fad0 >= var8007fba0 - 3) { - var800a4634 = menugfxDrawPlane(var800a4634, + var800a4634 = menugfx_draw_plane(var800a4634, var8007fba0, curchar->baseline + sp90, var8007fba0, @@ -1878,7 +1878,7 @@ void text0f156030(u32 colour) var800a463c = colour; } -Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *chars, struct font *font, +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) { s32 savedx; @@ -1908,7 +1908,7 @@ Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar * if (var8007fbd8) { #if VERSION >= VERSION_JPN_FINAL - menuGetSinOscFrac(40); + menu_get_sin_osc_frac(40); newx = *x / g_ScaleX; newy = *y; tmpcolour = var800a463c; @@ -1919,7 +1919,7 @@ Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar * newy--; } - mainOverrideVariable("sbrd", &sbrd); + main_override_variable("sbrd", &sbrd); if (sbrd != 0) { tmpcolour = sbrd; @@ -1937,38 +1937,38 @@ Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar * newx = *x / g_ScaleX + 1; newy = *y - 1; - gdl = textRenderProjected(gdl, &newx, &newy, text, chars, font, tmpcolour, width, height, arg9, lineheight); + gdl = text_render_projected(gdl, &newx, &newy, text, chars, font, tmpcolour, width, height, arg9, lineheight); newx = *x / g_ScaleX + 1; newy = *y + 1; - gdl = textRenderProjected(gdl, &newx, &newy, text, chars, font, tmpcolour, width, height, arg9, lineheight); + gdl = text_render_projected(gdl, &newx, &newy, text, chars, font, tmpcolour, width, height, arg9, lineheight); newx = *x / g_ScaleX - 1; newy = *y - 1; - gdl = textRenderProjected(gdl, &newx, &newy, text, chars, font, tmpcolour, width, height, arg9, lineheight); + gdl = text_render_projected(gdl, &newx, &newy, text, chars, font, tmpcolour, width, height, arg9, lineheight); newx = *x / g_ScaleX - 1; newy = *y + 1; - gdl = textRenderProjected(gdl, &newx, &newy, text, chars, font, tmpcolour, width, height, arg9, lineheight); + gdl = text_render_projected(gdl, &newx, &newy, text, chars, font, tmpcolour, width, height, arg9, lineheight); var8007fbd8 = 1; g_Blend.types = savedtypes; g_Blend.diagmode = savedmode; #else - alpha = (1.0f - menuGetSinOscFrac(40.0f)) * 100.0f + 150.0f; + alpha = (1.0f - menu_get_sin_osc_frac(40.0f)) * 100.0f + 150.0f; newx = *x / g_ScaleX; newy = *y; tmpcolour = var800a463c; colour2 = (colour & 0xffffff00) | (u32) alpha; - mainOverrideVariable("sbrd", &sbrd); + main_override_variable("sbrd", &sbrd); if (sbrd) { tmpcolour = sbrd; } - gdl = textRender(gdl, &newx, &newy, text, chars, font, colour2, tmpcolour, width, height, arg9, lineheight); + gdl = text_render(gdl, &newx, &newy, text, chars, font, colour2, tmpcolour, width, height, arg9, lineheight); #endif } @@ -1978,13 +1978,13 @@ Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar * } #endif - mainOverrideVariable("lalpha", &var8007fbac); - mainOverrideVariable("subtlety", &var8007fbb8); - mainOverrideVariable("subtletx", &var8007fbbc); - mainOverrideVariable("coly", &var8007fbc4); - mainOverrideVariable("colx", &var8007fbc0); - mainOverrideVariable("lfade", &var8007fbb0); - mainOverrideVariable("llimbo", &var8007fbb4); + main_override_variable("lalpha", &var8007fbac); + main_override_variable("subtlety", &var8007fbb8); + main_override_variable("subtletx", &var8007fbbc); + main_override_variable("coly", &var8007fbc4); + main_override_variable("colx", &var8007fbc0); + main_override_variable("lfade", &var8007fbb0); + main_override_variable("llimbo", &var8007fbb4); savedx = *x; savedy = *y; @@ -2047,7 +2047,7 @@ Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar * struct fontchar *sp78; struct fontchar *sp74; - textMapCodeUnitToChar(&text, &sp78, &sp74, chars, &prevchar); + text_map_code_unit_to_char(&text, &sp78, &sp74, chars, &prevchar); gdl = text0f15568c(gdl, x, y, sp78, sp74, font, savedx, savedy, width, height, arg9); } @@ -2089,7 +2089,7 @@ Gfx *textRenderProjected(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar * } tmpchar.index = codepoint + 0x80; - tmpchar.pixeldata = (void *)langGetJpnCharPixels(codepoint); + tmpchar.pixeldata = (void *)lang_get_jpn_char_pixels(codepoint); gdl = text0f15568c(gdl, x, y, &tmpchar, &tmpchar, font, savedx, savedy, width, height, arg9); @@ -2129,7 +2129,7 @@ Gfx *text0f1566cc(Gfx *gdl, u32 arg1, u32 arg2) return gdl; } -Gfx *textRenderChar(Gfx *gdl, s32 *x, s32 *y, struct fontchar *char1, struct fontchar *char2, +Gfx *text_render_char(Gfx *gdl, s32 *x, s32 *y, struct fontchar *char1, struct fontchar *char2, struct font *font, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 arg10) { s32 tmp; @@ -2141,15 +2141,15 @@ Gfx *textRenderChar(Gfx *gdl, s32 *x, s32 *y, struct fontchar *char1, struct fon *x -= (tmp - 1) * var8007fad0; if (*x > 0 - && *x <= viGetWidth() - && sp38 + char1->baseline <= viGetHeight() + && *x <= vi_get_width() + && sp38 + char1->baseline <= vi_get_height() && *x <= arg6 + arg8 && char1->baseline + sp38 <= arg7 + arg9 && *x >= arg6 && sp38 + char1->baseline + char1->height >= arg7) { #if VERSION >= VERSION_JPN_FINAL if (char1->pixeldata == NULL) { - char1->pixeldata = (void *)langGetJpnCharPixels(char1->index - 0x80); + char1->pixeldata = (void *)lang_get_jpn_char_pixels(char1->index - 0x80); } #else if (g_Blend.types) { @@ -2231,7 +2231,7 @@ Gfx *text0f156a24(Gfx *gdl, s32 x, s32 y, struct fontchar *char1, s32 arg4, s32 return gdl; } -Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, +Gfx *text_render(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *chars, struct font *font, u32 arg6, u32 colour, s32 width, s32 height, u32 arg10, s32 lineheight) { @@ -2312,9 +2312,9 @@ Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *sp78; struct fontchar *sp74; - textMapCodeUnitToChar(&text, &sp78, &sp74, chars, &prevchar); + text_map_code_unit_to_char(&text, &sp78, &sp74, chars, &prevchar); - gdl = textRenderChar(gdl, x, y, sp78, sp74, + gdl = text_render_char(gdl, x, y, sp78, sp74, font, savedx, savedy, width * var8007fad0, height, arg10); } } @@ -2330,7 +2330,7 @@ Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, prevchar = 'H'; text++; } else if (*text < 0x80) { - gdl = textRenderChar(gdl, x, y, &chars[*text - 0x21], &chars[prevchar - 0x21], + gdl = text_render_char(gdl, x, y, &chars[*text - 0x21], &chars[prevchar - 0x21], font, savedx, savedy, width * var8007fad0, height, arg10); prevchar = *text; text++; @@ -2348,9 +2348,9 @@ Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, } sp74.index = codepoint + 0x80; - sp74.pixeldata = (void *)langGetJpnCharPixels(codepoint); + sp74.pixeldata = (void *)lang_get_jpn_char_pixels(codepoint); - gdl = textRenderChar(gdl, x, y, &sp74, &sp74, font, savedx, savedy, width * var8007fad0, height, arg10); + gdl = text_render_char(gdl, x, y, &sp74, &sp74, font, savedx, savedy, width * var8007fad0, height, arg10); text += 2; } @@ -2371,13 +2371,13 @@ Gfx *textRender(Gfx *gdl, s32 *x, s32 *y, char *text, #if VERSION == VERSION_JPN_FINAL Gfx *func0f1574d0jf(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, s32 colour, u32 colour2, s32 width, s32 height, s32 arg9, u32 arg10) { - return textRenderProjected(gdl, x, y, text, font1, font2, colour, width, height, arg9, arg10); + return text_render_projected(gdl, x, y, text, font1, font2, colour, width, height, arg9, arg10); } #endif #if VERSION < VERSION_PAL_BETA && MATCHING GLOBAL_ASM( -glabel textMeasure +glabel text_measure /* f1572f8: 27bdffe8 */ addiu $sp,$sp,-24 /* f1572fc: afb10008 */ sw $s1,0x8($sp) /* f157300: 8fb1002c */ lw $s1,0x2c($sp) @@ -2532,7 +2532,7 @@ glabel textMeasure ); #else // Mismatch: Regalloc -void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *font1, struct font *font2, s32 lineheight) +void text_measure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *font1, struct font *font2, s32 lineheight) { char prevchar; char thischar; @@ -2593,7 +2593,7 @@ void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *f text++; } else { #if VERSION >= VERSION_JPN_FINAL - textMapCodeUnitToChar(&text, &sp54, &sp50, font1, &prevchar); + text_map_code_unit_to_char(&text, &sp54, &sp50, font1, &prevchar); overlap = 0; @@ -2616,7 +2616,7 @@ void textMeasure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *f struct fontchar *sp50; struct fontchar *sp4c; - textMapCodeUnitToChar(&text, &sp50, &sp4c, font1, &prevchar); + text_map_code_unit_to_char(&text, &sp50, &sp4c, font1, &prevchar); tmp = font2->kerning[sp4c->kerningindex * 13 + sp50->kerningindex] + var8007fac4 - 1; *textwidth = *textwidth + sp50->width - tmp; @@ -2669,7 +2669,7 @@ bool func0f157768jf(s32 arg0, s32 arg1) #if MATCHING && VERSION >= VERSION_JPN_FINAL GLOBAL_ASM( -glabel textWrap +glabel text_wrap /* f157778: 27bdff48 */ addiu $sp,$sp,-184 /* f15777c: afbe0040 */ sw $s8,0x40($sp) /* f157780: afb3002c */ sw $s3,0x2c($sp) @@ -2846,7 +2846,7 @@ glabel textWrap /* f1579d0: 27a400a4 */ addiu $a0,$sp,0xa4 /* f1579d4: 27a500a8 */ addiu $a1,$sp,0xa8 /* f1579d8: 27a60074 */ addiu $a2,$sp,0x74 -/* f1579dc: 0fc55d49 */ jal textMeasure +/* f1579dc: 0fc55d49 */ jal text_measure /* f1579e0: afac0010 */ sw $t4,0x10($sp) /* f1579e4: 8fad00b4 */ lw $t5,0xb4($sp) /* f1579e8: 8fae00a8 */ lw $t6,0xa8($sp) @@ -3003,7 +3003,7 @@ glabel textWrap /* f157bf4: 27bd00b8 */ addiu $sp,$sp,0xb8 ); #else -void textWrap(s32 wrapwidth, char *src, char *dst, struct fontchar *chars, struct font *font) +void text_wrap(s32 wrapwidth, char *src, char *dst, struct fontchar *chars, struct font *font) { #if VERSION >= VERSION_JPN_FINAL // JPN mismatch: Regalloc for sp94 @@ -3123,7 +3123,7 @@ void textWrap(s32 wrapwidth, char *src, char *dst, struct fontchar *chars, struc curword[wordlen] = '\0'; - textMeasure(&wordheight, &wordwidth, curword, chars, font, 0); + text_measure(&wordheight, &wordwidth, curword, chars, font, 0); curlinewidth += wordwidth; @@ -3247,7 +3247,7 @@ void textWrap(s32 wrapwidth, char *src, char *dst, struct fontchar *chars, struc curword[wordlen] = '\0'; - textMeasure(&wordheight, &wordwidth, curword, chars, font, 0); + text_measure(&wordheight, &wordwidth, curword, chars, font, 0); curlinewidth += wordwidth; diff --git a/src/game/game_175f90.c b/src/game/game_175f90.c index e8f400d6d..413866192 100644 --- a/src/game/game_175f90.c +++ b/src/game/game_175f90.c @@ -15,12 +15,12 @@ void func0f175f90(void) void func0f175f98(void) { func0f167330(); - mempResetPool(MEMPOOL_5); - filesStop(5); + memp_reset_pool(MEMPOOL_5); + files_stop(5); } void func0f175fc8(void) { - mempDisablePool(MEMPOOL_5); - filesStop(5); + memp_disable_pool(MEMPOOL_5); + files_stop(5); } diff --git a/src/game/gamefile.c b/src/game/gamefile.c index 992cf95ad..43e292adc 100644 --- a/src/game/gamefile.c +++ b/src/game/gamefile.c @@ -21,126 +21,126 @@ #include "data.h" #include "types.h" -u8 *gamefileGetFlags(void) +u8 *gamefile_get_flags(void) { return g_GameFile.flags; } -void gamefileSetFlag(u32 value) +void gamefile_set_flag(u32 value) { - pakSetBitflag(value, g_GameFile.flags, true); + pak_set_bitflag(value, g_GameFile.flags, true); } -void gamefileUnsetFlag(u32 value) +void gamefile_unset_flag(u32 value) { - pakSetBitflag(value, g_GameFile.flags, false); + pak_set_bitflag(value, g_GameFile.flags, false); } -u32 gamefileHasFlag(u32 value) +u32 gamefile_has_flag(u32 value) { - return pakHasBitflag(value, g_GameFile.flags); + return pak_has_bitflag(value, g_GameFile.flags); } -void gamefilePrintFlags(void) +void gamefile_print_flags(void) { s32 i; for (i = 0x23; i != 0x4f; i++) { osSyncPrintf("Flag %d = %s", i, - pakHasBitflag(i, g_GameFile.flags) ? "TRUE" : "FALSE"); + pak_has_bitflag(i, g_GameFile.flags) ? "TRUE" : "FALSE"); } } -void gamefileApplyOptions(struct gamefile *file) +void gamefile_apply_options(struct gamefile *file) { s32 player1 = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? 0 : 4; s32 player2 = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? 1 : 5; - optionsSetForwardPitch(player1, pakHasBitflag(GAMEFILEFLAG_P1_FORWARDPITCH, file->flags)); - optionsSetAutoAim(player1, pakHasBitflag(GAMEFILEFLAG_P1_AUTOAIM, file->flags)); - optionsSetAimControl(player1, pakHasBitflag(GAMEFILEFLAG_P1_AIMCONTROL, file->flags)); - optionsSetSightOnScreen(player1, pakHasBitflag(GAMEFILEFLAG_P1_SIGHTONSCREEN, file->flags)); - optionsSetLookAhead(player1, pakHasBitflag(GAMEFILEFLAG_P1_LOOKAHEAD, file->flags)); - optionsSetAmmoOnScreen(player1, pakHasBitflag(GAMEFILEFLAG_P1_AMMOONSCREEN, file->flags)); - optionsSetHeadRoll(player1, pakHasBitflag(GAMEFILEFLAG_P1_HEADROLL, file->flags)); - optionsSetShowGunFunction(player1, pakHasBitflag(GAMEFILEFLAG_P1_SHOWGUNFUNCTION, file->flags)); - optionsSetAlwaysShowTarget(player1, pakHasBitflag(GAMEFILEFLAG_P1_ALWAYSSHOWTARGET, file->flags)); - optionsSetShowZoomRange(player1, pakHasBitflag(GAMEFILEFLAG_P1_SHOWZOOMRANGE, file->flags)); - optionsSetShowMissionTime(player1, pakHasBitflag(GAMEFILEFLAG_P1_SHOWMISSIONTIME, file->flags)); - optionsSetPaintball(player1, pakHasBitflag(GAMEFILEFLAG_P1_PAINTBALL, file->flags)); + options_set_forward_pitch(player1, pak_has_bitflag(GAMEFILEFLAG_P1_FORWARDPITCH, file->flags)); + options_set_auto_aim(player1, pak_has_bitflag(GAMEFILEFLAG_P1_AUTOAIM, file->flags)); + options_set_aim_control(player1, pak_has_bitflag(GAMEFILEFLAG_P1_AIMCONTROL, file->flags)); + options_set_sight_on_screen(player1, pak_has_bitflag(GAMEFILEFLAG_P1_SIGHTONSCREEN, file->flags)); + options_set_look_ahead(player1, pak_has_bitflag(GAMEFILEFLAG_P1_LOOKAHEAD, file->flags)); + options_set_ammo_on_screen(player1, pak_has_bitflag(GAMEFILEFLAG_P1_AMMOONSCREEN, file->flags)); + options_set_head_roll(player1, pak_has_bitflag(GAMEFILEFLAG_P1_HEADROLL, file->flags)); + options_set_show_gun_function(player1, pak_has_bitflag(GAMEFILEFLAG_P1_SHOWGUNFUNCTION, file->flags)); + options_set_always_show_target(player1, pak_has_bitflag(GAMEFILEFLAG_P1_ALWAYSSHOWTARGET, file->flags)); + options_set_show_zoom_range(player1, pak_has_bitflag(GAMEFILEFLAG_P1_SHOWZOOMRANGE, file->flags)); + options_set_show_mission_time(player1, pak_has_bitflag(GAMEFILEFLAG_P1_SHOWMISSIONTIME, file->flags)); + options_set_paintball(player1, pak_has_bitflag(GAMEFILEFLAG_P1_PAINTBALL, file->flags)); - optionsSetForwardPitch(player2, pakHasBitflag(GAMEFILEFLAG_P2_FORWARDPITCH, file->flags)); - optionsSetAutoAim(player2, pakHasBitflag(GAMEFILEFLAG_P2_AUTOAIM, file->flags)); - optionsSetAimControl(player2, pakHasBitflag(GAMEFILEFLAG_P2_AIMCONTROL, file->flags)); - optionsSetSightOnScreen(player2, pakHasBitflag(GAMEFILEFLAG_P2_SIGHTONSCREEN, file->flags)); - optionsSetLookAhead(player2, pakHasBitflag(GAMEFILEFLAG_P2_LOOKAHEAD, file->flags)); - optionsSetAmmoOnScreen(player2, pakHasBitflag(GAMEFILEFLAG_P2_AMMOONSCREEN, file->flags)); - optionsSetHeadRoll(player2, pakHasBitflag(GAMEFILEFLAG_P2_HEADROLL, file->flags)); - optionsSetShowGunFunction(player2, pakHasBitflag(GAMEFILEFLAG_P2_SHOWGUNFUNCTION, file->flags)); - optionsSetAlwaysShowTarget(player2, pakHasBitflag(GAMEFILEFLAG_P2_ALWAYSSHOWTARGET, file->flags)); - optionsSetShowZoomRange(player2, pakHasBitflag(GAMEFILEFLAG_P2_SHOWZOOMRANGE, file->flags)); - optionsSetShowMissionTime(player2, pakHasBitflag(GAMEFILEFLAG_P2_SHOWMISSIONTIME, file->flags)); - optionsSetPaintball(player2, pakHasBitflag(GAMEFILEFLAG_P2_PAINTBALL, file->flags)); + options_set_forward_pitch(player2, pak_has_bitflag(GAMEFILEFLAG_P2_FORWARDPITCH, file->flags)); + options_set_auto_aim(player2, pak_has_bitflag(GAMEFILEFLAG_P2_AUTOAIM, file->flags)); + options_set_aim_control(player2, pak_has_bitflag(GAMEFILEFLAG_P2_AIMCONTROL, file->flags)); + options_set_sight_on_screen(player2, pak_has_bitflag(GAMEFILEFLAG_P2_SIGHTONSCREEN, file->flags)); + options_set_look_ahead(player2, pak_has_bitflag(GAMEFILEFLAG_P2_LOOKAHEAD, file->flags)); + options_set_ammo_on_screen(player2, pak_has_bitflag(GAMEFILEFLAG_P2_AMMOONSCREEN, file->flags)); + options_set_head_roll(player2, pak_has_bitflag(GAMEFILEFLAG_P2_HEADROLL, file->flags)); + options_set_show_gun_function(player2, pak_has_bitflag(GAMEFILEFLAG_P2_SHOWGUNFUNCTION, file->flags)); + options_set_always_show_target(player2, pak_has_bitflag(GAMEFILEFLAG_P2_ALWAYSSHOWTARGET, file->flags)); + options_set_show_zoom_range(player2, pak_has_bitflag(GAMEFILEFLAG_P2_SHOWZOOMRANGE, file->flags)); + options_set_show_mission_time(player2, pak_has_bitflag(GAMEFILEFLAG_P2_SHOWMISSIONTIME, file->flags)); + options_set_paintball(player2, pak_has_bitflag(GAMEFILEFLAG_P2_PAINTBALL, file->flags)); - optionsSetInGameSubtitles(pakHasBitflag(GAMEFILEFLAG_INGAMESUBTITLES, file->flags)); - optionsSetCutsceneSubtitles(pakHasBitflag(GAMEFILEFLAG_CUTSCENESUBTITLES, file->flags)); + options_set_in_game_subtitles(pak_has_bitflag(GAMEFILEFLAG_INGAMESUBTITLES, file->flags)); + options_set_cutscene_subtitles(pak_has_bitflag(GAMEFILEFLAG_CUTSCENESUBTITLES, file->flags)); // Duplicate - optionsSetPaintball(player2, pakHasBitflag(GAMEFILEFLAG_P2_PAINTBALL, file->flags)); + options_set_paintball(player2, pak_has_bitflag(GAMEFILEFLAG_P2_PAINTBALL, file->flags)); - g_Vars.langfilteron = pakHasBitflag(GAMEFILEFLAG_LANGFILTERON, file->flags); + g_Vars.langfilteron = pak_has_bitflag(GAMEFILEFLAG_LANGFILTERON, file->flags); - if (pakHasBitflag(GAMEFILEFLAG_HIRES, file->flags)) { + if (pak_has_bitflag(GAMEFILEFLAG_HIRES, file->flags)) { if (IS4MB()) { - playerSetHiResEnabled(false); + player_set_hi_res_enabled(false); } else { - playerSetHiResEnabled(true); + player_set_hi_res_enabled(true); } } else { - playerSetHiResEnabled(false); + player_set_hi_res_enabled(false); } if (IS4MB()) { - optionsSetScreenSplit(SCREENSPLIT_HORIZONTAL); - optionsSetScreenRatio(SCREENRATIO_NORMAL); + options_set_screen_split(SCREENSPLIT_HORIZONTAL); + options_set_screen_ratio(SCREENRATIO_NORMAL); } else { - optionsSetScreenSplit(pakHasBitflag(GAMEFILEFLAG_SCREENSPLIT, file->flags)); - optionsSetScreenRatio(pakHasBitflag(GAMEFILEFLAG_SCREENRATIO, file->flags)); + options_set_screen_split(pak_has_bitflag(GAMEFILEFLAG_SCREENSPLIT, file->flags)); + options_set_screen_ratio(pak_has_bitflag(GAMEFILEFLAG_SCREENRATIO, file->flags)); } - if (pakHasBitflag(GAMEFILEFLAG_SCREENSIZE_CINEMA, file->flags)) { - optionsSetScreenSize(SCREENSIZE_CINEMA); - } else if (pakHasBitflag(GAMEFILEFLAG_SCREENSIZE_WIDE, file->flags)) { - optionsSetScreenSize(SCREENSIZE_WIDE); + if (pak_has_bitflag(GAMEFILEFLAG_SCREENSIZE_CINEMA, file->flags)) { + options_set_screen_size(SCREENSIZE_CINEMA); + } else if (pak_has_bitflag(GAMEFILEFLAG_SCREENSIZE_WIDE, file->flags)) { + options_set_screen_size(SCREENSIZE_WIDE); } else { - optionsSetScreenSize(SCREENSIZE_FULL); + options_set_screen_size(SCREENSIZE_FULL); } - g_Vars.pendingantiplayernum = pakHasBitflag(GAMEFILEFLAG_ANTIPLAYERNUM, file->flags) ? 1 : 0; - g_Vars.coopradaron = pakHasBitflag(GAMEFILEFLAG_COOPRADARON, file->flags) ? true : false; - g_Vars.coopfriendlyfire = pakHasBitflag(GAMEFILEFLAG_COOPFRIENDLYFIRE, file->flags) ? true : false; - g_Vars.antiradaron = pakHasBitflag(GAMEFILEFLAG_ANTIRADARON, file->flags) ? true : false; + g_Vars.pendingantiplayernum = pak_has_bitflag(GAMEFILEFLAG_ANTIPLAYERNUM, file->flags) ? 1 : 0; + g_Vars.coopradaron = pak_has_bitflag(GAMEFILEFLAG_COOPRADARON, file->flags) ? true : false; + g_Vars.coopfriendlyfire = pak_has_bitflag(GAMEFILEFLAG_COOPFRIENDLYFIRE, file->flags) ? true : false; + g_Vars.antiradaron = pak_has_bitflag(GAMEFILEFLAG_ANTIRADARON, file->flags) ? true : false; #if VERSION >= VERSION_PAL_BETA g_Vars.language = 0; - if (pakHasBitflag(GAMEFILEFLAG_LANGBIT1, file->flags)) { + if (pak_has_bitflag(GAMEFILEFLAG_LANGBIT1, file->flags)) { g_Vars.language |= 0x01; } - if (pakHasBitflag(GAMEFILEFLAG_LANGBIT2, file->flags)) { + if (pak_has_bitflag(GAMEFILEFLAG_LANGBIT2, file->flags)) { g_Vars.language |= 0x02; } - if (pakHasBitflag(GAMEFILEFLAG_LANGBIT3, file->flags)) { + if (pak_has_bitflag(GAMEFILEFLAG_LANGBIT3, file->flags)) { g_Vars.language |= 0x04; } - langSetEuropean(g_Vars.language); + lang_set_european(g_Vars.language); #endif } -void gamefileLoadDefaults(struct gamefile *file) +void gamefile_load_defaults(struct gamefile *file) { s32 player1 = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? 0 : 4; s32 player2 = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? 1 : 5; @@ -153,74 +153,74 @@ void gamefileLoadDefaults(struct gamefile *file) file->autostageindex = 0; file->totaltime = 0; #if VERSION >= VERSION_NTSC_1_0 - sndSetSfxVolume(0x5000); - optionsSetMusicVolume(0x5000); + snd_set_sfx_volume(0x5000); + options_set_music_volume(0x5000); #else - sndSetSfxVolume(0x7f80); - optionsSetMusicVolume(0x7f80); + snd_set_sfx_volume(0x7f80); + options_set_music_volume(0x7f80); #endif - sndSetSoundMode(SOUNDMODE_STEREO); - optionsSetControlMode(player1, CONTROLMODE_11); - optionsSetControlMode(player2, CONTROLMODE_11); - pakClearAllBitflags(file->flags); + snd_set_sound_mode(SOUNDMODE_STEREO); + options_set_control_mode(player1, CONTROLMODE_11); + options_set_control_mode(player2, CONTROLMODE_11); + pak_clear_all_bitflags(file->flags); - pakSetBitflag(GAMEFILEFLAG_P1_FORWARDPITCH, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_P1_AUTOAIM, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P1_AIMCONTROL, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_P1_SIGHTONSCREEN, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P1_LOOKAHEAD, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P1_AMMOONSCREEN, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P1_HEADROLL, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P1_SHOWGUNFUNCTION, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_INGAMESUBTITLES, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P1_ALWAYSSHOWTARGET, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P1_SHOWZOOMRANGE, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P1_SHOWMISSIONTIME, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_P1_PAINTBALL, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_P1_FORWARDPITCH, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_P1_AUTOAIM, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P1_AIMCONTROL, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_P1_SIGHTONSCREEN, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P1_LOOKAHEAD, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P1_AMMOONSCREEN, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P1_HEADROLL, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P1_SHOWGUNFUNCTION, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_INGAMESUBTITLES, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P1_ALWAYSSHOWTARGET, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P1_SHOWZOOMRANGE, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P1_SHOWMISSIONTIME, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_P1_PAINTBALL, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_P2_FORWARDPITCH, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_P2_AUTOAIM, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P2_AIMCONTROL, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_P2_SIGHTONSCREEN, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P2_LOOKAHEAD, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P2_AMMOONSCREEN, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P2_HEADROLL, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P2_SHOWGUNFUNCTION, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P2_FORWARDPITCH, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_P2_AUTOAIM, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P2_AIMCONTROL, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_P2_SIGHTONSCREEN, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P2_LOOKAHEAD, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P2_AMMOONSCREEN, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P2_HEADROLL, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P2_SHOWGUNFUNCTION, file->flags, true); #if VERSION >= VERSION_JPN_FINAL - pakSetBitflag(GAMEFILEFLAG_CUTSCENESUBTITLES, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_CUTSCENESUBTITLES, file->flags, true); #else - pakSetBitflag(GAMEFILEFLAG_CUTSCENESUBTITLES, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_CUTSCENESUBTITLES, file->flags, false); #endif - pakSetBitflag(GAMEFILEFLAG_P2_ALWAYSSHOWTARGET, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P2_SHOWZOOMRANGE, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_P2_SHOWMISSIONTIME, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_P2_PAINTBALL, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_P2_ALWAYSSHOWTARGET, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P2_SHOWZOOMRANGE, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_P2_SHOWMISSIONTIME, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_P2_PAINTBALL, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_SCREENSPLIT, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_SCREENRATIO, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_SCREENSIZE_CINEMA, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_SCREENSIZE_WIDE, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_SCREENSPLIT, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_SCREENRATIO, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_SCREENSIZE_CINEMA, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_SCREENSIZE_WIDE, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_HIRES, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_LANGFILTERON, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_HIRES, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_LANGFILTERON, file->flags, false); #if VERSION >= VERSION_NTSC_1_0 - pakSetBitflag(GAMEFILEFLAG_FOUNDTIMEDMINE, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_FOUNDPROXYMINE, file->flags, false); - pakSetBitflag(GAMEFILEFLAG_FOUNDREMOTEMINE, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_FOUNDTIMEDMINE, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_FOUNDPROXYMINE, file->flags, false); + pak_set_bitflag(GAMEFILEFLAG_FOUNDREMOTEMINE, file->flags, false); #endif - pakSetBitflag(GAMEFILEFLAG_COOPRADARON, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_COOPFRIENDLYFIRE, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_ANTIRADARON, file->flags, true); - pakSetBitflag(GAMEFILEFLAG_ANTIPLAYERNUM, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_COOPRADARON, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_COOPFRIENDLYFIRE, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_ANTIRADARON, file->flags, true); + pak_set_bitflag(GAMEFILEFLAG_ANTIPLAYERNUM, file->flags, true); #if VERSION >= VERSION_PAL_BETA - pakSetBitflag(GAMEFILEFLAG_LANGBIT1, g_GameFile.flags, ((g_Vars.language & 0x01) == 0x01)); - pakSetBitflag(GAMEFILEFLAG_LANGBIT2, g_GameFile.flags, ((g_Vars.language & 0x02) == 0x02)); - pakSetBitflag(GAMEFILEFLAG_LANGBIT3, g_GameFile.flags, ((g_Vars.language & 0x04) == 0x04)); + pak_set_bitflag(GAMEFILEFLAG_LANGBIT1, g_GameFile.flags, ((g_Vars.language & 0x01) == 0x01)); + pak_set_bitflag(GAMEFILEFLAG_LANGBIT2, g_GameFile.flags, ((g_Vars.language & 0x02) == 0x02)); + pak_set_bitflag(GAMEFILEFLAG_LANGBIT3, g_GameFile.flags, ((g_Vars.language & 0x04) == 0x04)); #endif file->unk1e = 0; @@ -233,11 +233,11 @@ void gamefileLoadDefaults(struct gamefile *file) for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { for (j = 1; j < MAX_PLAYERS + 1; j++) { - challengeSetCompletedByAnyPlayerWithNumPlayers(i, j, false); + challenge_set_completed_by_any_player_with_num_players(i, j, false); } } - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); for (i = 0; i < ARRAYCOUNT(g_GameFile.coopcompletions); i++) { g_GameFile.coopcompletions[i] = 0; @@ -256,7 +256,7 @@ void gamefileLoadDefaults(struct gamefile *file) g_GameFile.weaponsfound[i] = 0; } - gamefileApplyOptions(file); + gamefile_apply_options(file); } const char var7f1b38e8[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)"; @@ -266,7 +266,7 @@ const char var7f1b395c[] = "pdoptions.c"; const char var7f1b3968[] = "MAX_FUDGE_DATA_SIZE>=sizeof(PakFileTypeGameSetup_s)"; const char var7f1b399c[] = "pdoptions.c"; -s32 gamefileLoad(s32 device) +s32 gamefile_load(s32 device) { s32 p1index; s32 p2index; @@ -281,87 +281,87 @@ s32 gamefileLoad(s32 device) p2index = g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0 ? 1 : 5; if (device >= 0) { - savebufferClear(&buffer); - ret = pakReadBodyAtGuid(device, g_GameFileGuid.fileid, buffer.bytes, 0); + savebuffer_clear(&buffer); + ret = pak_read_body_at_guid(device, g_GameFileGuid.fileid, buffer.bytes, 0); g_FilemgrLastPakError = ret; if (ret == 0) { - cheatsInit(); - savebufferReadString(&buffer, g_GameFile.name, 0); - g_GameFile.thumbnail = savebufferReadBits(&buffer, 5); - g_GameFile.totaltime = savebufferReadBits(&buffer, 32); - g_GameFile.autodifficulty = savebufferReadBits(&buffer, 2); - g_GameFile.autostageindex = savebufferReadBits(&buffer, 5); + cheats_init(); + savebuffer_read_string(&buffer, g_GameFile.name, 0); + g_GameFile.thumbnail = savebuffer_read_bits(&buffer, 5); + g_GameFile.totaltime = savebuffer_read_bits(&buffer, 32); + g_GameFile.autodifficulty = savebuffer_read_bits(&buffer, 2); + g_GameFile.autostageindex = savebuffer_read_bits(&buffer, 5); - volume = savebufferReadBits(&buffer, 6) * 4; + volume = savebuffer_read_bits(&buffer, 6) * 4; if (volume >= 252) { volume = 255; } - sndSetSfxVolume((volume & 0x1ff) * 128); + snd_set_sfx_volume((volume & 0x1ff) * 128); - volume = savebufferReadBits(&buffer, 6) * 4; + volume = savebuffer_read_bits(&buffer, 6) * 4; if (volume >= 252) { volume = 255; } - optionsSetMusicVolume((volume & 0x1ff) * 128); + options_set_music_volume((volume & 0x1ff) * 128); - sndSetSoundMode(savebufferReadBits(&buffer, 2)); - optionsSetControlMode(p1index, savebufferReadBits(&buffer, 3)); - optionsSetControlMode(p2index, savebufferReadBits(&buffer, 3)); + snd_set_sound_mode(savebuffer_read_bits(&buffer, 2)); + options_set_control_mode(p1index, savebuffer_read_bits(&buffer, 3)); + options_set_control_mode(p2index, savebuffer_read_bits(&buffer, 3)); for (i = 0; i < ARRAYCOUNT(g_GameFile.flags); i++) { - g_GameFile.flags[i] = savebufferReadBits(&buffer, 8); + g_GameFile.flags[i] = savebuffer_read_bits(&buffer, 8); } - g_GameFile.unk1e = savebufferReadBits(&buffer, 16); + g_GameFile.unk1e = savebuffer_read_bits(&buffer, 16); for (i = 0; i < ARRAYCOUNT(g_GameFile.besttimes); i++) { for (j = 0; j < ARRAYCOUNT(g_GameFile.besttimes[i]); j++) { - g_GameFile.besttimes[i][j] = savebufferReadBits(&buffer, 12); + g_GameFile.besttimes[i][j] = savebuffer_read_bits(&buffer, 12); } } for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { for (j = 1; j < MAX_PLAYERS + 1; j++) { - challengeSetCompletedByAnyPlayerWithNumPlayers(i, j, savebufferReadBits(&buffer, 1)); + challenge_set_completed_by_any_player_with_num_players(i, j, savebuffer_read_bits(&buffer, 1)); } } - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); for (i = 0; i < ARRAYCOUNT(g_GameFile.coopcompletions); i++) { - g_GameFile.coopcompletions[i] = savebufferReadBits(&buffer, NUM_SOLOSTAGES); + g_GameFile.coopcompletions[i] = savebuffer_read_bits(&buffer, NUM_SOLOSTAGES); } for (i = 0; i < ARRAYCOUNT(g_GameFile.firingrangescores); i++) { s32 numbits = i == ARRAYCOUNT(g_GameFile.firingrangescores) - 1 ? 2 : 8; - g_GameFile.firingrangescores[i] = savebufferReadBits(&buffer, numbits); + g_GameFile.firingrangescores[i] = savebuffer_read_bits(&buffer, numbits); } for (i = 0; i < 4; i++) { - g_GameFile.weaponsfound[i] = savebufferReadBits(&buffer, 8); + g_GameFile.weaponsfound[i] = savebuffer_read_bits(&buffer, 8); } #if VERSION >= VERSION_NTSC_1_0 - if (pakHasBitflag(GAMEFILEFLAG_FOUNDTIMEDMINE, g_GameFile.flags)) { - frSetWeaponFound(WEAPON_TIMEDMINE); + if (pak_has_bitflag(GAMEFILEFLAG_FOUNDTIMEDMINE, g_GameFile.flags)) { + fr_set_weapon_found(WEAPON_TIMEDMINE); } - if (pakHasBitflag(GAMEFILEFLAG_FOUNDPROXYMINE, g_GameFile.flags)) { - frSetWeaponFound(WEAPON_PROXIMITYMINE); + if (pak_has_bitflag(GAMEFILEFLAG_FOUNDPROXYMINE, g_GameFile.flags)) { + fr_set_weapon_found(WEAPON_PROXIMITYMINE); } - if (pakHasBitflag(GAMEFILEFLAG_FOUNDREMOTEMINE, g_GameFile.flags)) { - frSetWeaponFound(WEAPON_REMOTEMINE); + if (pak_has_bitflag(GAMEFILEFLAG_FOUNDREMOTEMINE, g_GameFile.flags)) { + fr_set_weapon_found(WEAPON_REMOTEMINE); } #endif func0f0d54c4(&buffer); - gamefileApplyOptions(&g_GameFile); + gamefile_apply_options(&g_GameFile); return 0; } @@ -372,7 +372,7 @@ s32 gamefileLoad(s32 device) return -1; } -s32 gamefileSave(s32 device, s32 fileid, u16 deviceserial) +s32 gamefile_save(s32 device, s32 fileid, u16 deviceserial) { u32 value; s32 newfileid; @@ -388,58 +388,58 @@ s32 gamefileSave(s32 device, s32 fileid, u16 deviceserial) var80075bd0[0] = 1; - pakSetBitflag(GAMEFILEFLAG_P1_FORWARDPITCH, g_GameFile.flags, optionsGetForwardPitch(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_AUTOAIM, g_GameFile.flags, optionsGetAutoAim(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_AIMCONTROL, g_GameFile.flags, optionsGetAimControl(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_SIGHTONSCREEN, g_GameFile.flags, optionsGetSightOnScreen(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_LOOKAHEAD, g_GameFile.flags, optionsGetLookAhead(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_AMMOONSCREEN, g_GameFile.flags, optionsGetAmmoOnScreen(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_HEADROLL, g_GameFile.flags, optionsGetHeadRoll(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_SHOWGUNFUNCTION, g_GameFile.flags, optionsGetShowGunFunction(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_ALWAYSSHOWTARGET, g_GameFile.flags, optionsGetAlwaysShowTarget(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_SHOWZOOMRANGE, g_GameFile.flags, optionsGetShowZoomRange(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_SHOWMISSIONTIME, g_GameFile.flags, optionsGetShowMissionTime(p1index)); - pakSetBitflag(GAMEFILEFLAG_P1_PAINTBALL, g_GameFile.flags, optionsGetPaintball(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_FORWARDPITCH, g_GameFile.flags, options_get_forward_pitch(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_AUTOAIM, g_GameFile.flags, options_get_auto_aim(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_AIMCONTROL, g_GameFile.flags, options_get_aim_control(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_SIGHTONSCREEN, g_GameFile.flags, options_get_sight_on_screen(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_LOOKAHEAD, g_GameFile.flags, options_get_look_ahead(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_AMMOONSCREEN, g_GameFile.flags, options_get_ammo_on_screen(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_HEADROLL, g_GameFile.flags, options_get_head_roll(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_SHOWGUNFUNCTION, g_GameFile.flags, options_get_show_gun_function(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_ALWAYSSHOWTARGET, g_GameFile.flags, options_get_always_show_target(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_SHOWZOOMRANGE, g_GameFile.flags, options_get_show_zoom_range(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_SHOWMISSIONTIME, g_GameFile.flags, options_get_show_mission_time(p1index)); + pak_set_bitflag(GAMEFILEFLAG_P1_PAINTBALL, g_GameFile.flags, options_get_paintball(p1index)); - pakSetBitflag(GAMEFILEFLAG_P2_FORWARDPITCH, g_GameFile.flags, optionsGetForwardPitch(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_AUTOAIM, g_GameFile.flags, optionsGetAutoAim(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_AIMCONTROL, g_GameFile.flags, optionsGetAimControl(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_SIGHTONSCREEN, g_GameFile.flags, optionsGetSightOnScreen(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_LOOKAHEAD, g_GameFile.flags, optionsGetLookAhead(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_AMMOONSCREEN, g_GameFile.flags, optionsGetAmmoOnScreen(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_HEADROLL, g_GameFile.flags, optionsGetHeadRoll(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_SHOWGUNFUNCTION, g_GameFile.flags, optionsGetShowGunFunction(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_ALWAYSSHOWTARGET, g_GameFile.flags, optionsGetAlwaysShowTarget(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_SHOWZOOMRANGE, g_GameFile.flags, optionsGetShowZoomRange(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_SHOWMISSIONTIME, g_GameFile.flags, optionsGetShowMissionTime(p2index)); - pakSetBitflag(GAMEFILEFLAG_P2_PAINTBALL, g_GameFile.flags, optionsGetPaintball(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_FORWARDPITCH, g_GameFile.flags, options_get_forward_pitch(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_AUTOAIM, g_GameFile.flags, options_get_auto_aim(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_AIMCONTROL, g_GameFile.flags, options_get_aim_control(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_SIGHTONSCREEN, g_GameFile.flags, options_get_sight_on_screen(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_LOOKAHEAD, g_GameFile.flags, options_get_look_ahead(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_AMMOONSCREEN, g_GameFile.flags, options_get_ammo_on_screen(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_HEADROLL, g_GameFile.flags, options_get_head_roll(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_SHOWGUNFUNCTION, g_GameFile.flags, options_get_show_gun_function(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_ALWAYSSHOWTARGET, g_GameFile.flags, options_get_always_show_target(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_SHOWZOOMRANGE, g_GameFile.flags, options_get_show_zoom_range(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_SHOWMISSIONTIME, g_GameFile.flags, options_get_show_mission_time(p2index)); + pak_set_bitflag(GAMEFILEFLAG_P2_PAINTBALL, g_GameFile.flags, options_get_paintball(p2index)); - pakSetBitflag(GAMEFILEFLAG_SCREENSPLIT, g_GameFile.flags, optionsGetScreenSplit()); - pakSetBitflag(GAMEFILEFLAG_SCREENRATIO, g_GameFile.flags, optionsGetScreenRatio()); + pak_set_bitflag(GAMEFILEFLAG_SCREENSPLIT, g_GameFile.flags, options_get_screen_split()); + pak_set_bitflag(GAMEFILEFLAG_SCREENRATIO, g_GameFile.flags, options_get_screen_ratio()); #if VERSION >= VERSION_NTSC_1_0 - pakSetBitflag(GAMEFILEFLAG_SCREENSIZE_WIDE, g_GameFile.flags, optionsGetScreenSize() == SCREENSIZE_WIDE); - pakSetBitflag(GAMEFILEFLAG_SCREENSIZE_CINEMA, g_GameFile.flags, optionsGetScreenSize() == SCREENSIZE_CINEMA); + pak_set_bitflag(GAMEFILEFLAG_SCREENSIZE_WIDE, g_GameFile.flags, options_get_screen_size() == SCREENSIZE_WIDE); + pak_set_bitflag(GAMEFILEFLAG_SCREENSIZE_CINEMA, g_GameFile.flags, options_get_screen_size() == SCREENSIZE_CINEMA); #else - pakSetBitflag(GAMEFILEFLAG_SCREENSIZE_WIDE, g_GameFile.flags, optionsGetEffectiveScreenSize() == SCREENSIZE_WIDE); - pakSetBitflag(GAMEFILEFLAG_SCREENSIZE_CINEMA, g_GameFile.flags, optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA); + pak_set_bitflag(GAMEFILEFLAG_SCREENSIZE_WIDE, g_GameFile.flags, options_get_effective_screen_size() == SCREENSIZE_WIDE); + pak_set_bitflag(GAMEFILEFLAG_SCREENSIZE_CINEMA, g_GameFile.flags, options_get_effective_screen_size() == SCREENSIZE_CINEMA); #endif - pakSetBitflag(GAMEFILEFLAG_HIRES, g_GameFile.flags, g_ViRes == VIRES_HI); - pakSetBitflag(GAMEFILEFLAG_INGAMESUBTITLES, g_GameFile.flags, optionsGetInGameSubtitles()); - pakSetBitflag(GAMEFILEFLAG_CUTSCENESUBTITLES, g_GameFile.flags, optionsGetCutsceneSubtitles()); - pakSetBitflag(GAMEFILEFLAG_LANGFILTERON, g_GameFile.flags, g_Vars.langfilteron); + pak_set_bitflag(GAMEFILEFLAG_HIRES, g_GameFile.flags, g_ViRes == VIRES_HI); + pak_set_bitflag(GAMEFILEFLAG_INGAMESUBTITLES, g_GameFile.flags, options_get_in_game_subtitles()); + pak_set_bitflag(GAMEFILEFLAG_CUTSCENESUBTITLES, g_GameFile.flags, options_get_cutscene_subtitles()); + pak_set_bitflag(GAMEFILEFLAG_LANGFILTERON, g_GameFile.flags, g_Vars.langfilteron); #if VERSION >= VERSION_NTSC_1_0 - pakSetBitflag(GAMEFILEFLAG_FOUNDTIMEDMINE, g_GameFile.flags, frIsWeaponFound(WEAPON_TIMEDMINE)); - pakSetBitflag(GAMEFILEFLAG_FOUNDPROXYMINE, g_GameFile.flags, frIsWeaponFound(WEAPON_PROXIMITYMINE)); - pakSetBitflag(GAMEFILEFLAG_FOUNDREMOTEMINE, g_GameFile.flags, frIsWeaponFound(WEAPON_REMOTEMINE)); + pak_set_bitflag(GAMEFILEFLAG_FOUNDTIMEDMINE, g_GameFile.flags, fr_is_weapon_found(WEAPON_TIMEDMINE)); + pak_set_bitflag(GAMEFILEFLAG_FOUNDPROXYMINE, g_GameFile.flags, fr_is_weapon_found(WEAPON_PROXIMITYMINE)); + pak_set_bitflag(GAMEFILEFLAG_FOUNDREMOTEMINE, g_GameFile.flags, fr_is_weapon_found(WEAPON_REMOTEMINE)); #endif #if VERSION >= VERSION_NTSC_1_0 - switch (optionsGetScreenSize()) + switch (options_get_screen_size()) #else - switch (optionsGetEffectiveScreenSize()) + switch (options_get_effective_screen_size()) #endif { case SCREENSIZE_FULL: @@ -450,71 +450,71 @@ s32 gamefileSave(s32 device, s32 fileid, u16 deviceserial) break; } - pakSetBitflag(GAMEFILEFLAG_ANTIPLAYERNUM, g_GameFile.flags, g_Vars.pendingantiplayernum == 1); - pakSetBitflag(GAMEFILEFLAG_COOPRADARON, g_GameFile.flags, g_Vars.coopradaron == true); - pakSetBitflag(GAMEFILEFLAG_COOPFRIENDLYFIRE, g_GameFile.flags, g_Vars.coopfriendlyfire == true); - pakSetBitflag(GAMEFILEFLAG_ANTIRADARON, g_GameFile.flags, g_Vars.antiradaron == true); + pak_set_bitflag(GAMEFILEFLAG_ANTIPLAYERNUM, g_GameFile.flags, g_Vars.pendingantiplayernum == 1); + pak_set_bitflag(GAMEFILEFLAG_COOPRADARON, g_GameFile.flags, g_Vars.coopradaron == true); + pak_set_bitflag(GAMEFILEFLAG_COOPFRIENDLYFIRE, g_GameFile.flags, g_Vars.coopfriendlyfire == true); + pak_set_bitflag(GAMEFILEFLAG_ANTIRADARON, g_GameFile.flags, g_Vars.antiradaron == true); #if VERSION >= VERSION_PAL_BETA - pakSetBitflag(GAMEFILEFLAG_LANGBIT1, g_GameFile.flags, (g_Vars.language & 0x01) == 0x01); - pakSetBitflag(GAMEFILEFLAG_LANGBIT2, g_GameFile.flags, (g_Vars.language & 0x02) == 0x02); - pakSetBitflag(GAMEFILEFLAG_LANGBIT3, g_GameFile.flags, (g_Vars.language & 0x04) == 0x04); + pak_set_bitflag(GAMEFILEFLAG_LANGBIT1, g_GameFile.flags, (g_Vars.language & 0x01) == 0x01); + pak_set_bitflag(GAMEFILEFLAG_LANGBIT2, g_GameFile.flags, (g_Vars.language & 0x02) == 0x02); + pak_set_bitflag(GAMEFILEFLAG_LANGBIT3, g_GameFile.flags, (g_Vars.language & 0x04) == 0x04); #endif if (device >= 0) { - savebufferClear(&buffer); + savebuffer_clear(&buffer); func0f0d55a4(&buffer, g_GameFile.name); - savebufferOr(&buffer, g_GameFile.thumbnail, 5); - savebufferOr(&buffer, g_GameFile.totaltime, 32); - savebufferOr(&buffer, g_GameFile.autodifficulty, 2); - savebufferOr(&buffer, g_GameFile.autostageindex, 5); + savebuffer_or(&buffer, g_GameFile.thumbnail, 5); + savebuffer_or(&buffer, g_GameFile.totaltime, 32); + savebuffer_or(&buffer, g_GameFile.autodifficulty, 2); + savebuffer_or(&buffer, g_GameFile.autostageindex, 5); value = VOLUME(g_SfxVolume) >> 7; - savebufferOr(&buffer, value >> 2, 6); + savebuffer_or(&buffer, value >> 2, 6); - value = optionsGetMusicVolume() >> 7; - savebufferOr(&buffer, value >> 2, 6); + value = options_get_music_volume() >> 7; + savebuffer_or(&buffer, value >> 2, 6); value = g_SoundMode; - savebufferOr(&buffer, value, 2); + savebuffer_or(&buffer, value, 2); - savebufferOr(&buffer, optionsGetControlMode(p1index), 3); - savebufferOr(&buffer, optionsGetControlMode(p2index), 3); + savebuffer_or(&buffer, options_get_control_mode(p1index), 3); + savebuffer_or(&buffer, options_get_control_mode(p2index), 3); for (i = 0; i < ARRAYCOUNT(g_GameFile.flags); i++) { - savebufferOr(&buffer, g_GameFile.flags[i], 8); + savebuffer_or(&buffer, g_GameFile.flags[i], 8); } - savebufferOr(&buffer, g_GameFile.unk1e, 16); + savebuffer_or(&buffer, g_GameFile.unk1e, 16); for (i = 0; i < ARRAYCOUNT(g_GameFile.besttimes); i++) { for (j = 0; j < ARRAYCOUNT(g_GameFile.besttimes[i]); j++) { - savebufferOr(&buffer, g_GameFile.besttimes[i][j], 12); + savebuffer_or(&buffer, g_GameFile.besttimes[i][j], 12); } } for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { for (j = 1; j < MAX_PLAYERS + 1; j++) { - savebufferOr(&buffer, challengeIsCompletedByAnyPlayerWithNumPlayers(i, j), 1); + savebuffer_or(&buffer, challenge_is_completed_by_any_player_with_num_players(i, j), 1); } } for (i = 0; i < ARRAYCOUNT(g_GameFile.coopcompletions); i++) { - savebufferOr(&buffer, g_GameFile.coopcompletions[i], NUM_SOLOSTAGES); + savebuffer_or(&buffer, g_GameFile.coopcompletions[i], NUM_SOLOSTAGES); } for (i = 0; i < ARRAYCOUNT(g_GameFile.firingrangescores); i++) { - savebufferOr(&buffer, g_GameFile.firingrangescores[i], i == 8 ? 2 : 8); + savebuffer_or(&buffer, g_GameFile.firingrangescores[i], i == 8 ? 2 : 8); } for (i = 0; i < 4; i++) { - savebufferOr(&buffer, g_GameFile.weaponsfound[i], 8); + savebuffer_or(&buffer, g_GameFile.weaponsfound[i], 8); } func0f0d54c4(&buffer); - ret = pakSaveAtGuid(device, fileid, PAKFILETYPE_GAME, buffer.bytes, &newfileid, 0); + ret = pak_save_at_guid(device, fileid, PAKFILETYPE_GAME, buffer.bytes, &newfileid, 0); g_FilemgrLastPakError = ret; if (ret == 0) { @@ -530,20 +530,20 @@ s32 gamefileSave(s32 device, s32 fileid, u16 deviceserial) return -1; } -void gamefileGetOverview(char *arg0, char *name, u8 *stage, u8 *difficulty, u32 *time) +void gamefile_get_overview(char *arg0, char *name, u8 *stage, u8 *difficulty, u32 *time) { struct savebuffer buffer; func0f0d5484(&buffer, arg0, 15); - savebufferReadString(&buffer, name, false); + savebuffer_read_string(&buffer, name, false); - *stage = savebufferReadBits(&buffer, 5); + *stage = savebuffer_read_bits(&buffer, 5); #if VERSION >= VERSION_NTSC_1_0 - *time = savebufferReadBits(&buffer, 32); + *time = savebuffer_read_bits(&buffer, 32); #else - *time = (u16) savebufferReadBits(&buffer, 32); + *time = (u16) savebuffer_read_bits(&buffer, 32); #endif - *difficulty = savebufferReadBits(&buffer, 2); + *difficulty = savebuffer_read_bits(&buffer, 2); } diff --git a/src/game/getitle.c b/src/game/getitle.c index ea6fbd136..9928c7776 100644 --- a/src/game/getitle.c +++ b/src/game/getitle.c @@ -63,11 +63,11 @@ Gfx *getitle0f0155f0(Gfx *gdl, s32 arg1, u8 arg2) gSPDisplayList(gdl++, &var80061360); if (var80062494) { - gdl = titleClear(gdl); + gdl = title_clear(gdl); var80062494 = 0; } else { gDPSetCycleType(gdl++, G_CYC_FILL); - gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetWidth(), osVirtualToPhysical(viGetBackBuffer())); + gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, vi_get_width(), osVirtualToPhysical(vi_get_back_buffer())); gDPSetFillColor(gdl++, 0x00010001); gDPFillRectangle(gdl++, 200, 100, 439, 379); } @@ -142,7 +142,7 @@ extern u8 _getitleSegmentRomStart; extern u8 _getitleSegmentStart; extern u8 _getitleSegmentEnd; -void getitleLoad(void *addr, u32 arg1) +void getitle_load(void *addr, u32 arg1) { u32 len = (romptr_t)&_getitleSegmentEnd - (romptr_t)&_getitleSegmentStart; @@ -152,10 +152,10 @@ void getitleLoad(void *addr, u32 arg1) var80062498 = 0; var8009cc90 = addr; - dmaExec(var8009cc90, (romptr_t) &_getitleSegmentRomStart, ALIGN64(len)); + dma_exec(var8009cc90, (romptr_t) &_getitleSegmentRomStart, ALIGN64(len)); } -Gfx *getitleRender(Gfx *gdl) +Gfx *getitle_render(Gfx *gdl) { var80062410 = 1 - var80062410; diff --git a/src/game/getitlereset.c b/src/game/getitlereset.c index 1b8ce95f3..2446a2784 100644 --- a/src/game/getitlereset.c +++ b/src/game/getitlereset.c @@ -7,10 +7,10 @@ #include "data.h" #include "types.h" -void getitleReset(void) +void getitle_reset(void) { var80062410 = 0; - var8009cc80 = mempAlloc(2 * sizeof(Mtx), MEMPOOL_STAGE); - var8009cc84 = mempAlloc(2 * sizeof(Mtx), MEMPOOL_STAGE); - var8009cc88 = mempAlloc(2 * sizeof(Mtx), MEMPOOL_STAGE); + var8009cc80 = memp_alloc(2 * sizeof(Mtx), MEMPOOL_STAGE); + var8009cc84 = memp_alloc(2 * sizeof(Mtx), MEMPOOL_STAGE); + var8009cc88 = memp_alloc(2 * sizeof(Mtx), MEMPOOL_STAGE); } diff --git a/src/game/gfxmemory.c b/src/game/gfxmemory.c index a7d6bb9d6..950205dbe 100644 --- a/src/game/gfxmemory.c +++ b/src/game/gfxmemory.c @@ -65,18 +65,18 @@ u32 g_GfxNumSwaps = 2; * Comments in this function are strings that appear in an XBLA debug build. * They were likely in the N64 version but ifdeffed out. */ -void gfxReset(void) +void gfx_reset(void) { s32 stack; - if (argFindByPrefix(1, "-mgfx")) { + if (arg_find_by_prefix(1, "-mgfx")) { // Argument specified master_dl_size\n s32 gfx; s32 gfxtra = 0; - gfx = strtol(argFindByPrefix(1, "-mgfx"), NULL, 0) * 1024; + gfx = strtol(arg_find_by_prefix(1, "-mgfx"), NULL, 0) * 1024; - if (argFindByPrefix(1, "-mgfxtra")) { + if (arg_find_by_prefix(1, "-mgfxtra")) { // ******** Extra specified but are we in the correct game mode I wonder???\n if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) && PLAYERCOUNT() == 2) { // ******** Extra Display List Memeory Required\n @@ -84,7 +84,7 @@ void gfxReset(void) // ******** If you try and run hi-res then\n // ******** you're gonna shafted up the arse\n // ******** so don't blame me\n - gfxtra = strtol(argFindByPrefix(1, "-mgfxtra"), NULL, 0) * 1024; + gfxtra = strtol(arg_find_by_prefix(1, "-mgfxtra"), NULL, 0) * 1024; } else { // ******** No we're not so there\n } @@ -96,18 +96,18 @@ void gfxReset(void) g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1] = gfx + gfxtra; } - if (argFindByPrefix(1, "-mvtx")) { + if (arg_find_by_prefix(1, "-mvtx")) { // Argument specified mtxvtx_size\n - g_VtxSizesByPlayerCount[PLAYERCOUNT() - 1] = strtol(argFindByPrefix(1, "-mvtx"), NULL, 0) * 1024; + g_VtxSizesByPlayerCount[PLAYERCOUNT() - 1] = strtol(arg_find_by_prefix(1, "-mvtx"), NULL, 0) * 1024; } // %d Players : Allocating %d bytes for master dl's\n - g_GfxBuffers[0] = mempAlloc(g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1] * NUM_GFXTASKS, MEMPOOL_STAGE); + g_GfxBuffers[0] = memp_alloc(g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1] * NUM_GFXTASKS, MEMPOOL_STAGE); g_GfxBuffers[1] = g_GfxBuffers[0] + g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1]; g_GfxBuffers[2] = g_GfxBuffers[1] + g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1]; // Allocating %d bytes for mtxvtx space\n - g_VtxBuffers[0] = mempAlloc(g_VtxSizesByPlayerCount[PLAYERCOUNT() - 1] * NUM_GFXTASKS, MEMPOOL_STAGE); + g_VtxBuffers[0] = memp_alloc(g_VtxSizesByPlayerCount[PLAYERCOUNT() - 1] * NUM_GFXTASKS, MEMPOOL_STAGE); g_VtxBuffers[1] = g_VtxBuffers[0] + g_VtxSizesByPlayerCount[PLAYERCOUNT() - 1]; g_VtxBuffers[2] = g_VtxBuffers[1] + g_VtxSizesByPlayerCount[PLAYERCOUNT() - 1]; @@ -116,14 +116,14 @@ void gfxReset(void) g_GfxMemPos = g_VtxBuffers[0]; } -Gfx *gfxGetMasterDisplayList(void) +Gfx *gfx_get_master_display_list(void) { g_GfxRequestedDisplayList = true; return (Gfx *)g_GfxBuffers[g_GfxActiveBufferIndex]; } -Vtx *gfxAllocateVertices(u32 count) +Vtx *gfx_allocate_vertices(u32 count) { void *ptr = g_GfxMemPos; g_GfxMemPos += count * sizeof(Vtx); @@ -132,7 +132,7 @@ Vtx *gfxAllocateVertices(u32 count) return ptr; } -void *gfxAllocateMatrix(void) +void *gfx_allocate_matrix(void) { void *ptr = g_GfxMemPos; g_GfxMemPos += sizeof(Mtx); @@ -145,7 +145,7 @@ void *gfxAllocateMatrix(void) * The function allocates 0x8 for every count, so it could be allocating lights * instead, however it's only used for LookAts so it's named as LookAt. */ -LookAt *gfxAllocateLookAt(s32 count) +LookAt *gfx_allocate_look_at(s32 count) { void *ptr = g_GfxMemPos; g_GfxMemPos += count * (sizeof(LookAt) / 2); @@ -153,7 +153,7 @@ LookAt *gfxAllocateLookAt(s32 count) return ptr; } -Col *gfxAllocateColours(s32 count) +Col *gfx_allocate_colours(s32 count) { void *ptr = g_GfxMemPos; count = ALIGN16(count * sizeof(Col)); @@ -162,7 +162,7 @@ Col *gfxAllocateColours(s32 count) return ptr; } -void *gfxAllocate(u32 size) +void *gfx_allocate(u32 size) { void *ptr = g_GfxMemPos; size = ALIGN16(size); @@ -171,7 +171,7 @@ void *gfxAllocate(u32 size) return ptr; } -void gfxSwapBuffers(void) +void gfx_swap_buffers(void) { g_GfxActiveBufferIndex ^= 1; g_GfxRequestedDisplayList = false; @@ -184,12 +184,12 @@ void gfxSwapBuffers(void) } } -s32 gfxGetFreeGfx(Gfx *gdl) +s32 gfx_get_free_gfx(Gfx *gdl) { return (Gfx *)g_GfxBuffers[g_GfxActiveBufferIndex + 1] - gdl; } -u32 gfxGetFreeVtx(void) +u32 gfx_get_free_vtx(void) { return g_VtxBuffers[g_GfxActiveBufferIndex + 1] - g_GfxMemPos; } diff --git a/src/game/gfxreplace.c b/src/game/gfxreplace.c index e8a1de121..e2b9860c6 100644 --- a/src/game/gfxreplace.c +++ b/src/game/gfxreplace.c @@ -290,7 +290,7 @@ Gfx g_GfxGroup10[] = { 0, }; -void gfxReplaceGbiCommands(Gfx *startgdl, Gfx *endgdl, s32 type) +void gfx_replace_gbi_commands(Gfx *startgdl, Gfx *endgdl, s32 type) { static Gfx *groups[] = { g_GfxGroup00, @@ -323,7 +323,7 @@ void gfxReplaceGbiCommands(Gfx *startgdl, Gfx *endgdl, s32 type) } } -void gfxReplaceGbiCommandsRecursively(struct roomblock *block, s32 type) +void gfx_replace_gbi_commands_recursively(struct roomblock *block, s32 type) { if (block->type == ROOMBLOCKTYPE_PARENT); @@ -334,11 +334,11 @@ void gfxReplaceGbiCommandsRecursively(struct roomblock *block, s32 type) switch (block->type) { case ROOMBLOCKTYPE_LEAF: - gfxReplaceGbiCommands(block->gdl, NULL, type); + gfx_replace_gbi_commands(block->gdl, NULL, type); block = block->next; break; case ROOMBLOCKTYPE_PARENT: - gfxReplaceGbiCommandsRecursively(block->child, type); + gfx_replace_gbi_commands_recursively(block->child, type); block = block->next; break; default: diff --git a/src/game/gunfx.c b/src/game/gunfx.c index 214c752f5..92f8732d3 100644 --- a/src/game/gunfx.c +++ b/src/game/gunfx.c @@ -24,7 +24,7 @@ struct casing g_Casings[20]; struct boltbeam g_BoltBeams[8]; struct lasersight g_LaserSights[MAX_PLAYERS]; -void beamCreate(struct beam *beam, s32 weaponnum, struct coord *from, struct coord *to) +void beam_create(struct beam *beam, s32 weaponnum, struct coord *from, struct coord *to) { f32 distance; @@ -101,11 +101,11 @@ void beamCreate(struct beam *beam, s32 weaponnum, struct coord *from, struct coo } } -void beamCreateForHand(s32 handnum) +void beam_create_for_hand(s32 handnum) { struct player *player = g_Vars.currentplayer; struct hand *hand = player->hands + handnum; - Mtxf *mtx = camGetWorldToScreenMtxf(); + Mtxf *mtx = cam_get_world_to_screen_mtxf(); f32 tmp; tmp = hand->hitpos.f[0] * mtx->m[0][2] + hand->hitpos.f[1] * mtx->m[1][2] + hand->hitpos.f[2] * mtx->m[2][2] + mtx->m[3][2]; @@ -115,14 +115,14 @@ void beamCreateForHand(s32 handnum) // empty } else { struct beam *beam; - s32 weaponnum = bgunGetWeaponNum(handnum); + s32 weaponnum = bgun_get_weapon_num(handnum); if (hand->gset.weaponnum == WEAPON_LASER && hand->gset.weaponfunc == FUNC_SECONDARY) { weaponnum = -2; } beam = &hand->beam; - beamCreate(beam, weaponnum, &hand->muzzlepos, &hand->hitpos); + beam_create(beam, weaponnum, &hand->muzzlepos, &hand->hitpos); if (beam->weaponnum == WEAPON_MAULER) { beam->weaponnum = -3 - (s32)player->hands[handnum].matmot1; @@ -135,7 +135,7 @@ void beamCreateForHand(s32 handnum) f32 radians; if (chr->fireslots[handnum] == -1) { - chr->fireslots[handnum] = bgunAllocateFireslot(); + chr->fireslots[handnum] = bgun_allocate_fireslot(); } if (chr->fireslots[handnum] != -1) { @@ -154,7 +154,7 @@ void beamCreateForHand(s32 handnum) radians = acosf(disttolast.f[0] * disttocur.f[0] + disttolast.f[1] * disttocur.f[1] + disttolast.f[2] * disttocur.f[2]); if (!(radians > RAD(5, 0.08725257f)) || weaponnum == -2) { - beamCreate(&g_Fireslots[chr->fireslots[handnum]].beam, weaponnum, &player->chrmuzzlelastpos[handnum], &hand->hitpos); + beam_create(&g_Fireslots[chr->fireslots[handnum]].beam, weaponnum, &player->chrmuzzlelastpos[handnum], &hand->hitpos); if (g_Fireslots[chr->fireslots[handnum]].beam.weaponnum == WEAPON_MAULER) { g_Fireslots[chr->fireslots[handnum]].beam.weaponnum = -3 - (s32)player->hands[handnum].matmot1; @@ -165,7 +165,7 @@ void beamCreateForHand(s32 handnum) } } -Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, +Gfx *beam_render_generic(Gfx *gdl, struct textureconfig *texconfig, f32 arg2, struct coord *headpos, u32 headcolour, f32 arg5, struct coord *tailpos, u32 tailcolour) { @@ -175,9 +175,9 @@ Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, struct coord spd0; struct coord *campos = &g_Vars.currentplayer->cam_pos; Mtxf *spc8; - Col *colours = gfxAllocateColours(2); + Col *colours = gfx_allocate_colours(2); Mtxf sp84; - Mtxf *worldtoscreenmtx = camGetWorldToScreenMtxf(); + Mtxf *worldtoscreenmtx = cam_get_world_to_screen_mtxf(); struct coord sp74 = {0, 0, 0}; f32 mult; u32 stack[2]; @@ -197,7 +197,7 @@ Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, spe4.f[1] /= length; spe4.f[2] /= length; - mtx4TransformVec(camGetWorldToScreenMtxf(), headpos, &sp5c); + mtx4_transform_vec(cam_get_world_to_screen_mtxf(), headpos, &sp5c); if (sp5c.f[0] * arg2 > 10000.0f || sp5c.f[0] * arg2 < -10000.0f) { return gdl; @@ -211,7 +211,7 @@ Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, return gdl; } - mtx4TransformVec(camGetWorldToScreenMtxf(), tailpos, &sp5c); + mtx4_transform_vec(cam_get_world_to_screen_mtxf(), tailpos, &sp5c); if (sp5c.f[0] * arg2 > 10000.0f || sp5c.f[0] * arg2 < -10000.0f) { return gdl; @@ -240,14 +240,14 @@ Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, spd0.f[2] = 0.0f; } - vertices = gfxAllocateVertices(4); - spc8 = gfxAllocateMatrix(); + vertices = gfx_allocate_vertices(4); + spc8 = gfx_allocate_matrix(); - mtx4LoadTranslation(headpos, &sp84); + mtx4_load_translation(headpos, &sp84); mtx00015f04(1.0f / arg2, &sp84); mtx00015be0(worldtoscreenmtx, &sp84); - mtxF2L(&sp84, spc8); + mtx_f2l(&sp84, spc8); mult = arg5 * arg2; @@ -287,7 +287,7 @@ Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, gSPMatrix(gdl++, osVirtualToPhysical(spc8), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPColor(gdl++, osVirtualToPhysical(colours), 2); - texSelect(&gdl, texconfig, 4, 1, 2, true, NULL); + tex_select(&gdl, texconfig, 4, 1, 2, true, NULL); gSPVertex(gdl++, osVirtualToPhysical(vertices), 4, 0); gSPTri2(gdl++, 0, 1, 2, 2, 3, 0); @@ -295,14 +295,14 @@ Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, return gdl; } -Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) +Gfx *beam_render(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) { u32 stack; Mtxf *sp188; Mtxf sp148; if (arg3 < 5 && beam->age >= 0) { - Col *colours = gfxAllocateColours(1); + Col *colours = gfx_allocate_colours(1); struct coord sp138; struct coord *campos = &g_Vars.currentplayer->cam_pos; f32 sp130; @@ -316,7 +316,7 @@ Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) f32 spf0 = 1.4142f; struct textureconfig *texconfig = &g_TexBeamConfigs[arg3]; s32 i; - Mtxf *worldtoscreenmtx = camGetWorldToScreenMtxf(); + Mtxf *worldtoscreenmtx = cam_get_world_to_screen_mtxf(); s32 j; u32 stack1; s32 spd8; @@ -420,19 +420,19 @@ Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) sp118.f[2] *= sp130; if (beam->weaponnum == WEAPON_LASER) { - vertices = gfxAllocateVertices(8); + vertices = gfx_allocate_vertices(8); } else { - vertices = gfxAllocateVertices(4); + vertices = gfx_allocate_vertices(4); } - sp188 = gfxAllocateMatrix(); + sp188 = gfx_allocate_matrix(); if (sp12c > 0.0f && sp138.f[0] > -32000.0f && sp138.f[0] < 32000.0f && sp138.f[1] > -32000.0f && sp138.f[1] < 32000.0f && sp138.f[2] > -32000.0f && sp138.f[2] < 32000.0f) { spd8 = true; - mtx4LoadTranslation(&sp138, &sp148); + mtx4_load_translation(&sp138, &sp148); mtx00015f04(0.1f, &sp148); mtx00015be0(worldtoscreenmtx, &sp148); @@ -446,7 +446,7 @@ Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) } if (spd8) { - mtxF2L(&sp148, sp188); + mtx_f2l(&sp148, sp188); if (beam->weaponnum); @@ -455,7 +455,7 @@ Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) spcc.f[1] = sp138.f[1] + beam->dir.f[1] * sp12c; spcc.f[2] = sp138.f[2] + beam->dir.f[2] * sp12c; - mtx4TransformVecInPlace(worldtoscreenmtx, &spcc); + mtx4_transform_vec_in_place(worldtoscreenmtx, &spcc); spb8[0] = spb8[1] = sp130 / 10; tmp = -spcc.f[2]; @@ -468,7 +468,7 @@ Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) spcc.f[2] *= spc0[0] * 0.5f; } - mtx4TransformVecInPlace(camGetProjectionMtxF(), &spcc); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &spcc); spcc.f[0] -= sp138.f[0]; spcc.f[1] -= sp138.f[1]; @@ -575,16 +575,16 @@ Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) gSPColor(gdl++, osVirtualToPhysical(colours), 1); if (beam->weaponnum == WEAPON_LASER) { - texSelect(&gdl, &g_TexGroup03Configs[0], 4, arg2, 2, true, NULL); + tex_select(&gdl, &g_TexGroup03Configs[0], 4, arg2, 2, true, NULL); gSPVertex(gdl++, osVirtualToPhysical(vertices), 8, 0); gSPTri2(gdl++, 4, 5, 6, 4, 5, 7); - texSelect(&gdl, texconfig, 4, arg2, 2, true, NULL); + tex_select(&gdl, texconfig, 4, arg2, 2, true, NULL); gSPTri2(gdl++, 0, 2, 3, 0, 3, 1); } else { - texSelect(&gdl, texconfig, 4, arg2, 2, true, NULL); + tex_select(&gdl, texconfig, 4, arg2, 2, true, NULL); gSPVertex(gdl++, osVirtualToPhysical(vertices), 4, 0); gSPTri2(gdl++, 0, 2, 3, 0, 3, 1); @@ -597,7 +597,7 @@ Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) return gdl; } -void beamTick(struct beam *beam) +void beam_tick(struct beam *beam) { if (beam->age >= 0) { if (beam->weaponnum == -2) { @@ -624,7 +624,7 @@ void beamTick(struct beam *beam) bool g_CasingsActive = false; -struct casing *casingCreate(struct modeldef *modeldef, Mtxf *mtx) +struct casing *casing_create(struct modeldef *modeldef, Mtxf *mtx) { s32 i; s32 j; @@ -643,7 +643,7 @@ struct casing *casingCreate(struct modeldef *modeldef, Mtxf *mtx) casing->pos.y = mtx->m[3][1]; casing->pos.z = mtx->m[3][2]; - mtx4ToMtx3(mtx, rot); + mtx4_to_mtx3(mtx, rot); for (i = 0; i < 3; i++) { for (j = 0; j < 3; j++) { @@ -659,7 +659,7 @@ struct casing *casingCreate(struct modeldef *modeldef, Mtxf *mtx) return NULL; } -void casingCreateForHand(s32 handnum, f32 ground, Mtxf *mtx) +void casing_create_for_hand(s32 handnum, f32 ground, Mtxf *mtx) { f32 oldyspeed; struct casing *casing = NULL; @@ -668,10 +668,10 @@ void casingCreateForHand(s32 handnum, f32 ground, Mtxf *mtx) s32 j; Mtxf spec; f32 spc8[3][3]; - s32 weaponnum = bgunGetWeaponNum(handnum); + s32 weaponnum = bgun_get_weapon_num(handnum); s32 casingtype = -1; - struct weaponfunc *func = gsetGetWeaponFunction2(&player->hands[handnum].gset); - struct weapon *weapondef = weaponFindById(player->gunctrl.weaponnum); + struct weaponfunc *func = gset_get_weapon_function2(&player->hands[handnum].gset); + struct weapon *weapondef = weapon_find_by_id(player->gunctrl.weaponnum); struct weaponfunc_shoot *shootfunc = NULL; struct modeldef *modeldef; @@ -697,12 +697,12 @@ void casingCreateForHand(s32 handnum, f32 ground, Mtxf *mtx) return; } - mtx4Copy(mtx, &spec); + mtx4_copy(mtx, &spec); - modeldef = bgunGetCartModeldef(); + modeldef = bgun_get_cart_modeldef(); if (modeldef != NULL) { - casing = casingCreate(modeldef, &spec); + casing = casing_create(modeldef, &spec); } if (casing != NULL) { @@ -723,14 +723,14 @@ void casingCreateForHand(s32 handnum, f32 ground, Mtxf *mtx) casing->speed.y = RANDOMFRAC() * 2.5f * 0.0625f + 2.5f; casing->speed.z = 0.0f; - mtx4RotateVecInPlace(mtx, &casing->speed); + mtx4_rotate_vec_in_place(mtx, &casing->speed); spa4.x = 2.0f * RANDOMFRAC() * M_BADTAU * 0.0625f - 0.39263657f; spa4.y = 2.0f * RANDOMFRAC() * M_BADTAU * 0.0625f - 0.39263657f; spa4.z = 2.0f * RANDOMFRAC() * M_BADTAU * 0.0625f - 0.39263657f; - mtx4LoadRotation(&spa4, &sp64); - mtx4ToMtx3(&sp64, spc8); + mtx4_load_rotation(&spa4, &sp64); + mtx4_to_mtx3(&sp64, spc8); for (i = 0; i < 3; i++) { for (j = 0; j < 3; j++) { @@ -771,23 +771,23 @@ void casingCreateForHand(s32 handnum, f32 ground, Mtxf *mtx) casing->speed.z = -1.0f; } - mtx4RotateVecInPlace(mtx, &casing->speed); + mtx4_rotate_vec_in_place(mtx, &casing->speed); if (weaponnum == WEAPON_REAPER) { spa4.x = 2.0f * RANDOMFRAC() * M_BADTAU * 0.015625f - 0.09815914f; spa4.y = 2.0f * RANDOMFRAC() * M_BADTAU * 0.015625f - 0.09815914f; spa4.z = 2.0f * RANDOMFRAC() * M_BADTAU * 0.015625f - 0.09815914f; - mtx4LoadRotation(&spa4, &sp64); - mtx4RotateVecInPlace(&sp64, &casing->speed); + mtx4_load_rotation(&spa4, &sp64); + mtx4_rotate_vec_in_place(&sp64, &casing->speed); } spa4.x = 2.0f * RANDOMFRAC() * M_BADTAU * 0.015625f - 0.09815914f; spa4.y = 2.0f * RANDOMFRAC() * M_BADTAU * 0.015625f - 0.09815914f; spa4.z = 2.0f * RANDOMFRAC() * M_BADTAU * 0.015625f - 0.09815914f; - mtx4LoadRotation(&spa4, &sp64); - mtx4ToMtx3(&sp64, spc8); + mtx4_load_rotation(&spa4, &sp64); + mtx4_to_mtx3(&sp64, spc8); for (i = 0; i < 3; i++) { for (j = 0; j < 3; j++) { @@ -815,11 +815,11 @@ void casingCreateForHand(s32 handnum, f32 ground, Mtxf *mtx) } } -void casingRender(struct casing *casing, Gfx **gdlptr) +void casing_render(struct casing *casing, Gfx **gdlptr) { Gfx *gdl = *gdlptr; struct modeldef *modeldef = casing->modeldef; - Mtxf *matrices = gfxAllocate(modeldef->nummatrices * sizeof(Mtxf)); + Mtxf *matrices = gfx_allocate(modeldef->nummatrices * sizeof(Mtxf)); struct model model; struct modelrenderdata renderdata = { NULL, true, 3 }; Mtxf mtx; @@ -827,8 +827,8 @@ void casingRender(struct casing *casing, Gfx **gdlptr) s32 j; bool render = true; - modelAllocateRwData(modeldef); - modelInit(&model, modeldef, NULL, true); + model_allocate_rw_data(modeldef); + model_init(&model, modeldef, NULL, true); model.matrices = matrices; @@ -848,8 +848,8 @@ void casingRender(struct casing *casing, Gfx **gdlptr) mtx.m[3][3] = 1.0f; mtx00015f04(0.1000000089407f, &mtx); - mtx4SetTranslation(&casing->pos, &mtx); - mtx00015be4(camGetWorldToScreenMtxf(), &mtx, model.matrices); + mtx4_set_translation(&casing->pos, &mtx); + mtx00015be4(cam_get_world_to_screen_mtxf(), &mtx, model.matrices); // Check if any coordinate is out of range for (i = 0; i < 3; i++) { @@ -870,15 +870,15 @@ void casingRender(struct casing *casing, Gfx **gdlptr) | g_Vars.currentplayer->gunshadecol[2] << 8 | g_Vars.currentplayer->gunshadecol[3]; - modelRender(&renderdata, &model); + model_render(&renderdata, &model); *gdlptr = renderdata.gdl; - mtxF2LBulk(matrices, modeldef->nummatrices); + mtx_f2l_bulk(matrices, modeldef->nummatrices); } } -void casingsRender(Gfx **gdlptr) +void casings_render(Gfx **gdlptr) { if (g_CasingsActive) { struct casing *end = g_Casings + ARRAYCOUNT(g_Casings); @@ -886,7 +886,7 @@ void casingsRender(Gfx **gdlptr) while (casing < end) { if (casing->modeldef) { - casingRender(casing, gdlptr); + casing_render(casing, gdlptr); } casing++; @@ -894,7 +894,7 @@ void casingsRender(Gfx **gdlptr) } } -s32 boltbeamFindByProp(struct prop *prop) +s32 boltbeam_find_by_prop(struct prop *prop) { s32 result = -1; s32 i = 0; @@ -908,9 +908,9 @@ s32 boltbeamFindByProp(struct prop *prop) return result; } -s32 boltbeamCreate(struct prop *prop) +s32 boltbeam_create(struct prop *prop) { - s32 beamnum = boltbeamFindByProp((struct prop *) -1); + s32 beamnum = boltbeam_find_by_prop((struct prop *) -1); if (beamnum >= 0) { g_BoltBeams[beamnum].tickmode = BOLTBEAMTICKMODE_MANUAL; @@ -920,30 +920,30 @@ s32 boltbeamCreate(struct prop *prop) return beamnum; } -void boltbeamFree(struct prop *prop) +void boltbeam_free(struct prop *prop) { - s32 beamnum = boltbeamFindByProp(prop); + s32 beamnum = boltbeam_find_by_prop(prop); if (beamnum != -1) { g_BoltBeams[beamnum].unk00 = -1; } } -void boltbeamSetHeadPos(s32 beamnum, struct coord *pos) +void boltbeam_set_head_pos(s32 beamnum, struct coord *pos) { g_BoltBeams[beamnum].headpos.x = pos->x; g_BoltBeams[beamnum].headpos.y = pos->y; g_BoltBeams[beamnum].headpos.z = pos->z; } -void boltbeamSetTailPos(s32 beamnum, struct coord *pos) +void boltbeam_set_tail_pos(s32 beamnum, struct coord *pos) { g_BoltBeams[beamnum].tailpos.x = pos->x; g_BoltBeams[beamnum].tailpos.y = pos->y; g_BoltBeams[beamnum].tailpos.z = pos->z; } -void boltbeamIncrementHeadPos(s32 beamnum, f32 arg1, bool arg2) +void boltbeam_increment_head_pos(s32 beamnum, f32 arg1, bool arg2) { f32 dist; @@ -967,27 +967,27 @@ void boltbeamIncrementHeadPos(s32 beamnum, f32 arg1, bool arg2) } } -void boltbeamSetAutomatic(s32 beamnum, f32 speed) +void boltbeam_set_automatic(s32 beamnum, f32 speed) { g_BoltBeams[beamnum].tickmode = BOLTBEAMTICKMODE_AUTOMATIC; g_BoltBeams[beamnum].unk00 = 0; g_BoltBeams[beamnum].speed = speed; } -Gfx *boltbeamsRender(Gfx *gdl) +Gfx *boltbeams_render(Gfx *gdl) { s32 i; for (i = 0; i < ARRAYCOUNT(g_BoltBeams); i++) { if (g_BoltBeams[i].unk00 != -1) { - gdl = beamRenderGeneric(gdl, g_TexLaserConfigs, 1, &g_BoltBeams[i].headpos, 0xafafff00, 2, &g_BoltBeams[i].tailpos, 0xafafff7f); + gdl = beam_render_generic(gdl, g_TexLaserConfigs, 1, &g_BoltBeams[i].headpos, 0xafafff00, 2, &g_BoltBeams[i].tailpos, 0xafafff7f); } } return gdl; } -void boltbeamsTick(void) +void boltbeams_tick(void) { s32 i; @@ -1003,7 +1003,7 @@ void boltbeamsTick(void) if (length < 0) { g_BoltBeams[i].unk00 = -1; } else { - boltbeamIncrementHeadPos(i, length, false); + boltbeam_increment_head_pos(i, length, false); } } } @@ -1015,7 +1015,7 @@ void boltbeamsTick(void) * Additionally, populate the index pointer with the index of the lasersight * if it exists, or any free slot if it doesn't. */ -bool lasersightExists(s32 id, s32 *index) +bool lasersight_exists(s32 id, s32 *index) { s32 fallback = -1; s32 exact = -1; @@ -1040,7 +1040,7 @@ bool lasersightExists(s32 id, s32 *index) return true; } -Gfx *lasersightRenderDot(Gfx *gdl) +Gfx *lasersight_render_dot(Gfx *gdl) { Mtxf *mtx; f32 f0; @@ -1058,11 +1058,11 @@ Gfx *lasersightRenderDot(Gfx *gdl) static u32 spb = 24; static u32 spi = 6; - mainOverrideVariable("sp1", &sp1); - mainOverrideVariable("sp2", &sp2); - mainOverrideVariable("sp3", &sp3); - mainOverrideVariable("spb", &spb); - mainOverrideVariable("spi", &spi); + main_override_variable("sp1", &sp1); + main_override_variable("sp2", &sp2); + main_override_variable("sp3", &sp3); + main_override_variable("spb", &spb); + main_override_variable("spi", &spi); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_BILERP); @@ -1077,15 +1077,15 @@ Gfx *lasersightRenderDot(Gfx *gdl) if (f20); - mtx4LoadIdentity(&sp164); - mtx00015be0(camGetWorldToScreenMtxf(), &sp164); - mtx4LoadIdentity(&sp124); - mtx00015be0(camGetProjectionMtxF(), &sp124); + mtx4_load_identity(&sp164); + mtx00015be0(cam_get_world_to_screen_mtxf(), &sp164); + mtx4_load_identity(&sp124); + mtx00015be0(cam_get_projection_mtxf(), &sp124); sp124.m[3][0] = sp124.m[3][1] = sp124.m[3][2] = 0.0f; - mtx4LoadIdentity(&sp1b0); - mtx00015be0(camGetWorldToScreenMtxf(), &sp1b0); + mtx4_load_identity(&sp1b0); + mtx00015be0(cam_get_world_to_screen_mtxf(), &sp1b0); campos.x = player->cam_pos.x; campos.y = player->cam_pos.y; @@ -1097,8 +1097,8 @@ Gfx *lasersightRenderDot(Gfx *gdl) mtx00015f88(0.2f, &sp1b0); - mtx = gfxAllocateMatrix(); - mtxF2L(&sp1b0, mtx); + mtx = gfx_allocate_matrix(); + mtx_f2l(&sp1b0, mtx); gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -1117,7 +1117,7 @@ Gfx *lasersightRenderDot(Gfx *gdl) rot.y = g_LaserSights[i].dotrot.y; rot.z = g_LaserSights[i].dotrot.z; - colours = gfxAllocateColours(2); + colours = gfx_allocate_colours(2); colours[0].word = 0xff00005f; colours[1].word = 0xff00000f; @@ -1167,7 +1167,7 @@ Gfx *lasersightRenderDot(Gfx *gdl) } } - texSelect(&gdl, &g_TexGeneralConfigs[4], 4, 0, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[4], 4, 0, 2, true, NULL); if (rot.f[0] == 0.0f && rot.f[2] == 0.0f) { spcc = 0.0f; @@ -1194,7 +1194,7 @@ Gfx *lasersightRenderDot(Gfx *gdl) f00 = 0; } - vertices = gfxAllocateVertices(4); + vertices = gfx_allocate_vertices(4); vertices[3].colour = 0; vertices[2].colour = 0; @@ -1237,7 +1237,7 @@ Gfx *lasersightRenderDot(Gfx *gdl) return gdl; } -Gfx *lasersightRenderBeam(Gfx *gdl) +Gfx *lasersight_render_beam(Gfx *gdl) { u32 stack; struct player *player = g_Vars.currentplayer; @@ -1260,19 +1260,19 @@ Gfx *lasersightRenderBeam(Gfx *gdl) gDPSetCombineMode(gdl++, G_CC_BLENDIA, G_CC_BLENDIA); gSPClearGeometryMode(gdl++, G_CULL_BOTH); - texSelect(&gdl, &g_TexGeneralConfigs[3], 4, 0, 2, 1, NULL); - mtx4LoadIdentity(&sp14c); + tex_select(&gdl, &g_TexGeneralConfigs[3], 4, 0, 2, 1, NULL); + mtx4_load_identity(&sp14c); - mtx00015be0(camGetWorldToScreenMtxf(), &sp14c); - mtx4LoadIdentity(&sp10c); - mtx00015be0(camGetProjectionMtxF(), &sp10c); + mtx00015be0(cam_get_world_to_screen_mtxf(), &sp14c); + mtx4_load_identity(&sp10c); + mtx00015be0(cam_get_projection_mtxf(), &sp10c); sp10c.m[3][1] = 0; sp10c.m[3][0] = 0; sp10c.m[3][2] = 0; - mtx4LoadIdentity(&sp198); - mtx00015be0(camGetWorldToScreenMtxf(), &sp198); + mtx4_load_identity(&sp198); + mtx00015be0(cam_get_world_to_screen_mtxf(), &sp198); campos.x = player->cam_pos.x; campos.y = player->cam_pos.y; @@ -1283,8 +1283,8 @@ Gfx *lasersightRenderBeam(Gfx *gdl) sp198.m[3][2] = 0; mtx00015f88(0.2f, &sp198); - mtx = gfxAllocateMatrix(); - mtxF2L(&sp198, mtx); + mtx = gfx_allocate_matrix(); + mtx_f2l(&sp198, mtx); gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -1302,7 +1302,7 @@ Gfx *lasersightRenderBeam(Gfx *gdl) sp98.y = g_LaserSights[i].beamnear.y; sp98.z = g_LaserSights[i].beamnear.z; - mtx4TransformVecInPlace(&sp14c, &sp98); + mtx4_transform_vec_in_place(&sp14c, &sp98); spa8.x = sp98.f[0] < 0.0f ? 1.0f : -1.0f; spa8.y = 2.0f; @@ -1310,7 +1310,7 @@ Gfx *lasersightRenderBeam(Gfx *gdl) guNormalize(&spa8.x, &spa8.y, &spa8.z); - mtx4RotateVecInPlace(&sp10c, &spa8); + mtx4_rotate_vec_in_place(&sp10c, &spa8); spcc.x = g_LaserSights[i].beamnear.x; spcc.y = g_LaserSights[i].beamnear.y; @@ -1334,14 +1334,14 @@ Gfx *lasersightRenderBeam(Gfx *gdl) guNormalize(&spb4.x, &spb4.y, &spb4.z); - colours = gfxAllocateColours(2); + colours = gfx_allocate_colours(2); colours[0].word = 0xff00005f; colours[1].word = 0xff00000f; gSPColor(gdl++, osVirtualToPhysical(colours), 2); - vertices = gfxAllocateVertices(6); + vertices = gfx_allocate_vertices(6); vertices[0].colour = 0; vertices[1].colour = 0; @@ -1396,11 +1396,11 @@ Gfx *lasersightRenderBeam(Gfx *gdl) return gdl; } -void lasersightSetBeam(s32 id, s32 arg1, struct coord *near, struct coord *far) +void lasersight_set_beam(s32 id, s32 arg1, struct coord *near, struct coord *far) { s32 i; - if (!lasersightExists(id, &i)) { + if (!lasersight_exists(id, &i)) { if (i == -1) { return; } @@ -1424,11 +1424,11 @@ void lasersightSetBeam(s32 id, s32 arg1, struct coord *near, struct coord *far) g_LaserSights[i].unk28 = 0; } -void lasersightSetDot(s32 arg0, struct coord *pos, struct coord *rot) +void lasersight_set_dot(s32 arg0, struct coord *pos, struct coord *rot) { s32 i; - if (lasersightExists(arg0, &i)) { + if (lasersight_exists(arg0, &i)) { g_LaserSights[i].unk28 += 1.0f; g_LaserSights[i].dotpos.x = pos->x; @@ -1441,11 +1441,11 @@ void lasersightSetDot(s32 arg0, struct coord *pos, struct coord *rot) } } -void lasersightFree(s32 arg0) +void lasersight_free(s32 arg0) { s32 i; - if (lasersightExists(arg0, &i)) { + if (lasersight_exists(arg0, &i)) { g_LaserSights[i].id = -1; } } diff --git a/src/game/gunfxreset.c b/src/game/gunfxreset.c index efa506cae..3c86f7642 100644 --- a/src/game/gunfxreset.c +++ b/src/game/gunfxreset.c @@ -12,7 +12,7 @@ #include "data.h" #include "types.h" -void boltbeamsReset(void) +void boltbeams_reset(void) { s32 i; @@ -21,7 +21,7 @@ void boltbeamsReset(void) } } -void lasersightsReset(void) +void lasersights_reset(void) { s32 i; diff --git a/src/game/healthbar.c b/src/game/healthbar.c index 8df9d1909..d73e870bb 100644 --- a/src/game/healthbar.c +++ b/src/game/healthbar.c @@ -18,7 +18,7 @@ struct marker { f32 frac; }; -s32 healthbarMaybeInsertMarker(struct marker *markers, s32 *indexes, s32 maxlen, f32 fillfrac) +s32 healthbar_maybe_insert_marker(struct marker *markers, s32 *indexes, s32 maxlen, f32 fillfrac) { s32 len = 0; s32 i; @@ -76,7 +76,7 @@ s32 healthbarMaybeInsertMarker(struct marker *markers, s32 *indexes, s32 maxlen, return 0; } -u32 healthbarChooseColour(u32 fillcol, u32 bgcol, f32 fillexcfade, f32 fillincfade, f32 frac) +u32 healthbar_choose_colour(u32 fillcol, u32 bgcol, f32 fillexcfade, f32 fillincfade, f32 frac) { f32 mult; u32 r; @@ -130,7 +130,7 @@ u32 healthbarChooseColour(u32 fillcol, u32 bgcol, f32 fillexcfade, f32 fillincfa * of these dynamic markers are tweened from the two neighbours. There are two * of these because the colour change uses a fade rather than a hard edge. */ -Gfx *healthbarDraw(Gfx *gdl, struct chrdata *chr, s32 offyarg, f32 heightfracarg) +Gfx *healthbar_draw(Gfx *gdl, struct chrdata *chr, s32 offyarg, f32 heightfracarg) { struct marker shieldmarkers[12]; struct marker armourmarkers[8]; @@ -191,8 +191,8 @@ Gfx *healthbarDraw(Gfx *gdl, struct chrdata *chr, s32 offyarg, f32 heightfracarg static s32 underbottom = 46; static u32 undercol = 0x00000000; - vertices = gfxAllocateVertices(56); - colours = gfxAllocateColours(56); + vertices = gfx_allocate_vertices(56); + colours = gfx_allocate_colours(56); // 12 markers (24 vertices) for shield // 8 markers (16 vertices) for armour @@ -205,34 +205,34 @@ Gfx *healthbarDraw(Gfx *gdl, struct chrdata *chr, s32 offyarg, f32 heightfracarg armourcolours = colours + 24; traumacolours = colours + 40; - mainOverrideVariable("radmax", &radmax); - mainOverrideVariable("radmed", &radmed); - mainOverrideVariable("radmin", &radmin); - mainOverrideVariable("len1", &len1); - mainOverrideVariable("len2", &len2); - mainOverrideVariable("len3", &len3); - mainOverrideVariable("offx", &offx); - mainOverrideVariable("offy", &offy); - mainOverrideVariable("shieldcol", &shieldcol); - mainOverrideVariable("armourcol", &armourcol); - mainOverrideVariable("traumacol", &traumacol); - mainOverrideVariable("bgcol", &bgcol); - mainOverrideVariable("shieldfade", &shieldfade); - mainOverrideVariable("armourfade", &armourfade); - mainOverrideVariable("traumafade", &traumafade); - mainOverrideVariable("shielddir", &shielddir); - mainOverrideVariable("underleft", &underleft); - mainOverrideVariable("undertop", &undertop); - mainOverrideVariable("underright", &underright); - mainOverrideVariable("underbottom", &underbottom); - mainOverrideVariable("undercol", &undercol); + main_override_variable("radmax", &radmax); + main_override_variable("radmed", &radmed); + main_override_variable("radmin", &radmin); + main_override_variable("len1", &len1); + main_override_variable("len2", &len2); + main_override_variable("len3", &len3); + main_override_variable("offx", &offx); + main_override_variable("offy", &offy); + main_override_variable("shieldcol", &shieldcol); + main_override_variable("armourcol", &armourcol); + main_override_variable("traumacol", &traumacol); + main_override_variable("bgcol", &bgcol); + main_override_variable("shieldfade", &shieldfade); + main_override_variable("armourfade", &armourfade); + main_override_variable("traumafade", &traumafade); + main_override_variable("shielddir", &shielddir); + main_override_variable("underleft", &underleft); + main_override_variable("undertop", &undertop); + main_override_variable("underright", &underright); + main_override_variable("underbottom", &underbottom); + main_override_variable("undercol", &undercol); if (chr == NULL || offyarg <= 0 || heightfracarg <= 0.0f) { // Use the player's health shieldfrac = g_Vars.currentplayer->apparentarmour; armourfrac = (g_Vars.currentplayer->apparenthealth - 0.25f) / 0.75f; traumafrac = (0.25f - g_Vars.currentplayer->apparenthealth) * 4.0f; - heightfrac = playerGetHealthBarHeightFrac(); + heightfrac = player_get_health_bar_height_frac(); } else { // Use the given chr's health healthfrac = (chr->maxdamage - chr->damage) / chr->maxdamage; @@ -430,17 +430,17 @@ Gfx *healthbarDraw(Gfx *gdl, struct chrdata *chr, s32 offyarg, f32 heightfracarg shieldfillexcfade = shieldfillincfade - shieldfade * 0.001f; numshieldmarkers = 10; - numshieldmarkers += healthbarMaybeInsertMarker(shieldmarkers, shieldmarkerindexes, ARRAYCOUNT(shieldmarkers), shieldfillexcfade); - numshieldmarkers += healthbarMaybeInsertMarker(shieldmarkers, shieldmarkerindexes, ARRAYCOUNT(shieldmarkers), shieldfillincfade); + numshieldmarkers += healthbar_maybe_insert_marker(shieldmarkers, shieldmarkerindexes, ARRAYCOUNT(shieldmarkers), shieldfillexcfade); + numshieldmarkers += healthbar_maybe_insert_marker(shieldmarkers, shieldmarkerindexes, ARRAYCOUNT(shieldmarkers), shieldfillincfade); for (i = 0; i < numshieldmarkers; i++) { index = shieldmarkerindexes[i]; marker = &shieldmarkers[index]; if (shielddir != 0) { - colour = healthbarChooseColour(bgcol, shieldcol, shieldfillexcfade, shieldfillincfade, marker->frac); + colour = healthbar_choose_colour(bgcol, shieldcol, shieldfillexcfade, shieldfillincfade, marker->frac); } else { - colour = healthbarChooseColour(shieldcol, bgcol, shieldfillexcfade, shieldfillincfade, marker->frac); + colour = healthbar_choose_colour(shieldcol, bgcol, shieldfillexcfade, shieldfillincfade, marker->frac); } shieldvertices->x = (s32)marker->x1 + offx; @@ -468,14 +468,14 @@ Gfx *healthbarDraw(Gfx *gdl, struct chrdata *chr, s32 offyarg, f32 heightfracarg armourfillexcfade = armourfillincfade - armourfade * 0.001f; numarmourmarkers = 6; - numarmourmarkers += healthbarMaybeInsertMarker(armourmarkers, armourmarkerindexes, ARRAYCOUNT(armourmarkers), armourfillexcfade); - numarmourmarkers += healthbarMaybeInsertMarker(armourmarkers, armourmarkerindexes, ARRAYCOUNT(armourmarkers), armourfillincfade); + numarmourmarkers += healthbar_maybe_insert_marker(armourmarkers, armourmarkerindexes, ARRAYCOUNT(armourmarkers), armourfillexcfade); + numarmourmarkers += healthbar_maybe_insert_marker(armourmarkers, armourmarkerindexes, ARRAYCOUNT(armourmarkers), armourfillincfade); for (i = 0; i < numarmourmarkers; i++) { index = armourmarkerindexes[i]; marker = &armourmarkers[index]; - colour = healthbarChooseColour(armourcol, bgcol, armourfillexcfade, armourfillincfade, marker->frac); + colour = healthbar_choose_colour(armourcol, bgcol, armourfillexcfade, armourfillincfade, marker->frac); armourvertices->x = (s32)marker->x1 + offx; armourvertices->y = 0; @@ -502,14 +502,14 @@ Gfx *healthbarDraw(Gfx *gdl, struct chrdata *chr, s32 offyarg, f32 heightfracarg traumafillexcfade = traumafillincfade - traumafade * 0.001f; numtraumamarkers = 6; - numtraumamarkers += healthbarMaybeInsertMarker(traumamarkers, traumamarkerindexes, ARRAYCOUNT(traumamarkers), traumafillexcfade); - numtraumamarkers += healthbarMaybeInsertMarker(traumamarkers, traumamarkerindexes, ARRAYCOUNT(traumamarkers), traumafillincfade); + numtraumamarkers += healthbar_maybe_insert_marker(traumamarkers, traumamarkerindexes, ARRAYCOUNT(traumamarkers), traumafillexcfade); + numtraumamarkers += healthbar_maybe_insert_marker(traumamarkers, traumamarkerindexes, ARRAYCOUNT(traumamarkers), traumafillincfade); for (i = 0; i < numtraumamarkers; i++) { index = traumamarkerindexes[i]; marker = &traumamarkers[index]; - colour = healthbarChooseColour(traumacol, bgcol, traumafillexcfade, traumafillincfade, marker->frac); + colour = healthbar_choose_colour(traumacol, bgcol, traumafillexcfade, traumafillincfade, marker->frac); traumavertices->x = (s32)marker->x1 + offx; traumavertices->y = 0; diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c index f9ac6d6c6..9bcb528ad 100644 --- a/src/game/hudmsg.c +++ b/src/game/hudmsg.c @@ -78,37 +78,37 @@ struct hudmsgtype g_HudmsgTypes[] = { #endif }; -u8 hudmsgsAreActive(void) +u8 hudmsgs_are_active(void) { return g_HudmsgsActive; } -s32 hudmsgIsZoomRangeVisible(void) +s32 hudmsg_is_zoom_range_visible(void) { - return optionsGetShowZoomRange(g_Vars.currentplayerstats->mpindex) + return options_get_show_zoom_range(g_Vars.currentplayerstats->mpindex) && (PLAYERCOUNT() == 1 || !g_Vars.mplayerisrunning || g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) && var80075d60 == 2 - && currentPlayerGetSight() == SIGHT_ZOOM + && current_player_get_sight() == SIGHT_ZOOM && g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY && g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON; } /** - * hudmsgRenderMissionTimer calls viGetWidth (which returns an s16), then stores - * the width in sp42 while it calls viGetHeight. However, when we do this it + * hudmsg_render_mission_timer calls vi_get_width (which returns an s16), then stores + * the width in sp42 while it calls vi_get_height. However, when we do this it * stores the width to sp40 instead. * - * Changing the definition of viGetHeight to return an s32 fixes this, but is + * Changing the definition of vi_get_height to return an s32 fixes this, but is * surely wrong and creates mismatches elsewhere. So we declare a new function - * with the return type we need, and link it to the same address as viGetHeight + * with the return type we need, and link it to the same address as vi_get_height * via the linker config. */ -extern s32 viGetHeight_hack(void); +extern s32 vi_get_height_hack(void); -Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 alpha) +Gfx *hudmsg_render_mission_timer(Gfx *gdl, u32 alpha) { s32 x; s32 y; @@ -124,9 +124,9 @@ Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 alpha) textcolour = alpha; - viewleft = viGetViewLeft() / g_ScaleX; - viewtop = viGetViewTop(); - viewheight = viGetViewHeight(); + viewleft = vi_get_view_left() / g_ScaleX; + viewtop = vi_get_view_top(); + viewheight = vi_get_view_height(); playercount = PLAYERCOUNT(); playernum = g_Vars.currentplayernum; @@ -141,16 +141,16 @@ Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 alpha) // Because of this, in 1 player the timer is drawn out of place when the // screen split option is vertical and either the countdown timer is visible // or a zoomable weapon is in use. - if ((is4mb || optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) && countdownTimerIsVisible()) { + if ((is4mb || options_get_screen_split() == SCREENSPLIT_VERTICAL) && countdown_timer_is_visible()) { timery -= 8; } - if ((IS4MB() || optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || playercount >= 3) && hudmsgIsZoomRangeVisible()) { + if ((IS4MB() || options_get_screen_split() == SCREENSPLIT_VERTICAL || playercount >= 3) && hudmsg_is_zoom_range_visible()) { timery -= 8; } if (playercount == 2) { - if (IS4MB() || (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && playernum == 0)) { + if (IS4MB() || (options_get_screen_split() != SCREENSPLIT_VERTICAL && playernum == 0)) { timery += 10; } else { timery += 2; @@ -162,7 +162,7 @@ Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 alpha) timery += 2; } } else { - if (optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { + if (options_get_effective_screen_size() != SCREENSIZE_FULL) { timery += 8; } } @@ -170,7 +170,7 @@ Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 alpha) // If this is a second player with their viewport on the right side of the // screen, move the timer left a bit as the safe zone doesn't need to be // considered. - if (playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB()) && playernum == 1) { + if (playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB()) && playernum == 1) { viewleft -= 14; } else if (playercount >= 3 && (playernum & 1) == 1) { viewleft -= 14; @@ -180,17 +180,17 @@ Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 alpha) if (g_Is4Mb); textcolour |= 0x00ff0000; - formatTime(buffer, playerGetMissionTime(), TIMEPRECISION_HUNDREDTHS); + format_time(buffer, player_get_mission_time(), TIMEPRECISION_HUNDREDTHS); x = viewleft + g_HudPaddingX + 3; y = timery; - gdl = textRender(gdl, &x, &y, buffer, g_CharsNumeric, g_FontNumeric, textcolour, 0x000000a0, viGetWidth(), viGetHeight_hack(), 0, 0); + gdl = text_render(gdl, &x, &y, buffer, g_CharsNumeric, g_FontNumeric, textcolour, 0x000000a0, vi_get_width(), vi_get_height_hack(), 0, 0); return gdl; } -Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha) +Gfx *hudmsg_render_zoom_range(Gfx *gdl, u32 alpha) { s32 viewtop; s32 viewleft; @@ -213,10 +213,10 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha) u32 colour; colour = (alpha * 0xa0 / 255) | 0x00ff0000; - viewtop = viGetViewTop(); - viewleft = viGetViewLeft() / g_ScaleX; - viewhalfwidth = (viGetViewWidth() / g_ScaleX) >> 1; - viewheight = viGetViewHeight(); + viewtop = vi_get_view_top(); + viewleft = vi_get_view_left() / g_ScaleX; + viewhalfwidth = (vi_get_view_width() / g_ScaleX) >> 1; + viewheight = vi_get_view_height(); texty = viewheight + viewtop - 1; maxzoom = 1.0f; weaponnum = g_Vars.currentplayer->hands[0].gset.weaponnum; @@ -224,12 +224,12 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha) texty -= 17; - if (countdownTimerIsVisible()) { + if (countdown_timer_is_visible()) { texty -= 8; } if (playercount == 2) { - if (IS4MB() || (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && g_Vars.currentplayernum == 0)) { + if (IS4MB() || (options_get_screen_split() != SCREENSPLIT_VERTICAL && g_Vars.currentplayernum == 0)) { texty += 10; } else { texty += 2; @@ -240,12 +240,12 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha) } else { texty += 2; } - } else if (optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { + } else if (options_get_effective_screen_size() != SCREENSIZE_FULL) { texty += 8; } // Left side - current zoom level - zoomfov = currentPlayerGetGunZoomFov(); + zoomfov = current_player_get_gun_zoom_fov(); zoominfovy = g_Vars.currentplayer->zoominfovy; if (zoomfov == 0.0f || zoomfov == 60.0f) { @@ -260,7 +260,7 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha) } sprintf(text, "%s%s%4.2fX", "", "", curzoom); - textMeasure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0); + text_measure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0); x = viewleft + viewhalfwidth - textwidth - 5; y = texty; @@ -268,11 +268,11 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha) y2 = y + textheight; gdl = text0f1538e4(gdl, &x, &y, &x2, &y2); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, vi_get_width(), vi_get_height(), 0, 0); // Divider sprintf(text, "/"); - textMeasure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0); + text_measure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0); x = viewleft + viewhalfwidth - (textwidth >> 1); y = texty; @@ -280,11 +280,11 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha) y2 = y + textheight; gdl = text0f1538e4(gdl, &x, &y, &x2, &y2); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, vi_get_width(), vi_get_height(), 0, 0); // Right side - max zoom level sprintf(text, "%s%s%4.2fX", "", "", maxzoom); - textMeasure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0); + text_measure(&textheight, &textwidth, text, g_CharsNumeric, g_FontNumeric, 0); x = viewleft + viewhalfwidth + 5; y = texty; @@ -292,12 +292,12 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha) y2 = y + textheight; gdl = text0f1538e4(gdl, &x, &y, &x2, &y2); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, colour, 0x000000a0, vi_get_width(), vi_get_height(), 0, 0); return gdl; } -Gfx *hudmsgRenderBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u32 bordercolour, f32 textopacity) +Gfx *hudmsg_render_box(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u32 bordercolour, f32 textopacity) { f32 f0; f32 f20; @@ -320,10 +320,10 @@ Gfx *hudmsgRenderBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u3 gdl = func0f0d479c(gdl); - gdl = menugfxDrawFilledRect(gdl, x1, y1, x2, y1 + 1, bordercolour, bordercolour); - gdl = menugfxDrawFilledRect(gdl, x1, y2, x2, y2 + 1, bordercolour, bordercolour); - gdl = menugfxDrawFilledRect(gdl, x1, y1 + 1, x1 + 1, y2, bordercolour, bordercolour); - gdl = menugfxDrawFilledRect(gdl, x2, y1, x2 + 1, y2 + 1, bordercolour, bordercolour); + gdl = menugfx_draw_filled_rect(gdl, x1, y1, x2, y1 + 1, bordercolour, bordercolour); + gdl = menugfx_draw_filled_rect(gdl, x1, y2, x2, y2 + 1, bordercolour, bordercolour); + gdl = menugfx_draw_filled_rect(gdl, x1, y1 + 1, x1 + 1, y2, bordercolour, bordercolour); + gdl = menugfx_draw_filled_rect(gdl, x2, y1, x2 + 1, y2 + 1, bordercolour, bordercolour); gdl = func0f0d49c8(gdl); @@ -345,13 +345,13 @@ Gfx *hudmsgRenderBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u3 s32 hudmsg0f0ddb1c(s32 *arg0, s32 arg1) { #if VERSION >= VERSION_PAL_FINAL - s32 viewwidth = viGetViewWidth() / g_ScaleX; + s32 viewwidth = vi_get_view_width() / g_ScaleX; s32 result = 0; *arg0 = 24; if (PLAYERCOUNT() == 2 - && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL + && options_get_screen_split() == SCREENSPLIT_VERTICAL && (!g_InCutscene || g_MainIsEndscreen)) { result -= *arg0 * 2 / 3; @@ -379,7 +379,7 @@ s32 hudmsg0f0ddb1c(s32 *arg0, s32 arg1) *arg0 = 24; - if (PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { + if (PLAYERCOUNT() == 2 && options_get_screen_split() == SCREENSPLIT_VERTICAL) { result -= *arg0 * 2 / 3; if (g_Vars.currentplayernum == 0) { @@ -399,7 +399,7 @@ s32 hudmsg0f0ddb1c(s32 *arg0, s32 arg1) return result; } -void hudmsgsHideByChannel(s32 channelnum) +void hudmsgs_hide_by_channel(s32 channelnum) { s32 i; @@ -411,12 +411,12 @@ void hudmsgsHideByChannel(s32 channelnum) } } -void hudmsgsReset(void) +void hudmsgs_reset(void) { s32 i; g_NumHudMessages = g_Vars.mplayerisrunning ? 20 : 8; - g_HudMessages = mempAlloc(ALIGN64(sizeof(struct hudmessage) * g_NumHudMessages), MEMPOOL_STAGE); + g_HudMessages = memp_alloc(ALIGN64(sizeof(struct hudmessage) * g_NumHudMessages), MEMPOOL_STAGE); for (i = 0; i < g_NumHudMessages; i++) { g_HudMessages[i].state = HUDMSGSTATE_FREE; @@ -429,7 +429,7 @@ void hudmsgsReset(void) #endif } -void hudmsgRemoveAll(void) +void hudmsg_remove_all(void) { s32 i; @@ -438,7 +438,7 @@ void hudmsgRemoveAll(void) } } -s32 hudmsgGetNext(s32 refid) +s32 hudmsg_get_next(s32 refid) { s32 bestid = -1; s32 bestindex = -1; @@ -457,9 +457,9 @@ s32 hudmsgGetNext(s32 refid) return bestindex; } -void hudmsgCreate(char *text, s32 type) +void hudmsg_create(char *text, s32 type) { - hudmsgCreateFromArgs(text, type, + hudmsg_create_from_args(text, type, g_HudmsgTypes[type].unk00, g_HudmsgTypes[type].unk01, g_HudmsgTypes[type].unk02, @@ -474,9 +474,9 @@ void hudmsgCreate(char *text, s32 type) -1, 0); } -void hudmsgCreateWithFlags(char *text, s32 type, u32 flags) +void hudmsg_create_with_flags(char *text, s32 type, u32 flags) { - hudmsgCreateFromArgs(text, type, + hudmsg_create_from_args(text, type, g_HudmsgTypes[type].unk00, g_HudmsgTypes[type].unk01, g_HudmsgTypes[type].unk02, @@ -491,11 +491,11 @@ void hudmsgCreateWithFlags(char *text, s32 type, u32 flags) -1, flags); } -void hudmsgCreateWithColour(char *text, s32 type, u8 colournum) +void hudmsg_create_with_colour(char *text, s32 type, u8 colournum) { g_HudmsgTypes[type].colour = g_HudmsgColours[colournum]; - hudmsgCreateFromArgs(text, type, + hudmsg_create_from_args(text, type, g_HudmsgTypes[type].unk00, g_HudmsgTypes[type].unk01, g_HudmsgTypes[type].unk02, @@ -510,9 +510,9 @@ void hudmsgCreateWithColour(char *text, s32 type, u8 colournum) -1, 0); } -void hudmsgCreateWithDuration(char *text, s32 type, struct hudmsgtype *config, s32 duration60) +void hudmsg_create_with_duration(char *text, s32 type, struct hudmsgtype *config, s32 duration60) { - hudmsgCreateFromArgs(text, type, + hudmsg_create_from_args(text, type, config->unk00, config->unk01, config->unk02, @@ -550,21 +550,21 @@ void hudmsgCreateWithDuration(char *text, s32 type, struct hudmsgtype *config, s * Each hudmsg is assigned a duration according to its character length relative * to the entire string and the audio duration. */ -void hudmsgCreateAsSubtitle(char *srctext, s32 type, u8 colourindex, s32 audiochannelnum) +void hudmsg_create_as_subtitle(char *srctext, s32 type, u8 colourindex, s32 audiochannelnum) { s32 audioduration60; struct hudmsgtype *config; - audioduration60 = psGetDuration60(audiochannelnum); + audioduration60 = ps_get_duration60(audiochannelnum); if (type == HUDMSGTYPE_INGAMESUBTITLE) { if (g_Vars.tickmode == TICKMODE_CUTSCENE) { - if (!optionsGetCutsceneSubtitles()) { + if (!options_get_cutscene_subtitles()) { return; } type = HUDMSGTYPE_CUTSCENESUBTITLE; - } else if (!optionsGetInGameSubtitles()) { + } else if (!options_get_in_game_subtitles()) { return; } } @@ -603,7 +603,7 @@ void hudmsgCreateAsSubtitle(char *srctext, s32 type, u8 colourindex, s32 audioch buffer[len] = '\0'; if (len != 0) { - hudmsgCreateWithDuration(buffer, type, config, len * time60perchar); + hudmsg_create_with_duration(buffer, type, config, len * time60perchar); } } #else @@ -732,7 +732,7 @@ void hudmsgCreateAsSubtitle(char *srctext, s32 type, u8 colourindex, s32 audioch prewrap[accumlen + msglen + 1] = '\0'; // Apply text wrapping to prewrap - textWrap(wrapwidth, prewrap, postwrap, g_CharsHandelGothicSm, g_FontHandelGothicSm); + text_wrap(wrapwidth, prewrap, postwrap, g_CharsHandelGothicSm, g_FontHandelGothicSm); // Next, count the number of lines in the wrapped message. // If it's more than two, send the accumulator out as a hudmsg and @@ -759,7 +759,7 @@ void hudmsgCreateAsSubtitle(char *srctext, s32 type, u8 colourindex, s32 audioch msg[msglen] = '\0'; - hudmsgCreateWithDuration(msg, type, config, msglen * time60perchar); + hudmsg_create_with_duration(msg, type, config, msglen * time60perchar); append = false; } else { // Queue the accumulator and then clear it. @@ -770,7 +770,7 @@ void hudmsgCreateAsSubtitle(char *srctext, s32 type, u8 colourindex, s32 audioch accum[accumlen] = '\0'; - hudmsgCreateWithDuration(accum, type, config, accumlen * time60perchar); + hudmsg_create_with_duration(accum, type, config, accumlen * time60perchar); accumlen = 0; } } @@ -793,19 +793,19 @@ void hudmsgCreateAsSubtitle(char *srctext, s32 type, u8 colourindex, s32 audioch accum[accumlen] = '\0'; - hudmsgCreateWithDuration(accum, type, config, accumlen * time60perchar); + hudmsg_create_with_duration(accum, type, config, accumlen * time60perchar); } #endif } else { - hudmsgCreateFromArgs(srctext, type, config->unk00, config->unk01, config->unk02, + hudmsg_create_from_args(srctext, type, config->unk00, config->unk01, config->unk02, config->unk04, config->unk08, config->colour, config->unk10, config->alignh, config->unk16, config->alignv, config->unk18, audiochannelnum, 0); } } -void hudmsgCreateFromArgsWithoutFlags(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) +void hudmsg_create_from_args_without_flags(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) { - hudmsgCreateFromArgs(text, type, + hudmsg_create_from_args(text, type, conf00, conf01, conf02, @@ -820,7 +820,7 @@ void hudmsgCreateFromArgsWithoutFlags(char *text, s32 type, s32 conf00, s32 conf arg14, 0); } -void hudmsgCalculatePosition(struct hudmessage *msg) +void hudmsg_calculate_position(struct hudmessage *msg) { s32 x; s32 y; @@ -841,7 +841,7 @@ void hudmsgCalculatePosition(struct hudmessage *msg) } } - if (PLAYERCOUNT() == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) { + if (PLAYERCOUNT() == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())) { #if VERSION >= VERSION_PAL_FINAL if (!g_InCutscene || g_MainIsEndscreen) #endif @@ -865,7 +865,7 @@ void hudmsgCalculatePosition(struct hudmessage *msg) x = viewleft + v0 + msg->xmargin + 3; if (PLAYERCOUNT() == 2 - && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB()) + && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB()) && (!g_InCutscene || g_MainIsEndscreen)) { if (IS4MB()) { if (msg->playernum == 0) { @@ -910,7 +910,7 @@ void hudmsgCalculatePosition(struct hudmessage *msg) y = viewtop + viewheight - msg->height - msg->ymargin - 14; if (PLAYERCOUNT() == 2 && (g_InCutscene == 0 || g_MainIsEndscreen)) { - if (IS4MB() || (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && msg->playernum == 0)) { + if (IS4MB() || (options_get_screen_split() != SCREENSPLIT_VERTICAL && msg->playernum == 0)) { y += 8; } else { y += 3; @@ -922,7 +922,7 @@ void hudmsgCalculatePosition(struct hudmessage *msg) y += 3; } } else { - if (optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { + if (options_get_effective_screen_size() != SCREENSIZE_FULL) { y += 8; } } @@ -942,7 +942,7 @@ void hudmsgCalculatePosition(struct hudmessage *msg) msg->y = y; } -void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf02, +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) @@ -959,7 +959,7 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf char stacktext[400]; s32 writeindex; - if (type == HUDMSGTYPE_INGAMESUBTITLE && !optionsGetInGameSubtitles()) { + if (type == HUDMSGTYPE_INGAMESUBTITLE && !options_get_in_game_subtitles()) { return; } @@ -1004,7 +1004,7 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf || type == HUDMSGTYPE_OBJECTIVEFAILED || type == HUDMSGTYPE_INGAMESUBTITLE)) { // Out of space - Check if an existing message can be replaced - index = hudmsgGetNext(-1); + index = hudmsg_get_next(-1); while (index >= 0) { if (g_HudMessages[index].state == HUDMSGSTATE_QUEUED) { @@ -1017,7 +1017,7 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf } // Can't replace - try and find another - index = hudmsgGetNext(g_HudMessages[index].id); + index = hudmsg_get_next(g_HudMessages[index].id); } } @@ -1025,7 +1025,7 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf xmarginaextra = 0; msg = &g_HudMessages[index]; wrapwidth = hudmsg0f0ddb1c(&xmarginaextra, conf16); - textMeasure(&textheight, &textwidth, text, *conf04, *conf08, 0); + text_measure(&textheight, &textwidth, text, *conf04, *conf08, 0); #if VERSION >= VERSION_JPN_FINAL if (textwidth > wrapwidth && (flags & HUDMSGFLAG_NOWRAP) == 0) @@ -1047,8 +1047,8 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf stacktext[writeindex++] = '\n'; stacktext[writeindex++] = '\0'; - textWrap(wrapwidth, stacktext, msg->text, *conf04, *conf08); - textMeasure(&textheight, &textwidth, msg->text, *conf04, *conf08, 0); + text_wrap(wrapwidth, stacktext, msg->text, *conf04, *conf08); + text_measure(&textheight, &textwidth, msg->text, *conf04, *conf08, 0); } else { strncpy(msg->text, text, 399); msg->text[399] = '\0'; @@ -1076,7 +1076,7 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf msg->ymargin = conf18; msg->hash = hash; - hudmsgCalculatePosition(msg); + hudmsg_calculate_position(msg); if (flags & HUDMSGFLAG_NOCHANNEL) { msg->showduration = TICKS(arg14); @@ -1091,7 +1091,7 @@ void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf } } -void hudmsgsTick(void) +void hudmsgs_tick(void) { s32 k; s32 previd; @@ -1135,23 +1135,23 @@ void hudmsgsTick(void) } } - setCurrentPlayerNum(g_HudMessages[k].playernum); - hudmsgCalculatePosition(&g_HudMessages[k]); + set_current_player_num(g_HudMessages[k].playernum); + hudmsg_calculate_position(&g_HudMessages[k]); } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); #else for (k = 0; k < g_NumHudMessages; k++) { if (g_HudMessages[k].state != HUDMSGSTATE_FREE) { - hudmsgCalculatePosition(&g_HudMessages[k]); + hudmsg_calculate_position(&g_HudMessages[k]); } } #endif previd = -1; \ while (true) { - index = hudmsgGetNext(previd); + index = hudmsg_get_next(previd); if (index < 0) { break; @@ -1161,7 +1161,7 @@ void hudmsgsTick(void) previd = msg->id; if (msg->channelnum >= 0) { - msg->opacity = psGetSubtitleOpacity(msg->channelnum); + msg->opacity = ps_get_subtitle_opacity(msg->channelnum); } else { msg->opacity = 0xff; } @@ -1254,17 +1254,17 @@ void hudmsgsTick(void) } else { // Most HUD messages play a swish sound effect if (msg->timer == 0 - && !lvIsPaused() - && !mpIsPaused() + && !lv_is_paused() + && !mp_is_paused() #if VERSION >= VERSION_NTSC_1_0 && msg->type != HUDMSGTYPE_CUTSCENESUBTITLE && msg->type != HUDMSGTYPE_INGAMESUBTITLE #endif && PLAYERCOUNT() == 1) { #if VERSION >= VERSION_NTSC_1_0 - sndStart(var80095200, SFX_HUDMSG, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_HUDMSG, NULL, -1, -1, -1, -1, -1); #else - sndStart(var80095200, SFX_HUDMSG, &var800736b0nb, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_HUDMSG, &var800736b0nb, -1, -1, -1, -1, -1); #endif } @@ -1285,7 +1285,7 @@ void hudmsgsTick(void) // Subtitles have an audio channel number and are hidden when the audio stops if (msg->channelnum >= 0) { - if (psIsChannelFree(msg->channelnum)) { + if (ps_is_channel_free(msg->channelnum)) { hide = true; } else if (msg->flags & HUDMSGFLAG_FORCEOFF) { msg->flags &= ~HUDMSGFLAG_FORCEOFF; @@ -1323,17 +1323,17 @@ void hudmsgsTick(void) g_ScaleX = 1; } -void hudmsgsSetOn(u32 reason) +void hudmsgs_set_on(u32 reason) { g_Vars.currentplayer->hudmessoff &= ~reason; } -void hudmsgsSetOff(u32 reason) +void hudmsgs_set_off(u32 reason) { g_Vars.currentplayer->hudmessoff |= reason; } -void hudmsgsRemoveForDeadPlayer(s32 playernum) +void hudmsgs_remove_for_dead_player(s32 playernum) { s32 i; @@ -1347,7 +1347,7 @@ void hudmsgsRemoveForDeadPlayer(s32 playernum) } } -Gfx *hudmsgsRender(Gfx *gdl) +Gfx *hudmsgs_render(Gfx *gdl) { struct hudmessage *msg; s32 i; @@ -1418,15 +1418,15 @@ Gfx *hudmsgsRender(Gfx *gdl) x = msg->x; y = msg->y; - if (msg->type == HUDMSGTYPE_INGAMESUBTITLE && playerIsHealthVisible()) { - y += (s32)(16.0f * playerGetHealthBarHeightFrac()); + if (msg->type == HUDMSGTYPE_INGAMESUBTITLE && player_is_health_visible()) { + y += (s32)(16.0f * player_get_health_bar_height_frac()); } if (msg->type == HUDMSGTYPE_CUTSCENESUBTITLE) { #if VERSION >= VERSION_NTSC_1_0 gDPSetScissor(gdl++, 0, (x - 4) * g_ScaleX, 0, - (x + msg->width + 3) * g_ScaleX, viGetBufHeight()); + (x + msg->width + 3) * g_ScaleX, vi_get_buf_height()); #else gDPSetScissor(gdl++, 0, (x - 4) * g_ScaleX, y - 4, @@ -1467,23 +1467,23 @@ Gfx *hudmsgsRender(Gfx *gdl) tmp = msg->timer * PALUPF(7.0f); - textSetDiagonalBlend(x, y, tmp, DIAGMODE_FADEIN); + text_set_diagonal_blend(x, y, tmp, DIAGMODE_FADEIN); if (msg->boxed) { #if VERSION >= VERSION_JPN_FINAL - gdl = hudmsgRenderBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height - 1, 1.0f, bordercolour, spc0); + gdl = hudmsg_render_box(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height - 1, 1.0f, bordercolour, spc0); #else - gdl = hudmsgRenderBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, spc0); + gdl = hudmsg_render_box(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, spc0); #endif - gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, vi_get_width(), vi_get_height(), 0, 0); } else { gdl = text0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0); #if VERSION >= VERSION_JPN_FINAL - gdl = func0f1574d0jf(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = func0f1574d0jf(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, vi_get_width(), vi_get_height(), 0, 0); #endif } @@ -1491,7 +1491,7 @@ Gfx *hudmsgsRender(Gfx *gdl) timerthing = 0; } - textResetBlends(); + text_reset_blends(); } break; case HUDMSGSTATE_ONSCREEN: @@ -1504,19 +1504,19 @@ Gfx *hudmsgsRender(Gfx *gdl) } #if VERSION >= VERSION_JPN_FINAL - gdl = hudmsgRenderBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height - 1, 1.0f, bordercolour, 1.0f); + gdl = hudmsg_render_box(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height - 1, 1.0f, bordercolour, 1.0f); #else - gdl = hudmsgRenderBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, 1.0f); + gdl = hudmsg_render_box(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, 1.0f); #endif - gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, vi_get_width(), vi_get_height(), 0, 0); } else { gdl = text0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0); #if VERSION >= VERSION_JPN_FINAL - gdl = func0f1574d0jf(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = func0f1574d0jf(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, vi_get_width(), vi_get_height(), 0, 0); #endif } if (msg->alignv == 6) { @@ -1539,7 +1539,7 @@ Gfx *hudmsgsRender(Gfx *gdl) tmp = (spa8 - msg->timer) * PALUPF(7.0f); - textSetDiagonalBlend(x + msg->width, y + msg->height, tmp, DIAGMODE_FADEOUT); + text_set_diagonal_blend(x + msg->width, y + msg->height, tmp, DIAGMODE_FADEOUT); if (spa8 > 30.0f) { spa8 = 30.0f; @@ -1553,19 +1553,19 @@ Gfx *hudmsgsRender(Gfx *gdl) if (msg->boxed) { #if VERSION >= VERSION_JPN_FINAL - gdl = hudmsgRenderBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height - 1, 1.0f, bordercolour, 1.0f - spa8); + gdl = hudmsg_render_box(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height - 1, 1.0f, bordercolour, 1.0f - spa8); #else - gdl = hudmsgRenderBox(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, 1.0f - spa8); + gdl = hudmsg_render_box(gdl, x - 3, y - 3, x + msg->width + 2, y + msg->height + 2, 1.0f, bordercolour, 1.0f - spa8); #endif - gdl = textRenderProjected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, vi_get_width(), vi_get_height(), 0, 0); } else { gdl = text0f153a34(gdl, x, y, x + msg->width, y + msg->height, 0); #if VERSION >= VERSION_JPN_FINAL - gdl = func0f1574d0jf(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = func0f1574d0jf(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, msg->text, msg->font1, msg->font2, textcolour, glowcolour, vi_get_width(), vi_get_height(), 0, 0); #endif } @@ -1573,33 +1573,33 @@ Gfx *hudmsgsRender(Gfx *gdl) timerthing = 0; } - textResetBlends(); + text_reset_blends(); } break; } if (msg->type == HUDMSGTYPE_CUTSCENESUBTITLE) { gDPSetScissor(gdl++, 0, - viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), viGetViewTop() + viGetViewHeight()); + vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), vi_get_view_top() + vi_get_view_height()); } } if (timerthing) { - if (optionsGetShowMissionTime(g_Vars.currentplayerstats->mpindex) + if (options_get_show_mission_time(g_Vars.currentplayerstats->mpindex) && var80075d60 == 2 && g_Vars.normmplayerisrunning == false && g_Vars.stagenum != STAGE_CITRAINING && g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY && g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON) { - gdl = hudmsgRenderMissionTimer(gdl, timerthing); + gdl = hudmsg_render_mission_timer(gdl, timerthing); } - if (hudmsgIsZoomRangeVisible()) { - gdl = hudmsgRenderZoomRange(gdl, timerthing); + if (hudmsg_is_zoom_range_visible()) { + gdl = hudmsg_render_zoom_range(gdl, timerthing); } - gdl = countdownTimerRender(gdl); + gdl = countdown_timer_render(gdl); } gdl = text0f153780(gdl); @@ -1609,7 +1609,7 @@ Gfx *hudmsgsRender(Gfx *gdl) return gdl; } -void hudmsgsStop(void) +void hudmsgs_stop(void) { s32 i; diff --git a/src/game/inv.c b/src/game/inv.c index 87b5504b7..155ec72a6 100644 --- a/src/game/inv.c +++ b/src/game/inv.c @@ -11,7 +11,7 @@ #include "data.h" #include "types.h" -void invClear(void) +void inv_clear(void) { s32 i; @@ -29,7 +29,7 @@ void invClear(void) * Subject is expected to initially be at the head of the list. It works by * swapping the subject with the item to its right as many times as needed. */ -void invSortItem(struct invitem *subject) +void inv_sort_item(struct invitem *subject) { struct invitem *candidate; s32 subjweapon1 = -1; @@ -93,13 +93,13 @@ void invSortItem(struct invitem *subject) } } -void invInsertItem(struct invitem *item) +void inv_insert_item(struct invitem *item) { if (item->type == INVITEMTYPE_PROP) { struct prop *prop = item->type_prop.prop; if (prop && prop->obj) { - struct textoverride *override = invGetTextOverrideForObj(prop->obj); + struct textoverride *override = inv_get_text_override_for_obj(prop->obj); bool setflag = true; if (override) { @@ -137,11 +137,11 @@ void invInsertItem(struct invitem *item) g_Vars.currentplayer->weapons = item; - invSortItem(item); - invCalculateCurrentIndex(); + inv_sort_item(item); + inv_calculate_current_index(); } -void invRemoveItem(struct invitem *item) +void inv_remove_item(struct invitem *item) { struct invitem *next = item->next; struct invitem *prev = item->prev; @@ -158,10 +158,10 @@ void invRemoveItem(struct invitem *item) prev->next = next; item->type = -1; - invCalculateCurrentIndex(); + inv_calculate_current_index(); } -struct invitem *invFindUnusedSlot(void) +struct invitem *inv_find_unused_slot(void) { s32 i; @@ -174,22 +174,22 @@ struct invitem *invFindUnusedSlot(void) return NULL; } -void invSetAllGuns(bool enable) +void inv_set_all_guns(bool enable) { s32 weaponnum; g_Vars.currentplayer->equipallguns = enable; - invCalculateCurrentIndex(); - weaponnum = invGetWeaponNumByIndex(g_Vars.currentplayer->equipcuritem); - bgunEquipWeapon(weaponnum); + inv_calculate_current_index(); + weaponnum = inv_get_weapon_num_by_index(g_Vars.currentplayer->equipcuritem); + bgun_equip_weapon(weaponnum); } -bool invHasAllGuns(void) +bool inv_has_all_guns(void) { return g_Vars.currentplayer->equipallguns; } -struct invitem *invFindSingleWeapon(s32 weaponnum) +struct invitem *inv_find_single_weapon(s32 weaponnum) { struct invitem *first = g_Vars.currentplayer->weapons; struct invitem *item = first; @@ -209,12 +209,12 @@ struct invitem *invFindSingleWeapon(s32 weaponnum) return NULL; } -bool invHasSingleWeaponExcAllGuns(s32 weaponnum) +bool inv_has_single_weapon_exc_all_guns(s32 weaponnum) { - return invFindSingleWeapon(weaponnum) != NULL; + return inv_find_single_weapon(weaponnum) != NULL; } -struct invitem *invFindDoubleWeapon(s32 weapon1, s32 weapon2) +struct invitem *inv_find_double_weapon(s32 weapon1, s32 weapon2) { struct invitem *first = g_Vars.currentplayer->weapons; struct invitem *item = first; @@ -236,12 +236,12 @@ struct invitem *invFindDoubleWeapon(s32 weapon1, s32 weapon2) return NULL; } -bool invHasDoubleWeaponExcAllGuns(s32 weapon1, s32 weapon2) +bool inv_has_double_weapon_exc_all_guns(s32 weapon1, s32 weapon2) { - return invFindDoubleWeapon(weapon1, weapon2) != NULL; + return inv_find_double_weapon(weapon1, weapon2) != NULL; } -bool invHasSingleWeaponOrProp(s32 weaponnum) +bool inv_has_single_weapon_or_prop(s32 weaponnum) { struct invitem *item = g_Vars.currentplayer->weapons; @@ -276,12 +276,12 @@ bool invHasSingleWeaponOrProp(s32 weaponnum) return false; } -s32 invAddOneIfCantHaveSlayer(s32 index) +s32 inv_add_one_if_cant_have_slayer(s32 index) { - if (mainGetStageNum()); + if (main_get_stage_num()); - if (mainGetStageNum() != STAGE_ATTACKSHIP - && mainGetStageNum() != STAGE_SKEDARRUINS + if (main_get_stage_num() != STAGE_ATTACKSHIP + && main_get_stage_num() != STAGE_SKEDARRUINS && index >= WEAPON_SLAYER) { index++; } @@ -295,18 +295,18 @@ s32 invAddOneIfCantHaveSlayer(s32 index) return index; } -s32 currentStageForbidsSlayer(void) +s32 current_stage_forbids_slayer(void) { bool value = VERSION >= VERSION_JPN_FINAL ? 1 : 0; - if (mainGetStageNum() != STAGE_ATTACKSHIP && mainGetStageNum() != STAGE_SKEDARRUINS) { + if (main_get_stage_num() != STAGE_ATTACKSHIP && main_get_stage_num() != STAGE_SKEDARRUINS) { value++; } return value; } -bool invCanHaveAllGunsWeapon(s32 weaponnum) +bool inv_can_have_all_guns_weapon(s32 weaponnum) { bool canhave = true; @@ -321,7 +321,7 @@ bool invCanHaveAllGunsWeapon(s32 weaponnum) } // @bug: The stage conditions need an OR. This condition can never pass. - if ((mainGetStageNum() == STAGE_ATTACKSHIP && mainGetStageNum() == STAGE_SKEDARRUINS) + if ((main_get_stage_num() == STAGE_ATTACKSHIP && main_get_stage_num() == STAGE_SKEDARRUINS) && weaponnum == WEAPON_SLAYER) { canhave = true; } @@ -329,18 +329,18 @@ bool invCanHaveAllGunsWeapon(s32 weaponnum) return canhave; } -bool invHasSingleWeaponIncAllGuns(s32 weaponnum) +bool inv_has_single_weapon_inc_all_guns(s32 weaponnum) { if (g_Vars.currentplayer->equipallguns && weaponnum && weaponnum <= WEAPON_PSYCHOSISGUN && - invCanHaveAllGunsWeapon(weaponnum)) { + inv_can_have_all_guns_weapon(weaponnum)) { return true; } - return invHasSingleWeaponExcAllGuns(weaponnum); + return inv_has_single_weapon_exc_all_guns(weaponnum); } -bool invHasDoubleWeaponIncAllGuns(s32 weapon1, s32 weapon2) +bool inv_has_double_weapon_inc_all_guns(s32 weapon1, s32 weapon2) { if (weapon2 == WEAPON_NONE) { return true; @@ -349,34 +349,34 @@ bool invHasDoubleWeaponIncAllGuns(s32 weapon1, s32 weapon2) if (g_Vars.currentplayer->equipallguns && weapon1 <= WEAPON_PSYCHOSISGUN && weapon1 == weapon2 && - weaponHasFlag(weapon1, WEAPONFLAG_DUALWIELD) && - invCanHaveAllGunsWeapon(weapon1)) { + weapon_has_flag(weapon1, WEAPONFLAG_DUALWIELD) && + inv_can_have_all_guns_weapon(weapon1)) { return true; } - return invHasDoubleWeaponExcAllGuns(weapon1, weapon2); + return inv_has_double_weapon_exc_all_guns(weapon1, weapon2); } -bool invGiveSingleWeapon(s32 weaponnum) +bool inv_give_single_weapon(s32 weaponnum) { - frSetWeaponFound(weaponnum); + fr_set_weapon_found(weaponnum); - if (invHasSingleWeaponExcAllGuns(weaponnum) == 0) { + if (inv_has_single_weapon_exc_all_guns(weaponnum) == 0) { struct invitem *item; if (g_Vars.currentplayer->equipallguns && weaponnum <= WEAPON_PSYCHOSISGUN && - invCanHaveAllGunsWeapon(weaponnum)) { + inv_can_have_all_guns_weapon(weaponnum)) { return false; } - item = invFindUnusedSlot(); + item = inv_find_unused_slot(); if (item) { item->type = INVITEMTYPE_WEAP; item->type_weap.weapon1 = weaponnum; item->type_weap.pickuppad = -1; - invInsertItem(item); + inv_insert_item(item); } return true; @@ -385,17 +385,17 @@ bool invGiveSingleWeapon(s32 weaponnum) return false; } -bool invGiveDoubleWeapon(s32 weapon1, s32 weapon2) +bool inv_give_double_weapon(s32 weapon1, s32 weapon2) { - if (invHasDoubleWeaponExcAllGuns(weapon1, weapon2) == 0) { - if (weaponHasFlag(weapon1, WEAPONFLAG_DUALWIELD)) { - struct invitem *item = invFindUnusedSlot(); + if (inv_has_double_weapon_exc_all_guns(weapon1, weapon2) == 0) { + if (weapon_has_flag(weapon1, WEAPONFLAG_DUALWIELD)) { + struct invitem *item = inv_find_unused_slot(); if (item) { item->type = INVITEMTYPE_DUAL; item->type_dual.weapon1 = weapon1; item->type_dual.weapon2 = weapon2; - invInsertItem(item); + inv_insert_item(item); } return true; @@ -409,7 +409,7 @@ bool invGiveDoubleWeapon(s32 weapon1, s32 weapon2) return false; } -void invRemoveItemByNum(s32 weaponnum) +void inv_remove_item_by_num(s32 weaponnum) { if (g_Vars.currentplayer->weapons) { // Begin iterating from the second item in the list. This is required @@ -419,23 +419,23 @@ void invRemoveItemByNum(s32 weaponnum) while (true) { // Have to preload this because item->next shouldn't be trusted - // after calling invRemoveItem() + // after calling inv_remove_item() struct invitem *next = item->next; if (item->type == INVITEMTYPE_PROP) { struct prop *prop = item->type_prop.prop; - struct textoverride *override = invGetTextOverrideForObj(prop->obj); + struct textoverride *override = inv_get_text_override_for_obj(prop->obj); if (override && override->weapon == weaponnum) { - invRemoveItem(item); + inv_remove_item(item); } } else if (item->type == INVITEMTYPE_WEAP) { if (item->type_weap.weapon1 == weaponnum) { - invRemoveItem(item); + inv_remove_item(item); } } else if (item->type == INVITEMTYPE_DUAL) { if (item->type_dual.weapon1 == weaponnum || item->type_dual.weapon2 == weaponnum) { - invRemoveItem(item); + inv_remove_item(item); } } @@ -448,7 +448,7 @@ void invRemoveItemByNum(s32 weaponnum) } } -bool invGiveProp(struct prop *prop) +bool inv_give_prop(struct prop *prop) { struct invitem *item; @@ -456,25 +456,25 @@ bool invGiveProp(struct prop *prop) // (night vision is already there when using perfect darkness) // Note that this check doesn't work on Investigation because it uses the // IR specs model. See bug note in Investigation's setup file (setupear.c). - if (cheatIsActive(CHEAT_PERFECTDARKNESS) + if (cheat_is_active(CHEAT_PERFECTDARKNESS) && prop->type == PROPTYPE_OBJ && prop->obj && prop->obj->modelnum == MODEL_CHRNIGHTSIGHT) { return true; } - item = invFindUnusedSlot(); + item = inv_find_unused_slot(); if (item) { item->type = INVITEMTYPE_PROP; item->type_prop.prop = prop; - invInsertItem(item); + inv_insert_item(item); } return true; } -void invRemoveProp(struct prop *prop) +void inv_remove_prop(struct prop *prop) { if (g_Vars.currentplayer->weapons) { struct invitem *item = g_Vars.currentplayer->weapons->next; @@ -483,7 +483,7 @@ void invRemoveProp(struct prop *prop) struct invitem *next = item->next; if (item->type == INVITEMTYPE_PROP && item->type_prop.prop == prop) { - invRemoveItem(item); + inv_remove_item(item); } if (item == g_Vars.currentplayer->weapons || !g_Vars.currentplayer->weapons) { @@ -495,7 +495,7 @@ void invRemoveProp(struct prop *prop) } } -s32 invGiveWeaponsByProp(struct prop *prop) +s32 inv_give_weapons_by_prop(struct prop *prop) { s32 numgiven = 0; @@ -511,18 +511,18 @@ s32 invGiveWeaponsByProp(struct prop *prop) weaponnum = weapon->weaponnum; otherweaponnum; - if (cheatIsActive(CHEAT_PERFECTDARKNESS) && weaponnum == WEAPON_NIGHTVISION) { + if (cheat_is_active(CHEAT_PERFECTDARKNESS) && weaponnum == WEAPON_NIGHTVISION) { return 1; } - if (invGiveSingleWeapon(weaponnum)) { + if (inv_give_single_weapon(weaponnum)) { numgiven = 1; } if (g_Vars.normmplayerisrunning - && weaponHasFlag(weaponnum, WEAPONFLAG_DUALWIELD) - && !invHasDoubleWeaponExcAllGuns(weaponnum, weaponnum)) { - struct invitem *invitem = invFindSingleWeapon(weaponnum); + && weapon_has_flag(weaponnum, WEAPONFLAG_DUALWIELD) + && !inv_has_double_weapon_exc_all_guns(weaponnum, weaponnum)) { + struct invitem *invitem = inv_find_single_weapon(weaponnum); if (invitem) { if (invitem->type_weap.pickuppad < 0) { @@ -530,7 +530,7 @@ s32 invGiveWeaponsByProp(struct prop *prop) invitem->type_weap.pickuppad = obj->pad; } } else if (obj->pad >= 0 && invitem->type_weap.pickuppad != obj->pad) { - if (invGiveDoubleWeapon(weaponnum, weaponnum)) { + if (inv_give_double_weapon(weaponnum, weaponnum)) { numgiven = 2; } else { numgiven = 0; @@ -543,9 +543,9 @@ s32 invGiveWeaponsByProp(struct prop *prop) if (otherweapon) { if (weapon->base.flags & OBJFLAG_WEAPON_LEFTHANDED) { - numgiven = invHasDoubleWeaponExcAllGuns(otherweapon->weaponnum, weaponnum) == 0; + numgiven = inv_has_double_weapon_exc_all_guns(otherweapon->weaponnum, weaponnum) == 0; } else { - numgiven = invHasDoubleWeaponExcAllGuns(weaponnum, otherweapon->weaponnum) == 0; + numgiven = inv_has_double_weapon_exc_all_guns(weaponnum, otherweapon->weaponnum) == 0; } weapon->dualweapon->dualweaponnum = weaponnum; @@ -553,13 +553,13 @@ s32 invGiveWeaponsByProp(struct prop *prop) weapon->dualweapon = NULL; } else if (weapon->dualweaponnum >= 0) { if (weapon->base.flags & OBJFLAG_WEAPON_LEFTHANDED) { - if (invGiveDoubleWeapon(weapon->dualweaponnum, weaponnum)) { + if (inv_give_double_weapon(weapon->dualweaponnum, weaponnum)) { numgiven = 2; } else { numgiven = 0; } } else { - if (invGiveDoubleWeapon(weaponnum, weapon->dualweaponnum)) { + if (inv_give_double_weapon(weaponnum, weapon->dualweaponnum)) { numgiven = 2; } else { numgiven = 0; @@ -572,7 +572,7 @@ s32 invGiveWeaponsByProp(struct prop *prop) return numgiven; } -void invChooseCycleForwardWeapon(s32 *ptr1, s32 *ptr2, bool arg2) +void inv_choose_cycle_forward_weapon(s32 *ptr1, s32 *ptr2, bool arg2) { s32 weapon1 = *ptr1; s32 weapon2 = *ptr2; @@ -580,7 +580,7 @@ void invChooseCycleForwardWeapon(s32 *ptr1, s32 *ptr2, bool arg2) if (g_Vars.currentplayer->equipallguns) { s32 candidate = *ptr1; - if (weaponHasFlag(*ptr1, WEAPONFLAG_DUALWIELD) && *ptr2 != *ptr1) { + if (weapon_has_flag(*ptr1, WEAPONFLAG_DUALWIELD) && *ptr2 != *ptr1) { // Switching to dual from single weapon1 = *ptr1; weapon2 = *ptr1; @@ -593,7 +593,7 @@ void invChooseCycleForwardWeapon(s32 *ptr1, s32 *ptr2, bool arg2) candidate = (candidate + 1) % NUM_CYCLEABLE_WEAPONS; } - if ((!arg2 || bgun0f0a1a10(candidate)) && invCanHaveAllGunsWeapon(candidate)) { + if ((!arg2 || bgun0f0a1a10(candidate)) && inv_can_have_all_guns_weapon(candidate)) { weapon1 = candidate; weapon2 = WEAPON_NONE; break; @@ -640,7 +640,7 @@ void invChooseCycleForwardWeapon(s32 *ptr1, s32 *ptr2, bool arg2) *ptr2 = weapon2; } -void invChooseCycleBackWeapon(s32 *ptr1, s32 *ptr2, bool arg2) +void inv_choose_cycle_back_weapon(s32 *ptr1, s32 *ptr2, bool arg2) { s32 weapon1 = *ptr1; s32 weapon2 = *ptr2; @@ -648,7 +648,7 @@ void invChooseCycleBackWeapon(s32 *ptr1, s32 *ptr2, bool arg2) if (g_Vars.currentplayer->equipallguns) { s32 candidate = *ptr1; - if (weaponHasFlag(weapon1, WEAPONFLAG_DUALWIELD) && weapon1 == weapon2) { + if (weapon_has_flag(weapon1, WEAPONFLAG_DUALWIELD) && weapon1 == weapon2) { // Switching from dual to single weapon1 = candidate; weapon2 = WEAPON_NONE; @@ -660,9 +660,9 @@ void invChooseCycleBackWeapon(s32 *ptr1, s32 *ptr2, bool arg2) if (candidate == WEAPON_NONE) { candidate = (candidate + NUM_CYCLEABLE_WEAPONS - 1) % NUM_CYCLEABLE_WEAPONS; } - } while ((arg2 && !bgun0f0a1a10(candidate)) || !invCanHaveAllGunsWeapon(candidate)); + } while ((arg2 && !bgun0f0a1a10(candidate)) || !inv_can_have_all_guns_weapon(candidate)); - if (weaponHasFlag(candidate, WEAPONFLAG_DUALWIELD)) { + if (weapon_has_flag(candidate, WEAPONFLAG_DUALWIELD)) { weapon1 = candidate; weapon2 = candidate; } else { @@ -711,7 +711,7 @@ void invChooseCycleBackWeapon(s32 *ptr1, s32 *ptr2, bool arg2) *ptr2 = weapon2; } -bool invHasKeyFlags(u32 wantkeyflags) +bool inv_has_key_flags(u32 wantkeyflags) { u32 heldkeyflags = 0; struct invitem *item = g_Vars.currentplayer->weapons; @@ -750,19 +750,19 @@ bool func0f11283c(void) return false; } -bool invHasBriefcase(void) +bool inv_has_briefcase(void) { if (g_Vars.currentplayer->isdead == false) { - return invHasSingleWeaponExcAllGuns(WEAPON_BRIEFCASE2); + return inv_has_single_weapon_exc_all_guns(WEAPON_BRIEFCASE2); } return false; } -bool invHasDataUplink(void) +bool inv_has_data_uplink(void) { if (g_Vars.currentplayer->isdead == false) { - return invHasSingleWeaponExcAllGuns(WEAPON_DATAUPLINK); + return inv_has_single_weapon_exc_all_guns(WEAPON_DATAUPLINK); } return false; @@ -773,7 +773,7 @@ bool func0f1128c4(void) return false; } -bool invHasProp(struct prop *prop) +bool inv_has_prop(struct prop *prop) { struct invitem *item = g_Vars.currentplayer->weapons; struct prop *child; @@ -803,13 +803,13 @@ bool invHasProp(struct prop *prop) return false; } -s32 invGetCount(void) +s32 inv_get_count(void) { s32 numitems = 0; struct invitem *item; if (g_Vars.currentplayer->equipallguns) { - numitems = WEAPON_PSYCHOSISGUN - currentStageForbidsSlayer(); + numitems = WEAPON_PSYCHOSISGUN - current_stage_forbids_slayer(); } item = g_Vars.currentplayer->weapons; @@ -850,16 +850,16 @@ s32 invGetCount(void) return numitems; } -struct invitem *invGetItemByIndex(s32 index) +struct invitem *inv_get_item_by_index(s32 index) { struct invitem *item; if (g_Vars.currentplayer->equipallguns) { - if (index < WEAPON_PSYCHOSISGUN - currentStageForbidsSlayer()) { + if (index < WEAPON_PSYCHOSISGUN - current_stage_forbids_slayer()) { return NULL; } - index += currentStageForbidsSlayer() - WEAPON_PSYCHOSISGUN; + index += current_stage_forbids_slayer() - WEAPON_PSYCHOSISGUN; } item = g_Vars.currentplayer->weapons; @@ -909,7 +909,7 @@ struct invitem *invGetItemByIndex(s32 index) return NULL; } -struct textoverride *invGetTextOverrideForObj(struct defaultobj *obj) +struct textoverride *inv_get_text_override_for_obj(struct defaultobj *obj) { struct textoverride *override = g_Vars.textoverrides; @@ -924,7 +924,7 @@ struct textoverride *invGetTextOverrideForObj(struct defaultobj *obj) return NULL; } -struct textoverride *invGetTextOverrideForWeapon(s32 weaponnum) +struct textoverride *inv_get_text_override_for_weapon(s32 weaponnum) { struct textoverride *override = g_Vars.textoverrides; @@ -939,14 +939,14 @@ struct textoverride *invGetTextOverrideForWeapon(s32 weaponnum) return NULL; } -s32 invGetWeaponNumByIndex(s32 index) +s32 inv_get_weapon_num_by_index(s32 index) { - struct invitem *item = invGetItemByIndex(index); + struct invitem *item = inv_get_item_by_index(index); if (item) { if (item->type == INVITEMTYPE_PROP) { struct prop *prop = item->type_prop.prop; - struct textoverride *override = invGetTextOverrideForObj(prop->obj); + struct textoverride *override = inv_get_text_override_for_obj(prop->obj); if (override) { return override->weapon; @@ -955,25 +955,25 @@ s32 invGetWeaponNumByIndex(s32 index) return item->type_weap.weapon1; } } else if (g_Vars.currentplayer->equipallguns) { - if (index < WEAPON_PSYCHOSISGUN - currentStageForbidsSlayer()) { + if (index < WEAPON_PSYCHOSISGUN - current_stage_forbids_slayer()) { index++; - return invAddOneIfCantHaveSlayer(index); + return inv_add_one_if_cant_have_slayer(index); } } return 0; } -u16 invGetNameIdByIndex(s32 index) +u16 inv_get_name_id_by_index(s32 index) { - struct invitem *item = invGetItemByIndex(index); + struct invitem *item = inv_get_item_by_index(index); s32 weaponnum = 0; struct textoverride *override; if (item) { if (item->type == INVITEMTYPE_PROP) { struct prop *prop = item->type_prop.prop; - override = invGetTextOverrideForObj(prop->obj); + override = inv_get_text_override_for_obj(prop->obj); if (override) { if (override->inventorytext) { @@ -984,7 +984,7 @@ u16 invGetNameIdByIndex(s32 index) } } else if (item->type == INVITEMTYPE_WEAP) { weaponnum = item->type_weap.weapon1; - override = invGetTextOverrideForWeapon(weaponnum); + override = inv_get_text_override_for_weapon(weaponnum); if (override && override->inventorytext) { return override->inventorytext; @@ -992,36 +992,36 @@ u16 invGetNameIdByIndex(s32 index) } } else { if (g_Vars.currentplayer->equipallguns) { - if (index < WEAPON_PSYCHOSISGUN - currentStageForbidsSlayer()) { + if (index < WEAPON_PSYCHOSISGUN - current_stage_forbids_slayer()) { index++; - return bgunGetNameId(invAddOneIfCantHaveSlayer(index)); + return bgun_get_name_id(inv_add_one_if_cant_have_slayer(index)); } } } - return bgunGetNameId(weaponnum); + return bgun_get_name_id(weaponnum); } -char *invGetNameByIndex(s32 index) +char *inv_get_name_by_index(s32 index) { - return langGet(invGetNameIdByIndex(index)); + return lang_get(inv_get_name_id_by_index(index)); } -char *invGetShortNameByIndex(s32 index) +char *inv_get_short_name_by_index(s32 index) { - struct invitem *item = invGetItemByIndex(index); + struct invitem *item = inv_get_item_by_index(index); s32 weaponnum = 0; struct textoverride *override; if (item) { if (item->type == INVITEMTYPE_PROP) { struct prop *prop = item->type_prop.prop; - override = invGetTextOverrideForObj(prop->obj); + override = inv_get_text_override_for_obj(prop->obj); if (override) { #if VERSION < VERSION_JPN_FINAL if (override->inventorytext) { - return langGet(override->inventorytext); + return lang_get(override->inventorytext); } #endif @@ -1030,90 +1030,90 @@ char *invGetShortNameByIndex(s32 index) } else if (item->type == INVITEMTYPE_WEAP) { weaponnum = item->type_weap.weapon1; #if VERSION < VERSION_JPN_FINAL - override = invGetTextOverrideForWeapon(weaponnum); + override = inv_get_text_override_for_weapon(weaponnum); if (override && override->inventorytext) { - return langGet(override->inventorytext); + return lang_get(override->inventorytext); } #endif } } else if (g_Vars.currentplayer->equipallguns) { - if (index < WEAPON_PSYCHOSISGUN - currentStageForbidsSlayer()) { + if (index < WEAPON_PSYCHOSISGUN - current_stage_forbids_slayer()) { index++; - return bgunGetShortName(invAddOneIfCantHaveSlayer(index)); + return bgun_get_short_name(inv_add_one_if_cant_have_slayer(index)); } } - return bgunGetShortName(weaponnum); + return bgun_get_short_name(weaponnum); } -void invInsertTextOverride(struct textoverride *override) +void inv_insert_text_override(struct textoverride *override) { override->next = g_Vars.textoverrides; g_Vars.textoverrides = override; } -u32 invGetCurrentIndex(void) +u32 inv_get_current_index(void) { return g_Vars.currentplayer->equipcuritem; } -void invSetCurrentIndex(u32 item) +void inv_set_current_index(u32 item) { g_Vars.currentplayer->equipcuritem = item; } -void invCalculateCurrentIndex(void) +void inv_calculate_current_index(void) { - s32 curweaponnum = bgunGetWeaponNum(HAND_RIGHT); + s32 curweaponnum = bgun_get_weapon_num(HAND_RIGHT); s32 i; g_Vars.currentplayer->equipcuritem = 0; - for (i = 0; i < invGetCount(); i++) { - if (invGetWeaponNumByIndex(i) == curweaponnum) { + for (i = 0; i < inv_get_count(); i++) { + if (inv_get_weapon_num_by_index(i) == curweaponnum) { g_Vars.currentplayer->equipcuritem = i; break; } } } -char *invGetPickupTextByObj(struct defaultobj *obj) +char *inv_get_pickup_text_by_obj(struct defaultobj *obj) { - struct textoverride *override = invGetTextOverrideForObj(obj); + struct textoverride *override = inv_get_text_override_for_obj(obj); if (override && override->pickuptext) { - return langGet(override->pickuptext); + return lang_get(override->pickuptext); } return NULL; } -char *invGetPickupTextByWeaponNum(s32 weaponnum) +char *inv_get_pickup_text_by_weapon_num(s32 weaponnum) { - struct textoverride *override = invGetTextOverrideForWeapon(weaponnum); + struct textoverride *override = inv_get_text_override_for_weapon(weaponnum); if (override && override->pickuptext) { - return langGet(override->pickuptext); + return lang_get(override->pickuptext); } return NULL; } -void invIncrementHeldTime(s32 weapon1, s32 weapon2) +void inv_increment_held_time(s32 weapon1, s32 weapon2) { s32 leastusedtime; s32 leastusedindex; s32 i; - if (!weaponHasFlag(weapon1, WEAPONFLAG_TRACKTIMEUSED)) { + if (!weapon_has_flag(weapon1, WEAPONFLAG_TRACKTIMEUSED)) { return; } leastusedtime = 0x7fffffff; leastusedindex = 0; - if (!weaponHasFlag(weapon2, WEAPONFLAG_TRACKTIMEUSED)) { + if (!weapon_has_flag(weapon2, WEAPONFLAG_TRACKTIMEUSED)) { weapon2 = 0; } @@ -1145,7 +1145,7 @@ void invIncrementHeldTime(s32 weapon1, s32 weapon2) } } -void invGetWeaponOfChoice(s32 *weapon1, s32 *weapon2) +void inv_get_weapon_of_choice(s32 *weapon1, s32 *weapon2) { s32 mosttime = -1; s32 i; diff --git a/src/game/invreset.c b/src/game/invreset.c index 8aeb2ee6a..a84328d9c 100644 --- a/src/game/invreset.c +++ b/src/game/invreset.c @@ -8,12 +8,12 @@ #include "data.h" #include "types.h" -void invReset(void) +void inv_reset(void) { s32 i; if (PLAYERCOUNT() == 1 && g_Vars.normmplayerisrunning == false) { - g_Vars.currentplayer->equipallguns = cheatIsActive(CHEAT_ALLGUNS); + g_Vars.currentplayer->equipallguns = cheat_is_active(CHEAT_ALLGUNS); } else { g_Vars.currentplayer->equipallguns = false; } @@ -23,9 +23,9 @@ void invReset(void) } } -void invInit(s32 numdoubles) +void inv_init(s32 numdoubles) { g_Vars.currentplayer->equipmaxitems = numdoubles + 30; - g_Vars.currentplayer->equipment = mempAlloc(ALIGN16(g_Vars.currentplayer->equipmaxitems * sizeof(struct invitem)), MEMPOOL_STAGE); - invClear(); + g_Vars.currentplayer->equipment = memp_alloc(ALIGN16(g_Vars.currentplayer->equipmaxitems * sizeof(struct invitem)), MEMPOOL_STAGE); + inv_clear(); } diff --git a/src/game/lang.c b/src/game/lang.c index 74c770403..db276f01b 100644 --- a/src/game/lang.c +++ b/src/game/lang.c @@ -138,7 +138,7 @@ u16 g_LangFiles[] = { /*68*/ FILE_LMP20E, }; -u32 langGetLangBankIndexFromStagenum(s32 stagenum) +u32 lang_get_lang_bank_index_from_stagenum(s32 stagenum) { u32 bank; @@ -217,7 +217,7 @@ extern u8 _fontjpnSegmentRomStart; extern u8 _fontjpnsingleSegmentRomStart; extern u8 _fontjpnmultiSegmentRomStart; -struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) +struct jpncharpixels *lang_get_jpn_char_pixels(s32 codepoint) { s32 i; s32 freeindexsingle = -1; @@ -234,8 +234,8 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) } #if VERSION == VERSION_JPN_FINAL - mainOverrideVariable("tmul", &tmul); - mainOverrideVariable("tload", &tload); + main_override_variable("tmul", &tmul); + main_override_variable("tload", &tload); if (tload) { codepoint = tload; @@ -288,7 +288,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) g_JpnCacheCacheItems[freeindexsingle].ttl = 2; g_JpnCacheCacheItems[freeindexsingle].codepoint = codepoint; - dmaExec((u8 *) (freeindexsingle * (TMUL * 0x0c) + (romptr_t) &g_JpnCharCachePixels[0]), + dma_exec((u8 *) (freeindexsingle * (TMUL * 0x0c) + (romptr_t) &g_JpnCharCachePixels[0]), (romptr_t) &_fontjpnSegmentRomStart + ((codepoint * TMUL) * 0xc + TMUL * (24 * 0xc)), TMUL * 0x0c); @@ -310,7 +310,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) g_JpnCacheCacheItems[freeindexsingle].ttl = 2; g_JpnCacheCacheItems[freeindexsingle].codepoint = codepoint >> 1; - dmaExec(&g_JpnCharCachePixels[freeindexsingle * 8], (romptr_t) &_fontjpnsingleSegmentRomStart + (codepoint >> SHIFTAMOUNT) * 0x60, 0x60); + dma_exec(&g_JpnCharCachePixels[freeindexsingle * 8], (romptr_t) &_fontjpnsingleSegmentRomStart + (codepoint >> SHIFTAMOUNT) * 0x60, 0x60); return &g_JpnCharCachePixels[freeindexsingle * 8]; } @@ -321,7 +321,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) g_JpnCacheCacheItems[freeindexmulti + 0].codepoint = codepoint >> 1; g_JpnCacheCacheItems[freeindexmulti + 1].codepoint = codepoint >> 1; - dmaExec(&g_JpnCharCachePixels[freeindexmulti * 8], (romptr_t) &_fontjpnmultiSegmentRomStart + ((codepoint & 0x1fff) >> SHIFTAMOUNT) * 0x80, 0x80); + dma_exec(&g_JpnCharCachePixels[freeindexmulti * 8], (romptr_t) &_fontjpnmultiSegmentRomStart + ((codepoint & 0x1fff) >> SHIFTAMOUNT) * 0x80, 0x80); return &g_JpnCharCachePixels[freeindexmulti * 8]; } @@ -334,7 +334,7 @@ struct jpncharpixels *langGetJpnCharPixels(s32 codepoint) * NTSC only supports English, while PAL supports 4 languages and JPN has its * own. Each English file is followed immediately by the other translations. */ -s32 langGetFileNumOffset(void) +s32 lang_get_file_num_offset(void) { #if PAL s32 offset = g_LanguageId; @@ -350,37 +350,37 @@ s32 langGetFileNumOffset(void) #endif } -s32 langGetFileId(s32 bank) +s32 lang_get_file_id(s32 bank) { - return g_LangFiles[bank] + langGetFileNumOffset(); + return g_LangFiles[bank] + lang_get_file_num_offset(); } -void langLoad(s32 bank) +void lang_load(s32 bank) { #if VERSION >= VERSION_PAL_BETA - s32 len = fileGetInflatedSize(langGetFileId(bank)); + s32 len = file_get_inflated_size(lang_get_file_id(bank)); if ((s32)g_LangBuffer + len + g_LangBufferSize - (s32)g_LangBufferPos >= 0) { s32 len2 = (s32)g_LangBuffer + g_LangBufferSize - (s32)g_LangBufferPos; len2 = len2 / 32 * 32; - g_LangBanks[bank] = fileLoadToAddr(langGetFileId(bank), FILELOADMETHOD_DEFAULT, (u8 *)g_LangBufferPos, len2); + g_LangBanks[bank] = file_load_to_addr(lang_get_file_id(bank), FILELOADMETHOD_DEFAULT, (u8 *)g_LangBufferPos, len2); g_LangBufferPos = (u8 *)(align32((s32)g_LangBufferPos + len)); } else { CRASH(); } #else - s32 file_id = langGetFileId(bank); - g_LangBanks[bank] = fileLoadToNew(file_id, FILELOADMETHOD_DEFAULT); + s32 file_id = lang_get_file_id(bank); + g_LangBanks[bank] = file_load_to_new(file_id, FILELOADMETHOD_DEFAULT); #endif } -void langLoadToAddr(s32 bank, u8 *dst, s32 size) +void lang_load_to_addr(s32 bank, u8 *dst, s32 size) { - s32 file_id = langGetFileId(bank); - g_LangBanks[bank] = fileLoadToAddr(file_id, FILELOADMETHOD_DEFAULT, dst, size); + s32 file_id = lang_get_file_id(bank); + g_LangBanks[bank] = file_load_to_addr(file_id, FILELOADMETHOD_DEFAULT, dst, size); } -void langClearBank(s32 bank) +void lang_clear_bank(s32 bank) { g_LangBanks[bank] = NULL; } @@ -395,7 +395,7 @@ void langClearBank(s32 bank) * The language file data consists of a variable-length array of offsets into * the file. Not to be confused with pointers. */ -char *langGet(s32 textid) +char *lang_get(s32 textid) { s32 bankindex = textid >> 9; s32 textindex = textid & 0x1ff; @@ -412,7 +412,7 @@ char *langGet(s32 textid) } #if VERSION >= VERSION_PAL_BETA -void langReload(void) +void lang_reload(void) { s32 i; @@ -420,14 +420,14 @@ void langReload(void) for (i = 0; i < ARRAYCOUNT(g_LangBanks); i++) { if (g_LangBanks[i] != NULL) { - langLoad(i); + lang_load(i); } } } #endif #if VERSION >= VERSION_PAL_BETA -void langSetEuropean(u32 arg0) +void lang_set_european(u32 arg0) { u8 teams; bool hasoptionslang = false; @@ -437,7 +437,7 @@ void langSetEuropean(u32 arg0) } if (hasoptionslang) { - mpGetTeamsWithDefaultName(&teams); + mp_get_teams_with_default_name(&teams); } switch (arg0) { @@ -461,19 +461,19 @@ void langSetEuropean(u32 arg0) break; } - langReload(); + lang_reload(); if (hasoptionslang) { - mpSetTeamNamesToDefault(teams); + mp_set_team_names_to_default(teams); } } #endif #if VERSION == VERSION_JPN_FINAL -void langSetJpnEnabled(bool enable) +void lang_set_jpn_enabled(bool enable) { g_Jpn = enable ? true : false; - langReload(); + lang_reload(); } #endif diff --git a/src/game/langinit.c b/src/game/langinit.c index e7b48c326..36ea05663 100644 --- a/src/game/langinit.c +++ b/src/game/langinit.c @@ -7,15 +7,15 @@ u16 *g_FrameBuffers[NUM_FRAMEBUFFERS]; -void langInit(void) +void lang_init(void) { s32 i; #if VERSION >= VERSION_JPN_FINAL g_JpnMaxCacheItems = IS4MB() ? 124 : 174; - g_JpnCharCachePixels = mempAlloc(MAX_JPN_CACHE_ITEMS() * (sizeof(struct jpncharpixels) * 8), MEMPOOL_PERMANENT); - g_JpnCacheCacheItems = mempAlloc(ALIGN16(MAX_JPN_CACHE_ITEMS() * sizeof(struct jpncacheitem)), MEMPOOL_PERMANENT); + g_JpnCharCachePixels = memp_alloc(MAX_JPN_CACHE_ITEMS() * (sizeof(struct jpncharpixels) * 8), MEMPOOL_PERMANENT); + g_JpnCacheCacheItems = memp_alloc(ALIGN16(MAX_JPN_CACHE_ITEMS() * sizeof(struct jpncacheitem)), MEMPOOL_PERMANENT); for (i = 0; i < MAX_JPN_CACHE_ITEMS(); i++) { g_JpnCacheCacheItems[i].ttl = 0; @@ -23,8 +23,8 @@ void langInit(void) } #else if (g_Jpn) { - g_JpnCharCachePixels = mempAlloc(MAX_JPN_CACHE_ITEMS() * (sizeof(struct jpncharpixels) * 8), MEMPOOL_PERMANENT); - g_JpnCacheCacheItems = mempAlloc(ALIGN16(MAX_JPN_CACHE_ITEMS() * sizeof(struct jpncacheitem)), MEMPOOL_PERMANENT); + g_JpnCharCachePixels = memp_alloc(MAX_JPN_CACHE_ITEMS() * (sizeof(struct jpncharpixels) * 8), MEMPOOL_PERMANENT); + g_JpnCacheCacheItems = memp_alloc(ALIGN16(MAX_JPN_CACHE_ITEMS() * sizeof(struct jpncacheitem)), MEMPOOL_PERMANENT); for (i = 0; i < MAX_JPN_CACHE_ITEMS(); i++) { g_JpnCacheCacheItems[i].ttl = 0; diff --git a/src/game/langreset.c b/src/game/langreset.c index 71bbd0cfc..e9b9e7c80 100644 --- a/src/game/langreset.c +++ b/src/game/langreset.c @@ -10,7 +10,7 @@ extern u8 *g_LangBuffer; extern s32 g_LangBufferSize; -void langReset(s32 stagenum) +void lang_reset(s32 stagenum) { s32 i; s32 size; @@ -21,9 +21,9 @@ void langReset(s32 stagenum) #if VERSION >= VERSION_PAL_BETA // PAL and newer have to support switching languages mid-stage. To do this, - // langReload iterates the bank pointers and reloads them if they're - // non-zero. Here it's using langReload to do the initial load by setting - // the desired banks to dummy (non-zero) values so langReload will load them. + // lang_reload iterates the bank pointers and reloads them if they're + // non-zero. Here it's using lang_reload to do the initial load by setting + // the desired banks to dummy (non-zero) values so lang_reload will load them. g_LangBanks[LANGBANK_GUN] = (void *)1; g_LangBanks[LANGBANK_MPMENU] = (void *)1; g_LangBanks[LANGBANK_PROPOBJ] = (void *)1; @@ -45,21 +45,21 @@ void langReset(s32 stagenum) } } - g_LangBuffer = mempAlloc(ALIGN16(size), MEMPOOL_STAGE); + g_LangBuffer = memp_alloc(ALIGN16(size), MEMPOOL_STAGE); g_LangBufferSize = size; - langReload(); + lang_reload(); #else // Versions prior to PAL load the language directly - g_LangBanks[LANGBANK_GUN] = fileLoadToNew(langGetFileId(LANGBANK_GUN), FILELOADMETHOD_DEFAULT); - g_LangBanks[LANGBANK_MPMENU] = fileLoadToNew(langGetFileId(LANGBANK_MPMENU), FILELOADMETHOD_DEFAULT); - g_LangBanks[LANGBANK_PROPOBJ] = fileLoadToNew(langGetFileId(LANGBANK_PROPOBJ), FILELOADMETHOD_DEFAULT); - g_LangBanks[LANGBANK_MPWEAPONS] = fileLoadToNew(langGetFileId(LANGBANK_MPWEAPONS), FILELOADMETHOD_DEFAULT); - g_LangBanks[LANGBANK_OPTIONS] = fileLoadToNew(langGetFileId(LANGBANK_OPTIONS), FILELOADMETHOD_DEFAULT); - g_LangBanks[LANGBANK_MISC] = fileLoadToNew(langGetFileId(LANGBANK_MISC), FILELOADMETHOD_DEFAULT); + g_LangBanks[LANGBANK_GUN] = file_load_to_new(lang_get_file_id(LANGBANK_GUN), FILELOADMETHOD_DEFAULT); + g_LangBanks[LANGBANK_MPMENU] = file_load_to_new(lang_get_file_id(LANGBANK_MPMENU), FILELOADMETHOD_DEFAULT); + g_LangBanks[LANGBANK_PROPOBJ] = file_load_to_new(lang_get_file_id(LANGBANK_PROPOBJ), FILELOADMETHOD_DEFAULT); + g_LangBanks[LANGBANK_MPWEAPONS] = file_load_to_new(lang_get_file_id(LANGBANK_MPWEAPONS), FILELOADMETHOD_DEFAULT); + g_LangBanks[LANGBANK_OPTIONS] = file_load_to_new(lang_get_file_id(LANGBANK_OPTIONS), FILELOADMETHOD_DEFAULT); + g_LangBanks[LANGBANK_MISC] = file_load_to_new(lang_get_file_id(LANGBANK_MISC), FILELOADMETHOD_DEFAULT); if (stagenum == STAGE_CREDITS) { - g_LangBanks[LANGBANK_TITLE] = fileLoadToNew(langGetFileId(LANGBANK_TITLE), FILELOADMETHOD_DEFAULT); + g_LangBanks[LANGBANK_TITLE] = file_load_to_new(lang_get_file_id(LANGBANK_TITLE), FILELOADMETHOD_DEFAULT); } #endif } diff --git a/src/game/langtick.c b/src/game/langtick.c index 2b9704db7..5d5f9d0da 100644 --- a/src/game/langtick.c +++ b/src/game/langtick.c @@ -13,7 +13,7 @@ s32 var8009d370jf; extern s32 g_JpnMaxCacheItems; -void langTick(void) +void lang_tick(void) { s32 i; @@ -22,10 +22,10 @@ void langTick(void) var8009d370jf = 0; - mainOverrideVariable("jap", &language); + main_override_variable("jap", &language); if (language < 2) { - langSetJpnEnabled(language); + lang_set_jpn_enabled(language); language = 99; } @@ -37,10 +37,10 @@ void langTick(void) #elif VERSION >= VERSION_PAL_BETA static u32 language = 99; - mainOverrideVariable("language", &language); + main_override_variable("language", &language); if (language < 5) { - langSetEuropean(language); + lang_set_european(language); language = 99; } diff --git a/src/game/lv.c b/src/game/lv.c index d4134f4fa..974ea79ef 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -131,23 +131,23 @@ u32 g_FadePrevColour = 0; u32 g_FadeColour = 0; s16 g_FadeDelay = 0; -u32 getVar80084040(void) +u32 get_var80084040(void) { return var80084040; } -void setVar80084040(u32 value) +void set_var80084040(u32 value) { var80084040 = value; } -void lvInit(void) +void lv_init(void) { g_Vars.lockscreen = 0; g_Vars.joydisableframestogo = -1; } -void lvResetMiscSfx(void) +void lv_reset_misc_sfx(void) { s32 i; @@ -157,7 +157,7 @@ void lvResetMiscSfx(void) } } -s32 lvGetMiscSfxIndex(u32 type) +s32 lv_get_misc_sfx_index(u32 type) { s32 i; @@ -170,11 +170,11 @@ s32 lvGetMiscSfxIndex(u32 type) return -1; } -void lvSetMiscSfxState(u32 type, bool play) +void lv_set_misc_sfx_state(u32 type, bool play) { if (play) { - if (lvGetMiscSfxIndex(type) == -1) { - s32 index = lvGetMiscSfxIndex(-1); + if (lv_get_misc_sfx_index(type) == -1) { + s32 index = lv_get_misc_sfx_index(-1); #if VERSION >= VERSION_NTSC_1_0 if (index != -1 && g_MiscSfxAudioHandles[index] == NULL) @@ -182,13 +182,13 @@ void lvSetMiscSfxState(u32 type, bool play) if (index != -1) #endif { - sndStart(var80095200, g_MiscSfxSounds[type], &g_MiscSfxAudioHandles[index], -1, -1, -1, -1, -1); + snd_start(var80095200, g_MiscSfxSounds[type], &g_MiscSfxAudioHandles[index], -1, -1, -1, -1, -1); g_MiscSfxActiveTypes[index] = type; } } } else { u32 stack; - s32 index = lvGetMiscSfxIndex(type); + s32 index = lv_get_misc_sfx_index(type); if (index != -1) { audioStop(g_MiscSfxAudioHandles[index]); @@ -200,21 +200,21 @@ void lvSetMiscSfxState(u32 type, bool play) } } -void lvUpdateMiscSfx(void) +void lv_update_misc_sfx(void) { s32 i; if (g_Vars.lvupdate240 == 0) { for (i = 0; i != ARRAYCOUNT(g_MiscSfxActiveTypes); i++) { - lvSetMiscSfxState(i, false); + lv_set_misc_sfx_state(i, false); } } else { bool usingboost = g_Vars.speedpillon - && lvGetSlowMotionType() == SLOWMOTION_OFF + && lv_get_slow_motion_type() == SLOWMOTION_OFF && g_Vars.in_cutscene == false; bool usingrocket; - lvSetMiscSfxState(MISCSFX_BOOSTHEARTBEAT, usingboost); + lv_set_misc_sfx_state(MISCSFX_BOOSTHEARTBEAT, usingboost); usingrocket = false; @@ -224,8 +224,8 @@ void lvUpdateMiscSfx(void) } } - lvSetMiscSfxState(MISCSFX_SLAYERROCKETHUM, usingrocket); - lvSetMiscSfxState(MISCSFX_SLAYERROCKETBEEP, usingrocket); + lv_set_misc_sfx_state(MISCSFX_SLAYERROCKETHUM, usingrocket); + lv_set_misc_sfx_state(MISCSFX_SLAYERROCKETBEEP, usingrocket); } if (g_Vars.lvupdate240 == 0 && g_MiscAudioHandle && sndGetState(g_MiscAudioHandle) != AL_STOPPED) { @@ -233,20 +233,20 @@ void lvUpdateMiscSfx(void) } } -void lvReset(s32 stagenum) +void lv_reset(s32 stagenum) { - lvFadeReset(); + lv_fade_reset(); var80084014 = false; var80084010 = 0; #if VERSION >= VERSION_NTSC_1_0 - joyLockCyclicPolling(); + joy_lock_cyclic_polling(); g_Vars.joydisableframestogo = 10; #else - if (joyIsCyclicPollingEnabled()) { - joyDisableCyclicPolling(760, "lv.c"); + if (joy_is_cyclic_polling_enabled()) { + joy_disable_cyclic_polling(760, "lv.c"); g_Vars.joydisableframestogo = 10; } @@ -256,7 +256,7 @@ void lvReset(s32 stagenum) g_Vars.paksneededformenu = 0; g_Vars.stagenum = stagenum; - cheatsReset(); + cheats_reset(); var80084040 = true; g_Vars.lvframenum = 0; @@ -296,19 +296,19 @@ void lvReset(s32 stagenum) g_MiscAudioHandle = NULL; - musicReset(); - modelmgrSetLvResetting(true); - surfaceReset(); - texReset(); - textReset(); - hudmsgsReset(); + music_reset(); + modelmgr_set_lv_resetting(true); + surface_reset(); + tex_reset(); + text_reset(); + hudmsgs_reset(); if (stagenum == STAGE_TEST_OLD) { - titleReset(); + title_reset(); } if (stagenum == STAGE_TITLE) { - titleReset(); + title_reset(); } else if (stagenum == STAGE_BOOTPAKMENU) { // empty } else if (stagenum == STAGE_CREDITS) { @@ -319,19 +319,19 @@ void lvReset(s32 stagenum) s32 i; s32 j; - tilesReset(); - bgReset(g_Vars.stagenum); - bgBuildTables(g_Vars.stagenum); - skyReset(g_Vars.stagenum); + tiles_reset(); + bg_reset(g_Vars.stagenum); + bg_build_tables(g_Vars.stagenum); + sky_reset(g_Vars.stagenum); if (g_Vars.normmplayerisrunning) { - musicSetStageAndStartMusic(stagenum); + music_set_stage_and_start_music(stagenum); } else { - musicSetStage(stagenum); + music_set_stage(stagenum); } if (g_Vars.normmplayerisrunning) { - mpApplyLimits(); + mp_apply_limits(); } if (g_Vars.mplayerisrunning == false) { @@ -362,25 +362,25 @@ void lvReset(s32 stagenum) } } - mpSetDefaultNamesIfEmpty(); - animsReset(); - objectivesReset(); - vtxstoreReset(); - modelmgrReset(); - psReset(); - setupLoadFiles(stagenum); - scenarioReset(); - varsReset(); - propsReset(); - chrmgrReset(); - bodiesReset(stagenum); - setupCreateProps(stagenum); - tagsReset(); - explosionsReset(); - smokeReset(); - sparksReset(); - weatherReset(); - lvResetMiscSfx(); + mp_set_default_names_if_empty(); + anims_reset(); + objectives_reset(); + vtxstore_reset(); + modelmgr_reset(); + ps_reset(); + setup_load_files(stagenum); + scenario_reset(); + vars_reset(); + props_reset(); + chrmgr_reset(); + bodies_reset(stagenum); + setup_create_props(stagenum); + tags_reset(); + explosions_reset(); + smoke_reset(); + sparks_reset(); + weather_reset(); + lv_reset_misc_sfx(); switch (g_Vars.stagenum) { case STAGE_ESCAPE: @@ -389,87 +389,87 @@ void lvReset(s32 stagenum) case STAGE_DEFECTION: case STAGE_ATTACKSHIP: case STAGE_TEST_OLD: - starsReset(); + stars_reset(); break; } func0f0099a4(); - boltbeamsReset(); - lasersightsReset(); + boltbeams_reset(); + lasersights_reset(); stub0f013540(); - shardsReset(); - frReset(); + shards_reset(); + fr_reset(); if (g_Vars.stagenum == STAGE_TITLE) { // empty } else if (stagenum == STAGE_BOOTPAKMENU) { - setCurrentPlayerNum(0); - menuReset(); + set_current_player_num(0); + menu_reset(); } else if (stagenum == STAGE_4MBMENU) { - setCurrentPlayerNum(0); - menuReset(); + set_current_player_num(0); + menu_reset(); } else if (stagenum == STAGE_CREDITS) { - creditsReset(); + credits_reset(); } else { s32 i; - utilsReset(); - casingsReset(); + utils_reset(); + casings_reset(); for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); g_Vars.currentplayer->usedowntime = 0; g_Vars.currentplayer->invdowntime = g_Vars.currentplayer->usedowntime; - menuReset(); - amReset(); - invReset(); - bgunReset(); - playerLoadDefaults(); - playerReset(); - playerSpawn(); - bheadReset(); + menu_reset(); + am_reset(); + inv_reset(); + bgun_reset(); + player_load_defaults(); + player_reset(); + player_spawn(); + bhead_reset(); if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_TEAMSENABLED)) { - playermgrCalculateAiBuddyNums(); + playermgr_calculate_ai_buddy_nums(); } } - acousticReset(); - portalsReset(); - lightsReset(); - setCurrentPlayerNum(0); + acoustic_reset(); + portals_reset(); + lights_reset(); + set_current_player_num(0); } if (g_Vars.lvmpbotlevel) { - mpCalculateTeamIsOnlyAi(); + mp_calculate_team_is_only_ai(); } - paksReset(); - sndResetCurMp3(); + paks_reset(); + snd_reset_cur_mp3(); if (stagenum == STAGE_BOOTPAKMENU) { - bootmenuReset(); + bootmenu_reset(); } if (stagenum == STAGE_4MBMENU) { - fmbReset(); + fmb_reset(); } if (IS8MB()) { - pheadReset(); + phead_reset(); } - modelmgrSetLvResetting(false); + modelmgr_set_lv_resetting(false); var80084018 = 1; - schedResetArtifacts(); - lvSetPaused(0); + sched_reset_artifacts(); + lv_set_paused(0); #if PIRACYCHECKS { u32 checksum = 0; - s32 *i = (s32 *)&lvGetSlowMotionType; - s32 *end = (s32 *)&lvTick; + s32 *i = (s32 *)&lv_get_slow_motion_type; + s32 *end = (s32 *)&lv_tick; while (i < end) { checksum += *i; @@ -494,7 +494,7 @@ void lvReset(s32 stagenum) #endif } -void lvConfigureFade(u32 color, s16 num_frames) +void lv_configure_fade(u32 color, s16 num_frames) { g_FadeNumFrames = num_frames; g_FadePrevColour = g_FadeColour; @@ -510,7 +510,7 @@ void lvConfigureFade(u32 color, s16 num_frames) g_FadeDelay = 2; } -Gfx *lvRenderFade(Gfx *gdl) +Gfx *lv_render_fade(Gfx *gdl) { u32 colour = g_FadeColour; u32 inset = 0; @@ -540,7 +540,7 @@ Gfx *lvRenderFade(Gfx *gdl) return gdl; } } else { - colour = colourBlend(g_FadeColour, g_FadePrevColour, g_FadeFrac * 255); + colour = colour_blend(g_FadeColour, g_FadePrevColour, g_FadeFrac * 255); } if ((colour & 0xff) == 0) { @@ -553,20 +553,20 @@ Gfx *lvRenderFade(Gfx *gdl) gDPSetPrimColorViaWord(gdl++, 0, 0, colour); gDPFillRectangle(gdl++, - viGetViewLeft(), - viGetViewTop() + inset, - viGetViewLeft() + viGetViewWidth() + 1, - viGetViewTop() + viGetViewHeight() - inset + 2); + vi_get_view_left(), + vi_get_view_top() + inset, + vi_get_view_left() + vi_get_view_width() + 1, + vi_get_view_top() + vi_get_view_height() - inset + 2); return text0f153838(gdl); } -bool lvIsFadeActive(void) +bool lv_is_fade_active(void) { return g_FadeFrac >= 0; } -void lvFadeReset(void) +void lv_fade_reset(void) { g_FadeNumFrames = 0; g_FadeFrac = -1; @@ -575,7 +575,7 @@ void lvFadeReset(void) g_FadeDelay = 0; } -bool lvUpdateTrackedProp(struct trackedprop *trackedprop, s32 index) +bool lv_update_tracked_prop(struct trackedprop *trackedprop, s32 index) { f32 y1; f32 x1; @@ -587,14 +587,14 @@ bool lvUpdateTrackedProp(struct trackedprop *trackedprop, s32 index) if (trackedprop->prop && prop->chr) { switch (trackedprop->prop->type) { case PROPTYPE_PLAYER: - if (playermgrGetPlayerNumByProp(prop) == g_Vars.currentplayernum) { + if (playermgr_get_player_num_by_prop(prop) == g_Vars.currentplayernum) { return false; } // fall through case PROPTYPE_CHR: chr = trackedprop->prop->chr; - if (chrIsDead(trackedprop->prop->chr)) { + if (chr_is_dead(trackedprop->prop->chr)) { if (index >= 0) { // Existing trackedprop if (g_Vars.currentplayer->targetset[index] < TICKS(129)) { @@ -620,7 +620,7 @@ bool lvUpdateTrackedProp(struct trackedprop *trackedprop, s32 index) x2 = -2; y2 = -2; - if (modelGetScreenCoords(model, &x2, &x1, &y2, &y1)) { + if (model_get_screen_coords(model, &x2, &x1, &y2, &y1)) { break; } return false; @@ -636,7 +636,7 @@ bool lvUpdateTrackedProp(struct trackedprop *trackedprop, s32 index) x2 = -2; y2 = -2; - if (modelGetScreenCoords(model, &x2, &x1, &y2, &y1)) { + if (model_get_screen_coords(model, &x2, &x1, &y2, &y1)) { break; } return false; @@ -660,7 +660,7 @@ bool lvUpdateTrackedProp(struct trackedprop *trackedprop, s32 index) } #ifdef DEBUG -Gfx *lvRenderManPosIfEnabled(Gfx *gdl) +Gfx *lv_render_man_pos_if_enabled(Gfx *gdl) { char bufroom[16]; char bufx[16]; @@ -671,7 +671,7 @@ Gfx *lvRenderManPosIfEnabled(Gfx *gdl) s32 y; s32 y2; - if (debugIsManPosEnabled()) { + if (debug_is_man_pos_enabled()) { f32 xfrac = g_Vars.currentplayer->bond2.unk00.x; f32 zfrac = g_Vars.currentplayer->bond2.unk00.z; @@ -695,25 +695,25 @@ Gfx *lvRenderManPosIfEnabled(Gfx *gdl) sprintf(bufz, "%s%sz %4.0f", "", "", g_Vars.currentplayer->prop->pos.z); sprintf(bufdir, "%s %3d", &directions[(degrees + 22) / 45], degrees); - x = viGetViewLeft() + 17; - y = viGetViewTop() + 17; + x = vi_get_view_left() + 17; + y = vi_get_view_top() + 17; y2 = y + 10; gdl = text0f153628(gdl); - gdl = text0f153a34(gdl, 0, y - 1, viGetWidth(), y2 + 1, 0x00000064); + gdl = text0f153a34(gdl, 0, y - 1, vi_get_width(), y2 + 1, 0x00000064); - gdl = textRenderProjected(gdl, &x, &y, bufroom, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, bufroom, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); - x = viGetViewLeft() + 87; - gdl = textRenderProjected(gdl, &x, &y, bufx, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + x = vi_get_view_left() + 87; + gdl = text_render_projected(gdl, &x, &y, bufx, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); - x = viGetViewLeft() + 141; - gdl = textRenderProjected(gdl, &x, &y, bufy, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + x = vi_get_view_left() + 141; + gdl = text_render_projected(gdl, &x, &y, bufy, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); - x = viGetViewLeft() + 195; - gdl = textRenderProjected(gdl, &x, &y, bufz, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + x = vi_get_view_left() + 195; + gdl = text_render_projected(gdl, &x, &y, bufz, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); - x = viGetViewLeft() + 249; - gdl = textRenderProjected(gdl, &x, &y, bufdir, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + x = vi_get_view_left() + 249; + gdl = text_render_projected(gdl, &x, &y, bufdir, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); } @@ -722,7 +722,7 @@ Gfx *lvRenderManPosIfEnabled(Gfx *gdl) } #endif -void lvFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, bool *activeslots, f32 *distances) +void lv_find_threats_for_prop(struct prop *prop, bool inchild, struct coord *playerpos, bool *activeslots, f32 *distances) { bool condition = true; struct defaultobj *obj; @@ -776,7 +776,7 @@ void lvFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerp } } - if (obj->modelnum == MODEL_TARGET && frIsTargetOneHitExplodable(prop)) { + if (obj->modelnum == MODEL_TARGET && fr_is_target_one_hit_explodable(prop)) { pass = true; } @@ -794,7 +794,7 @@ void lvFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerp sp76 = -2; sp80 = -2; - if (!modelGetScreenCoords(model, &sp76, &sp84, &sp80, &sp88)) { + if (!model_get_screen_coords(model, &sp76, &sp84, &sp80, &sp88)) { pass = false; } } @@ -842,11 +842,11 @@ void lvFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerp } if (prop->child) { - lvFindThreatsForProp(prop->child, true, playerpos, activeslots, distances); + lv_find_threats_for_prop(prop->child, true, playerpos, activeslots, distances); } if (inchild && prop->next) { - lvFindThreatsForProp(prop->next, inchild, playerpos, activeslots, distances); + lv_find_threats_for_prop(prop->next, inchild, playerpos, activeslots, distances); } } @@ -871,7 +871,7 @@ void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 } else { if (prop->type == PROPTYPE_CHR || (prop->type == PROPTYPE_PLAYER - && playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum)) { + && playermgr_get_player_num_by_prop(prop) != g_Vars.currentplayernum)) { model = g_Vars.currentplayer->trackedprops[i].prop->chr->model; } } @@ -882,7 +882,7 @@ void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 sp116 = -2; sp120 = -2; - if (modelGetScreenCoords(model, &sp116, &sp124, &sp120, &sp128)) { + if (model_get_screen_coords(model, &sp116, &sp124, &sp120, &sp128)) { activeslots[i] = true; g_Vars.currentplayer->trackedprops[i].x1 = sp124 - 2; g_Vars.currentplayer->trackedprops[i].x2 = sp116 + 2; @@ -907,7 +907,7 @@ void func0f168f24(struct prop *prop, bool inchild, struct coord *playerpos, s32 } } -void lvFindThreats(void) +void lv_find_threats(void) { s32 i; struct prop *prop; @@ -944,7 +944,7 @@ void lvFindThreats(void) prop = *propptr; if (prop) { - lvFindThreatsForProp(prop, false, &campos, activeslots, distances); + lv_find_threats_for_prop(prop, false, &campos, activeslots, distances); } propptr--; @@ -981,7 +981,7 @@ void lvFindThreats(void) * - random static in the Infiltration intro cutscene * - combat boost activation and reverting */ -Gfx *lvRender(Gfx *gdl) +Gfx *lv_render(Gfx *gdl) { gSPSegment(gdl++, SPSEGMENT_PHYSICAL, 0x00000000); @@ -990,84 +990,84 @@ Gfx *lvRender(Gfx *gdl) #endif if (g_Vars.stagenum == STAGE_TITLE - || (g_Vars.stagenum == STAGE_TEST_OLD && titleIsKeepingMode())) { + || (g_Vars.stagenum == STAGE_TEST_OLD && title_is_keeping_mode())) { gSPDisplayList(gdl++, &var800613a0); - if (debugIsZBufferDisabled()) { + if (debug_is_z_buffer_disabled()) { gSPDisplayList(gdl++, &var80061360); } else { gSPDisplayList(gdl++, &var80061380); } - gdl = viPrepareZbuf(gdl); + gdl = vi_prepare_zbuf(gdl); gdl = vi0000b1d0(gdl); gDPSetScissorFrac(gdl++, 0, - viGetViewLeft() * 4.0f, viGetViewTop() * 4.0f, - (viGetViewLeft() + viGetViewWidth()) * 4.0f, - (viGetViewTop() + viGetViewHeight()) * 4.0f); + vi_get_view_left() * 4.0f, vi_get_view_top() * 4.0f, + (vi_get_view_left() + vi_get_view_width()) * 4.0f, + (vi_get_view_top() + vi_get_view_height()) * 4.0f); - gdl = titleRender(gdl); - gdl = lvRenderFade(gdl); + gdl = title_render(gdl); + gdl = lv_render_fade(gdl); } else if (g_Vars.stagenum == STAGE_BOOTPAKMENU) { gSPClipRatio(gdl++, FRUSTRATIO_2); gSPDisplayList(gdl++, &var800613a0); gSPDisplayList(gdl++, &var80061380); - setCurrentPlayerNum(0); - viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); - viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, + set_current_player_num(0); + vi_set_view_position(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); + vi_set_fov_aspect_and_size(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight); mtx00016748(1); gdl = vi0000b1d0(gdl); - gdl = viRenderViewportEdges(gdl); - gdl = bgScissorToViewport(gdl); - gdl = menuRender(gdl); + gdl = vi_render_viewport_edges(gdl); + gdl = bg_scissor_to_viewport(gdl); + gdl = menu_render(gdl); } else if (g_Vars.stagenum == STAGE_4MBMENU) { gSPClipRatio(gdl++, FRUSTRATIO_2); gSPDisplayList(gdl++, &var800613a0); gSPDisplayList(gdl++, &var80061380); - setCurrentPlayerNum(0); + set_current_player_num(0); #if VERSION >= VERSION_PAL_BETA - viSetMode(VIMODE_LO); - viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); - viSetSize(playerGetFbWidth(), playerGetFbHeight()); - viSetBufSize(playerGetFbWidth(), playerGetFbHeight()); - viSetViewSize(playerGetFbWidth(), playerGetFbHeight()); + vi_set_mode(VIMODE_LO); + vi_set_view_position(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); + vi_set_size(player_get_fb_width(), player_get_fb_height()); + vi_set_buf_size(player_get_fb_width(), player_get_fb_height()); + vi_set_view_size(player_get_fb_width(), player_get_fb_height()); #else - viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); + vi_set_view_position(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); #endif - viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, + vi_set_fov_aspect_and_size(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight); mtx00016748(1); gdl = vi0000b1d0(gdl); - gdl = bgScissorToViewport(gdl); - gdl = menuRender(gdl); + gdl = bg_scissor_to_viewport(gdl); + gdl = menu_render(gdl); if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) { - playerTickPauseMenu(); + player_tick_pause_menu(); } } else if (g_Vars.stagenum == STAGE_CREDITS) { gSPClipRatio(gdl++, FRUSTRATIO_2); gSPDisplayList(gdl++, &var800613a0); gSPDisplayList(gdl++, &var80061380); - setCurrentPlayerNum(0); - viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); - viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, + set_current_player_num(0); + vi_set_view_position(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); + vi_set_fov_aspect_and_size(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight); mtx00016748(1); gdl = vi0000b1a8(gdl); gdl = vi0000b1d0(gdl); - gdl = viRenderViewportEdges(gdl); - gdl = creditsDraw(gdl); + gdl = vi_render_viewport_edges(gdl); + gdl = credits_draw(gdl); } else { // Normal stages s32 i; @@ -1075,10 +1075,10 @@ Gfx *lvRender(Gfx *gdl) Gfx *savedgdl; #if VERSION >= VERSION_NTSC_1_0 bool forcesingleplayer = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) - && playerHasSharedViewport(); + && player_has_shared_viewport(); #else bool forcesingleplayer = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) - && ((g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE); + && ((g_InCutscene && !g_MainIsEndscreen) || menu_get_root() == MENUROOT_COOPCONTINUE); #endif struct player *player; struct chrdata *chr; @@ -1094,12 +1094,12 @@ Gfx *lvRender(Gfx *gdl) savedgdl = gdl; if (forcesingleplayer) { - setCurrentPlayerNum(0); + set_current_player_num(0); g_Vars.currentplayerindex = 0; islastplayer = true; } else { s32 nextplayernum = i + 1; - setCurrentPlayerNum(playermgrGetPlayerAtOrder(i)); + set_current_player_num(playermgr_get_player_at_order(i)); islastplayer = playercount == nextplayernum; } @@ -1130,26 +1130,26 @@ Gfx *lvRender(Gfx *gdl) } } - bviewSetMotionBlur(bluramount); + bview_set_motion_blur(bluramount); gSPDisplayList(gdl++, &var800613a0); - if (debugIsZBufferDisabled()) { + if (debug_is_z_buffer_disabled()) { gSPDisplayList(gdl++, &var80061360); } else { gSPDisplayList(gdl++, &var80061380); } - viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); - viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, + vi_set_view_position(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); + vi_set_fov_aspect_and_size(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight); mtx00016748(g_Vars.currentplayerstats->scale_bg2gfx); - envTick(); - zbufSwap(); - gdl = viPrepareZbuf(gdl); + env_tick(); + zbuf_swap(); + gdl = vi_prepare_zbuf(gdl); gdl = vi0000b1d0(gdl); - gdl = bgScissorToViewport(gdl); - artifactsClear(); + gdl = bg_scissor_to_viewport(gdl); + artifacts_clear(); if ((g_Vars.stagenum != STAGE_CITRAINING || (var80087260 <= 0 && g_MenuData.root != MENUROOT_MPSETUP)) && g_Vars.lvframenum <= 5 @@ -1165,41 +1165,41 @@ Gfx *lvRender(Gfx *gdl) && g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON && g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY && var8009dfc0 == 0) { - g_Vars.currentplayer->gunctrl.loadall = bgunLoadAll(); + g_Vars.currentplayer->gunctrl.loadall = bgun_load_all(); } if (g_Vars.lockscreen) { - gdl = bviewDrawMotionBlur(gdl, 0xffffffff, 255); + gdl = bview_draw_motion_blur(gdl, 0xffffffff, 255); g_Vars.lockscreen--; } else if (var8009dfc0) { - gdl = viRenderViewportEdges(gdl); - gdl = bgScissorToViewport(gdl); + gdl = vi_render_viewport_edges(gdl); + gdl = bg_scissor_to_viewport(gdl); mtx00016748(1); if (g_Vars.currentplayer->menuisactive) { - gdl = menuRender(gdl); + gdl = menu_render(gdl); } } else { if (var80075d60 == 2) { - gdl = playerUpdateShootRot(gdl); + gdl = player_update_shoot_rot(gdl); } - gdl = viRenderViewportEdges(gdl); - gdl = skyRender(gdl); - bgTick(); - lightsTick(); - propsTickPlayer(islastplayer); - scenarioTickChr(NULL); - propsSort(); - autoaimTick(); - handsTickAttack(); + gdl = vi_render_viewport_edges(gdl); + gdl = sky_render(gdl); + bg_tick(); + lights_tick(); + props_tick_player(islastplayer); + scenario_tick_chr(NULL); + props_sort(); + autoaim_tick(); + hands_tick_attack(); // Calculate lookingatprop if (PLAYERCOUNT() == 1 || g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0 - || (weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_AIMTRACK) && bmoveIsInSightAimMode())) { - g_Vars.currentplayer->lookingatprop.prop = propFindAimingAt(HAND_RIGHT, false, FINDPROPCONTEXT_QUERY); + || (weapon_has_flag(bgun_get_weapon_num(HAND_RIGHT), WEAPONFLAG_AIMTRACK) && bmove_is_in_sight_aim_mode())) { + g_Vars.currentplayer->lookingatprop.prop = prop_find_aiming_at(HAND_RIGHT, false, FINDPROPCONTEXT_QUERY); if (g_Vars.currentplayer->lookingatprop.prop) { if (g_Vars.currentplayer->lookingatprop.prop->type == PROPTYPE_CHR @@ -1230,21 +1230,21 @@ Gfx *lvRender(Gfx *gdl) g_Vars.currentplayer->lookingatprop.prop = NULL; } - if (gsetHasFunctionFlags(&g_Vars.currentplayer->hands[0].gset, FUNCFLAG_THREATDETECTOR)) { - lvFindThreats(); - } else if (weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_AIMTRACK)) { + if (gset_has_function_flags(&g_Vars.currentplayer->hands[0].gset, FUNCFLAG_THREATDETECTOR)) { + lv_find_threats(); + } else if (weapon_has_flag(bgun_get_weapon_num(HAND_RIGHT), WEAPONFLAG_AIMTRACK)) { s32 j; - if (frIsInTraining() + if (fr_is_in_training() && g_Vars.currentplayer->lookingatprop.prop - && bmoveIsInSightAimMode()) { + && bmove_is_in_sight_aim_mode()) { func0f1a0924(g_Vars.currentplayer->lookingatprop.prop); - } else if (lvUpdateTrackedProp(&g_Vars.currentplayer->lookingatprop, -1) == 0) { + } else if (lv_update_tracked_prop(&g_Vars.currentplayer->lookingatprop, -1) == 0) { g_Vars.currentplayer->lookingatprop.prop = NULL; } for (j = 0; j < ARRAYCOUNT(g_Vars.currentplayer->trackedprops); j++) { - if (!lvUpdateTrackedProp(&g_Vars.currentplayer->trackedprops[j], j)) { + if (!lv_update_tracked_prop(&g_Vars.currentplayer->trackedprops[j], j)) { g_Vars.currentplayer->trackedprops[j].x1 = -1; g_Vars.currentplayer->trackedprops[j].x2 = -2; } @@ -1256,71 +1256,71 @@ Gfx *lvRender(Gfx *gdl) && (g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit & DEVICE_EYESPY) && g_Vars.currentplayer->eyespy->camerabuttonheld) { if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { - objectiveCheckHolograph(400); - sndStart(var80095200, SFX_CAMSPY_SHUTTER, 0, -1, -1, -1, -1, -1); + objective_check_holograph(400); + snd_start(var80095200, SFX_CAMSPY_SHUTTER, 0, -1, -1, -1, -1, -1); } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { if (g_Vars.currentplayer->eyespydarts) { // Fire dart struct coord direction; - sndStart(var80095200, SFX_DRUGSPY_FIREDART, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_DRUGSPY_FIREDART, 0, -1, -1, -1, -1, -1); g_Vars.currentplayer->eyespydarts--; direction.x = g_Vars.currentplayer->eyespy->look.x; direction.y = g_Vars.currentplayer->eyespy->look.y; direction.z = g_Vars.currentplayer->eyespy->look.z; - projectileCreate(g_Vars.currentplayer->eyespy->prop, 0, + projectile_create(g_Vars.currentplayer->eyespy->prop, 0, &g_Vars.currentplayer->eyespy->prop->pos, &direction, WEAPON_TRANQUILIZER, NULL); } else { // No dart ammo - sndStart(var80095200, SFX_FIREEMPTY, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_FIREEMPTY, 0, -1, -1, -1, -1, -1); } } else { // EYESPYMODE_BOMBSPY struct coord vel = {0, 0, 0}; struct gset gset = {WEAPON_GRENADE, 0, 0, FUNC_PRIMARY}; - explosionCreateSimple(g_Vars.currentplayer->eyespy->prop, + explosion_create_simple(g_Vars.currentplayer->eyespy->prop, &g_Vars.currentplayer->eyespy->prop->pos, g_Vars.currentplayer->eyespy->prop->rooms, EXPLOSIONTYPE_DRAGONBOMBSPY, 0); - chrBeginDeath(g_Vars.currentplayer->eyespy->prop->chr, &vel, 0, 0, &gset, false, 0); + chr_begin_death(g_Vars.currentplayer->eyespy->prop->chr, &vel, 0, 0, &gset, false, 0); } } // Handle opening doors and reloading if (g_Vars.currentplayer->bondactivateorreload) { - if (currentPlayerInteract(false)) { - bgunReloadIfPossible(HAND_RIGHT); - bgunReloadIfPossible(HAND_LEFT); + if (current_player_interact(false)) { + bgun_reload_if_possible(HAND_RIGHT); + bgun_reload_if_possible(HAND_LEFT); } } else if (g_Vars.currentplayer->eyespy && g_Vars.currentplayer->eyespy->active && g_Vars.currentplayer->eyespy->opendoor) { - currentPlayerInteract(true); + current_player_interact(true); } - propsTestForPickup(); - gdl = bgRender(gdl); + props_test_for_pickup(); + gdl = bg_render(gdl); chr0f028498(var80075d68 == 15 || g_AnimHostEnabled); - gdl = propsRenderBeams(gdl); - gdl = shardsRender(gdl); - gdl = sparksRender(gdl); - gdl = weatherRender(gdl); + gdl = props_render_beams(gdl); + gdl = shards_render(gdl); + gdl = sparks_render(gdl); + gdl = weather_render(gdl); if (g_NbombsActive) { - gdl = nbombsRender(gdl); + gdl = nbombs_render(gdl); } if (var80075d60 == 2) { - gdl = playerRenderHud(gdl); + gdl = player_render_hud(gdl); #ifdef DEBUG - gdl = lvRenderManPosIfEnabled(gdl); + gdl = lv_render_man_pos_if_enabled(gdl); #endif } else { - gdl = boltbeamsRender(gdl); + gdl = boltbeams_render(gdl); if (g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) { - gdl = bgRenderArtifacts(gdl); + gdl = bg_render_artifacts(gdl); } } @@ -1338,7 +1338,7 @@ Gfx *lvRender(Gfx *gdl) if (g_Vars.stagenum == STAGE_TEST_OLD) { f32 frac = 0; u32 colour; - s32 endframe = animGetNumFrames(g_CutsceneAnimNum) - 1; + s32 endframe = anim_get_num_frames(g_CutsceneAnimNum) - 1; colour = 0; @@ -1366,10 +1366,10 @@ Gfx *lvRender(Gfx *gdl) gDPSetPrimColorViaWord(gdl++, 0, 0, colour | alpha); gDPFillRectangle(gdl++, - viGetViewLeft(), - viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), - viGetViewTop() + viGetViewHeight()); + vi_get_view_left(), + vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), + vi_get_view_top() + vi_get_view_height()); gdl = text0f153838(gdl); } @@ -1381,7 +1381,7 @@ Gfx *lvRender(Gfx *gdl) case ANIM_CUT_CAVE_INTRO_CAM: // Horizon scanner in Air Base intro if (g_CutsceneCurAnimFrame60 > 839 && g_CutsceneCurAnimFrame60 < 1411) { - gdl = bviewDrawHorizonScanner(gdl); + gdl = bview_draw_horizon_scanner(gdl); } break; case ANIM_CUT_LUE_INTRO_CAM_01: @@ -1393,7 +1393,7 @@ Gfx *lvRender(Gfx *gdl) cutscenehasstatic = true; if (g_CutsceneStaticAudioHandle == NULL) { - sndStart(var80095200, SFX_INFIL_STATIC_LONG, &g_CutsceneStaticAudioHandle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_INFIL_STATIC_LONG, &g_CutsceneStaticAudioHandle, -1, -1, -1, -1, -1); } g_CutsceneStaticTimer -= g_Vars.diffframe60; @@ -1403,12 +1403,12 @@ Gfx *lvRender(Gfx *gdl) g_CutsceneStaticActive = false; } - gdl = bviewDrawFilmInterlace(gdl, 0xffffffff, 0xffffffff); + gdl = bview_draw_film_interlace(gdl, 0xffffffff, 0xffffffff); if (g_CutsceneStaticTimer < TICKS(15)) { if (g_CutsceneStaticActive == false) { g_CutsceneStaticActive = true; - sndStart(var80095200, SFX_INFIL_STATIC_MEDIUM, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_INFIL_STATIC_MEDIUM, NULL, -1, -1, -1, -1, -1); } cutscenestatic = 225 - g_CutsceneStaticTimer * PALUP(10); @@ -1418,11 +1418,11 @@ Gfx *lvRender(Gfx *gdl) // to the main static above if (random() % 60 == 1) { cutscenestatic = 255; - sndStart(var80095200, SFX_INFIL_STATIC_SHORT, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_INFIL_STATIC_SHORT, NULL, -1, -1, -1, -1, -1); } if (cutscenestatic) { - gdl = bviewDrawStatic(gdl, 0xffffffff, cutscenestatic); + gdl = bview_draw_static(gdl, 0xffffffff, cutscenestatic); } } break; @@ -1436,7 +1436,7 @@ Gfx *lvRender(Gfx *gdl) // Slayer rocket shows static when flying out of bounds if (g_Vars.currentplayer->visionmode == VISIONMODE_SLAYERROCKET && g_Vars.tickmode != TICKMODE_CUTSCENE) { - gdl = bviewDrawSlayerRocketInterlace(gdl, 0xffffffff, 0xffffffff); + gdl = bview_draw_slayer_rocket_interlace(gdl, 0xffffffff, 0xffffffff); if (g_Vars.currentplayer->badrockettime > 0) { u32 slayerstatic = g_Vars.currentplayer->badrockettime * 255 / TICKS(90); @@ -1445,13 +1445,13 @@ Gfx *lvRender(Gfx *gdl) slayerstatic = 255; } - gdl = bviewDrawStatic(gdl, 0x4fffffff, slayerstatic); + gdl = bview_draw_static(gdl, 0x4fffffff, slayerstatic); } } #if VERSION >= VERSION_NTSC_1_0 if (g_Vars.currentplayer->visionmode == VISIONMODE_SLAYERROCKETSTATIC) { - gdl = bviewDrawStatic(gdl, 0x4fffffff, 255); + gdl = bview_draw_static(gdl, 0x4fffffff, 255); g_Vars.currentplayer->visionmode = VISIONMODE_NORMAL; } #endif @@ -1468,7 +1468,7 @@ Gfx *lvRender(Gfx *gdl) #endif } - gdl = bviewDrawZoomBlur(gdl, 0xffffffff, xraything, 1.05f, 1.05f); + gdl = bview_draw_zoom_blur(gdl, 0xffffffff, xraything, 1.05f, 1.05f); } // Handle combat boosts @@ -1476,22 +1476,22 @@ Gfx *lvRender(Gfx *gdl) || (g_Vars.speedpillwant && !g_Vars.speedpillon) || (!g_Vars.speedpillwant && g_Vars.speedpillon)) { if (g_Vars.speedpillchange == (PAL ? 26 : 30) && !g_Vars.speedpillwant) { - sndStart(var80095200, lvGetSlowMotionType() ? SFX_JO_BOOST_ACTIVATE : SFX_ARGH_JO_02AD, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, lv_get_slow_motion_type() ? SFX_JO_BOOST_ACTIVATE : SFX_ARGH_JO_02AD, 0, -1, -1, -1, -1, -1); } if (g_Vars.speedpillchange < (PAL ? 13 : 15)) { - gdl = bviewDrawZoomBlur(gdl, 0xffffffff, + gdl = bview_draw_zoom_blur(gdl, 0xffffffff, g_Vars.speedpillchange * 180 / (PAL ? 13 : 15), (f32)g_Vars.speedpillchange * (PAL ? 0.023076923564076f : 0.02000000141561f) + 1.1f, (f32)g_Vars.speedpillchange * (PAL ? 0.023076923564076f : 0.02000000141561f) + 1.1f); - gdl = playerDrawFade(gdl, 0xff, 0xff, 0xff, + gdl = player_draw_fade(gdl, 0xff, 0xff, 0xff, g_Vars.speedpillchange * (PAL ? 0.0076923076994717f : 0.0066666668280959f)); } else { - gdl = bviewDrawZoomBlur(gdl, 0xffffffff, + gdl = bview_draw_zoom_blur(gdl, 0xffffffff, ((PAL ? 26 : 30) - g_Vars.speedpillchange) * 180 / (PAL ? 13 : 15), (f32)((PAL ? 26 : 30) - g_Vars.speedpillchange) * (PAL ? 0.023076923564076f : 0.02000000141561f) + 1.1f, (f32)((PAL ? 26 : 30) - g_Vars.speedpillchange) * (PAL ? 0.023076923564076f : 0.02000000141561f) + 1.1f); - gdl = playerDrawFade(gdl, 0xff, 0xff, 0xff, + gdl = player_draw_fade(gdl, 0xff, 0xff, 0xff, ((PAL ? 26.0f : 30.0f) - g_Vars.speedpillchange) * (PAL ? 0.0076923076994717f : 0.0066666668280959f)); } @@ -1517,19 +1517,19 @@ Gfx *lvRender(Gfx *gdl) } if (bluramount) { - bviewClearMotionBlur(); - gdl = bviewDrawMotionBlur(gdl, 0xffffffff, bluramount); + bview_clear_motion_blur(); + gdl = bview_draw_motion_blur(gdl, 0xffffffff, bluramount); } // Handle blur effect in cutscenes (Extraction intro?) if (g_Vars.tickmode == TICKMODE_CUTSCENE) { - f32 cutsceneblurfrac = playerGetCutsceneBlurFrac(); + f32 cutsceneblurfrac = player_get_cutscene_blur_frac(); if (cutsceneblurfrac > 0) { #if VERSION < VERSION_PAL_BETA u32 stack; #endif - gdl = bviewDrawMotionBlur(gdl, 0xffffff00, cutsceneblurfrac * 255); + gdl = bview_draw_motion_blur(gdl, 0xffffff00, cutsceneblurfrac * 255); } } @@ -1546,12 +1546,12 @@ Gfx *lvRender(Gfx *gdl) if (bluramount); #endif - if (debugGetMotionBlur() == 1) { - gdl = bviewDrawMotionBlur(gdl, 0xffffff00, 128); - } else if (debugGetMotionBlur() == 2) { - gdl = bviewDrawMotionBlur(gdl, 0xffffff00, 192); - } else if (debugGetMotionBlur() == 3) { - gdl = bviewDrawMotionBlur(gdl, 0xffffff00, 230); + if (debug_get_motion_blur() == 1) { + gdl = bview_draw_motion_blur(gdl, 0xffffff00, 128); + } else if (debug_get_motion_blur() == 2) { + gdl = bview_draw_motion_blur(gdl, 0xffffff00, 192); + } else if (debug_get_motion_blur() == 3) { + gdl = bview_draw_motion_blur(gdl, 0xffffff00, 230); } // Render white when teleporting @@ -1580,31 +1580,31 @@ Gfx *lvRender(Gfx *gdl) if (alpha) { gdl = text0f153628(gdl); gdl = text0f153a34(gdl, - viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), - viGetViewTop() + viGetViewHeight(), 0xffffff00 | alpha); + vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), + vi_get_view_top() + vi_get_view_height(), 0xffffff00 | alpha); gdl = text0f153780(gdl); } } } #if VERSION >= VERSION_NTSC_1_0 - gdl = scenarioRenderHud(gdl); - gdl = lvRenderFade(gdl); + gdl = scenario_render_hud(gdl); + gdl = lv_render_fade(gdl); #else - gdl = lvRenderFade(gdl); - gdl = scenarioRenderHud(gdl); + gdl = lv_render_fade(gdl); + gdl = scenario_render_hud(gdl); #endif if (g_FrIsValidWeapon) { - gdl = frRenderHud(gdl); + gdl = fr_render_hud(gdl); } - if (debugGetTilesDebugMode() != 0 - || debugGetPadsDebugMode() != 0 + if (debug_get_tiles_debug_mode() != 0 + || debug_get_pads_debug_mode() != 0 || debug0f11eea8() || debug0f11ef80() - || debugIsChrStatsEnabled() + || debug_is_chr_stats_enabled() || debug0f11ee40()) { #if VERSION < VERSION_NTSC_1_0 RoomNum spc8[21]; @@ -1622,42 +1622,42 @@ Gfx *lvRender(Gfx *gdl) spc8[j] = -1; for (j = 0; sp9c[j] != -1; j++) { - bgRoomGetNeighbours(sp9c[j], spb0, 10); - roomsAppend(spb0, spc8, 20); + bg_room_get_neighbours(sp9c[j], spb0, 10); + rooms_append(spb0, spc8, 20); } - if (debugIsChrStatsEnabled()) { - gdl = chrsRenderChrStats(gdl, spc8); + if (debug_is_chr_stats_enabled()) { + gdl = chrs_render_chr_stats(gdl, spc8); } #endif } - gdl = skyRenderOverexposure(gdl); - gdl = amRender(gdl); + gdl = sky_render_overexposure(gdl); + gdl = am_render(gdl); mtx00016748(1); if (g_Vars.currentplayer->menuisactive) { - gdl = menuRender(gdl); + gdl = menu_render(gdl); } mtx00016748(g_Vars.currentplayerstats->scale_bg2gfx); if (g_Vars.mplayerisrunning) { - gdl = mpRenderModalText(gdl); + gdl = mp_render_modal_text(gdl); } if (g_Vars.currentplayer->dostartnewlife) { - playerStartNewLife(); + player_start_new_life(); } } - artifactsTick(); + artifacts_tick(); if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) #if VERSION >= VERSION_NTSC_1_0 - && playerHasSharedViewport() + && player_has_shared_viewport() #else - && ((g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE) + && ((g_InCutscene && !g_MainIsEndscreen) || menu_get_root() == MENUROOT_COOPCONTINUE) #endif && g_Vars.currentplayernum != 0) { gdl = savedgdl; @@ -1675,18 +1675,18 @@ Gfx *lvRender(Gfx *gdl) } if (g_Vars.autocutgroupcur < 0 && g_Vars.autocutgroupleft <= 0) { - mainChangeToStage(STAGE_TITLE); + main_change_to_stage(STAGE_TITLE); } } // Advance the cutscenes when autoplaying if (!g_Vars.autocutplaying && g_Vars.autocutgroupcur >= 0 && g_Vars.autocutgroupleft > 0) { - hudmsgRemoveAll(); + hudmsg_remove_all(); g_Vars.autocutnum = g_Cutscenes[g_Vars.autocutgroupcur].scene; #if VERSION < VERSION_NTSC_1_0 - if (mainGetStageNum() != g_Cutscenes[g_Vars.autocutgroupcur].stage) + if (main_get_stage_num() != g_Cutscenes[g_Vars.autocutgroupcur].stage) #endif { g_MissionConfig.iscoop = false; @@ -1696,14 +1696,14 @@ Gfx *lvRender(Gfx *gdl) g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; g_MissionConfig.isanti = false; - setNumPlayers(1); - titleSetNextMode(TITLEMODE_SKIP); + set_num_players(1); + title_set_next_mode(TITLEMODE_SKIP); g_MissionConfig.difficulty = DIFF_A; - lvSetDifficulty(DIFF_A); + lv_set_difficulty(DIFF_A); g_MissionConfig.stageindex = g_Cutscenes[g_Vars.autocutgroupcur].mission; g_MissionConfig.stagenum = g_Cutscenes[g_Vars.autocutgroupcur].stage; - titleSetNextStage(g_Cutscenes[g_Vars.autocutgroupcur].stage); - mainChangeToStage(g_Cutscenes[g_Vars.autocutgroupcur].stage); + title_set_next_stage(g_Cutscenes[g_Vars.autocutgroupcur].stage); + main_change_to_stage(g_Cutscenes[g_Vars.autocutgroupcur].stage); } g_Vars.autocutgroupleft--; @@ -1715,12 +1715,12 @@ Gfx *lvRender(Gfx *gdl) } } - gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetWidth(), viGetHeight()); + gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, vi_get_width(), vi_get_height()); #if VERSION < VERSION_NTSC_1_0 if ((uintptr_t)gdl < (uintptr_t)g_GfxBuffers[g_GfxActiveBufferIndex] || (uintptr_t)gdl > (uintptr_t)g_GfxBuffers[g_GfxActiveBufferIndex + 1]) { - crashSetMessage("lv.c Master DL overrun!"); + crash_set_message("lv.c Master DL overrun!"); CRASH(); } #endif @@ -1747,7 +1747,7 @@ u32 var800840b4 = 0; u32 var800840b8 = 0; u32 var800840bc = 0; -void lvUpdateSoloHandicaps(void) +void lv_update_solo_handicaps(void) { if (g_Vars.antiplayernum >= 0) { if (g_Difficulty == DIFF_A) { @@ -1845,7 +1845,7 @@ void lvUpdateSoloHandicaps(void) f32 frac = 1; if (g_Vars.coopplayernum < 0 && g_Vars.antiplayernum < 0) { - totalhealth = playerGetHealthFrac() + playerGetShieldFrac(); + totalhealth = player_get_health_frac() + player_get_shield_frac(); if (totalhealth <= 0.125f) { frac = 0.5f; @@ -1931,7 +1931,7 @@ s32 sub54321(s32 value) } #endif -void lvUpdateCutsceneTime(void) +void lv_update_cutscene_time(void) { if (g_Vars.in_cutscene) { g_CutsceneTime240_60 += g_Vars.lvupdate60; @@ -1941,7 +1941,7 @@ void lvUpdateCutsceneTime(void) g_CutsceneTime240_60 = 0; } -s32 lvGetSlowMotionType(void) +s32 lv_get_slow_motion_type(void) { #if PIRACYCHECKS #if PAL @@ -1975,13 +1975,13 @@ s32 lvGetSlowMotionType(void) return SLOWMOTION_SMART; } } else { - if (cheatIsActive(CHEAT_SLOMO)) { + if (cheat_is_active(CHEAT_SLOMO)) { return SLOWMOTION_ON; } - if (debugGetSlowMotion() == SLOWMOTION_ON) { + if (debug_get_slow_motion() == SLOWMOTION_ON) { return SLOWMOTION_ON; } - if (debugGetSlowMotion() == SLOWMOTION_SMART) { + if (debug_get_slow_motion() == SLOWMOTION_SMART) { return SLOWMOTION_SMART; } } @@ -1989,16 +1989,16 @@ s32 lvGetSlowMotionType(void) return SLOWMOTION_OFF; } -void lvTick(void) +void lv_tick(void) { s32 j; s32 i; - lvCheckPauseStateChanged(); + lv_check_pause_state_changed(); #if VERSION >= VERSION_NTSC_1_0 if (g_Vars.pakstocheck) { - paksTick(); + paks_tick(); } #endif @@ -2006,10 +2006,10 @@ void lvTick(void) g_Vars.joydisableframestogo--; } else if (g_Vars.joydisableframestogo == 0) { #if VERSION >= VERSION_NTSC_1_0 - joyUnlockCyclicPolling(); + joy_unlock_cyclic_polling(); #else - if (!joyIsCyclicPollingEnabled()) { - joyEnableCyclicPolling(3278, "lv.c"); + if (!joy_is_cyclic_polling_enabled()) { + joy_enable_cyclic_polling(3278, "lv.c"); } #endif @@ -2020,14 +2020,14 @@ void lvTick(void) g_Vars.paksneededforgame = 0; } else { g_Vars.paksneededforgame = 0x1f; - pakEnableRumbleForAllPlayers(); + pak_enable_rumble_for_all_players(); } g_Vars.joydisableframestogo = -1; } if (IS4MB()) { - vmPrintStatsIfEnabled(); + vm_print_stats_if_enabled(); } for (j = 0; j < PLAYERCOUNT(); j++) { @@ -2035,16 +2035,16 @@ void lvTick(void) g_Vars.players[j]->hands[HAND_RIGHT].hasdotinfo = false; } - if (lvIsPaused()) { + if (lv_is_paused()) { g_Vars.lvupdate240 = 0; - } else if (mpIsPaused()) { + } else if (mp_is_paused()) { g_Vars.lvupdate240 = 0; for (j = 0; j < PLAYERCOUNT(); j++) { g_Vars.players[j]->joybutinhibit = 0xefffefff; } } else { - s32 slowmo = lvGetSlowMotionType(); + s32 slowmo = lv_get_slow_motion_type(); g_Vars.lvupdate240 = g_Vars.diffframe240; if (slowmo == SLOWMOTION_ON) { @@ -2071,7 +2071,7 @@ void lvTick(void) for (otherplayernum = 0; otherplayernum < PLAYERCOUNT(); otherplayernum++) { if (playernum != otherplayernum && g_Vars.players[otherplayernum]->isdead == false - && bgRoomIsOnPlayerScreen(rooms[r], otherplayernum)) { + && bg_room_is_on_player_screen(rooms[r], otherplayernum)) { foundnearbychr = true; } } @@ -2118,58 +2118,58 @@ void lvTick(void) g_Vars.lvupdate60frealprev = g_Vars.lvupdate60freal; g_Vars.lvupdate60freal = PALUPF(g_Vars.lvupdate60f); - bgunTickBoost(); - hudmsgsTick(); + bgun_tick_boost(); + hudmsgs_tick(); - if ((joyGetButtonsPressedThisFrame(0, 0xffff) != 0 - || joyGetStickX(0) > 10 - || joyGetStickX(0) < -10 - || joyGetStickY(0) > 10 - || joyGetStickY(0) < -10 - || joyGetButtonsPressedThisFrame(1, 0xffff) != 0 - || joyGetStickX(1) > 10 - || joyGetStickX(1) < -10 - || joyGetStickY(1) > 10 - || joyGetStickY(1) < -10 - || joyGetButtonsPressedThisFrame(2, 0xffff) != 0 - || joyGetStickX(2) > 10 - || joyGetStickX(2) < -10 - || joyGetStickY(2) > 10 - || joyGetStickY(2) < -10 - || joyGetButtonsPressedThisFrame(3, 0xffff) != 0 - || joyGetStickX(3) > 10 - || joyGetStickX(3) < -10 - || joyGetStickY(3) > 10 - || joyGetStickY(3) < -10) && g_IsTitleDemo) { + if ((joy_get_buttons_pressed_this_frame(0, 0xffff) != 0 + || joy_get_stick_x(0) > 10 + || joy_get_stick_x(0) < -10 + || joy_get_stick_y(0) > 10 + || joy_get_stick_y(0) < -10 + || joy_get_buttons_pressed_this_frame(1, 0xffff) != 0 + || joy_get_stick_x(1) > 10 + || joy_get_stick_x(1) < -10 + || joy_get_stick_y(1) > 10 + || joy_get_stick_y(1) < -10 + || joy_get_buttons_pressed_this_frame(2, 0xffff) != 0 + || joy_get_stick_x(2) > 10 + || joy_get_stick_x(2) < -10 + || joy_get_stick_y(2) > 10 + || joy_get_stick_y(2) < -10 + || joy_get_buttons_pressed_this_frame(3, 0xffff) != 0 + || joy_get_stick_x(3) > 10 + || joy_get_stick_x(3) < -10 + || joy_get_stick_y(3) > 10 + || joy_get_stick_y(3) < -10) && g_IsTitleDemo) { if (g_Vars.stagenum != STAGE_TITLE) { - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(STAGE_TITLE); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(STAGE_TITLE); } g_IsTitleDemo = false; } if (g_Vars.stagenum < STAGE_TITLE && !g_IsTitleDemo && !g_Vars.in_cutscene) { - if (joyGetButtons(0, 0xffff) == 0 - && joyGetStickX(0) < 10 - && joyGetStickX(0) > -10 - && joyGetStickY(0) < 10 - && joyGetStickY(0) > -10 - && joyGetButtons(1, 0xffff) == 0 - && joyGetStickX(1) < 10 - && joyGetStickX(1) > -10 - && joyGetStickY(1) < 10 - && joyGetStickY(1) > -10 - && joyGetButtons(2, 0xffff) == 0 - && joyGetStickX(2) < 10 - && joyGetStickX(2) > -10 - && joyGetStickY(2) < 10 - && joyGetStickY(2) > -10 - && joyGetButtons(3, 0xffff) == 0 - && joyGetStickX(3) < 10 - && joyGetStickX(3) > -10 - && joyGetStickY(3) < 10 - && joyGetStickY(3) > -10) { + if (joy_get_buttons(0, 0xffff) == 0 + && joy_get_stick_x(0) < 10 + && joy_get_stick_x(0) > -10 + && joy_get_stick_y(0) < 10 + && joy_get_stick_y(0) > -10 + && joy_get_buttons(1, 0xffff) == 0 + && joy_get_stick_x(1) < 10 + && joy_get_stick_x(1) > -10 + && joy_get_stick_y(1) < 10 + && joy_get_stick_y(1) > -10 + && joy_get_buttons(2, 0xffff) == 0 + && joy_get_stick_x(2) < 10 + && joy_get_stick_x(2) > -10 + && joy_get_stick_y(2) < 10 + && joy_get_stick_y(2) > -10 + && joy_get_buttons(3, 0xffff) == 0 + && joy_get_stick_x(3) < 10 + && joy_get_stick_x(3) > -10 + && joy_get_stick_y(3) < 10 + && joy_get_stick_y(3) > -10) { g_TitleIdleTime60 += g_Vars.diffframe60; } else { g_TitleIdleTime60 = 0; @@ -2192,20 +2192,20 @@ void lvTick(void) s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); - hudmsgCreate(langGet(L_MISC_068), HUDMSGTYPE_DEFAULT); // "One minute left." + set_current_player_num(i); + hudmsg_create(lang_get(L_MISC_068), HUDMSGTYPE_DEFAULT); // "One minute left." } } if (elapsed < TICKS(g_MpTimeLimit60) && nexttime >= TICKS(g_MpTimeLimit60)) { // Match is ending due to time limit reached - mainEndStage(); + main_end_stage(); } // Sound alarm at 10 seconds remaining if (nexttime >= TICKS(g_MpTimeLimit60) - TICKS(600) && g_MiscAudioHandle == NULL - && !lvIsPaused() + && !lv_is_paused() && nexttime < TICKS(g_MpTimeLimit60)) { snd00010718(&g_MiscAudioHandle, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_ALARM_DEFAULT, 1, 1, -1, true); } @@ -2232,7 +2232,7 @@ void lvTick(void) if (g_MpScoreLimit > 0) { struct ranking rankings[MAX_MPCHRS]; - s32 count = mpGetPlayerRankings(rankings); + s32 count = mp_get_player_rankings(rankings); for (i = 0; i < count; i++) { if (rankings[i].score >= g_MpScoreLimit) { @@ -2243,7 +2243,7 @@ void lvTick(void) if (g_MpTeamScoreLimit > 0) { struct ranking rankings[MAX_MPCHRS]; - s32 count = mpGetTeamRankings(rankings); + s32 count = mp_get_team_rankings(rankings); for (i = 0; i < count; i++) { if (rankings[i].score >= g_MpTeamScoreLimit) { @@ -2253,7 +2253,7 @@ void lvTick(void) } if (g_NumReasonsToEndMpMatch > 0 && numdying == 0) { - mainEndStage(); + main_end_stage(); } } } @@ -2261,86 +2261,86 @@ void lvTick(void) g_StageTimeElapsed60 += g_Vars.lvupdate60; g_StageTimeElapsed1f = g_StageTimeElapsed60 / TICKS(60.0f); - viSetUseZBuf(true); + vi_set_use_z_buf(true); if (g_Vars.stagenum == STAGE_TEST_OLD) { - titleTickOld(); - musicTick(); + title_tick_old(); + music_tick(); } if (g_Vars.stagenum == STAGE_TITLE) { - titleTick(); - langTick(); - musicTick(); + title_tick(); + lang_tick(); + music_tick(); } else if (g_Vars.stagenum == STAGE_BOOTPAKMENU) { - setCurrentPlayerNum(0); + set_current_player_num(0); #if VERSION >= VERSION_PAL_BETA - playerConfigureVi(); + player_configure_vi(); #endif - menuTick(); - musicTick(); - langTick(); - pakExecuteDebugOperations(); + menu_tick(); + music_tick(); + lang_tick(); + pak_execute_debug_operations(); } else if (g_Vars.stagenum == STAGE_4MBMENU) { - menuTick(); - musicTick(); - langTick(); - pakExecuteDebugOperations(); + menu_tick(); + music_tick(); + lang_tick(); + pak_execute_debug_operations(); } else if (g_Vars.stagenum == STAGE_CREDITS) { - musicTick(); - langTick(); + music_tick(); + lang_tick(); } else { - lvUpdateCutsceneTime(); - vtxstoreTick(); - lvUpdateSoloHandicaps(); - roomsTick(); - skyTick(); - casingsTick(); - shardsTick(); - sparksTick(); - wallhitsTick(); - splatsTick(); + lv_update_cutscene_time(); + vtxstore_tick(); + lv_update_solo_handicaps(); + rooms_tick(); + sky_tick(); + casings_tick(); + shards_tick(); + sparks_tick(); + wallhits_tick(); + splats_tick(); if (g_WeatherActive) { - weatherTick(); + weather_tick(); } if (g_NbombsActive) { - nbombsTick(); + nbombs_tick(); } - lvUpdateMiscSfx(); - sndTick(); - pakExecuteDebugOperations(); - lightingTick(); - modelmgrPrintCounts(); - boltbeamsTick(); - amTick(); - menuTick(); - scenarioTick(); + lv_update_misc_sfx(); + snd_tick(); + pak_execute_debug_operations(); + lighting_tick(); + modelmgr_print_counts(); + boltbeams_tick(); + am_tick(); + menu_tick(); + scenario_tick(); if (!g_MainIsEndscreen) { - propsTick(); + props_tick(); } - musicTick(); - langTick(); - propsTickPadEffects(); + music_tick(); + lang_tick(); + props_tick_pad_effects(); - if (mainGetStageNum() == STAGE_CITRAINING) { - struct trainingdata *trainingdata = dtGetData(); + if (main_get_stage_num() == STAGE_CITRAINING) { + struct trainingdata *trainingdata = dt_get_data(); if ((g_Vars.currentplayer->prop->rooms[0] < ROOM_DISH_HOLO1 || g_Vars.currentplayer->prop->rooms[0] > ROOM_DISH_HOLO4) && g_Vars.currentplayer->prop->rooms[0] != ROOM_DISH_FIRINGRANGE && (trainingdata == NULL || trainingdata->intraining == false)) { - chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_IN_TRAINING); } - frTick(); + fr_tick(); if (g_Vars.lvupdate240 != 0) { - dtTick(); - htTick(); + dt_tick(); + ht_tick(); } } } @@ -2351,16 +2351,16 @@ const char var7f1b774c[] = "pos:%s%s %.2f %.2f %.2f\n"; const char var7f1b7768[] = ""; const char var7f1b776c[] = ""; -void lvTickPlayer(void) +void lv_tick_player(void) { f32 xdiff; f32 zdiff; if (var80075d64 == 2) { if (var80075d68 == 2) { - playerTick(true); + player_tick(true); } else { - playerTick(false); + player_tick(false); } } @@ -2370,92 +2370,92 @@ void lvTickPlayer(void) g_Vars.currentplayerstats->distance += sqrtf(xdiff * xdiff + zdiff * zdiff); } -void lvStop(void) +void lv_stop(void) { - paksStop(true); + paks_stop(true); if (g_MiscAudioHandle && sndGetState(g_MiscAudioHandle)) { audioStop(g_MiscAudioHandle); } if (g_Vars.stagenum < STAGE_TITLE) { - s32 bank = langGetLangBankIndexFromStagenum(g_Vars.stagenum); - langClearBank(bank); + s32 bank = lang_get_lang_bank_index_from_stagenum(g_Vars.stagenum); + lang_clear_bank(bank); stub0f015270(); } - chrmgrStop(); - explosionsStop(); - smokeStop(); + chrmgr_stop(); + explosions_stop(); + smoke_stop(); stub0f015400(); stub0f015410(); - shardsStop(); + shards_stop(); stub0f0153f0(); - propsStop(); - objsStop(); - weatherStop(); - objectivesStop(); + props_stop(); + objs_stop(); + weather_stop(); + objectives_stop(); stub0f015260(); - bgunStop(); - psStop(); - musicStop(); - hudmsgsStop(); + bgun_stop(); + ps_stop(); + music_stop(); + hudmsgs_stop(); if (g_Vars.stagenum < STAGE_TITLE) { - bgStop(); + bg_stop(); } func00033dd8(); if (g_FileState == FILESTATE_CHANGINGAGENT) { - menuPlaySound(MENUSOUND_EXPLOSION); + menu_play_sound(MENUSOUND_EXPLOSION); g_FileState = FILESTATE_UNSELECTED; } #if VERSION >= VERSION_NTSC_1_0 - menuStop(); + menu_stop(); #endif } -void lvCheckPauseStateChanged(void) +void lv_check_pause_state_changed(void) { - u32 paused = mpIsPaused(); + u32 paused = mp_is_paused(); if (paused != var80084010) { if (paused) { - pakDisableRumbleForAllPlayers(); + pak_disable_rumble_for_all_players(); } else { - pakEnableRumbleForAllPlayers(); + pak_enable_rumble_for_all_players(); } } var80084010 = paused; } -void lvSetPaused(bool paused) +void lv_set_paused(bool paused) { if (paused) { - pakDisableRumbleForAllPlayers(); + pak_disable_rumble_for_all_players(); snd0000fe20(); } else { snd0000fe50(); - pakEnableRumbleForAllPlayers(); + pak_enable_rumble_for_all_players(); } var80084014 = paused; } -bool lvIsPaused(void) +bool lv_is_paused(void) { return var80084014; } -s32 lvGetDifficulty(void) +s32 lv_get_difficulty(void) { return g_Difficulty; } -void lvSetDifficulty(s32 difficulty) +void lv_set_difficulty(s32 difficulty) { if (difficulty < DIFF_A || difficulty > DIFF_PD) { difficulty = DIFF_A; @@ -2464,27 +2464,27 @@ void lvSetDifficulty(s32 difficulty) g_Difficulty = difficulty; } -void lvSetMpTimeLimit60(u32 limit) +void lv_set_mp_time_limit60(u32 limit) { g_MpTimeLimit60 = limit; } -void lvSetMpScoreLimit(u32 limit) +void lv_set_mp_score_limit(u32 limit) { g_MpScoreLimit = limit; } -void lvSetMpTeamScoreLimit(u32 limit) +void lv_set_mp_team_score_limit(u32 limit) { g_MpTeamScoreLimit = limit; } -f32 lvGetStageTimeInSeconds(void) +f32 lv_get_stage_time_in_seconds(void) { return g_StageTimeElapsed1f; } -s32 lvGetStageTime60(void) +s32 lv_get_stage_time60(void) { return g_StageTimeElapsed60; } diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c index 1595df7fc..97903b811 100644 --- a/src/game/mainmenu.c +++ b/src/game/mainmenu.c @@ -39,28 +39,28 @@ struct menudialogdef g_2PMissionControlStyleMenuDialog; struct menudialogdef g_CiControlPlayer2MenuDialog; struct menudialogdef g_CinemaMenuDialog; -char *menuTextCurrentStageName(struct menuitem *item) +char *menu_text_current_stage_name(struct menuitem *item) { - sprintf(g_StringPointer, "%s\n", langGet(g_SoloStages[g_MissionConfig.stageindex].name3)); + sprintf(g_StringPointer, "%s\n", lang_get(g_SoloStages[g_MissionConfig.stageindex].name3)); return g_StringPointer; } -char *soloMenuTextDifficulty(struct menuitem *item) +char *solo_menu_text_difficulty(struct menuitem *item) { #if VERSION >= VERSION_NTSC_1_0 if (g_MissionConfig.pdmode) { - return langGet(L_MPWEAPONS_221); + return lang_get(L_MPWEAPONS_221); } #endif switch (g_MissionConfig.difficulty) { case DIFF_SA: - return langGet(L_OPTIONS_252); + return lang_get(L_OPTIONS_252); case DIFF_PA: - return langGet(L_OPTIONS_253); + return lang_get(L_OPTIONS_253); case DIFF_A: default: - return langGet(L_OPTIONS_251); + return lang_get(L_OPTIONS_251); } } @@ -75,7 +75,7 @@ u16 g_ControlStyleOptions[] = { L_OPTIONS_246, // "2.4" }; -MenuItemHandlerResult menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex) +MenuItemHandlerResult menuhandler_control_style_impl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex) { u16 categories[] = { L_OPTIONS_237, // "Single" @@ -94,18 +94,18 @@ MenuItemHandlerResult menuhandlerControlStyleImpl(s32 operation, struct menuitem data->list.value = 2; break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(g_ControlStyleOptions[data->list.value]); + return (s32) lang_get(g_ControlStyleOptions[data->list.value]); case MENUOP_GETOPTGROUPTEXT: - return (s32) langGet(categories[data->list.value]); + return (s32) lang_get(categories[data->list.value]); case MENUOP_GETGROUPSTARTINDEX: data->list.groupstartindex = data->list.value == 0 ? 0 : 4; break; case MENUOP_SET: - optionsSetControlMode(mpindex, data->list.value); + options_set_control_mode(mpindex, data->list.value); g_Vars.modifiedfiles |= MODFILE_GAME; break; case MENUOP_GETSELECTEDINDEX: - data->list.value = optionsGetControlMode(mpindex); + data->list.value = options_get_control_mode(mpindex); g_Menus[g_MpPlayerNum].main.mpindex = mpindex; break; case MENUOP_LISTITEMFOCUS: @@ -120,15 +120,15 @@ MenuItemHandlerResult menuhandlerControlStyleImpl(s32 operation, struct menuitem MenuItemHandlerResult menuhandler001024dc(s32 operation, struct menuitem *item, union handlerdata *data) { - return menuhandlerControlStyleImpl(operation, item, data, 4); + return menuhandler_control_style_impl(operation, item, data, 4); } MenuItemHandlerResult menuhandler001024fc(s32 operation, struct menuitem *item, union handlerdata *data) { - return menuhandlerControlStyleImpl(operation, item, data, 5); + return menuhandler_control_style_impl(operation, item, data, 5); } -MenuItemHandlerResult menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_reverse_pitch(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -140,16 +140,16 @@ MenuItemHandlerResult menuhandlerReversePitch(s32 operation, struct menuitem *it switch (operation) { case MENUOP_GET: - return !optionsGetForwardPitch(mpchrnum); + return !options_get_forward_pitch(mpchrnum); case MENUOP_SET: - optionsSetForwardPitch(mpchrnum, data->checkbox.value == 0); + options_set_forward_pitch(mpchrnum, data->checkbox.value == 0); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_aim_control(s32 operation, struct menuitem *item, union handlerdata *data) { u32 playernum = (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) ? g_Vars.currentplayerstats->mpindex : item->param3; @@ -162,7 +162,7 @@ MenuItemHandlerResult menuhandlerAimControl(s32 operation, struct menuitem *item { L_MPWEAPONS_276, L_MPWEAPONS_277 }, // "Hold", "Toggle" }; - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() >= 2) { + if (options_get_screen_split() == SCREENSPLIT_VERTICAL && PLAYERCOUNT() >= 2) { index = 1; } #else @@ -178,22 +178,22 @@ MenuItemHandlerResult menuhandlerAimControl(s32 operation, struct menuitem *item break; case MENUOP_GETOPTIONTEXT: #if VERSION >= VERSION_PAL_FINAL - return (s32) langGet(options[index][data->dropdown.value]); + return (s32) lang_get(options[index][data->dropdown.value]); #else - return (s32) langGet(options[data->dropdown.value]); + return (s32) lang_get(options[data->dropdown.value]); #endif case MENUOP_SET: - optionsSetAimControl(playernum, data->dropdown.value); + options_set_aim_control(playernum, data->dropdown.value); g_Vars.modifiedfiles |= MODFILE_GAME; break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = optionsGetAimControl(playernum); + data->dropdown.value = options_get_aim_control(playernum); } return 0; } -MenuItemHandlerResult menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_sound_mode(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS_232, // "Mono" @@ -207,9 +207,9 @@ MenuItemHandlerResult menuhandlerSoundMode(s32 operation, struct menuitem *item, data->dropdown.value = 4; break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(options[data->dropdown.value]); + return (s32) lang_get(options[data->dropdown.value]); case MENUOP_SET: - sndSetSoundMode(data->dropdown.value); + snd_set_sound_mode(data->dropdown.value); g_Vars.modifiedfiles |= MODFILE_GAME; break; case MENUOP_GETSELECTEDINDEX: @@ -219,7 +219,7 @@ MenuItemHandlerResult menuhandlerSoundMode(s32 operation, struct menuitem *item, return 0; } -MenuItemHandlerResult menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_screen_size(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS_220, // "Full" @@ -232,19 +232,19 @@ MenuItemHandlerResult menuhandlerScreenSize(s32 operation, struct menuitem *item data->dropdown.value = 3; break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(options[data->dropdown.value]); + return (s32) lang_get(options[data->dropdown.value]); case MENUOP_SET: - optionsSetScreenSize(data->dropdown.value); + options_set_screen_size(data->dropdown.value); g_Vars.modifiedfiles |= MODFILE_GAME; break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = optionsGetEffectiveScreenSize(); + data->dropdown.value = options_get_effective_screen_size(); } return 0; } -MenuItemHandlerResult menuhandlerScreenRatio(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_screen_ratio(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS_223, // "Normal" @@ -256,20 +256,20 @@ MenuItemHandlerResult menuhandlerScreenRatio(s32 operation, struct menuitem *ite data->dropdown.value = 2; break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(options[data->dropdown.value]); + return (s32) lang_get(options[data->dropdown.value]); case MENUOP_SET: - optionsSetScreenRatio(data->dropdown.value); + options_set_screen_ratio(data->dropdown.value); g_Vars.modifiedfiles |= MODFILE_GAME; break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = optionsGetScreenRatio(); + data->dropdown.value = options_get_screen_ratio(); } return 0; } #if PAL -MenuItemHandlerResult menuhandlerLanguage(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_language(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { L_MPWEAPONS_262, // English @@ -284,10 +284,10 @@ MenuItemHandlerResult menuhandlerLanguage(s32 operation, struct menuitem *item, data->dropdown.value = 5; break; case MENUOP_GETOPTIONTEXT: - return (s32)langGet(labels[data->dropdown.value]); + return (s32)lang_get(labels[data->dropdown.value]); case MENUOP_SET: g_Vars.language = data->dropdown.value; - langSetEuropean(g_Vars.language); + lang_set_european(g_Vars.language); g_Vars.modifiedfiles |= MODFILE_GAME | MODFILE_BOSS; break; case MENUOP_GETSELECTEDINDEX: @@ -303,7 +303,7 @@ MenuItemHandlerResult menuhandlerLanguage(s32 operation, struct menuitem *item, } #endif -MenuItemHandlerResult menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_screen_split(s32 operation, struct menuitem *item, union handlerdata *data) { u16 options[] = { L_OPTIONS_225, // "Horizontal" @@ -315,10 +315,10 @@ MenuItemHandlerResult menuhandlerScreenSplit(s32 operation, struct menuitem *ite data->dropdown.value = 2; break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(options[data->dropdown.value]); + return (s32) lang_get(options[data->dropdown.value]); case MENUOP_SET: - if (data->dropdown.value != (u32)optionsGetScreenSplit()) { - optionsSetScreenSplit(data->dropdown.value); + if (data->dropdown.value != (u32)options_get_screen_split()) { + options_set_screen_split(data->dropdown.value); g_Vars.modifiedfiles |= MODFILE_GAME; @@ -333,14 +333,14 @@ MenuItemHandlerResult menuhandlerScreenSplit(s32 operation, struct menuitem *ite } break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = optionsGetScreenSplit(); + data->dropdown.value = options_get_screen_split(); break; } return 0; } -MenuItemHandlerResult menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_look_ahead(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -352,16 +352,16 @@ MenuItemHandlerResult menuhandlerLookAhead(s32 operation, struct menuitem *item, switch (operation) { case MENUOP_GET: - return optionsGetLookAhead(mpchrnum); + return options_get_look_ahead(mpchrnum); case MENUOP_SET: - optionsSetLookAhead(mpchrnum, data->checkbox.value); + options_set_look_ahead(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_head_roll(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -373,42 +373,42 @@ MenuItemHandlerResult menuhandlerHeadRoll(s32 operation, struct menuitem *item, switch (operation) { case MENUOP_GET: - return optionsGetHeadRoll(mpchrnum); + return options_get_head_roll(mpchrnum); case MENUOP_SET: - optionsSetHeadRoll(mpchrnum, data->checkbox.value); + options_set_head_roll(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_in_game_subtitles(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: - return optionsGetInGameSubtitles(); + return options_get_in_game_subtitles(); case MENUOP_SET: - optionsSetInGameSubtitles(data->checkbox.value); + options_set_in_game_subtitles(data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_cutscene_subtitles(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: - return optionsGetCutsceneSubtitles(); + return options_get_cutscene_subtitles(); case MENUOP_SET: - optionsSetCutsceneSubtitles(data->checkbox.value); + options_set_cutscene_subtitles(data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_alternative_title(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -426,7 +426,7 @@ MenuItemHandlerResult menuhandlerAlternativeTitle(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_hi_res(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -442,14 +442,14 @@ MenuItemHandlerResult menuhandlerHiRes(s32 operation, struct menuitem *item, uni case MENUOP_GET: return g_HiResEnabled == true; case MENUOP_SET: - playerSetHiResEnabled(data->checkbox.value ? 1 : 0); + player_set_hi_res_enabled(data->checkbox.value ? 1 : 0); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_ammo_on_screen(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -461,16 +461,16 @@ MenuItemHandlerResult menuhandlerAmmoOnScreen(s32 operation, struct menuitem *it switch (operation) { case MENUOP_GET: - return optionsGetAmmoOnScreen(mpchrnum); + return options_get_ammo_on_screen(mpchrnum); case MENUOP_SET: - optionsSetAmmoOnScreen(mpchrnum, data->checkbox.value); + options_set_ammo_on_screen(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_show_gun_function(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -482,21 +482,21 @@ MenuItemHandlerResult menuhandlerShowGunFunction(s32 operation, struct menuitem switch (operation) { case MENUOP_CHECKDISABLED: - if (optionsGetAmmoOnScreen(mpchrnum) == 0) { + if (options_get_ammo_on_screen(mpchrnum) == 0) { return true; } break; case MENUOP_GET: - return optionsGetShowGunFunction(mpchrnum); + return options_get_show_gun_function(mpchrnum); case MENUOP_SET: - optionsSetShowGunFunction(mpchrnum, data->checkbox.value); + options_set_show_gun_function(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_show_mission_time(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -508,16 +508,16 @@ MenuItemHandlerResult menuhandlerShowMissionTime(s32 operation, struct menuitem switch (operation) { case MENUOP_GET: - return optionsGetShowMissionTime(mpchrnum); + return options_get_show_mission_time(mpchrnum); case MENUOP_SET: - optionsSetShowMissionTime(mpchrnum, data->checkbox.value); + options_set_show_mission_time(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_always_show_target(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -529,21 +529,21 @@ MenuItemHandlerResult menuhandlerAlwaysShowTarget(s32 operation, struct menuitem switch (operation) { case MENUOP_CHECKDISABLED: - if (optionsGetSightOnScreen(mpchrnum) == 0) { + if (options_get_sight_on_screen(mpchrnum) == 0) { return true; } break; case MENUOP_GET: - return optionsGetAlwaysShowTarget(mpchrnum); + return options_get_always_show_target(mpchrnum); case MENUOP_SET: - optionsSetAlwaysShowTarget(mpchrnum, data->checkbox.value); + options_set_always_show_target(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_show_zoom_range(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -555,21 +555,21 @@ MenuItemHandlerResult menuhandlerShowZoomRange(s32 operation, struct menuitem *i switch (operation) { case MENUOP_CHECKDISABLED: - if (optionsGetSightOnScreen(mpchrnum) == 0) { + if (options_get_sight_on_screen(mpchrnum) == 0) { return true; } break; case MENUOP_GET: - return optionsGetShowZoomRange(mpchrnum); + return options_get_show_zoom_range(mpchrnum); case MENUOP_SET: - optionsSetShowZoomRange(mpchrnum, data->checkbox.value); + options_set_show_zoom_range(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_paintball(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -581,16 +581,16 @@ MenuItemHandlerResult menuhandlerPaintball(s32 operation, struct menuitem *item, switch (operation) { case MENUOP_GET: - return optionsGetPaintball(mpchrnum); + return options_get_paintball(mpchrnum); case MENUOP_SET: - optionsSetPaintball(mpchrnum, data->checkbox.value); + options_set_paintball(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_sight_on_screen(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -602,16 +602,16 @@ MenuItemHandlerResult menuhandlerSightOnScreen(s32 operation, struct menuitem *i switch (operation) { case MENUOP_GET: - return optionsGetSightOnScreen(mpchrnum); + return options_get_sight_on_screen(mpchrnum); case MENUOP_SET: - optionsSetSightOnScreen(mpchrnum, data->checkbox.value); + options_set_sight_on_screen(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_auto_aim(s32 operation, struct menuitem *item, union handlerdata *data) { u32 mpchrnum; @@ -623,44 +623,44 @@ MenuItemHandlerResult menuhandlerAutoAim(s32 operation, struct menuitem *item, u switch (operation) { case MENUOP_GET: - return optionsGetAutoAim(mpchrnum); + return options_get_auto_aim(mpchrnum); case MENUOP_SET: - optionsSetAutoAim(mpchrnum, data->checkbox.value); + options_set_auto_aim(mpchrnum, data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_music_volume(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: - data->slider.value = optionsGetMusicVolume(); + data->slider.value = options_get_music_volume(); break; case MENUOP_SET: - optionsSetMusicVolume(data->slider.value); + options_set_music_volume(data->slider.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuItemHandlerResult menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_sfx_volume(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: data->slider.value = VOLUME(g_SfxVolume); break; case MENUOP_SET: - sndSetSfxVolume(data->slider.value); + snd_set_sfx_volume(data->slider.value); g_Vars.modifiedfiles |= MODFILE_GAME; } return 0; } -MenuDialogHandlerResult menudialogBriefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_briefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog @@ -668,7 +668,7 @@ MenuDialogHandlerResult menudialogBriefing(s32 operation, struct menudialogdef * struct menuinputs *inputs = data->dialog2.inputs; if (inputs->start) { - menuhandlerAcceptMission(MENUOP_SET, NULL, data); + menuhandler_accept_mission(MENUOP_SET, NULL, data); } inputs->start = false; @@ -694,21 +694,21 @@ struct menudialogdef g_PreAndPostMissionBriefingMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_247, // "Briefing" g_PreAndPostMissionBriefingMenuItems, - menudialogBriefing, + menudialog_briefing, MENUDIALOGFLAG_DISABLEITEMSCROLL, NULL, }; -MenuItemHandlerResult menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_accept_mission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuStop(); + menu_stop(); if (g_Vars.stagenum == g_MissionConfig.stagenum) { g_Vars.restartlevel = true; } - titleSetNextStage(g_MissionConfig.stagenum); + title_set_next_stage(g_MissionConfig.stagenum); if (g_MissionConfig.iscoop) { if (g_Vars.numaibuddies == 0) { @@ -716,13 +716,13 @@ MenuItemHandlerResult menuhandlerAcceptMission(s32 operation, struct menuitem *i g_Vars.bondplayernum = 0; g_Vars.coopplayernum = 1; g_Vars.antiplayernum = -1; - setNumPlayers(2); + set_num_players(2); } else { // Coop with AI buddies g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - setNumPlayers(1); + set_num_players(1); } } else if (g_MissionConfig.isanti) { if (g_Vars.pendingantiplayernum == 1) { @@ -734,36 +734,36 @@ MenuItemHandlerResult menuhandlerAcceptMission(s32 operation, struct menuitem *i } g_Vars.coopplayernum = -1; - setNumPlayers(2); + set_num_players(2); } else { // Solo g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - setNumPlayers(1); + set_num_players(1); } - lvSetDifficulty(g_MissionConfig.difficulty); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(g_MissionConfig.stagenum); + lv_set_difficulty(g_MissionConfig.difficulty); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(g_MissionConfig.stagenum); #if VERSION >= VERSION_NTSC_1_0 - viBlack(true); + vi_black(true); #endif } return 0; } -char *soloMenuTitleStageOverview(struct menudialogdef *dialogdef) +char *solo_menu_title_stage_overview(struct menudialogdef *dialogdef) { if (dialogdef != g_Menus[g_MpPlayerNum].curdialog->definition) { - return langGet(L_OPTIONS_273); // "Overview" + return lang_get(L_OPTIONS_273); // "Overview" } sprintf(g_StringPointer, "%s: %s\n", - langGet(g_SoloStages[g_MissionConfig.stageindex].name3), - langGet(L_OPTIONS_273)); + lang_get(g_SoloStages[g_MissionConfig.stageindex].name3), + lang_get(L_OPTIONS_273)); return g_StringPointer; } @@ -774,12 +774,12 @@ MenuDialogHandlerResult menudialog00103608(s32 operation, struct menudialogdef * case MENUOP_OPEN: g_Menus[g_MpPlayerNum].menumodel.curparams = 0; - setupLoadBriefing(g_MissionConfig.stagenum, + setup_load_briefing(g_MissionConfig.stagenum, g_Menus[g_MpPlayerNum].menumodel.allocstart, g_Menus[g_MpPlayerNum].menumodel.alloclen, &g_Briefing); break; case MENUOP_CLOSE: - langClearBank(g_Briefing.langbank); + lang_clear_bank(g_Briefing.langbank); break; } @@ -801,7 +801,7 @@ struct menuitem g_AcceptMissionMenuItems[] = { 0, L_OPTIONS_274, // "Accept" 0, - menuhandlerAcceptMission, + menuhandler_accept_mission, }, { MENUITEMTYPE_SELECTABLE, @@ -816,7 +816,7 @@ struct menuitem g_AcceptMissionMenuItems[] = { struct menudialogdef g_AcceptMissionMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&soloMenuTitleStageOverview, + (uintptr_t)&solo_menu_title_stage_overview, g_AcceptMissionMenuItems, menudialog00103608, MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLEITEMSCROLL, @@ -829,10 +829,10 @@ f32 func0f1036ac(u8 value, s32 prop) return value / 255.0f; } - return mpHandicapToDamageScale(value); + return mp_handicap_to_damage_scale(value); } -MenuItemHandlerResult menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_pd_mode_setting(s32 operation, struct menuitem *item, union handlerdata *data) { u8 *property; f32 fvalue; @@ -864,7 +864,7 @@ MenuItemHandlerResult menuhandlerPdModeSetting(s32 operation, struct menuitem *i return 0; } -MenuItemHandlerResult menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_accept_pd_mode_settings(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.pdmode = true; @@ -872,10 +872,10 @@ MenuItemHandlerResult menuhandlerAcceptPdModeSettings(s32 operation, struct menu g_MissionConfig.pdmodedamagef = func0f1036ac(g_MissionConfig.pdmodedamage, PDMODEPROP_DAMAGE); g_MissionConfig.pdmodeaccuracyf = func0f1036ac(g_MissionConfig.pdmodeaccuracy, PDMODEPROP_ACCURACY); g_MissionConfig.difficulty = DIFF_PA; - lvSetDifficulty(g_MissionConfig.difficulty); - menuPopDialog(); - menuPopDialog(); - menuPushDialog(&g_AcceptMissionMenuDialog); + lv_set_difficulty(g_MissionConfig.difficulty); + menu_pop_dialog(); + menu_pop_dialog(); + menu_push_dialog(&g_AcceptMissionMenuDialog); } return 0; @@ -896,7 +896,7 @@ struct menuitem g_PdModeSettingsMenuItems[] = { MENUITEMFLAG_SLIDER_ALTSIZE, L_MPWEAPONS_224, // "Enemy Health:" 0x000000ff, - menuhandlerPdModeSetting, + menuhandler_pd_mode_setting, }, { MENUITEMTYPE_SLIDER, @@ -904,7 +904,7 @@ struct menuitem g_PdModeSettingsMenuItems[] = { MENUITEMFLAG_SLIDER_ALTSIZE, L_MPWEAPONS_225, // "Enemy Damage:" 0x000000ff, - menuhandlerPdModeSetting, + menuhandler_pd_mode_setting, }, { MENUITEMTYPE_SLIDER, @@ -912,7 +912,7 @@ struct menuitem g_PdModeSettingsMenuItems[] = { MENUITEMFLAG_SLIDER_ALTSIZE, L_MPWEAPONS_226, // "Enemy Accuracy:" 0x000000ff, - menuhandlerPdModeSetting, + menuhandler_pd_mode_setting, }, { MENUITEMTYPE_SEPARATOR, @@ -928,7 +928,7 @@ struct menuitem g_PdModeSettingsMenuItems[] = { 0, L_MPWEAPONS_227, // "OK" 0, - menuhandlerAcceptPdModeSettings, + menuhandler_accept_pd_mode_settings, }, { MENUITEMTYPE_SELECTABLE, @@ -956,7 +956,7 @@ struct menudialogdef g_PdModeSettingsMenuDialog = { * * This function does not test for PD mode being unlocked. */ -bool isStageDifficultyUnlocked(s32 stageindex, s32 difficulty) +bool is_stage_difficulty_unlocked(s32 stageindex, s32 difficulty) { s32 s; s32 d; @@ -1097,12 +1097,12 @@ bool isStageDifficultyUnlocked(s32 stageindex, s32 difficulty) return false; } -MenuItemHandlerResult menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_solo_difficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKPREFOCUSED: #if VERSION >= VERSION_NTSC_1_0 - if (isStageDifficultyUnlocked(g_MissionConfig.stageindex, item->param)) { + if (is_stage_difficulty_unlocked(g_MissionConfig.stageindex, item->param)) { if (item->param3 == 0) { return true; } @@ -1122,12 +1122,12 @@ MenuItemHandlerResult menuhandlerSoloDifficulty(s32 operation, struct menuitem * case MENUOP_SET: g_MissionConfig.pdmode = false; g_MissionConfig.difficulty = item->param; - lvSetDifficulty(g_MissionConfig.difficulty); - menuPopDialog(); - menuPushDialog(&g_AcceptMissionMenuDialog); + lv_set_difficulty(g_MissionConfig.difficulty); + menu_pop_dialog(); + menu_push_dialog(&g_AcceptMissionMenuDialog); break; case MENUOP_CHECKDISABLED: - if (!isStageDifficultyUnlocked(g_MissionConfig.stageindex, item->param)) { + if (!is_stage_difficulty_unlocked(g_MissionConfig.stageindex, item->param)) { return true; } } @@ -1135,11 +1135,11 @@ MenuItemHandlerResult menuhandlerSoloDifficulty(s32 operation, struct menuitem * return 0; } -MenuItemHandlerResult menuhandlerPdMode(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_pd_mode(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: - menuPushDialog(&g_PdModeSettingsMenuDialog); + menu_push_dialog(&g_PdModeSettingsMenuDialog); break; case MENUOP_CHECKHIDDEN: if (g_GameFile.besttimes[SOLOSTAGEINDEX_SKEDARRUINS][DIFF_PA] == 0) { @@ -1150,7 +1150,7 @@ MenuItemHandlerResult menuhandlerPdMode(s32 operation, struct menuitem *item, un return 0; } -char *soloMenuTextBestTime(struct menuitem *item) +char *solo_menu_text_best_time(struct menuitem *item) { u16 time = g_GameFile.besttimes[g_MissionConfig.stageindex][item->param]; s32 hours = time / 3600; @@ -1188,24 +1188,24 @@ struct menuitem g_SoloMissionDifficultyMenuItems[] = { 0, 0, L_OPTIONS_251, // "Agent" - (uintptr_t)&soloMenuTextBestTime, - menuhandlerSoloDifficulty, + (uintptr_t)&solo_menu_text_best_time, + menuhandler_solo_difficulty, }, { MENUITEMTYPE_SELECTABLE, 1, 0, L_OPTIONS_252, // "Special Agent" - (uintptr_t)&soloMenuTextBestTime, - menuhandlerSoloDifficulty, + (uintptr_t)&solo_menu_text_best_time, + menuhandler_solo_difficulty, }, { MENUITEMTYPE_SELECTABLE, 2, 0, L_OPTIONS_253, // "Perfect Agent" - (uintptr_t)&soloMenuTextBestTime, - menuhandlerSoloDifficulty, + (uintptr_t)&solo_menu_text_best_time, + menuhandler_solo_difficulty, }, { MENUITEMTYPE_SELECTABLE, @@ -1213,7 +1213,7 @@ struct menuitem g_SoloMissionDifficultyMenuItems[] = { 0, L_MPWEAPONS_221, // "Perfect Dark" 0, - menuhandlerPdMode, + menuhandler_pd_mode, }, { MENUITEMTYPE_SEPARATOR, @@ -1243,11 +1243,11 @@ struct menudialogdef g_SoloMissionDifficultyMenuDialog = { NULL, }; -MenuItemHandlerResult menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_buddy_options_continue(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - menuPushDialog(&g_AcceptMissionMenuDialog); + menu_pop_dialog(); + menu_push_dialog(&g_AcceptMissionMenuDialog); } if (operation == MENUOP_CHECKPREFOCUSED) { @@ -1258,7 +1258,7 @@ MenuItemHandlerResult menuhandlerBuddyOptionsContinue(s32 operation, struct menu } #if VERSION >= VERSION_NTSC_1_0 -s32 getMaxAiBuddies(void) +s32 get_max_ai_buddies(void) { u32 stack; s32 extra = 0; @@ -1283,7 +1283,7 @@ s32 getMaxAiBuddies(void) #if VERSION == VERSION_PAL_BETA #ifdef DEBUG - if (debugIsAllBuddiesEnabled()) { + if (debug_is_all_buddies_enabled()) { max = 4; } #endif @@ -1293,11 +1293,11 @@ s32 getMaxAiBuddies(void) } #endif -MenuDialogHandlerResult menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_coop_anti_options(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { #if VERSION >= VERSION_NTSC_1_0 if (operation == MENUOP_OPEN) { - s32 max = getMaxAiBuddies(); + s32 max = get_max_ai_buddies(); if (g_Vars.numaibuddies > max) { g_Vars.numaibuddies = max; @@ -1310,7 +1310,7 @@ MenuDialogHandlerResult menudialogCoopAntiOptions(s32 operation, struct menudial struct menuinputs *inputs = data->dialog2.inputs; if (inputs->start) { - menuhandlerBuddyOptionsContinue(MENUOP_SET, NULL, NULL); + menuhandler_buddy_options_continue(MENUOP_SET, NULL, NULL); } inputs->start = false; @@ -1320,7 +1320,7 @@ MenuDialogHandlerResult menudialogCoopAntiOptions(s32 operation, struct menudial return 0; } -MenuItemHandlerResult menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_coop_radar(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1333,7 +1333,7 @@ MenuItemHandlerResult menuhandlerCoopRadar(s32 operation, struct menuitem *item, return 0; } -MenuItemHandlerResult menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_coop_friendly_fire(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1346,7 +1346,7 @@ MenuItemHandlerResult menuhandlerCoopFriendlyFire(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_coop_buddy(s32 operation, struct menuitem *item, union handlerdata *data) { const u16 labels[] = { L_OPTIONS_261, // "Human" @@ -1360,10 +1360,10 @@ MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, case MENUOP_GETOPTIONCOUNT: #if VERSION >= VERSION_NTSC_1_0 { - s32 maxaibuddies = getMaxAiBuddies(); + s32 maxaibuddies = get_max_ai_buddies(); s32 human = 0; - if (joyGetConnectedControllers() & 2) { + if (joy_get_connected_controllers() & 2) { human = 1; } @@ -1376,7 +1376,7 @@ MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, s32 maxbuddies = 1 - g_MissionConfig.difficulty; s32 human = 0; - if (joyGetConnectedControllers() & 2) { + if (joy_get_connected_controllers() & 2) { human = 1; } @@ -1397,7 +1397,7 @@ MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, } #ifdef DEBUG - if (debugIsAllBuddiesEnabled()) { + if (debug_is_all_buddies_enabled()) { maxbuddies = 4; } #endif @@ -1410,17 +1410,17 @@ MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, { s32 extra = 1; - if (joyGetConnectedControllers() & 2) { + if (joy_get_connected_controllers() & 2) { extra = 0; } - return (s32)langGet(labels[data->dropdown.value + extra]); + return (s32)lang_get(labels[data->dropdown.value + extra]); } case MENUOP_SET: { s32 extra = 1; - if (joyGetConnectedControllers() & 2) { + if (joy_get_connected_controllers() & 2) { extra = 0; } @@ -1432,7 +1432,7 @@ MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, { s32 extra = 1; - if (joyGetConnectedControllers() & 2) { + if (joy_get_connected_controllers() & 2) { extra = 0; } @@ -1455,7 +1455,7 @@ struct menuitem g_CoopOptionsMenuItems[] = { 0, L_OPTIONS_256, // "Radar On" 0, - menuhandlerCoopRadar, + menuhandler_coop_radar, }, { MENUITEMTYPE_CHECKBOX, @@ -1463,7 +1463,7 @@ struct menuitem g_CoopOptionsMenuItems[] = { 0, L_OPTIONS_257, // "Friendly Fire" 0, - menuhandlerCoopFriendlyFire, + menuhandler_coop_friendly_fire, }, { MENUITEMTYPE_DROPDOWN, @@ -1471,7 +1471,7 @@ struct menuitem g_CoopOptionsMenuItems[] = { 0, L_OPTIONS_258, // "Perfect Buddy" 0, - menuhandlerCoopBuddy, + menuhandler_coop_buddy, }, { MENUITEMTYPE_SEPARATOR, @@ -1487,7 +1487,7 @@ struct menuitem g_CoopOptionsMenuItems[] = { 0, L_OPTIONS_259, // "Continue" 0, - menuhandlerBuddyOptionsContinue, + menuhandler_buddy_options_continue, }, { MENUITEMTYPE_SELECTABLE, @@ -1504,12 +1504,12 @@ struct menudialogdef g_CoopOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_255, // "Co-Operative Options" g_CoopOptionsMenuItems, - menudialogCoopAntiOptions, + menudialog_coop_anti_options, MENUDIALOGFLAG_STARTSELECTS, NULL, }; -MenuItemHandlerResult menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_anti_radar(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -1522,7 +1522,7 @@ MenuItemHandlerResult menuhandlerAntiRadar(s32 operation, struct menuitem *item, return 0; } -MenuItemHandlerResult menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_anti_player(s32 operation, struct menuitem *item, union handlerdata *data) { const u16 labels[] = {L_OPTIONS_271, L_OPTIONS_272}; @@ -1531,7 +1531,7 @@ MenuItemHandlerResult menuhandlerAntiPlayer(s32 operation, struct menuitem *item data->dropdown.value = 2; break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(labels[data->dropdown.value]); + return (s32) lang_get(labels[data->dropdown.value]); case MENUOP_SET: g_Vars.pendingantiplayernum = data->dropdown.value; g_Vars.modifiedfiles |= MODFILE_GAME; @@ -1551,7 +1551,7 @@ struct menuitem g_AntiOptionsMenuItems[] = { 0, L_OPTIONS_267, // "Radar On" 0, - menuhandlerAntiRadar, + menuhandler_anti_radar, }, { MENUITEMTYPE_DROPDOWN, @@ -1559,7 +1559,7 @@ struct menuitem g_AntiOptionsMenuItems[] = { 0, L_OPTIONS_268, // "Counter-Operative" 0, - menuhandlerAntiPlayer, + menuhandler_anti_player, }, { MENUITEMTYPE_SEPARATOR, @@ -1575,7 +1575,7 @@ struct menuitem g_AntiOptionsMenuItems[] = { 0, L_OPTIONS_269, // "Continue" 0, - menuhandlerBuddyOptionsContinue, + menuhandler_buddy_options_continue, }, { MENUITEMTYPE_SELECTABLE, @@ -1592,23 +1592,23 @@ struct menudialogdef g_AntiOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_266, // "Counter-Operative Options" g_AntiOptionsMenuItems, - menudialogCoopAntiOptions, + menudialog_coop_anti_options, MENUDIALOGFLAG_STARTSELECTS, NULL, }; -MenuItemHandlerResult menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_coop_difficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: g_MissionConfig.pdmode = false; g_MissionConfig.difficulty = item->param; - lvSetDifficulty(g_MissionConfig.difficulty); - menuPopDialog(); - menuPushDialog(&g_CoopOptionsMenuDialog); + lv_set_difficulty(g_MissionConfig.difficulty); + menu_pop_dialog(); + menu_push_dialog(&g_CoopOptionsMenuDialog); break; case MENUOP_CHECKDISABLED: - if (!isStageDifficultyUnlocked(g_MissionConfig.stageindex, item->param)) { + if (!is_stage_difficulty_unlocked(g_MissionConfig.stageindex, item->param)) { return true; } } @@ -1623,7 +1623,7 @@ struct menuitem g_CoopMissionDifficultyMenuItems[] = { 0, L_OPTIONS_251, // "Agent" 0, - menuhandlerCoopDifficulty, + menuhandler_coop_difficulty, }, { MENUITEMTYPE_SELECTABLE, @@ -1631,7 +1631,7 @@ struct menuitem g_CoopMissionDifficultyMenuItems[] = { 0, L_OPTIONS_252, // "Special Agent" 0, - menuhandlerCoopDifficulty, + menuhandler_coop_difficulty, }, { MENUITEMTYPE_SELECTABLE, @@ -1639,7 +1639,7 @@ struct menuitem g_CoopMissionDifficultyMenuItems[] = { 0, L_OPTIONS_253, // "Perfect Agent" 0, - menuhandlerCoopDifficulty, + menuhandler_coop_difficulty, }, { MENUITEMTYPE_SEPARATOR, @@ -1669,15 +1669,15 @@ struct menudialogdef g_CoopMissionDifficultyMenuDialog = { NULL, }; -MenuItemHandlerResult menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_anti_difficulty(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: g_MissionConfig.pdmode = false; g_MissionConfig.difficulty = item->param; - lvSetDifficulty(g_MissionConfig.difficulty); - menuPopDialog(); - menuPushDialog(&g_AntiOptionsMenuDialog); + lv_set_difficulty(g_MissionConfig.difficulty); + menu_pop_dialog(); + menu_push_dialog(&g_AntiOptionsMenuDialog); } return 0; @@ -1690,7 +1690,7 @@ struct menuitem g_AntiMissionDifficultyMenuItems[] = { 0, L_OPTIONS_251, // "Agent" 0, - menuhandlerAntiDifficulty, + menuhandler_anti_difficulty, }, { MENUITEMTYPE_SELECTABLE, @@ -1698,7 +1698,7 @@ struct menuitem g_AntiMissionDifficultyMenuItems[] = { 0, L_OPTIONS_252, // "Special Agent" 0, - menuhandlerAntiDifficulty, + menuhandler_anti_difficulty, }, { MENUITEMTYPE_SELECTABLE, @@ -1706,7 +1706,7 @@ struct menuitem g_AntiMissionDifficultyMenuItems[] = { 0, L_OPTIONS_253, // "Perfect Agent" 0, - menuhandlerAntiDifficulty, + menuhandler_anti_difficulty, }, { MENUITEMTYPE_SEPARATOR, @@ -1761,7 +1761,7 @@ struct solostage g_SoloStages[NUM_SOLOSTAGES] = { { STAGE_DUEL, 0x1c, L_OPTIONS_171, L_OPTIONS_003, L_OPTIONS_171 }, }; -s32 getNumUnlockedSpecialStages(void) +s32 get_num_unlocked_special_stages(void) { s32 count = 0; s32 offsetforduel = 1; @@ -1777,7 +1777,7 @@ s32 getNumUnlockedSpecialStages(void) offsetforduel = 0; } else { for (i = 0; i < (VERSION >= VERSION_NTSC_1_0 ? 32 : 33); i++) { - if (ciGetFiringRangeScore(i) <= 0) { + if (ci_get_firing_range_score(i) <= 0) { offsetforduel = 0; } } @@ -1804,7 +1804,7 @@ s32 func0f104720(s32 value) return 20; } -MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mission_list(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[] = { { 0, L_OPTIONS_123 }, // "Mission 1" @@ -1866,26 +1866,26 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite } } - data->list.value += getNumUnlockedSpecialStages(); + data->list.value += get_num_unlocked_special_stages(); break; case MENUOP_GETOPTIONTEXT: if (data->list.unk04u32 == 0) { - menuhandlerMissionList(MENUOP_GETOPTIONCOUNT, item, &sp18c); - data->list.unk04u32 = sp18c.list.value - getNumUnlockedSpecialStages(); + menuhandler_mission_list(MENUOP_GETOPTIONCOUNT, item, &sp18c); + data->list.unk04u32 = sp18c.list.value - get_num_unlocked_special_stages(); } if (data->list.value < data->list.unk04u32) { // Regular stage such as "dataDyne Central - Defection" // Return the name before the dash, such as "dataDyne Central" - return (s32) langGet(g_SoloStages[data->list.value].name1); + return (s32) lang_get(g_SoloStages[data->list.value].name1); } // Special stages have no dash and suffix, so just return the name - return (s32) langGet(g_SoloStages[func0f104720(data->list.value - data->list.unk04u32)].name1); + return (s32) lang_get(g_SoloStages[func0f104720(data->list.value - data->list.unk04u32)].name1); case MENUOP_SET: sp188 = data->list.value; - menuhandlerMissionList(MENUOP_GETOPTIONCOUNT, item, &sp178); - sp178.list.value -= getNumUnlockedSpecialStages(); + menuhandler_mission_list(MENUOP_GETOPTIONCOUNT, item, &sp178); + sp178.list.value -= get_num_unlocked_special_stages(); if (data->list.value >= sp178.list.value) { sp188 = func0f104720(data->list.value - sp178.list.value); @@ -1897,11 +1897,11 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite g_MissionConfig.stageindex = sp188; if (g_MissionConfig.iscoop) { - menuPushDialog(&g_CoopMissionDifficultyMenuDialog); + menu_push_dialog(&g_CoopMissionDifficultyMenuDialog); } else if (g_MissionConfig.isanti) { - menuPushDialog(&g_AntiMissionDifficultyMenuDialog); + menu_push_dialog(&g_AntiMissionDifficultyMenuDialog); } else { - menuPushDialog(&g_SoloMissionDifficultyMenuDialog); + menu_push_dialog(&g_SoloMissionDifficultyMenuDialog); } break; @@ -1912,11 +1912,11 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite if (data->list.unk04 == 0 && !g_MissionConfig.iscoop && !g_MissionConfig.isanti) { data->list.value = g_GameFile.autostageindex; - menuhandlerMissionList(MENUOP_GETOPTIONCOUNT, item, &sp168); - sp168.list.value -= getNumUnlockedSpecialStages(); + menuhandler_mission_list(MENUOP_GETOPTIONCOUNT, item, &sp168); + sp168.list.value -= get_num_unlocked_special_stages(); if (data->list.value >= sp168.list.value) { - sp164 = getNumUnlockedSpecialStages(); + sp164 = get_num_unlocked_special_stages(); data->list.value = sp168.list.value - 1; @@ -1929,8 +1929,8 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite } break; case MENUOP_GETOPTGROUPCOUNT: - menuhandlerMissionList(MENUOP_GETOPTIONCOUNT, item, &sp150); - sp150.list.value -= getNumUnlockedSpecialStages(); + menuhandler_mission_list(MENUOP_GETOPTIONCOUNT, item, &sp150); + sp150.list.value -= get_num_unlocked_special_stages(); data->list.unk0c = 0; @@ -1944,13 +1944,13 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite break; case MENUOP_GETOPTGROUPTEXT: if (data->list.unk0c == data->list.value) { - return (s32) langGet(groups[9].name); // "Special Assignments" + return (s32) lang_get(groups[9].name); // "Special Assignments" } - return (s32) langGet(groups[data->list.value].name); + return (s32) lang_get(groups[data->list.value].name); case MENUOP_GETGROUPSTARTINDEX: if (data->list.unk0c == data->list.value) { - menuhandlerMissionList(MENUOP_GETOPTIONCOUNT, item, &sp13c); - data->list.groupstartindex = sp13c.list.value - getNumUnlockedSpecialStages(); + menuhandler_mission_list(MENUOP_GETOPTIONCOUNT, item, &sp13c); + data->list.groupstartindex = sp13c.list.value - get_num_unlocked_special_stages(); } else { data->list.groupstartindex = groups[data->list.value].offset; } @@ -1962,8 +1962,8 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite stageindex = data->type19.unk04u32; if (data->type19.unk0c == 0) { - menuhandlerMissionList(MENUOP_GETOPTIONCOUNT, item, &spdc); - data->type19.unk0c = spdc.list.value - getNumUnlockedSpecialStages(); + menuhandler_mission_list(MENUOP_GETOPTIONCOUNT, item, &spdc); + data->type19.unk0c = spdc.list.value - get_num_unlocked_special_stages(); } if (data->type19.unk04u32 >= data->type19.unk0c) { @@ -1978,13 +1978,13 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite gDPSetTextureConvert(gdl++, G_TC_FILT); #if VERSION >= VERSION_NTSC_1_0 - texSelect(&gdl, g_TexGeneralConfigs + 13 + stageindex, 2, 0, 2, true, NULL); + tex_select(&gdl, g_TexGeneralConfigs + 13 + stageindex, 2, 0, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_CUSTOM_00, G_CC_CUSTOM_00); gDPSetTextureFilter(gdl++, G_TF_POINT); gDPSetEnvColorViaWord(gdl++, 0xffffff00 | ((renderdata->colour & 0xff) * 255 / 256)); #else - texSelect(&gdl, g_TexGeneralConfigs + 13 + stageindex, 1, 0, 2, true, NULL); + tex_select(&gdl, g_TexGeneralConfigs + 13 + stageindex, 1, 0, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -1998,7 +1998,7 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite if (g_MissionConfig.isanti) { // No stars } else if (g_MissionConfig.iscoop) { - texSelect(&gdl, &g_TexGeneralConfigs[36], 2, 0, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[36], 2, 0, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -2030,7 +2030,7 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite G_TX_RENDERTILE, 0x0010, 0x01c0, 1024 / g_ScaleX, -1024); } } else { - texSelect(&gdl, &g_TexGeneralConfigs[34], 2, 0, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[34], 2, 0, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -2076,17 +2076,17 @@ MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *ite gdl = text0f153628(gdl); // Draw first part of name - strcpy(text, langGet(g_SoloStages[stageindex].name1)); + strcpy(text, lang_get(g_SoloStages[stageindex].name1)); strcat(text, "\n"); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, - renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, + renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); // Draw last part of name - strcpy(text, langGet(g_SoloStages[stageindex].name2)); + strcpy(text, lang_get(g_SoloStages[stageindex].name2)); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, - renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, + renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); @@ -2106,7 +2106,7 @@ MenuDialogHandlerResult menudialog0010559c(s32 operation, struct menudialogdef * break; case MENUOP_CLOSE: if ((g_Vars.modifiedfiles & MODFILE_GAME) && g_Vars.coopplayernum < 0 && g_Vars.antiplayernum < 0) { - if (filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_001, 0) == 0) { + if (filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_001, 0) == 0) { data->dialog1.preventclose = true; } @@ -2114,7 +2114,7 @@ MenuDialogHandlerResult menudialog0010559c(s32 operation, struct menudialogdef * } if (g_Vars.modifiedfiles & MODFILE_BOSS) { - bossfileSave(); + bossfile_save(); g_Vars.modifiedfiles &= ~MODFILE_BOSS; } break; @@ -2192,7 +2192,7 @@ char *func0f1056a0(struct menuitem *item) return (char *)menuhandler001024fc(MENUOP_GETOPTIONTEXT, item, &data); } -MenuItemHandlerResult menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_lang_filter(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -2205,13 +2205,13 @@ MenuItemHandlerResult menuhandlerLangFilter(s32 operation, struct menuitem *item return 0; } -MenuItemHandlerResult menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_control_style(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (PLAYERCOUNT() >= 2) { - menuPushDialog(&g_2PMissionControlStyleMenuDialog); + menu_push_dialog(&g_2PMissionControlStyleMenuDialog); } else { - menuPushDialog(&g_SoloMissionControlStyleMenuDialog); + menu_push_dialog(&g_SoloMissionControlStyleMenuDialog); } } @@ -2221,13 +2221,13 @@ MenuItemHandlerResult menuhandlerControlStyle(s32 operation, struct menuitem *it MenuItemHandlerResult menuhandler001057ec(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_002, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_002, 0); } return 0; } -MenuItemHandlerResult menuhandlerChangeAgent(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_change_agent(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(NULL, -7); @@ -2373,7 +2373,7 @@ struct menuitem g_AudioOptionsMenuItems[] = { #else 0x7fff, #endif - menuhandlerSfxVolume, + menuhandler_sfx_volume, }, { MENUITEMTYPE_SLIDER, @@ -2385,7 +2385,7 @@ struct menuitem g_AudioOptionsMenuItems[] = { #else 0x7fff, #endif - menuhandlerMusicVolume, + menuhandler_music_volume, }, { MENUITEMTYPE_DROPDOWN, @@ -2393,7 +2393,7 @@ struct menuitem g_AudioOptionsMenuItems[] = { 0, L_OPTIONS_230, // "Sound Mode" 0, - menuhandlerSoundMode, + menuhandler_sound_mode, }, #if VERSION != VERSION_JPN_FINAL { @@ -2402,7 +2402,7 @@ struct menuitem g_AudioOptionsMenuItems[] = { 0, L_MPWEAPONS_218, // "Language Filter" 0, - menuhandlerLangFilter, + menuhandler_lang_filter, }, #endif { @@ -2444,7 +2444,7 @@ struct menuitem g_2PMissionAudioOptionsVMenuItems[] = { #else 0x7fff, #endif - menuhandlerSfxVolume, + menuhandler_sfx_volume, }, { MENUITEMTYPE_SLIDER, @@ -2456,7 +2456,7 @@ struct menuitem g_2PMissionAudioOptionsVMenuItems[] = { #else 0x7fff, #endif - menuhandlerMusicVolume, + menuhandler_music_volume, }, { MENUITEMTYPE_DROPDOWN, @@ -2464,7 +2464,7 @@ struct menuitem g_2PMissionAudioOptionsVMenuItems[] = { 0, L_MPWEAPONS_153, // "Mode" 0, - menuhandlerSoundMode, + menuhandler_sound_mode, }, #if VERSION != VERSION_JPN_FINAL { @@ -2473,7 +2473,7 @@ struct menuitem g_2PMissionAudioOptionsVMenuItems[] = { 0, L_MPWEAPONS_218, // "Language Filter" 0, - menuhandlerLangFilter, + menuhandler_lang_filter, }, #endif { @@ -2511,7 +2511,7 @@ struct menuitem g_VideoOptionsMenuItems[] = { 0, L_OPTIONS_215, // "Screen Size" 0, - menuhandlerScreenSize, + menuhandler_screen_size, }, { MENUITEMTYPE_DROPDOWN, @@ -2519,7 +2519,7 @@ struct menuitem g_VideoOptionsMenuItems[] = { 0, L_OPTIONS_216, // "Ratio" 0, - menuhandlerScreenRatio, + menuhandler_screen_ratio, }, { MENUITEMTYPE_CHECKBOX, @@ -2527,7 +2527,7 @@ struct menuitem g_VideoOptionsMenuItems[] = { 0, L_OPTIONS_217, // "Hi-Res" 0, - menuhandlerHiRes, + menuhandler_hi_res, }, #if PAL { @@ -2536,7 +2536,7 @@ struct menuitem g_VideoOptionsMenuItems[] = { 0, L_MPWEAPONS_269, // "" 0, - menuhandlerLanguage, + menuhandler_language, }, #endif { @@ -2545,7 +2545,7 @@ struct menuitem g_VideoOptionsMenuItems[] = { 0, L_OPTIONS_218, // "2-Player Screen Split" 0, - menuhandlerScreenSplit, + menuhandler_screen_split, }, { MENUITEMTYPE_CHECKBOX, @@ -2553,7 +2553,7 @@ struct menuitem g_VideoOptionsMenuItems[] = { 0, L_MPWEAPONS_170, // "Alternative Title Screen" 0, - menuhandlerAlternativeTitle, + menuhandler_alternative_title, }, { MENUITEMTYPE_SEPARATOR, @@ -2581,7 +2581,7 @@ struct menuitem g_2PMissionVideoOptionsMenuItems[] = { 0, L_OPTIONS_216, // "Ratio" 0, - menuhandlerScreenRatio, + menuhandler_screen_ratio, }, { MENUITEMTYPE_CHECKBOX, @@ -2589,7 +2589,7 @@ struct menuitem g_2PMissionVideoOptionsMenuItems[] = { 0, L_OPTIONS_217, // "Hi-Res" 0, - menuhandlerHiRes, + menuhandler_hi_res, }, #if PAL { @@ -2598,7 +2598,7 @@ struct menuitem g_2PMissionVideoOptionsMenuItems[] = { 0, L_MPWEAPONS_269, // "" 0, - menuhandlerLanguage, + menuhandler_language, }, #endif { @@ -2607,7 +2607,7 @@ struct menuitem g_2PMissionVideoOptionsMenuItems[] = { 0, L_MPWEAPONS_154, // "Split" 0, - menuhandlerScreenSplit, + menuhandler_screen_split, }, { MENUITEMTYPE_SEPARATOR, @@ -2653,7 +2653,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_OPTIONS_205, // "Sight on Screen" 0x00000004, - menuhandlerSightOnScreen, + menuhandler_sight_on_screen, }, { MENUITEMTYPE_CHECKBOX, @@ -2661,7 +2661,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_OPTIONS_206, // "Always Show Target" 0x00000004, - menuhandlerAlwaysShowTarget, + menuhandler_always_show_target, }, { MENUITEMTYPE_CHECKBOX, @@ -2669,7 +2669,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_OPTIONS_207, // "Show Zoom Range" 0x00000004, - menuhandlerShowZoomRange, + menuhandler_show_zoom_range, }, { MENUITEMTYPE_CHECKBOX, @@ -2677,7 +2677,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_OPTIONS_208, // "Ammo on Screen" 0x00000004, - menuhandlerAmmoOnScreen, + menuhandler_ammo_on_screen, }, { MENUITEMTYPE_CHECKBOX, @@ -2685,7 +2685,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_OPTIONS_209, // "Show Gun Function" 0x00000004, - menuhandlerShowGunFunction, + menuhandler_show_gun_function, }, { MENUITEMTYPE_CHECKBOX, @@ -2693,7 +2693,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_OPTIONS_210, // "Paintball" 0x00000004, - menuhandlerPaintball, + menuhandler_paintball, }, { MENUITEMTYPE_CHECKBOX, @@ -2701,7 +2701,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_MPWEAPONS_169, // "In-Game Subtitles" 0x00000004, - menuhandlerInGameSubtitles, + menuhandler_in_game_subtitles, }, { MENUITEMTYPE_CHECKBOX, @@ -2709,7 +2709,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_MPWEAPONS_168, // "Cutscene Subtitles" 0x00000004, - menuhandlerCutsceneSubtitles, + menuhandler_cutscene_subtitles, }, { MENUITEMTYPE_CHECKBOX, @@ -2717,7 +2717,7 @@ struct menuitem g_MissionDisplayOptionsMenuItems[] = { 0, L_OPTIONS_212, // "Show Mission Time" 0x00000004, - menuhandlerShowMissionTime, + menuhandler_show_mission_time, }, { MENUITEMTYPE_SEPARATOR, @@ -2754,7 +2754,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { 0, L_MPWEAPONS_145, // "Sight on Screen" 0x00000004, - menuhandlerSightOnScreen, + menuhandler_sight_on_screen, }, { MENUITEMTYPE_CHECKBOX, @@ -2762,7 +2762,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { 0, L_MPWEAPONS_146, // "Target" 0x00000004, - menuhandlerAlwaysShowTarget, + menuhandler_always_show_target, }, { MENUITEMTYPE_CHECKBOX, @@ -2770,7 +2770,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { 0, L_MPWEAPONS_147, // "Zoom Range" 0x00000004, - menuhandlerShowZoomRange, + menuhandler_show_zoom_range, }, { MENUITEMTYPE_CHECKBOX, @@ -2778,7 +2778,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { 0, L_MPWEAPONS_148, // "Show Ammo" 0x00000004, - menuhandlerAmmoOnScreen, + menuhandler_ammo_on_screen, }, { MENUITEMTYPE_CHECKBOX, @@ -2786,7 +2786,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { 0, L_MPWEAPONS_149, // "Gun Function" 0x00000004, - menuhandlerShowGunFunction, + menuhandler_show_gun_function, }, { MENUITEMTYPE_CHECKBOX, @@ -2794,7 +2794,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { 0, L_MPWEAPONS_150, // "Paintball" 0x00000004, - menuhandlerPaintball, + menuhandler_paintball, }, { MENUITEMTYPE_CHECKBOX, @@ -2806,7 +2806,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { L_MPWEAPONS_169, // "In-Game Subtitles" #endif 0x00000004, - menuhandlerInGameSubtitles, + menuhandler_in_game_subtitles, }, { MENUITEMTYPE_CHECKBOX, @@ -2818,7 +2818,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { L_MPWEAPONS_168, // "Cutscene Subtitles" #endif 0x00000004, - menuhandlerCutsceneSubtitles, + menuhandler_cutscene_subtitles, }, { MENUITEMTYPE_CHECKBOX, @@ -2826,7 +2826,7 @@ struct menuitem g_2PMissionDisplayOptionsVMenuItems[] = { 0, L_MPWEAPONS_152, // "Mission Time" 0x00000004, - menuhandlerShowMissionTime, + menuhandler_show_mission_time, }, { MENUITEMTYPE_SEPARATOR, @@ -2863,7 +2863,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_OPTIONS_205, // "Sight on Screen" 0x00000004, - menuhandlerSightOnScreen, + menuhandler_sight_on_screen, }, { MENUITEMTYPE_CHECKBOX, @@ -2871,7 +2871,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_OPTIONS_206, // "Always Show Target" 0x00000004, - menuhandlerAlwaysShowTarget, + menuhandler_always_show_target, }, { MENUITEMTYPE_CHECKBOX, @@ -2879,7 +2879,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_OPTIONS_207, // "Show Zoom Range" 0x00000004, - menuhandlerShowZoomRange, + menuhandler_show_zoom_range, }, { MENUITEMTYPE_CHECKBOX, @@ -2887,7 +2887,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_OPTIONS_208, // "Ammo on Screen" 0x00000004, - menuhandlerAmmoOnScreen, + menuhandler_ammo_on_screen, }, { MENUITEMTYPE_CHECKBOX, @@ -2895,7 +2895,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_OPTIONS_209, // "Show Gun Function" 0x00000004, - menuhandlerShowGunFunction, + menuhandler_show_gun_function, }, { MENUITEMTYPE_CHECKBOX, @@ -2903,7 +2903,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_OPTIONS_210, // "Paintball" 0x00000004, - menuhandlerPaintball, + menuhandler_paintball, }, { MENUITEMTYPE_CHECKBOX, @@ -2911,7 +2911,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_MPWEAPONS_169, // "In-Game Subtitles" 0x00000004, - menuhandlerInGameSubtitles, + menuhandler_in_game_subtitles, }, { MENUITEMTYPE_CHECKBOX, @@ -2919,7 +2919,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_MPWEAPONS_168, // "Cutscene Subtitles" 0x00000004, - menuhandlerCutsceneSubtitles, + menuhandler_cutscene_subtitles, }, { MENUITEMTYPE_CHECKBOX, @@ -2927,7 +2927,7 @@ struct menuitem g_CiDisplayMenuItems[] = { 0, L_OPTIONS_212, // "Show Mission Time" 0x00000004, - menuhandlerShowMissionTime, + menuhandler_show_mission_time, }, { MENUITEMTYPE_SEPARATOR, @@ -2966,7 +2966,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_OPTIONS_205, // "Sight on Screen" 0x00000005, - menuhandlerSightOnScreen, + menuhandler_sight_on_screen, }, { MENUITEMTYPE_CHECKBOX, @@ -2974,7 +2974,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_OPTIONS_206, // "Always Show Target" 0x00000005, - menuhandlerAlwaysShowTarget, + menuhandler_always_show_target, }, { MENUITEMTYPE_CHECKBOX, @@ -2982,7 +2982,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_OPTIONS_207, // "Show Zoom Range" 0x00000005, - menuhandlerShowZoomRange, + menuhandler_show_zoom_range, }, { MENUITEMTYPE_CHECKBOX, @@ -2990,7 +2990,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_OPTIONS_208, // "Ammo on Screen" 0x00000005, - menuhandlerAmmoOnScreen, + menuhandler_ammo_on_screen, }, { MENUITEMTYPE_CHECKBOX, @@ -2998,7 +2998,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_OPTIONS_209, // "Show Gun Function" 0x00000005, - menuhandlerShowGunFunction, + menuhandler_show_gun_function, }, { MENUITEMTYPE_CHECKBOX, @@ -3006,7 +3006,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_OPTIONS_210, // "Paintball" 0x00000005, - menuhandlerPaintball, + menuhandler_paintball, }, { MENUITEMTYPE_CHECKBOX, @@ -3014,7 +3014,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_MPWEAPONS_169, // "In-Game Subtitles" 0x00000005, - menuhandlerInGameSubtitles, + menuhandler_in_game_subtitles, }, { MENUITEMTYPE_CHECKBOX, @@ -3022,7 +3022,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_MPWEAPONS_168, // "Cutscene Subtitles" 0x00000005, - menuhandlerCutsceneSubtitles, + menuhandler_cutscene_subtitles, }, { MENUITEMTYPE_CHECKBOX, @@ -3030,7 +3030,7 @@ struct menuitem g_CiDisplayPlayer2MenuItems[] = { 0, L_OPTIONS_212, // "Show Mission Time" 0x00000005, - menuhandlerShowMissionTime, + menuhandler_show_mission_time, }, { MENUITEMTYPE_SEPARATOR, @@ -3067,7 +3067,7 @@ struct menuitem g_MissionControlOptionsMenuItems[] = { 0, L_OPTIONS_194, // "Control Style" (uintptr_t)&func0f105664, - menuhandlerControlStyle, + menuhandler_control_style, }, { MENUITEMTYPE_CHECKBOX, @@ -3075,7 +3075,7 @@ struct menuitem g_MissionControlOptionsMenuItems[] = { 0, L_OPTIONS_195, // "Reverse Pitch" 0x00000004, - menuhandlerReversePitch, + menuhandler_reverse_pitch, }, { MENUITEMTYPE_CHECKBOX, @@ -3083,7 +3083,7 @@ struct menuitem g_MissionControlOptionsMenuItems[] = { 0, L_OPTIONS_196, // "Look Ahead" 0x00000004, - menuhandlerLookAhead, + menuhandler_look_ahead, }, { MENUITEMTYPE_CHECKBOX, @@ -3091,7 +3091,7 @@ struct menuitem g_MissionControlOptionsMenuItems[] = { 0, L_OPTIONS_197, // "Head Roll" 0x00000004, - menuhandlerHeadRoll, + menuhandler_head_roll, }, { MENUITEMTYPE_CHECKBOX, @@ -3099,7 +3099,7 @@ struct menuitem g_MissionControlOptionsMenuItems[] = { 0, L_OPTIONS_198, // "Auto-Aim" 0x00000004, - menuhandlerAutoAim, + menuhandler_auto_aim, }, { MENUITEMTYPE_DROPDOWN, @@ -3107,7 +3107,7 @@ struct menuitem g_MissionControlOptionsMenuItems[] = { 0, L_OPTIONS_199, // "Aim Control" 0x00000004, - menuhandlerAimControl, + menuhandler_aim_control, }, { MENUITEMTYPE_SEPARATOR, @@ -3145,7 +3145,7 @@ struct menuitem g_CiControlOptionsMenuItems2[] = { 0, L_MPWEAPONS_270, // "" (uintptr_t)&func0f105664, - menuhandlerControlStyle, + menuhandler_control_style, }, { MENUITEMTYPE_CHECKBOX, @@ -3153,7 +3153,7 @@ struct menuitem g_CiControlOptionsMenuItems2[] = { 0, L_MPWEAPONS_271, // "" 0x00000004, - menuhandlerReversePitch, + menuhandler_reverse_pitch, }, { MENUITEMTYPE_CHECKBOX, @@ -3161,7 +3161,7 @@ struct menuitem g_CiControlOptionsMenuItems2[] = { 0, L_MPWEAPONS_272, // "" 0x00000004, - menuhandlerLookAhead, + menuhandler_look_ahead, }, { MENUITEMTYPE_CHECKBOX, @@ -3169,7 +3169,7 @@ struct menuitem g_CiControlOptionsMenuItems2[] = { 0, L_MPWEAPONS_273, // "" 0x00000004, - menuhandlerHeadRoll, + menuhandler_head_roll, }, { MENUITEMTYPE_CHECKBOX, @@ -3177,7 +3177,7 @@ struct menuitem g_CiControlOptionsMenuItems2[] = { 0, L_MPWEAPONS_274, // "" 0x00000004, - menuhandlerAutoAim, + menuhandler_auto_aim, }, { MENUITEMTYPE_DROPDOWN, @@ -3185,7 +3185,7 @@ struct menuitem g_CiControlOptionsMenuItems2[] = { 0, L_MPWEAPONS_275, // "" 0x00000004, - menuhandlerAimControl, + menuhandler_aim_control, }, { MENUITEMTYPE_SEPARATOR, @@ -3231,7 +3231,7 @@ struct menuitem g_CiControlOptionsMenuItems[] = { 0, L_OPTIONS_195, // "Reverse Pitch" 0x00000004, - menuhandlerReversePitch, + menuhandler_reverse_pitch, }, { MENUITEMTYPE_CHECKBOX, @@ -3239,7 +3239,7 @@ struct menuitem g_CiControlOptionsMenuItems[] = { 0, L_OPTIONS_196, // "Look Ahead" 0x00000004, - menuhandlerLookAhead, + menuhandler_look_ahead, }, { MENUITEMTYPE_CHECKBOX, @@ -3247,7 +3247,7 @@ struct menuitem g_CiControlOptionsMenuItems[] = { 0, L_OPTIONS_197, // "Head Roll" 0x00000004, - menuhandlerHeadRoll, + menuhandler_head_roll, }, { MENUITEMTYPE_CHECKBOX, @@ -3255,7 +3255,7 @@ struct menuitem g_CiControlOptionsMenuItems[] = { 0, L_OPTIONS_198, // "Auto-Aim" 0x00000004, - menuhandlerAutoAim, + menuhandler_auto_aim, }, { MENUITEMTYPE_DROPDOWN, @@ -3263,7 +3263,7 @@ struct menuitem g_CiControlOptionsMenuItems[] = { 0, L_OPTIONS_199, // "Aim Control" 0x00000004, - menuhandlerAimControl, + menuhandler_aim_control, }, { MENUITEMTYPE_SEPARATOR, @@ -3308,7 +3308,7 @@ struct menuitem g_CiControlPlayer2MenuItems[] = { 0, L_OPTIONS_195, // "Reverse Pitch" 0x00000005, - menuhandlerReversePitch, + menuhandler_reverse_pitch, }, { MENUITEMTYPE_CHECKBOX, @@ -3316,7 +3316,7 @@ struct menuitem g_CiControlPlayer2MenuItems[] = { 0, L_OPTIONS_196, // "Look Ahead" 0x00000005, - menuhandlerLookAhead, + menuhandler_look_ahead, }, { MENUITEMTYPE_CHECKBOX, @@ -3324,7 +3324,7 @@ struct menuitem g_CiControlPlayer2MenuItems[] = { 0, L_OPTIONS_197, // "Head Roll" 0x00000005, - menuhandlerHeadRoll, + menuhandler_head_roll, }, { MENUITEMTYPE_CHECKBOX, @@ -3332,7 +3332,7 @@ struct menuitem g_CiControlPlayer2MenuItems[] = { 0, L_OPTIONS_198, // "Auto-Aim" 0x00000005, - menuhandlerAutoAim, + menuhandler_auto_aim, }, { MENUITEMTYPE_DROPDOWN, @@ -3340,7 +3340,7 @@ struct menuitem g_CiControlPlayer2MenuItems[] = { 0, L_OPTIONS_199, // "Aim Control" 0x00000005, - menuhandlerAimControl, + menuhandler_aim_control, }, { MENUITEMTYPE_SEPARATOR, @@ -3385,7 +3385,7 @@ struct menuitem g_ChangeAgentMenuItems[] = { 0, L_OPTIONS_190, // "Yes" 0, - menuhandlerChangeAgent, + menuhandler_change_agent, }, { MENUITEMTYPE_SELECTABLE, @@ -3488,9 +3488,9 @@ struct menuitem g_2PMissionOptionsHMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, 0, - (uintptr_t)&menutextPauseOrUnpause, + (uintptr_t)&menutext_pause_or_unpause, 0, - menuhandlerMpPause, + menuhandler_mp_pause, }, { MENUITEMTYPE_END }, }; @@ -3544,9 +3544,9 @@ struct menuitem g_2PMissionOptionsVMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, 0, - (uintptr_t)&menutextPauseOrUnpause, + (uintptr_t)&menutext_pause_or_unpause, 0, - menuhandlerMpPause, + menuhandler_mp_pause, }, { MENUITEMTYPE_END }, }; @@ -3650,32 +3650,32 @@ struct menudialogdef g_2PMissionOptionsVMenuDialog = { u8 var80072d88 = 255; -char *invMenuTextPrimaryFunction(struct menuitem *item) +char *inv_menu_text_primary_function(struct menuitem *item) { - struct weaponfunc *primaryfunc = weaponGetFunctionById(g_InventoryWeapon, 0); - struct weaponfunc *secondaryfunc = weaponGetFunctionById(g_InventoryWeapon, 1); + struct weaponfunc *primaryfunc = weapon_get_function_by_id(g_InventoryWeapon, 0); + struct weaponfunc *secondaryfunc = weapon_get_function_by_id(g_InventoryWeapon, 1); if (primaryfunc && secondaryfunc) { - return langGet(primaryfunc->name); + return lang_get(primaryfunc->name); } - return langGet(L_OPTIONS_003); // "\n" + return lang_get(L_OPTIONS_003); // "\n" } -char *invMenuTextSecondaryFunction(struct menuitem *item) +char *inv_menu_text_secondary_function(struct menuitem *item) { - struct weaponfunc *primaryfunc = weaponGetFunctionById(g_InventoryWeapon, 0); - struct weaponfunc *secondaryfunc = weaponGetFunctionById(g_InventoryWeapon, 1); + struct weaponfunc *primaryfunc = weapon_get_function_by_id(g_InventoryWeapon, 0); + struct weaponfunc *secondaryfunc = weapon_get_function_by_id(g_InventoryWeapon, 1); if (secondaryfunc) { - return langGet(secondaryfunc->name); + return lang_get(secondaryfunc->name); } if (primaryfunc) { - return langGet(primaryfunc->name); + return lang_get(primaryfunc->name); } - return langGet(L_OPTIONS_003); // "\n" + return lang_get(L_OPTIONS_003); // "\n" } void func0f105948(s32 weaponnum) @@ -3776,12 +3776,12 @@ void func0f105948(s32 weaponnum) useindex = 0; } - if (weaponHasFlag(weaponnum, WEAPONFLAG_HIDEMENUMODEL) == false && (u32)wantindex >= 0 && useindex >= 0) { - weapon = weaponFindById(weaponnum); + if (weapon_has_flag(weaponnum, WEAPONFLAG_HIDEMENUMODEL) == false && (u32)wantindex >= 0 && useindex >= 0) { + weapon = weapon_find_by_id(weaponnum); g_Menus[g_MpPlayerNum].menumodel.loaddelay = 8; g_Menus[g_MpPlayerNum].menumodel.curparams = 0; - g_Menus[g_MpPlayerNum].menumodel.newparams = MENUMODELPARAMS_SET_FILENUM(weaponGetFileNum(weaponnum)); + g_Menus[g_MpPlayerNum].menumodel.newparams = MENUMODELPARAMS_SET_FILENUM(weapon_get_file_num(weaponnum)); g_Menus[g_MpPlayerNum].menumodel.curposx = g_Menus[g_MpPlayerNum].menumodel.newposx = 0; g_Menus[g_MpPlayerNum].menumodel.curposy = g_Menus[g_MpPlayerNum].menumodel.newposy = 0; @@ -3796,7 +3796,7 @@ void func0f105948(s32 weaponnum) g_Menus[g_MpPlayerNum].menumodel.newrotx = gunconfig[useindex][3]; g_Menus[g_MpPlayerNum].menumodel.currotx = gunconfig[useindex][3]; - menuConfigureModel(&g_Menus[g_MpPlayerNum].menumodel, 0, 0, 0, 0, 0, 0, gunconfig[useindex][4], MENUMODELFLAG_HASSCALE); + menu_configure_model(&g_Menus[g_MpPlayerNum].menumodel, 0, 0, 0, 0, 0, 0, gunconfig[useindex][4], MENUMODELFLAG_HASSCALE); g_Menus[g_MpPlayerNum].menumodel.curscale = 0; g_Menus[g_MpPlayerNum].menumodel.partvisibility = weapon->partvisibility; @@ -3813,7 +3813,7 @@ void func0f105948(s32 weaponnum) g_Menus[g_MpPlayerNum].menumodel.partvisibility = NULL; g_Menus[g_MpPlayerNum].menumodel.removingpiece = false; - menuConfigureModel(&g_Menus[g_MpPlayerNum].menumodel, 0, 0, 0, 0, 0, 0, 1, MENUMODELFLAG_HASSCALE); + menu_configure_model(&g_Menus[g_MpPlayerNum].menumodel, 0, 0, 0, 0, 0, 0, 1, MENUMODELFLAG_HASSCALE); g_Menus[g_MpPlayerNum].menumodel.rottimer60 = TICKS(60); g_Menus[g_MpPlayerNum].menumodel.zoomtimer60 = TICKS(120); @@ -3826,7 +3826,7 @@ void func0f105948(s32 weaponnum) } } -MenuDialogHandlerResult inventoryMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult inventory_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) { @@ -3858,27 +3858,27 @@ MenuDialogHandlerResult inventoryMenuDialog(s32 operation, struct menudialogdef * Return name, but if there is no manufacturer then return a blank value * because the name is being shown in the manufacturer slot. */ -char *invMenuTextWeaponName(struct menuitem *item) +char *inv_menu_text_weapon_name(struct menuitem *item) { - struct weapon *weapon = weaponFindById(g_InventoryWeapon); + struct weapon *weapon = weapon_find_by_id(g_InventoryWeapon); if (weapon) { if (weapon->manufacturer == L_GUN_000) { // "\n" - return langGet(L_OPTIONS_003); // "\n" + return lang_get(L_OPTIONS_003); // "\n" } - return langGet(weapon->name); + return lang_get(weapon->name); } - return langGet(L_OPTIONS_003); // "\n" + return lang_get(L_OPTIONS_003); // "\n" } /** * Return manufacturer, with fallback to weapon name if manufacturer is blank. */ -char *invMenuTextWeaponManufacturer(struct menuitem *item) +char *inv_menu_text_weapon_manufacturer(struct menuitem *item) { - struct weapon *weapon = weaponFindById(g_InventoryWeapon); + struct weapon *weapon = weapon_find_by_id(g_InventoryWeapon); u32 textid = L_GUN_000; // "\n" if (weapon) { @@ -3886,36 +3886,36 @@ char *invMenuTextWeaponManufacturer(struct menuitem *item) } if (textid != L_GUN_000) { - return langGet(textid); + return lang_get(textid); } - weapon = weaponFindById(g_InventoryWeapon); + weapon = weapon_find_by_id(g_InventoryWeapon); if (weapon) { - return langGet(weapon->name); + return lang_get(weapon->name); } - return langGet(L_OPTIONS_003); // "\n" + return lang_get(L_OPTIONS_003); // "\n" } -char *invMenuTextWeaponDescription(struct menuitem *item) +char *inv_menu_text_weapon_description(struct menuitem *item) { - struct weapon *weapon = weaponFindById(g_InventoryWeapon); + struct weapon *weapon = weapon_find_by_id(g_InventoryWeapon); if (weapon) { if (g_InventoryWeapon == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) { if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { - return langGet(L_GUN_237); // Drugspy description + return lang_get(L_GUN_237); // Drugspy description } if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_BOMBSPY) { - return langGet(L_GUN_236); // Bombspy description + return lang_get(L_GUN_236); // Bombspy description } } if (g_InventoryWeapon == WEAPON_NECKLACE && g_Vars.stagenum == (VERSION >= VERSION_NTSC_1_0 ? STAGE_ATTACKSHIP : STAGE_SKEDARRUINS) - && lvGetDifficulty() >= DIFF_PA) { + && lv_get_difficulty() >= DIFF_PA) { #if VERSION >= VERSION_NTSC_1_0 // Phrases included here to assist people searching the code for them: // CDV780322 @@ -3962,18 +3962,18 @@ char *invMenuTextWeaponDescription(struct menuitem *item) } // "Cassandra De Vries' replacement necklace. Username: %s Password: %s" - sprintf(g_StringPointer, langGet(L_GUN_239), &username, &password); + sprintf(g_StringPointer, lang_get(L_GUN_239), &username, &password); return g_StringPointer; #else // ntsc-beta stores the whole thing as a single plain text string - return langGet(L_GUN_239); + return lang_get(L_GUN_239); #endif } - return langGet(weapon->description); + return lang_get(weapon->description); } - return langGet(L_OPTIONS_003); // "\n" + return lang_get(L_OPTIONS_003); // "\n" } struct menuitem g_SoloMissionInventoryMenuItems[] = { @@ -3983,14 +3983,14 @@ struct menuitem g_SoloMissionInventoryMenuItems[] = { 0, 0x0000006e, (VERSION >= VERSION_JPN_FINAL ? 0x54 : 0x63), - menuhandlerInventoryList, + menuhandler_inventory_list, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_NEWCOLUMN | MENUITEMFLAG_00000002 | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (uintptr_t)&invMenuTextWeaponManufacturer, + (uintptr_t)&inv_menu_text_weapon_manufacturer, NULL, }, { @@ -3998,7 +3998,7 @@ struct menuitem g_SoloMissionInventoryMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LABEL_ALTCOLOUR | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (uintptr_t)&invMenuTextWeaponName, + (uintptr_t)&inv_menu_text_weapon_name, NULL, }, { @@ -4014,7 +4014,7 @@ struct menuitem g_SoloMissionInventoryMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (uintptr_t)&invMenuTextPrimaryFunction, + (uintptr_t)&inv_menu_text_primary_function, NULL, }, { @@ -4022,14 +4022,14 @@ struct menuitem g_SoloMissionInventoryMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (uintptr_t)&invMenuTextSecondaryFunction, + (uintptr_t)&inv_menu_text_secondary_function, NULL, }, { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&invMenuTextWeaponDescription, + (uintptr_t)&inv_menu_text_weapon_description, 0, NULL, }, @@ -4043,14 +4043,14 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = { 0, 0x0000006e, 0x00000063, - menuhandlerFrInventoryList, + menuhandler_fr_inventory_list, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_NEWCOLUMN | MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (uintptr_t)&invMenuTextWeaponManufacturer, + (uintptr_t)&inv_menu_text_weapon_manufacturer, NULL, }, { @@ -4058,7 +4058,7 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LABEL_ALTCOLOUR | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (uintptr_t)&invMenuTextWeaponName, + (uintptr_t)&inv_menu_text_weapon_name, NULL, }, { @@ -4074,7 +4074,7 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (uintptr_t)&invMenuTextPrimaryFunction, + (uintptr_t)&inv_menu_text_primary_function, NULL, }, { @@ -4082,14 +4082,14 @@ struct menuitem g_FrWeaponsAvailableMenuItems[] = { 0, MENUITEMFLAG_00000002 | MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT, L_OPTIONS_003, // "" - (uintptr_t)&invMenuTextSecondaryFunction, + (uintptr_t)&inv_menu_text_secondary_function, NULL, }, { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&invMenuTextWeaponDescription, + (uintptr_t)&inv_menu_text_weapon_description, 0, NULL, }, @@ -4100,7 +4100,7 @@ struct menudialogdef g_SoloMissionInventoryMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_178, // "Inventory" g_SoloMissionInventoryMenuItems, - inventoryMenuDialog, + inventory_menu_dialog, #if VERSION >= VERSION_JPN_FINAL MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE | MENUDIALOGFLAG_0400 | MENUDIALOGFLAG_1000, #else @@ -4113,12 +4113,12 @@ struct menudialogdef g_FrWeaponsAvailableMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_179, // "Weapons Available" g_FrWeaponsAvailableMenuItems, - inventoryMenuDialog, + inventory_menu_dialog, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE | MENUDIALOGFLAG_0400, NULL, }; -MenuItemHandlerResult menuhandlerFrInventoryList(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_fr_inventory_list(s32 operation, struct menuitem *item, union handlerdata *data) { static u8 g_FrFocusedSlotIndex = 0; @@ -4132,11 +4132,11 @@ MenuItemHandlerResult menuhandlerFrInventoryList(s32 operation, struct menuitem data->list.groupstartindex = 0; break; case MENUOP_GETOPTIONCOUNT: - data->list.value = frGetNumWeaponsAvailable(); + data->list.value = fr_get_num_weapons_available(); break; case MENUOP_GETOPTIONTEXT: g_FrFocusedSlotIndex = data->list.value; - return (s32)bgunGetName(frGetWeaponBySlot(data->list.value)); + return (s32)bgun_get_name(fr_get_weapon_by_slot(data->list.value)); case MENUOP_SET: g_FrFocusedSlotIndex = data->list.value; return 0; @@ -4144,7 +4144,7 @@ MenuItemHandlerResult menuhandlerFrInventoryList(s32 operation, struct menuitem data->list.value = g_FrFocusedSlotIndex; break; case MENUOP_LISTITEMFOCUS: - g_InventoryWeapon = frGetWeaponBySlot(data->list.value); + g_InventoryWeapon = fr_get_weapon_by_slot(data->list.value); g_Menus[g_MpPlayerNum].training.weaponnum = g_InventoryWeapon; g_FrFocusedSlotIndex = data->list.value; @@ -4159,44 +4159,44 @@ MenuItemHandlerResult menuhandlerFrInventoryList(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerInventoryList(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_inventory_list(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->list.value = invGetCount(); + data->list.value = inv_get_count(); break; case MENUOP_GETOPTIONTEXT: - return (s32)invGetNameByIndex(data->list.value); + return (s32)inv_get_name_by_index(data->list.value); case MENUOP_SET: { - s32 weaponnum = invGetWeaponNumByIndex(data->list.value); + s32 weaponnum = inv_get_weapon_num_by_index(data->list.value); bool equippable = true; if (weaponnum != WEAPON_NONE) { - s32 state = currentPlayerGetDeviceState(weaponnum); + s32 state = current_player_get_device_state(weaponnum); if (state != DEVICESTATE_UNEQUIPPED) { equippable = false; if (data->list.unk04 == 0) { if (state == DEVICESTATE_INACTIVE) { - currentPlayerSetDeviceActive(weaponnum, true); + current_player_set_device_active(weaponnum, true); } else { - currentPlayerSetDeviceActive(weaponnum, false); + current_player_set_device_active(weaponnum, false); } } } } if (equippable) { - invSetCurrentIndex(data->list.value); + inv_set_current_index(data->list.value); - if (invHasDoubleWeaponIncAllGuns(weaponnum, weaponnum)) { - bgunEquipWeapon2(HAND_RIGHT, weaponnum); - bgunEquipWeapon2(HAND_LEFT, weaponnum); + if (inv_has_double_weapon_inc_all_guns(weaponnum, weaponnum)) { + bgun_equip_weapon2(HAND_RIGHT, weaponnum); + bgun_equip_weapon2(HAND_LEFT, weaponnum); } else { - bgunEquipWeapon2(HAND_RIGHT, weaponnum); - bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE); + bgun_equip_weapon2(HAND_RIGHT, weaponnum); + bgun_equip_weapon2(HAND_LEFT, WEAPON_NONE); } } @@ -4204,14 +4204,14 @@ MenuItemHandlerResult menuhandlerInventoryList(s32 operation, struct menuitem *i } break; case MENUOP_GETSELECTEDINDEX: - data->list.value = invGetCurrentIndex(); + data->list.value = inv_get_current_index(); break; case MENUOP_GETLISTITEMCHECKBOX: { - s32 weaponnum = invGetWeaponNumByIndex(data->list.value); + s32 weaponnum = inv_get_weapon_num_by_index(data->list.value); if (weaponnum != WEAPON_NONE) { - s32 state = currentPlayerGetDeviceState(weaponnum); + s32 state = current_player_get_device_state(weaponnum); if (state != DEVICESTATE_UNEQUIPPED) { data->list.unk04 = state; @@ -4220,7 +4220,7 @@ MenuItemHandlerResult menuhandlerInventoryList(s32 operation, struct menuitem *i } break; case MENUOP_LISTITEMFOCUS: - g_InventoryWeapon = invGetWeaponNumByIndex(data->list.value); + g_InventoryWeapon = inv_get_weapon_num_by_index(data->list.value); g_Menus[g_MpPlayerNum].training.weaponnum = g_InventoryWeapon; func0f0f139c(&g_SoloMissionInventoryMenuItems[1], -1); @@ -4233,17 +4233,17 @@ MenuItemHandlerResult menuhandlerInventoryList(s32 operation, struct menuitem *i return 0; } -MenuItemHandlerResult menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_abort_mission(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.currentplayer->aborted = true; - mainEndStage(); + main_end_stage(); } return 0; } -MenuDialogHandlerResult menudialogAbortMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_abort_mission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { // empty @@ -4275,7 +4275,7 @@ struct menuitem g_MissionAbortMenuItems[] = { 0, L_OPTIONS_177, // "Abort" 0, - menuhandlerAbortMission, + menuhandler_abort_mission, }, { MENUITEMTYPE_END }, }; @@ -4284,7 +4284,7 @@ struct menudialogdef g_MissionAbortMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS_174, // "Warning" g_MissionAbortMenuItems, - menudialogAbortMission, + menudialog_abort_mission, 0, NULL, }; @@ -4312,7 +4312,7 @@ struct menuitem g_2PMissionAbortVMenuItems[] = { 0, L_OPTIONS_177, // "Abort" 0, - menuhandlerAbortMission, + menuhandler_abort_mission, }, { MENUITEMTYPE_END }, }; @@ -4321,12 +4321,12 @@ struct menudialogdef g_2PMissionAbortVMenuDialog = { MENUDIALOGTYPE_DANGER, L_OPTIONS_174, // "Warning" g_2PMissionAbortVMenuItems, - menudialogAbortMission, + menudialog_abort_mission, 0, NULL, }; -MenuDialogHandlerResult soloMenuDialogPauseStatus(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult solo_menu_dialog_pause_status(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { struct briefingobj *briefing = g_BriefingObjs; @@ -4334,11 +4334,11 @@ MenuDialogHandlerResult soloMenuDialogPauseStatus(s32 operation, struct menudial s32 wanttype = BRIEFINGTYPE_TEXT_PA; s32 i; - if (lvGetDifficulty() == DIFF_A) { + if (lv_get_difficulty() == DIFF_A) { wanttype = BRIEFINGTYPE_TEXT_A; } - if (lvGetDifficulty() == DIFF_SA) { + if (lv_get_difficulty() == DIFF_SA) { wanttype = BRIEFINGTYPE_TEXT_SA; } @@ -4357,10 +4357,10 @@ MenuDialogHandlerResult soloMenuDialogPauseStatus(s32 operation, struct menudial briefing = briefing->next; } - for (i = 0; i < objectiveGetCount(); i++) { + for (i = 0; i < objective_get_count(); i++) { if (g_Objectives[i]) { g_Briefing.objectivenames[i] = g_Objectives[i]->text; - g_Briefing.objectivedifficulties[i] = objectiveGetDifficultyBits(i); + g_Briefing.objectivedifficulties[i] = objective_get_difficulty_bits(i); } } } @@ -4368,15 +4368,15 @@ MenuDialogHandlerResult soloMenuDialogPauseStatus(s32 operation, struct menudial return 0; } -char *soloMenuTitlePauseStatus(struct menudialogdef *dialogdef) +char *solo_menu_title_pause_status(struct menudialogdef *dialogdef) { if (dialogdef != g_Menus[g_MpPlayerNum].curdialog->definition) { - return langGet(L_OPTIONS_172); // "Status" + return lang_get(L_OPTIONS_172); // "Status" } sprintf(g_StringPointer, "%s: %s\n", - langGet(g_SoloStages[g_MissionConfig.stageindex].name3), - langGet(L_OPTIONS_172)); + lang_get(g_SoloStages[g_MissionConfig.stageindex].name3), + lang_get(L_OPTIONS_172)); return g_StringPointer; } @@ -4423,18 +4423,18 @@ struct menuitem g_MissionPauseMenuItems[] = { struct menudialogdef g_SoloMissionPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&soloMenuTitlePauseStatus, + (uintptr_t)&solo_menu_title_pause_status, g_MissionPauseMenuItems, - soloMenuDialogPauseStatus, + solo_menu_dialog_pause_status, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_SoloMissionInventoryMenuDialog, }; struct menudialogdef g_2PMissionPauseHMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&soloMenuTitlePauseStatus, + (uintptr_t)&solo_menu_title_pause_status, g_MissionPauseMenuItems, - soloMenuDialogPauseStatus, + solo_menu_dialog_pause_status, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_2PMissionInventoryHMenuDialog, }; @@ -4443,7 +4443,7 @@ struct menudialogdef g_2PMissionPauseVMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_172, // "Status" g_2PMissionPauseVMenuItems, - soloMenuDialogPauseStatus, + solo_menu_dialog_pause_status, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_2PMissionInventoryVMenuDialog, }; @@ -4533,7 +4533,7 @@ u32 g_CutsceneCountsByMission[] = { #endif }; -s32 getNumCompletedMissions(void) +s32 get_num_completed_missions(void) { s32 s; s32 d; @@ -4563,7 +4563,7 @@ struct cutscenegroup { u16 name; }; -MenuItemHandlerResult menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_cinema(s32 operation, struct menuitem *item, union handlerdata *data) { struct cutscenegroup groups[] = { { /* 0*/ 0, L_OPTIONS_436 }, // "Special" @@ -4593,28 +4593,28 @@ MenuItemHandlerResult menuhandlerCinema(s32 operation, struct menuitem *item, un switch (operation) { case MENUOP_GETOPTIONCOUNT: // Add one for Play All option - data->list.value = g_CutsceneCountsByMission[getNumCompletedMissions()] + 1; + data->list.value = g_CutsceneCountsByMission[get_num_completed_missions()] + 1; break; case MENUOP_GETOPTIONTEXT: if (data->list.value == 0) { - sprintf(g_StringPointer, langGet(L_OPTIONS_448)); // "Play All" + sprintf(g_StringPointer, lang_get(L_OPTIONS_448)); // "Play All" return (s32) g_StringPointer; } - return (s32) langGet(g_Cutscenes[data->list.value - 1].name); + return (s32) lang_get(g_Cutscenes[data->list.value - 1].name); case MENUOP_SET: if (data->list.value == 0) { // Play all - s32 index = getNumCompletedMissions(); + s32 index = get_num_completed_missions(); g_Vars.autocutgroupcur = 0; g_Vars.autocutgroupleft = g_CutsceneCountsByMission[index]; - menuPopDialog(); - menuStop(); + menu_pop_dialog(); + menu_stop(); } else { // Play specific cutscene g_Vars.autocutgroupcur = data->list.value - 1; g_Vars.autocutgroupleft = 1; - menuPopDialog(); - menuStop(); + menu_pop_dialog(); + menu_stop(); } break; case MENUOP_GETSELECTEDINDEX: @@ -4624,7 +4624,7 @@ MenuItemHandlerResult menuhandlerCinema(s32 operation, struct menuitem *item, un data->list.value = ARRAYCOUNT(groups); break; case MENUOP_GETOPTGROUPTEXT: - return (s32) langGet(groups[data->list.value].name); + return (s32) lang_get(groups[data->list.value].name); case MENUOP_GETGROUPSTARTINDEX: data->list.groupstartindex = groups[data->list.value].first_cutscene_index; break; @@ -4640,7 +4640,7 @@ struct menuitem g_CinemaMenuItems[] = { 0, 0x000000eb, 0, - menuhandlerCinema, + menuhandler_cinema, }, { MENUITEMTYPE_END }, }; @@ -4661,7 +4661,7 @@ struct menuitem g_SelectMissionMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x000000eb, 0, - menuhandlerMissionList, + menuhandler_mission_list, }, { MENUITEMTYPE_END }, }; @@ -4675,16 +4675,16 @@ struct menudialogdef g_SelectMissionMenuDialog = { NULL, }; -MenuItemHandlerResult menuhandlerMainMenuSoloMissions(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_main_menu_solo_missions(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.iscoop = false; g_MissionConfig.isanti = false; - menuPushDialog(&g_SelectMissionMenuDialog); + menu_push_dialog(&g_SelectMissionMenuDialog); } if (operation == MENUOP_CHECKPREFOCUSED) { - if (isStageDifficultyUnlocked(SOLOSTAGEINDEX_INVESTIGATION, DIFF_A)) { + if (is_stage_difficulty_unlocked(SOLOSTAGEINDEX_INVESTIGATION, DIFF_A)) { return true; } } @@ -4692,13 +4692,13 @@ MenuItemHandlerResult menuhandlerMainMenuSoloMissions(s32 operation, struct menu return 0; } -MenuItemHandlerResult menuhandlerMainMenuCombatSimulator(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_main_menu_combat_simulator(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); g_Vars.mpsetupmenu = MPSETUPMENU_GENERAL; func0f0f820c(&g_CombatSimulatorMenuDialog, MENUROOT_MPSETUP); func0f0f8300(); @@ -4707,21 +4707,21 @@ MenuItemHandlerResult menuhandlerMainMenuCombatSimulator(s32 operation, struct m return 0; } -MenuItemHandlerResult menuhandlerMainMenuCooperative(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_main_menu_cooperative(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_MissionConfig.iscoop = true; g_MissionConfig.isanti = false; - menuPushDialog(&g_SelectMissionMenuDialog); + menu_push_dialog(&g_SelectMissionMenuDialog); } return 0; } -MenuItemHandlerResult menuhandlerMainMenuCounterOperative(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_main_menu_counter_operative(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { - if ((joyGetConnectedControllers() & 2) == 0) { + if ((joy_get_connected_controllers() & 2) == 0) { return true; } } @@ -4729,13 +4729,13 @@ MenuItemHandlerResult menuhandlerMainMenuCounterOperative(s32 operation, struct if (operation == MENUOP_SET) { g_MissionConfig.iscoop = false; g_MissionConfig.isanti = true; - menuPushDialog(&g_SelectMissionMenuDialog); + menu_push_dialog(&g_SelectMissionMenuDialog); } return 0; } -MenuDialogHandlerResult menudialogMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_main_menu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: @@ -4753,7 +4753,7 @@ MenuDialogHandlerResult menudialogMainMenu(s32 operation, struct menudialogdef * return false; } -char *mainMenuTextLabel(struct menuitem *item) +char *main_menu_text_label(struct menuitem *item) { u16 nocheats[] = { L_OPTIONS_117, // "Solo Missions" @@ -4770,10 +4770,10 @@ char *mainMenuTextLabel(struct menuitem *item) }; if (g_CheatsEnabledBank0 || g_CheatsEnabledBank1) { - return langGet(withcheats[item->param]); + return lang_get(withcheats[item->param]); } - return langGet(nocheats[item->param]); + return lang_get(nocheats[item->param]); } struct menuitem g_MainMenuMenuItems[] = { @@ -4789,33 +4789,33 @@ struct menuitem g_MainMenuMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_BIGFONT, - (uintptr_t)&mainMenuTextLabel, + (uintptr_t)&main_menu_text_label, 0x00000002, - menuhandlerMainMenuSoloMissions, + menuhandler_main_menu_solo_missions, }, { MENUITEMTYPE_SELECTABLE, 1, MENUITEMFLAG_BIGFONT, - (uintptr_t)&mainMenuTextLabel, + (uintptr_t)&main_menu_text_label, 0x00000003, - menuhandlerMainMenuCombatSimulator, + menuhandler_main_menu_combat_simulator, }, { MENUITEMTYPE_SELECTABLE, 2, MENUITEMFLAG_BIGFONT, - (uintptr_t)&mainMenuTextLabel, + (uintptr_t)&main_menu_text_label, 0x00000004, - menuhandlerMainMenuCooperative, + menuhandler_main_menu_cooperative, }, { MENUITEMTYPE_SELECTABLE, 3, MENUITEMFLAG_BIGFONT, - (uintptr_t)&mainMenuTextLabel, + (uintptr_t)&main_menu_text_label, 0x00000005, - menuhandlerMainMenuCounterOperative, + menuhandler_main_menu_counter_operative, }, { MENUITEMTYPE_SELECTABLE, @@ -4832,7 +4832,7 @@ struct menudialogdef g_CiMenuViaPcMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_116, // "Perfect Menu" g_MainMenuMenuItems, - menudialogMainMenu, + menudialog_main_menu, MENUDIALOGFLAG_STARTSELECTS, &g_CiOptionsViaPcMenuDialog, }; @@ -4841,12 +4841,12 @@ struct menudialogdef g_CiMenuViaPauseMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_OPTIONS_116, // "Perfect Menu" g_MainMenuMenuItems, - menudialogMainMenu, + menudialog_main_menu, MENUDIALOGFLAG_STARTSELECTS, &g_CiOptionsViaPauseMenuDialog, }; -bool soloChoosePauseDialog(void) +bool solo_choose_pause_dialog(void) { if (g_Menus[g_MpPlayerNum].openinhibit == 0) { g_Menus[g_MpPlayerNum].playernum = 0; @@ -4854,43 +4854,43 @@ bool soloChoosePauseDialog(void) if (g_Vars.stagenum == STAGE_CITRAINING) { bool handled = false; - if (ciIsTourDone()) { - struct trainingdata *dtdata = dtGetData(); + if (ci_is_tour_done()) { + struct trainingdata *dtdata = dt_get_data(); s32 room = g_Vars.currentplayer->prop->rooms[0]; if (room >= ROOM_DISH_HOLO1 && room <= ROOM_DISH_HOLO4) { - struct trainingdata *htdata = getHoloTrainingData(); + struct trainingdata *htdata = get_holo_training_data(); if (htdata->intraining) { - menuPushRootDialog(&g_HtDetailsMenuDialog, MENUROOT_TRAINING); + menu_push_root_dialog(&g_HtDetailsMenuDialog, MENUROOT_TRAINING); } else if (htdata->finished) { - htPushEndscreen(); + ht_push_endscreen(); } else { - menuPushRootDialog(&g_HtListMenuDialog, MENUROOT_TRAINING); + menu_push_root_dialog(&g_HtListMenuDialog, MENUROOT_TRAINING); } handled = true; } else if (room == ROOM_DISH_DEVICELAB) { if (dtdata->intraining) { - menuPushRootDialog(&g_DtDetailsMenuDialog, MENUROOT_TRAINING); + menu_push_root_dialog(&g_DtDetailsMenuDialog, MENUROOT_TRAINING); } else if (dtdata->finished) { - dtPushEndscreen(); + dt_push_endscreen(); } else { - menuPushRootDialog(&g_DtListMenuDialog, MENUROOT_TRAINING); + menu_push_root_dialog(&g_DtListMenuDialog, MENUROOT_TRAINING); } handled = true; } else if (dtdata->intraining) { - menuPushRootDialog(&g_DtDetailsMenuDialog, MENUROOT_TRAINING); + menu_push_root_dialog(&g_DtDetailsMenuDialog, MENUROOT_TRAINING); handled = true; } else if (dtdata->finished) { - dtPushEndscreen(); + dt_push_endscreen(); handled = true; } else if (room == ROOM_DISH_FIRINGRANGE) { - if (frIsInTraining()) { - menuPushRootDialog(&g_FrTrainingInfoInGameMenuDialog, MENUROOT_TRAINING); + if (fr_is_in_training()) { + menu_push_root_dialog(&g_FrTrainingInfoInGameMenuDialog, MENUROOT_TRAINING); } else { - menuPushRootDialog(&g_FrWeaponListMenuDialog, MENUROOT_TRAINING); + menu_push_root_dialog(&g_FrWeaponListMenuDialog, MENUROOT_TRAINING); } handled = true; @@ -4898,11 +4898,11 @@ bool soloChoosePauseDialog(void) } if (!handled) { - menuPushRootDialog(&g_CiMenuViaPauseMenuDialog, MENUROOT_MAINMENU); + menu_push_root_dialog(&g_CiMenuViaPauseMenuDialog, MENUROOT_MAINMENU); return true; } } else { - menuPushRootDialog(&g_SoloMissionPauseMenuDialog, MENUROOT_MAINMENU); + menu_push_root_dialog(&g_SoloMissionPauseMenuDialog, MENUROOT_MAINMENU); } return true; diff --git a/src/game/menu.c b/src/game/menu.c index 898962604..9d7f0771e 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -130,7 +130,7 @@ char *g_StringPointer2 = &g_CheatMarqueeString[VERSION >= VERSION_PAL_FINAL ? 15 s32 g_MpPlayerNum = 0; -void menuPlaySound(s32 menusound) +void menu_play_sound(s32 menusound) { s32 sound = -1; s32 setpitch = false; @@ -188,7 +188,7 @@ void menuPlaySound(s32 menusound) osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); #endif - handle = sndStart(var80095200, sound, NULL, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, sound, NULL, -1, -1, -1, -1, -1); if (handle && setpitch) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(s32 *)&pitch); @@ -204,7 +204,7 @@ void menuPlaySound(s32 menusound) } } -bool menuIsSoloMissionOrMp(void) +bool menu_is_solo_mission_or_mp(void) { switch (g_MenuData.root) { case MENUROOT_MAINMENU: @@ -221,11 +221,11 @@ bool menuIsSoloMissionOrMp(void) return false; } -bool currentPlayerIsMenuOpenInSoloOrMp(void) +bool current_player_is_menu_open_in_solo_or_mp(void) { s32 mpindex = g_Vars.currentplayerstats->mpindex; - if (menuIsSoloMissionOrMp()) { + if (menu_is_solo_mission_or_mp()) { if (mpindex >= 4) { mpindex -= 4; } @@ -247,7 +247,7 @@ bool func0f0f0c68(void) return true; } -void menuSetBanner(s32 bannernum, bool allplayers) +void menu_set_banner(s32 bannernum, bool allplayers) { if (allplayers) { g_MenuData.bannernum = bannernum; @@ -258,9 +258,9 @@ void menuSetBanner(s32 bannernum, bool allplayers) } #if VERSION >= VERSION_NTSC_1_0 -Gfx *menuRenderBanner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum, s32 arg7, s32 arg8) +Gfx *menu_render_banner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum, s32 arg7, s32 arg8) #else -Gfx *menuRenderBanner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum) +Gfx *menu_render_banner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum) #endif { s32 midx; @@ -313,10 +313,10 @@ Gfx *menuRenderBanner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 ms y = (y1 + y2) / 2; - textMeasure(&textheight, &textwidth, langGet(msgs[msgnum]), chars, font, 0); + text_measure(&textheight, &textwidth, lang_get(msgs[msgnum]), chars, font, 0); // "Please Wait..." - textMeasure(&waitheight, &waitwidth, langGet(L_MPMENU_495), chars, font, 0); + text_measure(&waitheight, &waitwidth, lang_get(L_MPMENU_495), chars, font, 0); #if VERSION >= VERSION_NTSC_1_0 && VERSION < VERSION_JPN_FINAL if (msgs[msgnum] == L_MPMENU_491) { // "Checking Controller Pak" @@ -331,17 +331,17 @@ Gfx *menuRenderBanner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 ms bannerbottom = y + textheight + waitheight + 7; // Black fill - gdl = textSetPrimColour(gdl, 0x0000007f); + gdl = text_set_prim_colour(gdl, 0x0000007f); gDPFillRectangleScaled(gdl++, x1, y1, x2, y2); gdl = text0f153838(gdl); // Dark blue fill - gdl = textSetPrimColour(gdl, 0x00007f7f); + gdl = text_set_prim_colour(gdl, 0x00007f7f); gDPFillRectangleScaled(gdl++, x1, bannertop, x2, bannerbottom); gdl = text0f153838(gdl); // Top and bottom borders (light blue) - gdl = textSetPrimColour(gdl, 0x7f7fff7f); + gdl = text_set_prim_colour(gdl, 0x7f7fff7f); gDPFillRectangleScaled(gdl++, x1, bannerbottom + 2, x2, bannerbottom + 4); gDPFillRectangleScaled(gdl++, x1, bannertop - 4, x2, bannertop - 2); gdl = text0f153838(gdl); @@ -351,34 +351,34 @@ Gfx *menuRenderBanner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 ms // Render the selected message's shadow x = midx - textwidth / 2 + 2; y += 2; - gdl = textRenderProjected(gdl, &x, &y, langGet(msgs[msgnum]), - chars, font, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(msgs[msgnum]), + chars, font, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); // Render "Please Wait..." shadow x = midx - waitwidth / 2 + 2; y += 3; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_495), - chars, font, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(L_MPMENU_495), + chars, font, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); // Render the selected message proper x = midx - textwidth / 2; y = texttop; - gdl = textRenderProjected(gdl, &x, &y, langGet(msgs[msgnum]), - chars, font, 0xbfbfffff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(msgs[msgnum]), + chars, font, 0xbfbfffff, vi_get_width(), vi_get_width(), 0, 0); // Render "Please Wait..." proper x = midx - waitwidth / 2; y += 3; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_495), - chars, font, 0xbfbfffff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(L_MPMENU_495), + chars, font, 0xbfbfffff, vi_get_width(), vi_get_width(), 0, 0); #if VERSION >= VERSION_NTSC_1_0 && VERSION < VERSION_JPN_FINAL if (msgs[msgnum] == L_MPMENU_491) { // "Checking Controller Pak" // Render "TM" y = texttop - 1; x = textwidth / 2 + midx - 7; - gdl = textRenderProjected(gdl, &x, &y, "TM", - g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xbfbfffff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, "TM", + g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xbfbfffff, vi_get_width(), vi_get_width(), 0, 0); } #endif @@ -452,7 +452,7 @@ void func0f0f1494(void) } } -char *menuResolveText(uintptr_t thing, void *dialogoritem) +char *menu_resolve_text(uintptr_t thing, void *dialogoritem) { char *(*handler)(void *dialogoritem) = (void *)thing; @@ -463,7 +463,7 @@ char *menuResolveText(uintptr_t thing, void *dialogoritem) // Text ID if (thing < 0x5a00) { - return langGet((u32)thing); + return lang_get((u32)thing); } if (thing > (uintptr_t)func0f1a78b0) { @@ -481,17 +481,17 @@ char *menuResolveText(uintptr_t thing, void *dialogoritem) return ""; } -char *menuResolveParam2Text(struct menuitem *item) +char *menu_resolve_param2_text(struct menuitem *item) { - return menuResolveText(item->param2, item); + return menu_resolve_text(item->param2, item); } -char *menuResolveDialogTitle(struct menudialogdef *dialogdef) +char *menu_resolve_dialog_title(struct menudialogdef *dialogdef) { - return menuResolveText(dialogdef->title, dialogdef); + return menu_resolve_text(dialogdef->title, dialogdef); } -void menuGetItemBlocksRequired(struct menuitem *item, s32 *numwords) +void menu_get_item_blocks_required(struct menuitem *item, s32 *numwords) { switch (item->type) { case MENUITEMTYPE_SLIDER: @@ -528,7 +528,7 @@ void menuGetItemBlocksRequired(struct menuitem *item, s32 *numwords) } } -void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struct menudialog *dialog) +void menu_calculate_item_size(struct menuitem *item, s16 *width, s16 *height, struct menudialog *dialog) { char *text; s32 textwidth; @@ -603,7 +603,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc #endif break; case MENUITEMTYPE_DROPDOWN: - text = menuResolveParam2Text(item); + text = menu_resolve_param2_text(item); if (text && strcmp(text, "") == 0) { *width = 0; @@ -613,7 +613,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc textheight = 0; if (text != NULL) { - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); } *width = textwidth + 20; @@ -624,7 +624,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc item->handler(MENUOP_GETSELECTEDINDEX, item, &handlerdata2); handlerdata2.dropdown.unk04 = 0; text2 = (char *)item->handler(MENUOP_GETOPTIONTEXT, item, &handlerdata2); - textMeasure(&textheight, &textwidth, text2, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text2, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); #if VERSION >= VERSION_PAL_FINAL if ((item->flags & MENUITEMFLAG_ADJUSTWIDTH) == 0) { @@ -663,7 +663,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc font = g_FontHandelGothicXs; } - text = menuResolveParam2Text(item); + text = menu_resolve_param2_text(item); if (text == NULL) { *width = 120; @@ -671,7 +671,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc *width = 0; *height = 0; } else { - textMeasure(&textheight, &textwidth, text, chars, font, 0); + text_measure(&textheight, &textwidth, text, chars, font, 0); *width = (s16)textwidth + 34; } *height = VERSION == VERSION_JPN_FINAL ? 14 : 12; @@ -701,7 +701,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc break; case MENUITEMTYPE_LABEL: case MENUITEMTYPE_SELECTABLE: - text = menuResolveParam2Text(item); + text = menu_resolve_param2_text(item); if (text == NULL) { *width = 0; @@ -723,7 +723,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc *height = 0; *width = *height; } else { - textMeasure(&textheight, &textwidth, text, chars, font, 0); + text_measure(&textheight, &textwidth, text, chars, font, 0); *width = (s16)textwidth + 8; if ((item->flags & (MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_ADJUSTWIDTH)) == 0) { @@ -741,11 +741,11 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc #endif if ((item->flags & (MENUITEMFLAG_LABEL_HASRIGHTTEXT | MENUITEMFLAG_BIGFONT)) == 0) { - text = menuResolveText(item->param3, item); + text = menu_resolve_text(item->param3, item); // @bug: This is not how you check for an empty string if (text != NULL && text != "") { - textMeasure(&textheight, &textwidth, text, chars, font, 0); + text_measure(&textheight, &textwidth, text, chars, font, 0); *width += textwidth + 5; if (item->flags & MENUITEMFLAG_ADJUSTWIDTH) { @@ -773,7 +773,7 @@ void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struc *width = 240; for (i = 0; i < ARRAYCOUNT(g_Briefing.objectivenames); i++) { - if (g_Briefing.objectivenames[i] && (g_Briefing.objectivedifficulties[i] & (1 << lvGetDifficulty()))) { + if (g_Briefing.objectivenames[i] && (g_Briefing.objectivedifficulties[i] & (1 << lv_get_difficulty()))) { numobjectives++; } } @@ -888,7 +888,7 @@ void func0f0f1d6c(struct menudialogdef *dialogdef, struct menudialog *dialog, st } numblocksthisitem = -1; - menuGetItemBlocksRequired(item, &numblocksthisitem); + menu_get_item_blocks_required(item, &numblocksthisitem); if (numblocksthisitem != -1) { menu->rows[rowindex].blockindex = blockindex; @@ -963,7 +963,7 @@ void dialog0f0f1ef4(struct menudialog *dialog) } } -void dialogCalculateContentSize(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu) +void dialog_calculate_content_size(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu) { s32 contentheight; s32 rowindex; @@ -996,7 +996,7 @@ void dialogCalculateContentSize(struct menudialogdef *dialogdef, struct menudial rowindex = menu->cols[colindex].rowstart; } - menuCalculateItemSize(item, &width, &height, dialog); + menu_calculate_item_size(item, &width, &height, dialog); if (width > menu->cols[colindex].width) { menu->cols[colindex].width = width; @@ -1035,7 +1035,7 @@ void dialogCalculateContentSize(struct menudialogdef *dialogdef, struct menudial // Calculate and consider the title width. // Some of the multiplayer dialogs have a player number // in the top right, so extra space is considered for those. - textMeasure(&textheight, &textwidth, menuResolveDialogTitle(dialog->definition), g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, menu_resolve_dialog_title(dialog->definition), g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); titleextra = 8; @@ -1060,7 +1060,7 @@ void dialogCalculateContentSize(struct menudialogdef *dialogdef, struct menudial * Find the given item in the given dialog, and write its column and row indices * to the given pointers. Return the y value of the item relative to the dialog. */ -s32 dialogFindItem(struct menudialog *dialog, struct menuitem *item, s32 *rowindex, s32 *colindex) +s32 dialog_find_item(struct menudialog *dialog, struct menuitem *item, s32 *rowindex, s32 *colindex) { for (*colindex = dialog->colstart; *colindex < dialog->colstart + dialog->numcols; *colindex += 1) { s32 y = 0; @@ -1088,7 +1088,7 @@ s32 dialogFindItem(struct menudialog *dialog, struct menuitem *item, s32 *rowind * If this returns true, the scrollable is rendered with less padding and * scrolling is disabled. */ -bool menuIsScrollableUnscrollable(struct menuitem *item) +bool menu_is_scrollable_unscrollable(struct menuitem *item) { if (item->type == MENUITEMTYPE_SCROLLABLE) { if (item->param == DESCRIPTION_MPCONFIG @@ -1103,7 +1103,7 @@ bool menuIsScrollableUnscrollable(struct menuitem *item) return false; } -bool menuIsItemDisabled(struct menuitem *item, struct menudialog *dialog) +bool menu_is_item_disabled(struct menuitem *item, struct menudialog *dialog) { union handlerdata sp30; s16 width; @@ -1114,11 +1114,11 @@ bool menuIsItemDisabled(struct menuitem *item, struct menudialog *dialog) return true; } - if (mpIsPlayerLockedOut(g_MpPlayerNum) && item->flags & MENUITEMFLAG_LOCKABLEMAJOR) { + if (mp_is_player_locked_out(g_MpPlayerNum) && item->flags & MENUITEMFLAG_LOCKABLEMAJOR) { return true; } - if (menuIsScrollableUnscrollable(item)) { + if (menu_is_scrollable_unscrollable(item)) { return true; } @@ -1128,7 +1128,7 @@ bool menuIsItemDisabled(struct menuitem *item, struct menudialog *dialog) return true; } - menuCalculateItemSize(item, &width, &height, dialog); + menu_calculate_item_size(item, &width, &height, dialog); if (height == 0) { return true; @@ -1137,7 +1137,7 @@ bool menuIsItemDisabled(struct menuitem *item, struct menudialog *dialog) return false; } -bool menuIsItemFocusable(struct menuitem *item, struct menudialog *dialog, s32 arg2) +bool menu_is_item_focusable(struct menuitem *item, struct menudialog *dialog, s32 arg2) { s32 rowindex; s32 colindex; @@ -1157,17 +1157,17 @@ bool menuIsItemFocusable(struct menuitem *item, struct menudialog *dialog, s32 a case MENUITEMTYPE_14: case MENUITEMTYPE_16: case MENUITEMTYPE_18: - dialogFindItem(dialog, item, &rowindex, &colindex); + dialog_find_item(dialog, item, &rowindex, &colindex); } - if (menuIsItemDisabled(item, dialog)) { + if (menu_is_item_disabled(item, dialog)) { return false; } return true; } -struct menuitem *dialogFindItemAtColY(s32 targety, s32 colindex, struct menudialogdef *dialogdef, s32 *rowindexptr, struct menudialog *dialog) +struct menuitem *dialog_find_item_at_col_y(s32 targety, s32 colindex, struct menudialogdef *dialogdef, s32 *rowindexptr, struct menudialog *dialog) { struct menuitem *result = NULL; bool done = false; @@ -1178,7 +1178,7 @@ struct menuitem *dialogFindItemAtColY(s32 targety, s32 colindex, struct menudial for (i = 0, y = 0; !done && i < g_Menus[g_MpPlayerNum].cols[colindex].numrows; rowindex++, i++) { struct menuitem *item = &dialogdef->items[g_Menus[g_MpPlayerNum].rows[rowindex].itemindex]; - if (menuIsItemFocusable(item, dialog, 1)) { + if (menu_is_item_focusable(item, dialog, 1)) { result = item; if (y >= targety) { @@ -1194,14 +1194,14 @@ struct menuitem *dialogFindItemAtColY(s32 targety, s32 colindex, struct menudial return result; } -struct menuitem *dialogFindFirstItem(struct menudialog *dialog) +struct menuitem *dialog_find_first_item(struct menudialog *dialog) { s32 i; s32 colindex = dialog->colstart; s32 rowindex; for (i = 0; i < dialog->numcols; i++) { - struct menuitem *item = dialogFindItemAtColY(0, colindex, dialog->definition, &rowindex, dialog); + struct menuitem *item = dialog_find_item_at_col_y(0, colindex, dialog->definition, &rowindex, dialog); if (item != NULL) { return item; @@ -1210,19 +1210,19 @@ struct menuitem *dialogFindFirstItem(struct menudialog *dialog) colindex++; } - menuResolveDialogTitle(dialog->definition); + menu_resolve_dialog_title(dialog->definition); return dialog->definition->items; } -struct menuitem *dialogFindFirstItemRight(struct menudialog *dialog) +struct menuitem *dialog_find_first_item_right(struct menudialog *dialog) { s32 i; s32 colindex = dialog->colstart + dialog->numcols - 1; s32 rowindex; for (i = 0; i < dialog->numcols; i++) { - struct menuitem *item = dialogFindItemAtColY(0, colindex, dialog->definition, &rowindex, dialog); + struct menuitem *item = dialog_find_item_at_col_y(0, colindex, dialog->definition, &rowindex, dialog); if (item != NULL) { return item; @@ -1231,12 +1231,12 @@ struct menuitem *dialogFindFirstItemRight(struct menudialog *dialog) colindex--; } - menuResolveDialogTitle(dialog->definition); + menu_resolve_dialog_title(dialog->definition); return dialog->definition->items; } -void dialogChangeItemFocusVertically(struct menudialog *dialog, s32 updown) +void dialog_change_item_focus_vertically(struct menudialog *dialog, s32 updown) { s32 rowindex; s32 colindex; @@ -1246,7 +1246,7 @@ void dialogChangeItemFocusVertically(struct menudialog *dialog, s32 updown) s32 start; s32 end; - dialogFindItem(dialog, dialog->focuseditem, &rowindex, &colindex); + dialog_find_item(dialog, dialog->focuseditem, &rowindex, &colindex); startrowindex = rowindex; @@ -1265,7 +1265,7 @@ void dialogChangeItemFocusVertically(struct menudialog *dialog, s32 updown) item = &dialog->definition->items[g_Menus[g_MpPlayerNum].rows[rowindex].itemindex]; - if (menuIsItemFocusable(item, dialog, updown)) { + if (menu_is_item_focusable(item, dialog, updown)) { done = true; } @@ -1277,13 +1277,13 @@ void dialogChangeItemFocusVertically(struct menudialog *dialog, s32 updown) dialog->focuseditem = item; } -s32 dialogChangeItemFocusHorizontally(struct menudialog *dialog, s32 leftright) +s32 dialog_change_item_focus_horizontally(struct menudialog *dialog, s32 leftright) { s32 rowindex; s32 colindex; bool done = false; s32 swipedir = 0; - s32 y = dialogFindItem(dialog, dialog->focuseditem, &rowindex, &colindex); + s32 y = dialog_find_item(dialog, dialog->focuseditem, &rowindex, &colindex); s32 startcolindex = colindex; struct menuitem *item; @@ -1300,7 +1300,7 @@ s32 dialogChangeItemFocusHorizontally(struct menudialog *dialog, s32 leftright) colindex = dialog->colstart + dialog->numcols - 1; } - item = dialogFindItemAtColY(y, colindex, dialog->definition, &rowindex, dialog); + item = dialog_find_item_at_col_y(y, colindex, dialog->definition, &rowindex, dialog); if (item) { done = true; @@ -1318,7 +1318,7 @@ s32 dialogChangeItemFocusHorizontally(struct menudialog *dialog, s32 leftright) return swipedir; } -s32 dialogChangeItemFocus(struct menudialog *dialog, s32 leftright, s32 updown) +s32 dialog_change_item_focus(struct menudialog *dialog, s32 leftright, s32 updown) { s32 swipedir = 0; @@ -1327,11 +1327,11 @@ s32 dialogChangeItemFocus(struct menudialog *dialog, s32 leftright, s32 updown) } if (updown != 0) { - dialogChangeItemFocusVertically(dialog, updown); + dialog_change_item_focus_vertically(dialog, updown); } if (leftright != 0) { - swipedir = dialogChangeItemFocusHorizontally(dialog, leftright); + swipedir = dialog_change_item_focus_horizontally(dialog, leftright); } if (dialog->focuseditem != 0) { @@ -1346,7 +1346,7 @@ s32 dialogChangeItemFocus(struct menudialog *dialog, s32 leftright, s32 updown) return swipedir; } -void menuOpenDialog(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu) +void menu_open_dialog(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu) { union handlerdata data3; struct menuitem *item; @@ -1368,7 +1368,7 @@ void menuOpenDialog(struct menudialogdef *dialogdef, struct menudialog *dialog, } func0f0f1d6c(dialogdef, dialog, menu); - dialogInitItems(dialog); + dialog_init_items(dialog); dialog->type = dialogdef->type; dialog->transitionfrac = -1; @@ -1382,7 +1382,7 @@ void menuOpenDialog(struct menudialogdef *dialogdef, struct menudialog *dialog, dialog->unk58 = 0; dialog->unk5c = 0; - dialog->focuseditem = dialogFindFirstItem(dialog); + dialog->focuseditem = dialog_find_first_item(dialog); // Check if any items should be focused automatically item = dialog->definition->items; @@ -1412,8 +1412,8 @@ void menuOpenDialog(struct menudialogdef *dialogdef, struct menudialog *dialog, dialogdef->handler(MENUOP_OPEN, dialogdef, &data3); } - dialogCalculateContentSize(dialogdef, dialog, menu); - dialogCalculatePosition(dialog); + dialog_calculate_content_size(dialogdef, dialog, menu); + dialog_calculate_position(dialog); dialog->x = dialog->dstx; dialog->y = dialog->dsty; @@ -1421,10 +1421,10 @@ void menuOpenDialog(struct menudialogdef *dialogdef, struct menudialog *dialog, dialog->height = dialog->dstheight; } -void menuPushDialog(struct menudialogdef *dialogdef) +void menu_push_dialog(struct menudialogdef *dialogdef) { if (dialogdef) { - menuUnsetModel(&g_Menus[g_MpPlayerNum].menumodel); + menu_unset_model(&g_Menus[g_MpPlayerNum].menumodel); if (g_Menus[g_MpPlayerNum].depth < 6 && g_Menus[g_MpPlayerNum].numdialogs < ARRAYCOUNT(g_Menus[0].dialogs)) { struct menulayer *layer = &g_Menus[g_MpPlayerNum].layers[g_Menus[g_MpPlayerNum].depth]; @@ -1442,10 +1442,10 @@ void menuPushDialog(struct menudialogdef *dialogdef) g_Menus[g_MpPlayerNum].curdialog = dialog; dialog->swipedir = 0; - menuOpenDialog(dialogdef, dialog, &g_Menus[g_MpPlayerNum]); + menu_open_dialog(dialogdef, dialog, &g_Menus[g_MpPlayerNum]); - dialog->dstx = (viGetWidth() - dialog->width) / 2; - dialog->dsty = (viGetHeight() - dialog->height) / 2; + dialog->dstx = (vi_get_width() - dialog->width) / 2; + dialog->dsty = (vi_get_height() - dialog->height) / 2; g_Menus[g_MpPlayerNum].fm.unke40_00 = true; sibling = dialogdef->nextsibling; @@ -1463,10 +1463,10 @@ void menuPushDialog(struct menudialogdef *dialogdef) dialog->swipedir = -1; - menuOpenDialog(sibling, dialog, &g_Menus[g_MpPlayerNum]); + menu_open_dialog(sibling, dialog, &g_Menus[g_MpPlayerNum]); dialog->dstx = dialog->x = -SCREEN_320; - dialog->dsty = dialog->y = (viGetHeight() - dialog->height) / 2; + dialog->dsty = dialog->y = (vi_get_height() - dialog->height) / 2; dialog->type = 0; sibling = sibling->nextsibling; @@ -1475,14 +1475,14 @@ void menuPushDialog(struct menudialogdef *dialogdef) if (sibling); - menuPlaySound(MENUSOUND_OPENDIALOG); + menu_play_sound(MENUSOUND_OPENDIALOG); if (dialogdef->type == MENUDIALOGTYPE_DANGER) { - menuPlaySound(MENUSOUND_ERROR); + menu_play_sound(MENUSOUND_ERROR); } if (dialogdef->type == MENUDIALOGTYPE_SUCCESS) { - menuPlaySound(MENUSOUND_SUCCESS); + menu_play_sound(MENUSOUND_SUCCESS); } } } @@ -1518,14 +1518,14 @@ bool func0f0f3220(s32 arg0) } if (save) { - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); } g_MpPlayerNum = prevplayernum; } else if (g_MenuData.unk669[arg0] < 4) { s32 prevplayernum = g_MpPlayerNum; g_MpPlayerNum = g_MenuData.unk669[arg0]; - filemgrSaveOrLoad(&g_PlayerConfigsArray[g_MpPlayerNum].fileguid, FILEOP_SAVE_MPPLAYER, g_MpPlayerNum); + filemgr_save_or_load(&g_PlayerConfigsArray[g_MpPlayerNum].fileguid, FILEOP_SAVE_MPPLAYER, g_MpPlayerNum); save = true; g_MpPlayerNum = prevplayernum; } @@ -1550,13 +1550,13 @@ void func0f0f3220(s32 arg0) } } - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); g_MpPlayerNum = prevplayernum; } else if (g_MenuData.unk669[arg0] < 4) { s32 prevplayernum = g_MpPlayerNum; g_MpPlayerNum = g_MenuData.unk669[arg0]; - filemgrSaveOrLoad(&g_PlayerConfigsArray[g_MpPlayerNum].fileguid, FILEOP_SAVE_MPPLAYER, g_MpPlayerNum); + filemgr_save_or_load(&g_PlayerConfigsArray[g_MpPlayerNum].fileguid, FILEOP_SAVE_MPPLAYER, g_MpPlayerNum); g_MpPlayerNum = prevplayernum; } @@ -1564,7 +1564,7 @@ void func0f0f3220(s32 arg0) } #endif -void menuCloseDialog(void) +void menu_close_dialog(void) { if (g_Menus[g_MpPlayerNum].depth > 0) { union handlerdata data; @@ -1593,7 +1593,7 @@ void menuCloseDialog(void) g_Menus[g_MpPlayerNum].blockend = layer->siblings[0]->blockstart; g_Menus[g_MpPlayerNum].depth--; - menuPlaySound(MENUSOUND_0B); + menu_play_sound(MENUSOUND_0B); } #if VERSION >= VERSION_NTSC_1_0 @@ -1618,14 +1618,14 @@ void menuCloseDialog(void) } } -void menuUpdateCurFrame(void) +void menu_update_cur_frame(void) { s32 depth = g_Menus[g_MpPlayerNum].depth; if (depth == 0) { // No more parent menus - return control to the player g_Vars.currentplayer->joybutinhibit = 0xffffffff; - menuClose(); + menu_close(); g_Menus[g_MpPlayerNum].curdialog = NULL; } else { // Set up parent menu @@ -1634,19 +1634,19 @@ void menuUpdateCurFrame(void) } } -void menuPopDialog(void) +void menu_pop_dialog(void) { - menuCloseDialog(); - menuUpdateCurFrame(); + menu_close_dialog(); + menu_update_cur_frame(); } void func0f0f3704(struct menudialogdef *dialogdef) { - menuCloseDialog(); - menuPushDialog(dialogdef); + menu_close_dialog(); + menu_push_dialog(dialogdef); } -void menuConfigureModel(struct menumodel *menumodel, f32 x, f32 y, f32 z, f32 rotx, f32 roty, f32 rotz, f32 scale, u8 flags) +void menu_configure_model(struct menumodel *menumodel, f32 x, f32 y, f32 z, f32 rotx, f32 roty, f32 rotz, f32 scale, u8 flags) { menumodel->configuring = true; @@ -1670,10 +1670,10 @@ void menuConfigureModel(struct menumodel *menumodel, f32 x, f32 y, f32 z, f32 ro menumodel->configurefrac = 0.0f; } -void menuUnsetModel(struct menumodel *menumodel) +void menu_unset_model(struct menumodel *menumodel) { if (menumodel->curparams == 0x4fac5ace) { - challengeUnsetCurrent(); + challenge_unset_current(); } menumodel->loaddelay = 0; @@ -1712,7 +1712,7 @@ Lights1 var80071468 = gdSPDefLights1(0x96, 0x96, 0x96, 0xff, 0xff, 0xff, 0xb2, 0 /** * Render the hudpiece as well as any models within dialogs. */ -Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) +Gfx *menu_render_model(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) { f32 rotx; f32 roty; @@ -1735,9 +1735,9 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) } if (menumodel->allocstart == NULL) { - if (bgunChangeGunMem(GUNMEMOWNER_INVMENU)) { - menumodel->allocstart = bgunGetGunMem(); - menumodel->alloclen = bgunCalculateGunMemCapacity(); + if (bgun_change_gun_mem(GUNMEMOWNER_INVMENU)) { + menumodel->allocstart = bgun_get_gun_mem(); + menumodel->alloclen = bgun_calculate_gun_mem_capacity(); } else { return gdl; } @@ -1755,7 +1755,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) menumodel->loaddelay = 0; } else { if (menumodel->curparams == 0x4fac5ace) { - challengeUnsetCurrent(); + challenge_unset_current(); } if (menumodel->loaddelay == 0) { @@ -1773,20 +1773,20 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) } else { s32 mpheadnum = MENUMODELPARAMS_GET_MP_HEADNUM(menumodel->newparams); s32 mpbodynum = MENUMODELPARAMS_GET_MP_BODYNUM(menumodel->newparams); - bodynum = mpGetBodyId(mpbodynum); + bodynum = mp_get_body_id(mpbodynum); - if (mpheadnum < mpGetNumHeads2()) { - headnum = mpGetHeadId(mpheadnum); + if (mpheadnum < mp_get_num_heads2()) { + headnum = mp_get_head_id(mpheadnum); } else { - headnum = func0f14a9f8(mpheadnum - mpGetNumHeads2()); - headnum = mpGetBeauHeadId(headnum); - menumodel->perfectheadnum = (mpheadnum - mpGetNumHeads2()) & 0xff; + headnum = func0f14a9f8(mpheadnum - mp_get_num_heads2()); + headnum = mp_get_beau_head_id(headnum); + menumodel->perfectheadnum = (mpheadnum - mp_get_num_heads2()) & 0xff; } } bodyfilenum = g_HeadsAndBodies[bodynum].filenum; - totalfilelen = fileGetInflatedSize(bodyfilenum); + totalfilelen = file_get_inflated_size(bodyfilenum); totalfilelen = ALIGN64(totalfilelen); if (g_HeadsAndBodies[bodynum].unk00_01) { @@ -1794,49 +1794,49 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) headfilenum = 0xffff; } else { headfilenum = g_HeadsAndBodies[headnum].filenum; - totalfilelen += ALIGN64(fileGetInflatedSize(headfilenum)); + totalfilelen += ALIGN64(file_get_inflated_size(headfilenum)); } totalfilelen += 0x4000; - texInitPool(&texpool, menumodel->allocstart + totalfilelen, menumodel->alloclen - totalfilelen); + tex_init_pool(&texpool, menumodel->allocstart + totalfilelen, menumodel->alloclen - totalfilelen); menumodel->headnum = headnum; menumodel->bodynum = bodynum; - menumodel->bodymodeldef = modeldefLoad(bodyfilenum, menumodel->allocstart, totalfilelen, &texpool); - bodyfilelen2 = ALIGN64(fileGetLoadedSize(bodyfilenum)); - modelAllocateRwData(menumodel->bodymodeldef); + menumodel->bodymodeldef = modeldef_load(bodyfilenum, menumodel->allocstart, totalfilelen, &texpool); + bodyfilelen2 = ALIGN64(file_get_loaded_size(bodyfilenum)); + model_allocate_rw_data(menumodel->bodymodeldef); if (headnum < 0) { menumodel->headmodeldef = NULL; } else { - menumodel->headmodeldef = modeldefLoad(headfilenum, menumodel->allocstart + bodyfilelen2, totalfilelen - bodyfilelen2, &texpool); - fileGetLoadedSize(headfilenum); - bodyCalculateHeadOffset(menumodel->headmodeldef, headnum, bodynum); - modelAllocateRwData(menumodel->headmodeldef); + menumodel->headmodeldef = modeldef_load(headfilenum, menumodel->allocstart + bodyfilelen2, totalfilelen - bodyfilelen2, &texpool); + file_get_loaded_size(headfilenum); + body_calculate_head_offset(menumodel->headmodeldef, headnum, bodynum); + model_allocate_rw_data(menumodel->headmodeldef); } - modelInit(&menumodel->bodymodel, menumodel->bodymodeldef, menumodel->rwdata, true); - animInit(&menumodel->bodyanim); + model_init(&menumodel->bodymodel, menumodel->bodymodeldef, menumodel->rwdata, true); + anim_init(&menumodel->bodyanim); menumodel->bodymodel.rwdatalen = 256; menumodel->bodymodel.anim = &menumodel->bodyanim; body0f02ce8c(bodynum, headnum, menumodel->bodymodeldef, menumodel->headmodeldef, totalfilelen * 0, &menumodel->bodymodel, false, 1); } else { - totalfilelen = ALIGN64(fileGetInflatedSize(menumodel->newparams)) + 0x4000; + totalfilelen = ALIGN64(file_get_inflated_size(menumodel->newparams)) + 0x4000; if (1); - texInitPool(&texpool, &menumodel->allocstart[(u32)totalfilelen], menumodel->alloclen - totalfilelen); + tex_init_pool(&texpool, &menumodel->allocstart[(u32)totalfilelen], menumodel->alloclen - totalfilelen); menumodel->headnum = -1; menumodel->bodynum = -1; - menumodel->bodymodeldef = modeldefLoad(menumodel->newparams, menumodel->allocstart, totalfilelen, &texpool); + menumodel->bodymodeldef = modeldef_load(menumodel->newparams, menumodel->allocstart, totalfilelen, &texpool); - fileGetLoadedSize(menumodel->newparams); - modelAllocateRwData(menumodel->bodymodeldef); - modelInit(&menumodel->bodymodel, menumodel->bodymodeldef, menumodel->rwdata, true); - animInit(&menumodel->bodyanim); + file_get_loaded_size(menumodel->newparams); + model_allocate_rw_data(menumodel->bodymodeldef); + model_init(&menumodel->bodymodel, menumodel->bodymodeldef, menumodel->rwdata, true); + anim_init(&menumodel->bodyanim); menumodel->bodymodel.rwdatalen = 256; menumodel->bodymodel.anim = &menumodel->bodyanim; @@ -1869,13 +1869,13 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) // Most models use the z-buffer and a scissor. // Types 2 and 3 are unused. Type 4 is the credits scrolling logo. if (modeltype < MENUMODELTYPE_3 && g_MenuData.usezbuf) { - gdl = viPrepareZbuf(gdl); + gdl = vi_prepare_zbuf(gdl); gdl = vi0000b1d0(gdl); g_MenuData.usezbuf = false; if (modeltype != MENUMODELTYPE_2) { - gdl = menuApplyScissor(gdl); + gdl = menu_apply_scissor(gdl); } gSPSetGeometryMode(gdl++, G_ZBUFFER); @@ -1891,11 +1891,11 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) dodefaultzoom = true; if (menumodel->bodymodeldef->skel == &g_SkelChr) { - struct modelnode *node = modelGetPart(menumodel->bodymodeldef, MODELPART_CHR_0006); + struct modelnode *node = model_get_part(menumodel->bodymodeldef, MODELPART_CHR_0006); if (node) { struct modelrodata_position *rodata = &node->rodata->position; - f32 frac = menuGetLinearOscPauseFrac(menumodel->zoomtimer60 / TICKS(480.0f)); + f32 frac = menu_get_linear_osc_pause_frac(menumodel->zoomtimer60 / TICKS(480.0f)); zoompos.f[0] = 0.0f; zoompos.f[1] = 0.0f - (rodata->pos.f[1] / 7.6f * (1.0f - frac * frac)); @@ -1908,14 +1908,14 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) dodefaultzoom = false; - modelFindBboxRodata(&menumodel->bodymodel); + model_find_bbox_rodata(&menumodel->bodymodel); } if (1); } if (dodefaultzoom) { - struct modelrodata_bbox *bbox = modelFindBboxRodata(&menumodel->bodymodel); + struct modelrodata_bbox *bbox = model_find_bbox_rodata(&menumodel->bodymodel); if (bbox) { zoompos.x = -(bbox->xmax - ((bbox->xmax - bbox->xmin) * 0.5f)); @@ -1927,7 +1927,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) } } - mtx4LoadIdentity(&rotmtx); + mtx4_load_identity(&rotmtx); // For the hudpiece, tween the position and scale to the new values and apply rotation. if (modeltype == MENUMODELTYPE_HUDPIECE) { @@ -1979,7 +1979,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) tmpcoord.y = roty; tmpcoord.z = rotz; - mtx4LoadRotation(&tmpcoord, &rotmtx); + mtx4_load_rotation(&tmpcoord, &rotmtx); } } else { // If the caller is reconfiguring the model's position, rotation or scale, tween towards the new values. @@ -2033,8 +2033,8 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) tmprot.z = menumodel->newrotz; quaternion0f096ca0(&tmprot, sp2ac); - quaternionSlerp(sp2bc, sp2ac, fracnew, sp29c); - quaternionToMtx(sp29c, &rotmtx); + quaternion_slerp(sp2bc, sp2ac, fracnew, sp29c); + quaternion_to_mtx(sp29c, &rotmtx); } else { menumodel->currotx = rotx = menumodel->newrotx; menumodel->curroty = roty = menumodel->newroty; @@ -2044,7 +2044,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) tmpcoord.y = roty; tmpcoord.z = rotz; - mtx4LoadRotation(&tmpcoord, &rotmtx); + mtx4_load_rotation(&tmpcoord, &rotmtx); } } } @@ -2066,7 +2066,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) tmpcoord.y = roty; tmpcoord.z = rotz; - mtx4LoadRotation(&tmpcoord, &rotmtx); + mtx4_load_rotation(&tmpcoord, &rotmtx); } } @@ -2078,23 +2078,23 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) screenpos[1] = menumodel->curposy; } } else { - screenpos[0] = posx * g_ScaleX + viGetViewLeft() + viGetViewWidth() * 0.5f; - screenpos[1] = posy + viGetViewTop() + viGetViewHeight() * 0.5f; + screenpos[0] = posx * g_ScaleX + vi_get_view_left() + vi_get_view_width() * 0.5f; + screenpos[1] = posy + vi_get_view_top() + vi_get_view_height() * 0.5f; } cam0f0b4c3c(screenpos, &tmpcoord, 1.0f); - mtx4LoadIdentity(&posmtx); + mtx4_load_identity(&posmtx); // Show or hide model parts according to the visibility list if (menumodel->partvisibility != NULL) { struct modelpartvisibility *ptr = menumodel->partvisibility; while (ptr->part != 255) { - struct modelnode *node = modelGetPart(menumodel->bodymodeldef, ptr->part); + struct modelnode *node = model_get_part(menumodel->bodymodeldef, ptr->part); if (node) { - union modelrwdata *rwdata = modelGetNodeRwData(&menumodel->bodymodel, node); + union modelrwdata *rwdata = model_get_node_rw_data(&menumodel->bodymodel, node); if (rwdata) { if (ptr->visible) { @@ -2127,17 +2127,17 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) struct coord newpos = {0, 0, 0}; u32 stack[3]; - modelUpdateInfo(&menumodel->bodymodel); + model_update_info(&menumodel->bodymodel); - modelGetRootPosition(&menumodel->bodymodel, &oldpos); + model_get_root_position(&menumodel->bodymodel, &oldpos); - if (joyGetButtons(0, L_TRIG)) { - modelSetRootPosition(&menumodel->bodymodel, &newpos); + if (joy_get_buttons(0, L_TRIG)) { + model_set_root_position(&menumodel->bodymodel, &newpos); } } #endif - mtx4LoadTranslation(&tmpcoord, &posmtx); + mtx4_load_translation(&tmpcoord, &posmtx); if (haszoom) { mtx00015f04(scale * zoomy, &posmtx); @@ -2152,23 +2152,23 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) Mtxf sp184; if (haszoom) { - mtx4LoadTranslation(&zoompos, &sp204); + mtx4_load_translation(&zoompos, &sp204); } else { tmpcoord.x = menumodel->displacex; tmpcoord.y = menumodel->displacey; tmpcoord.z = menumodel->displacez; - mtx4LoadTranslation(&tmpcoord, &sp204); + mtx4_load_translation(&tmpcoord, &sp204); } - mtx4MultMtx4(&posmtx, &rotmtx, &sp244); + mtx4_mult_mtx4(&posmtx, &rotmtx, &sp244); if (modeltype == MENUMODELTYPE_3) { credits0f13ae04(&sp1c4); - mtx4MultMtx4(&sp1c4, &sp244, &sp184); - mtx4MultMtx4(&sp184, &sp204, &menumodel->mtx); + mtx4_mult_mtx4(&sp1c4, &sp244, &sp184); + mtx4_mult_mtx4(&sp184, &sp204, &menumodel->mtx); } else { - mtx4MultMtx4(&sp244, &sp204, &menumodel->mtx); + mtx4_mult_mtx4(&sp244, &sp204, &menumodel->mtx); } } @@ -2177,19 +2177,19 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) if (modeltype < MENUMODELTYPE_3) { if (modeltype != MENUMODELTYPE_DEFAULT) { gdl = func0f0d49c8(gdl); - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } else { f32 aspect = (f32) (g_MenuScissorX2 - g_MenuScissorX1) / (f32) (g_MenuScissorY2 - g_MenuScissorY1); static u32 znear = 10; static u32 zfar = 300; - mainOverrideVariable("mzn", &znear); - mainOverrideVariable("mzf", &zfar); + main_override_variable("mzn", &znear); + main_override_variable("mzf", &zfar); gdl = func0f0d49c8(gdl); - viSetViewPosition(g_MenuScissorX1 * g_ScaleX, g_MenuScissorY1); - viSetFovAspectAndSize(g_Vars.currentplayer->fovy, aspect, (g_MenuScissorX2 - g_MenuScissorX1) * g_ScaleX, g_MenuScissorY2 - g_MenuScissorY1); + vi_set_view_position(g_MenuScissorX1 * g_ScaleX, g_MenuScissorY1); + vi_set_fov_aspect_and_size(g_Vars.currentplayer->fovy, aspect, (g_MenuScissorX2 - g_MenuScissorX1) * g_ScaleX, g_MenuScissorY2 - g_MenuScissorY1); gdl = vi0000af00(gdl, var800a2048[g_MpPlayerNum]); gdl = vi0000aca4(gdl, znear, zfar); @@ -2197,10 +2197,10 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) } // Allocate model matrices - matrices = gfxAllocate(menumodel->bodymodeldef->nummatrices * sizeof(Mtxf)); + matrices = gfx_allocate(menumodel->bodymodeldef->nummatrices * sizeof(Mtxf)); for (i = 0; i < menumodel->bodymodeldef->nummatrices; i++) { - mtx4LoadIdentity(&matrices[i]); + mtx4_load_identity(&matrices[i]); } menumodel->bodymodel.matrices = matrices; @@ -2208,10 +2208,10 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) // Set new animation if requested if (menumodel->newanimnum && menumodel->curanimnum != menumodel->newanimnum) { if (menumodel->reverseanim) { - modelSetAnimation(&menumodel->bodymodel, menumodel->newanimnum, false, 0, PALUPF(-0.5f), 0.0f); - modelSetAnimFrame(&menumodel->bodymodel, modelGetNumAnimFrames(&menumodel->bodymodel)); + model_set_animation(&menumodel->bodymodel, menumodel->newanimnum, false, 0, PALUPF(-0.5f), 0.0f); + model_set_anim_frame(&menumodel->bodymodel, model_get_num_anim_frames(&menumodel->bodymodel)); } else { - modelSetAnimation(&menumodel->bodymodel, menumodel->newanimnum, false, 0, PALUPF(0.5f), 0.0f); + model_set_animation(&menumodel->bodymodel, menumodel->newanimnum, false, 0, PALUPF(0.5f), 0.0f); } menumodel->curanimnum = menumodel->newanimnum; @@ -2224,29 +2224,29 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) f32 frame; u32 stack; - modelTickAnimQuarterSpeed(&menumodel->bodymodel, g_Vars.diffframe240, true); + model_tick_anim_quarter_speed(&menumodel->bodymodel, g_Vars.diffframe240, true); if (menumodel->reverseanim) { - frame = modelGetNumAnimFrames(&menumodel->bodymodel) - modelGetCurAnimFrame(&menumodel->bodymodel); + frame = model_get_num_anim_frames(&menumodel->bodymodel) - model_get_cur_anim_frame(&menumodel->bodymodel); } else { - frame = modelGetCurAnimFrame(&menumodel->bodymodel); + frame = model_get_cur_anim_frame(&menumodel->bodymodel); } - if (frame >= modelGetNumAnimFrames(&menumodel->bodymodel) - 1) { + if (frame >= model_get_num_anim_frames(&menumodel->bodymodel) - 1) { menumodel->curanimnum = 0; } } - mtx4Copy(&menumodel->mtx, matrices); + mtx4_copy(&menumodel->mtx, matrices); renderdata.unk00 = &menumodel->mtx; renderdata.unk10 = menumodel->bodymodel.matrices; - modelSetMatricesWithAnim(&renderdata, &menumodel->bodymodel); + model_set_matrices_with_anim(&renderdata, &menumodel->bodymodel); if (menumodel->bodymodeldef->skel == &g_SkelHudPiece) { // Update the hudpiece's liquid texture - struct modelnode *node = modelGetPart(menumodel->bodymodeldef, MODELPART_HUDPIECE_0000); + struct modelnode *node = model_get_part(menumodel->bodymodeldef, MODELPART_HUDPIECE_0000); if (node) { struct modelrodata_gundl *rodata = &node->rodata->gundl; @@ -2269,28 +2269,28 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) } // Rotate the hudpiece's rotor thing - node = modelGetPart(menumodel->bodymodeldef, MODELPART_HUDPIECE_0002); + node = model_get_part(menumodel->bodymodeldef, MODELPART_HUDPIECE_0002); if (node) { - s32 mtxindex = modelFindNodeMtxIndex(node, 0); + s32 mtxindex = model_find_node_mtx_index(node, 0); Mtxf sp120; Mtxf spe0; - mtx4LoadIdentity(&sp120); - mtx4LoadXRotation(menuGetCosOscFrac(4), &sp120); - mtx4MultMtx4((Mtxf *)((uintptr_t)matrices + mtxindex * sizeof(Mtxf)), &sp120, &spe0); - mtx4Copy(&spe0, (Mtxf *)((uintptr_t)matrices + mtxindex * sizeof(Mtxf))); + mtx4_load_identity(&sp120); + mtx4_load_x_rotation(menu_get_cos_osc_frac(4), &sp120); + mtx4_mult_mtx4((Mtxf *)((uintptr_t)matrices + mtxindex * sizeof(Mtxf)), &sp120, &spe0); + mtx4_copy(&spe0, (Mtxf *)((uintptr_t)matrices + mtxindex * sizeof(Mtxf))); } // Make the menu projection lines come from the hudpiece eye - node = modelGetPart(menumodel->bodymodeldef, MODELPART_HUDPIECE_0001); + node = model_get_part(menumodel->bodymodeldef, MODELPART_HUDPIECE_0001); if (node) { if (g_MenuData.root == MENUROOT_MAINMENU || g_MenuData.root == MENUROOT_FILEMGR || g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_TRAINING) { - s32 mtxindex = modelFindNodeMtxIndex(node, 0); + s32 mtxindex = model_find_node_mtx_index(node, 0); struct coord pos; f32 screenpos[2]; @@ -2300,14 +2300,14 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) cam0f0b4d04(&pos, screenpos); - g_MenuProjectFromX = ((s32)screenpos[0] - viGetWidth() / 2) / g_ScaleX; - g_MenuProjectFromY = (s32)screenpos[1] - viGetHeight() / 2; + g_MenuProjectFromX = ((s32)screenpos[0] - vi_get_width() / 2) / g_ScaleX; + g_MenuProjectFromY = (s32)screenpos[1] - vi_get_height() / 2; } } } gSPSetLights1(gdl++, var80071468); - gSPLookAt(gdl++, camGetLookAt()); + gSPLookAt(gdl++, cam_get_look_at()); renderdata.unk30 = 1; renderdata.envcolour = 0xffffffff; @@ -2318,7 +2318,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) renderdata.gdl = gdl; renderdata.zbufferenabled = true; - modelRender(&renderdata, &menumodel->bodymodel); + model_render(&renderdata, &menumodel->bodymodel); gdl = renderdata.gdl; @@ -2326,8 +2326,8 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) for (i = 0; i < menumodel->bodymodeldef->nummatrices; i++) { Mtxf sp70; - mtx4Copy((Mtxf *)((uintptr_t)menumodel->bodymodel.matrices + i * sizeof(Mtxf)), &sp70); - mtxF2L(&sp70, &menumodel->bodymodel.matrices[i]); + mtx4_copy((Mtxf *)((uintptr_t)menumodel->bodymodel.matrices + i * sizeof(Mtxf)), &sp70); + mtx_f2l(&sp70, &menumodel->bodymodel.matrices[i]); } mtx00016784(); @@ -2343,11 +2343,11 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) gSPClearGeometryMode(gdl++, G_CULL_BOTH); gDPSetTextureFilter(gdl++, G_TF_BILERP); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gSPDisplayList(gdl++, var800613a0); } @@ -2355,7 +2355,7 @@ Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype) return gdl; } -void menuGetTeamTitlebarColours(u32 *top, u32 *middle, u32 *bottom) +void menu_get_team_titlebar_colours(u32 *top, u32 *middle, u32 *bottom) { const u32 colours[][3] = { // top, middle, bottom @@ -2374,7 +2374,7 @@ void menuGetTeamTitlebarColours(u32 *top, u32 *middle, u32 *bottom) *bottom = colours[g_PlayerConfigsArray[g_MpPlayerNum].base.team][2] | (*bottom & 0xff); } -Gfx *menuApplyScissor(Gfx *gdl) +Gfx *menu_apply_scissor(Gfx *gdl) { gDPPipeSync(gdl++); @@ -2400,20 +2400,20 @@ Gfx *menuApplyScissor(Gfx *gdl) g_ScissorY2 = 0; } - if (g_ScissorX1 > viGetBufWidth()) { - g_ScissorX1 = viGetBufWidth(); + if (g_ScissorX1 > vi_get_buf_width()) { + g_ScissorX1 = vi_get_buf_width(); } - if (g_ScissorX2 > viGetBufWidth()) { - g_ScissorX2 = viGetBufWidth(); + if (g_ScissorX2 > vi_get_buf_width()) { + g_ScissorX2 = vi_get_buf_width(); } - if (g_ScissorY1 > viGetBufHeight()) { - g_ScissorY1 = viGetBufHeight(); + if (g_ScissorY1 > vi_get_buf_height()) { + g_ScissorY1 = vi_get_buf_height(); } - if (g_ScissorY2 > viGetBufHeight()) { - g_ScissorY2 = viGetBufHeight(); + if (g_ScissorY2 > vi_get_buf_height()) { + g_ScissorY2 = vi_get_buf_height(); } if (g_ScissorX2 < g_ScissorX1) { @@ -2441,7 +2441,7 @@ Gfx *menuApplyScissor(Gfx *gdl) * variant of the dialog is rendered which has no borders, less background, * no overlays and no models such as inventory weapons. */ -Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight) +Gfx *dialog_render(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight) { s32 i; s32 dialogleft; @@ -2475,7 +2475,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l #if VERSION >= VERSION_NTSC_1_0 if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) - && menuGetRoot() == MENUROOT_MPENDSCREEN + && menu_get_root() == MENUROOT_MPENDSCREEN && !var8009dfc0) { return gdl; } @@ -2492,7 +2492,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l && !lightweight && g_Menus[g_MpPlayerNum].menumodel.drawbehinddialog == true) { gSPSetGeometryMode(gdl++, G_ZBUFFER); - gdl = menuRenderModel(gdl, &g_Menus[g_MpPlayerNum].menumodel, MENUMODELTYPE_2); + gdl = menu_render_model(gdl, &g_Menus[g_MpPlayerNum].menumodel, MENUMODELTYPE_2); gSPClearGeometryMode(gdl++, G_ZBUFFER); } @@ -2509,7 +2509,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l sp170 = 1.0f - g_MenuData.unk010; #if VERSION >= VERSION_NTSC_1_0 - if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) && menuGetRoot() == MENUROOT_MPENDSCREEN) { + if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) && menu_get_root() == MENUROOT_MPENDSCREEN) { sp170 = 1.0f - dialog->statefrac; } #endif @@ -2524,7 +2524,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l dialogright = dialogleft + dialogwidth; dialogbottom = dialogtop + dialogheight; - title = menuResolveDialogTitle(dialog->definition); + title = menu_resolve_dialog_title(dialog->definition); colour1 = MIXCOLOUR(dialog, dialog_border1); colour2 = MIXCOLOUR(dialog, dialog_titlebg); @@ -2554,14 +2554,14 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l // Each surface is rendered a second time with the colours swapped. // The order is top, right, bottom, left. if (g_MenuData.root != MENUROOT_MPSETUP && (g_MenuData.root != MENUROOT_MPPAUSE || g_Vars.normmplayerisrunning)) { - var800a4634 = menugfxDrawPlane(var800a4634, bgx1, bgy1, bgx2, bgy1, colour4, colour5, MENUPLANE_00); - var800a4634 = menugfxDrawPlane(var800a4634, bgx2, bgy1, bgx2, bgy2, colour5, colour4, MENUPLANE_00); - var800a4634 = menugfxDrawPlane(var800a4634, bgx2, bgy2, bgx1, bgy2, colour4, colour5, MENUPLANE_00); - var800a4634 = menugfxDrawPlane(var800a4634, bgx1, bgy2, bgx1, bgy1, colour5, colour4, MENUPLANE_00); - var800a4634 = menugfxDrawPlane(var800a4634, bgx1, bgy1, bgx2, bgy1, colour5, colour4, MENUPLANE_01); - var800a4634 = menugfxDrawPlane(var800a4634, bgx2, bgy1, bgx2, bgy2, colour4, colour5, MENUPLANE_01); - var800a4634 = menugfxDrawPlane(var800a4634, bgx2, bgy2, bgx1, bgy2, colour5, colour4, MENUPLANE_01); - var800a4634 = menugfxDrawPlane(var800a4634, bgx1, bgy2, bgx1, bgy1, colour4, colour5, MENUPLANE_01); + var800a4634 = menugfx_draw_plane(var800a4634, bgx1, bgy1, bgx2, bgy1, colour4, colour5, MENUPLANE_00); + var800a4634 = menugfx_draw_plane(var800a4634, bgx2, bgy1, bgx2, bgy2, colour5, colour4, MENUPLANE_00); + var800a4634 = menugfx_draw_plane(var800a4634, bgx2, bgy2, bgx1, bgy2, colour4, colour5, MENUPLANE_00); + var800a4634 = menugfx_draw_plane(var800a4634, bgx1, bgy2, bgx1, bgy1, colour5, colour4, MENUPLANE_00); + var800a4634 = menugfx_draw_plane(var800a4634, bgx1, bgy1, bgx2, bgy1, colour5, colour4, MENUPLANE_01); + var800a4634 = menugfx_draw_plane(var800a4634, bgx2, bgy1, bgx2, bgy2, colour4, colour5, MENUPLANE_01); + var800a4634 = menugfx_draw_plane(var800a4634, bgx2, bgy2, bgx1, bgy2, colour5, colour4, MENUPLANE_01); + var800a4634 = menugfx_draw_plane(var800a4634, bgx1, bgy2, bgx1, bgy1, colour4, colour5, MENUPLANE_01); } // Render the title bar @@ -2569,12 +2569,12 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l if (((g_MenuData.root == MENUROOT_MPSETUP) || (g_MenuData.root == MENUROOT_4MBMAINMENU)) && (g_MpSetup.options & MPOPTION_TEAMSENABLED) && g_Vars.mpsetupmenu != MPSETUPMENU_GENERAL) { - menuGetTeamTitlebarColours(&colour1, &colour2, &colour3); + menu_get_team_titlebar_colours(&colour1, &colour2, &colour3); } - gdl = menugfxRenderGradient(gdl, dialogleft - 2, dialogtop, dialogright + 2, dialogtop + LINEHEIGHT, colour1, colour2, colour3); - gdl = menugfxDrawShimmer(gdl, dialogleft - 2, dialogtop, dialogright + 2, dialogtop + 1, (colour1 & 0xff) >> 1, 1, 40, 0); - gdl = menugfxDrawShimmer(gdl, dialogleft - 2, dialogtop + 10, dialogright + 2, dialogtop + LINEHEIGHT, (colour1 & 0xff) >> 1, 0, 40, 1); + gdl = menugfx_render_gradient(gdl, dialogleft - 2, dialogtop, dialogright + 2, dialogtop + LINEHEIGHT, colour1, colour2, colour3); + gdl = menugfx_draw_shimmer(gdl, dialogleft - 2, dialogtop, dialogright + 2, dialogtop + 1, (colour1 & 0xff) >> 1, 1, 40, 0); + gdl = menugfx_draw_shimmer(gdl, dialogleft - 2, dialogtop + 10, dialogright + 2, dialogtop + LINEHEIGHT, (colour1 & 0xff) >> 1, 0, 40, 1); x = dialogleft + 2; y = dialogtop + 2; @@ -2597,19 +2597,19 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l colour1 = MIXCOLOUR(dialog, dialog_titlefg); - textSetWaveColours(g_MenuWave2Colours[dialog->type].dialog_titlefg, g_MenuWave1Colours[dialog->type].dialog_titlefg); + text_set_wave_colours(g_MenuWave2Colours[dialog->type].dialog_titlefg, g_MenuWave1Colours[dialog->type].dialog_titlefg); // Title shadow x = dialogleft + 3; y = dialogtop + 3; - gdl = textRenderProjected(gdl, &x, &y, title, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour1 & 0xff, dialogwidth, viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, title, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour1 & 0xff, dialogwidth, vi_get_height(), 0, 0); // Title proper x = dialogleft + 2; y = dialogtop + 2; - gdl = textRenderProjected(gdl, &x, &y, title, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour1, dialogwidth, viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, title, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour1, dialogwidth, vi_get_height(), 0, 0); // In MP dialogs, render the player number in the top right if (g_MenuData.root == MENUROOT_MPSETUP @@ -2619,7 +2619,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l x = dialogright - 9; y = dialogtop + 2; - gdl = textRenderProjected(gdl, &x, &y, sp154[g_MpPlayerNum], g_CharsHandelGothicSm, g_FontHandelGothicSm, colour1, dialogwidth, viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, sp154[g_MpPlayerNum], g_CharsHandelGothicSm, g_FontHandelGothicSm, colour1, dialogwidth, vi_get_height(), 0, 0); } } @@ -2630,15 +2630,15 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l if (!(dialog->redrawtimer < 0.0f)) { if (g_MenuData.root != MENUROOT_MPPAUSE) { if (dialog->state >= MENUDIALOGSTATE_POPULATED) { - textSetDiagonalBlend(dialog->x, dialog->y, dialog->redrawtimer, DIAGMODE_REDRAW); + text_set_diagonal_blend(dialog->x, dialog->y, dialog->redrawtimer, DIAGMODE_REDRAW); } else { - textSetDiagonalBlend(dialog->x, dialog->y, dialog->redrawtimer, DIAGMODE_FADEIN); + text_set_diagonal_blend(dialog->x, dialog->y, dialog->redrawtimer, DIAGMODE_FADEIN); } var8007fb9c = true; } } else if (dialog->state == MENUDIALOGSTATE_POPULATED) { - textSetMenuBlend(dialog->statefrac); + text_set_menu_blend(dialog->statefrac); } if (dialogbottom < dialogtop + LINEHEIGHT) { @@ -2648,7 +2648,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l colour1 = MIXCOLOUR(dialog, dialog_bodybg); if (dialog->dimmed) { - colour1 = (colourBlend(colour1, 0x00000000, 44) & 0xffffff00) | (colour1 & 0xff); + colour1 = (colour_blend(colour1, 0x00000000, 44) & 0xffffff00) | (colour1 & 0xff); } colour2 = MIXCOLOUR(dialog, unused14); @@ -2656,16 +2656,16 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l // Draw the dialog's background and outer borders if (!lightweight) { if (dialog->state == MENUDIALOGSTATE_OPENING) { - gdl = menugfxRenderDialogBackground(gdl, dialogleft + 1, dialogtop + LINEHEIGHT, dialogright - 1, dialogbottom, dialog, colour1, colour2, 1.0f); + gdl = menugfx_render_dialog_background(gdl, dialogleft + 1, dialogtop + LINEHEIGHT, dialogright - 1, dialogbottom, dialog, colour1, colour2, 1.0f); } else if (dialog->state == MENUDIALOGSTATE_POPULATING) { - gdl = menugfxRenderDialogBackground(gdl, dialogleft + 1, dialogtop + LINEHEIGHT, dialogright - 1, dialogbottom, dialog, colour1, colour2, dialog->statefrac); + gdl = menugfx_render_dialog_background(gdl, dialogleft + 1, dialogtop + LINEHEIGHT, dialogright - 1, dialogbottom, dialog, colour1, colour2, dialog->statefrac); } else { - gdl = menugfxRenderDialogBackground(gdl, dialogleft + 1, dialogtop + LINEHEIGHT, dialogright - 1, dialogbottom, dialog, colour1, colour2, -1.0f); + gdl = menugfx_render_dialog_background(gdl, dialogleft + 1, dialogtop + LINEHEIGHT, dialogright - 1, dialogbottom, dialog, colour1, colour2, -1.0f); } // No dialog has this flag, so this branch is unused if (dialog->definition->flags & MENUDIALOGFLAG_DISABLETITLEBAR) { - gdl = menugfxDrawDialogBorderLine(gdl, dialogleft + 1, dialogtop + LINEHEIGHT, dialogright - 1, dialogtop + LINEHEIGHT + 1, MIXCOLOUR(dialog, dialog_border1), MIXCOLOUR(dialog, dialog_border2)); + gdl = menugfx_draw_dialog_border_line(gdl, dialogleft + 1, dialogtop + LINEHEIGHT, dialogright - 1, dialogtop + LINEHEIGHT + 1, MIXCOLOUR(dialog, dialog_border1), MIXCOLOUR(dialog, dialog_border2)); } } @@ -2675,10 +2675,10 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l { struct menulayer *layer; - s32 viewleft = viGetViewLeft() / g_ScaleX; - s32 viewtop = viGetViewTop(); - s32 viewright = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX; - s32 viewbottom = viGetViewTop() + viGetViewHeight(); + s32 viewleft = vi_get_view_left() / g_ScaleX; + s32 viewtop = vi_get_view_top(); + s32 viewright = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX; + s32 viewbottom = vi_get_view_top() + vi_get_view_height(); g_MenuScissorX1 = dialogleft + 2; g_MenuScissorX2 = dialogright - 2; @@ -2722,7 +2722,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l var8009de90 = g_MenuScissorY1; var8009de94 = g_MenuScissorY2; - gdl = menuApplyScissor(gdl); + gdl = menu_apply_scissor(gdl); // Render models (inventory, chr/vehicle bios) if (g_Menus[g_MpPlayerNum].curdialog == dialog @@ -2731,12 +2731,12 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l && !g_Menus[g_MpPlayerNum].menumodel.drawbehinddialog) { gSPSetGeometryMode(gdl++, G_ZBUFFER); - gdl = menuRenderModel(gdl, &g_Menus[g_MpPlayerNum].menumodel, MENUMODELTYPE_DEFAULT); + gdl = menu_render_model(gdl, &g_Menus[g_MpPlayerNum].menumodel, MENUMODELTYPE_DEFAULT); gSPClearGeometryMode(gdl++, G_ZBUFFER); - viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); - viSetFovAspectAndSize(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, + vi_set_view_position(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); + vi_set_fov_aspect_and_size(g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight); } @@ -2767,7 +2767,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l colindex = dialog->colstart + i; if (i != 0 && (dialog->definition->flags & MENUDIALOGFLAG_0400) == 0) { - gdl = menugfxDrawFilledRect(gdl, curx - 1, dialogtop + LINEHEIGHT + 1, curx, dialogbottom, sp120, sp120); + gdl = menugfx_draw_filled_rect(gdl, curx - 1, dialogtop + LINEHEIGHT + 1, curx, dialogbottom, sp120, sp120); } colwidth = menu->cols[colindex].width; @@ -2824,7 +2824,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l context.dialog = dialog; if (prevwaslist) { - gdl = menugfxDrawFilledRect(gdl, context.x, context.y - 1, context.x + context.width, context.y, sp120, sp120); + gdl = menugfx_draw_filled_rect(gdl, context.x, context.y - 1, context.x + context.width, context.y, sp120, sp120); prevwaslist = false; } @@ -2838,9 +2838,9 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l u32 colour2; colour2 = MIXCOLOUR(dialog, item_focused_outer); - colour = colourBlend(colour2, colour2 & 0xffffff00, 127); + colour = colour_blend(colour2, colour2 & 0xffffff00, 127); - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); gDPFillRectangleScaled(gdl++, x1, y1, x2, y2); gdl = text0f153838(gdl); } @@ -2875,11 +2875,11 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l // Left side gdl = menugfx0f0e2498(gdl); - gdl = menugfxDrawTri2(gdl, x1, liney - 1, x3 - 3, liney, sp120, sp120, 0); - gdl = menugfxDrawTri2(gdl, x3 - 3, liney - 1, x3, liney, sp120, 0xffffffff, 0); - gdl = menugfxDrawTri2(gdl, x1, liney + 1, x3 - 3, liney + 2, sp120, sp120, 0); - gdl = menugfxDrawTri2(gdl, x3 - 3, liney + 1, x3, liney + 2, sp120, 0xffffffff, 0); - gdl = menugfxDrawTri2(gdl, x3 - 2, liney, x4, liney + 1, colour, sp120 & 0xffffff00, 0); + gdl = menugfx_draw_tri2(gdl, x1, liney - 1, x3 - 3, liney, sp120, sp120, 0); + gdl = menugfx_draw_tri2(gdl, x3 - 3, liney - 1, x3, liney, sp120, 0xffffffff, 0); + gdl = menugfx_draw_tri2(gdl, x1, liney + 1, x3 - 3, liney + 2, sp120, sp120, 0); + gdl = menugfx_draw_tri2(gdl, x3 - 3, liney + 1, x3, liney + 2, sp120, 0xffffffff, 0); + gdl = menugfx_draw_tri2(gdl, x3 - 2, liney, x4, liney + 1, colour, sp120 & 0xffffff00, 0); if (item->flags & MENUITEMFLAG_SELECTABLE_CENTRE) { // Right side @@ -2887,16 +2887,16 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l x3 = context.x + context.width - 8; x4 = context.x + context.width - context.width / 3; - gdl = menugfxDrawTri2(gdl, x1 - 5, liney - 1, x1, liney, sp120, sp120, 0); - gdl = menugfxDrawTri2(gdl, x3, liney - 1, x3 + 3, liney, -1, sp120, 0); - gdl = menugfxDrawTri2(gdl, x3 + 3, liney + 1, x1, liney + 2, sp120, sp120, 0); - gdl = menugfxDrawTri2(gdl, x3, liney + 1, x3 + 3, liney + 2, -1, sp120, 0); - gdl = menugfxDrawTri2(gdl, x4, liney, x3 + 2, liney + 1, sp120 & 0xffffff00, colour, 0); + gdl = menugfx_draw_tri2(gdl, x1 - 5, liney - 1, x1, liney, sp120, sp120, 0); + gdl = menugfx_draw_tri2(gdl, x3, liney - 1, x3 + 3, liney, -1, sp120, 0); + gdl = menugfx_draw_tri2(gdl, x3 + 3, liney + 1, x1, liney + 2, sp120, sp120, 0); + gdl = menugfx_draw_tri2(gdl, x3, liney + 1, x3 + 3, liney + 2, -1, sp120, 0); + gdl = menugfx_draw_tri2(gdl, x4, liney, x3 + 2, liney + 1, sp120 & 0xffffff00, colour, 0); } } } - gdl = menuitemRender(gdl, &context); + gdl = menuitem_render(gdl, &context); if (item->type == MENUITEMTYPE_LIST) { prevwaslist = true; @@ -2915,7 +2915,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l // Render overlays, such as dropdown menus if (!lightweight) { - gdl = textSetPrimColour(gdl, 0x00000000); + gdl = text_set_prim_colour(gdl, 0x00000000); curx = dialogleft; @@ -2939,7 +2939,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l itemdata = (union menuitemdata *)&menu->blocks[menu->rows[rowindex].blockindex]; } - gdl = menuitemOverlay(gdl, curx, cury, menu->cols[colindex].width, menu->rows[rowindex].height, item, dialog, itemdata); + gdl = menuitem_overlay(gdl, curx, cury, menu->cols[colindex].width, menu->rows[rowindex].height, item, dialog, itemdata); cury += menu->rows[rowindex].height; } @@ -2950,11 +2950,11 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l gdl = text0f153838(gdl); } - gDPSetScissor(gdl++, G_SC_NON_INTERLACE, viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), viGetViewTop() + viGetViewHeight()); + gDPSetScissor(gdl++, G_SC_NON_INTERLACE, vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), vi_get_view_top() + vi_get_view_height()); } else { - gDPSetScissor(gdl++, G_SC_NON_INTERLACE, viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), viGetViewTop() + viGetViewHeight()); + gDPSetScissor(gdl++, G_SC_NON_INTERLACE, vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), vi_get_view_top() + vi_get_view_height()); } // Render left/right chevrons and sibling dialog titles @@ -2966,13 +2966,13 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l // Draw chevrons u32 colour1; u32 colour; - u32 weight = menuGetSinOscFrac(10) * 255.0f; + u32 weight = menu_get_sin_osc_frac(10) * 255.0f; colour1 = MIXCOLOUR(dialog, dialog_border1); - colour = colourBlend(0xffffffff, colour1, weight); + colour = colour_blend(0xffffffff, colour1, weight); - gdl = menugfxDrawDialogChevron(gdl, dialogleft - 5, (dialogtop + dialogbottom) / 2, 9, 1, colour, colour, menuGetSinOscFrac(20)); - gdl = menugfxDrawDialogChevron(gdl, dialogright + 5, (dialogtop + dialogbottom) / 2, 9, 3, colour, colour, menuGetSinOscFrac(20)); + gdl = menugfx_draw_dialog_chevron(gdl, dialogleft - 5, (dialogtop + dialogbottom) / 2, 9, 1, colour, colour, menu_get_sin_osc_frac(20)); + gdl = menugfx_draw_dialog_chevron(gdl, dialogright + 5, (dialogtop + dialogbottom) / 2, 9, 3, colour, colour, menu_get_sin_osc_frac(20)); if (g_MenuData.root == MENUROOT_MAINMENU || g_MenuData.root == MENUROOT_4MBFILEMGR @@ -2984,8 +2984,8 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l s32 previndex; s32 nextindex; - textResetBlends(); - textSetRotation90(true); + text_reset_blends(); + text_set_rotation90(true); gdl = text0f153628(gdl); @@ -2996,9 +2996,9 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l previndex = layer->numsiblings - 1; } - title = menuResolveDialogTitle(layer->siblings[previndex]->definition); + title = menu_resolve_dialog_title(layer->siblings[previndex]->definition); - textMeasure(&textheight, &textwidth, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = dialogleft - 1; y = (dialogtop + dialogbottom) / 2 - textwidth - 3; @@ -3008,7 +3008,7 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l x -= 3; } - gdl = textRenderProjected(gdl, &y, &x, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffffff, dialogwidth, viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &y, &x, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0xffffffff, dialogwidth, vi_get_height(), 0, 0); // Right/next title nextindex = layer->cursibling + 1; @@ -3017,9 +3017,9 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l nextindex = 0; } - title = menuResolveDialogTitle(layer->siblings[nextindex]->definition); + title = menu_resolve_dialog_title(layer->siblings[nextindex]->definition); - textMeasure(&textheight, &textwidth, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION == VERSION_JPN_FINAL x = dialogright + 13; @@ -3033,10 +3033,10 @@ Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool l x += 3; } - gdl = textRenderProjected(gdl, &y, &x, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, -1, dialogwidth, viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &y, &x, title, g_CharsHandelGothicXs, g_FontHandelGothicXs, -1, dialogwidth, vi_get_height(), 0, 0); gdl = text0f153780(gdl); - textSetRotation90(false); + text_set_rotation90(false); } } } @@ -3050,7 +3050,7 @@ const char var7f1b269c[] = "NOT IN MODE MULTIINGAME!\n"; const char var7f1b26b8[] = "Numactive now:%d\n"; const char var7f1b26cc[] = "[]-[] SwitchMenuMode called, context %d\n"; -void menuGetContPads(s8 *contpadnum1, s8 *contpadnum2) +void menu_get_cont_pads(s8 *contpadnum1, s8 *contpadnum2) { switch (g_MenuData.root) { case MENUROOT_MPSETUP: @@ -3062,14 +3062,14 @@ void menuGetContPads(s8 *contpadnum1, s8 *contpadnum2) *contpadnum2 = -1; break; default: - *contpadnum1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); + *contpadnum1 = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); *contpadnum2 = -1; if (!g_Vars.normmplayerisrunning) { - s32 mode = optionsGetControlMode(g_Vars.currentplayerstats->mpindex); + s32 mode = options_get_control_mode(g_Vars.currentplayerstats->mpindex); if (mode == CONTROLMODE_23 || mode == CONTROLMODE_24 || mode == CONTROLMODE_22 || mode == CONTROLMODE_21) { - *contpadnum2 = optionsGetContpadNum2(g_Vars.currentplayerstats->mpindex); + *contpadnum2 = options_get_contpad_num2(g_Vars.currentplayerstats->mpindex); } } break; @@ -3156,15 +3156,15 @@ void func0f0f7594(s32 arg0, s32 *vdir, s32 *hdir) * are sharing a viewport. */ #if VERSION >= VERSION_JPN_FINAL -void menuFindAvailableSize(s32 *leftptr, s32 *topptr, s32 *rightptr, s32 *bottomptr, struct menudialog *dialog) +void menu_find_available_size(s32 *leftptr, s32 *topptr, s32 *rightptr, s32 *bottomptr, struct menudialog *dialog) #else -void menuFindAvailableSize(s32 *leftptr, s32 *topptr, s32 *rightptr, s32 *bottomptr) +void menu_find_available_size(s32 *leftptr, s32 *topptr, s32 *rightptr, s32 *bottomptr) #endif { - s32 left = viGetViewLeft() / g_ScaleX + 20; - s32 top = viGetViewTop() + 4; - s32 right = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX - 20; - s32 bottom = viGetViewTop() + viGetViewHeight() - 4; + s32 left = vi_get_view_left() / g_ScaleX + 20; + s32 top = vi_get_view_top() + 4; + s32 right = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX - 20; + s32 bottom = vi_get_view_top() + vi_get_view_height() - 4; s32 playernum; u32 stack1; #if VERSION >= VERSION_JPN_FINAL @@ -3173,7 +3173,7 @@ void menuFindAvailableSize(s32 *leftptr, s32 *topptr, s32 *rightptr, s32 *bottom u32 stack2; #if VERSION >= VERSION_JPN_FINAL - if (currentPlayerIsMenuOpenInSoloOrMp()) { + if (current_player_is_menu_open_in_solo_or_mp()) { v1 = true; } @@ -3189,17 +3189,17 @@ void menuFindAvailableSize(s32 *leftptr, s32 *topptr, s32 *rightptr, s32 *bottom // Make room for health bar top += 22; - if (optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA) { + if (options_get_effective_screen_size() == SCREENSIZE_CINEMA) { top -= 8; bottom += 4; } } #else - if (currentPlayerIsMenuOpenInSoloOrMp()) { + if (current_player_is_menu_open_in_solo_or_mp()) { // Make room for health bar top += 22; - if (optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA) { + if (options_get_effective_screen_size() == SCREENSIZE_CINEMA) { top -= 8; bottom += 4; } @@ -3298,9 +3298,9 @@ void menuFindAvailableSize(s32 *leftptr, s32 *topptr, s32 *rightptr, s32 *bottom } #if VERSION >= VERSION_NTSC_1_0 - if (PLAYERCOUNT() == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) + if (PLAYERCOUNT() == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())) #else - if (PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) + if (PLAYERCOUNT() == 2 && options_get_screen_split() == SCREENSPLIT_VERTICAL) #endif { if (g_Menus[g_MpPlayerNum].playernum == 0) { @@ -3319,7 +3319,7 @@ void menuFindAvailableSize(s32 *leftptr, s32 *topptr, s32 *rightptr, s32 *bottom } } -void dialogCalculatePosition(struct menudialog *dialog) +void dialog_calculate_position(struct menudialog *dialog) { s32 xmin; s32 xmax; @@ -3331,9 +3331,9 @@ void dialogCalculatePosition(struct menudialog *dialog) s32 hdir; #if VERSION >= VERSION_JPN_FINAL - menuFindAvailableSize(&xmin, &ymin, &xmax, &ymax, dialog); + menu_find_available_size(&xmin, &ymin, &xmax, &ymax, dialog); #else - menuFindAvailableSize(&xmin, &ymin, &xmax, &ymax); + menu_find_available_size(&xmin, &ymin, &xmax, &ymax); #endif height = ymax - ymin - 6; @@ -3360,7 +3360,7 @@ void dialogCalculatePosition(struct menudialog *dialog) } if (hdir > 0) { - dialog->dstx = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX + 4; + dialog->dstx = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX + 4; } if (vdir < 0) { @@ -3368,12 +3368,12 @@ void dialogCalculatePosition(struct menudialog *dialog) } if (vdir > 0) { - dialog->dsty = viGetViewTop() + viGetViewHeight() + 4; + dialog->dsty = vi_get_view_top() + vi_get_view_height() + 4; } } } -void menuClose(void) +void menu_close(void) { g_Menus[g_MpPlayerNum].depth = 0; g_Menus[g_MpPlayerNum].numdialogs = 0; @@ -3394,7 +3394,7 @@ void menuClose(void) } if (g_MenuData.root == MENUROOT_BOOTPAKMGR) { - mainChangeToStage(STAGE_TITLE); + main_change_to_stage(STAGE_TITLE); } } @@ -3411,7 +3411,7 @@ void func0f0f8120(void) if (g_Menus[g_MpPlayerNum].curdialog == prev) { while (g_Menus[g_MpPlayerNum].depth > 0) { - menuPopDialog(); + menu_pop_dialog(); } } } @@ -3434,7 +3434,7 @@ void func0f0f820c(struct menudialogdef *dialogdef, s32 root) g_MenuData.unk00c = dialogdef; } -void menuSetBackground(s32 bg) +void menu_set_background(s32 bg) { // Can only screenshot if there is no background already, // because we want a clean screenshot @@ -3466,7 +3466,7 @@ void func0f0f8300(void) } } -void menuPushRootDialog(struct menudialogdef *dialogdef, s32 root) +void menu_push_root_dialog(struct menudialogdef *dialogdef, s32 root) { g_Menus[g_MpPlayerNum].numdialogs = 0; g_Menus[g_MpPlayerNum].depth = 0; @@ -3515,14 +3515,14 @@ void menuPushRootDialog(struct menudialogdef *dialogdef, s32 root) } } - menuPushDialog(dialogdef); + menu_push_dialog(dialogdef); switch (root) { case MENUROOT_MPSETUP: - menuSetBackground(MENUBG_CONEALPHA); + menu_set_background(MENUBG_CONEALPHA); break; case MENUROOT_4MBFILEMGR: - musicStartMenu(); + music_start_menu(); g_MenuData.bg = MENUBG_CONEOPAQUE; break; case MENUROOT_4MBMAINMENU: @@ -3540,41 +3540,41 @@ void menuPushRootDialog(struct menudialogdef *dialogdef, s32 root) case MENUROOT_FILEMGR: case MENUROOT_COOPCONTINUE: case MENUROOT_TRAINING: - menuSetBackground(MENUBG_BLUR); + menu_set_background(MENUBG_BLUR); break; case MENUROOT_BOOTPAKMGR: - musicStartMenu(); + music_start_menu(); g_MenuData.bg = MENUBG_GRADIENT; break; } - if (menuIsSoloMissionOrMp()) { - playerDisplayHealth(); + if (menu_is_solo_mission_or_mp()) { + player_display_health(); } } void func0f0f85e0(struct menudialogdef *dialogdef, s32 root) { if (dialogdef == &g_CiMenuViaPcMenuDialog) { - musicStartMenu(); + music_start_menu(); } - menuPushRootDialog(dialogdef, root); - lvSetPaused(true); + menu_push_root_dialog(dialogdef, root); + lv_set_paused(true); g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED; } u32 g_MenuCThresh = 120; -Gfx *menuRenderDialog(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight) +Gfx *menu_render_dialog(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight) { - mainOverrideVariable("cthresh", &g_MenuCThresh); + main_override_variable("cthresh", &g_MenuCThresh); - textSetWaveBlend(dialog->unk54, dialog->unk58, g_MenuCThresh); + text_set_wave_blend(dialog->unk54, dialog->unk58, g_MenuCThresh); - gdl = dialogRender(gdl, dialog, menu, lightweight); + gdl = dialog_render(gdl, dialog, menu, lightweight); - textResetBlends(); + text_reset_blends(); return gdl; } @@ -3592,16 +3592,16 @@ const char var7f1b2768[] = "StartSelects\n"; * transitioning between dialogs. This happens when swiping left or right beteen * dialogs on the same layer, or when opening or closing dialogs. */ -Gfx *menuRenderDialogs(Gfx *gdl) +Gfx *menu_render_dialogs(Gfx *gdl) { if (g_Menus[g_MpPlayerNum].curdialog) { if (g_MenuData.root == MENUROOT_MPPAUSE || g_MenuData.root == MENUROOT_PICKTARGET || g_MenuData.root == MENUROOT_MPENDSCREEN) { - g_MenuProjectFromX = g_Menus[g_MpPlayerNum].curdialog->x + g_Menus[g_MpPlayerNum].curdialog->width / 2 - viGetWidth() / (g_ScaleX * 2); - g_MenuProjectFromY = g_Menus[g_MpPlayerNum].curdialog->y + g_Menus[g_MpPlayerNum].curdialog->height / 2 - viGetHeight() / 2; + g_MenuProjectFromX = g_Menus[g_MpPlayerNum].curdialog->x + g_Menus[g_MpPlayerNum].curdialog->width / 2 - vi_get_width() / (g_ScaleX * 2); + g_MenuProjectFromY = g_Menus[g_MpPlayerNum].curdialog->y + g_Menus[g_MpPlayerNum].curdialog->height / 2 - vi_get_height() / 2; - gdl = menuRenderDialog(gdl, g_Menus[g_MpPlayerNum].curdialog, &g_Menus[g_MpPlayerNum], 0); + gdl = menu_render_dialog(gdl, g_Menus[g_MpPlayerNum].curdialog, &g_Menus[g_MpPlayerNum], 0); } else { s32 i; s32 j; @@ -3626,12 +3626,12 @@ Gfx *menuRenderDialogs(Gfx *gdl) // Render the other dialog if any if (dialogs[0]) { - gdl = menuRenderDialog(gdl, dialogs[0], &g_Menus[g_MpPlayerNum], 0); + gdl = menu_render_dialog(gdl, dialogs[0], &g_Menus[g_MpPlayerNum], 0); } // Render the current dialog if (g_Menus[g_MpPlayerNum].curdialog) { - gdl = menuRenderDialog(gdl, g_Menus[g_MpPlayerNum].curdialog, &g_Menus[g_MpPlayerNum], 0); + gdl = menu_render_dialog(gdl, g_Menus[g_MpPlayerNum].curdialog, &g_Menus[g_MpPlayerNum], 0); } #else // NTSC beta renders all dialogs all the time, and in their natural order @@ -3639,7 +3639,7 @@ Gfx *menuRenderDialogs(Gfx *gdl) struct menulayer *layer = &g_Menus[g_MpPlayerNum].layers[i]; for (j = 0; j < layer->numsiblings; j++) { - gdl = menuRenderDialog(gdl, layer->siblings[j], &g_Menus[g_MpPlayerNum], 0); + gdl = menu_render_dialog(gdl, layer->siblings[j], &g_Menus[g_MpPlayerNum], 0); } } #endif @@ -3655,26 +3655,26 @@ Gfx *menuRenderDialogs(Gfx *gdl) s32 ymax; #if VERSION >= VERSION_JPN_FINAL - menuFindAvailableSize(&xmin, &ymin, &xmax, &ymax, NULL); + menu_find_available_size(&xmin, &ymin, &xmax, &ymax, NULL); #else - menuFindAvailableSize(&xmin, &ymin, &xmax, &ymax); + menu_find_available_size(&xmin, &ymin, &xmax, &ymax); #endif #if VERSION >= VERSION_NTSC_1_0 - gdl = menuRenderBanner(gdl, xmin, ymin, xmax, ymax, false, g_Menus[g_MpPlayerNum].bannernum, 0, 0); + gdl = menu_render_banner(gdl, xmin, ymin, xmax, ymax, false, g_Menus[g_MpPlayerNum].bannernum, 0, 0); #else - gdl = menuRenderBanner(gdl, xmin, ymin, xmax, ymax, false, g_Menus[g_MpPlayerNum].bannernum); + gdl = menu_render_banner(gdl, xmin, ymin, xmax, ymax, false, g_Menus[g_MpPlayerNum].bannernum); #endif } else { - s32 xmin = viGetViewLeft() / g_ScaleX; - s32 ymin = viGetViewTop(); - s32 xmax = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX; - s32 ymax = viGetViewTop() + viGetViewHeight(); + s32 xmin = vi_get_view_left() / g_ScaleX; + s32 ymin = vi_get_view_top(); + s32 xmax = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX; + s32 ymax = vi_get_view_top() + vi_get_view_height(); #if VERSION >= VERSION_NTSC_1_0 - gdl = menuRenderBanner(gdl, xmin, ymin, xmax, ymax, true, g_Menus[g_MpPlayerNum].bannernum, 0, 0); + gdl = menu_render_banner(gdl, xmin, ymin, xmax, ymax, true, g_Menus[g_MpPlayerNum].bannernum, 0, 0); #else - gdl = menuRenderBanner(gdl, xmin, ymin, xmax, ymax, true, g_Menus[g_MpPlayerNum].bannernum); + gdl = menu_render_banner(gdl, xmin, ymin, xmax, ymax, true, g_Menus[g_MpPlayerNum].bannernum); #endif } } @@ -3685,10 +3685,10 @@ Gfx *menuRenderDialogs(Gfx *gdl) u32 var800714e8 = 0; -void menuResetModel(struct menumodel *menumodel, u32 allocationlen, bool allocate) +void menu_reset_model(struct menumodel *menumodel, u32 allocationlen, bool allocate) { menumodel->alloclen = allocationlen; - menumodel->allocstart = allocate ? mempAlloc(allocationlen, MEMPOOL_STAGE) : NULL; + menumodel->allocstart = allocate ? memp_alloc(allocationlen, MEMPOOL_STAGE) : NULL; menumodel->loaddelay = 0; menumodel->newparams = MENUMODELPARAMS_SET_FILENUM(0xffff); menumodel->bodymodeldef = NULL; @@ -3717,7 +3717,7 @@ void menuResetModel(struct menumodel *menumodel, u32 allocationlen, bool allocat menumodel->bodynum = -1; } -void menuReset(void) +void menu_reset(void) { s32 i; @@ -3726,31 +3726,31 @@ void menuReset(void) var8009dfc0 = 0; if (IS8MB()) { - g_BlurBuffer = mempAlloc(0x4b00, MEMPOOL_STAGE); + g_BlurBuffer = memp_alloc(0x4b00, MEMPOOL_STAGE); } g_MenuData.unk5d5_01 = false; - texLoadFromConfig(&g_TexGeneralConfigs[1]); - texLoadFromConfig(&g_TexGeneralConfigs[6]); - texLoadFromConfig(&g_TexGeneralConfigs[51]); - texLoadFromConfig(&g_TexGeneralConfigs[52]); - texLoadFromConfig(&g_TexGeneralConfigs[53]); - texLoadFromConfig(&g_TexGeneralConfigs[54]); - texLoadFromConfig(&g_TexGeneralConfigs[55]); + tex_load_from_config(&g_TexGeneralConfigs[1]); + tex_load_from_config(&g_TexGeneralConfigs[6]); + tex_load_from_config(&g_TexGeneralConfigs[51]); + tex_load_from_config(&g_TexGeneralConfigs[52]); + tex_load_from_config(&g_TexGeneralConfigs[53]); + tex_load_from_config(&g_TexGeneralConfigs[54]); + tex_load_from_config(&g_TexGeneralConfigs[55]); if (g_Vars.stagenum == STAGE_CITRAINING) { for (i = 12; i < 34; i++) { - texLoadFromConfig(&g_TexGeneralConfigs[i]); + tex_load_from_config(&g_TexGeneralConfigs[i]); } - texLoadFromConfig(&g_TexGeneralConfigs[34]); - texLoadFromConfig(&g_TexGeneralConfigs[36]); - texLoadFromConfig(&g_TexGeneralConfigs[35]); + tex_load_from_config(&g_TexGeneralConfigs[34]); + tex_load_from_config(&g_TexGeneralConfigs[36]); + tex_load_from_config(&g_TexGeneralConfigs[35]); } if (g_Vars.mplayerisrunning) { - texLoadFromConfig(&g_TexGeneralConfigs[35]); + tex_load_from_config(&g_TexGeneralConfigs[35]); } for (i = 0; i < ARRAYCOUNT(g_Menus); i++) { @@ -3777,11 +3777,11 @@ void menuReset(void) } for (i = 0; i < max; i++) { - menuResetModel(&g_Menus[i].menumodel, IS4MB() ? 0xb400 : 0x25800, true); + menu_reset_model(&g_Menus[i].menumodel, IS4MB() ? 0xb400 : 0x25800, true); } if (IS8MB()) { - menuResetModel(&g_MenuData.hudpiece, 0xc800, true); + menu_reset_model(&g_MenuData.hudpiece, 0xc800, true); } g_MenuData.hudpiece.newparams = MENUMODELPARAMS_SET_FILENUM(FILE_GHUDPIECE); @@ -3833,7 +3833,7 @@ void menuReset(void) g_MenuData.unk66f = 0; } -void menuSwipe(s32 direction) +void menu_swipe(s32 direction) { struct menulayer *layer = &g_Menus[g_MpPlayerNum].layers[g_Menus[g_MpPlayerNum].depth - 1]; struct menuitem *item; @@ -3856,9 +3856,9 @@ void menuSwipe(s32 direction) g_Menus[g_MpPlayerNum].curdialog = layer->siblings[layer->cursibling]; if (direction == 1) { - g_Menus[g_MpPlayerNum].curdialog->focuseditem = dialogFindFirstItem(g_Menus[g_MpPlayerNum].curdialog); + g_Menus[g_MpPlayerNum].curdialog->focuseditem = dialog_find_first_item(g_Menus[g_MpPlayerNum].curdialog); } else { - g_Menus[g_MpPlayerNum].curdialog->focuseditem = dialogFindFirstItemRight(g_Menus[g_MpPlayerNum].curdialog); + g_Menus[g_MpPlayerNum].curdialog->focuseditem = dialog_find_first_item_right(g_Menus[g_MpPlayerNum].curdialog); } item = g_Menus[g_MpPlayerNum].curdialog->definition->items; @@ -3881,7 +3881,7 @@ void menuSwipe(s32 direction) g_Menus[g_MpPlayerNum].curdialog->swipedir = direction; - dialogCalculatePosition(g_Menus[g_MpPlayerNum].curdialog); + dialog_calculate_position(g_Menus[g_MpPlayerNum].curdialog); g_Menus[g_MpPlayerNum].curdialog->x = g_Menus[g_MpPlayerNum].curdialog->dstx; g_Menus[g_MpPlayerNum].curdialog->y = g_Menus[g_MpPlayerNum].curdialog->dsty; @@ -3889,15 +3889,15 @@ void menuSwipe(s32 direction) g_Menus[g_MpPlayerNum].curdialog->state = MENUDIALOGSTATE_PREOPEN; g_Menus[g_MpPlayerNum].curdialog->statefrac = 0.0f; - menuUnsetModel(&g_Menus[g_MpPlayerNum].menumodel); + menu_unset_model(&g_Menus[g_MpPlayerNum].menumodel); - menuPlaySound(MENUSOUND_SWIPE); + menu_play_sound(MENUSOUND_SWIPE); } } extern struct menudialogdef g_MpDropOut4MbMenuDialog; -void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags) +void dialog_tick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags) { bool usedefaultbehaviour; struct menudialogdef *definition; @@ -3953,7 +3953,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl if (dialog == g_Menus[g_MpPlayerNum].curdialog) { transitiontotype = definition->type; - if (mpIsPlayerLockedOut(g_MpPlayerNum) && (dialog->definition->flags & MENUDIALOGFLAG_MPLOCKABLE)) { + if (mp_is_player_locked_out(g_MpPlayerNum) && (dialog->definition->flags & MENUDIALOGFLAG_MPLOCKABLE)) { transitiontotype = MENUDIALOGTYPE_DANGER; } @@ -4091,7 +4091,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl dialog->redrawtimer = 0.0f; dialog->statefrac = 0.5f; } - } else if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) && menuGetRoot() == MENUROOT_MPENDSCREEN) { + } else if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) && menu_get_root() == MENUROOT_MPENDSCREEN) { if (var8009dfc0) { #if VERSION >= VERSION_PAL_BETA dialog->statefrac += g_Vars.diffframe240freal / 60.0f; @@ -4148,10 +4148,10 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl } if ((dialog->definition->flags & MENUDIALOGFLAG_DISABLERESIZE) == 0) { - dialogCalculateContentSize(dialog->definition, dialog, menu); + dialog_calculate_content_size(dialog->definition, dialog, menu); } - dialogCalculatePosition(dialog); + dialog_calculate_position(dialog); dialog0f0f1ef4(dialog); // Update slide @@ -4286,9 +4286,9 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl union menuitemdata *handlerdata = NULL; struct menuinputs *inputsptr = inputs; - if (mpIsPlayerLockedOut(g_MpPlayerNum) && (item->flags & MENUITEMFLAG_LOCKABLEMINOR)) { + if (mp_is_player_locked_out(g_MpPlayerNum) && (item->flags & MENUITEMFLAG_LOCKABLEMINOR)) { inputsptr = &spd8; - } else if ((item->flags & MENUITEMFLAG_MPWEAPONSLOT) && mpGetWeaponSet() != func0f189088()) { + } else if ((item->flags & MENUITEMFLAG_MPWEAPONSLOT) && mp_get_weapon_set() != func0f189088()) { inputsptr = &spd8; } else if (g_MenuData.root == MENUROOT_12) { inputsptr = &spd8; @@ -4305,12 +4305,12 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl u32 itemtickflags = tickflags | MENUTICKFLAG_ITEMISFOCUSED; if (dialog->dimmed) { - usedefaultbehaviour = menuitemTick(item, dialog, inputsptr, itemtickflags | MENUTICKFLAG_DIALOGISDIMMED, handlerdata); + usedefaultbehaviour = menuitem_tick(item, dialog, inputsptr, itemtickflags | MENUTICKFLAG_DIALOGISDIMMED, handlerdata); } else { - usedefaultbehaviour = menuitemTick(item, dialog, inputsptr, itemtickflags, handlerdata); + usedefaultbehaviour = menuitem_tick(item, dialog, inputsptr, itemtickflags, handlerdata); } } else { - menuitemTick(item, dialog, inputsptr, tickflags, handlerdata); + menuitem_tick(item, dialog, inputsptr, tickflags, handlerdata); } } } @@ -4319,7 +4319,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl // If the focused item is disabled somehow, automatically jump to the next if (dialog->focuseditem - && menuIsItemDisabled(dialog->focuseditem, dialog) + && menu_is_item_disabled(dialog->focuseditem, dialog) && (tickflags & MENUTICKFLAG_DIALOGISCURRENT)) { usedefaultbehaviour = true; inputs->updown = 1; @@ -4333,36 +4333,36 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl if (layer->numsiblings <= 1) { struct menuitem *prevfocuseditem = dialog->focuseditem; - dialogChangeItemFocus(dialog, inputs->leftright, inputs->updown); + dialog_change_item_focus(dialog, inputs->leftright, inputs->updown); if (dialog->focuseditem != prevfocuseditem) { - menuPlaySound(MENUSOUND_FOCUS); + menu_play_sound(MENUSOUND_FOCUS); } } else { struct menuitem *prevfocuseditem = dialog->focuseditem; - s32 swipedir = dialogChangeItemFocus(dialog, inputs->leftright, inputs->updown); + s32 swipedir = dialog_change_item_focus(dialog, inputs->leftright, inputs->updown); if (swipedir != 0) { - menuSwipe(swipedir); + menu_swipe(swipedir); } else if (prevfocuseditem != dialog->focuseditem) { - menuPlaySound(MENUSOUND_FOCUS); + menu_play_sound(MENUSOUND_FOCUS); } } if (inputs->back) { if ((dialog->definition->flags & MENUDIALOGFLAG_DROPOUTONCLOSE) && g_Vars.unk000498) { if (IS4MB()) { - menuPushDialog(&g_MpDropOut4MbMenuDialog); + menu_push_dialog(&g_MpDropOut4MbMenuDialog); } else { - menuPushDialog(&g_MpDropOutMenuDialog); + menu_push_dialog(&g_MpDropOutMenuDialog); } } else if ((dialog->definition->flags & MENUDIALOGFLAG_IGNOREBACK) == 0) { - menuPopDialog(); + menu_pop_dialog(); } } else if (dialog->definition->flags & MENUDIALOGFLAG_CLOSEONSELECT) { if (dialog->state > MENUDIALOGSTATE_PREOPEN) { if ((inputs->select & 1) == 1 || (inputs->back & 1) == 1) { - menuPopDialog(); + menu_pop_dialog(); } } } @@ -4382,7 +4382,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl s32 itemy; #endif - s32 y = dialogFindItem(dialog, dialog->focuseditem, &rowindex, &colindex); + s32 y = dialog_find_item(dialog, dialog->focuseditem, &rowindex, &colindex); if ((dialog->focuseditem->flags & MENUITEMFLAG_00010000) == 0) { itemy = y + menu->rows[rowindex].height / 2; @@ -4451,7 +4451,7 @@ void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickfl } } -void dialogInitItems(struct menudialog *dialog) +void dialog_init_items(struct menudialog *dialog) { struct menu *menu = &g_Menus[g_MpPlayerNum]; s32 i; @@ -4469,7 +4469,7 @@ void dialogInitItems(struct menudialog *dialog) data = (union menuitemdata *)&menu->blocks[menu->rows[rowindex].blockindex]; } - menuitemInit(item, data); + menuitem_init(item, data); } } } @@ -4482,12 +4482,12 @@ void func0f0fa6ac(void) case MENUROOT_FILEMGR: case MENUROOT_4MBMAINMENU: case MENUROOT_TRAINING: - playerUnpause(); + player_unpause(); g_PlayersWithControl[0] = true; } } -void menuProcessInput(void) +void menu_process_input(void) { s32 yhelddir; s32 xhelddir; @@ -4548,7 +4548,7 @@ void menuProcessInput(void) contpadnums[3] = 3; numcontpads = 4; } else { - menuGetContPads(&contpadnum1, &contpadnum2); + menu_get_cont_pads(&contpadnum1, &contpadnum2); if (contpadnum1 >= 0) { contpadnums[numcontpads] = contpadnum1; @@ -4569,7 +4569,7 @@ void menuProcessInput(void) guid.fileid = g_Menus[g_MpPlayerNum].fm.fileid; guid.deviceserial = g_Menus[g_MpPlayerNum].fm.deviceserial; - filemgrSaveOrLoad(&guid, -1, 0); + filemgr_save_or_load(&guid, -1, 0); } else { g_Menus[g_MpPlayerNum].fm.unke40_00 = true; } @@ -4578,10 +4578,10 @@ void menuProcessInput(void) // Iterate controllers and figure out which buttons are being pressed. // For the control stick input, take whichever stick is pressed the most. for (i = 0; i < numcontpads; i++) { - s8 thisstickx = joyGetStickX(contpadnums[i]); - s8 thissticky = joyGetStickY(contpadnums[i]); - u16 buttons = joyGetButtons(contpadnums[i], 0xffff); - u16 buttonsnow = joyGetButtonsPressedThisFrame(contpadnums[i], 0xffff); + s8 thisstickx = joy_get_stick_x(contpadnums[i]); + s8 thissticky = joy_get_stick_y(contpadnums[i]); + u16 buttons = joy_get_buttons(contpadnums[i], 0xffff); + u16 buttonsnow = joy_get_buttons_pressed_this_frame(contpadnums[i], 0xffff); if (buttonsnow & A_BUTTON) { inputs.select = 1; @@ -4983,7 +4983,7 @@ void menuProcessInput(void) foundcurrent = true; } - dialogTick(layer->siblings[j], &inputs, tickflags); + dialog_tick(layer->siblings[j], &inputs, tickflags); } } } @@ -4998,7 +4998,7 @@ void menuProcessInput(void) if (g_Vars.mpsetupmenu != MPSETUPMENU_GENERAL && g_Menus[g_MpPlayerNum].curdialog->definition != &g_MpReadyMenuDialog) { - menuPushDialog(&g_MpReadyMenuDialog); + menu_push_dialog(&g_MpReadyMenuDialog); } else if (g_Menus[g_MpPlayerNum].curdialog->definition == &g_MpQuickTeamGameSetupMenuDialog) { func0f17f428(); } @@ -5033,7 +5033,7 @@ Gfx *menugfxRenderBgFailureAlt(Gfx *gdl); * frac is used when transitioning between two backgrounds. * A value of 1 means draw this background with full alpha. */ -Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) +Gfx *menu_render_background_layer1(Gfx *gdl, u8 bg, f32 frac) { static u32 bblur = 1; @@ -5043,11 +5043,11 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) u32 alpha = 255 * frac; // Render the blurred background texture with full alpha - gdl = menugfxRenderBgBlur(gdl, 0xffffff00 | alpha, 0, 0); + gdl = menugfx_render_bg_blur(gdl, 0xffffff00 | alpha, 0, 0); // Render it twice more with half alpha and offset - gdl = menugfxRenderBgBlur(gdl, 0xffffff00 | alpha >> 1, -30, -30); - gdl = menugfxRenderBgBlur(gdl, 0xffffff00 | alpha >> 1, 30, 30); + gdl = menugfx_render_bg_blur(gdl, 0xffffff00 | alpha >> 1, -30, -30); + gdl = menugfx_render_bg_blur(gdl, 0xffffff00 | alpha >> 1, 30, 30); } break; case MENUBG_BLACK: @@ -5055,8 +5055,8 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) { u32 colour = 255 * frac; gSPDisplayList(gdl++, var800613a0); - gdl = textSetPrimColour(gdl, colour); - gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight()); + gdl = text_set_prim_colour(gdl, colour); + gDPFillRectangle(gdl++, 0, 0, vi_get_width(), vi_get_height()); gdl = text0f153838(gdl); } break; @@ -5064,12 +5064,12 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) { // Fill with black gSPDisplayList(gdl++, var800613a0); - gdl = textSetPrimColour(gdl, 0x000000ff); - gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight()); + gdl = text_set_prim_colour(gdl, 0x000000ff); + gDPFillRectangle(gdl++, 0, 0, vi_get_width(), vi_get_height()); gdl = text0f153838(gdl); // Render the success BG - gdl = menugfxRenderBgSuccess(gdl); + gdl = menugfx_render_bg_success(gdl); // Render alpha black if fading in { @@ -5077,8 +5077,8 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) if (alpha) { gSPDisplayList(gdl++, var800613a0); - gdl = textSetPrimColour(gdl, alpha); - gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight()); + gdl = text_set_prim_colour(gdl, alpha); + gDPFillRectangle(gdl++, 0, 0, vi_get_width(), vi_get_height()); gdl = text0f153838(gdl); } } @@ -5090,16 +5090,16 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) u32 stack; u32 channel = (1.0f - frac) * 255; gSPDisplayList(gdl++, var800613a0); - gdl = textSetPrimColour(gdl, channel << 24 | channel << 16 | channel << 8 | 0xff); - gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight()); + gdl = text_set_prim_colour(gdl, channel << 24 | channel << 16 | channel << 8 | 0xff); + gDPFillRectangle(gdl++, 0, 0, vi_get_width(), vi_get_height()); gdl = text0f153838(gdl); // Render the failure BG - gdl = menugfxRenderBgFailure(gdl); + gdl = menugfx_render_bg_failure(gdl); } break; case MENUBG_CONEALPHA: - mainOverrideVariable("bblur", &bblur); + main_override_variable("bblur", &bblur); if (g_MenuData.screenshottimer) { return gdl; @@ -5107,7 +5107,7 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) if (bblur) { // Render the blurred background - gdl = menugfxRenderBgBlur(gdl, 0xffffffff, 0, 0); + gdl = menugfx_render_bg_blur(gdl, 0xffffffff, 0, 0); // While fading, render red if (frac < 1.0f) { @@ -5116,19 +5116,19 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) gSPDisplayList(gdl++, var800613a0); alpha = (1.0f - frac) * 255; - gdl = textSetPrimColour(gdl, 0xff000000 | alpha); - gDPFillRectangle(gdl++, 0, 0, viGetWidth(), viGetHeight()); + gdl = text_set_prim_colour(gdl, 0xff000000 | alpha); + gDPFillRectangle(gdl++, 0, 0, vi_get_width(), vi_get_height()); gdl = text0f153838(gdl); } } break; case MENUBG_GRADIENT: // Blue to red - gdl = menugfxRenderGradient(gdl, 0, 0, viGetWidth(), viGetHeight(), 0x00007f7f, 0x000000ff, 0x8f0000ff); + gdl = menugfx_render_gradient(gdl, 0, 0, vi_get_width(), vi_get_height(), 0x00007f7f, 0x000000ff, 0x8f0000ff); break; case MENUBG_CONEOPAQUE: // Yellow to yellow (ie. not a gradient) - gdl = menugfxRenderGradient(gdl, 0, 0, viGetWidth(), viGetHeight(), 0x3f3f00ff, 0x7f0000ff, 0x3f3f00ff); + gdl = menugfx_render_gradient(gdl, 0, 0, vi_get_width(), vi_get_height(), 0x3f3f00ff, 0x7f0000ff, 0x3f3f00ff); break; } @@ -5137,21 +5137,21 @@ Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac) u32 var800714f0 = 1; -Gfx *menuRenderBackgroundLayer2(Gfx *gdl, u8 bg, f32 frac) +Gfx *menu_render_background_layer2(Gfx *gdl, u8 bg, f32 frac) { if (bg == MENUBG_CONEALPHA || bg == MENUBG_CONEOPAQUE) { - mainOverrideVariable("cone", &var800714f0); + main_override_variable("cone", &var800714f0); if (var800714f0 && (g_MenuData.nextbg == MENUBG_CONEALPHA || g_MenuData.nextbg == 0 || g_MenuData.nextbg == 255)) { - gdl = menugfxRenderBgCone(gdl); + gdl = menugfx_render_bg_cone(gdl); } } return gdl; } -Gfx *menuRender(Gfx *gdl) +Gfx *menu_render(Gfx *gdl) { static u32 usepiece = 1; @@ -5170,13 +5170,13 @@ Gfx *menuRender(Gfx *gdl) // Render the background if (g_MenuData.nextbg != 255) { if (g_MenuData.nextbg == 0) { - gdl = menuRenderBackgroundLayer1(gdl, g_MenuData.bg, 1.0f - g_MenuData.unk010); + gdl = menu_render_background_layer1(gdl, g_MenuData.bg, 1.0f - g_MenuData.unk010); } else { - gdl = menuRenderBackgroundLayer1(gdl, g_MenuData.bg, 1.0f); - gdl = menuRenderBackgroundLayer1(gdl, g_MenuData.nextbg, g_MenuData.unk010); + gdl = menu_render_background_layer1(gdl, g_MenuData.bg, 1.0f); + gdl = menu_render_background_layer1(gdl, g_MenuData.nextbg, g_MenuData.unk010); } } else { - gdl = menuRenderBackgroundLayer1(gdl, g_MenuData.bg, 1.0f); + gdl = menu_render_background_layer1(gdl, g_MenuData.bg, 1.0f); } // Calculate hudpiece things then render it @@ -5240,12 +5240,12 @@ Gfx *menuRender(Gfx *gdl) } } - mainOverrideVariable("usePiece", &usepiece); + main_override_variable("usePiece", &usepiece); if (usepiece) { g_MenuData.usezbuf = false; - gdl = menuRenderModel(gdl, &g_MenuData.hudpiece, MENUMODELTYPE_HUDPIECE); + gdl = menu_render_model(gdl, &g_MenuData.hudpiece, MENUMODELTYPE_HUDPIECE); gSPClearGeometryMode(gdl++, G_ZBUFFER); g_MenuData.usezbuf = true; @@ -5263,20 +5263,20 @@ Gfx *menuRender(Gfx *gdl) // which draws over the top of the hud piece) if (g_MenuData.nextbg != 255) { if (g_MenuData.nextbg == 0) { - gdl = menuRenderBackgroundLayer2(gdl, g_MenuData.bg, 1.0f - g_MenuData.unk010); + gdl = menu_render_background_layer2(gdl, g_MenuData.bg, 1.0f - g_MenuData.unk010); } else { - gdl = menuRenderBackgroundLayer2(gdl, g_MenuData.bg, 1.0f); - gdl = menuRenderBackgroundLayer2(gdl, g_MenuData.nextbg, g_MenuData.unk010); + gdl = menu_render_background_layer2(gdl, g_MenuData.bg, 1.0f); + gdl = menu_render_background_layer2(gdl, g_MenuData.nextbg, g_MenuData.unk010); } } else { - gdl = menuRenderBackgroundLayer2(gdl, g_MenuData.bg, 1.0f); + gdl = menu_render_background_layer2(gdl, g_MenuData.bg, 1.0f); } - // Render the health bar (playerRenderHealthBar may choose not to render) + // Render the health bar (player_render_health_bar may choose not to render) if ((g_MenuData.bg || g_MenuData.nextbg != 255) && (!g_Vars.currentplayer->eyespy || !g_Vars.currentplayer->eyespy->active)) { gdl = func0f0d49c8(gdl); - gdl = playerRenderHealthBar(gdl); + gdl = player_render_health_bar(gdl); gdl = func0f0d479c(gdl); } @@ -5286,19 +5286,19 @@ Gfx *menuRender(Gfx *gdl) if (g_MenuData.root == MENUROOT_MPPAUSE || g_MenuData.root == MENUROOT_MPENDSCREEN) { g_MpPlayerNum = g_Vars.currentplayerstats->mpindex; - gdl = menuRenderDialogs(gdl); + gdl = menu_render_dialogs(gdl); } else { s32 i; for (i = 0; i < MAX_PLAYERS; i++) { g_MpPlayerNum = i; - gdl = menuRenderDialogs(gdl); + gdl = menu_render_dialogs(gdl); } } g_MpPlayerNum = 0; - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPDisplayList(gdl++, var800613a0); text0f153b40(); @@ -5307,10 +5307,10 @@ Gfx *menuRender(Gfx *gdl) if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) { s32 i; s32 j; - s32 viewleft = viGetViewLeft() / g_ScaleX + 20; - s32 viewtop = viGetViewTop() + 4; - s32 viewright = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX - 20; - s32 viewbottom = viGetViewTop() + viGetViewHeight() - 4; + s32 viewleft = vi_get_view_left() / g_ScaleX + 20; + s32 viewtop = vi_get_view_top() + 4; + s32 viewright = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX - 20; + s32 viewbottom = vi_get_view_top() + vi_get_view_height() - 4; s32 textheight; s32 textwidth; bool renderit; @@ -5334,7 +5334,7 @@ Gfx *menuRender(Gfx *gdl) // or similar. Show "Ready" in their corner. renderit = true; // "Player %d: " and "Ready!" - sprintf(text, "%s%s", langGet(L_MPMENU_482), langGet(L_MISC_461)); + sprintf(text, "%s%s", lang_get(L_MPMENU_482), lang_get(L_MISC_461)); } else { if (g_MenuData.root == MENUROOT_4MBMAINMENU) { if (g_Vars.mpsetupmenu == MPSETUPMENU_GENERAL) { @@ -5353,15 +5353,15 @@ Gfx *menuRender(Gfx *gdl) } // "Player %d: " and "Press START!" - sprintf(text, "%s%s", langGet(L_MPMENU_482), langGet(L_MPMENU_483)); + sprintf(text, "%s%s", lang_get(L_MPMENU_482), lang_get(L_MPMENU_483)); } if (renderit) { - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); // Check which controllers are connected // and update the alpha of the label - if (((g_MpSetup.chrslots | ~joyGetConnectedControllers()) & (1 << i)) == 0) { + if (((g_MpSetup.chrslots | ~joy_get_connected_controllers()) & (1 << i)) == 0) { #if VERSION >= VERSION_PAL_BETA tmp1 = g_Vars.diffframe60freal * 3; #else @@ -5392,10 +5392,10 @@ Gfx *menuRender(Gfx *gdl) } if (g_MenuData.playerjoinalpha[i] > 0) { - u32 weight = menuGetSinOscFrac(20) * 255.0f; + u32 weight = menu_get_sin_osc_frac(20) * 255.0f; // "Player %d: " - sprintf(text, langGet(L_MPMENU_482), i + 1); + sprintf(text, lang_get(L_MPMENU_482), i + 1); if (i < 2) { y = viewtop + 2; @@ -5409,25 +5409,25 @@ Gfx *menuRender(Gfx *gdl) x = viewleft + 2; } - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, g_MenuData.playerjoinalpha[i] | 0x5070ff00, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, g_MenuData.playerjoinalpha[i] | 0x5070ff00, vi_get_width(), vi_get_height(), 0, 0); if (g_Vars.mpsetupmenu == MPSETUPMENU_GENERAL && g_Vars.waitingtojoin[i]) { // "Ready!" #if VERSION >= VERSION_JPN_FINAL colour = L_MISC_461; - strcpy(text, langGet(colour)); + strcpy(text, lang_get(colour)); colour = 0xffffffff; #else - strcpy(text, langGet(L_MISC_461)); + strcpy(text, lang_get(L_MISC_461)); colour = g_MenuData.playerjoinalpha[i] | 0xd00020ff; #endif } else { // "Press START!" - strcpy(text, langGet(L_MPMENU_483)); - colour = colourBlend(0x00ffff00, 0xffffff00, weight) | g_MenuData.playerjoinalpha[i]; + strcpy(text, lang_get(L_MPMENU_483)); + colour = colour_blend(0x00ffff00, 0xffffff00, weight) | g_MenuData.playerjoinalpha[i]; } - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, vi_get_width(), vi_get_height(), 0, 0); } } } @@ -5441,10 +5441,10 @@ Gfx *menuRender(Gfx *gdl) // Render banner messages, such as "Please Wait...", // "Checking Controller Pak" and some unused game boy camera texts. if (g_MenuData.bannernum != -1) { - s32 x1 = viGetViewLeft() / g_ScaleX; - s32 y1 = viGetViewTop(); - s32 x2 = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX; - s32 y2 = viGetViewTop() + viGetViewHeight(); + s32 x1 = vi_get_view_left() / g_ScaleX; + s32 y1 = vi_get_view_top(); + s32 x2 = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX; + s32 y2 = vi_get_view_top() + vi_get_view_height(); #if VERSION >= VERSION_NTSC_1_0 s32 left = 0; @@ -5458,7 +5458,7 @@ Gfx *menuRender(Gfx *gdl) } } - if (PLAYERCOUNT() == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) { + if (PLAYERCOUNT() == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())) { if (g_Vars.currentplayernum == 1) { right = 15; } else { @@ -5466,7 +5466,7 @@ Gfx *menuRender(Gfx *gdl) } } - gdl = menuRenderBanner(gdl, x1, y1, x2, y2, PLAYERCOUNT() < 2, g_MenuData.bannernum, left, right); + gdl = menu_render_banner(gdl, x1, y1, x2, y2, PLAYERCOUNT() < 2, g_MenuData.bannernum, left, right); #else if (PLAYERCOUNT() >= 3) { if (g_Vars.currentplayernum == 1 || g_Vars.currentplayernum == 3) { @@ -5476,7 +5476,7 @@ Gfx *menuRender(Gfx *gdl) } } - if (PLAYERCOUNT() == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())) { + if (PLAYERCOUNT() == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())) { if (g_Vars.currentplayernum == 1) { x2 -= 10; } else { @@ -5484,7 +5484,7 @@ Gfx *menuRender(Gfx *gdl) } } - gdl = menuRenderBanner(gdl, x1, y1, x2, y2, PLAYERCOUNT() < 2, g_MenuData.bannernum); + gdl = menu_render_banner(gdl, x1, y1, x2, y2, PLAYERCOUNT() < 2, g_MenuData.bannernum); #endif } @@ -5497,7 +5497,7 @@ Gfx *menuRender(Gfx *gdl) const char var7f1b27a4[] = "Tune Selector - mode %d\n"; -u32 menuChooseMusic(void) +u32 menu_choose_music(void) { s32 missionsuccess = MUSIC_MISSION_SUCCESS; @@ -5506,7 +5506,7 @@ u32 menuChooseMusic(void) } if (g_MenuData.root == MENUROOT_ENDSCREEN) { - if (g_Vars.bond->isdead || g_Vars.bond->aborted || !objectiveIsAllComplete()) { + if (g_Vars.bond->isdead || g_Vars.bond->aborted || !objective_is_all_complete()) { return MUSIC_MISSION_FAILED; } @@ -5518,7 +5518,7 @@ u32 menuChooseMusic(void) if ((g_Vars.bond->isdead && g_Vars.coop->isdead) || g_Vars.bond->aborted || g_Vars.coop->aborted - || !objectiveIsAllComplete()) { + || !objective_is_all_complete()) { return MUSIC_MISSION_FAILED; } @@ -5526,7 +5526,7 @@ u32 menuChooseMusic(void) } if (g_Vars.antiplayernum >= 0) { - if (g_Vars.bond->isdead || g_Vars.bond->aborted || !objectiveIsAllComplete()) { + if (g_Vars.bond->isdead || g_Vars.bond->aborted || !objective_is_all_complete()) { return MUSIC_MISSION_FAILED; } @@ -5575,7 +5575,7 @@ bool func0f0fcc04(void) return false; } -u32 menuGetRoot(void) +u32 menu_get_root(void) { if (g_MenuData.count == 0) { return 0; @@ -5603,7 +5603,7 @@ MenuItemHandlerResult menuhandler000fcc34(s32 operation, struct menuitem *item, || g_Menus[g_MpPlayerNum].curdialog->definition == &g_PakDamagedMenuDialog || g_Menus[g_MpPlayerNum].curdialog->definition == &g_PakFullMenuDialog) { done = false; - menuPopDialog(); + menu_pop_dialog(); } } } @@ -5618,7 +5618,7 @@ MenuDialogHandlerResult menudialog000fcd48(s32 operation, struct menudialogdef * if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef - && joyGetPakState(g_Menus[g_MpPlayerNum].fm.device3) == PAKSTATE_NOPAK) { + && joy_get_pak_state(g_Menus[g_MpPlayerNum].fm.device3) == PAKSTATE_NOPAK) { func0f0f3704(&g_PakRemovedMenuDialog); } } @@ -5637,10 +5637,10 @@ MenuItemHandlerResult func0f0fcdd0(s32 operation, struct menuitem *item, union h } #endif -MenuItemHandlerResult menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_repair_pak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - if (pakRepair(g_Menus[g_MpPlayerNum].fm.device3)) { + if (pak_repair(g_Menus[g_MpPlayerNum].fm.device3)) { func0f0f3704(&g_PakRepairSuccessMenuDialog); } else { func0f0f3704(&g_PakRepairFailedMenuDialog); @@ -5650,7 +5650,7 @@ MenuItemHandlerResult menuhandlerRepairPak(s32 operation, struct menuitem *item, return 0; } -void menuPushPakDialogForPlayer(struct menudialogdef *dialogdef, s32 playernum, s32 paknum) +void menu_push_pak_dialog_for_player(struct menudialogdef *dialogdef, s32 playernum, s32 paknum) { s32 prevplayernum = g_MpPlayerNum; @@ -5659,14 +5659,14 @@ void menuPushPakDialogForPlayer(struct menudialogdef *dialogdef, s32 playernum, if (g_Menus[g_MpPlayerNum].curdialog == NULL) { if (PLAYERCOUNT() == 1) { - menuPushRootDialog(dialogdef, MENUROOT_MAINMENU); - lvSetPaused(true); + menu_push_root_dialog(dialogdef, MENUROOT_MAINMENU); + lv_set_paused(true); g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED; } else { - menuPushRootDialog(dialogdef, MENUROOT_MPPAUSE); + menu_push_root_dialog(dialogdef, MENUROOT_MPPAUSE); } } else { - menuPushDialog(dialogdef); + menu_push_dialog(dialogdef); } g_MpPlayerNum = prevplayernum; @@ -5836,7 +5836,7 @@ struct menuitem g_PakAttemptRepairMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_179, // "Repair" 0, - menuhandlerRepairPak, + menuhandler_repair_pak, }, { MENUITEMTYPE_END }, }; @@ -5850,7 +5850,7 @@ struct menudialogdef g_PakAttemptRepairMenuDialog = { NULL, }; -char *menuTextSaveDeviceName(struct menuitem *item) +char *menu_text_save_device_name(struct menuitem *item) { u16 devices[] = { L_OPTIONS_112, // "Controller Pak 1" @@ -5863,16 +5863,16 @@ char *menuTextSaveDeviceName(struct menuitem *item) }; if ((u8)g_Menus[g_MpPlayerNum].fm.device3 < ARRAYCOUNT(devices)) { - return langGet(devices[(u8)g_Menus[g_MpPlayerNum].fm.device3]); + return lang_get(devices[(u8)g_Menus[g_MpPlayerNum].fm.device3]); } return NULL; } -MenuItemHandlerResult menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_retry_save_pak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); + menu_pop_dialog(); #if VERSION >= VERSION_NTSC_1_0 g_Vars.pakstocheck &= 0xfff0; @@ -5886,11 +5886,11 @@ MenuItemHandlerResult menuhandlerRetrySavePak(s32 operation, struct menuitem *it return 0; } -MenuItemHandlerResult menuhandlerWarnRepairPak(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_warn_repair_pak(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { #if VERSION >= VERSION_NTSC_1_0 - menuPushDialog(&g_PakAttemptRepairMenuDialog); + menu_push_dialog(&g_PakAttemptRepairMenuDialog); #else func0f0f3704(&g_PakAttemptRepairMenuDialog); #endif @@ -5899,7 +5899,7 @@ MenuItemHandlerResult menuhandlerWarnRepairPak(s32 operation, struct menuitem *i return 0; } -s32 menuPakNumToPlayerNum(s32 paknum) +s32 menu_pak_num_to_player_num(s32 paknum) { u32 result = 0; @@ -5918,9 +5918,9 @@ s32 menuPakNumToPlayerNum(s32 paknum) return result; } -bool menuIsReadyForPakError(s32 paknum, s32 pakerrordialog) +bool menu_is_ready_for_pak_error(s32 paknum, s32 pakerrordialog) { - s32 playernum = menuPakNumToPlayerNum(paknum); + s32 playernum = menu_pak_num_to_player_num(paknum); bool result = true; if (g_Vars.lvframenum < 20) { @@ -5955,10 +5955,10 @@ bool menuIsReadyForPakError(s32 paknum, s32 pakerrordialog) return result; } -void menuPushPakErrorDialog(s32 paknum, s32 pakerrordialog) +void menu_push_pak_error_dialog(s32 paknum, s32 pakerrordialog) { s32 prevplayernum = g_MpPlayerNum; - s32 playernum = menuPakNumToPlayerNum(paknum); + s32 playernum = menu_pak_num_to_player_num(paknum); bool found; s32 i; @@ -5967,7 +5967,7 @@ void menuPushPakErrorDialog(s32 paknum, s32 pakerrordialog) switch (pakerrordialog) { case PAKERRORDIALOG_CORRUPT: case PAKERRORDIALOG_DEVICEERROR: - menuPushPakDialogForPlayer(&g_PakDamagedMenuDialog, playernum, paknum); + menu_push_pak_dialog_for_player(&g_PakDamagedMenuDialog, playernum, paknum); break; case PAKERRORDIALOG_FULL: found = false; @@ -5980,15 +5980,15 @@ void menuPushPakErrorDialog(s32 paknum, s32 pakerrordialog) } if (!found) { - menuPushPakDialogForPlayer(&g_PakFullMenuDialog, playernum, paknum); + menu_push_pak_dialog_for_player(&g_PakFullMenuDialog, playernum, paknum); } break; #if VERSION >= VERSION_NTSC_1_0 case PAKERRORDIALOG_GB_UNREADABLE: - menuPushPakDialogForPlayer(&g_PakCannotReadGameBoyMenuDialog, playernum, paknum); + menu_push_pak_dialog_for_player(&g_PakCannotReadGameBoyMenuDialog, playernum, paknum); break; case PAKERRORDIALOG_DATALOST: - menuPushPakDialogForPlayer(&g_PakDataLostMenuDialog, playernum, paknum); + menu_push_pak_dialog_for_player(&g_PakDataLostMenuDialog, playernum, paknum); break; #endif } @@ -6004,13 +6004,13 @@ void func0f0fd494(struct coord *pos) g_MenuData.unk5d5_04 = true; - matrix = camGetWorldToScreenMtxf(); + matrix = cam_get_world_to_screen_mtxf(); - mtx4TransformVec(matrix, pos, &coord); + mtx4_transform_vec(matrix, pos, &coord); cam0f0b4d04(&coord, xy); - g_MenuData.unk670 = (s32)xy[0] - viGetWidth() / 2; - g_MenuData.unk674 = (s32)xy[1] - viGetHeight() / 2; + g_MenuData.unk670 = (s32)xy[0] - vi_get_width() / 2; + g_MenuData.unk674 = (s32)xy[1] - vi_get_height() / 2; g_MenuData.unk5d5_05 = false; } @@ -6021,7 +6021,7 @@ void func0f0fd548(s32 arg0) g_MenuData.unk66f = 0; } -struct menudialog *menuIsDialogOpen(struct menudialogdef *dialogdef) +struct menudialog *menu_is_dialog_open(struct menudialogdef *dialogdef) { s32 i; s32 j; @@ -6045,7 +6045,7 @@ struct menuitem g_PakDamagedMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&menuTextSaveDeviceName, + (uintptr_t)&menu_text_save_device_name, 0, NULL, }, @@ -6079,7 +6079,7 @@ struct menuitem g_PakDamagedMenuItems[] = { 0, L_MPWEAPONS_067, // "Attempt Repair" 0, - menuhandlerWarnRepairPak, + menuhandler_warn_repair_pak, }, { MENUITEMTYPE_SELECTABLE, @@ -6087,7 +6087,7 @@ struct menuitem g_PakDamagedMenuItems[] = { 0, L_MPWEAPONS_068, // "Retry" 0, - menuhandlerRetrySavePak, + menuhandler_retry_save_pak, }, { MENUITEMTYPE_SELECTABLE, @@ -6118,7 +6118,7 @@ struct menuitem g_PakFullMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&menuTextSaveDeviceName, + (uintptr_t)&menu_text_save_device_name, 0, NULL, }, @@ -6223,7 +6223,7 @@ struct menuitem g_PakDataLostMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&menuTextSaveDeviceName, + (uintptr_t)&menu_text_save_device_name, 0, NULL, }, diff --git a/src/game/menugfx.c b/src/game/menugfx.c index b2a887833..dd181c71d 100644 --- a/src/game/menugfx.c +++ b/src/game/menugfx.c @@ -42,16 +42,16 @@ * It's a simple fade between the source framebuffer and the blurred image. * Only one blurred image is made. */ -void menugfxCreateBlur(void) +void menugfx_create_blur(void) { - u8 *fb = (u8 *) viGetFrontBuffer(); + u8 *fb = (u8 *) vi_get_front_buffer(); s32 dstx; s32 dsty; #if PAL - s32 fbwidthinbytes = viGetWidth() * 2; - f32 scale = viGetWidth() / (f32) SCREEN_WIDTH_LO; + s32 fbwidthinbytes = vi_get_width() * 2; + f32 scale = vi_get_width() / (f32) SCREEN_WIDTH_LO; #else - s32 fbwidthinbytes = PXTOBYTES(viGetWidth()); + s32 fbwidthinbytes = PXTOBYTES(vi_get_width()); #endif s32 srcx; s32 srcy; @@ -69,10 +69,10 @@ void menugfxCreateBlur(void) #endif if (cccc == 1) { - fb = (u8 *) viGetFrontBuffer(); + fb = (u8 *) vi_get_front_buffer(); } - mainOverrideVariable("cccc", &cccc); + main_override_variable("cccc", &cccc); for (dsty = 0; dsty < BLURIMG_HEIGHT; dsty++) { @@ -115,7 +115,7 @@ void menugfxCreateBlur(void) g_ScaleX = 1; } -Gfx *menugfxRenderBgBlur(Gfx *gdl, u32 colour, s16 arg2, s16 arg3) +Gfx *menugfx_render_bg_blur(Gfx *gdl, u32 colour, s16 arg2, s16 arg3) { Col *colours; Vtx *vertices; @@ -125,11 +125,11 @@ Gfx *menugfxRenderBgBlur(Gfx *gdl, u32 colour, s16 arg2, s16 arg3) #endif if (IS4MB()) { - return menugfxRenderGradient(gdl, 0, 0, viGetWidth(), viGetHeight(), 0xff, 0xff, 0xff); + return menugfx_render_gradient(gdl, 0, 0, vi_get_width(), vi_get_height(), 0xff, 0xff, 0xff); } - colours = gfxAllocateColours(1); - vertices = gfxAllocateVertices(4); + colours = gfx_allocate_colours(1); + vertices = gfx_allocate_vertices(4); gDPPipeSync(gdl++); gSPTexture(gdl++, 0xffff, 0xffff, 0, G_TX_RENDERTILE, G_ON); @@ -148,8 +148,8 @@ Gfx *menugfxRenderBgBlur(Gfx *gdl, u32 colour, s16 arg2, s16 arg3) gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); #if VERSION >= VERSION_JPN_FINAL - width = viGetWidth() * 10; - height = viGetHeight() * 10; + width = vi_get_width() * 10; + height = vi_get_height() * 10; *(u16 *)&vertices[0].x = arg2; *(u16 *)&vertices[0].y = arg3; @@ -164,8 +164,8 @@ Gfx *menugfxRenderBgBlur(Gfx *gdl, u32 colour, s16 arg2, s16 arg3) *(u16 *)&vertices[3].y = arg3 + SCREEN_240 * 10u + 50; vertices[3].z = -10; #elif PAL - width = viGetWidth() * 10; - height = viGetHeight() * 10; + width = vi_get_width() * 10; + height = vi_get_height() * 10; *(u16 *)&vertices[0].x = arg2; *(u16 *)&vertices[0].y = arg3; @@ -232,20 +232,20 @@ void func0f0e0cbc(s32 arg0, s32 arg1, s16 arg2, s16 arg3, Vtx *vertex, Mtxf *arg vertex->colour = 0; - mtx4TransformVecInPlace(arg5, &sp24); + mtx4_transform_vec_in_place(arg5, &sp24); vertex->s = sp24.x * 32; vertex->t = sp24.y * 32; } -Gfx *menugfxRenderDialogBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct menudialog *dialog, u32 colour1, u32 colour2, f32 arg8) +Gfx *menugfx_render_dialog_background(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct menudialog *dialog, u32 colour1, u32 colour2, f32 arg8) { u32 stack[1]; u32 leftcolour; u32 rightcolour; // Render the dialog's background fill - gdl = textSetPrimColour(gdl, colour1); + gdl = text_set_prim_colour(gdl, colour1); gDPFillRectangleScaled(gdl++, x1, y1, x2, y2); @@ -254,19 +254,19 @@ Gfx *menugfxRenderDialogBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, str if (dialog->transitionfrac < 0.0f) { leftcolour = g_MenuColours[dialog->type].dialog_border1; } else { - leftcolour = colourBlend(g_MenuColours[dialog->type2].dialog_border1, g_MenuColours[dialog->type].dialog_border1, dialog->colourweight); + leftcolour = colour_blend(g_MenuColours[dialog->type2].dialog_border1, g_MenuColours[dialog->type].dialog_border1, dialog->colourweight); } if (dialog->transitionfrac < 0.0f) { rightcolour = g_MenuColours[dialog->type].dialog_border2; } else { - rightcolour = colourBlend(g_MenuColours[dialog->type2].dialog_border2, g_MenuColours[dialog->type].dialog_border2, dialog->colourweight); + rightcolour = colour_blend(g_MenuColours[dialog->type2].dialog_border2, g_MenuColours[dialog->type].dialog_border2, dialog->colourweight); } // Right, left, bottom border - gdl = menugfxDrawDialogBorderLine(gdl, x2 - 1, y1, x2, y2, rightcolour, rightcolour); - gdl = menugfxDrawDialogBorderLine(gdl, x1, y1, x1 + 1, y2, leftcolour, leftcolour); - gdl = menugfxDrawDialogBorderLine(gdl, x1, y2 - 1, x2, y2, leftcolour, rightcolour); + gdl = menugfx_draw_dialog_border_line(gdl, x2 - 1, y1, x2, y2, rightcolour, rightcolour); + gdl = menugfx_draw_dialog_border_line(gdl, x1, y1, x1 + 1, y2, leftcolour, leftcolour); + gdl = menugfx_draw_dialog_border_line(gdl, x1, y2 - 1, x2, y2, leftcolour, rightcolour); return gdl; } @@ -277,7 +277,7 @@ Gfx *menugfxRenderDialogBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, str * The background consists of two layers of a green hazy texture. * Both layers spin slowly in opposite directions. */ -Gfx *menugfxRenderBgGreenHaze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) +Gfx *menugfx_render_bg_green_haze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) { s32 i; Col *colours; @@ -295,8 +295,8 @@ Gfx *menugfxRenderBgGreenHaze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) f32 f2; u32 stack; - colours = gfxAllocateColours(4); - vertices = gfxAllocateVertices(8); + colours = gfx_allocate_colours(4); + vertices = gfx_allocate_vertices(8); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -305,7 +305,7 @@ Gfx *menugfxRenderBgGreenHaze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) gSPClearGeometryMode(gdl++, G_CULL_BOTH); gDPSetTextureFilter(gdl++, G_TF_BILERP); - texSelect(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); @@ -394,10 +394,10 @@ Gfx *menugfxRenderBgGreenHaze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) return gdl; } -Gfx *menugfxDrawDropdownBackground(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) { - Col *colours = gfxAllocateColours(3); - Vtx *vertices = gfxAllocateVertices(6); + Col *colours = gfx_allocate_colours(3); + Vtx *vertices = gfx_allocate_vertices(6); u32 colour1; u32 colour2; @@ -408,7 +408,7 @@ Gfx *menugfxDrawDropdownBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) gSPClearGeometryMode(gdl++, G_CULL_BOTH); gDPSetTextureFilter(gdl++, G_TF_BILERP); - texSelect(&gdl, NULL, 2, 0, 2, true, NULL); + tex_select(&gdl, NULL, 2, 0, 2, true, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); @@ -459,13 +459,13 @@ Gfx *menugfxDrawDropdownBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) } #if VERSION >= VERSION_NTSC_1_0 -Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3, u8 alpha) +Gfx *menugfx_draw_list_group_header(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3, u8 alpha) #else -Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3) +Gfx *menugfx_draw_list_group_header(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3) #endif { - Col *colours = gfxAllocateColours(7); - Vtx *vertices = gfxAllocateVertices(9); + Col *colours = gfx_allocate_colours(7); + Vtx *vertices = gfx_allocate_vertices(9); u32 alpha1; u32 alpha2; @@ -476,7 +476,7 @@ Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3 gSPClearGeometryMode(gdl++, G_CULL_BOTH); gDPSetTextureFilter(gdl++, G_TF_BILERP); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); @@ -544,15 +544,15 @@ Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3 gSPTri4(gdl++, 0, 1, 3, 3, 2, 0, 2, 3, 4, 4, 3, 5); gSPTri4(gdl++, 1, 6, 7, 7, 3, 1, 3, 7, 8, 8, 5, 3); - gdl = menugfxDrawShimmer(gdl, x1, y1, x2, y1 + 1, (alpha1 & 0xff) >> 2, 1, 0x28, 0); - gdl = menugfxDrawShimmer(gdl, x1, y2, x2, y2 + 1, (alpha1 & 0xff) >> 2, 0, 0x28, 1); + gdl = menugfx_draw_shimmer(gdl, x1, y1, x2, y1 + 1, (alpha1 & 0xff) >> 2, 1, 0x28, 0); + gdl = menugfx_draw_shimmer(gdl, x1, y2, x2, y2 + 1, (alpha1 & 0xff) >> 2, 0, 0x28, 1); return gdl; } #if MATCHING GLOBAL_ASM( -glabel menugfxRenderGradient +glabel menugfx_render_gradient /* f0e1ce8: 27bdffa0 */ addiu $sp,$sp,-96 /* f0e1cec: afbf002c */ sw $ra,0x2c($sp) /* f0e1cf0: afa40060 */ sw $a0,0x60($sp) @@ -561,10 +561,10 @@ glabel menugfxRenderGradient /* f0e1cfc: afa50064 */ sw $a1,0x64($sp) /* f0e1d00: afa60068 */ sw $a2,0x68($sp) /* f0e1d04: afa7006c */ sw $a3,0x6c($sp) -/* f0e1d08: 0fc59e73 */ jal gfxAllocateColours +/* f0e1d08: 0fc59e73 */ jal gfx_allocate_colours /* f0e1d0c: 24040003 */ addiu $a0,$zero,0x3 /* f0e1d10: 00408825 */ or $s1,$v0,$zero -/* f0e1d14: 0fc59e59 */ jal gfxAllocateVertices +/* f0e1d14: 0fc59e59 */ jal gfx_allocate_vertices /* f0e1d18: 24040006 */ addiu $a0,$zero,0x6 /* f0e1d1c: 8fae0060 */ lw $t6,0x60($sp) /* f0e1d20: 3c18e700 */ lui $t8,0xe700 @@ -618,7 +618,7 @@ glabel menugfxRenderGradient /* f0e1de0: 27a40060 */ addiu $a0,$sp,0x60 /* f0e1de4: 00002825 */ or $a1,$zero,$zero /* f0e1de8: 24060002 */ addiu $a2,$zero,0x2 -/* f0e1dec: 0fc2ce70 */ jal texSelect +/* f0e1dec: 0fc2ce70 */ jal tex_select /* f0e1df0: 00003825 */ or $a3,$zero,$zero /* f0e1df4: 8fb90060 */ lw $t9,0x60($sp) /* f0e1df8: 8fab0070 */ lw $t3,0x70($sp) @@ -735,10 +735,10 @@ glabel menugfxRenderGradient ); #else // Mismatch: Goal has the if statement with empty contents -Gfx *menugfxRenderGradient(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colourstart, u32 colourmid, u32 colourend) +Gfx *menugfx_render_gradient(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colourstart, u32 colourmid, u32 colourend) { - Col *colours = gfxAllocateColours(3); - Vtx *vertices = gfxAllocateVertices(6); + Col *colours = gfx_allocate_colours(3); + Vtx *vertices = gfx_allocate_vertices(6); s32 ymid; gDPPipeSync(gdl++); @@ -748,7 +748,7 @@ Gfx *menugfxRenderGradient(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colours gSPClearGeometryMode(gdl++, G_CULL_BOTH); gDPSetTextureFilter(gdl++, G_TF_BILERP); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); @@ -808,10 +808,10 @@ Gfx *menugfxRenderGradient(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colours } #endif -Gfx *menugfxRenderSlider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, u32 colour) +Gfx *menugfx_render_slider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, u32 colour) { - Col *colours = gfxAllocateColours(3); - Vtx *vertices = gfxAllocateVertices(6); + Col *colours = gfx_allocate_colours(3); + Vtx *vertices = gfx_allocate_vertices(6); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -820,7 +820,7 @@ Gfx *menugfxRenderSlider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, gSPClearGeometryMode(gdl++, G_CULL_BOTH); gDPSetTextureFilter(gdl++, G_TF_BILERP); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); @@ -873,10 +873,10 @@ Gfx *menugfxRenderSlider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); // Line to the left of the marker: blue -> white gradient - gdl = menugfxDrawLine(gdl, x1, y2, markerx, y2 + 1, 0x0000ffff, 0xffffffff); + gdl = menugfx_draw_line(gdl, x1, y2, markerx, y2 + 1, 0x0000ffff, 0xffffffff); // Line to the right of the marker: solid blue - gdl = menugfxDrawLine(gdl, markerx, y2, x2, y2 + 1, 0x0000ffff, 0x0000ffff); + gdl = menugfx_draw_line(gdl, markerx, y2, x2, y2 + 1, 0x0000ffff, 0x0000ffff); return gdl; } @@ -910,20 +910,20 @@ Gfx *menugfx0f0e2498(Gfx *gdl) gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI); gSPClearGeometryMode(gdl++, G_CULL_BOTH); - texSelect(&gdl, 0, 2, 0, 2, 1, NULL); + tex_select(&gdl, 0, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); return gdl; } -Gfx *menugfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7) +Gfx *menugfx_draw_tri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7) { Vtx *vertices; Col *colours; - colours = gfxAllocateColours(2); - vertices = gfxAllocateVertices(4); + colours = gfx_allocate_colours(2); + vertices = gfx_allocate_vertices(4); vertices[0].x = x1 * 10; vertices[0].y = y1 * 10; @@ -963,15 +963,15 @@ Gfx *menugfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 return gdl; } -Gfx *menugfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) +Gfx *menugfx_draw_line(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) { gdl = menugfx0f0e2498(gdl); - gdl = menugfxDrawTri2(gdl, x1, y1, x2, y2, colour1, colour2, false); + gdl = menugfx_draw_tri2(gdl, x1, y1, x2, y2, colour1, colour2, false); return gdl; } -Gfx *menugfxDrawProjectedLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) +Gfx *menugfx_draw_projected_line(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) { s32 numfullblocks; s32 i; @@ -981,33 +981,33 @@ Gfx *menugfxDrawProjectedLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colo s32 parttop; u32 stack[2]; - if (textHasDiagonalBlend()) { + if (text_has_diagonal_blend()) { if (x2 - x1 < y2 - y1) { // Portrait numfullblocks = (y2 - y1) / 15; parttop = y1; - partcolourtop = textApplyProjectionColour(x1, y1, colour1); + partcolourtop = text_apply_projection_colour(x1, y1, colour1); for (i = 0; i < numfullblocks; i++) { partbottom = y1 + i * 15; if (y2 - partbottom < 3) { partbottom = y2; - partcolourbottom = textApplyProjectionColour(x2, partbottom, colour2); + partcolourbottom = text_apply_projection_colour(x2, partbottom, colour2); } else { - partcolourbottom = colourBlend(colour2, colour1, (partbottom - y1) * 255 / (y2 - y1)); + partcolourbottom = colour_blend(colour2, colour1, (partbottom - y1) * 255 / (y2 - y1)); // @bug: y1 should be x1 - partcolourbottom = textApplyProjectionColour(y1, partbottom, partcolourbottom); + partcolourbottom = text_apply_projection_colour(y1, partbottom, partcolourbottom); } - gdl = menugfxDrawTri2(gdl, x1, parttop, x2, partbottom, partcolourtop, partcolourbottom, false); + gdl = menugfx_draw_tri2(gdl, x1, parttop, x2, partbottom, partcolourtop, partcolourbottom, false); parttop = partbottom; partcolourtop = partcolourbottom; } - partcolourbottom = textApplyProjectionColour(x2, y2, colour2); - gdl = menugfxDrawTri2(gdl, x1, parttop, x2, y2, partcolourtop, partcolourbottom, false); + partcolourbottom = text_apply_projection_colour(x2, y2, colour2); + gdl = menugfx_draw_tri2(gdl, x1, parttop, x2, y2, partcolourtop, partcolourbottom, false); } else { // Landscape s32 numfullblocks; @@ -1020,20 +1020,20 @@ Gfx *menugfxDrawProjectedLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colo numfullblocks = (x2 - x1) / 15; partleft = x1; - partcolourleft = textApplyProjectionColour(x1, y1, colour1); + partcolourleft = text_apply_projection_colour(x1, y1, colour1); for (i = 0; i < numfullblocks; i++) { partright = x1 + i * 15; if (x2 - partright < 3) { partright = x2; - partcolourright = textApplyProjectionColour(x2, y2, colour2); + partcolourright = text_apply_projection_colour(x2, y2, colour2); } else { - partcolourright = colourBlend(colour2, colour1, (partright - x1) * 255 / (x2 - x1)); - partcolourright = textApplyProjectionColour(partright, y1, partcolourright); + partcolourright = colour_blend(colour2, colour1, (partright - x1) * 255 / (x2 - x1)); + partcolourright = text_apply_projection_colour(partright, y1, partcolourright); } - gdl = menugfxDrawTri2(gdl, partleft, y1, partright, y2, partcolourleft, partcolourright, false); + gdl = menugfx_draw_tri2(gdl, partleft, y1, partright, y2, partcolourleft, partcolourright, false); partleft = partright; partcolourleft = partcolourright; @@ -1041,11 +1041,11 @@ Gfx *menugfxDrawProjectedLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colo if (partcolourtop); - partcolourright = textApplyProjectionColour(x2, y2, colour2); - gdl = menugfxDrawTri2(gdl, partleft, y1, x2, y2, partcolourleft, partcolourright, false); + partcolourright = text_apply_projection_colour(x2, y2, colour2); + gdl = menugfx_draw_tri2(gdl, partleft, y1, x2, y2, partcolourleft, partcolourright, false); } } else { - gdl = menugfxDrawTri2(gdl, x1, y1, x2, y2, colour1, colour2, false); + gdl = menugfx_draw_tri2(gdl, x1, y1, x2, y2, colour1, colour2, false); } return gdl; @@ -1063,7 +1063,7 @@ Gfx *menugfxDrawProjectedLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colo * The shimmer will go right to left or bottom to top unless the reverse * argument is set to true. */ -Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bool arg6, s32 arg7, bool reverse) +Gfx *menugfx_draw_shimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bool arg6, s32 arg7, bool reverse) { s32 shimmerleft; s32 shimmertop; @@ -1119,10 +1119,10 @@ Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bo if (reverse) { // Left to right - gdl = menugfxDrawTri2(gdl, shimmerleft, y1, shimmerright, y2, 0xffffff00, tailcolour, 0); + gdl = menugfx_draw_tri2(gdl, shimmerleft, y1, shimmerright, y2, 0xffffff00, tailcolour, 0); } else { // Right to left - gdl = menugfxDrawTri2(gdl, shimmerleft, y1, shimmerright, y2, tailcolour, 0xffffff00, 0); + gdl = menugfx_draw_tri2(gdl, shimmerleft, y1, shimmerright, y2, tailcolour, 0xffffff00, 0); } } } else { @@ -1161,10 +1161,10 @@ Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bo if (reverse) { // Top to bottom - gdl = menugfxDrawTri2(gdl, x1, shimmertop, x2, shimmerbottom, 0xffffff00, tailcolour, 1); + gdl = menugfx_draw_tri2(gdl, x1, shimmertop, x2, shimmerbottom, 0xffffff00, tailcolour, 1); } else { // Bottom to top - gdl = menugfxDrawTri2(gdl, x1, shimmertop, x2, shimmerbottom, tailcolour, 0xffffff00, 1); + gdl = menugfx_draw_tri2(gdl, x1, shimmertop, x2, shimmerbottom, tailcolour, 0xffffff00, 1); } } } @@ -1172,19 +1172,19 @@ Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bo return gdl; } -Gfx *menugfxDrawDialogBorderLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) +Gfx *menugfx_draw_dialog_border_line(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) { - gdl = menugfxDrawLine(gdl, x1, y1, x2, y2, colour1, colour2); - gdl = menugfxDrawShimmer(gdl, x1, y1, x2, y2, colour1, 0, 10, false); + gdl = menugfx_draw_line(gdl, x1, y1, x2, y2, colour1, colour2); + gdl = menugfx_draw_shimmer(gdl, x1, y1, x2, y2, colour1, 0, 10, false); return gdl; } -Gfx *menugfxDrawFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) +Gfx *menugfx_draw_filled_rect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2) { gdl = menugfx0f0e2498(gdl); - gdl = menugfxDrawProjectedLine(gdl, x1, y1, x2, y2, colour1, colour2); - gdl = menugfxDrawShimmer(gdl, x1, y1, x2, y2, colour1, 0, 10, false); + gdl = menugfx_draw_projected_line(gdl, x1, y1, x2, y2, colour1, colour2); + gdl = menugfx_draw_shimmer(gdl, x1, y1, x2, y2, colour1, 0, 10, false); return gdl; } @@ -1197,7 +1197,7 @@ Gfx *menugfxDrawFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1 * The x and y arguments refer to the apex of the chevron. Size is the distance * from the apex to the opposite side. */ -Gfx *menugfxDrawCarouselChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u32 colour1, u32 colour2) +Gfx *menugfx_draw_carousel_chevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u32 colour1, u32 colour2) { Vtx *vertices; Col *colours; @@ -1232,8 +1232,8 @@ Gfx *menugfxDrawCarouselChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, break; } - colours = gfxAllocateColours(2); - vertices = gfxAllocateVertices(3); + colours = gfx_allocate_colours(2); + vertices = gfx_allocate_vertices(3); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -1241,7 +1241,7 @@ Gfx *menugfxDrawCarouselChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI); gSPClearGeometryMode(gdl++, G_CULL_BOTH); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2); @@ -1280,7 +1280,7 @@ Gfx *menugfxDrawCarouselChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, * The x and y arguments refer to the apex of the chevron. Size is the distance * from the apex to the opposite side. */ -Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u32 colour1, u32 colour2, f32 arg7) +Gfx *menugfx_draw_dialog_chevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u32 colour1, u32 colour2, f32 arg7) { u32 stack; Col *colours; @@ -1316,8 +1316,8 @@ Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u break; } - colours = gfxAllocateColours(2); - vertices = gfxAllocateVertices(4); + colours = gfx_allocate_colours(2); + vertices = gfx_allocate_vertices(4); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -1325,7 +1325,7 @@ Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI); gSPClearGeometryMode(gdl++, G_CULL_BOTH); - texSelect(&gdl, NULL, 2, 0, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); @@ -1365,15 +1365,15 @@ Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u return gdl; } -Gfx *menugfxDrawCheckbox(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour) +Gfx *menugfx_draw_checkbox(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour) { if (fill) { - gdl = textSetPrimColour(gdl, fillcolour); + gdl = text_set_prim_colour(gdl, fillcolour); gDPFillRectangleScaled(gdl++, x, y, x + size, y + size); gdl = text0f153838(gdl); } - gdl = textSetPrimColour(gdl, bordercolour); + gdl = text_set_prim_colour(gdl, bordercolour); gDPFillRectangleScaled(gdl++, x, y, x + size + 1, y + 1); gDPFillRectangleScaled(gdl++, x, y + size, x + size + 1, y + size + 1); @@ -1385,7 +1385,7 @@ Gfx *menugfxDrawCheckbox(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 border return gdl; } -Gfx *menugfxRenderBgFailure(Gfx *gdl) +Gfx *menugfx_render_bg_failure(Gfx *gdl) { f32 spb4; s32 i; @@ -1408,8 +1408,8 @@ Gfx *menugfxRenderBgFailure(Gfx *gdl) var8009de90 = -100000; var8009de94 = 100000; - gdl = menugfxDrawPlane(gdl, -10000, 0, 10000, 0, 0x00007f7f, 0x00007f7f, MENUPLANE_04); - gdl = menugfxDrawPlane(gdl, -10000, 300, 10000, 300, 0x00007f7f, 0x00007f7f, MENUPLANE_04); + gdl = menugfx_draw_plane(gdl, -10000, 0, 10000, 0, 0x00007f7f, 0x00007f7f, MENUPLANE_04); + gdl = menugfx_draw_plane(gdl, -10000, 300, 10000, 300, 0x00007f7f, 0x00007f7f, MENUPLANE_04); for (i = 0; i < 3; i++) { angle = (2.0f * i * M_PI) / 3.0f + spb4; @@ -1431,8 +1431,8 @@ Gfx *menugfxRenderBgFailure(Gfx *gdl) s0 += 120; s7 += 120; - gdl = menugfxDrawPlane(gdl, s6, s3, s2, s0, 0xff000040, 0xff00007f, MENUPLANE_02); - gdl = menugfxDrawPlane(gdl, s2, s0, s1, s7, 0xff00007f, 0xff000040, MENUPLANE_03); + gdl = menugfx_draw_plane(gdl, s6, s3, s2, s0, 0xff000040, 0xff00007f, MENUPLANE_02); + gdl = menugfx_draw_plane(gdl, s2, s0, s1, s7, 0xff00007f, 0xff000040, MENUPLANE_03); angle = -2.0f * spb4 + (2.0f * i * M_PI) / 3.0f; s6 = sinf(angle) * 600.0f; @@ -1453,11 +1453,11 @@ Gfx *menugfxRenderBgFailure(Gfx *gdl) s0 += 120; s7 += 120; - alpha1 = menuGetCosOscFrac(4) * 127.0f; - alpha2 = menuGetCosOscFrac(4) * 55.0f; + alpha1 = menu_get_cos_osc_frac(4) * 127.0f; + alpha2 = menu_get_cos_osc_frac(4) * 55.0f; - gdl = menugfxDrawPlane(gdl, s6, s3, s2, s0, 0xffff0000 | alpha2, 0xffff0000 | alpha1, MENUPLANE_02); - gdl = menugfxDrawPlane(gdl, s2, s0, s1, s7, 0xffff0000 | alpha1, 0xffff0000 | alpha2, MENUPLANE_03); + gdl = menugfx_draw_plane(gdl, s6, s3, s2, s0, 0xffff0000 | alpha2, 0xffff0000 | alpha1, MENUPLANE_02); + gdl = menugfx_draw_plane(gdl, s2, s0, s1, s7, 0xffff0000 | alpha1, 0xffff0000 | alpha2, MENUPLANE_03); angle = -2.0f * spb4 + (2.0f * i * M_PI) / 3.0f + M_PI; s6 = sinf(angle) * 600.0f; @@ -1478,11 +1478,11 @@ Gfx *menugfxRenderBgFailure(Gfx *gdl) s0 += 120; s7 += 120; - alpha1 = (1.0f - menuGetCosOscFrac(4)) * 99.0f; - alpha2 = (1.0f - menuGetCosOscFrac(4)) * 33.0f; + alpha1 = (1.0f - menu_get_cos_osc_frac(4)) * 99.0f; + alpha2 = (1.0f - menu_get_cos_osc_frac(4)) * 33.0f; - gdl = menugfxDrawPlane(gdl, s6, s3, s2, s0, 0xffffff00 | alpha2, 0xffffff00 | alpha1, MENUPLANE_02); - gdl = menugfxDrawPlane(gdl, s2, s0, s1, s7, 0xffffff00 | alpha1, 0xffffff00 | alpha2, MENUPLANE_03); + gdl = menugfx_draw_plane(gdl, s6, s3, s2, s0, 0xffffff00 | alpha2, 0xffffff00 | alpha1, MENUPLANE_02); + gdl = menugfx_draw_plane(gdl, s2, s0, s1, s7, 0xffffff00 | alpha1, 0xffffff00 | alpha2, MENUPLANE_03); } gdl = func0f0d4c80(gdl); @@ -1496,7 +1496,7 @@ Gfx *menugfxRenderBgFailure(Gfx *gdl) * The background has two "cones" being projected into the camera's eye and * rotating in opposite directions. */ -Gfx *menugfxRenderBgCone(Gfx *gdl) +Gfx *menugfx_render_bg_cone(Gfx *gdl) { f32 baseangle; f32 angle; @@ -1510,7 +1510,7 @@ Gfx *menugfxRenderBgCone(Gfx *gdl) // Cone 1 baseangle = M_TAU * g_20SecIntervalFrac * 2.0f; - colourupper = (u32) (menuGetSinOscFrac(1.0f) * 255.0f) << 16; + colourupper = (u32) (menu_get_sin_osc_frac(1.0f) * 255.0f) << 16; gdl = func0f0d4a3c(gdl, 0); @@ -1534,11 +1534,11 @@ Gfx *menugfxRenderBgCone(Gfx *gdl) colour = colourupper | 0xff00007f; - gdl = menugfxDrawPlane(gdl, x1, y1, x2, y2, colour, colour, MENUPLANE_08); + gdl = menugfx_draw_plane(gdl, x1, y1, x2, y2, colour, colour, MENUPLANE_08); } // Cone 2 - colourupper = (u32) (255.0f - menuGetCosOscFrac(1.0f) * 255.0f) << 16; + colourupper = (u32) (255.0f - menu_get_cos_osc_frac(1.0f) * 255.0f) << 16; baseangle = M_TAU * g_20SecIntervalFrac; @@ -1561,7 +1561,7 @@ Gfx *menugfxRenderBgCone(Gfx *gdl) colour = colourupper | 0xff00007f; - gdl = menugfxDrawPlane(gdl, x1, y1, x2, y2, colour, colour, MENUPLANE_09); + gdl = menugfx_draw_plane(gdl, x1, y1, x2, y2, colour, colour, MENUPLANE_09); } gdl = func0f0d4c80(gdl); @@ -1579,15 +1579,15 @@ Gfx *menugfxRenderBgCone(Gfx *gdl) Gfx *func0f0e458c(Gfx *gdl) { g_MenuProjectFromX = 0; - g_MenuProjectFromY = -20 - viGetHeight() / 2; + g_MenuProjectFromY = -20 - vi_get_height() / 2; gdl = func0f0d4a3c(gdl, 0); var8009de90 = -100000; var8009de94 = 100000; - gdl = menugfxDrawPlane(gdl, -1000, viGetHeight() + 10, 2000, viGetHeight() + 10, 0x00ff00bf, 0x00ff00bf, MENUPLANE_06); - gdl = menugfxDrawPlane(gdl, -1000, viGetHeight() + 10, 2000, viGetHeight() + 10, 0xffff00af, 0xffff00af, MENUPLANE_05); + gdl = menugfx_draw_plane(gdl, -1000, vi_get_height() + 10, 2000, vi_get_height() + 10, 0x00ff00bf, 0x00ff00bf, MENUPLANE_06); + gdl = menugfx_draw_plane(gdl, -1000, vi_get_height() + 10, 2000, vi_get_height() + 10, 0xffff00af, 0xffff00af, MENUPLANE_05); gdl = func0f0d4c80(gdl); g_MenuProjectFromX = g_MenuProjectFromY = 0; @@ -1605,10 +1605,10 @@ Gfx *func0f0e46b0(Gfx *gdl, f32 arg1) var8009de90 = -100000; var8009de94 = 100000; - gdl = menugfxDrawPlane(gdl, -1000, y1, 2000, y1, 0xffff007f, 0xffff007f, MENUPLANE_05); - gdl = menugfxDrawPlane(gdl, -1000, y1, 2000, y1, 0x00aa007f, 0x00aa007f, MENUPLANE_06); - gdl = menugfxDrawPlane(gdl, -1000, y2, 2000, y2, 0xffff007f, 0xffff007f, MENUPLANE_05); - gdl = menugfxDrawPlane(gdl, -1000, y2, 2000, y2, 0x00aa007f, 0x00aa007f, MENUPLANE_06); + gdl = menugfx_draw_plane(gdl, -1000, y1, 2000, y1, 0xffff007f, 0xffff007f, MENUPLANE_05); + gdl = menugfx_draw_plane(gdl, -1000, y1, 2000, y1, 0x00aa007f, 0x00aa007f, MENUPLANE_06); + gdl = menugfx_draw_plane(gdl, -1000, y2, 2000, y2, 0xffff007f, 0xffff007f, MENUPLANE_05); + gdl = menugfx_draw_plane(gdl, -1000, y2, 2000, y2, 0x00aa007f, 0x00aa007f, MENUPLANE_06); gdl = func0f0d4c80(gdl); @@ -1616,9 +1616,9 @@ Gfx *func0f0e46b0(Gfx *gdl, f32 arg1) } /** - * This is an exact copy of menugfxRenderBgFailure. + * This is an exact copy of menugfx_render_bg_failure. */ -Gfx *menugfxRenderBgFailureCopy(Gfx *gdl) +Gfx *menugfx_render_bg_failure_copy(Gfx *gdl) { f32 spb4; s32 i; @@ -1641,8 +1641,8 @@ Gfx *menugfxRenderBgFailureCopy(Gfx *gdl) var8009de90 = -100000; var8009de94 = 100000; - gdl = menugfxDrawPlane(gdl, -10000, 0, 10000, 0, 0x00007f7f, 0x00007f7f, MENUPLANE_04); - gdl = menugfxDrawPlane(gdl, -10000, 300, 10000, 300, 0x00007f7f, 0x00007f7f, MENUPLANE_04); + gdl = menugfx_draw_plane(gdl, -10000, 0, 10000, 0, 0x00007f7f, 0x00007f7f, MENUPLANE_04); + gdl = menugfx_draw_plane(gdl, -10000, 300, 10000, 300, 0x00007f7f, 0x00007f7f, MENUPLANE_04); for (i = 0; i < 3; i++) { angle = (2.0f * i * M_PI) / 3.0f + spb4; @@ -1664,8 +1664,8 @@ Gfx *menugfxRenderBgFailureCopy(Gfx *gdl) s0 += 120; s7 += 120; - gdl = menugfxDrawPlane(gdl, s6, s3, s2, s0, 0xff000040, 0xff00007f, MENUPLANE_02); - gdl = menugfxDrawPlane(gdl, s2, s0, s1, s7, 0xff00007f, 0xff000040, MENUPLANE_03); + gdl = menugfx_draw_plane(gdl, s6, s3, s2, s0, 0xff000040, 0xff00007f, MENUPLANE_02); + gdl = menugfx_draw_plane(gdl, s2, s0, s1, s7, 0xff00007f, 0xff000040, MENUPLANE_03); angle = -2.0f * spb4 + (2.0f * i * M_PI) / 3.0f; s6 = sinf(angle) * 600.0f; @@ -1686,11 +1686,11 @@ Gfx *menugfxRenderBgFailureCopy(Gfx *gdl) s0 += 120; s7 += 120; - alpha1 = menuGetCosOscFrac(4) * 127.0f; - alpha2 = menuGetCosOscFrac(4) * 55.0f; + alpha1 = menu_get_cos_osc_frac(4) * 127.0f; + alpha2 = menu_get_cos_osc_frac(4) * 55.0f; - gdl = menugfxDrawPlane(gdl, s6, s3, s2, s0, 0xffff0000 | alpha2, 0xffff0000 | alpha1, MENUPLANE_02); - gdl = menugfxDrawPlane(gdl, s2, s0, s1, s7, 0xffff0000 | alpha1, 0xffff0000 | alpha2, MENUPLANE_03); + gdl = menugfx_draw_plane(gdl, s6, s3, s2, s0, 0xffff0000 | alpha2, 0xffff0000 | alpha1, MENUPLANE_02); + gdl = menugfx_draw_plane(gdl, s2, s0, s1, s7, 0xffff0000 | alpha1, 0xffff0000 | alpha2, MENUPLANE_03); angle = -2.0f * spb4 + (2.0f * i * M_PI) / 3.0f + M_PI; s6 = sinf(angle) * 600.0f; @@ -1711,11 +1711,11 @@ Gfx *menugfxRenderBgFailureCopy(Gfx *gdl) s0 += 120; s7 += 120; - alpha1 = (1.0f - menuGetCosOscFrac(4)) * 99.0f; - alpha2 = (1.0f - menuGetCosOscFrac(4)) * 33.0f; + alpha1 = (1.0f - menu_get_cos_osc_frac(4)) * 99.0f; + alpha2 = (1.0f - menu_get_cos_osc_frac(4)) * 33.0f; - gdl = menugfxDrawPlane(gdl, s6, s3, s2, s0, 0xffffff00 | alpha2, 0xffffff00 | alpha1, MENUPLANE_02); - gdl = menugfxDrawPlane(gdl, s2, s0, s1, s7, 0xffffff00 | alpha1, 0xffffff00 | alpha2, MENUPLANE_03); + gdl = menugfx_draw_plane(gdl, s6, s3, s2, s0, 0xffffff00 | alpha2, 0xffffff00 | alpha1, MENUPLANE_02); + gdl = menugfx_draw_plane(gdl, s2, s0, s1, s7, 0xffffff00 | alpha1, 0xffffff00 | alpha2, MENUPLANE_03); } gdl = func0f0d4c80(gdl); @@ -1730,12 +1730,12 @@ struct coord *g_MenuParticles = NULL; * the memory gets reused for other things, so all that needs to happen here is * clearing the pointer that the menugfx system maintains. */ -void menugfxFreeParticles(void) +void menugfx_free_particles(void) { g_MenuParticles = NULL; } -u32 menugfxGetParticleArraySize(void) +u32 menugfx_get_particle_array_size(void) { return align16(NUM_SUCCESS_PARTICLES * sizeof(struct coord)); } @@ -1749,7 +1749,7 @@ u32 menugfxGetParticleArraySize(void) * * In the Defense stage, everything is gray and the particles move slower. */ -Gfx *menugfxRenderBgSuccess(Gfx *gdl) +Gfx *menugfx_render_bg_success(Gfx *gdl) { Mtxf sp110; Mtxf *modelmtx; @@ -1768,7 +1768,7 @@ Gfx *menugfxRenderBgSuccess(Gfx *gdl) // Initialise particles if they haven't been already if (g_MenuParticles == NULL) { - g_MenuParticles = (struct coord *) bgunGetGunMem(); + g_MenuParticles = (struct coord *) bgun_get_gun_mem(); if (g_MenuParticles == NULL) { return gdl; @@ -1806,7 +1806,7 @@ Gfx *menugfxRenderBgSuccess(Gfx *gdl) } } - f0 = menuGetLinearIntervalFrac(10.0f); + f0 = menu_get_linear_interval_frac(10.0f); // Draw the two haze layers g_MenuProjectFromX = 0; @@ -1818,18 +1818,18 @@ Gfx *menugfxRenderBgSuccess(Gfx *gdl) var8009de94 = 100000; if (gray) { - gdl = menugfxDrawPlane(gdl, -1000, -10, 2000, -10, 0x6060607f, 0x6060607f, MENUPLANE_05); - gdl = menugfxDrawPlane(gdl, -1000, viGetHeight() + 10, 2000, viGetHeight() + 10, 0x9090907f, 0x9090907f, MENUPLANE_05); + gdl = menugfx_draw_plane(gdl, -1000, -10, 2000, -10, 0x6060607f, 0x6060607f, MENUPLANE_05); + gdl = menugfx_draw_plane(gdl, -1000, vi_get_height() + 10, 2000, vi_get_height() + 10, 0x9090907f, 0x9090907f, MENUPLANE_05); } else { - gdl = menugfxDrawPlane(gdl, -1000, -10, 2000, -10, 0x0000947f, 0x0000947f, MENUPLANE_10); - gdl = menugfxDrawPlane(gdl, -1000, viGetHeight() + 10, 2000, viGetHeight() + 10, 0x6200947f, 0x6200947f, MENUPLANE_06); + gdl = menugfx_draw_plane(gdl, -1000, -10, 2000, -10, 0x0000947f, 0x0000947f, MENUPLANE_10); + gdl = menugfx_draw_plane(gdl, -1000, vi_get_height() + 10, 2000, vi_get_height() + 10, 0x6200947f, 0x6200947f, MENUPLANE_06); } // Prepare stuff for drawing the particles gdl = func0f0d4c80(gdl); gdl = func0f0d49c8(gdl); - texSelect(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, true, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); @@ -1841,15 +1841,15 @@ Gfx *menugfxRenderBgSuccess(Gfx *gdl) gDPSetTextureFilter(gdl++, G_TF_BILERP); gDPSetTexturePersp(gdl++, G_TP_PERSP); - mtx4LoadIdentity(&sp110); + mtx4_load_identity(&sp110); - modelmtx = gfxAllocateMatrix(); + modelmtx = gfx_allocate_matrix(); - mtxF2L(&sp110, modelmtx); + mtx_f2l(&sp110, modelmtx); gSPMatrix(gdl++, osVirtualToPhysical(modelmtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - colours = gfxAllocateColours(20); + colours = gfx_allocate_colours(20); if (gray) { for (j = 0, ptr = colours; j < 5;) { @@ -1928,7 +1928,7 @@ Gfx *menugfxRenderBgSuccess(Gfx *gdl) f32 invsine2 = -sine; f32 invsine = -sine; f32 invcosine = -cosine; - Vtx *vertices = gfxAllocateVertices(5); + Vtx *vertices = gfx_allocate_vertices(5); vertices[0].x = pos.f[0]; vertices[0].y = pos.f[1]; diff --git a/src/game/menuitem.c b/src/game/menuitem.c index 2bf147771..1832f9159 100644 --- a/src/game/menuitem.c +++ b/src/game/menuitem.c @@ -114,7 +114,7 @@ s32 menuitem0f0e5d2c(s32 arg0, struct menuitem *item) return s1; } -s16 menuitemListGetOffsetY(s16 optionindex, struct menuitem *item) +s16 menuitem_list_get_offset_y(s16 optionindex, struct menuitem *item) { union handlerdata data; bool done; @@ -156,7 +156,7 @@ s16 menuitemListGetOffsetY(s16 optionindex, struct menuitem *item) return optionindex * g_LineHeight + numlines * LINEHEIGHT; } -Gfx *menuitemListRenderHeader(Gfx *gdl, s16 x1, s16 y1, s16 width, s16 arg4, s16 height, char *text, struct menudialog *dialog) +Gfx *menuitem_list_render_header(Gfx *gdl, s16 x1, s16 y1, s16 width, s16 arg4, s16 height, char *text, struct menudialog *dialog) { s32 x; s32 y; @@ -165,14 +165,14 @@ Gfx *menuitemListRenderHeader(Gfx *gdl, s16 x1, s16 y1, s16 width, s16 arg4, s16 colour = MIXCOLOUR(dialog, listgroup_headerbg); if (dialog->dimmed) { - colour = (colourBlend(colour, 0, 0x2c) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 0x2c) & 0xffffff00) | (colour & 0xff); } gdl = text0f153780(gdl); #if VERSION >= VERSION_NTSC_1_0 - gdl = menugfxDrawListGroupHeader(gdl, x1, y1, x1 + width, y1 + height, x1 + arg4, colour & 0xff); + gdl = menugfx_draw_list_group_header(gdl, x1, y1, x1 + width, y1 + height, x1 + arg4, colour & 0xff); #else - gdl = menugfxDrawListGroupHeader(gdl, x1, y1, x1 + width, y1 + height, x1 + arg4); + gdl = menugfx_draw_list_group_header(gdl, x1, y1, x1 + width, y1 + height, x1 + arg4); #endif gdl = text0f153628(gdl); @@ -182,23 +182,23 @@ Gfx *menuitemListRenderHeader(Gfx *gdl, s16 x1, s16 y1, s16 width, s16 arg4, s16 colour = MIXCOLOUR(dialog, listgroup_headerfg); if (dialog->dimmed) { - colour = (colourBlend(colour, 0, 0x2c) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 0x2c) & 0xffffff00) | (colour & 0xff); } - textSetWaveColours(g_MenuWave2Colours[dialog->type].listgroup_headerfg, g_MenuWave1Colours[dialog->type].listgroup_headerfg); + text_set_wave_colours(g_MenuWave2Colours[dialog->type].listgroup_headerfg, g_MenuWave1Colours[dialog->type].listgroup_headerfg); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, width, height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, width, height, 0, 0); return gdl; } -Gfx *menuitemListOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2) +Gfx *menuitem_list_overlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2) { gDPFillRectangleScaled(gdl++, x, y, x + x2, y + y2); return gdl; } -Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_list_render(Gfx *gdl, struct menurendercontext *context) { struct menuitemdata_list *itemdata = &context->data->list; union handlerdata sp15c; @@ -266,20 +266,20 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) g_ScissorY2 = 0; } - if (g_ScissorX1 > viGetBufWidth()) { - g_ScissorX1 = viGetBufWidth(); + if (g_ScissorX1 > vi_get_buf_width()) { + g_ScissorX1 = vi_get_buf_width(); } - if (g_ScissorX2 > viGetBufWidth()) { - g_ScissorX2 = viGetBufWidth(); + if (g_ScissorX2 > vi_get_buf_width()) { + g_ScissorX2 = vi_get_buf_width(); } - if (g_ScissorY1 > viGetBufHeight()) { - g_ScissorY1 = viGetBufHeight(); + if (g_ScissorY1 > vi_get_buf_height()) { + g_ScissorY1 = vi_get_buf_height(); } - if (g_ScissorY2 > viGetBufHeight()) { - g_ScissorY2 = viGetBufHeight(); + if (g_ScissorY2 > vi_get_buf_height()) { + g_ScissorY2 = vi_get_buf_height(); } if (g_ScissorX1 > g_ScissorX2) { @@ -304,12 +304,12 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) itemdata->viewheight = context->height; if (context->item->type == MENUITEMTYPE_DROPDOWN || context->item->type == MENUITEMTYPE_PLAYERSTATS) { - gdl = menugfxDrawDropdownBackground(gdl, context->x, context->y, context->x + context->width, context->y + context->height); + gdl = menugfx_draw_dropdown_background(gdl, context->x, context->y, context->x + context->width, context->y + context->height); - gdl = menugfxDrawShimmer(gdl, context->x, context->y, context->x + 1, context->y + context->height, 0x0000007f, true, 15, true); - gdl = menugfxDrawShimmer(gdl, context->x + context->width, context->y, context->x + context->width + 1, context->y + context->height, 0x0000007f, false, 15, true); - gdl = menugfxDrawShimmer(gdl, context->x, context->y, context->x + context->width, context->y + 1, 0x0000007f, false, 15, true); - gdl = menugfxDrawShimmer(gdl, context->x, context->y + context->height, context->x + context->width, context->y + context->height + 1, 0x0000007f, false, 15, false); + gdl = menugfx_draw_shimmer(gdl, context->x, context->y, context->x + 1, context->y + context->height, 0x0000007f, true, 15, true); + gdl = menugfx_draw_shimmer(gdl, context->x + context->width, context->y, context->x + context->width + 1, context->y + context->height, 0x0000007f, false, 15, true); + gdl = menugfx_draw_shimmer(gdl, context->x, context->y, context->x + context->width, context->y + 1, 0x0000007f, false, 15, true); + gdl = menugfx_draw_shimmer(gdl, context->x, context->y + context->height, context->x + context->width, context->y + context->height + 1, 0x0000007f, false, 15, false); } if (context->item->handler == NULL) { @@ -339,7 +339,7 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) sp15c.list.unk04 = 0; - s4 = menuitemListGetOffsetY(optionindex, context->item) + halfheight - itemdata->curoffsety; + s4 = menuitem_list_get_offset_y(optionindex, context->item) + halfheight - itemdata->curoffsety; sp14c.list.value = 0; sp14c.list.unk0c = 0; @@ -380,7 +380,7 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) text = (char *) context->item->handler(MENUOP_GETOPTGROUPTEXT, context->item, &sp13c); if (s4 + g_LineHeight > 0) { - gdl = menuitemListRenderHeader(gdl, context->x, context->y, context->width, width, LINEHEIGHT, text, context->dialog); + gdl = menuitem_list_render_header(gdl, context->x, context->y, context->width, width, LINEHEIGHT, text, context->dialog); donestickyheader = true; } @@ -408,17 +408,17 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) colour = MIXCOLOUR(context->dialog, item_unfocused); if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0x00000000, 127) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0x00000000, 127) & 0xffffff00) | (colour & 0xff); } - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); if (optionindex == nextgroupstartindex) { // Draw a group header. Note that optionindex is not incremented // in this branch, but nextgroupstartindex is changed so next time the loop // iterates it will enter the else branch. if (context->item->flags & MENUITEMFLAG_LIST_CUSTOMRENDER) { - gdl = menuApplyScissor(gdl); + gdl = menu_apply_scissor(gdl); } title = (char *) context->item->handler(MENUOP_GETOPTGROUPTEXT, context->item, &sp13c); @@ -430,7 +430,7 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) height = LINEHEIGHT; } - gdl = menuitemListRenderHeader(gdl, context->x, context->y + s4, context->width, width, height, title, context->dialog); + gdl = menuitem_list_render_header(gdl, context->x, context->y + s4, context->width, width, height, title, context->dialog); if (sp14c.list.values32 < numgroups) { context->item->handler(MENUOP_GETGROUPSTARTINDEX, context->item, &sp14c); @@ -454,11 +454,11 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) if (optionindex == itemdata->index && context->focused) { u32 spb0; - u32 weight = menuGetSinOscFrac(40.0f) * 255.0f; + u32 weight = menu_get_sin_osc_frac(40.0f) * 255.0f; spb0 = MIXCOLOUR(context->dialog, item_focused_inner); - colour = colourBlend(colour, colour & 0xff, 127); - colour = colourBlend(colour, spb0, weight); + colour = colour_blend(colour, colour & 0xff, 127); + colour = colour_blend(colour, spb0, weight); #if VERSION >= VERSION_NTSC_1_0 // If not transitioning the dialog type @@ -513,12 +513,12 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) } // This logic doesn't look right... - if (sp94left / g_ScaleX > viGetWidth()) { - sp94left = viGetWidth() / g_ScaleX; + if (sp94left / g_ScaleX > vi_get_width()) { + sp94left = vi_get_width() / g_ScaleX; } - if (sp8cright / g_ScaleX > viGetWidth()) { - sp8cright = viGetWidth() / g_ScaleX; + if (sp8cright / g_ScaleX > vi_get_width()) { + sp8cright = vi_get_width() / g_ScaleX; } gDPPipeSync(gdl++); @@ -545,20 +545,20 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) g_ScissorY2 = 0; } - if (g_ScissorX1 > viGetBufWidth()) { - g_ScissorX1 = viGetBufWidth(); + if (g_ScissorX1 > vi_get_buf_width()) { + g_ScissorX1 = vi_get_buf_width(); } - if (g_ScissorX2 > viGetBufWidth()) { - g_ScissorX2 = viGetBufWidth(); + if (g_ScissorX2 > vi_get_buf_width()) { + g_ScissorX2 = vi_get_buf_width(); } - if (g_ScissorY1 > viGetBufHeight()) { - g_ScissorY1 = viGetBufHeight(); + if (g_ScissorY1 > vi_get_buf_height()) { + g_ScissorY1 = vi_get_buf_height(); } - if (g_ScissorY2 > viGetBufHeight()) { - g_ScissorY2 = viGetBufHeight(); + if (g_ScissorY2 > vi_get_buf_height()) { + g_ScissorY2 = vi_get_buf_height(); } if (g_ScissorX2 < g_ScissorX1) { @@ -606,7 +606,7 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) height = 0; } - gdl = textRenderProjected(gdl, &x, &y, text2, chars, font, colour, context->width - left + context->x, height, sp128, 0); + gdl = text_render_projected(gdl, &x, &y, text2, chars, font, colour, context->width - left + context->x, height, sp128, 0); // Consider a checkbox spb8.list.value = optionindex; @@ -615,7 +615,7 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) context->item->handler(MENUOP_GETLISTITEMCHECKBOX, context->item, &spb8); if (spb8.list.unk04 != 255) { - gdl = menugfxDrawCheckbox(gdl, left, context->y + s4 + 1, 6, spb8.list.unk04, colour, 0xff00007f); + gdl = menugfx_draw_checkbox(gdl, left, context->y + s4 + 1, 6, spb8.list.unk04, colour, 0xff00007f); } } @@ -637,20 +637,20 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) } } - gdl = menuApplyScissor(gdl); + gdl = menu_apply_scissor(gdl); } else { // The list has no options in it colour = MIXCOLOUR(context->dialog, item_unfocused); if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0x00000000, 0x0000007f) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0x00000000, 0x0000007f) & 0xffffff00) | (colour & 0xff); } x = left + 8; y = context->y + context->height / 2; // "< Empty >" - gdl = textRenderProjected(gdl, &x, &y, langGet(L_OPTIONS_313), chars, font, colour, context->width - left + context->x, viGetHeight(), sp128, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(L_OPTIONS_313), chars, font, colour, context->width - left + context->x, vi_get_height(), sp128, 0); } gdl = text0f153780(gdl); @@ -658,7 +658,7 @@ Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context) return gdl; } -bool menuitemListTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) +bool menuitem_list_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) { f32 f0; union handlerdata handlerdata; @@ -687,7 +687,7 @@ bool menuitemListTick(struct menuitem *item, struct menuinputs *inputs, u32 tick min = min / g_LineHeight; min *= g_LineHeight; - data->list.targetoffsety = menuitemListGetOffsetY(data->list.index, item); + data->list.targetoffsety = menuitem_list_get_offset_y(data->list.index, item); if (data->list.targetoffsety < min) { data->list.targetoffsety = min; @@ -729,7 +729,7 @@ bool menuitemListTick(struct menuitem *item, struct menuinputs *inputs, u32 tick if (data->list.index > last) { data->list.index = last; - data->list.targetoffsety = menuitemListGetOffsetY(data->list.index, item); + data->list.targetoffsety = menuitem_list_get_offset_y(data->list.index, item); } if (inputs->updown) { @@ -744,13 +744,13 @@ bool menuitemListTick(struct menuitem *item, struct menuinputs *inputs, u32 tick data->list.index = 0; } - data->list.targetoffsety = menuitemListGetOffsetY(data->list.index, item); + data->list.targetoffsety = menuitem_list_get_offset_y(data->list.index, item); if (prev2 != data->list.index) { handlerdata.list.value = data->list.index; item->handler(MENUOP_LISTITEMFOCUS, item, &handlerdata); - menuPlaySound(MENUSOUND_SUBFOCUS); + menu_play_sound(MENUSOUND_SUBFOCUS); } } @@ -764,7 +764,7 @@ bool menuitemListTick(struct menuitem *item, struct menuinputs *inputs, u32 tick item->handler(MENUOP_SET, item, &handlerdata); - menuPlaySound(MENUSOUND_SELECT); + menu_play_sound(MENUSOUND_SELECT); if (handlerdata.list.unk04 == 2) { inputs->start = false; @@ -785,13 +785,13 @@ bool menuitemListTick(struct menuitem *item, struct menuinputs *inputs, u32 tick if (handlerdata.list.unk0c != handlerdata.list.value) { data->list.index = handlerdata.list.value; - data->list.targetoffsety = menuitemListGetOffsetY(data->list.index, item); + data->list.targetoffsety = menuitem_list_get_offset_y(data->list.index, item); } return true; } -void menuitemDropdownInit(struct menuitem *item, union menuitemdata *data) +void menuitem_dropdown_init(struct menuitem *item, union menuitemdata *data) { s32 (*handler)(s32 operation, struct menuitem *item, union handlerdata *data); union handlerdata handlerdata; @@ -828,12 +828,12 @@ void menuitemDropdownInit(struct menuitem *item, union menuitemdata *data) data->dropdown.list.index = handlerdata.dropdown.value; } - data->dropdown.list.targetoffsety = menuitemListGetOffsetY(data->dropdown.list.index, item); + data->dropdown.list.targetoffsety = menuitem_list_get_offset_y(data->dropdown.list.index, item); item->handler(MENUOP_LISTITEMFOCUS, item, &handlerdata); } -Gfx *menuitemDropdownRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_dropdown_render(Gfx *gdl, struct menurendercontext *context) { u32 colour; char *text; @@ -843,51 +843,51 @@ Gfx *menuitemDropdownRender(Gfx *gdl, struct menurendercontext *context) x = context->x; y = context->y; - text = menuResolveParam2Text(context->item); + text = menu_resolve_param2_text(context->item); colour = MIXCOLOUR(context->dialog, item_unfocused); if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); } if (context->focused != 0) { if ((context->focused & 2) != 0) { u32 tmpcolour; - u32 weight = menuGetSinOscFrac(20) * 255.0f; \ + u32 weight = menu_get_sin_osc_frac(20) * 255.0f; \ tmpcolour = MIXCOLOUR(context->dialog, item_focused_inner); - colour = colourBlend(colour, colour & 0xff, 0x7f); - colour = colourBlend(colour, tmpcolour, weight); + colour = colour_blend(colour, colour & 0xff, 0x7f); + colour = colour_blend(colour, tmpcolour, weight); } else { u32 tmpcolour; - u32 weight = menuGetSinOscFrac(40) * 255.0f; \ + u32 weight = menu_get_sin_osc_frac(40) * 255.0f; \ tmpcolour = MIXCOLOUR(context->dialog, item_focused_inner); - colour = colourBlend(colour, colour & 0xff, 0x7f); - colour = colourBlend(colour, tmpcolour, weight); + colour = colour_blend(colour, colour & 0xff, 0x7f); + colour = colour_blend(colour, tmpcolour, weight); } - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_focused_inner, g_MenuWave1Colours[context->dialog->type].item_focused_inner); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_focused_inner, g_MenuWave1Colours[context->dialog->type].item_focused_inner); } else { - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); } - if (menuIsItemDisabled(context->item, context->dialog)) { + if (menu_is_item_disabled(context->item, context->dialog)) { colour = MIXCOLOUR(context->dialog, item_disabled); if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); } - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_disabled, g_MenuWave1Colours[context->dialog->type].item_disabled); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_disabled, g_MenuWave1Colours[context->dialog->type].item_disabled); } gdl = text0f153628(gdl); x = context->x + 10; y = context->y + 2; - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0); if (context->dialog->unk6e) { x = context->x + 80; @@ -911,10 +911,10 @@ Gfx *menuitemDropdownRender(Gfx *gdl, struct menurendercontext *context) data.list.unk04 = 0; text = (char *)context->item->handler(MENUOP_GETOPTIONTEXT, context->item, &data); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = context->x + context->width - textwidth - 10; - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0); } gdl = text0f153780(gdl); @@ -922,15 +922,15 @@ Gfx *menuitemDropdownRender(Gfx *gdl, struct menurendercontext *context) return gdl; } -bool menuitemDropdownTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) +bool menuitem_dropdown_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) { u32 stack; if ((tickflags & MENUTICKFLAG_ITEMISFOCUSED) && item->handler) { if (dialog->dimmed && item == dialog->focuseditem) { - menuitemListTick(item, inputs, tickflags, data); + menuitem_list_tick(item, inputs, tickflags, data); - if (mpIsPlayerLockedOut(g_MpPlayerNum)) { + if (mp_is_player_locked_out(g_MpPlayerNum)) { if ((item->flags & MENUITEMFLAG_LOCKABLEMAJOR) || (dialog->definition->flags & MENUDIALOGFLAG_MPLOCKABLE)) { dialog->dimmed = false; } @@ -940,7 +940,7 @@ bool menuitemDropdownTick(struct menuitem *item, struct menudialog *dialog, stru if (inputs->back && dialog->dimmed) { dialog->dimmed = false; inputs->back = false; - menuPlaySound(MENUSOUND_TOGGLEOFF); + menu_play_sound(MENUSOUND_TOGGLEOFF); } if (inputs->select) { @@ -950,12 +950,12 @@ bool menuitemDropdownTick(struct menuitem *item, struct menudialog *dialog, stru union handlerdata handlerdata; dialog->dimmed = true; - menuitemDropdownInit(item, data); + menuitem_dropdown_init(item, data); handlerdata.dropdown.value = 0; item->handler(MENUOP_GETSELECTEDINDEX, item, &handlerdata); data->dropdown.unk0e = (u32)handlerdata.dropdown.value * g_LineHeight; - menuPlaySound(MENUSOUND_TOGGLEOFF); + menu_play_sound(MENUSOUND_TOGGLEOFF); } } } @@ -963,7 +963,7 @@ bool menuitemDropdownTick(struct menuitem *item, struct menudialog *dialog, stru return true; } -Gfx *menuitemDropdownOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, 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) { s32 stack; s32 textwidth; @@ -1020,7 +1020,7 @@ Gfx *menuitemDropdownOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menu for (i = 0; i != numoptions; i++) { handlerdata.dropdown.value = i; text = (char *)item->handler(MENUOP_GETOPTIONTEXT, item, &handlerdata); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); textwidth += 6; if (textwidth > context.width) { @@ -1047,13 +1047,13 @@ Gfx *menuitemDropdownOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menu context.y = dialog->y + dialog->height - context.height + 2; } - gdl = menuitemListRender(gdl, &context); + gdl = menuitem_list_render(gdl, &context); } return gdl; } -bool menuitemKeyboardIsStringEmptyOrSpaces(char *text) +bool menuitem_keyboard_is_string_empty_or_spaces(char *text) { s32 i; @@ -1088,7 +1088,7 @@ bool menuitemKeyboardIsStringEmptyOrSpaces(char *text) * | DEL | CAPS | CANCEL | OK | * +-------+-----------+-----------+-------+ */ -Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_keyboard_render(Gfx *gdl, struct menurendercontext *context) { char label[8]; s32 x; @@ -1108,12 +1108,12 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) label[1] = '\n'; label[2] = '\0'; - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); // Draw input field background - gdl = textSetPrimColour(gdl, 0x0000ff7f); + gdl = text_set_prim_colour(gdl, 0x0000ff7f); if (context->item->param3 == 0) { // Half width @@ -1134,24 +1134,24 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) y = context->y + 2; gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, data->string, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, context->width, context->height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, data->string, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffffffff, context->width, context->height, 0, 0); gdl = text0f153780(gdl); // Render cursor - alpha = menuGetSinOscFrac(40) * 255; + alpha = menu_get_sin_osc_frac(40) * 255; if (context->dialog->transitionfrac < 0) { cursorcolour = g_MenuColours[context->dialog->type].item_focused_inner; } else { - cursorcolour = colourBlend( + cursorcolour = colour_blend( g_MenuColours[context->dialog->type2].item_focused_inner, g_MenuColours[context->dialog->type].item_focused_inner, context->dialog->colourweight); } - cursorcolour = colourBlend(colourBlend(0x0000ffff, 0x000000ff, 127), cursorcolour, alpha); + cursorcolour = colour_blend(colour_blend(0x0000ffff, 0x000000ff, 127), cursorcolour, alpha); - gdl = textSetPrimColour(gdl, cursorcolour); + gdl = text_set_prim_colour(gdl, cursorcolour); gDPFillRectangleScaled(gdl++, x + 1, context->y + 2, x + 3, context->y + 9); @@ -1159,7 +1159,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) // Render horizontal grid lines for (row = 0; row < 6; row++) { - gdl = menugfxDrawFilledRect(gdl, context->x + 4, context->y + row * 11 + 13, + gdl = menugfx_draw_filled_rect(gdl, context->x + 4, context->y + row * 11 + 13, context->x + 124, context->y + row * 11 + 14, 0x00ffff7f, 0x00ffff7f); } @@ -1171,7 +1171,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) rowspan = 4; } - gdl = menugfxDrawFilledRect(gdl, context->x + col * 12 + 4, context->y + 13, + gdl = menugfx_draw_filled_rect(gdl, context->x + col * 12 + 4, context->y + 13, context->x + col * 12 + 5, context->y + rowspan * 11 + 14, 0x00ffff7f, 0x00ffff7f); } @@ -1185,14 +1185,14 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) if (context->dialog->transitionfrac < 0) { textcolour = g_MenuColours[context->dialog->type].item_unfocused; } else { - textcolour = colourBlend( + textcolour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - textcolour = (colourBlend(textcolour, 0x00000000, 127) & 0xffffff00) | (textcolour & 0xff); + textcolour = (colour_blend(textcolour, 0x00000000, 127) & 0xffffff00) | (textcolour & 0xff); } if (data->capseffective && col == 2 && row == 4) { @@ -1202,18 +1202,18 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) // If this button is the focused one, set highlighted colour if (col == data->col && row == data->row) { - alpha = menuGetSinOscFrac(40) * 255; + alpha = menu_get_sin_osc_frac(40) * 255; if (context->dialog->transitionfrac < 0) { tmpcolour = g_MenuColours[context->dialog->type].item_focused_inner; } else { - tmpcolour = colourBlend( + tmpcolour = colour_blend( g_MenuColours[context->dialog->type2].item_focused_inner, g_MenuColours[context->dialog->type].item_focused_inner, context->dialog->colourweight); } - textcolour = colourBlend(colourBlend(textcolour, textcolour & 0xff, 127), tmpcolour, alpha); + textcolour = colour_blend(colour_blend(textcolour, textcolour & 0xff, 127), tmpcolour, alpha); } x = context->x + col * 12 + 4; @@ -1253,33 +1253,33 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) buttonwidth = 36; } - textMeasure(&textheight, &textwidth, langGet(labels[index]), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, lang_get(labels[index]), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = (buttonwidth - textwidth) / 2 + x; // Dim the OK button if string is empty - if (index == 3 && menuitemKeyboardIsStringEmptyOrSpaces(data->string)) { + if (index == 3 && menuitem_keyboard_is_string_empty_or_spaces(data->string)) { if (context->dialog->transitionfrac < 0) { textcolour = g_MenuColours[context->dialog->type].item_disabled; } else { - textcolour = colourBlend( + textcolour = colour_blend( g_MenuColours[context->dialog->type2].item_disabled, g_MenuColours[context->dialog->type].item_disabled, context->dialog->colourweight); } if (context->dialog->dimmed) { - textcolour = (colourBlend(textcolour, 0, 127) & 0xffffff00) | (textcolour & 0xff); + textcolour = (colour_blend(textcolour, 0, 127) & 0xffffff00) | (textcolour & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_disabled, g_MenuWave1Colours[context->dialog->type].item_disabled); } - gdl = textRenderProjected(gdl, &x, &y, langGet(labels[index]), g_CharsHandelGothicXs, g_FontHandelGothicXs, textcolour, context->width, context->height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(labels[index]), g_CharsHandelGothicXs, g_FontHandelGothicXs, textcolour, context->width, context->height, 0, 0); - if (index == 3 && menuitemKeyboardIsStringEmptyOrSpaces(data->string)) { - textSetWaveColours( + if (index == 3 && menuitem_keyboard_is_string_empty_or_spaces(data->string)) { + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); } @@ -1293,9 +1293,9 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) label[0] += 32; } - textMeasure(&textheight, &textwidth, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = (12 - textwidth) / 2 + x; - gdl = textRenderProjected(gdl, &x, &y, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0); } } } @@ -1327,10 +1327,10 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) } } - gdl = menugfxDrawLine(gdl, x1, y1, x2, y1 + 1, -1, -1); // top - gdl = menugfxDrawLine(gdl, x2, y1, x2 + 1, y2 + 1, -1, -1); // right - gdl = menugfxDrawLine(gdl, x1, y2, x2, y2 + 1, -1, -1); // bottom - gdl = menugfxDrawLine(gdl, x1, y1, x1 + 1, y2 + 1, -1, -1); // left + gdl = menugfx_draw_line(gdl, x1, y1, x2, y1 + 1, -1, -1); // top + gdl = menugfx_draw_line(gdl, x2, y1, x2 + 1, y2 + 1, -1, -1); // right + gdl = menugfx_draw_line(gdl, x1, y2, x2, y2 + 1, -1, -1); // bottom + gdl = menugfx_draw_line(gdl, x1, y1, x1 + 1, y2 + 1, -1, -1); // left } return gdl; @@ -1350,7 +1350,7 @@ Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *context) * | DEL | CAPS | CANCEL | OK | * +-------+-----------+-----------+-------+ */ -bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) +bool menuitem_keyboard_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) { struct menuitemdata_keyboard *kb = &data->keyboard; union handlerdata handlerdata; @@ -1411,7 +1411,7 @@ bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 } if (prevcol != kb->col || prevrow != kb->row) { - menuPlaySound(MENUSOUND_KEYBOARDFOCUS); + menu_play_sound(MENUSOUND_KEYBOARDFOCUS); } if (inputs->back2) { @@ -1419,13 +1419,13 @@ bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 } if (inputs->start) { - if (item->handler && !menuitemKeyboardIsStringEmptyOrSpaces(kb->string)) { - menuPlaySound(MENUSOUND_SELECT); + if (item->handler && !menuitem_keyboard_is_string_empty_or_spaces(kb->string)) { + menu_play_sound(MENUSOUND_SELECT); handlerdata.keyboard.string = kb->string; item->handler(MENUOP_SETTEXT, item, &handlerdata); - menuPopDialog(); + menu_pop_dialog(); item->handler(MENUOP_SET, item, &handlerdata); } @@ -1447,7 +1447,7 @@ bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 // OK if (kb->col == 8) { - if (item->handler && !menuitemKeyboardIsStringEmptyOrSpaces(kb->string)) { + if (item->handler && !menuitem_keyboard_is_string_empty_or_spaces(kb->string)) { handlerdata.keyboard.string = kb->string; item->handler(MENUOP_SETTEXT, item, &handlerdata); } @@ -1457,14 +1457,14 @@ bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 if (kb->col == 8 || kb->col == 5) { s32 ok = (kb->col == 8); - if (kb->col == 5 || !menuitemKeyboardIsStringEmptyOrSpaces(kb->string)) { - menuPopDialog(); + if (kb->col == 5 || !menuitem_keyboard_is_string_empty_or_spaces(kb->string)) { + menu_pop_dialog(); if (ok) { item->handler(MENUOP_SET, item, &handlerdata); - menuPlaySound(MENUSOUND_SELECT); + menu_play_sound(MENUSOUND_SELECT); } else { - menuPlaySound(MENUSOUND_KEYBOARDCANCEL); + menu_play_sound(MENUSOUND_KEYBOARDCANCEL); } inputs->select = false; @@ -1497,14 +1497,14 @@ bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 i++; } - textMeasure(&textheight, &textwidth, kb->string, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, kb->string, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); if (item->param3 == 0 && textwidth > 58) { delete = true; } if (!delete) { - menuPlaySound(MENUSOUND_FOCUS); + menu_play_sound(MENUSOUND_FOCUS); } } } @@ -1515,7 +1515,7 @@ bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 s32 deleted = false; s32 i = 10; - menuPlaySound(MENUSOUND_FOCUS); + menu_play_sound(MENUSOUND_FOCUS); while (!deleted) { if (kb->string[i] != '\0') { @@ -1540,9 +1540,9 @@ bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 if (kb->capseffective != prev) { if (kb->capseffective) { - menuPlaySound(MENUSOUND_TOGGLEON); + menu_play_sound(MENUSOUND_TOGGLEON); } else { - menuPlaySound(MENUSOUND_TOGGLEOFF); + menu_play_sound(MENUSOUND_TOGGLEOFF); } } } @@ -1550,7 +1550,7 @@ bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 return true; } -void menuitemKeyboardInit(struct menuitem *item, union menuitemdata *data) +void menuitem_keyboard_init(struct menuitem *item, union menuitemdata *data) { u32 stack; s32 i; @@ -1571,14 +1571,14 @@ void menuitemKeyboardInit(struct menuitem *item, union menuitemdata *data) data->keyboard.capslock = 0; } -Gfx *menuitemSeparatorRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_separator_render(Gfx *gdl, struct menurendercontext *context) { u32 colour; if (context->dialog->transitionfrac < 0) { colour = g_MenuColours[context->dialog->type].item_unfocused; } else { - colour = colourBlend( + colour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); @@ -1587,15 +1587,15 @@ Gfx *menuitemSeparatorRender(Gfx *gdl, struct menurendercontext *context) colour = (colour & 0xffffff00) | 0x3f; #if VERSION >= VERSION_JPN_FINAL - return menugfxDrawFilledRect(gdl, context->x, context->y, context->x + context->width, context->y + 1, colour, colour); + return menugfx_draw_filled_rect(gdl, context->x, context->y, context->x + context->width, context->y + 1, colour, colour); #else - return menugfxDrawFilledRect(gdl, context->x, context->y + 2, context->x + context->width, context->y + 3, colour, colour); + return menugfx_draw_filled_rect(gdl, context->x, context->y + 2, context->x + context->width, context->y + 3, colour, colour); #endif } u32 var800711e8 = 0x00000000; -Gfx *menuitemObjectivesRenderOne(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_one(Gfx *gdl, struct menudialog *dialog, s32 index, s32 position, s16 objx, s16 objy, s16 width, s16 height, bool withstatus, bool narrow) { u32 sp12c; s32 x; @@ -1638,47 +1638,47 @@ Gfx *menuitemObjectivesRenderOne(Gfx *gdl, struct menudialog *dialog, s32 index, #endif } - mainOverrideVariable("brcol", &var800711e8); - sp120 = langGet(g_Briefing.objectivenames[index]); + main_override_variable("brcol", &var800711e8); + sp120 = lang_get(g_Briefing.objectivenames[index]); y = objy; sp12c = MIXCOLOUR(dialog, item_unfocused); if (dialog->dimmed) { - sp12c = (colourBlend(sp12c, 0, 0x2c) & 0xffffff00) | (sp12c & 0xff); + sp12c = (colour_blend(sp12c, 0, 0x2c) & 0xffffff00) | (sp12c & 0xff); } - textSetWaveColours(g_MenuWave2Colours[dialog->type].item_unfocused, g_MenuWave1Colours[dialog->type].item_unfocused); + text_set_wave_colours(g_MenuWave2Colours[dialog->type].item_unfocused, g_MenuWave1Colours[dialog->type].item_unfocused); buffer[0] = '\0'; // Render objective number gdl = text0f153628(gdl); sprintf(buffer, "%d: ", position); - textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = objx - textwidth + 25; - gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, sp12c, width, height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, sp12c, width, height, 0, 0); x = objx + 25; if (narrow) { - textWrap(85, sp120, buffer, g_CharsHandelGothicXs, g_FontHandelGothicXs); - gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicXs, g_FontHandelGothicXs, sp12c, width, height, 0, 0); + text_wrap(85, sp120, buffer, g_CharsHandelGothicXs, g_FontHandelGothicXs); + gdl = text_render_projected(gdl, &x, &y, buffer, g_CharsHandelGothicXs, g_FontHandelGothicXs, sp12c, width, height, 0, 0); } else { sprintf(buffer, "%s", sp120); - gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, sp12c, width, height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, sp12c, width, height, 0, 0); } if (withstatus) { - switch (objectiveCheck(index)) { + switch (objective_check(index)) { case OBJECTIVE_INCOMPLETE: - spcc = langGet(L_OPTIONS_001); // "Incomplete" + spcc = lang_get(L_OPTIONS_001); // "Incomplete" spc8 = 0xffff00ff; break; case OBJECTIVE_COMPLETE: - spcc = langGet(L_OPTIONS_000); // "Complete" + spcc = lang_get(L_OPTIONS_000); // "Complete" spc8 = 0x00ff00ff; break; case OBJECTIVE_FAILED: - spcc = langGet(L_OPTIONS_002); // "Failed" + spcc = lang_get(L_OPTIONS_002); // "Failed" spc8 = 0xff4040ff; break; } @@ -1687,7 +1687,7 @@ Gfx *menuitemObjectivesRenderOne(Gfx *gdl, struct menudialog *dialog, s32 index, spc8 = g_MenuColours[0].item_unfocused; } - textMeasure(&textheight, &textwidth, spcc, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, spcc, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); if (var800711e8 != 0) { spc8 = var800711e8; @@ -1701,13 +1701,13 @@ Gfx *menuitemObjectivesRenderOne(Gfx *gdl, struct menudialog *dialog, s32 index, y = objy + spbc + 9; #endif - gdl = textRenderProjected(gdl, &x, &y, spcc, g_CharsHandelGothicXs, g_FontHandelGothicXs, spc8, width, height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, spcc, g_CharsHandelGothicXs, g_FontHandelGothicXs, spc8, width, height, 0, 0); #if VERSION != VERSION_JPN_FINAL x = objx + width - textwidth - 10; y = objy + spbc + 9; - gdl = textRenderProjected(gdl, &x, &y, spcc, g_CharsHandelGothicXs, g_FontHandelGothicXs, spc8 & 0xffffff7f, width, height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, spcc, g_CharsHandelGothicXs, g_FontHandelGothicXs, spc8 & 0xffffff7f, width, height, 0, 0); #endif x = objx + width - textwidth - 13; @@ -1734,22 +1734,22 @@ Gfx *menuitemObjectivesRenderOne(Gfx *gdl, struct menudialog *dialog, s32 index, gdl = menugfx0f0e2498(gdl); // Blue lines - gdl = menugfxDrawProjectedLine(gdl, objx, spb0, spb4, spb0 + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, spb4, spb0, spb4 + 1, spac, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, objx, spac, sp58, spac + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp58 + 3, spac, spb4 + 1, spac + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp58, spac, sp58 + 1, spa8 + 2, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp58 + 2, spac, sp58 + 3, spa8, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, objx, spb0, spb4, spb0 + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, spb4, spb0, spb4 + 1, spac, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, objx, spac, sp58, spac + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58 + 3, spac, spb4 + 1, spac + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58, spac, sp58 + 1, spa8 + 2, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58 + 2, spac, sp58 + 3, spa8, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); spb4 = (spc8 & 0xffffff00) | 0x3f; - gdl = menugfxDrawProjectedLine(gdl, sp58 + 2, spa8, sp54, spa8 + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp58, spa8 + 2, sp54, spa8 + 3, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp54, spa8, sp98, spa8 + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp54, spa8 + 2, sp98, spa8 + 3, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58 + 2, spa8, sp54, spa8 + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58, spa8 + 2, sp54, spa8 + 3, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp54, spa8, sp98, spa8 + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp54, spa8 + 2, sp98, spa8 + 3, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); // Coloured lines - gdl = menugfxDrawProjectedLine(gdl, sp98, spa8, sp98 + 1, spa8 + 3, spb4, spb4); - gdl = menugfxDrawProjectedLine(gdl, sp98 + 1, spa8 + 1, sp9c - 4, spa8 + 2, spb4, spb4); - gdl = menugfxDrawProjectedLine(gdl, sp9c - 4, spa8 + 1, sp9c, spa8 + 2, spb4, (spc8 & 0xffffff00) | 0xcf); + gdl = menugfx_draw_projected_line(gdl, sp98, spa8, sp98 + 1, spa8 + 3, spb4, spb4); + gdl = menugfx_draw_projected_line(gdl, sp98 + 1, spa8 + 1, sp9c - 4, spa8 + 2, spb4, spb4); + gdl = menugfx_draw_projected_line(gdl, sp9c - 4, spa8 + 1, sp9c, spa8 + 2, spb4, (spc8 & 0xffffff00) | 0xcf); } else { // Render lines without status sp80 = objx + 22; @@ -1757,7 +1757,7 @@ Gfx *menuitemObjectivesRenderOne(Gfx *gdl, struct menudialog *dialog, s32 index, sp78 = objy + 8; sp74 = y + 1; - textMeasure(&textheight, &textwidth, sp120, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, sp120, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); #if VERSION >= VERSION_JPN_FINAL sp74 -= 2; @@ -1769,31 +1769,31 @@ Gfx *menuitemObjectivesRenderOne(Gfx *gdl, struct menudialog *dialog, s32 index, gdl = text0f153780(gdl); gdl = menugfx0f0e2498(gdl); - gdl = menugfxDrawProjectedLine(gdl, objx, sp7c, sp80, sp7c + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp80, sp7c, sp80 + 1, sp78, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, objx, sp78, sp58, sp78 + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp58 + 3, sp78, sp80 + 1, sp78 + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, objx, sp7c, sp80, sp7c + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp80, sp7c, sp80 + 1, sp78, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, objx, sp78, sp58, sp78 + 1, sp12c & 0xffffff00, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58 + 3, sp78, sp80 + 1, sp78 + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); #if VERSION == VERSION_JPN_FINAL - gdl = menugfxDrawProjectedLine(gdl, sp58, sp78, sp58 + 1, sp74 + 3, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58, sp78, sp58 + 1, sp74 + 3, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); #else - gdl = menugfxDrawProjectedLine(gdl, sp58, sp78, sp58 + 1, sp74 + 2, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58, sp78, sp58 + 1, sp74 + 2, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); #endif - gdl = menugfxDrawProjectedLine(gdl, sp58 + 2, sp78, sp58 + 3, sp74, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); - gdl = menugfxDrawProjectedLine(gdl, sp58 + 2, sp74, sp6c, sp74 + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58 + 2, sp78, sp58 + 3, sp74, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); + gdl = menugfx_draw_projected_line(gdl, sp58 + 2, sp74, sp6c, sp74 + 1, (sp12c & 0xffffff00) | 0x3f, (sp12c & 0xffffff00) | 0x3f); } return gdl; } -Gfx *menuitemObjectivesRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_objectives_render(Gfx *gdl, struct menurendercontext *context) { s32 y = context->y + 5; s32 position = 1; s32 i; for (i = 0; i < ARRAYCOUNT(g_Briefing.objectivenames); i++) { - if (g_Briefing.objectivenames[i] && g_Briefing.objectivedifficulties[i] & (1 << lvGetDifficulty())) { - gdl = menuitemObjectivesRenderOne(gdl, + if (g_Briefing.objectivenames[i] && g_Briefing.objectivedifficulties[i] & (1 << lv_get_difficulty())) { + gdl = menuitem_objectives_render_one(gdl, context->dialog, i, position, context->x, y, context->width, context->height, context->item->param != 1, @@ -1824,7 +1824,7 @@ Gfx *menuitemObjectivesRender(Gfx *gdl, struct menurendercontext *context) return gdl; } -Gfx *menuitemModelRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_model_render(Gfx *gdl, struct menurendercontext *context) { if (context->item->flags & MENUITEMFLAG_LIST_CUSTOMRENDER) { struct menuitemrenderdata renderdata; @@ -1837,14 +1837,14 @@ Gfx *menuitemModelRender(Gfx *gdl, struct menurendercontext *context) if (context->dialog->transitionfrac < 0) { renderdata.colour = g_MenuColours[context->dialog->type].item_focused_inner; } else { - renderdata.colour = colourBlend( + renderdata.colour = colour_blend( g_MenuColours[context->dialog->type2].item_focused_inner, g_MenuColours[context->dialog->type].item_focused_inner, context->dialog->colourweight); } if (context->dialog->dimmed) { - renderdata.colour = (colourBlend(renderdata.colour, 0, 127) & 0xffffff00) | (renderdata.colour & 0xff); + renderdata.colour = (colour_blend(renderdata.colour, 0, 127) & 0xffffff00) | (renderdata.colour & 0xff); } renderdata.unk10 = true; @@ -1859,7 +1859,7 @@ Gfx *menuitemModelRender(Gfx *gdl, struct menurendercontext *context) return gdl; } -Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_label_render(Gfx *gdl, struct menurendercontext *context) { u32 colour1; u32 colour2; @@ -1878,7 +1878,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) x -= 6; } - text = menuResolveParam2Text(context->item); + text = menu_resolve_param2_text(context->item); if (!text) { return gdl; @@ -1896,7 +1896,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) // Center s32 textheight; s32 textwidth; - textMeasure(&textheight, &textwidth, text, font1, font2, 0); + text_measure(&textheight, &textwidth, text, font1, font2, 0); x = context->x + (context->width - textwidth) / 2; } @@ -1904,53 +1904,53 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) if (context->dialog->transitionfrac < 0) { colour1 = g_MenuColours[context->dialog->type].checkbox_checked_unfocused; } else { - colour1 = colourBlend( + colour1 = colour_blend( g_MenuColours[context->dialog->type2].checkbox_checked_unfocused, g_MenuColours[context->dialog->type].checkbox_checked_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - colour1 = (colourBlend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff); + colour1 = (colour_blend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].checkbox_checked_unfocused, g_MenuWave1Colours[context->dialog->type].checkbox_checked_unfocused); } else { if (context->dialog->transitionfrac < 0) { colour1 = g_MenuColours[context->dialog->type].item_unfocused; } else { - colour1 = colourBlend( + colour1 = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - colour1 = (colourBlend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff); + colour1 = (colour_blend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); } - if (menuIsItemDisabled(context->item, context->dialog)) { + if (menu_is_item_disabled(context->item, context->dialog)) { if (context->dialog->transitionfrac < 0) { colour1 = g_MenuColours[context->dialog->type].item_disabled; } else { - colour1 = colourBlend( + colour1 = colour_blend( g_MenuColours[context->dialog->type2].item_disabled, g_MenuColours[context->dialog->type].item_disabled, context->dialog->colourweight); } if (context->dialog->dimmed) { - colour1 = (colourBlend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff); + colour1 = (colour_blend(colour1, 0, 127) & 0xffffff00) | (colour1 & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_disabled, g_MenuWave1Colours[context->dialog->type].item_disabled); } @@ -1962,8 +1962,8 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) return gdl; } - textBackupDiagonalBlendSettings(); - textSetDiagonalBlend(x, y, menudfc->unk04 * 300, 0); + text_backup_diagonal_blend_settings(); + text_set_diagonal_blend(x, y, menudfc->unk04 * 300, 0); var8007fb9c = true; } @@ -1986,12 +1986,12 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) } gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, text, + gdl = text_render_projected(gdl, &x, &y, text, font1, font2, colour1, context->width, context->height, 0, 0); if ((context->item->flags & MENUITEMFLAG_LABEL_HASRIGHTTEXT) == 0) { // Right side text - text = menuResolveText(context->item->param3, context->item); + text = menu_resolve_text(context->item->param3, context->item); // This is not how you check if a string is empty... if (text != NULL && text != "") { @@ -2006,14 +2006,14 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) } #endif - textMeasure(&textheight, &textwidth, text, font1, font2, 0); + text_measure(&textheight, &textwidth, text, font1, font2, 0); x = context->x + context->width - textwidth - 10; if (context->item->flags & MENUITEMFLAG_LESSLEFTPADDING) { x += 6; } - gdl = textRenderProjected(gdl, &x, &y, text, + gdl = text_render_projected(gdl, &x, &y, text, font1, font2, colour2, context->width, context->height, 0, 0); } } @@ -2027,7 +2027,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) var8007fb9c = savedvalue; - textRestoreDiagonalBlendSettings(); + text_restore_diagonal_blend_settings(); } if (context->item->flags & MENUITEMFLAG_LIST_CUSTOMRENDER) { @@ -2054,7 +2054,7 @@ Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context) * Renders two yellow bars and an optional label. Suspected to be a resource * meter but with the calculations ifdeffed out, so the widths are static. */ -Gfx *menuitemMeterRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_meter_render(Gfx *gdl, struct menurendercontext *context) { u32 a = 9; char *text; @@ -2070,38 +2070,38 @@ Gfx *menuitemMeterRender(Gfx *gdl, struct menurendercontext *context) if (context->dialog->transitionfrac < 0) { colour = g_MenuColours[context->dialog->type].item_unfocused; } else { - colour = colourBlend( + colour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0, 127) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 127) & 0xffffff00) | (colour & 0xff); } colour2 = 0xffff0000 | (colour & 0xff); - colour1 = colourBlend(colour2, colour2 & 0xff, 127); + colour1 = colour_blend(colour2, colour2 & 0xff, 127); x1 = context->x + 32; x2 = x1 + a; x3 = x2 + 6; - gdl = textSetPrimColour(gdl, colour1); + gdl = text_set_prim_colour(gdl, colour1); gDPFillRectangleScaled(gdl++, x1, context->y, x2, context->y + 5); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, colour2); + gdl = text_set_prim_colour(gdl, colour2); gDPFillRectangleScaled(gdl++, x2, context->y, x3, context->y + 5); gdl = text0f153838(gdl); - text = menuResolveParam2Text(context->item); + text = menu_resolve_param2_text(context->item); if (text) { gdl = text0f153628(gdl); x = context->x; y = context->y - 1; - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, colour2 & 0xffffff7f, context->width, context->height, 0, 0); gdl = text0f153780(gdl); } @@ -2109,7 +2109,7 @@ Gfx *menuitemMeterRender(Gfx *gdl, struct menurendercontext *context) return gdl; } -Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_selectable_render(Gfx *gdl, struct menurendercontext *context) { u32 leftcolour; u32 rightcolour; @@ -2128,19 +2128,19 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context) font2 = g_FontHandelGothicMd; } - text = menuResolveParam2Text(context->item); + text = menu_resolve_param2_text(context->item); if (context->dialog->transitionfrac < 0) { leftcolour = g_MenuColours[context->dialog->type].item_unfocused; } else { - leftcolour = colourBlend( + leftcolour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - leftcolour = (colourBlend(leftcolour, 0, 127) & 0xffffff00) | (leftcolour & 0xff); + leftcolour = (colour_blend(leftcolour, 0, 127) & 0xffffff00) | (leftcolour & 0xff); } rightcolour = leftcolour; @@ -2151,44 +2151,44 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context) // use in the else branch. The lui is loading a value into $at for the // float to u32 conversion for weight. u32 colour2; - u32 weight = menuGetSinOscFrac(40) * 255; \ + u32 weight = menu_get_sin_osc_frac(40) * 255; \ if (context->dialog->transitionfrac < 0) { \ colour2 = g_MenuColours[context->dialog->type].item_focused_inner; \ } else { \ - colour2 = colourBlend( + colour2 = colour_blend( g_MenuColours[context->dialog->type2].item_focused_inner, g_MenuColours[context->dialog->type].item_focused_inner, context->dialog->colourweight); } - leftcolour = colourBlend(colourBlend(leftcolour, leftcolour & 0x000000ff, 127), colour2, weight); + leftcolour = colour_blend(colour_blend(leftcolour, leftcolour & 0x000000ff, 127), colour2, weight); - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_focused_inner, g_MenuWave1Colours[context->dialog->type].item_focused_inner); } else { - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); } - if (menuIsItemDisabled(context->item, context->dialog)) { + if (menu_is_item_disabled(context->item, context->dialog)) { if (context->dialog->transitionfrac < 0) { leftcolour = g_MenuColours[context->dialog->type].item_disabled; } else { - leftcolour = colourBlend( + leftcolour = colour_blend( g_MenuColours[context->dialog->type2].item_disabled, g_MenuColours[context->dialog->type].item_disabled, context->dialog->colourweight); } if (context->dialog->dimmed) { - leftcolour = (colourBlend(leftcolour, 0x00000000, 127) & 0xffffff00) | (leftcolour & 0xff); + leftcolour = (colour_blend(leftcolour, 0x00000000, 127) & 0xffffff00) | (leftcolour & 0xff); } rightcolour = leftcolour; - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_disabled, g_MenuWave1Colours[context->dialog->type].item_disabled); } @@ -2197,7 +2197,7 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context) // Center text s32 textheight; s32 textwidth; - textMeasure(&textheight, &textwidth, text, font1, font2, 0); + text_measure(&textheight, &textwidth, text, font1, font2, 0); x = context->x + (context->width - textwidth) / 2; } @@ -2207,12 +2207,12 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context) } gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, text, font1, font2, + gdl = text_render_projected(gdl, &x, &y, text, font1, font2, leftcolour, context->width, context->height, 0, 0); if ((context->item->flags & (MENUITEMFLAG_LABEL_HASRIGHTTEXT | MENUITEMFLAG_BIGFONT)) == 0) { // Right side text - text = menuResolveText(context->item->param3, context->item); + text = menu_resolve_text(context->item->param3, context->item); // This is not how you check if a string is empty... if (text != NULL && text != "") { @@ -2220,10 +2220,10 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context) s32 textwidth; y = context->y + 2; - textMeasure(&textheight, &textwidth, text, font1, font2, 0); + text_measure(&textheight, &textwidth, text, font1, font2, 0); x = context->x + context->width - textwidth - 10; - gdl = textRenderProjected(gdl, &x, &y, text, font1, font2, + gdl = text_render_projected(gdl, &x, &y, text, font1, font2, rightcolour, context->width, context->height, 0, 0); } } @@ -2231,17 +2231,17 @@ Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context) return text0f153780(gdl); } -bool menuitemSelectableTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags) +bool menuitem_selectable_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags) { if ((tickflags & MENUTICKFLAG_ITEMISFOCUSED) && inputs->select) { - menuPlaySound(MENUSOUND_SELECT); + menu_play_sound(MENUSOUND_SELECT); if (item->flags & MENUITEMFLAG_SELECTABLE_CLOSESDIALOG) { - menuPopDialog(); + menu_pop_dialog(); } if (item->flags & MENUITEMFLAG_SELECTABLE_OPENSDIALOG) { - menuPushDialog((struct menudialogdef *)item->handler); + menu_push_dialog((struct menudialogdef *)item->handler); } else if (item->handler) { union handlerdata data; item->handler(MENUOP_SET, item, &data); @@ -2251,7 +2251,7 @@ bool menuitemSelectableTick(struct menuitem *item, struct menuinputs *inputs, u3 return true; } -Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_slider_render(Gfx *gdl, struct menurendercontext *context) { u32 colour; char *label; @@ -2289,63 +2289,63 @@ Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context) x -= 6; } - label = menuResolveParam2Text(context->item); + label = menu_resolve_param2_text(context->item); markerx = context->x + context->width + slidervalue * 75 / context->item->param3 - 82; colour = MIXCOLOUR(context->dialog, item_unfocused); if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); } if (context->focused) { if (context->focused & 2) { u32 tmpcolour; - u32 weight = menuGetSinOscFrac(40) * 255.0f; + u32 weight = menu_get_sin_osc_frac(40) * 255.0f; tmpcolour = MIXCOLOUR(context->dialog, item_focused_inner); - colour = colourBlend(colour, colour & 0xff, 0x7f); - colour = colourBlend(colour, tmpcolour, weight) | 0xff; + colour = colour_blend(colour, colour & 0xff, 0x7f); + colour = colour_blend(colour, tmpcolour, weight) | 0xff; } - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_focused_inner, g_MenuWave1Colours[context->dialog->type].item_focused_inner); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_focused_inner, g_MenuWave1Colours[context->dialog->type].item_focused_inner); } else { - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); } - gdl = menugfxRenderSlider(gdl, context->x + context->width - 82, context->y + extray + 5, context->x + context->width - 7, context->y + extray + 11, markerx, colour); + gdl = menugfx_render_slider(gdl, context->x + context->width - 82, context->y + extray + 5, context->x + context->width - 7, context->y + extray + 11, markerx, colour); colour = MIXCOLOUR(context->dialog, item_unfocused); if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); } if (context->focused != 0) { if (context->focused & 2) { u32 tmpcolour; - u32 weight = menuGetSinOscFrac(20) * 255.0f; + u32 weight = menu_get_sin_osc_frac(20) * 255.0f; tmpcolour = MIXCOLOUR(context->dialog, item_focused_inner); - colour = colourBlend(colour, colour & 0xff, 0x7f); - colour = colourBlend(colour, tmpcolour, weight); + colour = colour_blend(colour, colour & 0xff, 0x7f); + colour = colour_blend(colour, tmpcolour, weight); } else { u32 tmpcolour; - u32 weight = menuGetSinOscFrac(40) * 255.0f; + u32 weight = menu_get_sin_osc_frac(40) * 255.0f; tmpcolour = MIXCOLOUR(context->dialog, item_focused_inner); - colour = colourBlend(colour, colour & 0xff, 0x7f); - colour = colourBlend(colour, tmpcolour, weight); + colour = colour_blend(colour, colour & 0xff, 0x7f); + colour = colour_blend(colour, tmpcolour, weight); } - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_focused_inner, g_MenuWave1Colours[context->dialog->type].item_focused_inner); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_focused_inner, g_MenuWave1Colours[context->dialog->type].item_focused_inner); } else { - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); } gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, label, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0); if ((context->item->flags & MENUITEMFLAG_SLIDER_HIDEVALUE) == 0) { strcpy(buffer, ""); @@ -2358,7 +2358,7 @@ Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context) context->item->handler(MENUOP_GETSLIDERLABEL, context->item, &data); } - textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = context->x + context->width - textwidth - 7; y = context->y + 2; @@ -2366,13 +2366,13 @@ Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context) colour = MIXCOLOUR(context->dialog, item_unfocused); if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); } - textSetWaveColours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); + text_set_wave_colours(g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); colour = (colour & 0xffffff00) | ((colour & 0xff) >> 1); - gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0); + gdl = text_render_projected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width, context->height, 0, 0); } gdl = text0f153780(gdl); @@ -2380,7 +2380,7 @@ Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context) return gdl; } -bool menuitemSliderTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) +bool menuitem_slider_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) { s32 index; union handlerdata handlerdata; @@ -2490,36 +2490,36 @@ bool menuitemSliderTick(struct menuitem *item, struct menudialog *dialog, struct return true; } -void menuitemSliderInit(union menuitemdata *data) +void menuitem_slider_init(union menuitemdata *data) { data->slider.multiplier = 0; } -Gfx *menuitemCarouselRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_carousel_render(Gfx *gdl, struct menurendercontext *context) { u32 colour = 0xff0000ff; if (context->focused) { u32 colour1; - u32 weight = menuGetSinOscFrac(40) * 255; + u32 weight = menu_get_sin_osc_frac(40) * 255; if (context->dialog->transitionfrac < 0) { colour1 = g_MenuColours[context->dialog->type].item_focused_inner; } else { - colour1 = colourBlend( + colour1 = colour_blend( g_MenuColours[context->dialog->type2].item_focused_inner, g_MenuColours[context->dialog->type].item_focused_inner, context->dialog->colourweight); } - colour = colourBlend(colourBlend(colour, 0x000000ff, 127), colour1, weight); + colour = colour_blend(colour_blend(colour, 0x000000ff, 127), colour1, weight); } // Left arrow - gdl = menugfxDrawCarouselChevron(gdl, context->x, context->y + context->height / 2, 8, 1, -1, colour); + gdl = menugfx_draw_carousel_chevron(gdl, context->x, context->y + context->height / 2, 8, 1, -1, colour); // Right arrow - gdl = menugfxDrawCarouselChevron(gdl, context->x + context->width, context->y + context->height / 2, 8, 3, -1, colour); + gdl = menugfx_draw_carousel_chevron(gdl, context->x + context->width, context->y + context->height / 2, 8, 3, -1, colour); // This part of the function is unused because param2 is always zero. // Setting it to 0x7b causes a crash. @@ -2543,7 +2543,7 @@ Gfx *menuitemCarouselRender(Gfx *gdl, struct menurendercontext *context) return gdl; } -bool menuitemCarouselTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags) +bool menuitem_carousel_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags) { union handlerdata data; s32 index; @@ -2553,7 +2553,7 @@ bool menuitemCarouselTick(struct menuitem *item, struct menuinputs *inputs, u32 if (((tickflags & MENUTICKFLAG_ITEMISFOCUSED) || (item->flags & MENUITEMFLAG_CAROUSEL_04000000)) && item->handler) { if (inputs->leftright != 0) { - if (mpIsPlayerLockedOut(g_MpPlayerNum) == 0 || (item->flags & MENUITEMFLAG_LOCKABLEMINOR) == 0) { + if (mp_is_player_locked_out(g_MpPlayerNum) == 0 || (item->flags & MENUITEMFLAG_LOCKABLEMINOR) == 0) { done = false; item->handler(MENUOP_GETOPTIONCOUNT, item, &data); @@ -2599,7 +2599,7 @@ bool menuitemCarouselTick(struct menuitem *item, struct menuinputs *inputs, u32 return true; } -Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_checkbox_render(Gfx *gdl, struct menurendercontext *context) { u32 maincolour = 0x00000000; char *text; @@ -2618,7 +2618,7 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context) x = context->x; y = context->y; - text = menuResolveParam2Text(context->item); + text = menu_resolve_param2_text(context->item); data[0] = 0; if (context->item->handler @@ -2628,34 +2628,34 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context) if (context->dialog->transitionfrac < 0) { maincolour = g_MenuColours[context->dialog->type].checkbox_checked_unfocused; } else { - maincolour = colourBlend( + maincolour = colour_blend( g_MenuColours[context->dialog->type2].checkbox_checked_unfocused, g_MenuColours[context->dialog->type].checkbox_checked_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - maincolour = (colourBlend(maincolour, 0, 127) & 0xffffff00) | (maincolour & 0xff); + maincolour = (colour_blend(maincolour, 0, 127) & 0xffffff00) | (maincolour & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].checkbox_checked_unfocused, g_MenuWave1Colours[context->dialog->type].checkbox_checked_unfocused); } else { if (context->dialog->transitionfrac < 0) { maincolour = g_MenuColours[context->dialog->type].item_unfocused; } else { - maincolour = colourBlend( + maincolour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - maincolour = (colourBlend(maincolour, 0, 127) & 0xffffff00) | (maincolour & 0xff); + maincolour = (colour_blend(maincolour, 0, 127) & 0xffffff00) | (maincolour & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); } @@ -2668,38 +2668,38 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context) // use in the else branch. The lui is loading a value into $at for the // float to u32 conversion for weight. u32 focuscolour; - u32 weight = menuGetSinOscFrac(40) * 255; \ + u32 weight = menu_get_sin_osc_frac(40) * 255; \ if (context->dialog->transitionfrac < 0) { \ focuscolour = g_MenuColours[context->dialog->type].item_focused_inner; } else { - focuscolour = colourBlend( + focuscolour = colour_blend( g_MenuColours[context->dialog->type2].item_focused_inner, g_MenuColours[context->dialog->type].item_focused_inner, context->dialog->colourweight); } - maincolour = colourBlend(colourBlend(maincolour, maincolour & 0xff, 127), focuscolour, weight); + maincolour = colour_blend(colour_blend(maincolour, maincolour & 0xff, 127), focuscolour, weight); - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_focused_inner, g_MenuWave1Colours[context->dialog->type].item_focused_inner); } - if (menuIsItemDisabled(context->item, context->dialog)) { + if (menu_is_item_disabled(context->item, context->dialog)) { if (context->dialog->transitionfrac < 0) { maincolour = g_MenuColours[context->dialog->type].item_disabled; } else { - maincolour = colourBlend( + maincolour = colour_blend( g_MenuColours[context->dialog->type2].item_disabled, g_MenuColours[context->dialog->type].item_disabled, context->dialog->colourweight); } if (context->dialog->dimmed) { - maincolour = (colourBlend(maincolour, 0, 127) & 0xffffff00) | (maincolour & 0xff); + maincolour = (colour_blend(maincolour, 0, 127) & 0xffffff00) | (maincolour & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_disabled, g_MenuWave1Colours[context->dialog->type].item_disabled); @@ -2707,30 +2707,30 @@ Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context) } #if VERSION == VERSION_JPN_FINAL - gdl = menugfxDrawCheckbox(gdl, context->x + context->width - 19, context->y + 2, 9, checked, maincolour, fillcolour); + gdl = menugfx_draw_checkbox(gdl, context->x + context->width - 19, context->y + 2, 9, checked, maincolour, fillcolour); #else - gdl = menugfxDrawCheckbox(gdl, context->x + context->width - 16, context->y + 2, 6, checked, maincolour, fillcolour); + gdl = menugfx_draw_checkbox(gdl, context->x + context->width - 16, context->y + 2, 6, checked, maincolour, fillcolour); #endif x = context->x + 10; y = context->y + 2; - gdl = textRenderProjected(gdl, &x, &y, text, font1, font2, + gdl = text_render_projected(gdl, &x, &y, text, font1, font2, maincolour, context->width, context->height, 0, 0); return text0f153780(gdl); } -bool menuitemCheckboxTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags) +bool menuitem_checkbox_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags) { union handlerdata data; if ((tickflags & MENUTICKFLAG_ITEMISFOCUSED) && inputs->select) { if (item->handler && item->handler(MENUOP_GET, item, &data) == 1) { data.checkbox.value = 0; - menuPlaySound(MENUSOUND_TOGGLEOFF); + menu_play_sound(MENUSOUND_TOGGLEOFF); } else { data.checkbox.value = 1; - menuPlaySound(MENUSOUND_TOGGLEON); + menu_play_sound(MENUSOUND_TOGGLEON); } if (item->handler) { @@ -2741,37 +2741,37 @@ bool menuitemCheckboxTick(struct menuitem *item, struct menuinputs *inputs, u32 return true; } -char *menuitemScrollableGetText(u32 type) +char *menuitem_scrollable_get_text(u32 type) { switch (type) { case DESCRIPTION_MPCONFIG: - return challengeGetConfigDescription(g_Menus[g_MpPlayerNum].training.mpconfig); + return challenge_get_config_description(g_Menus[g_MpPlayerNum].training.mpconfig); case DESCRIPTION_MPCHALLENGE: - if (!challengeIsLoaded()) { + if (!challenge_is_loaded()) { g_Menus[g_MpPlayerNum].menumodel.curparams = 0x4fac5ace; - challengeLoadAndStoreCurrent(g_Menus[g_MpPlayerNum].menumodel.allocstart, g_Menus[g_MpPlayerNum].menumodel.alloclen); + challenge_load_and_store_current(g_Menus[g_MpPlayerNum].menumodel.allocstart, g_Menus[g_MpPlayerNum].menumodel.alloclen); } - return challengeGetCurrentDescription(); - case DESCRIPTION_CHRBIO: return ciGetChrBioDescription(); - case DESCRIPTION_MISCBIO: return ciGetMiscBioDescription(); - case DESCRIPTION_DEVICETRAINING: return dtGetDescription(); - case DESCRIPTION_FRWEAPON: return frGetWeaponDescription(); - case DESCRIPTION_HANGARBIO: return ciGetHangarBioDescription(); - case DESCRIPTION_HOLOTRAINING: return htGetDescription(); - case DESCRIPTION_HOLOTIP1: return htGetTip1(); - case DESCRIPTION_HOLOTIP2: return htGetTip2(); - case DESCRIPTION_DEVICETIP1: return dtGetTip1(); - case DESCRIPTION_DEVICETIP2: return dtGetTip2(); + return challenge_get_current_description(); + case DESCRIPTION_CHRBIO: return ci_get_chr_bio_description(); + case DESCRIPTION_MISCBIO: return ci_get_misc_bio_description(); + case DESCRIPTION_DEVICETRAINING: return dt_get_description(); + case DESCRIPTION_FRWEAPON: return fr_get_weapon_description(); + case DESCRIPTION_HANGARBIO: return ci_get_hangar_bio_description(); + case DESCRIPTION_HOLOTRAINING: return ht_get_description(); + case DESCRIPTION_HOLOTIP1: return ht_get_tip1(); + case DESCRIPTION_HOLOTIP2: return ht_get_tip2(); + case DESCRIPTION_DEVICETIP1: return dt_get_tip1(); + case DESCRIPTION_DEVICETIP2: return dt_get_tip2(); } - return langGet(g_Briefing.briefingtextnum); + return lang_get(g_Briefing.briefingtextnum); } /** * Render a scrollable menu item, such as briefing paragraphs and challenge * descriptions. * - * The text returned from menuitemScrollableGetText is first wrapped to fit the + * The text returned from menuitem_scrollable_get_text is first wrapped to fit the * width of the dialog. It is then separated into two strings: * * headings - which are started with the pipe character and ended with a @@ -2780,7 +2780,7 @@ char *menuitemScrollableGetText(u32 type) * * Headings are rendered in red, with a dropshadow and are outdented. */ -Gfx *menuitemScrollableRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_scrollable_render(Gfx *gdl, struct menurendercontext *context) { char alltext[8000] = ""; char headingtext[8000]; @@ -2796,14 +2796,14 @@ Gfx *menuitemScrollableRender(Gfx *gdl, struct menurendercontext *context) char *rawtext; s32 paddingright = 24; - rawtext = menuitemScrollableGetText(context->item->param); + rawtext = menuitem_scrollable_get_text(context->item->param); - if (menuIsScrollableUnscrollable(context->item)) { + if (menu_is_scrollable_unscrollable(context->item)) { paddingright = 10; } if (rawtext) { - textWrap(context->width - paddingright, rawtext, alltext, g_CharsHandelGothicSm, g_FontHandelGothicSm); + text_wrap(context->width - paddingright, rawtext, alltext, g_CharsHandelGothicSm, g_FontHandelGothicSm); } inptr = alltext; @@ -2850,17 +2850,17 @@ Gfx *menuitemScrollableRender(Gfx *gdl, struct menurendercontext *context) if (context->dialog->transitionfrac < 0) { colour = g_MenuColours[context->dialog->type].item_unfocused; } else { - colour = colourBlend( + colour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 0x7f) & 0xffffff00) | (colour & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[context->dialog->type].item_unfocused, g_MenuWave1Colours[context->dialog->type].item_unfocused); @@ -2869,26 +2869,26 @@ Gfx *menuitemScrollableRender(Gfx *gdl, struct menurendercontext *context) // Heading text shadow x = context->x + 3; y = context->y + 3; - gdl = textRenderProjected(gdl, &x, &y, headingtext, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, headingtext, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0x000000ff, context->width - 4, context->height - 4, -data->scrolloffset, 0); // Heading text (red) x = context->x + 2; y = context->y + 2; - gdl = textRenderProjected(gdl, &x, &y, headingtext, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, headingtext, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff4444ff, context->width - 4, context->height - 4, -data->scrolloffset, 0); // Body text - x = menuIsScrollableUnscrollable(context->item) ? context->x + 5 : context->x + 12; + x = menu_is_scrollable_unscrollable(context->item) ? context->x + 5 : context->x + 12; y = context->y + 2; - gdl = textRenderProjected(gdl, &x, &y, bodytext, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, bodytext, g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, context->width - 4, context->height - 1, -data->scrolloffset, 0); return text0f153780(gdl); } -bool menuitemScrollableTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) +bool menuitem_scrollable_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) { u32 stack; @@ -2910,24 +2910,24 @@ bool menuitemScrollableTick(struct menuitem *item, struct menudialog *dialog, st data->scrollable.language = g_LanguageId; #endif - dialogFindItem(dialog, item, &rowindex, &colindex); + dialog_find_item(dialog, item, &rowindex, &colindex); colwidth = g_Menus[g_MpPlayerNum].cols[colindex].width; rowheight = g_Menus[g_MpPlayerNum].rows[rowindex].height; - if (menuIsScrollableUnscrollable(item)) { + if (menu_is_scrollable_unscrollable(item)) { width = colwidth - 10; } else { width = colwidth - 24; } - rawtext = menuitemScrollableGetText(item->param); + rawtext = menuitem_scrollable_get_text(item->param); if (rawtext) { - textWrap(width, rawtext, wrapped, g_CharsHandelGothicSm, g_FontHandelGothicSm); + text_wrap(width, rawtext, wrapped, g_CharsHandelGothicSm, g_FontHandelGothicSm); } - textMeasure(&height, &width, wrapped, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&height, &width, wrapped, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); data->scrollable.maxscrolloffset = height - rowheight + 5; @@ -2938,7 +2938,7 @@ bool menuitemScrollableTick(struct menuitem *item, struct menudialog *dialog, st data->scrollable.dialogheight = dialog->height; } - if (menuIsScrollableUnscrollable(item)) { + if (menu_is_scrollable_unscrollable(item)) { data->scrollable.scrolloffset = 0; } else if (tickflags & MENUTICKFLAG_ITEMISFOCUSED) { f32 floatval; @@ -2984,16 +2984,16 @@ bool menuitemScrollableTick(struct menuitem *item, struct menudialog *dialog, st return true; } -void menuitemScrollableInit(union menuitemdata *data) +void menuitem_scrollable_init(union menuitemdata *data) { data->scrollable.dialogheight = -1; data->scrollable.scrolloffset = -10; } -Gfx *menuitemMarqueeRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_marquee_render(Gfx *gdl, struct menurendercontext *context) { struct menuitemdata_marquee *data = &context->data->marquee; - char *text = menuResolveParam2Text(context->item); + char *text = menu_resolve_param2_text(context->item); s32 x; s32 y; u32 colour; @@ -3033,14 +3033,14 @@ Gfx *menuitemMarqueeRender(Gfx *gdl, struct menurendercontext *context) if (context->dialog->transitionfrac < 0) { colour = g_MenuColours[context->dialog->type].item_unfocused; } else { - colour = colourBlend( + colour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - colour = (colourBlend(colour, 0, 127) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 127) & 0xffffff00) | (colour & 0xff); } x = context->x + context->width - data->totalmoved; @@ -3069,7 +3069,7 @@ Gfx *menuitemMarqueeRender(Gfx *gdl, struct menurendercontext *context) } #endif - textMeasure(&textheight, &textwidth, string, font1, font2, 0); + text_measure(&textheight, &textwidth, string, font1, font2, 0); if (x + textwidth > context->x) { hasmore = false; @@ -3111,20 +3111,20 @@ Gfx *menuitemMarqueeRender(Gfx *gdl, struct menurendercontext *context) g_ScissorY2 = 0; } - if (g_ScissorX1 > viGetBufWidth()) { - g_ScissorX1 = viGetBufWidth(); + if (g_ScissorX1 > vi_get_buf_width()) { + g_ScissorX1 = vi_get_buf_width(); } - if (g_ScissorX2 > viGetBufWidth()) { - g_ScissorX2 = viGetBufWidth(); + if (g_ScissorX2 > vi_get_buf_width()) { + g_ScissorX2 = vi_get_buf_width(); } - if (g_ScissorY1 > viGetBufHeight()) { - g_ScissorY1 = viGetBufHeight(); + if (g_ScissorY1 > vi_get_buf_height()) { + g_ScissorY1 = vi_get_buf_height(); } - if (g_ScissorY2 > viGetBufHeight()) { - g_ScissorY2 = viGetBufHeight(); + if (g_ScissorY2 > vi_get_buf_height()) { + g_ScissorY2 = vi_get_buf_height(); } if (g_ScissorX2 < g_ScissorX1) { @@ -3142,25 +3142,25 @@ Gfx *menuitemMarqueeRender(Gfx *gdl, struct menurendercontext *context) (context->x + context->width) * g_ScaleX, context->y + context->height - 1); #endif - textBackupAndResetBlends(); + text_backup_and_reset_blends(); if (context->item->flags & MENUITEMFLAG_MARQUEE_FADEBOTHSIDES) { #if VERSION == VERSION_JPN_FINAL - textSetHorizontalBlend(context->x, context->x + context->width, 28); + text_set_horizontal_blend(context->x, context->x + context->width, 28); #else - textSetHorizontalBlend(context->x, context->x + context->width, 14); + text_set_horizontal_blend(context->x, context->x + context->width, 14); #endif } else { - textSetHorizontalBlend(context->x, context->x, 14); + text_set_horizontal_blend(context->x, context->x, 14); } gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, &text[i], font1, font2, colour, + gdl = text_render_projected(gdl, &x, &y, &text[i], font1, font2, colour, context->width + context->x - x, context->height, 0, 0); gdl = text0f153780(gdl); - gdl = menuApplyScissor(gdl); + gdl = menu_apply_scissor(gdl); - textRestoreBlends(); + text_restore_blends(); data->viewwidth = context->width; @@ -3169,7 +3169,7 @@ Gfx *menuitemMarqueeRender(Gfx *gdl, struct menurendercontext *context) u32 var800711f0 = 0x00000002; -bool menuitemMarqueeTick(struct menuitem *item, union menuitemdata *data) +bool menuitem_marquee_tick(struct menuitem *item, union menuitemdata *data) { s32 i; s32 textheight; @@ -3178,7 +3178,7 @@ bool menuitemMarqueeTick(struct menuitem *item, union menuitemdata *data) struct font *font2; s32 increment; u16 texthash = 0; - char *text = menuResolveParam2Text(item); + char *text = menu_resolve_param2_text(item); s32 limit; #if VERSION == VERSION_JPN_FINAL @@ -3210,7 +3210,7 @@ bool menuitemMarqueeTick(struct menuitem *item, union menuitemdata *data) data->marquee.texthash = texthash; } - textMeasure(&textheight, &textwidth, text, font1, font2, 0); + text_measure(&textheight, &textwidth, text, font1, font2, 0); limit = data->marquee.viewwidth + textwidth; increment = g_Vars.diffframe60 / 2; @@ -3227,19 +3227,19 @@ bool menuitemMarqueeTick(struct menuitem *item, union menuitemdata *data) return true; } -void menuitemMarqueeInit(union menuitemdata *data) +void menuitem_marquee_init(union menuitemdata *data) { data->marquee.totalmoved = 0; data->marquee.viewwidth = 50; data->marquee.unk06 = 0; } -Gfx *menuitem07Render(Gfx *gdl) +Gfx *menuitem07_render(Gfx *gdl) { return gdl; } -Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_ranking_render(Gfx *gdl, struct menurendercontext *context) { struct ranking rankings[MAX_MPCHRS]; s32 numrows; @@ -3258,9 +3258,9 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context) if (context->item->param2 == 1) { team = true; - numrows = mpGetTeamRankings(rankings); + numrows = mp_get_team_rankings(rankings); } else { - numrows = mpGetPlayerRankings(rankings); + numrows = mp_get_player_rankings(rankings); } gdl = text0f153628(gdl); @@ -3283,30 +3283,30 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context) if (context->dialog->transitionfrac < 0) { textcolour = g_MenuColours[context->dialog->type].item_unfocused; } else { - textcolour = colourBlend( + textcolour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - textcolour = (colourBlend(textcolour, 0, 127) & 0xffffff00) | (textcolour & 0xff); + textcolour = (colour_blend(textcolour, 0, 127) & 0xffffff00) | (textcolour & 0xff); } if (!team) { // "Deaths" - textMeasure(&textheight, &textwidth, langGet(L_MPMENU_277), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, lang_get(L_MPMENU_277), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = (context->x - textwidth) + 91; y = context->y + 1; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_277), g_CharsHandelGothicXs, g_FontHandelGothicXs, + gdl = text_render_projected(gdl, &x, &y, lang_get(L_MPMENU_277), g_CharsHandelGothicXs, g_FontHandelGothicXs, textcolour, context->width, context->height, 0, 0); } // "Score" - textMeasure(&textheight, &textwidth, langGet(L_MPMENU_278), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, lang_get(L_MPMENU_278), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = (context->x - textwidth) + 120; y = context->y + 1; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_278), g_CharsHandelGothicXs, g_FontHandelGothicXs, + gdl = text_render_projected(gdl, &x, &y, lang_get(L_MPMENU_278), g_CharsHandelGothicXs, g_FontHandelGothicXs, textcolour, context->width, context->height, 0, 0); gdl = text0f153780(gdl); @@ -3315,37 +3315,37 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context) if (dialog->transitionfrac < 0) { linecolour1 = g_MenuColours[dialog->type].dialog_border1; } else { - linecolour1 = colourBlend( + linecolour1 = colour_blend( g_MenuColours[dialog->type2].dialog_border1, g_MenuColours[dialog->type].dialog_border1, dialog->colourweight); } if (dialog->dimmed) { - linecolour1 = (colourBlend(linecolour1, 0, 44) & 0xffffff00) | (linecolour1 & 0xff); + linecolour1 = (colour_blend(linecolour1, 0, 44) & 0xffffff00) | (linecolour1 & 0xff); } if (dialog->transitionfrac < 0) { linecolour2 = g_MenuColours[dialog->type].dialog_border2; } else { - linecolour2 = colourBlend( + linecolour2 = colour_blend( g_MenuColours[dialog->type2].dialog_border2, g_MenuColours[dialog->type].dialog_border2, dialog->colourweight); } if (dialog->dimmed) { - linecolour2 = (colourBlend(linecolour2, 0, 44) & 0xffffff00) | (linecolour2 & 0xff); + linecolour2 = (colour_blend(linecolour2, 0, 44) & 0xffffff00) | (linecolour2 & 0xff); } - linecolour1 = (textApplyProjectionColour(context->x, context->y + 2, -129) & 0xff) | (linecolour1 & 0xffffff00); - linecolour2 = (textApplyProjectionColour(context->x + context->width, context->y + 2, -129) & 0xff) | (linecolour2 & 0xffffff00); + linecolour1 = (text_apply_projection_colour(context->x, context->y + 2, -129) & 0xff) | (linecolour1 & 0xffffff00); + linecolour2 = (text_apply_projection_colour(context->x + context->width, context->y + 2, -129) & 0xff) | (linecolour2 & 0xffffff00); // Horizontal line between header and body #if VERSION == VERSION_JPN_FINAL - gdl = menugfxDrawFilledRect(gdl, context->x, context->y + 13, context->x + context->width, context->y + 14, linecolour1, linecolour1); + gdl = menugfx_draw_filled_rect(gdl, context->x, context->y + 13, context->x + context->width, context->y + 14, linecolour1, linecolour1); #else - gdl = menugfxDrawFilledRect(gdl, context->x, context->y + 9, context->x + context->width, context->y + 10, linecolour1, linecolour1); + gdl = menugfx_draw_filled_rect(gdl, context->x, context->y + 9, context->x + context->width, context->y + 10, linecolour1, linecolour1); #endif gDPPipeSync(gdl++); @@ -3372,20 +3372,20 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context) g_ScissorY2 = 0; } - if (g_ScissorX1 > viGetBufWidth()) { - g_ScissorX1 = viGetBufWidth(); + if (g_ScissorX1 > vi_get_buf_width()) { + g_ScissorX1 = vi_get_buf_width(); } - if (g_ScissorX2 > viGetBufWidth()) { - g_ScissorX2 = viGetBufWidth(); + if (g_ScissorX2 > vi_get_buf_width()) { + g_ScissorX2 = vi_get_buf_width(); } - if (g_ScissorY1 > viGetBufHeight()) { - g_ScissorY1 = viGetBufHeight(); + if (g_ScissorY1 > vi_get_buf_height()) { + g_ScissorY1 = vi_get_buf_height(); } - if (g_ScissorY2 > viGetBufHeight()) { - g_ScissorY2 = viGetBufHeight(); + if (g_ScissorY2 > vi_get_buf_height()) { + g_ScissorY2 = vi_get_buf_height(); } if (g_ScissorX2 < g_ScissorX1) { @@ -3420,7 +3420,7 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context) weight = i / (f32)(numrows - 1) * 255; } - textcolour = colourBlend(0x008888ff, 0x00ffffff, weight); + textcolour = colour_blend(0x008888ff, 0x00ffffff, weight); x = context->x + 5; #if VERSION >= VERSION_JPN_FINAL y = context->y + i * 13 - data->scrolloffset + 18; @@ -3429,46 +3429,46 @@ Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context) #endif if (team) { - gdl = textRenderProjected(gdl, &x, &y, g_BossFile.teamnames[ranking->teamnum], + gdl = text_render_projected(gdl, &x, &y, g_BossFile.teamnames[ranking->teamnum], g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0); } else { - gdl = textRenderProjected(gdl, &x, &y, ranking->mpchr->name, + gdl = text_render_projected(gdl, &x, &y, ranking->mpchr->name, g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0); } if (!team) { // Deaths value (red) - textcolour = colourBlend(0xcf0000ff, 0xff4040ff, weight); + textcolour = colour_blend(0xcf0000ff, 0xff4040ff, weight); sprintf(valuebuffer, "%d\n", ranking->mpchr->numdeaths); - textMeasure(&textheight, &textwidth, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = context->x - textwidth + 91; #if VERSION >= VERSION_JPN_FINAL y = context->y + i * 13 - data->scrolloffset + 18; #else y = context->y + i * 10 - data->scrolloffset + 14; #endif - gdl = textRenderProjected(gdl, &x, &y, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0); } // Score value (green) - textcolour = colourBlend(0x009f00ff, 0x00ff00ff, weight); + textcolour = colour_blend(0x009f00ff, 0x00ff00ff, weight); sprintf(valuebuffer, "%d\n", ranking->score); - textMeasure(&textheight, &textwidth, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = context->x - textwidth + 120; #if VERSION >= VERSION_JPN_FINAL y = context->y + i * 13 - data->scrolloffset + 18; #else y = context->y + i * 10 - data->scrolloffset + 14; #endif - gdl = textRenderProjected(gdl, &x, &y, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, valuebuffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, textcolour, context->width, context->height, 0, 0); } return text0f153780(gdl); } -bool menuitemRankingTick(struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) +bool menuitem_ranking_tick(struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) { f32 floatval; s32 intval; @@ -3503,12 +3503,12 @@ bool menuitemRankingTick(struct menuinputs *inputs, u32 tickflags, union menuite return true; } -void menuitemRankingInit(union menuitemdata *data) +void menuitem_ranking_init(union menuitemdata *data) { data->ranking.scrolloffset = 0; } -Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_player_stats_render(Gfx *gdl, struct menurendercontext *context) { struct menuitemdata_dropdown *data = &context->data->dropdown; s32 x; @@ -3519,7 +3519,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) u32 selectioncolour; s32 textheight; s32 textwidth; - s32 numchrs = mpGetNumChrs(); + s32 numchrs = mp_get_num_chrs(); char buffer[12]; s32 i; u32 weight; @@ -3531,39 +3531,39 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) gdl = text0f153628(gdl); // Write selected player's name - weight = menuGetSinOscFrac(40) * 255; + weight = menu_get_sin_osc_frac(40) * 255; if (context->dialog->transitionfrac < 0) { selectioncolour = g_MenuColours[context->dialog->type].item_focused_inner; } else { - selectioncolour = colourBlend( + selectioncolour = colour_blend( g_MenuColours[context->dialog->type2].item_focused_inner, g_MenuColours[context->dialog->type].item_focused_inner, context->dialog->colourweight); } - selectioncolour = colourBlend(colourBlend(0xffffffff, 0x000000ff, 127), selectioncolour, weight); + selectioncolour = colour_blend(colour_blend(0xffffffff, 0x000000ff, 127), selectioncolour, weight); x = context->x + 2; y = context->y + 1; - gdl = textRenderProjected(gdl, &x, &y, mpchr->name, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, mpchr->name, g_CharsHandelGothicSm, g_FontHandelGothicSm, selectioncolour, context->width, context->height, 0, 0); // "Suicides" heading if (context->dialog->transitionfrac < 0) { maincolour = g_MenuColours[context->dialog->type].item_unfocused; } else { - maincolour = colourBlend( + maincolour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - maincolour = (colourBlend(maincolour, 0x00000000, 127) & 0xffffff00) | (maincolour & 0xff); + maincolour = (colour_blend(maincolour, 0x00000000, 127) & 0xffffff00) | (maincolour & 0xff); } - textMeasure(&textheight, &textwidth, langGet(L_MPMENU_281), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, lang_get(L_MPMENU_281), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_NTSC_1_0 x = context->x - textwidth + 121; #else @@ -3571,7 +3571,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) #endif y = context->y + 1; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_281), g_CharsHandelGothicXs, g_FontHandelGothicXs, + gdl = text_render_projected(gdl, &x, &y, lang_get(L_MPMENU_281), g_CharsHandelGothicXs, g_FontHandelGothicXs, maincolour, context->width, context->height, 0, 0); // Num suicides @@ -3579,7 +3579,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) x = context->x - textwidth + 119; #endif sprintf(buffer, "%d\n", mpchr->killcounts[playernum]); - textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); #if VERSION >= VERSION_NTSC_1_0 x -= textwidth; #else @@ -3591,7 +3591,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) y++; #endif - gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xffff00ff, context->width, context->height, 0, 0); // Move ypos past top row @@ -3601,29 +3601,29 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) ypos += 12; #endif - if (mpGetNumChrs() >= 2) { + if (mp_get_num_chrs() >= 2) { if (context->dialog->transitionfrac < 0) { maincolour = g_MenuColours[context->dialog->type].item_unfocused; } else { - maincolour = colourBlend( + maincolour = colour_blend( g_MenuColours[context->dialog->type2].item_unfocused, g_MenuColours[context->dialog->type].item_unfocused, context->dialog->colourweight); } if (context->dialog->dimmed) { - maincolour = (colourBlend(maincolour, 0, 127) & 0xffffff00) | (maincolour & 0xff); + maincolour = (colour_blend(maincolour, 0, 127) & 0xffffff00) | (maincolour & 0xff); } // "Deaths" heading - textMeasure(&textheight, &textwidth, langGet(L_MPMENU_282), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, lang_get(L_MPMENU_282), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x = context->x - textwidth + 120; y = context->y + ypos; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_282), g_CharsHandelGothicXs, g_FontHandelGothicXs, + gdl = text_render_projected(gdl, &x, &y, lang_get(L_MPMENU_282), g_CharsHandelGothicXs, g_FontHandelGothicXs, maincolour, context->width, context->height, 0, 0); // "Kills" heading - textMeasure(&textheight, &textwidth, langGet(L_MPMENU_283), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, lang_get(L_MPMENU_283), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); #if VERSION >= VERSION_JPN_FINAL x = context->x + 4; @@ -3632,7 +3632,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) #endif y = context->y + ypos; - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPMENU_283), g_CharsHandelGothicXs, g_FontHandelGothicXs, + gdl = text_render_projected(gdl, &x, &y, lang_get(L_MPMENU_283), g_CharsHandelGothicXs, g_FontHandelGothicXs, maincolour, context->width, context->height, 0, 0); // Move ypos past heading row @@ -3682,20 +3682,20 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) g_ScissorY2 = 0; } - if (g_ScissorX1 > viGetBufWidth()) { - g_ScissorX1 = viGetBufWidth(); + if (g_ScissorX1 > vi_get_buf_width()) { + g_ScissorX1 = vi_get_buf_width(); } - if (g_ScissorX2 > viGetBufWidth()) { - g_ScissorX2 = viGetBufWidth(); + if (g_ScissorX2 > vi_get_buf_width()) { + g_ScissorX2 = vi_get_buf_width(); } - if (g_ScissorY1 > viGetBufHeight()) { - g_ScissorY1 = viGetBufHeight(); + if (g_ScissorY1 > vi_get_buf_height()) { + g_ScissorY1 = vi_get_buf_height(); } - if (g_ScissorY2 > viGetBufHeight()) { - g_ScissorY2 = viGetBufHeight(); + if (g_ScissorY2 > vi_get_buf_height()) { + g_ScissorY2 = vi_get_buf_height(); } if (g_ScissorX2 < g_ScissorX1) { @@ -3725,20 +3725,20 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) // Name x = context->x + 29; y = context->y + ypos; - gdl = textRenderProjected(gdl, &x, &y, loopmpchr->name, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, loopmpchr->name, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0x00ffffff, context->width, context->height, 0, 0); // Num deaths sprintf(buffer, "%d\n", loopmpchr->killcounts[playernum]); - textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = context->x - textwidth + 120; y = context->y + ypos; - gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff4040ff, context->width, context->height, 0, 0); // Num kills sprintf(buffer, "%d\n", mpchr->killcounts[i]); - textMeasure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); #if VERSION == VERSION_JPN_FINAL x = context->x + 4; @@ -3747,7 +3747,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) #endif y = context->y + ypos; - gdl = textRenderProjected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, + gdl = text_render_projected(gdl, &x, &y, buffer, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0x00ff00ff, context->width, context->height, 0, 0); #if VERSION == VERSION_JPN_FINAL @@ -3763,7 +3763,7 @@ Gfx *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context) return text0f153780(gdl); } -bool menuitemPlayerStatsTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) +bool menuitem_player_stats_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) { f32 floatval; s32 intval; @@ -3795,27 +3795,27 @@ bool menuitemPlayerStatsTick(struct menuitem *item, struct menudialog *dialog, s } } - return menuitemDropdownTick(item, dialog, inputs, tickflags, data); + return menuitem_dropdown_tick(item, dialog, inputs, tickflags, data); } -Gfx *menuitemPlayerStatsOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, 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) { #if VERSION >= VERSION_NTSC_1_0 - return menuitemDropdownOverlay(gdl, x + 1, y, -1, y2, item, dialog, data); + return menuitem_dropdown_overlay(gdl, x + 1, y, -1, y2, item, dialog, data); #else - return menuitemDropdownOverlay(gdl, x, y, 56, y2, item, dialog, data); + return menuitem_dropdown_overlay(gdl, x, y, 56, y2, item, dialog, data); #endif } -void menuitemPlayerStatsInit(struct menuitem *item, union menuitemdata *data) +void menuitem_player_stats_init(struct menuitem *item, union menuitemdata *data) { data->dropdown.scrolloffset = 0; g_MpSelectedPlayersForStats[g_MpPlayerNum] = g_MpPlayerNum; - menuitemDropdownInit(item, data); + menuitem_dropdown_init(item, data); } -Gfx *menuitemControllerRenderLine(Gfx *gdl, s32 speed, s32 x1, s32 y1, s32 x2, s32 y2) +Gfx *menuitem_controller_render_line(Gfx *gdl, s32 speed, s32 x1, s32 y1, s32 x2, s32 y2) { speed = speed + (x1 % 4); @@ -3830,7 +3830,7 @@ Gfx *menuitemControllerRenderLine(Gfx *gdl, s32 speed, s32 x1, s32 y1, s32 x2, s return gdl; } -Gfx *menuitemControllerRenderTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alpha) +Gfx *menuitem_controller_render_texture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alpha) { gDPPipeSync(gdl++); gDPSetTexturePersp(gdl++, G_TP_NONE); @@ -3838,7 +3838,7 @@ Gfx *menuitemControllerRenderTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, &g_TexGeneralConfigs[texturenum], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[texturenum], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -3867,7 +3867,7 @@ struct lineconfig { s32 y2; }; -Gfx *menuitemControllerRenderLines(Gfx *gdl, struct menurendercontext *context, s32 firstindex, s32 lastindex, s32 padx, s32 pady, u32 alpha) +Gfx *menuitem_controller_render_lines(Gfx *gdl, struct menurendercontext *context, s32 firstindex, s32 lastindex, s32 padx, s32 pady, u32 alpha) { s32 speed; s32 i; @@ -3955,7 +3955,7 @@ Gfx *menuitemControllerRenderLines(Gfx *gdl, struct menurendercontext *context, gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, &g_TexGeneralConfigs[55], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[55], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); @@ -4009,7 +4009,7 @@ Gfx *menuitemControllerRenderLines(Gfx *gdl, struct menurendercontext *context, break; } - gdl = menuitemControllerRenderLine(gdl, thisspeed, + gdl = menuitem_controller_render_line(gdl, thisspeed, linecfgs[i].x1 + context->x + padx, linecfgs[i].y1 + context->y + pady, linecfgs[i].x2 + context->x + padx, linecfgs[i].y2 + context->y + pady); } @@ -4033,22 +4033,22 @@ u16 var80071354[][9] = { /*11*/ { L_OPTIONS_003, L_OPTIONS_003, L_MPWEAPONS_212, L_OPTIONS_003, L_MPWEAPONS_203, L_MPWEAPONS_204, L_MPWEAPONS_208, L_MPWEAPONS_205, L_OPTIONS_003 }, }; -u16 menuitemControllerGetButtonAction(s32 mode, s32 buttonnum) +u16 menuitem_controller_get_button_action(s32 mode, s32 buttonnum) { u32 textid = var80071354[mode][buttonnum]; if (textid == L_MPWEAPONS_194 // "AIM" - && optionsGetAimControl(g_Menus[g_MpPlayerNum].main.mpindex) == AIMCONTROL_TOGGLE) { + && options_get_aim_control(g_Menus[g_MpPlayerNum].main.mpindex) == AIMCONTROL_TOGGLE) { textid = L_MPWEAPONS_195; // "AIM TOGGLE" } if (textid == L_MPWEAPONS_196 // "LOOK UP" - && optionsGetForwardPitch(g_Menus[g_MpPlayerNum].main.mpindex) == false) { + && options_get_forward_pitch(g_Menus[g_MpPlayerNum].main.mpindex) == false) { textid = L_MPWEAPONS_198; // "LOOK DOWN" } if (textid == L_MPWEAPONS_197 // "LOOK DOWN" - && optionsGetForwardPitch(g_Menus[g_MpPlayerNum].main.mpindex) == false) { + && options_get_forward_pitch(g_Menus[g_MpPlayerNum].main.mpindex) == false) { textid = L_MPWEAPONS_199; // "LOOK UP" } @@ -4064,7 +4064,7 @@ u16 menuitemControllerGetButtonAction(s32 mode, s32 buttonnum) * Note that the valuecolour argument is mostly unused - only the alpha channel * is used because the rest is bitwise or'ed to white. */ -Gfx *menuitemControllerRenderText(Gfx *gdl, s32 curmode, struct menurendercontext *context, s32 padx, s32 pady, u32 valuecolour, u32 labelcolour, s8 prevmode) +Gfx *menuitem_controller_render_text(Gfx *gdl, s32 curmode, struct menurendercontext *context, s32 padx, s32 pady, u32 valuecolour, u32 labelcolour, s8 prevmode) { s32 rx; s32 ry; @@ -4103,11 +4103,11 @@ Gfx *menuitemControllerRenderText(Gfx *gdl, s32 curmode, struct menurendercontex #if VERSION < VERSION_NTSC_1_0 ry = i * 7 + context->y + pady; #endif - gdl = textRenderProjected(gdl, &rx, &ry, langGet(labels[i]), - g_CharsHandelGothicXs, g_FontHandelGothicXs, labelcolour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &rx, &ry, lang_get(labels[i]), + g_CharsHandelGothicXs, g_FontHandelGothicXs, labelcolour, vi_get_width(), vi_get_height(), 0, 0); } - textnum = menuitemControllerGetButtonAction(curmode, i); + textnum = menuitem_controller_get_button_action(curmode, i); colour = valuecolour; // If there's a prevmode, get the text ID that was in this position for @@ -4118,11 +4118,11 @@ Gfx *menuitemControllerRenderText(Gfx *gdl, s32 curmode, struct menurendercontex // choose their control style separately to player 1, in which case // there would have been 2.5, 2.6, 2.7 and 2.8 for player 2. if (curmode > CONTROLMODE_24) { - if (textnum == menuitemControllerGetButtonAction(prevmode + 4, i)) { + if (textnum == menuitem_controller_get_button_action(prevmode + 4, i)) { colour = labelcolour; } } else { - if (textnum == menuitemControllerGetButtonAction(prevmode, i)) { + if (textnum == menuitem_controller_get_button_action(prevmode, i)) { colour = labelcolour; } } @@ -4138,42 +4138,42 @@ Gfx *menuitemControllerRenderText(Gfx *gdl, s32 curmode, struct menurendercontex colour |= 0xffffff00; } - gdl = textRenderProjected(gdl, &rx, &ry, langGet(textnum), - g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &rx, &ry, lang_get(textnum), + g_CharsHandelGothicXs, g_FontHandelGothicXs, colour, vi_get_width(), vi_get_height(), 0, 0); } return text0f153780(gdl); } -Gfx *menuitemControllerRenderPad(Gfx *gdl, struct menurendercontext *context, s32 padx, s32 pady, s32 curmode, u32 alpha, u32 colour1, u32 colour2, 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) { s32 rx = context->x + padx; s32 ry = context->y + pady + (VERSION == VERSION_JPN_FINAL ? 25 : 4); // The controller graphic is split into 4 textures - gdl = menuitemControllerRenderTexture(gdl, rx, ry, 0x33, alpha); - gdl = menuitemControllerRenderTexture(gdl, rx + 32, ry, 0x34, alpha); - gdl = menuitemControllerRenderTexture(gdl, rx, ry + 32, 0x35, alpha); - gdl = menuitemControllerRenderTexture(gdl, rx + 32, ry + 32, 0x36, alpha); + gdl = menuitem_controller_render_texture(gdl, rx, ry, 0x33, alpha); + gdl = menuitem_controller_render_texture(gdl, rx + 32, ry, 0x34, alpha); + gdl = menuitem_controller_render_texture(gdl, rx, ry + 32, 0x35, alpha); + gdl = menuitem_controller_render_texture(gdl, rx + 32, ry + 32, 0x36, alpha); #if VERSION >= VERSION_JPN_FINAL if (curmode >= CONTROLMODE_21) { - gdl = menuitemControllerRenderLines(gdl, context, 13, 20, padx, pady, alpha); + gdl = menuitem_controller_render_lines(gdl, context, 13, 20, padx, pady, alpha); } else { - gdl = menuitemControllerRenderLines(gdl, context, 0, 22, padx, pady, alpha); + gdl = menuitem_controller_render_lines(gdl, context, 0, 22, padx, pady, alpha); } #else if (curmode >= CONTROLMODE_21) { - gdl = menuitemControllerRenderLines(gdl, context, 13, 19, padx, pady, alpha); + gdl = menuitem_controller_render_lines(gdl, context, 13, 19, padx, pady, alpha); } else { - gdl = menuitemControllerRenderLines(gdl, context, 0, 21, padx, pady, alpha); + gdl = menuitem_controller_render_lines(gdl, context, 0, 21, padx, pady, alpha); } #endif - return menuitemControllerRenderText(gdl, curmode, context, padx, pady, colour1, colour2, prevmode); + return menuitem_controller_render_text(gdl, curmode, context, padx, pady, colour1, colour2, prevmode); } -Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_controller_render(Gfx *gdl, struct menurendercontext *context) { struct menuitemdata_controller *data = &context->data->controller; u32 colour; @@ -4185,7 +4185,7 @@ Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context) u32 contalpha; u32 textalpha; - textBackupAndResetBlends(); + text_backup_and_reset_blends(); // If changing modes within the same group (eg. within 1.x) if (data->curmode != (g_Menus[g_MpPlayerNum].main.controlmode & 0xff)) { @@ -4238,48 +4238,48 @@ Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context) if (dialog->transitionfrac < 0) { colour = g_MenuColours[dialog->type].item_unfocused; } else { - colour = colourBlend( + colour = colour_blend( g_MenuColours[dialog->type2].item_unfocused, g_MenuColours[dialog->type].item_unfocused, dialog->colourweight); } if (dialog->dimmed) { - colour = (colourBlend(colour, 0, 44) & 0xffffff00) | (colour & 0xff); + colour = (colour_blend(colour, 0, 44) & 0xffffff00) | (colour & 0xff); } - textSetWaveColours( + text_set_wave_colours( g_MenuWave2Colours[dialog->type].item_unfocused, g_MenuWave1Colours[dialog->type].item_unfocused); if (g_Menus[g_MpPlayerNum].main.controlmode >= CONTROLMODE_21) { - sprintf(text, langGet(L_MPWEAPONS_213), // "Control Style %s %s" - langGet(g_ControlStyleOptions[g_Menus[g_MpPlayerNum].main.controlmode]), - langGet(L_MPWEAPONS_215)); // "(Two-Handed)" + sprintf(text, lang_get(L_MPWEAPONS_213), // "Control Style %s %s" + lang_get(g_ControlStyleOptions[g_Menus[g_MpPlayerNum].main.controlmode]), + lang_get(L_MPWEAPONS_215)); // "(Two-Handed)" } else { - sprintf(text, langGet(L_MPWEAPONS_213), // "Control Style %s %s" - langGet(g_ControlStyleOptions[g_Menus[g_MpPlayerNum].main.controlmode]), - langGet(L_MPWEAPONS_214)); // "(One-Handed)" + sprintf(text, lang_get(L_MPWEAPONS_213), // "Control Style %s %s" + lang_get(g_ControlStyleOptions[g_Menus[g_MpPlayerNum].main.controlmode]), + lang_get(L_MPWEAPONS_214)); // "(One-Handed)" } x = context->x + 2; y = context->y + 2; - gdl = textRenderProjected(gdl, &x, &y, text, - g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, + g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); - textcolour = colourBlend(colour, colour & 0xffffff00, textalpha); - colour = colourBlend(colour, colour & 0xffffff00, contalpha); + textcolour = colour_blend(colour, colour & 0xffffff00, textalpha); + colour = colour_blend(colour, colour & 0xffffff00, contalpha); if (g_Menus[g_MpPlayerNum].main.controlmode >= CONTROLMODE_21) { - gdl = menuitemControllerRenderPad(gdl, context, 0, VERSION == VERSION_JPN_FINAL ? -4 : 12, + gdl = menuitem_controller_render_pad(gdl, context, 0, VERSION == VERSION_JPN_FINAL ? -4 : 12, g_Menus[g_MpPlayerNum].main.controlmode, contalpha, textcolour, colour, data->prevmode); - gdl = menuitemControllerRenderPad(gdl, context, 0, VERSION == VERSION_JPN_FINAL ? 74 : 80, + gdl = menuitem_controller_render_pad(gdl, context, 0, VERSION == VERSION_JPN_FINAL ? 74 : 80, g_Menus[g_MpPlayerNum].main.controlmode + 4, contalpha, textcolour, colour, data->prevmode); } else { - gdl = menuitemControllerRenderPad(gdl, context, 0, PAL ? 19 : 15, + gdl = menuitem_controller_render_pad(gdl, context, 0, PAL ? 19 : 15, g_Menus[g_MpPlayerNum].main.controlmode, contalpha, textcolour, colour, data->prevmode); @@ -4291,17 +4291,17 @@ Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context) #endif gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, langGet(L_MPWEAPONS_216), // "Hold weapon button for ..." - g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(L_MPWEAPONS_216), // "Hold weapon button for ..." + g_CharsHandelGothicSm, g_FontHandelGothicSm, colour, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); } - textRestoreBlends(); + text_restore_blends(); return gdl; } -void menuitemControllerInit(union menuitemdata *data) +void menuitem_controller_init(union menuitemdata *data) { data->controller.textfadetimer = 0; data->controller.contfadetimer = 0; @@ -4310,27 +4310,27 @@ void menuitemControllerInit(union menuitemdata *data) data->controller.prevmode = -1; } -Gfx *menuitemRender(Gfx *gdl, struct menurendercontext *context) +Gfx *menuitem_render(Gfx *gdl, struct menurendercontext *context) { switch (context->item->type) { - case MENUITEMTYPE_LIST: return menuitemListRender(gdl, context); - case MENUITEMTYPE_SELECTABLE: return menuitemSelectableRender(gdl, context); - case MENUITEMTYPE_SLIDER: return menuitemSliderRender(gdl, context); - case MENUITEMTYPE_CHECKBOX: return menuitemCheckboxRender(gdl, context); - case MENUITEMTYPE_SCROLLABLE: return menuitemScrollableRender(gdl, context); - case MENUITEMTYPE_MARQUEE: return menuitemMarqueeRender(gdl, context); - case MENUITEMTYPE_LABEL: return menuitemLabelRender(gdl, context); - case MENUITEMTYPE_METER: return menuitemMeterRender(gdl, context); - case MENUITEMTYPE_SEPARATOR: return menuitemSeparatorRender(gdl, context); - case MENUITEMTYPE_OBJECTIVES: return menuitemObjectivesRender(gdl, context); - case MENUITEMTYPE_07: return menuitem07Render(gdl); - case MENUITEMTYPE_DROPDOWN: return menuitemDropdownRender(gdl, context); - case MENUITEMTYPE_KEYBOARD: return menuitemKeyboardRender(gdl, context); - case MENUITEMTYPE_RANKING: return menuitemRankingRender(gdl, context); - case MENUITEMTYPE_PLAYERSTATS: return menuitemPlayerStatsRender(gdl, context); - case MENUITEMTYPE_CAROUSEL: return menuitemCarouselRender(gdl, context); - case MENUITEMTYPE_MODEL: return menuitemModelRender(gdl, context); - case MENUITEMTYPE_CONTROLLER: return menuitemControllerRender(gdl, context); + case MENUITEMTYPE_LIST: return menuitem_list_render(gdl, context); + case MENUITEMTYPE_SELECTABLE: return menuitem_selectable_render(gdl, context); + case MENUITEMTYPE_SLIDER: return menuitem_slider_render(gdl, context); + case MENUITEMTYPE_CHECKBOX: return menuitem_checkbox_render(gdl, context); + case MENUITEMTYPE_SCROLLABLE: return menuitem_scrollable_render(gdl, context); + case MENUITEMTYPE_MARQUEE: return menuitem_marquee_render(gdl, context); + case MENUITEMTYPE_LABEL: return menuitem_label_render(gdl, context); + case MENUITEMTYPE_METER: return menuitem_meter_render(gdl, context); + case MENUITEMTYPE_SEPARATOR: return menuitem_separator_render(gdl, context); + case MENUITEMTYPE_OBJECTIVES: return menuitem_objectives_render(gdl, context); + case MENUITEMTYPE_07: return menuitem07_render(gdl); + case MENUITEMTYPE_DROPDOWN: return menuitem_dropdown_render(gdl, context); + case MENUITEMTYPE_KEYBOARD: return menuitem_keyboard_render(gdl, context); + case MENUITEMTYPE_RANKING: return menuitem_ranking_render(gdl, context); + case MENUITEMTYPE_PLAYERSTATS: return menuitem_player_stats_render(gdl, context); + case MENUITEMTYPE_CAROUSEL: return menuitem_carousel_render(gdl, context); + case MENUITEMTYPE_MODEL: return menuitem_model_render(gdl, context); + case MENUITEMTYPE_CONTROLLER: return menuitem_controller_render(gdl, context); } return gdl; @@ -4339,62 +4339,62 @@ Gfx *menuitemRender(Gfx *gdl, struct menurendercontext *context) /** * Return true if default up/down/left/right/back behaviour should be used. */ -bool menuitemTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) +bool menuitem_tick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data) { switch (item->type) { - case MENUITEMTYPE_LIST: return menuitemListTick(item, inputs, tickflags, data); - case MENUITEMTYPE_SELECTABLE: return menuitemSelectableTick(item, inputs, tickflags); - case MENUITEMTYPE_SLIDER: return menuitemSliderTick(item, dialog, inputs, tickflags, data); - case MENUITEMTYPE_CHECKBOX: return menuitemCheckboxTick(item, inputs, tickflags); - case MENUITEMTYPE_SCROLLABLE: return menuitemScrollableTick(item, dialog, inputs, tickflags, data); - case MENUITEMTYPE_MARQUEE: return menuitemMarqueeTick(item, data); - case MENUITEMTYPE_RANKING: return menuitemRankingTick(inputs, tickflags, data); - case MENUITEMTYPE_DROPDOWN: return menuitemDropdownTick(item, dialog, inputs, tickflags, data); - case MENUITEMTYPE_KEYBOARD: return menuitemKeyboardTick(item, inputs, tickflags, data); - case MENUITEMTYPE_CAROUSEL: return menuitemCarouselTick(item, inputs, tickflags); - case MENUITEMTYPE_PLAYERSTATS: return menuitemPlayerStatsTick(item, dialog, inputs, tickflags, data); + case MENUITEMTYPE_LIST: return menuitem_list_tick(item, inputs, tickflags, data); + case MENUITEMTYPE_SELECTABLE: return menuitem_selectable_tick(item, inputs, tickflags); + case MENUITEMTYPE_SLIDER: return menuitem_slider_tick(item, dialog, inputs, tickflags, data); + case MENUITEMTYPE_CHECKBOX: return menuitem_checkbox_tick(item, inputs, tickflags); + case MENUITEMTYPE_SCROLLABLE: return menuitem_scrollable_tick(item, dialog, inputs, tickflags, data); + case MENUITEMTYPE_MARQUEE: return menuitem_marquee_tick(item, data); + case MENUITEMTYPE_RANKING: return menuitem_ranking_tick(inputs, tickflags, data); + case MENUITEMTYPE_DROPDOWN: return menuitem_dropdown_tick(item, dialog, inputs, tickflags, data); + case MENUITEMTYPE_KEYBOARD: return menuitem_keyboard_tick(item, inputs, tickflags, data); + case MENUITEMTYPE_CAROUSEL: return menuitem_carousel_tick(item, inputs, tickflags); + case MENUITEMTYPE_PLAYERSTATS: return menuitem_player_stats_tick(item, dialog, inputs, tickflags, data); } return true; } -void menuitemInit(struct menuitem *item, union menuitemdata *data) +void menuitem_init(struct menuitem *item, union menuitemdata *data) { switch (item->type) { case MENUITEMTYPE_LIST: case MENUITEMTYPE_DROPDOWN: - menuitemDropdownInit(item, data); + menuitem_dropdown_init(item, data); break; case MENUITEMTYPE_SCROLLABLE: - menuitemScrollableInit(data); + menuitem_scrollable_init(data); break; case MENUITEMTYPE_MARQUEE: - menuitemMarqueeInit(data); + menuitem_marquee_init(data); break; case MENUITEMTYPE_RANKING: - menuitemRankingInit(data); + menuitem_ranking_init(data); break; case MENUITEMTYPE_SLIDER: - menuitemSliderInit(data); + menuitem_slider_init(data); break; case MENUITEMTYPE_PLAYERSTATS: - menuitemPlayerStatsInit(item, data); + menuitem_player_stats_init(item, data); break; case MENUITEMTYPE_KEYBOARD: - menuitemKeyboardInit(item, data); + menuitem_keyboard_init(item, data); break; case MENUITEMTYPE_CONTROLLER: - menuitemControllerInit(data); + menuitem_controller_init(data); break; } } -Gfx *menuitemOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data) +Gfx *menuitem_overlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data) { switch (item->type) { - case MENUITEMTYPE_LIST: return menuitemListOverlay(gdl, x, y, x2, y2); - case MENUITEMTYPE_DROPDOWN: return menuitemDropdownOverlay(gdl, x, y, x2, y2, item, dialog, data); - case MENUITEMTYPE_PLAYERSTATS: return menuitemPlayerStatsOverlay(gdl, x, y, x2, y2, item, dialog, data); + case MENUITEMTYPE_LIST: return menuitem_list_overlay(gdl, x, y, x2, y2); + case MENUITEMTYPE_DROPDOWN: return menuitem_dropdown_overlay(gdl, x, y, x2, y2, item, dialog, data); + case MENUITEMTYPE_PLAYERSTATS: return menuitem_player_stats_overlay(gdl, x, y, x2, y2, item, dialog, data); } return gdl; diff --git a/src/game/menustop.c b/src/game/menustop.c index a58773847..9e19ef20a 100644 --- a/src/game/menustop.c +++ b/src/game/menustop.c @@ -27,12 +27,12 @@ #include "data.h" #include "types.h" -void menuStop(void) +void menu_stop(void) { if (var80062944) { var80062944 = 0; var80062948 = 0; - joySetDefaultPfsPollInterval(); + joy_set_default_pfs_poll_interval(); func0f110bf8(); } } diff --git a/src/game/menutick.c b/src/game/menutick.c index e6fefe0d3..f22e82fe4 100644 --- a/src/game/menutick.c +++ b/src/game/menutick.c @@ -42,7 +42,7 @@ const char var7f1a85e0[] = "Live: %d\n"; const char var7f1a85ec[] = "current:"; const char var7f1a85f8[] = " numactive %d "; -void menuCountDialogs(void) +void menu_count_dialogs(void) { s32 i; g_MenuData.count = 0; @@ -54,7 +54,7 @@ void menuCountDialogs(void) } } -void menuTick(void) +void menu_tick(void) { s32 i; s32 j; @@ -69,13 +69,13 @@ void menuTick(void) g_ScaleX = g_ViRes == VIRES_HI ? 2 : 1; #endif - menuTickTimers(); + menu_tick_timers(); if (g_MenuData.count) { // empty } - menuCountDialogs(); + menu_count_dialogs(); for (i = 0; i < ARRAYCOUNT(g_Menus); i++) { if (i); @@ -181,7 +181,7 @@ void menuTick(void) } if (g_MenuData.bg == MENUBG_6) { - menugfxFreeParticles(); + menugfx_free_particles(); g_MenuData.bg = MENUBG_BLUR; g_MenuData.nextbg = MENUBG_8; } @@ -201,7 +201,7 @@ void menuTick(void) } if (var8009dfc0 && g_Vars.currentplayer->gunmem2) { - playerRemoveChrBody(); + player_remove_chr_body(); if (g_Vars.currentplayer->gunmem2); } @@ -215,7 +215,7 @@ void menuTick(void) if (var80087260 > 0) { if (g_Vars.lvframenum >= 4) { if (g_Vars.stagenum == STAGE_CITRAINING || g_Vars.stagenum == STAGE_4MBMENU) { - viBlack(false); + vi_black(false); g_MpNumJoined = 0; if (g_Vars.usingadvsetup) { @@ -237,9 +237,9 @@ void menuTick(void) g_MpNumJoined++; if (IS4MB()) { - menuPushRootDialog(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); + menu_push_root_dialog(&g_MainMenu4MbMenuDialog, MENUROOT_4MBMAINMENU); } else { - menuPushRootDialog(&g_CombatSimulatorMenuDialog, MENUROOT_MPSETUP); + menu_push_root_dialog(&g_CombatSimulatorMenuDialog, MENUROOT_MPSETUP); } } else { g_Vars.waitingtojoin[i] = true; @@ -250,15 +250,15 @@ void menuTick(void) g_MpPlayerNum = 0; if (g_MpSetup.chrslots & 0xf) { - sndStart(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1); - playerPause(IS4MB() ? MENUROOT_4MBMAINMENU : MENUROOT_MPSETUP); + player_pause(IS4MB() ? MENUROOT_4MBMAINMENU : MENUROOT_MPSETUP); } } var80087260 = 0; } else { - viBlack(true); + vi_black(true); g_PlayersWithControl[0] = false; } } @@ -274,7 +274,7 @@ void menuTick(void) g_Menus[2].openinhibit = 0; g_Menus[3].openinhibit = 0; g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED; - playerPause(MENUROOT_FILEMGR); + player_pause(MENUROOT_FILEMGR); g_FileState = FILESTATE_SELECTED; } } @@ -301,8 +301,8 @@ void menuTick(void) } } - mpCalculateLockIfLastWinnerOrLoser(); - challengePerformSanityChecks(); + mp_calculate_lock_if_last_winner_or_loser(); + challenge_perform_sanity_checks(); } for (i = 0; i < MAX_PLAYERS; i++) { @@ -325,16 +325,16 @@ void menuTick(void) s32 prevplayernum = g_Vars.currentplayernum; if (g_Menus[g_MpPlayerNum].playernum < PLAYERCOUNT()) { - setCurrentPlayerNum(g_Menus[g_MpPlayerNum].playernum); + set_current_player_num(g_Menus[g_MpPlayerNum].playernum); } - menuProcessInput(); - setCurrentPlayerNum(prevplayernum); + menu_process_input(); + set_current_player_num(prevplayernum); } else { if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) { // Check if player is joining the game bool canjoin; - u16 buttons = joyGetButtonsPressedThisFrame(i, 0xffff); + u16 buttons = joy_get_buttons_pressed_this_frame(i, 0xffff); if (g_MenuData.root == MENUROOT_4MBMAINMENU) { if (g_Vars.mpsetupmenu == MPSETUPMENU_GENERAL) { @@ -368,12 +368,12 @@ void menuTick(void) // players here, so they are waiting to join. #if VERSION >= VERSION_NTSC_1_0 if (!g_Vars.waitingtojoin[i]) { - sndStart(var80095200, SFX_EXPLOSION_809A, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_EXPLOSION_809A, 0, -1, -1, -1, -1, -1); } g_Vars.waitingtojoin[i] = true; #else g_Vars.waitingtojoin[i] = true; - sndStart(var80095200, SFX_EXPLOSION_809A, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_EXPLOSION_809A, 0, -1, -1, -1, -1, -1); #endif } else if (g_Vars.mpsetupmenu == MPSETUPMENU_QUICKGO) { @@ -381,9 +381,9 @@ void menuTick(void) g_MpNumJoined++; if (IS4MB()) { - menuPushRootDialog(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); + menu_push_root_dialog(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); } else { - menuPushRootDialog(&g_MpQuickGoMenuDialog, MENUROOT_MPSETUP); + menu_push_root_dialog(&g_MpQuickGoMenuDialog, MENUROOT_MPSETUP); } } else { // Joining from advanced setup @@ -407,9 +407,9 @@ void menuTick(void) g_MpNumJoined++; if (IS4MB()) { - menuPushRootDialog(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); + menu_push_root_dialog(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); } else { - menuPushRootDialog(&g_MpQuickGoMenuDialog, MENUROOT_MPSETUP); + menu_push_root_dialog(&g_MpQuickGoMenuDialog, MENUROOT_MPSETUP); } } else if (g_Vars.mpsetupmenu == MPSETUPMENU_ADVSETUP) { // Player was waiting to join and we have just @@ -428,7 +428,7 @@ void menuTick(void) // Note that MPENDSCREEN also refers to coop and anti modes. // Handle re-opening the endscreen by pressing B. if (g_MenuData.root == MENUROOT_MPENDSCREEN) { - u16 buttons2 = joyGetButtonsPressedThisFrame(g_PlayerConfigsArray[i].contpad1, 0xffff); + u16 buttons2 = joy_get_buttons_pressed_this_frame(g_PlayerConfigsArray[i].contpad1, 0xffff); if (buttons2 & B_BUTTON) { s32 playernum = -1; @@ -443,16 +443,16 @@ void menuTick(void) if (playernum >= 0) { if (g_Vars.coopplayernum >= 0) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); - endscreenPushCoop(); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playernum); + endscreen_push_coop(); + set_current_player_num(prevplayernum); } else if (g_Vars.antiplayernum >= 0) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); - endscreenPushAnti(); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playernum); + endscreen_push_anti(); + set_current_player_num(prevplayernum); } else { - mpPushEndscreenDialog(playernum, i); + mp_push_endscreen_dialog(playernum, i); } } } @@ -472,16 +472,16 @@ void menuTick(void) if (var80062948 == 0 && (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU)) { var80062948 = 1; - filelistCreate(0, FILETYPE_MPPLAYER); - filelistCreate(1, FILETYPE_MPSETUP); + filelist_create(0, FILETYPE_MPPLAYER); + filelist_create(1, FILETYPE_MPSETUP); } if (var80062944) { - filelistsTick(); + filelists_tick(); } } else { if (var80062944 == 1) { - menuStop(); + menu_stop(); } } @@ -512,11 +512,11 @@ void menuTick(void) if (g_MenuData.unk008 != -1) { if (g_MenuData.unk008 == -5) { // Match is beginning - mpStartMatch(); - menuStop(); + mp_start_match(); + menu_stop(); if (g_Vars.modifiedfiles & MODFILE_MPSETUP) { - bossfileSave(); + bossfile_save(); g_Vars.modifiedfiles &= ~MODFILE_MPSETUP; } } else if (g_MenuData.unk008 == -6) { @@ -533,25 +533,25 @@ void menuTick(void) if (g_Vars.stagenum == STAGE_DEEPSEA) { g_MissionConfig.stageindex++; g_MissionConfig.stagenum = g_SoloStages[g_MissionConfig.stageindex].stagenum; - titleSetNextStage(g_MissionConfig.stagenum); - lvSetDifficulty(g_MissionConfig.difficulty); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(g_MissionConfig.stagenum); + title_set_next_stage(g_MissionConfig.stagenum); + lv_set_difficulty(g_MissionConfig.difficulty); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(g_MissionConfig.stagenum); } else { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); - endscreenPushCoop(); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playernum); + endscreen_push_coop(); + set_current_player_num(prevplayernum); sp344 = true; } } else if (g_Vars.antiplayernum >= 0) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); - endscreenPushAnti(); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(playernum); + endscreen_push_anti(); + set_current_player_num(prevplayernum); sp344 = true; } else { - mpPushEndscreenDialog(playernum, i); + mp_push_endscreen_dialog(playernum, i); sp344 = true; if (g_PlayerConfigsArray[i].fileguid.fileid && g_PlayerConfigsArray[i].fileguid.deviceserial) { @@ -563,24 +563,24 @@ void menuTick(void) } } } else if (g_MenuData.unk008 == -7) { - menuStop(); + menu_stop(); g_FileState = FILESTATE_CHANGINGAGENT; - gamefileLoadDefaults(&g_GameFile); - gamefileApplyOptions(&g_GameFile); - mainChangeToStage(IS4MB() ? STAGE_4MBMENU : STAGE_CITRAINING); - musicQueueStopAllEvent(); + gamefile_load_defaults(&g_GameFile); + gamefile_apply_options(&g_GameFile); + main_change_to_stage(IS4MB() ? STAGE_4MBMENU : STAGE_CITRAINING); + music_queue_stop_all_event(); } else { bool startmusic = false; - menuPushRootDialog(g_MenuData.unk00c, g_MenuData.unk008); + menu_push_root_dialog(g_MenuData.unk00c, g_MenuData.unk008); sp344 = true; if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) { startmusic = true; - sndStart(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_EXPLOSION_8098, 0, -1, -1, -1, -1, -1); } if (g_MenuData.root == MENUROOT_MAINMENU || g_MenuData.root == MENUROOT_TRAINING) { - struct trainingdata *dtdata = dtGetData(); + struct trainingdata *dtdata = dt_get_data(); if ((g_Vars.stagenum == STAGE_CITRAINING || g_Vars.stagenum == STAGE_4MBMENU) && ((g_Vars.currentplayer->prop->rooms[0] >= 0x16 && g_Vars.currentplayer->prop->rooms[0] <= 0x19) @@ -594,7 +594,7 @@ void menuTick(void) } if (startmusic) { - musicStartMenu(); + music_start_menu(); } } @@ -604,9 +604,9 @@ void menuTick(void) switch (g_MenuData.root) { case MENUROOT_ENDSCREEN: if (g_Vars.restartlevel) { - mainChangeToStage(mainGetStageNum()); + main_change_to_stage(main_get_stage_num()); } else { - mainChangeToStage(STAGE_TITLE); + main_change_to_stage(STAGE_TITLE); } break; case MENUROOT_MPPAUSE: @@ -628,12 +628,12 @@ void menuTick(void) if (g_Vars.coopplayernum >= 0 && g_MissionConfig.stageindex <= SOLOSTAGEINDEX_SKEDARRUINS - && ((!g_CheatsActiveBank0 && !g_CheatsActiveBank1) || isStageDifficultyUnlocked(g_MissionConfig.stageindex + 1, g_MissionConfig.difficulty))) { - endscreenPushSolo(); + && ((!g_CheatsActiveBank0 && !g_CheatsActiveBank1) || is_stage_difficulty_unlocked(g_MissionConfig.stageindex + 1, g_MissionConfig.difficulty))) { + endscreen_push_solo(); } else if (g_Vars.restartlevel) { - mainChangeToStage(mainGetStageNum()); + main_change_to_stage(main_get_stage_num()); } else { - mpSetPaused(MPPAUSEMODE_UNPAUSED); + mp_set_paused(MPPAUSEMODE_UNPAUSED); g_Vars.mplayerisrunning = false; g_Vars.normmplayerisrunning = false; g_Vars.lvmpbotlevel = 0; @@ -643,28 +643,28 @@ void menuTick(void) } if (IS8MB()) { - titleSetNextStage(STAGE_CITRAINING); - setNumPlayers(1); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(STAGE_CITRAINING); + title_set_next_stage(STAGE_CITRAINING); + set_num_players(1); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(STAGE_CITRAINING); } else { - titleSetNextStage(STAGE_4MBMENU); - setNumPlayers(1); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(STAGE_4MBMENU); + title_set_next_stage(STAGE_4MBMENU); + set_num_players(1); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(STAGE_4MBMENU); } } break; case MENUROOT_COOPCONTINUE: if (g_Vars.coopplayernum >= 0) { - mpSetPaused(MPPAUSEMODE_UNPAUSED); + mp_set_paused(MPPAUSEMODE_UNPAUSED); g_Vars.mplayerisrunning = false; g_Vars.normmplayerisrunning = false; g_Vars.lvmpbotlevel = 0; - titleSetNextStage(STAGE_CITRAINING); - setNumPlayers(1); - titleSetNextMode(TITLEMODE_SKIP); - mainChangeToStage(STAGE_CITRAINING); + title_set_next_stage(STAGE_CITRAINING); + set_num_players(1); + title_set_next_mode(TITLEMODE_SKIP); + main_change_to_stage(STAGE_CITRAINING); g_MissionConfig.iscoop = false; } break; @@ -672,7 +672,7 @@ void menuTick(void) } } - menuCountDialogs(); + menu_count_dialogs(); if (g_MenuData.count == 0) { if (g_MenuData.nextbg != 255) { @@ -691,7 +691,7 @@ void menuTick(void) g_MenuData.unk5d5_01 = true; if (g_Menus[0].menumodel.allocstart) { - bgunFreeGunMem(); + bgun_free_gun_mem(); g_Menus[0].menumodel.allocstart = NULL; } } diff --git a/src/game/modeldef.c b/src/game/modeldef.c index ab23eeb6d..fd518b1d7 100644 --- a/src/game/modeldef.c +++ b/src/game/modeldef.c @@ -119,11 +119,11 @@ void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct m uintptr_t gdl; Vtx *vertices; - allocsize = fileGetAllocationSize(filenum); - loadedsize = fileGetLoadedSize(filenum); + allocsize = file_get_allocation_size(filenum); + loadedsize = file_get_loaded_size(filenum); node = NULL; - modelIterateDisplayLists(modeldef, &node, (Gfx **)&gdl); + model_iterate_display_lists(modeldef, &node, (Gfx **)&gdl); s5 = gdl; @@ -131,16 +131,16 @@ void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct m s32 v1 = allocsize - (loadedsize - (s32)(((uintptr_t)modeldef + (gdl & 0xffffff)) - (uintptr_t)modeldef)); sp84 = (s32)v1 + (s32)((uintptr_t)modeldef - ((uintptr_t)modeldef + (gdl & 0xffffff))); - texCopyGdls((Gfx *)((uintptr_t)modeldef + (gdl & 0xffffff)), + tex_copy_gdls((Gfx *)((uintptr_t)modeldef + (gdl & 0xffffff)), (Gfx *)(v1 + (uintptr_t)modeldef), loadedsize - (s32)(((uintptr_t)modeldef + (gdl & 0xffffff)) - (uintptr_t)modeldef)); - texLoadFromConfigs(modeldef->texconfigs, modeldef->numtexconfigs, texpool, (uintptr_t)modeldef2 - arg2); + tex_load_from_configs(modeldef->texconfigs, modeldef->numtexconfigs, texpool, (uintptr_t)modeldef2 - arg2); while (node) { prevnode = node; s0 = gdl; - modelIterateDisplayLists(modeldef, &node, (Gfx **) &gdl); + model_iterate_display_lists(modeldef, &node, (Gfx **) &gdl); if (gdl) { s4 = gdl - s0; @@ -148,7 +148,7 @@ void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct m s4 = loadedsize + (uintptr_t)modeldef - (uintptr_t)modeldef - (s0 & 0xffffff); } - modelNodeReplaceGdl(modeldef, prevnode, (Gfx *) s0, (Gfx *) s5); + model_node_replace_gdl(modeldef, prevnode, (Gfx *) s0, (Gfx *) s5); if (prevnode->type == MODELNODETYPE_DL) { struct modelrodata_dl *rodata = &prevnode->rodata->dl; @@ -157,14 +157,14 @@ void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct m vertices = NULL; } - s5 += texLoadFromGdl((Gfx *)((uintptr_t)modeldef + (s0 & 0xffffff) + sp84), s4, (Gfx *)((uintptr_t)modeldef + (s5 & 0xffffff)), texpool, (u8 *) vertices); + s5 += tex_load_from_gdl((Gfx *)((uintptr_t)modeldef + (s0 & 0xffffff) + sp84), s4, (Gfx *)((uintptr_t)modeldef + (s5 & 0xffffff)), texpool, (u8 *) vertices); } - fileSetSize(filenum, modeldef, (((uintptr_t)modeldef + (s5 & 0xffffff)) - (uintptr_t)modeldef + 0xf) & ~0xf, arg5); + file_set_size(filenum, modeldef, (((uintptr_t)modeldef + (s5 & 0xffffff)) - (uintptr_t)modeldef + 0xf) & ~0xf, arg5); } } -void modelPromoteTypeToPointer(struct modeldef *modeldef) +void model_promote_type_to_pointer(struct modeldef *modeldef) { s32 i; @@ -178,31 +178,31 @@ void modelPromoteTypeToPointer(struct modeldef *modeldef) } } -struct modeldef *modeldefLoad(u16 fileid, u8 *dst, s32 size, struct texpool *arg3) +struct modeldef *modeldef_load(u16 fileid, u8 *dst, s32 size, struct texpool *arg3) { struct modeldef *modeldef; g_LoadType = LOADTYPE_MODEL; if (dst) { - modeldef = fileLoadToAddr(fileid, FILELOADMETHOD_EXTRAMEM, dst, size); + modeldef = file_load_to_addr(fileid, FILELOADMETHOD_EXTRAMEM, dst, size); } else { - modeldef = fileLoadToNew(fileid, FILELOADMETHOD_EXTRAMEM); + modeldef = file_load_to_new(fileid, FILELOADMETHOD_EXTRAMEM); } - modelPromoteTypeToPointer(modeldef); - modelPromoteOffsetsToPointers(modeldef, 0x5000000, (uintptr_t) modeldef); + model_promote_type_to_pointer(modeldef); + model_promote_offsets_to_pointers(modeldef, 0x5000000, (uintptr_t) modeldef); modeldef0f1a7560(modeldef, fileid, 0x5000000, modeldef, arg3, dst == NULL); return modeldef; } -struct modeldef *modeldefLoadToNew(u16 fileid) +struct modeldef *modeldef_load_to_new(u16 fileid) { - return modeldefLoad(fileid, NULL, 0, NULL); + return modeldef_load(fileid, NULL, 0, NULL); } -struct modeldef *modeldefLoadToAddr(u16 fileid, u8 *dst, s32 size) +struct modeldef *modeldef_load_to_addr(u16 fileid, u8 *dst, s32 size) { - return modeldefLoad(fileid, dst, size, NULL); + return modeldef_load(fileid, dst, size, NULL); } diff --git a/src/game/modelmgr.c b/src/game/modelmgr.c index 5251e8d58..2233df469 100644 --- a/src/game/modelmgr.c +++ b/src/game/modelmgr.c @@ -26,13 +26,13 @@ s32 g_ModelMostAnims = 0; #define NUMTYPE2() (IS4MB() ? 24 : 25) #define NUMTYPE3() (IS4MB() ? 0 : 20) -bool modelmgrCanSlotFitRwdata(struct model *modelslot, struct modeldef *modeldef) +bool modelmgr_can_slot_fit_rwdata(struct model *modelslot, struct modeldef *modeldef) { return modeldef->rwdatalen <= 0 || (modelslot->rwdatas != NULL && modelslot->rwdatalen >= modeldef->rwdatalen); } -void modelmgrPrintCounts(void) +void modelmgr_print_counts(void) { s32 i; s32 numtype1 = 0; @@ -102,7 +102,7 @@ void modelmgrPrintCounts(void) if (IS4MB()); } -struct model *modelmgrInstantiateModel(struct modeldef *modeldef, bool withanim) +struct model *modelmgr_instantiate_model(struct modeldef *modeldef, bool withanim) { struct model *model = NULL; u32 *rwdatas = NULL; @@ -113,7 +113,7 @@ struct model *modelmgrInstantiateModel(struct modeldef *modeldef, bool withanim) // If it's being allocated mid-gameplay, look through all slots // and find any slot that's big enough. for (i = 0; i < g_MaxModels; i++) { - if (g_ModelSlots[i].definition == NULL && modelmgrCanSlotFitRwdata(&g_ModelSlots[i], modeldef)) { + if (g_ModelSlots[i].definition == NULL && modelmgr_can_slot_fit_rwdata(&g_ModelSlots[i], modeldef)) { model = &g_ModelSlots[i]; rwdatas = g_ModelSlots[i].rwdatas; datalen = g_ModelSlots[i].rwdatalen; @@ -135,13 +135,13 @@ struct model *modelmgrInstantiateModel(struct modeldef *modeldef, bool withanim) if (model == NULL) { osSyncPrintf("Allocating %d bytes for objinst structure\n", ALIGN16(sizeof(struct model))); - model = mempAlloc(ALIGN16(sizeof(struct model)), MEMPOOL_STAGE); + model = memp_alloc(ALIGN16(sizeof(struct model)), MEMPOOL_STAGE); } if (g_ModelIsLvResetting) { if (modeldef->rwdatalen > 0) { datalen = modeldef->rwdatalen; - rwdatas = mempAlloc(ALIGN16(datalen * 4), MEMPOOL_STAGE); + rwdatas = memp_alloc(ALIGN16(datalen * 4), MEMPOOL_STAGE); } } else { // At this point, it's during gameplay. A model instance slot has @@ -196,7 +196,7 @@ struct model *modelmgrInstantiateModel(struct modeldef *modeldef, bool withanim) if (!done && modeldef->rwdatalen <= 256) { for (i = 0; i < NUMTYPE3(); i++) { if (g_ModelRwdataBindings[2][i].model == NULL && g_ModelRwdataBindings[2][i].rwdata == NULL) { - g_ModelRwdataBindings[2][i].rwdata = mempAlloc(256 * 4, MEMPOOL_STAGE); + g_ModelRwdataBindings[2][i].rwdata = memp_alloc(256 * 4, MEMPOOL_STAGE); rwdatas = g_ModelRwdataBindings[2][i].rwdata; g_ModelRwdataBindings[2][i].model = model; break; @@ -218,19 +218,19 @@ struct model *modelmgrInstantiateModel(struct modeldef *modeldef, bool withanim) } if (rwdatas == NULL) { - rwdatas = mempAlloc(ALIGN16(datalen * 4), MEMPOOL_STAGE); + rwdatas = memp_alloc(ALIGN16(datalen * 4), MEMPOOL_STAGE); } } } if (model) { if (withanim) { - model->anim = modelmgrInstantiateAnim(); + model->anim = modelmgr_instantiate_anim(); if (model->anim) { - animInit(model->anim); + anim_init(model->anim); } else { - modelmgrFreeModel(model); + modelmgr_free_model(model); model = NULL; } } else { @@ -239,7 +239,7 @@ struct model *modelmgrInstantiateModel(struct modeldef *modeldef, bool withanim) } if (model) { - modelInit(model, modeldef, rwdatas, false); + model_init(model, modeldef, rwdatas, false); model->rwdatalen = datalen; } @@ -249,12 +249,12 @@ struct model *modelmgrInstantiateModel(struct modeldef *modeldef, bool withanim) return model; } -struct model *modelmgrInstantiateModelWithoutAnim(struct modeldef *modeldef) +struct model *modelmgr_instantiate_model_without_anim(struct modeldef *modeldef) { - return modelmgrInstantiateModel(modeldef, false); + return modelmgr_instantiate_model(modeldef, false); } -void modelmgrFreeModel(struct model *model) +void modelmgr_free_model(struct model *model) { bool done = false; s32 i; @@ -307,25 +307,25 @@ void modelmgrFreeModel(struct model *model) } if (model->anim) { - modelmgrFreeAnim(model->anim); + modelmgr_free_anim(model->anim); model->anim = NULL; } model->definition = NULL; } -struct model *modelmgrInstantiateModelWithAnim(struct modeldef *modeldef) +struct model *modelmgr_instantiate_model_with_anim(struct modeldef *modeldef) { - return modelmgrInstantiateModel(modeldef, true); + return modelmgr_instantiate_model(modeldef, true); } -void modelmgrAttachHead(struct model *model, struct modelnode *node, struct modeldef *headmodeldef) +void modelmgr_attach_head(struct model *model, struct modelnode *node, struct modeldef *headmodeldef) { - modelAttachHead(model, model->definition, node, headmodeldef); - modelInitRwData(model, headmodeldef->rootnode); + model_attach_head(model, model->definition, node, headmodeldef); + model_init_rw_data(model, headmodeldef->rootnode); } -struct anim *modelmgrInstantiateAnim(void) +struct anim *modelmgr_instantiate_anim(void) { s32 i; struct anim *anim = NULL; @@ -340,7 +340,7 @@ struct anim *modelmgrInstantiateAnim(void) return anim; } -void modelmgrFreeAnim(struct anim *anim) +void modelmgr_free_anim(struct anim *anim) { anim->animnum = -1; } diff --git a/src/game/modelmgrreset.c b/src/game/modelmgrreset.c index 1d6600514..a67a25291 100644 --- a/src/game/modelmgrreset.c +++ b/src/game/modelmgrreset.c @@ -29,13 +29,13 @@ #define NUMTYPE3() (IS4MB() ? 0 : 20) #define NUMSPARE() (IS4MB() ? 40 : 60) -void modelmgrReset(void) +void modelmgr_reset(void) { g_MaxAnims = 0; g_MaxModels = 0; } -void modelmgrSetLvResetting(bool value) +void modelmgr_set_lv_resetting(bool value) { g_ModelIsLvResetting = value; } @@ -57,7 +57,7 @@ void modelmgrSetLvResetting(bool value) * (eg. for thrown weapons), and a further 20 model and 20 anim slots are * allocated for animated objects. */ -void modelmgrAllocateSlots(s32 numobjs, s32 numchrs) +void modelmgr_allocate_slots(s32 numobjs, s32 numchrs) { s32 rwdata2sizetotal; s32 rwdata1sizetotal; @@ -97,7 +97,7 @@ void modelmgrAllocateSlots(s32 numobjs, s32 numchrs) g_ModelRwdataBindings[1] = NULL; g_ModelRwdataBindings[2] = NULL; - ptr = mempAlloc(totalsize, MEMPOOL_STAGE); + ptr = memp_alloc(totalsize, MEMPOOL_STAGE); if (NUMTYPE1()) { g_ModelRwdataBindings[0] = (struct modelrwdatabinding *) ptr; @@ -156,7 +156,7 @@ void modelmgrAllocateSlots(s32 numobjs, s32 numchrs) g_ModelMostAnims = 0; } -bool modelmgrLoadProjectileModeldefs(s32 weaponnum) +bool modelmgr_load_projectile_modeldefs(s32 weaponnum) { bool result = false; struct weapon *weapon = g_Weapons[weaponnum]; @@ -170,13 +170,13 @@ bool modelmgrLoadProjectileModeldefs(s32 weaponnum) struct weaponfunc_shootprojectile *func = (struct weaponfunc_shootprojectile *)genericfunc; if (func->projectilemodelnum >= 0) { - result |= setupLoadModeldef(func->projectilemodelnum); + result |= setup_load_modeldef(func->projectilemodelnum); } } else if (genericfunc->type == INVENTORYFUNCTYPE_THROW) { struct weaponfunc_throw *func = (struct weaponfunc_throw *)genericfunc; if (func->projectilemodelnum >= 0) { - result |= setupLoadModeldef(func->projectilemodelnum); + result |= setup_load_modeldef(func->projectilemodelnum); } } } diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c index ef96daa54..2c65b7379 100644 --- a/src/game/mplayer/ingame.c +++ b/src/game/mplayer/ingame.c @@ -28,7 +28,7 @@ struct menudialogdef g_MpEndscreenTeamGameOverMenuDialog; struct menudialogdef g_MpEndscreenSavePlayerMenuDialog; #endif -MenuItemHandlerResult mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_stats_for_player_dropdown_handler(s32 operation, struct menuitem *item, union handlerdata *data) { struct mpchrconfig *mpchr; s32 v0; @@ -98,11 +98,11 @@ MenuItemHandlerResult mpStatsForPlayerDropdownHandler(s32 operation, struct menu return 0; } -MenuItemHandlerResult menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_end_game(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.currentplayer->aborted = true; - mainEndStage(); + main_end_stage(); } return 0; @@ -122,26 +122,26 @@ MenuItemHandlerResult menuhandler00178018(s32 operation, struct menuitem *item, return 0; } -char *mpMenuTextInGameLimit(struct menuitem *item) +char *mp_menu_text_in_game_limit(struct menuitem *item) { *g_StringPointer = 0; switch (item->param) { case 0: - sprintf(g_StringPointer, langGet(L_MPMENU_114), g_MpSetup.timelimit + 1); + sprintf(g_StringPointer, lang_get(L_MPMENU_114), g_MpSetup.timelimit + 1); break; case 1: - sprintf(g_StringPointer, langGet(L_MPMENU_113), g_MpSetup.scorelimit + 1); + sprintf(g_StringPointer, lang_get(L_MPMENU_113), g_MpSetup.scorelimit + 1); break; case 2: - sprintf(g_StringPointer, langGet(L_MPMENU_113), mpCalculateTeamScoreLimit() + 1); + sprintf(g_StringPointer, lang_get(L_MPMENU_113), mp_calculate_team_score_limit() + 1); break; } return g_StringPointer; } -MenuItemHandlerResult menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_in_game_limit_label(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { switch (item->param) { @@ -154,13 +154,13 @@ MenuItemHandlerResult menuhandlerMpInGameLimitLabel(s32 operation, struct menuit return 0; } -MenuItemHandlerResult menuhandlerMpPause(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_pause(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - if (mpIsPaused()) { - mpSetPaused(MPPAUSEMODE_UNPAUSED); + if (mp_is_paused()) { + mp_set_paused(MPPAUSEMODE_UNPAUSED); } else { - mpSetPaused(MPPAUSEMODE_PAUSED); + mp_set_paused(MPPAUSEMODE_PAUSED); } } @@ -179,21 +179,21 @@ MenuItemHandlerResult menuhandlerMpPause(s32 operation, struct menuitem *item, u return 0; } -char *menutextPauseOrUnpause(s32 arg0) +char *menutext_pause_or_unpause(s32 arg0) { - if (mpIsPaused()) { - return langGet(L_MPMENU_289); // "Unpause" + if (mp_is_paused()) { + return lang_get(L_MPMENU_289); // "Unpause" } - return langGet(L_MPMENU_288); // "Pause" + return lang_get(L_MPMENU_288); // "Pause" } -char *menutextMatchTime(s32 arg0) +char *menutext_match_time(s32 arg0) { #if PAL - formatTime(g_StringPointer, lvGetStageTime60() * 60 / 50, TIMEPRECISION_SECONDS); + format_time(g_StringPointer, lv_get_stage_time60() * 60 / 50, TIMEPRECISION_SECONDS); #else - formatTime(g_StringPointer, lvGetStageTime60(), TIMEPRECISION_SECONDS); + format_time(g_StringPointer, lv_get_stage_time60(), TIMEPRECISION_SECONDS); #endif return g_StringPointer; @@ -230,7 +230,7 @@ struct menuitem g_MpEndGameMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPMENU_293, // "End Game" 0, - menuhandlerMpEndGame, + menuhandler_mp_end_game, }, { MENUITEMTYPE_END }, }; @@ -249,7 +249,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t) &mpMenuTextChallengeName, + (uintptr_t) &mp_menu_text_challenge_name, 0, menuhandler00178018, }, @@ -258,7 +258,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t) &mpMenuTextScenarioName, + (uintptr_t) &mp_menu_text_scenario_name, 0, NULL, }, @@ -272,8 +272,8 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMFLAG_SMALLFONT, #endif L_MPWEAPONS_162, // "Time Limit:" - (uintptr_t) &mpMenuTextInGameLimit, - menuhandlerMpInGameLimitLabel, + (uintptr_t) &mp_menu_text_in_game_limit, + menuhandler_mp_in_game_limit_label, }, { MENUITEMTYPE_LABEL, @@ -284,8 +284,8 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMFLAG_SMALLFONT, #endif L_MPWEAPONS_163, // "Score Limit:" - (uintptr_t) &mpMenuTextInGameLimit, - menuhandlerMpInGameLimitLabel, + (uintptr_t) &mp_menu_text_in_game_limit, + menuhandler_mp_in_game_limit_label, }, { MENUITEMTYPE_LABEL, @@ -296,8 +296,8 @@ struct menuitem g_MpPauseControlMenuItems[] = { MENUITEMFLAG_SMALLFONT, #endif L_MPWEAPONS_164, // "Team Score Limit:" - (uintptr_t) &mpMenuTextInGameLimit, - menuhandlerMpInGameLimitLabel, + (uintptr_t) &mp_menu_text_in_game_limit, + menuhandler_mp_in_game_limit_label, }, { MENUITEMTYPE_SEPARATOR, @@ -316,16 +316,16 @@ struct menuitem g_MpPauseControlMenuItems[] = { 0, #endif L_MPMENU_286, // "Game Time:" - (uintptr_t)&menutextMatchTime, + (uintptr_t)&menutext_match_time, NULL, }, { MENUITEMTYPE_SELECTABLE, 1, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&menutextPauseOrUnpause, + (uintptr_t)&menutext_pause_or_unpause, 0, - menuhandlerMpPause, + menuhandler_mp_pause, }, { MENUITEMTYPE_SELECTABLE, @@ -341,7 +341,7 @@ struct menuitem g_MpPauseControlMenuItems[] = { struct menudialogdef g_MpPauseControlMenuDialog = { MENUDIALOGTYPE_DEFAULT, #if VERSION >= VERSION_JPN_FINAL - (uintptr_t)&mpMenuTextScenarioName, + (uintptr_t)&mp_menu_text_scenario_name, #else L_MPMENU_285, // "Control" #endif @@ -352,25 +352,25 @@ struct menudialogdef g_MpPauseControlMenuDialog = { }; #if VERSION >= VERSION_JPN_FINAL -char *mpMenuTextWeaponDescription(struct menuitem *item) +char *mp_menu_text_weapon_description(struct menuitem *item) { - struct weapon *weapondef = weaponFindById(g_Menus[g_MpPlayerNum].training.weaponnum); + struct weapon *weapondef = weapon_find_by_id(g_Menus[g_MpPlayerNum].training.weaponnum); if (weapondef != NULL) { if (g_Menus[g_MpPlayerNum].training.weaponnum == WEAPON_EYESPY) { if (g_Vars.currentplayer->eyespy != NULL) { if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) { - return langGet(L_GUN_237); + return lang_get(L_GUN_237); } if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_BOMBSPY) { - return langGet(L_GUN_236); + return lang_get(L_GUN_236); } } } if (g_Menus[g_MpPlayerNum].training.weaponnum == WEAPON_NECKLACE && g_Vars.stagenum == STAGE_ATTACKSHIP) { - if (lvGetDifficulty() >= DIFF_PA) { + if (lv_get_difficulty() >= DIFF_PA) { u8 username[] = { 'C' + 9 * 1, 'D' + 9 * 2, @@ -411,36 +411,36 @@ char *mpMenuTextWeaponDescription(struct menuitem *item) password[i] -= i * 4 + 4; } - sprintf(g_StringPointer, langGet(L_GUN_239), username, password); + sprintf(g_StringPointer, lang_get(L_GUN_239), username, password); return g_StringPointer; } } - return langGet(weapondef->description); + return lang_get(weapondef->description); } - return langGet(L_OPTIONS_003); // "" + return lang_get(L_OPTIONS_003); // "" } #else -char *mpMenuTextWeaponDescription(struct menuitem *item) +char *mp_menu_text_weapon_description(struct menuitem *item) { - struct weapon *weapon = weaponFindById(g_Menus[g_MpPlayerNum].mppause.weaponnum); + struct weapon *weapon = weapon_find_by_id(g_Menus[g_MpPlayerNum].mppause.weaponnum); if (weapon) { - return langGet(weapon->description); + return lang_get(weapon->description); } return "\n"; } #endif -char *mpMenuTitleStatsFor(struct menudialogdef *dialogdef) +char *mp_menu_title_stats_for(struct menudialogdef *dialogdef) { struct mpchrconfig *mpchr = MPCHR(g_MpSelectedPlayersForStats[g_MpPlayerNum]); // "Stats for %s" - sprintf(g_StringPointer, langGet(L_MPMENU_280), mpchr->name); + sprintf(g_StringPointer, lang_get(L_MPMENU_280), mpchr->name); return g_StringPointer; } @@ -451,17 +451,17 @@ MenuItemHandlerResult func0f178440(s32 operation, struct menuitem *item, union h return 0; } -char *mpMenuTextWeaponOfChoiceName(struct menuitem *item) +char *mp_menu_text_weapon_of_choice_name(struct menuitem *item) { - return mpPlayerGetWeaponOfChoiceName(g_Menus[g_MpPlayerNum].playernum, 0); + return mp_player_get_weapon_of_choice_name(g_Menus[g_MpPlayerNum].playernum, 0); } -char *mpMenuTextAward1(struct menuitem *item) +char *mp_menu_text_award1(struct menuitem *item) { return g_Vars.players[g_Menus[g_MpPlayerNum].playernum]->award1; } -char *mpMenuTextAward2(struct menuitem *item) +char *mp_menu_text_award2(struct menuitem *item) { return g_Vars.players[g_Menus[g_MpPlayerNum].playernum]->award2; } @@ -473,13 +473,13 @@ struct menuitem g_Mp2PMissionInventoryMenuItems[] = { 0, 0x00000078, 0x00000042, - menuhandlerInventoryList, + menuhandler_inventory_list, }, { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&mpMenuTextWeaponDescription, + (uintptr_t)&mp_menu_text_weapon_description, 0, NULL, }, @@ -520,14 +520,14 @@ struct menuitem g_MpInGamePlayerStatsMenuItems[] = { 0, 0, 0, - mpStatsForPlayerDropdownHandler, + mp_stats_for_player_dropdown_handler, }, { MENUITEMTYPE_END }, }; struct menudialogdef g_MpPausePlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&mpMenuTitleStatsFor, + (uintptr_t)&mp_menu_title_stats_for, g_MpInGamePlayerStatsMenuItems, NULL, VERSION >= VERSION_JPN_FINAL ? MENUDIALOGFLAG_1000 : 0, @@ -536,7 +536,7 @@ struct menudialogdef g_MpPausePlayerStatsMenuDialog = { struct menudialogdef g_MpEndscreenPlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&mpMenuTitleStatsFor, + (uintptr_t)&mp_menu_title_stats_for, g_MpInGamePlayerStatsMenuItems, NULL, VERSION >= VERSION_JPN_FINAL ? MENUDIALOGFLAG_1000 : 0, @@ -603,7 +603,7 @@ struct menudialogdef g_MpEndscreenTeamRankingMenuDialog = { &g_MpEndscreenPlayerRankingMenuDialog, }; -char *mpMenuTextPlacementWithSuffix(struct menuitem *item) +char *mp_menu_text_placement_with_suffix(struct menuitem *item) { u16 suffixes[] = { L_MPMENU_264, // "1st" @@ -620,21 +620,21 @@ char *mpMenuTextPlacementWithSuffix(struct menuitem *item) L_MPMENU_275, // "12th" }; - return langGet(suffixes[g_PlayerConfigsArray[g_MpPlayerNum].base.placement]); + return lang_get(suffixes[g_PlayerConfigsArray[g_MpPlayerNum].base.placement]); } -MenuItemHandlerResult mpPlacementMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_placement_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_GETCOLOUR) { if (g_PlayerConfigsArray[g_MpPlayerNum].base.placement == 0) { // winner - data->label.colour2 = colourBlend(data->label.colour2, 0xffff00ff, menuGetSinOscFrac(40) * 255); + data->label.colour2 = colour_blend(data->label.colour2, 0xffff00ff, menu_get_sin_osc_frac(40) * 255); } } return 0; } -MenuItemHandlerResult mpAwardsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_awards_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_RENDER) { Gfx *gdl = data->type19.gdl; @@ -661,7 +661,7 @@ MenuItemHandlerResult mpAwardsMenuHandler(s32 operation, struct menuitem *item, gDPSetTextureConvert(gdl++, G_TC_FILT); gDPSetTextureFilter(gdl++, G_TF_POINT); - texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -704,24 +704,24 @@ MenuItemHandlerResult mpAwardsMenuHandler(s32 operation, struct menuitem *item, return 0; } -MenuItemHandlerResult mpPlayerTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_player_title_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_GETCOLOUR) { if (g_PlayerConfigsArray[g_MpPlayerNum].title != g_PlayerConfigsArray[g_MpPlayerNum].newtitle) { - data->label.colour2 = colourBlend(data->label.colour2, 0xffff00ff, menuGetSinOscFrac(40) * 255); + data->label.colour2 = colour_blend(data->label.colour2, 0xffff00ff, menu_get_sin_osc_frac(40) * 255); } } return 0; } -char *mpMenuTextPlayerTitle(s32 arg0) +char *mp_menu_text_player_title(s32 arg0) { - return langGet(L_MISC_185 + g_PlayerConfigsArray[g_MpPlayerNum].title); + return lang_get(L_MISC_185 + g_PlayerConfigsArray[g_MpPlayerNum].title); } #if VERSION >= VERSION_NTSC_1_0 -MenuItemHandlerResult mpConfirmPlayerNameHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_confirm_player_name_handler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; s32 i; @@ -759,7 +759,7 @@ MenuItemHandlerResult mpConfirmPlayerNameHandler(s32 operation, struct menuitem } break; case MENUOP_SET: - filemgrPushSelectLocationDialog(6, FILETYPE_MPPLAYER); + filemgr_push_select_location_dialog(6, FILETYPE_MPPLAYER); break; } @@ -767,7 +767,7 @@ MenuItemHandlerResult mpConfirmPlayerNameHandler(s32 operation, struct menuitem } #endif -void mpPushPauseDialog(void) +void mp_push_pause_dialog(void) { u32 prevplayernum = g_MpPlayerNum; @@ -782,15 +782,15 @@ void mpPushPauseDialog(void) if (g_Vars.normmplayerisrunning) { if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { - menuPushRootDialog(&g_MpPauseTeamRankingsMenuDialog, MENUROOT_MPPAUSE); + menu_push_root_dialog(&g_MpPauseTeamRankingsMenuDialog, MENUROOT_MPPAUSE); } else { - menuPushRootDialog(&g_MpPausePlayerRankingMenuDialog, MENUROOT_MPPAUSE); + menu_push_root_dialog(&g_MpPausePlayerRankingMenuDialog, MENUROOT_MPPAUSE); } } else { - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { - menuPushRootDialog(&g_2PMissionPauseVMenuDialog, MENUROOT_MPPAUSE); + if (options_get_screen_split() == SCREENSPLIT_VERTICAL) { + menu_push_root_dialog(&g_2PMissionPauseVMenuDialog, MENUROOT_MPPAUSE); } else { - menuPushRootDialog(&g_2PMissionPauseHMenuDialog, MENUROOT_MPPAUSE); + menu_push_root_dialog(&g_2PMissionPauseHMenuDialog, MENUROOT_MPPAUSE); } } } @@ -799,7 +799,7 @@ void mpPushPauseDialog(void) } } -void mpPushEndscreenDialog(u32 arg0, u32 playernum) +void mp_push_endscreen_dialog(u32 arg0, u32 playernum) { u32 prevplayernum = g_MpPlayerNum; g_MpPlayerNum = playernum; @@ -809,17 +809,17 @@ void mpPushEndscreenDialog(u32 arg0, u32 playernum) if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) { if (g_CheatsActiveBank0 || g_CheatsActiveBank1) { - menuPushRootDialog(&g_MpEndscreenChallengeCheatedMenuDialog, MENUROOT_MPENDSCREEN); - } else if (challengeIsCompleteForEndscreen()) { - menuPushRootDialog(&g_MpEndscreenChallengeCompletedMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_MpEndscreenChallengeCheatedMenuDialog, MENUROOT_MPENDSCREEN); + } else if (challenge_is_complete_for_endscreen()) { + menu_push_root_dialog(&g_MpEndscreenChallengeCompletedMenuDialog, MENUROOT_MPENDSCREEN); } else { - menuPushRootDialog(&g_MpEndscreenChallengeFailedMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_MpEndscreenChallengeFailedMenuDialog, MENUROOT_MPENDSCREEN); } } else { - menuPushRootDialog(&g_MpEndscreenTeamGameOverMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_MpEndscreenTeamGameOverMenuDialog, MENUROOT_MPENDSCREEN); } } else { - menuPushRootDialog(&g_MpEndscreenIndGameOverMenuDialog, MENUROOT_MPENDSCREEN); + menu_push_root_dialog(&g_MpEndscreenIndGameOverMenuDialog, MENUROOT_MPENDSCREEN); } #if VERSION >= VERSION_NTSC_1_0 @@ -831,7 +831,7 @@ void mpPushEndscreenDialog(u32 arg0, u32 playernum) && g_PlayerConfigsArray[g_MpPlayerNum].fileguid.fileid == 0 && g_PlayerConfigsArray[g_MpPlayerNum].fileguid.deviceserial == 0) { g_PlayerConfigsArray[g_MpPlayerNum].options |= OPTION_ASKEDSAVEPLAYER; - menuPushDialog(&g_MpEndscreenSavePlayerMenuDialog); + menu_push_dialog(&g_MpEndscreenSavePlayerMenuDialog); } } #endif @@ -844,23 +844,23 @@ struct menuitem g_MpGameOverMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LABEL_CUSTOMCOLOUR, - (uintptr_t)&mpGetCurrentPlayerName, - (uintptr_t)&mpMenuTextPlacementWithSuffix, - mpPlacementMenuHandler, + (uintptr_t)&mp_get_current_player_name, + (uintptr_t)&mp_menu_text_placement_with_suffix, + mp_placement_menu_handler, }, { MENUITEMTYPE_LABEL, 0, #if VERSION >= VERSION_JPN_FINAL MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_CUSTOMCOLOUR, - (uintptr_t)&mpMenuTextPlayerTitle, + (uintptr_t)&mp_menu_text_player_title, 0, #else MENUITEMFLAG_LABEL_CUSTOMCOLOUR, L_MPMENU_261, // "Title:" - (uintptr_t)&mpMenuTextPlayerTitle, + (uintptr_t)&mp_menu_text_player_title, #endif - mpPlayerTitleMenuHandler, + mp_player_title_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -882,7 +882,7 @@ struct menuitem g_MpGameOverMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_ALTCOLOUR, - (uintptr_t)&mpMenuTextWeaponOfChoiceName, + (uintptr_t)&mp_menu_text_weapon_of_choice_name, 0, NULL, }, @@ -911,7 +911,7 @@ struct menuitem g_MpGameOverMenuItems[] = { MENUITEMFLAG_00000002 | MENUITEMFLAG_LIST_CUSTOMRENDER, 0x00000001, 0x00000002, - mpAwardsMenuHandler, + mp_awards_menu_handler, }, #else { @@ -920,7 +920,7 @@ struct menuitem g_MpGameOverMenuItems[] = { MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_263, // "Awards:" 0, - mpAwardsMenuHandler, + mp_awards_menu_handler, }, #endif { @@ -931,7 +931,7 @@ struct menuitem g_MpGameOverMenuItems[] = { #else MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_ALTCOLOUR, #endif - (uintptr_t)&mpMenuTextAward1, + (uintptr_t)&mp_menu_text_award1, 0, NULL, }, @@ -943,7 +943,7 @@ struct menuitem g_MpGameOverMenuItems[] = { #else MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_LABEL_ALTCOLOUR, #endif - (uintptr_t)&mpMenuTextAward2, + (uintptr_t)&mp_menu_text_award2, 0, NULL, }, @@ -1011,7 +1011,7 @@ struct menuitem g_MpEndscreenConfirmNameMenuItems[] = { 0, 0, 0, - mpConfirmPlayerNameHandler, + mp_confirm_player_name_handler, }, { MENUITEMTYPE_END }, }; diff --git a/src/game/mplayer/mpaicommands.c b/src/game/mplayer/mpaicommands.c index 0be02de61..55b77e5e5 100644 --- a/src/game/mplayer/mpaicommands.c +++ b/src/game/mplayer/mpaicommands.c @@ -9,9 +9,9 @@ /** * @cmd 0185 */ -bool aiMpInitSimulants(void) +bool ai_mp_init_simulants(void) { - botSpawnAll(); + bot_spawn_all(); g_Vars.aioffset += 2; return false; } @@ -19,7 +19,7 @@ bool aiMpInitSimulants(void) /** * @cmd 0176 */ -bool aiIfBotRespawning(void) +bool ai_if_bot_respawning(void) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; struct aibot *aibot; @@ -36,7 +36,7 @@ bool aiIfBotRespawning(void) aibot = g_Vars.chrdata->aibot; if (aibot->respawning == true) { - g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); + g_Vars.aioffset = chrai_go_to_label(g_Vars.ailist, g_Vars.aioffset, cmd[2]); aibot->respawning = false; } else { g_Vars.aioffset += 3; diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 7ad23df96..ec55ff4de 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -106,7 +106,7 @@ struct mpweapon g_MpWeapons[NUM_MPWEAPONS] = { * value 127 will return 1 * value 255 will return 10 */ -f32 mpHandicapToDamageScale(u8 value) +f32 mp_handicap_to_damage_scale(u8 value) { f32 tmp; @@ -136,19 +136,19 @@ void func0f187838(struct mpchrconfig *mpchr) mpchr->unk40 = 0; } -void mpStartMatch(void) +void mp_start_match(void) { s32 i; s32 numplayers = 0; s32 stagenum; - mpConfigureQuickTeamSimulants(); + mp_configure_quick_team_simulants(); - if (!challengeIsFeatureUnlocked(MPFEATURE_ONEHITKILLS)) { + if (!challenge_is_feature_unlocked(MPFEATURE_ONEHITKILLS)) { g_MpSetup.options &= ~MPOPTION_ONEHITKILLS; } - if (!challengeIsFeatureUnlocked(MPFEATURE_SLOWMOTION)) { + if (!challenge_is_feature_unlocked(MPFEATURE_SLOWMOTION)) { g_MpSetup.options &= ~(MPOPTION_SLOWMOTION_ON | MPOPTION_SLOWMOTION_SMART); } @@ -161,18 +161,18 @@ void mpStartMatch(void) stagenum = g_MpSetup.stagenum; if (g_MpSetup.stagenum == STAGE_MP_RANDOM) { - stagenum = mpChooseRandomStage(); + stagenum = mp_choose_random_stage(); } - titleSetNextStage(stagenum); - mainChangeToStage(stagenum); - setNumPlayers(numplayers); - titleSetNextMode(TITLEMODE_SKIP); + title_set_next_stage(stagenum); + main_change_to_stage(stagenum); + set_num_players(numplayers); + title_set_next_mode(TITLEMODE_SKIP); g_Vars.perfectbuddynum = 1; } -void mpReset(void) +void mp_reset(void) { s32 i; s32 mpindex = 0; @@ -188,7 +188,7 @@ void mpReset(void) g_Vars.perfectbuddynum = 0; - if (mpHasSimulants()) { + if (mp_has_simulants()) { g_Vars.lvmpbotlevel = true; } @@ -238,7 +238,7 @@ void mpReset(void) g_PlayerConfigsArray[i].contpad1 = i; g_PlayerConfigsArray[i].contpad2 = 0; - mpCalculatePlayerTitle(&g_PlayerConfigsArray[i]); + mp_calculate_player_title(&g_PlayerConfigsArray[i]); g_PlayerConfigsArray[i].newtitle = g_PlayerConfigsArray[i].title; g_MpNumChrs++; @@ -262,13 +262,13 @@ void mpReset(void) g_MpEnableMusicSwitching = false; if (g_Vars.normmplayerisrunning) { - if (mpGetUsingMultipleTunes()) { + if (mp_get_using_multiple_tunes()) { s32 i = 0; s32 count = 0; - s32 numtracks = mpGetNumUnlockedTracks(); + s32 numtracks = mp_get_num_unlocked_tracks(); for (i; i < numtracks && count < 2; i++) { - if (mpIsMultiTrackSlotEnabled(i)) { + if (mp_is_multi_track_slot_enabled(i)) { count++; } } @@ -325,7 +325,7 @@ void mpReset(void) } } -void mpCalculateTeamIsOnlyAi(void) +void mp_calculate_team_is_only_ai(void) { s32 playercount = PLAYERCOUNT(); s32 i; @@ -365,7 +365,7 @@ void func0f187fec(void) g_MpSetup.teamscorelimit = 19; } -void mpPlayerSetDefaults(s32 playernum, bool autonames) +void mp_player_set_defaults(s32 playernum, bool autonames) { s32 i; s32 j; @@ -402,14 +402,14 @@ void mpPlayerSetDefaults(s32 playernum, bool autonames) break; } - g_PlayerConfigsArray[playernum].base.mpheadnum = mpGetMpheadnumByMpbodynum(g_PlayerConfigsArray[playernum].base.mpbodynum); + g_PlayerConfigsArray[playernum].base.mpheadnum = mp_get_mpheadnum_by_mpbodynum(g_PlayerConfigsArray[playernum].base.mpbodynum); g_PlayerConfigsArray[playernum].base.displayoptions = MPDISPLAYOPTION_RADAR | MPDISPLAYOPTION_HIGHLIGHTTEAMS; g_PlayerConfigsArray[playernum].fileguid.fileid = 0; g_PlayerConfigsArray[playernum].fileguid.deviceserial = 0; if (autonames) { // "Player 1" etc - sprintf(g_PlayerConfigsArray[playernum].base.name, "%s %d\n", langGet(L_MISC_437), playernum + 1); + sprintf(g_PlayerConfigsArray[playernum].base.name, "%s %d\n", lang_get(L_MISC_437), playernum + 1); } else { g_PlayerConfigsArray[playernum].base.name[0] = '\0'; } @@ -435,11 +435,11 @@ void mpPlayerSetDefaults(s32 playernum, bool autonames) if (playernum < MAX_PLAYERS) { for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { for (j = 1; j <= MAX_PLAYERS; j++) { - challengeSetCompletedByPlayerWithNumPlayers(playernum, i, j, false); + challenge_set_completed_by_player_with_num_players(playernum, i, j, false); } } - challengeDetermineUnlockedFeatures(); + challenge_determine_unlocked_features(); } for (i = 0; i < ARRAYCOUNT(g_PlayerConfigsArray); i++) { @@ -456,7 +456,7 @@ void func0f1881d4(s32 index) g_BotConfigsArray[index].difficulty = BOTDIFF_DISABLED; } -void mpInit(void) +void mp_init(void) { s32 i; s32 j; @@ -486,18 +486,18 @@ void mpInit(void) strcpy(g_MpSetup.name, ""); for (i = 0; i < ARRAYCOUNT(g_PlayerConfigsArray); i++) { - mpPlayerSetDefaults(i, false); + mp_player_set_defaults(i, false); } for (i = 0; i < MAX_BOTS; i++) { func0f1881d4(i); } - if (argFindByPrefix(1, "-mpwpnset")) { - char *value = argFindByPrefix(1, "-mpwpnset"); - mpSetWeaponSet(*value - '0'); + if (arg_find_by_prefix(1, "-mpwpnset")) { + char *value = arg_find_by_prefix(1, "-mpwpnset"); + mp_set_weapon_set(*value - '0'); } else { - mpSetWeaponSet(0); + mp_set_weapon_set(0); } g_Vars.mplayerisrunning = false; @@ -510,7 +510,7 @@ void mpInit(void) g_MpLockInfo.unk03 = -1; g_MpLockInfo.unk04 = -1; - challengeForceUnlockBotFeatures(); + challenge_force_unlock_bot_features(); for (i = 0; i < ARRAYCOUNT(g_PlayerConfigsArray); i++) { for (j = 0; j < ARRAYCOUNT(g_PlayerConfigsArray[i].gunfuncs); j++) { @@ -522,14 +522,14 @@ void mpInit(void) } #if VERSION >= VERSION_PAL_BETA -void mpGetTeamsWithDefaultName(u8 *mask) +void mp_get_teams_with_default_name(u8 *mask) { s32 i; *mask = 0; for (i = 0; i < ARRAYCOUNT(g_BossFile.teamnames); i++) { - if (strcmp(g_BossFile.teamnames[i], langGet(L_OPTIONS_008 + i)) == 0) { + if (strcmp(g_BossFile.teamnames[i], lang_get(L_OPTIONS_008 + i)) == 0) { *mask |= 1 << i; } } @@ -537,43 +537,43 @@ void mpGetTeamsWithDefaultName(u8 *mask) #endif #if VERSION >= VERSION_PAL_BETA -void mpSetTeamNamesToDefault(u8 mask) +void mp_set_team_names_to_default(u8 mask) { s32 i; for (i = 0; i < ARRAYCOUNT(g_BossFile.teamnames); i++) { if (mask & (1 << i)) { - strcpy(g_BossFile.teamnames[i], langGet(L_OPTIONS_008 + i)); + strcpy(g_BossFile.teamnames[i], lang_get(L_OPTIONS_008 + i)); } } } #endif -void mpSetDefaultNamesIfEmpty(void) +void mp_set_default_names_if_empty(void) { s32 i; // Setup file name if (g_MpSetup.name[0] == '\0') { - strcpy(g_MpSetup.name, langGet(L_MISC_438)); // empty string + strcpy(g_MpSetup.name, lang_get(L_MISC_438)); // empty string } // Team names for (i = 0; i < ARRAYCOUNT(g_BossFile.teamnames); i++) { if (g_BossFile.teamnames[i][0] == '\0') { - strcpy(g_BossFile.teamnames[i], langGet(L_OPTIONS_008 + i)); // "Red", "Yellow" etc + strcpy(g_BossFile.teamnames[i], lang_get(L_OPTIONS_008 + i)); // "Red", "Yellow" etc } } // Player names for (i = 0; i < MAX_PLAYERS; i++) { if (g_PlayerConfigsArray[i].base.name[0] == '\0') { - sprintf(g_PlayerConfigsArray[i].base.name, "%s %d\n", langGet(L_MISC_437), i + 1); // "Player 1" etc + sprintf(g_PlayerConfigsArray[i].base.name, "%s %d\n", lang_get(L_MISC_437), i + 1); // "Player 1" etc } } } -s32 mpCalculateTeamScoreLimit(void) +s32 mp_calculate_team_score_limit(void) { s32 limit = g_MpSetup.teamscorelimit; s32 i; @@ -607,24 +607,24 @@ s32 mpCalculateTeamScoreLimit(void) return limit; } -void mpApplyLimits(void) +void mp_apply_limits(void) { if (g_MpSetup.timelimit >= 60) { - lvSetMpTimeLimit60(0); + lv_set_mp_time_limit60(0); } else { - lvSetMpTimeLimit60(SECSTOTIME60((g_MpSetup.timelimit + 1) * 60)); + lv_set_mp_time_limit60(SECSTOTIME60((g_MpSetup.timelimit + 1) * 60)); } if (g_MpSetup.scorelimit >= 100) { - lvSetMpScoreLimit(0); + lv_set_mp_score_limit(0); } else { - lvSetMpScoreLimit(g_MpSetup.scorelimit + 1); + lv_set_mp_score_limit(g_MpSetup.scorelimit + 1); } if (g_MpSetup.teamscorelimit >= 400) { - lvSetMpTeamScoreLimit(0); + lv_set_mp_team_score_limit(0); } else { - lvSetMpTeamScoreLimit(mpCalculateTeamScoreLimit() + 1); + lv_set_mp_team_score_limit(mp_calculate_team_score_limit() + 1); } } @@ -635,7 +635,7 @@ void mpApplyLimits(void) * The function also populates the placement an rankablescore values in the * mpchr structs and calculates the last winner and loser for the lock settings. */ -s32 mpGetPlayerRankings(struct ranking *rankings) +s32 mp_get_player_rankings(struct ranking *rankings) { s32 i; s32 scores[MAX_MPCHRS]; @@ -656,7 +656,7 @@ s32 mpGetPlayerRankings(struct ranking *rankings) s32 j; if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { - numteams = mpGetTeamRankings(teamrankings); + numteams = mp_get_team_rankings(teamrankings); } // Populate 4 arrays with player info, sorted by highest score descending @@ -664,7 +664,7 @@ s32 mpGetPlayerRankings(struct ranking *rankings) if (g_MpSetup.chrslots & (1 << i)) { mpchr = MPCHR(i); - scenarioCalculatePlayerScore(mpchr, i, &score, &deaths); + scenario_calculate_player_score(mpchr, i, &score, &deaths); rankablescore = (score + 0x8000) << 16 | (0xffff - deaths); dstindex = 0; @@ -753,7 +753,7 @@ s32 mpGetPlayerRankings(struct ranking *rankings) g_MpLockInfo.lastloser = loser; if (g_BossFile.locktype == MPLOCKTYPE_RANDOM) { - g_MpLockInfo.lockedplayernum = mpChooseRandomLockPlayer(); + g_MpLockInfo.lockedplayernum = mp_choose_random_lock_player(); } return count; @@ -768,7 +768,7 @@ s32 mpGetPlayerRankings(struct ranking *rankings) * - The rankable score, which is the returned value. The rankable score is * similar to the team score but uses the number of deaths as a tie breaker. */ -s32 mpCalculateTeamScore(s32 teamnum, s32 *result) +s32 mp_calculate_team_score(s32 teamnum, s32 *result) { struct mpchrconfig *mpchr; s32 teamscore = 0; @@ -784,7 +784,7 @@ s32 mpCalculateTeamScore(s32 teamnum, s32 *result) mpchr = MPCHR(i); if (mpchr->team == teamnum) { - scenarioCalculatePlayerScore(mpchr, i, &score, &deaths); + scenario_calculate_player_score(mpchr, i, &score, &deaths); teamexists = true; teamscore += score; teamdeaths += deaths; @@ -805,7 +805,7 @@ s32 mpCalculateTeamScore(s32 teamnum, s32 *result) * with the winning team first, losing team last. Return the number of rows * (teams). */ -s32 mpGetTeamRankings(struct ranking *rankings) +s32 mp_get_team_rankings(struct ranking *rankings) { s32 i; s32 count; @@ -819,7 +819,7 @@ s32 mpGetTeamRankings(struct ranking *rankings) // Calculate scores for each team for (i = 0; i < MAX_TEAMS; i++) { apparentscores[i] = -8000; - rankablescores[i] = mpCalculateTeamScore(i, &apparentscores[i]); + rankablescores[i] = mp_calculate_team_score(i, &apparentscores[i]); } // Iterate each slot and determine which team belongs in it. @@ -859,13 +859,13 @@ s32 func0f188bcc(void) return NUM_MPWEAPONS; } -s32 mpGetNumWeaponOptions(void) +s32 mp_get_num_weapon_options(void) { s32 count = 0; s32 i; for (i = 0; i < ARRAYCOUNT(g_MpWeapons); i++) { - if (challengeIsFeatureUnlocked(g_MpWeapons[i].unlockfeature)) { + if (challenge_is_feature_unlocked(g_MpWeapons[i].unlockfeature)) { count++; } } @@ -873,26 +873,26 @@ s32 mpGetNumWeaponOptions(void) return count; } -char *mpGetWeaponLabel(s32 weaponnum) +char *mp_get_weapon_label(s32 weaponnum) { s32 i; for (i = 0; i < ARRAYCOUNT(g_MpWeapons); i++) { - if (challengeIsFeatureUnlocked(g_MpWeapons[i].unlockfeature)) { + if (challenge_is_feature_unlocked(g_MpWeapons[i].unlockfeature)) { if (weaponnum == 0) { if (g_MpWeapons[i].weaponnum == WEAPON_NONE) { - return langGet(L_MPWEAPONS_058); // "Nothing" + return lang_get(L_MPWEAPONS_058); // "Nothing" } if (g_MpWeapons[i].weaponnum == WEAPON_MPSHIELD) { - return langGet(L_MPWEAPONS_059); // "Shield" + return lang_get(L_MPWEAPONS_059); // "Shield" } if (g_MpWeapons[i].weaponnum == WEAPON_DISABLED) { - return langGet(L_MPWEAPONS_060); // "Disabled" + return lang_get(L_MPWEAPONS_060); // "Disabled" } - return bgunGetName(g_MpWeapons[i].weaponnum); + return bgun_get_name(g_MpWeapons[i].weaponnum); } weaponnum--; @@ -907,13 +907,13 @@ const char var7f1b8a5c[] = "Gun index %d -> slot %d = gun %d\n\n"; const char var7f1b8a80[] = "HOLDER: selecting weapon set %d\n"; #endif -void mpSetWeaponSlot(s32 slot, s32 mpweaponnum) +void mp_set_weapon_slot(s32 slot, s32 mpweaponnum) { s32 optionindex = mpweaponnum; s32 i; for (i = 0; i <= mpweaponnum; i++) { - if (challengeIsFeatureUnlocked(g_MpWeapons[i].unlockfeature) == 0) { + if (challenge_is_feature_unlocked(g_MpWeapons[i].unlockfeature) == 0) { mpweaponnum++; } @@ -923,13 +923,13 @@ void mpSetWeaponSlot(s32 slot, s32 mpweaponnum) g_MpSetup.weapons[slot] = optionindex; } -s32 mpGetWeaponSlot(s32 slot) +s32 mp_get_weapon_slot(s32 slot) { s32 count = 0; s32 i; for (i = 0; i < g_MpSetup.weapons[slot]; i++) { - if (challengeIsFeatureUnlocked(g_MpWeapons[i].unlockfeature)) { + if (challenge_is_feature_unlocked(g_MpWeapons[i].unlockfeature)) { count++; } } @@ -937,7 +937,7 @@ s32 mpGetWeaponSlot(s32 slot) return count; } -struct mpweapon *mpGetMpWeaponByLocation(s32 locationindex) +struct mpweapon *mp_get_mp_weapon_by_location(s32 locationindex) { s32 v0 = locationindex + 1; s32 slot = 0; @@ -970,7 +970,7 @@ struct mpweapon *mpGetMpWeaponByLocation(s32 locationindex) return &g_MpWeapons[mpweaponnum]; } -s32 mpCountWeaponSetThing(s32 weaponsetindex) +s32 mp_count_weapon_set_thing(s32 weaponsetindex) { s32 i; s32 count = 0; @@ -981,10 +981,10 @@ s32 mpCountWeaponSetThing(s32 weaponsetindex) } for (i = 0; i < weaponsetindex; i++) { - if ((challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[0]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[1]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[2]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[3])) || g_MpWeaponSets[i].unk0c != WEAPON_DISABLED) { + if ((challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[0]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[1]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[2]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[3])) || g_MpWeaponSets[i].unk0c != WEAPON_DISABLED) { count++; } } @@ -998,10 +998,10 @@ s32 func0f188f9c(s32 arg0) for (i = 0; i < ARRAYCOUNT(g_MpWeaponSets); i++) { // @bug? Shouldn't the disabled check be == WEAPON_DISABLED? - if ((challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[0]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[1]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[2]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[3])) + if ((challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[0]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[1]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[2]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[3])) || g_MpWeaponSets[i].unk0c != WEAPON_DISABLED) { if (arg0 == 0) { break; @@ -1016,31 +1016,31 @@ s32 func0f188f9c(s32 arg0) s32 func0f189058(bool full) { - return mpCountWeaponSetThing(full ? ARRAYCOUNT(g_MpWeaponSets) + 3 : ARRAYCOUNT(g_MpWeaponSets)); + return mp_count_weapon_set_thing(full ? ARRAYCOUNT(g_MpWeaponSets) + 3 : ARRAYCOUNT(g_MpWeaponSets)); } s32 func0f189088(void) { - return mpCountWeaponSetThing(ARRAYCOUNT(g_MpWeaponSets) + 2); + return mp_count_weapon_set_thing(ARRAYCOUNT(g_MpWeaponSets) + 2); } -char *mpGetWeaponSetName(s32 index) +char *mp_get_weapon_set_name(s32 index) { index = func0f188f9c(index); if (index < 0 || index >= ARRAYCOUNT(g_MpWeaponSets) + 2) { - return langGet(L_MPWEAPONS_041); // "Custom" + return lang_get(L_MPWEAPONS_041); // "Custom" } if (index == ARRAYCOUNT(g_MpWeaponSets) + 1) { - return langGet(L_MPWEAPONS_042); // "Random" + return lang_get(L_MPWEAPONS_042); // "Random" } if (index == ARRAYCOUNT(g_MpWeaponSets)) { - return langGet(L_MPWEAPONS_043); // "Random Five" + return lang_get(L_MPWEAPONS_043); // "Random Five" } - return langGet(g_MpWeaponSets[index].name); + return lang_get(g_MpWeaponSets[index].name); } void func0f18913c(void) @@ -1051,10 +1051,10 @@ void func0f18913c(void) s32 j; for (i = 0; !done && i < ARRAYCOUNT(g_MpWeaponSets); i++) { - if (challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[0]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[1]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[2]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[i].requirefeatures[3])) { + if (challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[0]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[1]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[2]) + && challenge_is_feature_unlocked(g_MpWeaponSets[i].requirefeatures[3])) { ptr = &g_MpWeaponSets[i].slots[0]; } else if (g_MpWeaponSets[i].unk0c != WEAPON_DISABLED) { ptr = &g_MpWeaponSets[i].unk0c; @@ -1069,7 +1069,7 @@ void func0f18913c(void) s32 weaponnum = ptr[j]; if (weaponnum == WEAPON_MPSHIELD) { - if (!challengeIsFeatureUnlocked(MPFEATURE_WEAPON_SHIELD)) { + if (!challenge_is_feature_unlocked(MPFEATURE_WEAPON_SHIELD)) { weaponnum = 0; } } @@ -1091,16 +1091,16 @@ void func0f18913c(void) } } -void mpApplyWeaponSet(void) +void mp_apply_weapon_set(void) { s32 i; u8 *ptr; if (g_MpWeaponSetNum >= 0 && g_MpWeaponSetNum < ARRAYCOUNT(g_MpWeaponSets)) { - if (challengeIsFeatureUnlocked(g_MpWeaponSets[g_MpWeaponSetNum].requirefeatures[0]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[g_MpWeaponSetNum].requirefeatures[1]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[g_MpWeaponSetNum].requirefeatures[2]) - && challengeIsFeatureUnlocked(g_MpWeaponSets[g_MpWeaponSetNum].requirefeatures[3])) { + if (challenge_is_feature_unlocked(g_MpWeaponSets[g_MpWeaponSetNum].requirefeatures[0]) + && challenge_is_feature_unlocked(g_MpWeaponSets[g_MpWeaponSetNum].requirefeatures[1]) + && challenge_is_feature_unlocked(g_MpWeaponSets[g_MpWeaponSetNum].requirefeatures[2]) + && challenge_is_feature_unlocked(g_MpWeaponSets[g_MpWeaponSetNum].requirefeatures[3])) { ptr = &g_MpWeaponSets[g_MpWeaponSetNum].slots[0]; } else if (g_MpWeaponSets[g_MpWeaponSetNum].unk0c != WEAPON_DISABLED) { ptr = &g_MpWeaponSets[g_MpWeaponSetNum].unk0c; @@ -1115,7 +1115,7 @@ void mpApplyWeaponSet(void) s32 mpweaponnum = MPWEAPON_NONE; s32 weaponnum = ptr[i]; - if (weaponnum == WEAPON_MPSHIELD && !challengeIsFeatureUnlocked(MPFEATURE_WEAPON_SHIELD)) { + if (weaponnum == WEAPON_MPSHIELD && !challenge_is_feature_unlocked(MPFEATURE_WEAPON_SHIELD)) { weaponnum = 0; } @@ -1132,41 +1132,41 @@ void mpApplyWeaponSet(void) } } } else if (g_MpWeaponSetNum == WEAPONSET_RANDOM) { - s32 numoptions = mpGetNumWeaponOptions(); + s32 numoptions = mp_get_num_weapon_options(); for (i = 0; i < ARRAYCOUNT(g_MpSetup.weapons); i++) { - mpSetWeaponSlot(i, random() % numoptions); + mp_set_weapon_slot(i, random() % numoptions); } } else if (g_MpWeaponSetNum == WEAPONSET_RANDOMFIVE) { - s32 numoptions = mpGetNumWeaponOptions() - 2; + s32 numoptions = mp_get_num_weapon_options() - 2; for (i = 0; i < 5; i++) { - mpSetWeaponSlot(i, random() % numoptions + 1); + mp_set_weapon_slot(i, random() % numoptions + 1); } - mpSetWeaponSlot(i, mpGetNumWeaponOptions() - 1); + mp_set_weapon_slot(i, mp_get_num_weapon_options() - 1); } } -void mpSetWeaponSet(s32 weaponsetnum) +void mp_set_weapon_set(s32 weaponsetnum) { g_MpWeaponSetNum = func0f188f9c(weaponsetnum); - mpApplyWeaponSet(); + mp_apply_weapon_set(); } void func0f1895e8(void) { if (g_MpWeaponSetNum < ARRAYCOUNT(g_MpWeaponSets)) { - mpApplyWeaponSet(); + mp_apply_weapon_set(); } } -s32 mpGetWeaponSet(void) +s32 mp_get_weapon_set(void) { - return mpCountWeaponSetThing(g_MpWeaponSetNum); + return mp_count_weapon_set_thing(g_MpWeaponSetNum); } -bool mpIsPaused(void) +bool mp_is_paused(void) { if (PLAYERCOUNT() == 1 && g_Vars.mplayerisrunning @@ -1181,7 +1181,7 @@ bool mpIsPaused(void) return true; } -void mpSetPaused(u8 mode) +void mp_set_paused(u8 mode) { g_MpSetup.paused = mode; } @@ -1190,12 +1190,12 @@ void mpSetPaused(u8 mode) * Render "Paused" in the middle of the viewport if paused, * or "Press START" if player has finished their death animation. * - * @bug: When calling textRender(), viGetWidth() is used twice but it should be - * viGetViewWidth() and viGetViewHeight(). These arguments to textRender() set + * @bug: When calling text_render(), vi_get_width() is used twice but it should be + * vi_get_view_width() and vi_get_view_height(). These arguments to text_render() set * the crop box for the text, but the text doesn't extend past the box anyway * so it has no effect. */ -Gfx *mpRenderModalText(Gfx *gdl) +Gfx *mp_render_modal_text(Gfx *gdl) { s32 textwidth; s32 textheight; @@ -1214,9 +1214,9 @@ Gfx *mpRenderModalText(Gfx *gdl) gdl = text0f153628(gdl); - strcpy(text, langGet(L_MPWEAPONS_040)); // "Paused" + strcpy(text, lang_get(L_MPWEAPONS_040)); // "Paused" - x = viGetViewLeft() + viGetViewWidth() / 2; + x = vi_get_view_left() + vi_get_view_width() / 2; #if VERSION >= VERSION_JPN_FINAL x = x / g_ScaleX; @@ -1228,27 +1228,27 @@ Gfx *mpRenderModalText(Gfx *gdl) if (g_Menus[g_Vars.currentplayernum].curdialog) #endif { - y = viGetViewTop() + 10; + y = vi_get_view_top() + 10; } else { - y = viGetViewTop() + viGetViewHeight() / 2; + y = vi_get_view_top() + vi_get_view_height() / 2; } #if VERSION >= VERSION_JPN_FINAL - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); #elif PAL // Use smaller fonts - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); #else - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, 0); #endif x -= textwidth / 2; #if VERSION >= VERSION_JPN_FINAL - gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, (red << 24) | 0x00ff00ff, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, (red << 24) | 0x00ff00ff, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); #elif PAL - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, (red << 24) | 0x00ff00ff, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, (red << 24) | 0x00ff00ff, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, (red << 24) | 0x00ff00ff, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, (red << 24) | 0x00ff00ff, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); #endif gdl = text0f153780(gdl); @@ -1263,43 +1263,43 @@ Gfx *mpRenderModalText(Gfx *gdl) // Render "Press START" text gdl = text0f153628(gdl); - strcpy(text, langGet(L_MPWEAPONS_039)); + strcpy(text, lang_get(L_MPWEAPONS_039)); - x = viGetViewLeft() + viGetViewWidth() / 2; + x = vi_get_view_left() + vi_get_view_width() / 2; #if VERSION >= VERSION_JPN_FINAL x = x / g_ScaleX; #endif - y = viGetViewTop() + viGetViewHeight() / 2; + y = vi_get_view_top() + vi_get_view_height() / 2; - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x -= textwidth / 2; #if VERSION >= VERSION_JPN_FINAL - gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff0000ff, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff0000ff, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff0000ff, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff0000ff, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); #endif if (g_Vars.currentplayer->deadtimer > 0) { // Render countdown timer - s32 countdowny = viGetViewTop() + viGetViewHeight() / 2 + textheight + 2; - s32 countdownx = viGetViewLeft() + viGetViewWidth() / 2; + s32 countdowny = vi_get_view_top() + vi_get_view_height() / 2 + textheight + 2; + s32 countdownx = vi_get_view_left() + vi_get_view_width() / 2; #if VERSION >= VERSION_JPN_FINAL countdownx = countdownx / g_ScaleX; #endif sprintf(text, "%d\n", (g_Vars.currentplayer->deadtimer + TICKS(60) - 1) / TICKS(60)); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = countdownx - textwidth / 2; y = countdowny; #if VERSION >= VERSION_JPN_FINAL - gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff0000ff, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff0000ff, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff0000ff, 0x000000ff, viGetWidth(), viGetWidth(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0xff0000ff, 0x000000ff, vi_get_width(), vi_get_width(), 0, 0); #endif } @@ -1315,7 +1315,7 @@ Gfx *mpRenderModalText(Gfx *gdl) return gdl; } -s32 mpFindMaxInt(s32 numplayers, s32 val0, s32 val1, s32 val2, s32 val3) +s32 mp_find_max_int(s32 numplayers, s32 val0, s32 val1, s32 val2, s32 val3) { s32 bestvalue = val0; s32 bestplayer = 0; @@ -1346,7 +1346,7 @@ s32 mpFindMaxInt(s32 numplayers, s32 val0, s32 val1, s32 val2, s32 val3) return bestplayer; } -s32 mpFindMinInt(s32 numplayers, s32 val0, s32 val1, s32 val2, s32 val3) +s32 mp_find_min_int(s32 numplayers, s32 val0, s32 val1, s32 val2, s32 val3) { s32 bestvalue = val0; s32 bestplayer = 0; @@ -1377,7 +1377,7 @@ s32 mpFindMinInt(s32 numplayers, s32 val0, s32 val1, s32 val2, s32 val3) return bestplayer; } -s32 mpFindMaxFloat(s32 numplayers, f32 val0, f32 val1, f32 val2, f32 val3) +s32 mp_find_max_float(s32 numplayers, f32 val0, f32 val1, f32 val2, f32 val3) { // @bug: bestvalue should be an f32. Any value saved into here will be // rounded down which may cause the function to return an incorrect result. @@ -1410,7 +1410,7 @@ s32 mpFindMaxFloat(s32 numplayers, f32 val0, f32 val1, f32 val2, f32 val3) return bestplayer; } -s32 mpFindMinFloat(s32 numplayers, f32 val0, f32 val1, f32 val2, f32 val3) +s32 mp_find_min_float(s32 numplayers, f32 val0, f32 val1, f32 val2, f32 val3) { // @bug: bestvalue should be an f32. Any value saved into here will be // rounded down which may cause the function to return an incorrect result. @@ -1486,7 +1486,7 @@ u16 g_AwardNames[] = { L_MPMENU_016, // "Quad Kill" }; -void mpCalculatePlayerTitle(struct mpplayerconfig *mpplayer) +void mp_calculate_player_title(struct mpplayerconfig *mpplayer) { #if VERSION >= VERSION_NTSC_1_0 const u32 tiers[] = { 2, 4, 8, 16, 28, 60, 100, 150, 210, 300 }; @@ -1911,7 +1911,7 @@ u32 g_MpFemaleHeads[] = { /** * Calculate player awards, medals, and update character statistics. */ -void mpCalculateAwards(void) +void mp_calculate_awards(void) { s32 playercount; s32 i; @@ -1921,7 +1921,7 @@ void mpCalculateAwards(void) struct awardmetrics metrics[MAX_PLAYERS]; // @bug: playerrankings should have 12 elements. Because it's too small, - // overflow occurs in mpGetPlayerRankings. The overflow writes into the + // overflow occurs in mp_get_player_rankings. The overflow writes into the // metrics array (above) which is yet to be initialised, so this bug has // no effect on IDO. #ifdef AVOID_UB @@ -1941,13 +1941,13 @@ void mpCalculateAwards(void) playercount = PLAYERCOUNT(); - duration60 = playerGetMissionTime(); + duration60 = player_get_mission_time(); func00033dd8(); - numchrs = mpGetPlayerRankings(playerrankings); + numchrs = mp_get_player_rankings(playerrankings); #if VERSION >= VERSION_NTSC_1_0 - numteams = (g_MpSetup.options & MPOPTION_TEAMSENABLED) ? mpGetTeamRankings(teamrankings) : 0; + numteams = (g_MpSetup.options & MPOPTION_TEAMSENABLED) ? mp_get_team_rankings(teamrankings) : 0; #endif prevplayernum = g_Vars.currentplayernum; @@ -1956,22 +1956,22 @@ void mpCalculateAwards(void) // At the same time, populate the metrics array // which is a temporary array for award calculation. for (i = 0; i < playercount; i++) { - struct mpchrconfig *mpchr = mpGetChrConfigBySlotNum(i); + struct mpchrconfig *mpchr = mp_get_chr_config_by_slot_num(i); struct mpplayerconfig *mpplayer = (struct mpplayerconfig *)mpchr; #if VERSION >= VERSION_NTSC_1_0 - s32 chrnum = mpGetChrIndexBySlotNum(i); + s32 chrnum = mp_get_chr_index_by_slot_num(i); #else s32 chrnum = i; #endif s32 sum; - setCurrentPlayerNum(i); + set_current_player_num(i); g_Vars.currentplayer->award1 = NULL; g_Vars.currentplayer->award2 = NULL; - metrics[i].numshots = mpstatsGetPlayerShotCountByRegion(SHOTREGION_TOTAL); - metrics[i].numheadshots = mpstatsGetPlayerShotCountByRegion(SHOTREGION_HEAD); + metrics[i].numshots = mpstats_get_player_shot_count_by_region(SHOTREGION_TOTAL); + metrics[i].numheadshots = mpstats_get_player_shot_count_by_region(SHOTREGION_HEAD); metrics[i].numkills = 0; metrics[i].numdeaths = 0; metrics[i].numsuicides = 0; @@ -2008,12 +2008,12 @@ void mpCalculateAwards(void) metrics[i].longestlife = g_Vars.playerstats[i].longestlife; metrics[i].shortestlife = g_Vars.playerstats[i].shortestlife; - sum = mpstatsGetPlayerShotCountByRegion(SHOTREGION_HEAD) - + mpstatsGetPlayerShotCountByRegion(SHOTREGION_BODY) - + mpstatsGetPlayerShotCountByRegion(SHOTREGION_LIMB) - + mpstatsGetPlayerShotCountByRegion(SHOTREGION_GUN) - + mpstatsGetPlayerShotCountByRegion(SHOTREGION_HAT) - + mpstatsGetPlayerShotCountByRegion(SHOTREGION_OBJECT); + sum = mpstats_get_player_shot_count_by_region(SHOTREGION_HEAD) + + mpstats_get_player_shot_count_by_region(SHOTREGION_BODY) + + mpstats_get_player_shot_count_by_region(SHOTREGION_LIMB) + + mpstats_get_player_shot_count_by_region(SHOTREGION_GUN) + + mpstats_get_player_shot_count_by_region(SHOTREGION_HAT) + + mpstats_get_player_shot_count_by_region(SHOTREGION_OBJECT); if (metrics[i].numshots > 0) { metrics[i].accuracyfrac = sum / (f32)metrics[i].numshots; @@ -2117,85 +2117,85 @@ void mpCalculateAwards(void) } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); // Choose which players are eligible for which awards - i = mpFindMaxInt(playercount, metrics[0].numsuicides, metrics[1].numsuicides, metrics[2].numsuicides, metrics[3].numsuicides); + i = mp_find_max_int(playercount, metrics[0].numsuicides, metrics[1].numsuicides, metrics[2].numsuicides, metrics[3].numsuicides); if (metrics[i].numsuicides > 0) { metrics[i].awards |= AWARD_MOSTSUICIDAL; } - i = mpFindMinInt(playercount, metrics[0].numshots, metrics[1].numshots, metrics[2].numshots, metrics[3].numshots); + i = mp_find_min_int(playercount, metrics[0].numshots, metrics[1].numshots, metrics[2].numshots, metrics[3].numshots); if (metrics[i].numshots < 100) { metrics[i].awards |= AWARD_WHONEEDSAMMO; } - i = mpFindMinFloat(playercount, metrics[0].armourcount, metrics[1].armourcount, metrics[2].armourcount, metrics[3].armourcount); + i = mp_find_min_float(playercount, metrics[0].armourcount, metrics[1].armourcount, metrics[2].armourcount, metrics[3].armourcount); if (metrics[i].armourcount <= 2.0f) { metrics[i].awards |= AWARD_LEASTSHIELDED; } - i = mpFindMaxFloat(playercount, metrics[0].armourcount, metrics[1].armourcount, metrics[2].armourcount, metrics[3].armourcount); + i = mp_find_max_float(playercount, metrics[0].armourcount, metrics[1].armourcount, metrics[2].armourcount, metrics[3].armourcount); if (metrics[i].armourcount > 6.0f) { metrics[i].awards |= AWARD_BESTPROTECTED; } - i = mpFindMaxInt(playercount, metrics[0].numheadshots, metrics[1].numheadshots, metrics[2].numheadshots, metrics[3].numheadshots); + i = mp_find_max_int(playercount, metrics[0].numheadshots, metrics[1].numheadshots, metrics[2].numheadshots, metrics[3].numheadshots); if (metrics[i].numheadshots > 0) { metrics[i].awards |= AWARD_MARKSMANSHIP; } - i = mpFindMaxFloat(playercount, metrics[0].ksratio, metrics[1].ksratio, metrics[2].ksratio, metrics[3].ksratio); + i = mp_find_max_float(playercount, metrics[0].ksratio, metrics[1].ksratio, metrics[2].ksratio, metrics[3].ksratio); if (metrics[i].ksratio > 0.0f) { metrics[i].awards |= AWARD_MOSTPROFESSIONAL; } - i = mpFindMaxFloat(playercount, metrics[0].kdratio, metrics[1].kdratio, metrics[2].kdratio, metrics[3].kdratio); + i = mp_find_max_float(playercount, metrics[0].kdratio, metrics[1].kdratio, metrics[2].kdratio, metrics[3].kdratio); if (metrics[i].kdratio > 0.0f) { metrics[i].awards |= AWARD_MOSTDEADLY; } - i = mpFindMinFloat(playercount, metrics[0].kdratio, metrics[1].kdratio, metrics[2].kdratio, metrics[3].kdratio); + i = mp_find_min_float(playercount, metrics[0].kdratio, metrics[1].kdratio, metrics[2].kdratio, metrics[3].kdratio); if (PLAYERCOUNT() >= 2) { metrics[i].awards |= AWARD_MOSTHARMLESS; } - i = mpFindMinInt(playercount, metrics[0].drawplayercount, metrics[1].drawplayercount, metrics[2].drawplayercount, metrics[3].drawplayercount); + i = mp_find_min_int(playercount, metrics[0].drawplayercount, metrics[1].drawplayercount, metrics[2].drawplayercount, metrics[3].drawplayercount); if (PLAYERCOUNT() >= 2) { metrics[i].awards |= AWARD_MOSTCOWARDLY; } - i = mpFindMaxFloat(playercount, metrics[0].avgkmperhour, metrics[1].avgkmperhour, metrics[2].avgkmperhour, metrics[3].avgkmperhour); + i = mp_find_max_float(playercount, metrics[0].avgkmperhour, metrics[1].avgkmperhour, metrics[2].avgkmperhour, metrics[3].avgkmperhour); if (metrics[i].avgkmperhour > 10.0f) { metrics[i].awards |= AWARD_MOSTFRANTIC; } - i = mpFindMinInt(playercount, metrics[0].backshotcount, metrics[1].backshotcount, metrics[2].backshotcount, metrics[3].backshotcount); + i = mp_find_min_int(playercount, metrics[0].backshotcount, metrics[1].backshotcount, metrics[2].backshotcount, metrics[3].backshotcount); metrics[i].awards |= AWARD_MOSTHONORABLE; - i = mpFindMaxInt(playercount, metrics[0].backshotcount, metrics[1].backshotcount, metrics[2].backshotcount, metrics[3].backshotcount); + i = mp_find_max_int(playercount, metrics[0].backshotcount, metrics[1].backshotcount, metrics[2].backshotcount, metrics[3].backshotcount); if (metrics[i].backshotcount > 0 && (metrics[i].awards & AWARD_MOSTHONORABLE) == 0) { metrics[i].awards |= AWARD_MOSTDISHONORABLE; } - i = mpFindMaxInt(playercount, metrics[0].longestlife, metrics[1].longestlife, metrics[2].longestlife, metrics[3].longestlife); + i = mp_find_max_int(playercount, metrics[0].longestlife, metrics[1].longestlife, metrics[2].longestlife, metrics[3].longestlife); if (metrics[i].longestlife > 0) { metrics[i].awards |= AWARD_LONGESTLIFE; } - i = mpFindMinInt(playercount, metrics[0].shortestlife, metrics[1].shortestlife, metrics[2].shortestlife, metrics[3].shortestlife); + i = mp_find_min_int(playercount, metrics[0].shortestlife, metrics[1].shortestlife, metrics[2].shortestlife, metrics[3].shortestlife); if (metrics[i].shortestlife > 0 && metrics[i].numdeaths > 0) { metrics[i].awards |= AWARD_SHORTESTLIFE; @@ -2243,7 +2243,7 @@ void mpCalculateAwards(void) while (numdone == 0) { if (metrics[i].awards & (1 << awardindex)) { metrics[i].awards &= ~(1 << awardindex); - g_Vars.players[i]->award1 = langGet(g_AwardNames[awardindex]); + g_Vars.players[i]->award1 = lang_get(g_AwardNames[awardindex]); numdone = 1; } @@ -2259,7 +2259,7 @@ void mpCalculateAwards(void) if (metrics[i].awards & (1 << awardindex)) { metrics[i].awards &= ~(1 << awardindex); - g_Vars.players[i]->award2 = langGet(g_AwardNames[awardindex]); + g_Vars.players[i]->award2 = lang_get(g_AwardNames[awardindex]); numdone = 2; } @@ -2356,13 +2356,13 @@ void mpCalculateAwards(void) } if (mostheadshotplayer >= 0) { - struct mpplayerconfig *mpplayer = (struct mpplayerconfig *)mpGetChrConfigBySlotNum(mostheadshotplayer); + struct mpplayerconfig *mpplayer = (struct mpplayerconfig *)mp_get_chr_config_by_slot_num(mostheadshotplayer); mpplayer->medals |= MEDAL_HEADSHOT; mpplayer->headshotmedals++; } if (mostaccurateplayer >= 0) { - struct mpplayerconfig *mpplayer = (struct mpplayerconfig *)mpGetChrConfigBySlotNum(mostaccurateplayer); + struct mpplayerconfig *mpplayer = (struct mpplayerconfig *)mp_get_chr_config_by_slot_num(mostaccurateplayer); mpplayer->medals |= MEDAL_ACCURACY; mpplayer->accuracymedals++; } @@ -2370,25 +2370,25 @@ void mpCalculateAwards(void) // Recalculate title for all players for (i = 0; i < playercount; i++) { - struct mpplayerconfig *mpchr = (struct mpplayerconfig *)mpGetChrConfigBySlotNum(i); - mpCalculatePlayerTitle(mpchr); + struct mpplayerconfig *mpchr = (struct mpplayerconfig *)mp_get_chr_config_by_slot_num(i); + mp_calculate_player_title(mpchr); } } -void mpEndMatch(void) +void mp_end_match(void) { s32 stack; s32 playercount = PLAYERCOUNT(); s32 prevplayernum; s32 i; - musicStartMenu(); - mpSetPaused(MPPAUSEMODE_GAMEOVER); + music_start_menu(); + mp_set_paused(MPPAUSEMODE_GAMEOVER); prevplayernum = g_Vars.currentplayernum; for (i = 0; i < playercount; i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); g_Vars.currentplayer->award1 = NULL; g_Vars.currentplayer->award2 = NULL; @@ -2398,52 +2398,52 @@ void mpEndMatch(void) } } - setCurrentPlayerNum(prevplayernum); - mpCalculateAwards(); + set_current_player_num(prevplayernum); + mp_calculate_awards(); if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) { - challengeConsiderMarkingComplete(); + challenge_consider_marking_complete(); } func0f0f820c(NULL, -6); } -s32 mpGetNumHeads2(void) +s32 mp_get_num_heads2(void) { return ARRAYCOUNT(g_MpHeads); } -s32 mpGetNumHeads(void) +s32 mp_get_num_heads(void) { return ARRAYCOUNT(g_MpHeads); } -s32 mpGetHeadId(u8 headnum) +s32 mp_get_head_id(u8 headnum) { return g_MpHeads[headnum].headnum; } -s32 mpGetHeadRequiredFeature(u8 headnum) +s32 mp_get_head_required_feature(u8 headnum) { return g_MpHeads[headnum].requirefeature; } -s32 mpGetBeauHeadId(u8 headnum) +s32 mp_get_beau_head_id(u8 headnum) { return g_MpBeauHeads[headnum].headnum; } -s32 mpGetNumBeauHeads(void) +s32 mp_get_num_beau_heads(void) { return ARRAYCOUNT(g_MpBeauHeads); } -u32 mpGetNumBodies(void) +u32 mp_get_num_bodies(void) { return ARRAYCOUNT(g_MpBodies); } -s32 mpGetBodyId(u8 bodynum) +s32 mp_get_body_id(u8 bodynum) { /** * @bug: bodynum 61 (0x3d) would cause an array overflow. @@ -2460,7 +2460,7 @@ s32 mpGetBodyId(u8 bodynum) return g_MpBodies[bodynum].bodynum; } -s32 mpGetMpbodynumByBodynum(u16 bodynum) +s32 mp_get_mpbodynum_by_bodynum(u16 bodynum) { s32 i; @@ -2477,17 +2477,17 @@ s32 mpGetMpbodynumByBodynum(u16 bodynum) return g_MpBodies[0].bodynum; } -char *mpGetBodyName(u8 mpbodynum) +char *mp_get_body_name(u8 mpbodynum) { // @bug: This should be >= if (mpbodynum > ARRAYCOUNT(g_MpBodies)) { mpbodynum = 0; } - return langGet(g_MpBodies[mpbodynum].name); + return lang_get(g_MpBodies[mpbodynum].name); } -u8 mpGetBodyRequiredFeature(u8 mpbodynum) +u8 mp_get_body_required_feature(u8 mpbodynum) { // @bug: This should be >= if (mpbodynum > ARRAYCOUNT(g_MpBodies)) { @@ -2497,7 +2497,7 @@ u8 mpGetBodyRequiredFeature(u8 mpbodynum) return g_MpBodies[mpbodynum].requirefeature; } -s32 mpGetMpheadnumByMpbodynum(s32 mpbodynum) +s32 mp_get_mpheadnum_by_mpbodynum(s32 mpbodynum) { s32 headnum; s32 index = 0; @@ -2526,7 +2526,7 @@ s32 mpGetMpheadnumByMpbodynum(s32 mpbodynum) return index; } -void mpFindUnusedHeadAndBody(u8 *mpheadnum, u8 *mpbodynum) +void mp_find_unused_head_and_body(u8 *mpheadnum, u8 *mpbodynum) { struct mpchrconfig *mpchr; bool available; @@ -2560,7 +2560,7 @@ void mpFindUnusedHeadAndBody(u8 *mpheadnum, u8 *mpbodynum) *mpbodynum = trympbodynum; } -s32 mpChooseRandomLockPlayer(void) +s32 mp_choose_random_lock_player(void) { s32 start = random() % 4; s32 i; @@ -2574,12 +2574,12 @@ s32 mpChooseRandomLockPlayer(void) return i; } -bool mpSetLock(s32 locktype, s32 playernum) +bool mp_set_lock(s32 locktype, s32 playernum) { g_BossFile.locktype = locktype; if (g_BossFile.locktype == MPLOCKTYPE_RANDOM) { - g_MpLockInfo.lockedplayernum = mpChooseRandomLockPlayer(); + g_MpLockInfo.lockedplayernum = mp_choose_random_lock_player(); } else { g_MpLockInfo.lockedplayernum = playernum; } @@ -2587,17 +2587,17 @@ bool mpSetLock(s32 locktype, s32 playernum) return true; } -s32 mpGetLockType(void) +s32 mp_get_lock_type(void) { return g_BossFile.locktype; } -u32 mpGetLockPlayerNum(void) +u32 mp_get_lock_player_num(void) { return g_MpLockInfo.lockedplayernum; } -bool mpIsPlayerLockedOut(s32 playernum) +bool mp_is_player_locked_out(s32 playernum) { if (g_BossFile.locktype == MPLOCKTYPE_NONE) { return false; @@ -2610,7 +2610,7 @@ bool mpIsPlayerLockedOut(s32 playernum) return true; } -void mpCalculateLockIfLastWinnerOrLoser(void) +void mp_calculate_lock_if_last_winner_or_loser(void) { if (g_BossFile.locktype == MPLOCKTYPE_LASTWINNER && g_MpLockInfo.lastwinner >= 0) { g_MpLockInfo.lockedplayernum = g_MpLockInfo.lastwinner; @@ -2624,7 +2624,7 @@ void mpCalculateLockIfLastWinnerOrLoser(void) && g_BossFile.locktype != MPLOCKTYPE_CHALLENGE && (g_MpSetup.chrslots & (1 << g_MpLockInfo.lockedplayernum)) == 0) { g_MpLockInfo.lastwinner = g_MpLockInfo.lastloser = -1; - g_MpLockInfo.lockedplayernum = mpChooseRandomLockPlayer(); + g_MpLockInfo.lockedplayernum = mp_choose_random_lock_player(); } } @@ -2674,7 +2674,7 @@ struct mptrack g_MpTracks[] = { /*0x29*/ { MUSIC_CREDITS, 120, L_MISC_165, SOLOSTAGEINDEX_SKEDARRUINS }, // "End Credits" }; -bool mpIsTrackUnlocked(s32 tracknum) +bool mp_is_track_unlocked(s32 tracknum) { s16 stageindex = g_MpTracks[tracknum].unlockstage; bool unlocked = false; @@ -2694,13 +2694,13 @@ bool mpIsTrackUnlocked(s32 tracknum) return unlocked; } -s32 mpGetTrackSlotIndex(s32 tracknum) +s32 mp_get_track_slot_index(s32 tracknum) { s32 i; s32 slotindex = 0; for (i = 0; i < tracknum; i++) { - if (mpIsTrackUnlocked(i)) { + if (mp_is_track_unlocked(i)) { slotindex++; } } @@ -2708,13 +2708,13 @@ s32 mpGetTrackSlotIndex(s32 tracknum) return slotindex; } -s32 mpGetTrackNumAtSlotIndex(s32 slotindex) +s32 mp_get_track_num_at_slot_index(s32 slotindex) { s32 i; s32 numunlocked = 0; for (i = 0; i != ARRAYCOUNT(g_MpTracks); i++) { - if (mpIsTrackUnlocked(i)) { + if (mp_is_track_unlocked(i)) { if (numunlocked == slotindex) { break; } @@ -2726,38 +2726,38 @@ s32 mpGetTrackNumAtSlotIndex(s32 slotindex) return i; } -s32 mpGetNumUnlockedTracks(void) +s32 mp_get_num_unlocked_tracks(void) { - return mpGetTrackSlotIndex(ARRAYCOUNT(g_MpTracks)); + return mp_get_track_slot_index(ARRAYCOUNT(g_MpTracks)); } -s32 mpGetTrackMusicNum(s32 slotindex) +s32 mp_get_track_music_num(s32 slotindex) { - s32 tracknum = mpGetTrackNumAtSlotIndex(slotindex); + s32 tracknum = mp_get_track_num_at_slot_index(slotindex); return g_MpTracks[tracknum].musicnum; } -char *mpGetTrackName(s32 slotindex) +char *mp_get_track_name(s32 slotindex) { - s32 tracknum = mpGetTrackNumAtSlotIndex(slotindex); + s32 tracknum = mp_get_track_num_at_slot_index(slotindex); - return langGet(g_MpTracks[tracknum].name); + return lang_get(g_MpTracks[tracknum].name); } -void mpSetUsingMultipleTunes(bool enable) +void mp_set_using_multiple_tunes(bool enable) { g_BossFile.usingmultipletunes = enable; } -bool mpGetUsingMultipleTunes(void) +bool mp_get_using_multiple_tunes(void) { return g_BossFile.usingmultipletunes; } -bool mpIsMultiTrackSlotEnabled(s32 slot) +bool mp_is_multi_track_slot_enabled(s32 slot) { - s32 tracknum = mpGetTrackNumAtSlotIndex(slot); + s32 tracknum = mp_get_track_num_at_slot_index(slot); u8 index = tracknum >> 3; u8 value = 1 << (tracknum & 7); @@ -2768,9 +2768,9 @@ bool mpIsMultiTrackSlotEnabled(s32 slot) return true; } -void mpSetMultiTrackSlotEnabled(s32 slot, bool enable) +void mp_set_multi_track_slot_enabled(s32 slot, bool enable) { - s32 tracknum = mpGetTrackNumAtSlotIndex(slot); + s32 tracknum = mp_get_track_num_at_slot_index(slot); u8 value = 1 << (tracknum & 7); u8 index = tracknum >> 3; @@ -2781,16 +2781,16 @@ void mpSetMultiTrackSlotEnabled(s32 slot, bool enable) } } -void mpSetTrackSlotEnabled(s32 slot) +void mp_set_track_slot_enabled(s32 slot) { - if (mpGetUsingMultipleTunes()) { - mpSetMultiTrackSlotEnabled(slot, 1 - mpIsMultiTrackSlotEnabled(slot)); + if (mp_get_using_multiple_tunes()) { + mp_set_multi_track_slot_enabled(slot, 1 - mp_is_multi_track_slot_enabled(slot)); } else { - g_BossFile.tracknum = mpGetTrackNumAtSlotIndex(slot); + g_BossFile.tracknum = mp_get_track_num_at_slot_index(slot); } } -void mpEnableAllMultiTracks(void) +void mp_enable_all_multi_tracks(void) { s32 i; @@ -2799,7 +2799,7 @@ void mpEnableAllMultiTracks(void) } } -void mpDisableAllMultiTracks(void) +void mp_disable_all_multi_tracks(void) { s32 i; @@ -2808,7 +2808,7 @@ void mpDisableAllMultiTracks(void) } } -void mpRandomiseMultiTracks(void) +void mp_randomise_multi_tracks(void) { s32 i; @@ -2817,38 +2817,38 @@ void mpRandomiseMultiTracks(void) } } -void mpSetTrackToRandom(void) +void mp_set_track_to_random(void) { g_BossFile.tracknum = -1; } -s32 mpGetCurrentTrackSlotNum(void) +s32 mp_get_current_track_slot_num(void) { if (g_BossFile.tracknum < 0) { return g_BossFile.tracknum; } - return mpGetTrackSlotIndex(g_BossFile.tracknum); + return mp_get_track_slot_index(g_BossFile.tracknum); } -s32 mpChooseTrack(void) +s32 mp_choose_track(void) { s32 i; s32 tracknum; - if (mpGetUsingMultipleTunes()) { - s32 numunlocked = mpGetNumUnlockedTracks(); + if (mp_get_using_multiple_tunes()) { + s32 numunlocked = mp_get_num_unlocked_tracks(); s32 numselected = 0; for (i = 0; i < numunlocked; i++) { - if (mpIsMultiTrackSlotEnabled(i)) { + if (mp_is_multi_track_slot_enabled(i)) { numselected++; } } if (numselected == 0) { do { - tracknum = mpGetTrackNumAtSlotIndex(random() % numunlocked); + tracknum = mp_get_track_num_at_slot_index(random() % numunlocked); } while (tracknum == g_MpLockInfo.unk04); g_MpLockInfo.unk04 = tracknum; @@ -2863,7 +2863,7 @@ s32 mpChooseTrack(void) tracknum = -1; for (i = 0; i < numunlocked; i++) { - if (mpIsMultiTrackSlotEnabled(i)) { + if (mp_is_multi_track_slot_enabled(i)) { if (selectionindex == selectioncount) { tracknum = i; } @@ -2877,7 +2877,7 @@ s32 mpChooseTrack(void) return g_MpTracks[0].musicnum; } - tracknum = mpGetTrackNumAtSlotIndex(tracknum); + tracknum = mp_get_track_num_at_slot_index(tracknum); } while (numselected > 1 && tracknum == g_MpLockInfo.unk04); g_MpLockInfo.unk04 = tracknum; @@ -2886,13 +2886,13 @@ s32 mpChooseTrack(void) return g_MpTracks[tracknum].musicnum; } - tracknum = mpGetCurrentTrackSlotNum(); + tracknum = mp_get_current_track_slot_num(); if (tracknum < 0) { - s32 numunlocked = mpGetNumUnlockedTracks(); + s32 numunlocked = mp_get_num_unlocked_tracks(); do { - tracknum = mpGetTrackNumAtSlotIndex(random() % numunlocked); + tracknum = mp_get_track_num_at_slot_index(random() % numunlocked); } while (tracknum == g_MpLockInfo.unk04); g_MpLockInfo.unk04 = tracknum; @@ -2900,14 +2900,14 @@ s32 mpChooseTrack(void) return g_MpTracks[tracknum].musicnum; } - tracknum = mpGetTrackNumAtSlotIndex(tracknum); + tracknum = mp_get_track_num_at_slot_index(tracknum); g_MpLockInfo.unk04 = tracknum; g_MusicLife60 = g_MpTracks[tracknum].duration * TICKS(60); return g_MpTracks[tracknum].musicnum; } -struct mpchrconfig *mpGetChrConfigBySlotNum(s32 slot) +struct mpchrconfig *mp_get_chr_config_by_slot_num(s32 slot) { s32 count = 0; struct mpchrconfig *result = NULL; @@ -2928,7 +2928,7 @@ struct mpchrconfig *mpGetChrConfigBySlotNum(s32 slot) } #if VERSION >= VERSION_NTSC_1_0 -s32 mpGetChrIndexBySlotNum(s32 slot) +s32 mp_get_chr_index_by_slot_num(s32 slot) { s32 count = 0; s32 result = 0; @@ -2949,7 +2949,7 @@ s32 mpGetChrIndexBySlotNum(s32 slot) } #endif -s32 mpGetNumChrs(void) +s32 mp_get_num_chrs(void) { s32 count = 0; s32 i; @@ -2963,7 +2963,7 @@ s32 mpGetNumChrs(void) return count; } -u8 mpFindUnusedTeamNum(void) +u8 mp_find_unused_team_num(void) { u8 teamnum = 0; bool available = false; @@ -2994,10 +2994,10 @@ u8 mpFindUnusedTeamNum(void) return teamnum; } -void mpCreateBotFromProfile(s32 botnum, u8 profilenum) +void mp_create_bot_from_profile(s32 botnum, u8 profilenum) { s32 headnum = 0; - u8 team = mpFindUnusedTeamNum(); + u8 team = mp_find_unused_team_num(); bool available = false; s32 i; @@ -3031,7 +3031,7 @@ void mpCreateBotFromProfile(s32 botnum, u8 profilenum) g_BotConfigsArray[botnum].base.mpbodynum = g_BotProfiles[profilenum].body; } -void mpSetBotDifficulty(s32 botnum, s32 difficulty) +void mp_set_bot_difficulty(s32 botnum, s32 difficulty) { s32 i; @@ -3047,7 +3047,7 @@ void mpSetBotDifficulty(s32 botnum, s32 difficulty) * * This is used for the quick team feature. */ -s32 mpGetSlotForNewBot(void) +s32 mp_get_slot_for_new_bot(void) { s32 i = 0; @@ -3058,15 +3058,15 @@ s32 mpGetSlotForNewBot(void) return i; } -void mpRemoveSimulant(s32 index) +void mp_remove_simulant(s32 index) { g_MpSetup.chrslots &= ~(1 << (index + 4)); g_BotConfigsArray[index].base.name[0] = '\0'; func0f1881d4(index); - mpGenerateBotNames(); + mp_generate_bot_names(); } -bool mpHasSimulants(void) +bool mp_has_simulants(void) { if ((g_MpSetup.chrslots & 0xfff0) != 0) { return true; @@ -3075,9 +3075,9 @@ bool mpHasSimulants(void) return false; } -bool mpHasUnusedBotSlots(void) +bool mp_has_unused_bot_slots(void) { - s32 numvacant = challengeIsFeatureUnlocked(MPFEATURE_8BOTS) ? MAX_BOTS : 4; + s32 numvacant = challenge_is_feature_unlocked(MPFEATURE_8BOTS) ? MAX_BOTS : 4; s32 i; for (i = 4; i < MAX_MPCHRS; i++) { @@ -3093,7 +3093,7 @@ bool mpHasUnusedBotSlots(void) return false; } -bool mpIsSimSlotEnabled(s32 slot) +bool mp_is_sim_slot_enabled(s32 slot) { s32 numfree = MAX_BOTS; s32 i; @@ -3115,7 +3115,7 @@ bool mpIsSimSlotEnabled(s32 slot) return true; } -s32 mpFindBotProfile(s32 type, s32 difficulty) +s32 mp_find_bot_profile(s32 type, s32 difficulty) { s32 i; @@ -3140,7 +3140,7 @@ s32 mpFindBotProfile(s32 type, s32 difficulty) return i; } -void mpGenerateBotNames(void) +void mp_generate_bot_names(void) { s32 counts[ARRAYCOUNT(g_BotProfiles)]; s32 profilenum; @@ -3154,7 +3154,7 @@ void mpGenerateBotNames(void) // Count the number of bots using each profile (MeatSim, TurtleSim etc) for (i = 4; i < MAX_MPCHRS; i++) { if (g_MpSetup.chrslots & (1 << i)) { - profilenum = mpFindBotProfile(g_BotConfigsArray[i - 4].type, g_BotConfigsArray[i - 4].difficulty); + profilenum = mp_find_bot_profile(g_BotConfigsArray[i - 4].type, g_BotConfigsArray[i - 4].difficulty); if (profilenum >= 0 && profilenum < ARRAYCOUNT(g_BotProfiles)) { counts[profilenum]++; @@ -3175,17 +3175,17 @@ void mpGenerateBotNames(void) for (i = 4; i < MAX_MPCHRS; i++) { if (g_MpSetup.chrslots & (1 << i)) { - profilenum = mpFindBotProfile(g_BotConfigsArray[i - 4].type, g_BotConfigsArray[i - 4].difficulty); + profilenum = mp_find_bot_profile(g_BotConfigsArray[i - 4].type, g_BotConfigsArray[i - 4].difficulty); if (profilenum >= 0 && profilenum < ARRAYCOUNT(g_BotProfiles)) { if (counts[profilenum] >= 0) { // Multiple bots using this profile - append the number counts[profilenum]++; - sprintf(name, "%s:%d\n", langGet(g_BotProfiles[profilenum].name), counts[profilenum]); + sprintf(name, "%s:%d\n", lang_get(g_BotProfiles[profilenum].name), counts[profilenum]); strcpy(g_BotConfigsArray[i - 4].base.name, name); } else { // One bots using this profile - just use the profile name - sprintf(name, "%s\n", langGet(g_BotProfiles[profilenum].name)); + sprintf(name, "%s\n", lang_get(g_BotProfiles[profilenum].name)); strcpy(g_BotConfigsArray[i - 4].base.name, name); } } @@ -3201,7 +3201,7 @@ const char var7f1b8c04[] = "PakId for player %d: %d\n"; const char var7f1b8c20[] = "Load Player - Result: %d\n"; #endif -s32 mpPlayerGetIndex(struct chrdata *chr) +s32 mp_player_get_index(struct chrdata *chr) { s32 i; @@ -3214,7 +3214,7 @@ s32 mpPlayerGetIndex(struct chrdata *chr) return -1; } -struct chrdata *mpGetChrFromPlayerIndex(s32 index) +struct chrdata *mp_get_chr_from_player_index(s32 index) { if (index >= 0 && index < g_MpNumChrs) { return g_MpAllChrPtrs[index]; @@ -3263,7 +3263,7 @@ s32 func0f18d0e8(s32 arg0) return -1; } -void mpplayerfileLoadGunFuncs(struct savebuffer *buffer, s32 playernum) +void mpplayerfile_load_gun_funcs(struct savebuffer *buffer, s32 playernum) { s32 bitsremaining = 35; s32 i = 0; @@ -3275,14 +3275,14 @@ void mpplayerfileLoadGunFuncs(struct savebuffer *buffer, s32 playernum) numbits = 8; } - g_PlayerConfigsArray[playernum].gunfuncs[i] = savebufferReadBits(buffer, numbits); + g_PlayerConfigsArray[playernum].gunfuncs[i] = savebuffer_read_bits(buffer, numbits); bitsremaining -= 8; i++; } } -void mpplayerfileSaveGunFuncs(struct savebuffer *buffer, s32 playernum) +void mpplayerfile_save_gun_funcs(struct savebuffer *buffer, s32 playernum) { s32 bitsremaining = 35; s32 i = 0; @@ -3294,30 +3294,30 @@ void mpplayerfileSaveGunFuncs(struct savebuffer *buffer, s32 playernum) numbits = 8; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].gunfuncs[i], numbits); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].gunfuncs[i], numbits); bitsremaining -= 8; i++; } } -void mpplayerfileLoadWad(s32 playernum, struct savebuffer *buffer, s32 arg2) +void mpplayerfile_load_wad(s32 playernum, struct savebuffer *buffer, s32 arg2) { struct fileguid guid; u32 stack; s32 i; s32 j; - savebufferReadString(buffer, g_PlayerConfigsArray[playernum].base.name, 1); - g_PlayerConfigsArray[playernum].time = savebufferReadBits(buffer, 28); + savebuffer_read_string(buffer, g_PlayerConfigsArray[playernum].base.name, 1); + g_PlayerConfigsArray[playernum].time = savebuffer_read_bits(buffer, 28); if (arg2 != 0) { - g_PlayerConfigsArray[playernum].base.mpheadnum = savebufferReadBits(buffer, 7); - g_PlayerConfigsArray[playernum].base.mpbodynum = savebufferReadBits(buffer, 7); + g_PlayerConfigsArray[playernum].base.mpheadnum = savebuffer_read_bits(buffer, 7); + g_PlayerConfigsArray[playernum].base.mpbodynum = savebuffer_read_bits(buffer, 7); - savebufferReadGuid(buffer, &guid); + savebuffer_read_guid(buffer, &guid); - if (g_PlayerConfigsArray[playernum].base.mpheadnum >= mpGetNumHeads2()) { + if (g_PlayerConfigsArray[playernum].base.mpheadnum >= mp_get_num_heads2()) { if (guid.fileid != 0 && guid.deviceserial != 0) { if (g_MenuData.unk668 < 11) { g_MenuData.unk668++; @@ -3331,42 +3331,42 @@ void mpplayerfileLoadWad(s32 playernum, struct savebuffer *buffer, s32 arg2) } } } else { - savebufferReadBits(buffer, 7); - savebufferReadBits(buffer, 7); - savebufferReadGuid(buffer, &guid); + savebuffer_read_bits(buffer, 7); + savebuffer_read_bits(buffer, 7); + savebuffer_read_guid(buffer, &guid); } - g_PlayerConfigsArray[playernum].base.displayoptions = savebufferReadBits(buffer, 8); - g_PlayerConfigsArray[playernum].kills = savebufferReadBits(buffer, 20); - g_PlayerConfigsArray[playernum].deaths = savebufferReadBits(buffer, 20); - g_PlayerConfigsArray[playernum].gamesplayed = savebufferReadBits(buffer, 19); - g_PlayerConfigsArray[playernum].gameswon = savebufferReadBits(buffer, 19); - g_PlayerConfigsArray[playernum].gameslost = savebufferReadBits(buffer, 19); - g_PlayerConfigsArray[playernum].distance = savebufferReadBits(buffer, 25); - g_PlayerConfigsArray[playernum].accuracy = savebufferReadBits(buffer, 10); - g_PlayerConfigsArray[playernum].damagedealt = savebufferReadBits(buffer, 26); - g_PlayerConfigsArray[playernum].painreceived = savebufferReadBits(buffer, 26); - g_PlayerConfigsArray[playernum].headshots = savebufferReadBits(buffer, 20); - g_PlayerConfigsArray[playernum].ammoused = savebufferReadBits(buffer, 30); - g_PlayerConfigsArray[playernum].accuracymedals = savebufferReadBits(buffer, 18); - g_PlayerConfigsArray[playernum].headshotmedals = savebufferReadBits(buffer, 18); - g_PlayerConfigsArray[playernum].killmastermedals = savebufferReadBits(buffer, 18); - g_PlayerConfigsArray[playernum].survivormedals = savebufferReadBits(buffer, 16); - g_PlayerConfigsArray[playernum].controlmode = savebufferReadBits(buffer, 2); - g_PlayerConfigsArray[playernum].options = savebufferReadBits(buffer, 12); + g_PlayerConfigsArray[playernum].base.displayoptions = savebuffer_read_bits(buffer, 8); + g_PlayerConfigsArray[playernum].kills = savebuffer_read_bits(buffer, 20); + g_PlayerConfigsArray[playernum].deaths = savebuffer_read_bits(buffer, 20); + g_PlayerConfigsArray[playernum].gamesplayed = savebuffer_read_bits(buffer, 19); + g_PlayerConfigsArray[playernum].gameswon = savebuffer_read_bits(buffer, 19); + g_PlayerConfigsArray[playernum].gameslost = savebuffer_read_bits(buffer, 19); + g_PlayerConfigsArray[playernum].distance = savebuffer_read_bits(buffer, 25); + g_PlayerConfigsArray[playernum].accuracy = savebuffer_read_bits(buffer, 10); + g_PlayerConfigsArray[playernum].damagedealt = savebuffer_read_bits(buffer, 26); + g_PlayerConfigsArray[playernum].painreceived = savebuffer_read_bits(buffer, 26); + g_PlayerConfigsArray[playernum].headshots = savebuffer_read_bits(buffer, 20); + g_PlayerConfigsArray[playernum].ammoused = savebuffer_read_bits(buffer, 30); + g_PlayerConfigsArray[playernum].accuracymedals = savebuffer_read_bits(buffer, 18); + g_PlayerConfigsArray[playernum].headshotmedals = savebuffer_read_bits(buffer, 18); + g_PlayerConfigsArray[playernum].killmastermedals = savebuffer_read_bits(buffer, 18); + g_PlayerConfigsArray[playernum].survivormedals = savebuffer_read_bits(buffer, 16); + g_PlayerConfigsArray[playernum].controlmode = savebuffer_read_bits(buffer, 2); + g_PlayerConfigsArray[playernum].options = savebuffer_read_bits(buffer, 12); for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { for (j = 1; j < MAX_PLAYERS + 1; j++) { - challengeSetCompletedByPlayerWithNumPlayers(playernum, i, j, savebufferReadBits(buffer, 1)); + challenge_set_completed_by_player_with_num_players(playernum, i, j, savebuffer_read_bits(buffer, 1)); } } - challengeDetermineUnlockedFeatures(); - mpCalculatePlayerTitle(&g_PlayerConfigsArray[playernum]); - mpplayerfileLoadGunFuncs(buffer, playernum); + challenge_determine_unlocked_features(); + mp_calculate_player_title(&g_PlayerConfigsArray[playernum]); + mpplayerfile_load_gun_funcs(buffer, playernum); } -void mpplayerfileSaveWad(s32 playernum, struct savebuffer *buffer) +void mpplayerfile_save_wad(s32 playernum, struct savebuffer *buffer) { s32 i; s32 j; @@ -3378,149 +3378,149 @@ void mpplayerfileSaveWad(s32 playernum, struct savebuffer *buffer) g_PlayerConfigsArray[playernum].time = 0x0fffffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].time, 28); - savebufferOr(buffer, g_PlayerConfigsArray[playernum].base.mpheadnum, 7); - savebufferOr(buffer, g_PlayerConfigsArray[playernum].base.mpbodynum, 7); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].time, 28); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].base.mpheadnum, 7); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].base.mpbodynum, 7); - if (g_PlayerConfigsArray[playernum].base.mpheadnum >= mpGetNumHeads2()) { + if (g_PlayerConfigsArray[playernum].base.mpheadnum >= mp_get_num_heads2()) { struct fileguid guid; - phGetGuid(g_PlayerConfigsArray[playernum].base.mpheadnum - mpGetNumHeads2(), &guid); - savebufferWriteGuid(buffer, &guid); + ph_get_guid(g_PlayerConfigsArray[playernum].base.mpheadnum - mp_get_num_heads2(), &guid); + savebuffer_write_guid(buffer, &guid); } else { struct fileguid guid; guid.deviceserial = 0; guid.fileid = 0; - savebufferWriteGuid(buffer, &guid); + savebuffer_write_guid(buffer, &guid); } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].base.displayoptions, 8); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].base.displayoptions, 8); if (g_PlayerConfigsArray[playernum].kills > 0xfffff) { // 1,048,575 g_PlayerConfigsArray[playernum].kills = 0xfffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].kills, 20); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].kills, 20); if (g_PlayerConfigsArray[playernum].deaths > 0xfffff) { // 1,048,575 g_PlayerConfigsArray[playernum].deaths = 0xfffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].deaths, 20); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].deaths, 20); if (g_PlayerConfigsArray[playernum].gamesplayed > 0x7ffff) { // 524,287 g_PlayerConfigsArray[playernum].gamesplayed = 0x7ffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].gamesplayed, 19); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].gamesplayed, 19); if (g_PlayerConfigsArray[playernum].gameswon > 0x7ffff) { // 524,287 g_PlayerConfigsArray[playernum].gameswon = 0x7ffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].gameswon, 19); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].gameswon, 19); if (g_PlayerConfigsArray[playernum].gameslost > 0x7ffff) { // 524,287 g_PlayerConfigsArray[playernum].gameslost = 0x7ffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].gameslost, 19); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].gameslost, 19); if (g_PlayerConfigsArray[playernum].distance > 0x1ffffff) { // 33,554,431 g_PlayerConfigsArray[playernum].distance = 0x1ffffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].distance, 25); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].distance, 25); if (g_PlayerConfigsArray[playernum].accuracy > 0x3ff) { // 1023 g_PlayerConfigsArray[playernum].accuracy = 0x3ff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].accuracy, 10); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].accuracy, 10); if (g_PlayerConfigsArray[playernum].damagedealt > 0x3ffffff) { // 67,108,863 g_PlayerConfigsArray[playernum].damagedealt = 0x3ffffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].damagedealt, 26); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].damagedealt, 26); if (g_PlayerConfigsArray[playernum].painreceived > 0x3ffffff) { // 67,108,863 g_PlayerConfigsArray[playernum].painreceived = 0x3ffffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].painreceived, 26); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].painreceived, 26); if (g_PlayerConfigsArray[playernum].headshots > 0xfffff) { // 1,048,575 g_PlayerConfigsArray[playernum].headshots = 0xfffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].headshots, 20); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].headshots, 20); if (g_PlayerConfigsArray[playernum].ammoused > 0x3fffffff) { // 1,073,741,823 g_PlayerConfigsArray[playernum].ammoused = 0x3fffffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].ammoused, 30); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].ammoused, 30); if (g_PlayerConfigsArray[playernum].accuracymedals > 0x3ffff) { // 262,143 g_PlayerConfigsArray[playernum].accuracymedals = 0x3ffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].accuracymedals, 18); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].accuracymedals, 18); if (g_PlayerConfigsArray[playernum].headshotmedals > 0x3ffff) { // 262,143 g_PlayerConfigsArray[playernum].headshotmedals = 0x3ffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].headshotmedals, 18); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].headshotmedals, 18); if (g_PlayerConfigsArray[playernum].killmastermedals > 0x3ffff) { // 262,143 g_PlayerConfigsArray[playernum].killmastermedals = 0x3ffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].killmastermedals, 18); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].killmastermedals, 18); if (g_PlayerConfigsArray[playernum].survivormedals > 0xffff) { // 65,535 g_PlayerConfigsArray[playernum].survivormedals = 0xffff; } - savebufferOr(buffer, g_PlayerConfigsArray[playernum].survivormedals, 16); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].survivormedals, 16); - savebufferOr(buffer, g_PlayerConfigsArray[playernum].controlmode, 2); - savebufferOr(buffer, g_PlayerConfigsArray[playernum].options, 12); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].controlmode, 2); + savebuffer_or(buffer, g_PlayerConfigsArray[playernum].options, 12); for (i = 0; i < ARRAYCOUNT(g_MpChallenges); i++) { for (j = 1; j < MAX_PLAYERS + 1; j++) { - savebufferOr(buffer, challengeIsCompletedByPlayerWithNumPlayers(playernum, i, j), 1); + savebuffer_or(buffer, challenge_is_completed_by_player_with_num_players(playernum, i, j), 1); } } - mpplayerfileSaveGunFuncs(buffer, playernum); + mpplayerfile_save_gun_funcs(buffer, playernum); } -void mpplayerfileGetOverview(char *arg0, char *name, u32 *playtime) +void mpplayerfile_get_overview(char *arg0, char *name, u32 *playtime) { struct savebuffer buffer; func0f0d5484(&buffer, arg0, 15); - savebufferReadString(&buffer, name, 0); - *playtime = savebufferReadBits(&buffer, 28); + savebuffer_read_string(&buffer, name, 0); + *playtime = savebuffer_read_bits(&buffer, 28); } -s32 mpplayerfileSave(s32 playernum, s32 device, s32 fileid, u16 deviceserial) +s32 mpplayerfile_save(s32 playernum, s32 device, s32 fileid, u16 deviceserial) { s32 ret; s32 newfileid; struct savebuffer buffer; if (device >= 0) { - savebufferClear(&buffer); - mpplayerfileSaveWad(playernum, &buffer); + savebuffer_clear(&buffer); + mpplayerfile_save_wad(playernum, &buffer); func0f0d54c4(&buffer); var80075bd0[2] = true; - ret = pakSaveAtGuid(device, fileid, PAKFILETYPE_MPPLAYER, buffer.bytes, &newfileid, 0); + ret = pak_save_at_guid(device, fileid, PAKFILETYPE_MPPLAYER, buffer.bytes, &newfileid, 0); if (ret == 0) { g_PlayerConfigsArray[playernum].fileguid.fileid = newfileid; @@ -3535,21 +3535,21 @@ s32 mpplayerfileSave(s32 playernum, s32 device, s32 fileid, u16 deviceserial) return -1; } -s32 mpplayerfileLoad(s32 playernum, s32 device, s32 fileid, u16 deviceserial) +s32 mpplayerfile_load(s32 playernum, s32 device, s32 fileid, u16 deviceserial) { s32 ret; struct savebuffer buffer; if (device >= 0) { - savebufferClear(&buffer); + savebuffer_clear(&buffer); - ret = pakReadBodyAtGuid(device, fileid, buffer.bytes, 0); + ret = pak_read_body_at_guid(device, fileid, buffer.bytes, 0); if (ret == 0) { g_PlayerConfigsArray[playernum].fileguid.fileid = fileid; g_PlayerConfigsArray[playernum].fileguid.deviceserial = deviceserial; - mpplayerfileLoadWad(playernum, &buffer, 1); + mpplayerfile_load_wad(playernum, &buffer, 1); func0f0d54c4(&buffer); g_PlayerConfigsArray[playernum].handicap = 0x80; @@ -3580,17 +3580,17 @@ struct mppreset g_MpPresets[] = { { L_MPWEAPONS_038, MPCONFIG_SLOWMO }, // "Slow Motion" }; -s32 mpGetNumPresets(void) +s32 mp_get_num_presets(void) { return ARRAYCOUNT(g_MpPresets); } -bool mpIsPresetUnlocked(s32 presetnum) +bool mp_is_preset_unlocked(s32 presetnum) { s32 i; for (i = 0; i < ARRAYCOUNT(g_MpPresets[presetnum].requirefeatures); i++) { - if (!challengeIsFeatureUnlocked(g_MpPresets[presetnum].requirefeatures[i]) && + if (!challenge_is_feature_unlocked(g_MpPresets[presetnum].requirefeatures[i]) && g_MpPresets[presetnum].requirefeatures[i] != MPFEATURE_WEAPON_SHIELD) { return false; } @@ -3599,13 +3599,13 @@ bool mpIsPresetUnlocked(s32 presetnum) return true; } -s32 mpGetNumUnlockedPresets(void) +s32 mp_get_num_unlocked_presets(void) { s32 numunlocked = 0; s32 i; for (i = 0; i < ARRAYCOUNT(g_MpPresets); i++) { - if (mpIsPresetUnlocked(i)) { + if (mp_is_preset_unlocked(i)) { numunlocked++; } } @@ -3613,14 +3613,14 @@ s32 mpGetNumUnlockedPresets(void) return numunlocked; } -char *mpGetPresetNameBySlot(s32 slot) +char *mp_get_preset_name_by_slot(s32 slot) { s32 i; for (i = 0; i < ARRAYCOUNT(g_MpPresets); i++) { - if (mpIsPresetUnlocked(i)) { + if (mp_is_preset_unlocked(i)) { if (slot == 0) { - return langGet(g_MpPresets[i].name); + return lang_get(g_MpPresets[i].name); } slot--; @@ -3655,7 +3655,7 @@ const char var7f1b8d20[] = "LoadGame Result: %d\n"; const char var7f1b8d38[] = "GBCHead: Call to create head for slot %d (gbcheadobjs[slotno]=%x)\n"; #endif // >= VERSION_NTSC_1_0 -void mpApplyConfig(struct mpconfigfull *config) +void mp_apply_config(struct mpconfigfull *config) { s32 i; s32 j; @@ -3667,7 +3667,7 @@ void mpApplyConfig(struct mpconfigfull *config) chrslots = g_MpSetup.chrslots; #endif - scenarioInit(); + scenario_init(); g_MpSetup = config->config.setup; @@ -3687,7 +3687,7 @@ void mpApplyConfig(struct mpconfigfull *config) #if VERSION >= VERSION_NTSC_1_0 if (IS4MB()) { // "ShockSim:%d" - sprintf(g_BotConfigsArray[i].base.name, langGet(L_MPWEAPONS_241), i + 1); + sprintf(g_BotConfigsArray[i].base.name, lang_get(L_MPWEAPONS_241), i + 1); } else { strcpy(g_BotConfigsArray[i].base.name, config->strings.aibotnames[i]); } @@ -3700,7 +3700,7 @@ void mpApplyConfig(struct mpconfigfull *config) g_BotConfigsArray[i].base.team = config->config.simulants[i].team; } - if (!challengeIsFeatureUnlocked(MPFEATURE_WEAPON_SHIELD)) { + if (!challenge_is_feature_unlocked(MPFEATURE_WEAPON_SHIELD)) { for (i = 0; i < ARRAYCOUNT(g_MpSetup.weapons); i++) { if (g_MpSetup.weapons[i] == MPWEAPON_SHIELD) { g_MpSetup.weapons[i] = MPWEAPON_NONE; @@ -3709,7 +3709,7 @@ void mpApplyConfig(struct mpconfigfull *config) } func0f18913c(); - challengeRemoveForceUnlocks(); + challenge_remove_force_unlocks(); } void mp0f18dec4(s32 slot) @@ -3720,7 +3720,7 @@ void mp0f18dec4(s32 slot) u32 i; for (i = 0; i < ARRAYCOUNT(g_MpPresets); i++) { - if (mpIsPresetUnlocked(i)) { + if (mp_is_preset_unlocked(i)) { if (slot == 0) { confignum = g_MpPresets[i].confignum; break; @@ -3730,9 +3730,9 @@ void mp0f18dec4(s32 slot) } } - config = challengeLoadConfig(confignum, buffer, sizeof(buffer)); + config = challenge_load_config(confignum, buffer, sizeof(buffer)); - mpApplyConfig(config); + mp_apply_config(config); #if VERSION >= VERSION_JPN_FINAL g_MpSetup.chrslots &= 0x0f; @@ -3745,27 +3745,27 @@ void mp0f18dec4(s32 slot) #endif } -void mpsetupfileLoadWad(struct savebuffer *buffer) +void mpsetupfile_load_wad(struct savebuffer *buffer) { s32 i; s32 j; - savebufferReadString(buffer, g_MpSetup.name, false); - savebufferReadBits(buffer, 4); + savebuffer_read_string(buffer, g_MpSetup.name, false); + savebuffer_read_bits(buffer, 4); - g_MpSetup.stagenum = savebufferReadBits(buffer, 7); - g_MpSetup.scenario = savebufferReadBits(buffer, 3); + g_MpSetup.stagenum = savebuffer_read_bits(buffer, 7); + g_MpSetup.scenario = savebuffer_read_bits(buffer, 3); - scenarioInit(); - scenarioReadSave(buffer); + scenario_init(); + scenario_read_save(buffer); - g_MpSetup.options = savebufferReadBits(buffer, 21); + g_MpSetup.options = savebuffer_read_bits(buffer, 21); g_MpSetup.chrslots &= 0x000f; for (i = 0; i < MAX_BOTS; i++) { g_BotConfigsArray[i].base.name[0] = '\0'; - g_BotConfigsArray[i].type = savebufferReadBits(buffer, 5); - g_BotConfigsArray[i].difficulty = savebufferReadBits(buffer, 3); + g_BotConfigsArray[i].type = savebuffer_read_bits(buffer, 5); + g_BotConfigsArray[i].difficulty = savebuffer_read_bits(buffer, 3); for (j = 0; j < MAX_PLAYERS; j++) { g_MpSimulantDifficultiesPerNumPlayers[i][j] = g_BotConfigsArray[i].difficulty; @@ -3775,31 +3775,31 @@ void mpsetupfileLoadWad(struct savebuffer *buffer) g_MpSetup.chrslots |= 1 << (i + 4); } - g_BotConfigsArray[i].base.mpheadnum = savebufferReadBits(buffer, 7); - g_BotConfigsArray[i].base.mpbodynum = savebufferReadBits(buffer, 7); - g_BotConfigsArray[i].base.team = savebufferReadBits(buffer, 3); + g_BotConfigsArray[i].base.mpheadnum = savebuffer_read_bits(buffer, 7); + g_BotConfigsArray[i].base.mpbodynum = savebuffer_read_bits(buffer, 7); + g_BotConfigsArray[i].base.team = savebuffer_read_bits(buffer, 3); } - mpGenerateBotNames(); + mp_generate_bot_names(); for (i = 0; i < ARRAYCOUNT(g_MpSetup.weapons); i++) { - g_MpSetup.weapons[i] = savebufferReadBits(buffer, 7); + g_MpSetup.weapons[i] = savebuffer_read_bits(buffer, 7); } func0f18913c(); - g_MpSetup.timelimit = savebufferReadBits(buffer, 6); - g_MpSetup.scorelimit = savebufferReadBits(buffer, 7); - g_MpSetup.teamscorelimit = savebufferReadBits(buffer, 9); + g_MpSetup.timelimit = savebuffer_read_bits(buffer, 6); + g_MpSetup.scorelimit = savebuffer_read_bits(buffer, 7); + g_MpSetup.teamscorelimit = savebuffer_read_bits(buffer, 9); for (i = 0; i < MAX_PLAYERS; i++) { - g_PlayerConfigsArray[i].base.team = savebufferReadBits(buffer, 3); + g_PlayerConfigsArray[i].base.team = savebuffer_read_bits(buffer, 3); } - challengeForceUnlockBotFeatures(); + challenge_force_unlock_bot_features(); } -void mpsetupfileSaveWad(struct savebuffer *buffer) +void mpsetupfile_save_wad(struct savebuffer *buffer) { s32 numsims = 0; s32 mpbodynum; @@ -3813,27 +3813,27 @@ void mpsetupfileSaveWad(struct savebuffer *buffer) } } - savebufferOr(buffer, numsims, 4); - savebufferOr(buffer, g_MpSetup.stagenum, 7); - savebufferOr(buffer, g_MpSetup.scenario, 3); + savebuffer_or(buffer, numsims, 4); + savebuffer_or(buffer, g_MpSetup.stagenum, 7); + savebuffer_or(buffer, g_MpSetup.scenario, 3); - scenarioWriteSave(buffer); + scenario_write_save(buffer); - savebufferOr(buffer, g_MpSetup.options, 21); + savebuffer_or(buffer, g_MpSetup.options, 21); for (i = 0; i < MAX_BOTS; i++) { - savebufferOr(buffer, g_BotConfigsArray[i].type, 5); + savebuffer_or(buffer, g_BotConfigsArray[i].type, 5); if (g_MpSetup.chrslots & (1 << (i + 4))) { - savebufferOr(buffer, g_BotConfigsArray[i].difficulty, 3); + savebuffer_or(buffer, g_BotConfigsArray[i].difficulty, 3); } else { - savebufferOr(buffer, BOTDIFF_DISABLED, 3); + savebuffer_or(buffer, BOTDIFF_DISABLED, 3); } - savebufferOr(buffer, g_BotConfigsArray[i].base.mpheadnum, 7); + savebuffer_or(buffer, g_BotConfigsArray[i].base.mpheadnum, 7); if (g_BotConfigsArray[i].base.mpbodynum == 0xff) { - s32 profilenum = mpFindBotProfile(g_BotConfigsArray[i].type, g_BotConfigsArray[i].difficulty); + s32 profilenum = mp_find_bot_profile(g_BotConfigsArray[i].type, g_BotConfigsArray[i].difficulty); if (profilenum < 0 || profilenum >= ARRAYCOUNT(g_BotProfiles)) { profilenum = 0; @@ -3844,48 +3844,48 @@ void mpsetupfileSaveWad(struct savebuffer *buffer) mpbodynum = g_BotConfigsArray[i].base.mpbodynum; } - savebufferOr(buffer, mpbodynum, 7); - savebufferOr(buffer, g_BotConfigsArray[i].base.team, 3); + savebuffer_or(buffer, mpbodynum, 7); + savebuffer_or(buffer, g_BotConfigsArray[i].base.team, 3); } for (i = 0; i < ARRAYCOUNT(g_MpSetup.weapons); i++) { - savebufferOr(buffer, g_MpSetup.weapons[i], 7); + savebuffer_or(buffer, g_MpSetup.weapons[i], 7); } - savebufferOr(buffer, g_MpSetup.timelimit, 6); - savebufferOr(buffer, g_MpSetup.scorelimit, 7); - savebufferOr(buffer, g_MpSetup.teamscorelimit, 9); + savebuffer_or(buffer, g_MpSetup.timelimit, 6); + savebuffer_or(buffer, g_MpSetup.scorelimit, 7); + savebuffer_or(buffer, g_MpSetup.teamscorelimit, 9); for (i = 0; i < MAX_PLAYERS; i++) { - savebufferOr(buffer, g_PlayerConfigsArray[i].base.team, 3); + savebuffer_or(buffer, g_PlayerConfigsArray[i].base.team, 3); } } -void mpsetupfileGetOverview(char *arg0, char *filename, u16 *numsims, u16 *stagenum, u16 *scenarionum) +void mpsetupfile_get_overview(char *arg0, char *filename, u16 *numsims, u16 *stagenum, u16 *scenarionum) { struct savebuffer buffer; func0f0d5484(&buffer, arg0, 15); - savebufferReadString(&buffer, filename, 0); + savebuffer_read_string(&buffer, filename, 0); - *numsims = savebufferReadBits(&buffer, 4); - *stagenum = savebufferReadBits(&buffer, 7); - *scenarionum = savebufferReadBits(&buffer, 3); + *numsims = savebuffer_read_bits(&buffer, 4); + *stagenum = savebuffer_read_bits(&buffer, 7); + *scenarionum = savebuffer_read_bits(&buffer, 3); } -s32 mpsetupfileSave(s32 device, s32 fileid, u16 deviceserial) +s32 mpsetupfile_save(s32 device, s32 fileid, u16 deviceserial) { s32 ret; s32 newfileid; struct savebuffer buffer; if (device >= 0) { - savebufferClear(&buffer); - mpsetupfileSaveWad(&buffer); + savebuffer_clear(&buffer); + mpsetupfile_save_wad(&buffer); func0f0d54c4(&buffer); - ret = pakSaveAtGuid(device, fileid, PAKFILETYPE_MPSETUP, buffer.bytes, &newfileid, 0); + ret = pak_save_at_guid(device, fileid, PAKFILETYPE_MPSETUP, buffer.bytes, &newfileid, 0); var80075bd0[1] = true; if (ret == 0) { @@ -3901,20 +3901,20 @@ s32 mpsetupfileSave(s32 device, s32 fileid, u16 deviceserial) return -1; } -s32 mpsetupfileLoad(s32 device, s32 fileid, u16 deviceserial) +s32 mpsetupfile_load(s32 device, s32 fileid, u16 deviceserial) { s32 ret; struct savebuffer buffer; if (device >= 0) { - savebufferClear(&buffer); - ret = pakReadBodyAtGuid(device, fileid, buffer.bytes, 0); + savebuffer_clear(&buffer); + ret = pak_read_body_at_guid(device, fileid, buffer.bytes, 0); if (ret == 0) { g_MpSetup.fileguid.fileid = fileid; g_MpSetup.fileguid.deviceserial = deviceserial; - mpsetupfileLoadWad(&buffer); + mpsetupfile_load_wad(&buffer); func0f0d54c4(&buffer); return 0; diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index e2c144d21..9f843da50 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -47,8 +47,8 @@ * - Pop a Cap (PAC) * * Each scenario registers callback functions for certain events. For example, - * code elsewhere in the game may call scenarioTick, then scenarioTick checks - * if the current scenario has a tick callback defined (eg. htbTick). If so, + * code elsewhere in the game may call scenario_tick, then scenario_tick checks + * if the current scenario has a tick callback defined (eg. htb_tick). If so, * that scenario's callback is run. */ @@ -74,7 +74,7 @@ struct mpscenario { }; #if VERSION >= VERSION_JPN_FINAL -char *scenarioRemoveLineBreaks(char *src, s32 stringnum) +char *scenario_remove_line_breaks(char *src, s32 stringnum) { static char strings[2][30]; char *out = strings[stringnum]; @@ -95,7 +95,7 @@ char *scenarioRemoveLineBreaks(char *src, s32 stringnum) struct scenariodata g_ScenarioData; -MenuItemHandlerResult menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_display_team(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { @@ -105,23 +105,23 @@ MenuItemHandlerResult menuhandlerMpDisplayTeam(s32 operation, struct menuitem *i return true; } - return menuhandlerMpCheckboxOption(operation, item, data); + return menuhandler_mp_checkbox_option(operation, item, data); } -MenuItemHandlerResult menuhandlerMpOneHitKills(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_one_hit_kills(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED || operation == MENUOP_CHECKHIDDEN) { - if (challengeIsFeatureUnlocked(MPFEATURE_ONEHITKILLS)) { + if (challenge_is_feature_unlocked(MPFEATURE_ONEHITKILLS)) { return false; } return true; } - return menuhandlerMpCheckboxOption(operation, item, data); + return menuhandler_mp_checkbox_option(operation, item, data); } -MenuItemHandlerResult menuhandlerMpSlowMotion(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_slow_motion(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { L_MPMENU_240, // "Off" @@ -132,7 +132,7 @@ MenuItemHandlerResult menuhandlerMpSlowMotion(s32 operation, struct menuitem *it switch (operation) { case MENUOP_CHECKDISABLED: case MENUOP_CHECKHIDDEN: - if (challengeIsFeatureUnlocked(MPFEATURE_SLOWMOTION)) { + if (challenge_is_feature_unlocked(MPFEATURE_SLOWMOTION)) { return false; } return true; @@ -140,7 +140,7 @@ MenuItemHandlerResult menuhandlerMpSlowMotion(s32 operation, struct menuitem *it data->dropdown.value = 3; break; case MENUOP_GETOPTIONTEXT: - return (s32)langGet(labels[data->dropdown.value]); + return (s32)lang_get(labels[data->dropdown.value]); case MENUOP_SET: g_MpSetup.options &= ~(MPOPTION_SLOWMOTION_ON | MPOPTION_SLOWMOTION_SMART); @@ -178,75 +178,75 @@ struct mpscenario g_MpScenarios[] = { &g_MpCombatOptionsMenuDialog, }, { &g_HtbOptionsMenuDialog, - htbInit, - htbNumProps, - htbInitProps, - htbTick, - htbTickChr, - htbRenderHud, - htbCalculatePlayerScore, - htbRadarExtra, - htbRadarChr, - htbHighlightProp, + htb_init, + htb_num_props, + htb_init_props, + htb_tick, + htb_tick_chr, + htb_render_hud, + htb_calculate_player_score, + htb_radar_extra, + htb_radar_chr, + htb_highlight_prop, }, { &g_HtmOptionsMenuDialog, - htmInit, - htmNumProps, - htmInitProps, - htmTick, - htmTickChr, - htmRenderHud, - htmCalculatePlayerScore, - htmRadarExtra, - htmRadarChr, - htmHighlightProp, + htm_init, + htm_num_props, + htm_init_props, + htm_tick, + htm_tick_chr, + htm_render_hud, + htm_calculate_player_score, + htm_radar_extra, + htm_radar_chr, + htm_highlight_prop, }, { &g_PacOptionsMenuDialog, - pacInit, + pac_init, NULL, - pacInitProps, - pacTick, + pac_init_props, + pac_tick, NULL, - pacRenderHud, - pacCalculatePlayerScore, - pacRadarExtra, - pacRadarChr, - pacHighlightProp, + pac_render_hud, + pac_calculate_player_score, + pac_radar_extra, + pac_radar_chr, + pac_highlight_prop, }, { &g_KohOptionsMenuDialog, - kohInit, + koh_init, NULL, - kohInitProps, - kohTick, + koh_init_props, + koh_tick, NULL, - kohRenderHud, - kohCalculatePlayerScore, - kohRadarExtra, + koh_render_hud, + koh_calculate_player_score, + koh_radar_extra, NULL, NULL, NULL, NULL, - kohIsRoomHighlighted, - kohHighlightRoom, + koh_is_room_highlighted, + koh_highlight_room, NULL, - kohReadSave, - kohWriteSave + koh_read_save, + koh_write_save }, { &g_CtcOptionsMenuDialog, - ctcInit, - ctcNumProps, - ctcInitProps, - ctcTick, - ctcTickChr, + ctc_init, + ctc_num_props, + ctc_init_props, + ctc_tick, + ctc_tick_chr, NULL, - ctcCalculatePlayerScore, - ctcRadarExtra, - ctcRadarChr, - ctcHighlightProp, - ctcChooseSpawnLocation, - ctcGetMaxTeams, - ctcIsRoomHighlighted, - ctcHighlightRoom, + ctc_calculate_player_score, + ctc_radar_extra, + ctc_radar_chr, + ctc_highlight_prop, + ctc_choose_spawn_location, + ctc_get_max_teams, + ctc_is_room_highlighted, + ctc_highlight_room, }, }; @@ -264,7 +264,7 @@ struct mpscenariooverview g_MpScenarioOverviews[] = { * While the options dialog is open, check if another player has changed the * scenario to a different one. If so, replace this dialog with the new one. */ -MenuDialogHandlerResult mpOptionsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult mp_options_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_Menus[g_MpPlayerNum].curdialog->definition != g_MpScenarios[g_MpSetup.scenario].optionsdialog) { @@ -278,8 +278,8 @@ MenuDialogHandlerResult mpOptionsMenuDialog(s32 operation, struct menudialogdef } if (i < end) { - menuPopDialog(); - menuPushDialog(g_MpScenarios[g_MpSetup.scenario].optionsdialog); + menu_pop_dialog(); + menu_push_dialog(g_MpScenarios[g_MpSetup.scenario].optionsdialog); } } } @@ -287,15 +287,15 @@ MenuDialogHandlerResult mpOptionsMenuDialog(s32 operation, struct menudialogdef return 0; } -char *mpMenuTextScenarioShortName(struct menuitem *item) +char *mp_menu_text_scenario_short_name(struct menuitem *item) { - sprintf(g_StringPointer, "%s\n", langGet(g_MpScenarioOverviews[g_MpSetup.scenario].shortname)); + sprintf(g_StringPointer, "%s\n", lang_get(g_MpScenarioOverviews[g_MpSetup.scenario].shortname)); return g_StringPointer; } -char *mpMenuTextScenarioName(struct menuitem *item) +char *mp_menu_text_scenario_name(struct menuitem *item) { - sprintf(g_StringPointer, "%s\n", langGet(g_MpScenarioOverviews[g_MpSetup.scenario].name)); + sprintf(g_StringPointer, "%s\n", lang_get(g_MpScenarioOverviews[g_MpSetup.scenario].name)); return g_StringPointer; } @@ -304,7 +304,7 @@ struct scenariogroup { u16 textid; }; -MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult scenario_scenario_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { struct scenariogroup groups[] = { { 0, L_MPMENU_244 }, // "Free for All!" @@ -324,7 +324,7 @@ MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem switch (operation) { case MENUOP_GETOPTIONCOUNT: for (i = 0; i < ARRAYCOUNT(g_MpScenarioOverviews); i++) { - if (challengeIsFeatureUnlocked(g_MpScenarioOverviews[i].requirefeature) + if (challenge_is_feature_unlocked(g_MpScenarioOverviews[i].requirefeature) && (teamgame || g_MpScenarioOverviews[i].teamonly == false)) { count++; } @@ -334,10 +334,10 @@ MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem break; case MENUOP_GETOPTIONTEXT: for (i = 0; i < ARRAYCOUNT(g_MpScenarioOverviews); i++) { - if (challengeIsFeatureUnlocked(g_MpScenarioOverviews[i].requirefeature) + if (challenge_is_feature_unlocked(g_MpScenarioOverviews[i].requirefeature) && (teamgame || g_MpScenarioOverviews[i].teamonly == false)) { if (count == data->list.value) { - return (s32)langGet(g_MpScenarioOverviews[i].name); + return (s32)lang_get(g_MpScenarioOverviews[i].name); } count++; @@ -347,7 +347,7 @@ MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem break; case MENUOP_SET: for (i = 0; i < ARRAYCOUNT(g_MpScenarioOverviews); i++) { - if (challengeIsFeatureUnlocked(g_MpScenarioOverviews[i].requirefeature) + if (challenge_is_feature_unlocked(g_MpScenarioOverviews[i].requirefeature) && (teamgame || g_MpScenarioOverviews[i].teamonly == false)) { if (count == data->list.value) { g_MpSetup.scenario = i; @@ -358,11 +358,11 @@ MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem } } - scenarioInit(); + scenario_init(); break; case MENUOP_GETSELECTEDINDEX: for (i = 0; i < ARRAYCOUNT(g_MpScenarioOverviews); i++) { - if (challengeIsFeatureUnlocked(g_MpScenarioOverviews[i].requirefeature) + if (challenge_is_feature_unlocked(g_MpScenarioOverviews[i].requirefeature) && (teamgame || g_MpScenarioOverviews[i].teamonly == false)) { if (i == g_MpSetup.scenario) { data->list.value = count; @@ -377,15 +377,15 @@ MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem case MENUOP_GETOPTGROUPCOUNT: data->list.value = 2; - if (!teamgame || (!challengeIsFeatureUnlocked(MPFEATURE_SCENARIO_KOH) && !challengeIsFeatureUnlocked(MPFEATURE_SCENARIO_CTC))) { + if (!teamgame || (!challenge_is_feature_unlocked(MPFEATURE_SCENARIO_KOH) && !challenge_is_feature_unlocked(MPFEATURE_SCENARIO_CTC))) { data->list.value--; } break; case MENUOP_GETOPTGROUPTEXT: - return (s32)langGet(groups[data->list.value].textid); + return (s32)lang_get(groups[data->list.value].textid); case MENUOP_GETGROUPSTARTINDEX: for (i = 0; i < groups[data->list.value].startindex; i++) { - if (challengeIsFeatureUnlocked(g_MpScenarioOverviews[i].requirefeature) + if (challenge_is_feature_unlocked(g_MpScenarioOverviews[i].requirefeature) && (teamgame || g_MpScenarioOverviews[i].teamonly == false)) { count++; } @@ -398,10 +398,10 @@ MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_open_options(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPushDialog(g_MpScenarios[g_MpSetup.scenario].optionsdialog); + menu_push_dialog(g_MpScenarios[g_MpSetup.scenario].optionsdialog); } return 0; @@ -415,12 +415,12 @@ MenuItemHandlerResult menuhandlerMpOpenOptions(s32 operation, struct menuitem *i * * Used by KOH to read the mphilltime. */ -void scenarioReadSave(struct savebuffer *buffer) +void scenario_read_save(struct savebuffer *buffer) { if (g_MpScenarios[g_MpSetup.scenario].readsavefunc) { g_MpScenarios[g_MpSetup.scenario].readsavefunc(buffer); } else { - savebufferReadBits(buffer, 8); + savebuffer_read_bits(buffer, 8); } } @@ -432,12 +432,12 @@ void scenarioReadSave(struct savebuffer *buffer) * * Used by KOH to write the mphilltime. */ -void scenarioWriteSave(struct savebuffer *buffer) +void scenario_write_save(struct savebuffer *buffer) { if (g_MpScenarios[g_MpSetup.scenario].writesavefunc) { g_MpScenarios[g_MpSetup.scenario].writesavefunc(buffer); } else { - savebufferOr(buffer, 0, 8); + savebuffer_or(buffer, 0, 8); } } @@ -446,7 +446,7 @@ void scenarioWriteSave(struct savebuffer *buffer) * * The callback should initialise all the properties in g_ScenarioData. */ -void scenarioInit(void) +void scenario_init(void) { if (g_MpScenarios[g_MpSetup.scenario].initfunc) { g_MpScenarios[g_MpSetup.scenario].initfunc(); @@ -457,7 +457,7 @@ void scenarioInit(void) * Return the number of additional props that will be created, such as * briefcases and uplinks. */ -s32 scenarioNumProps(void) +s32 scenario_num_props(void) { s32 result = 0; @@ -471,7 +471,7 @@ s32 scenarioNumProps(void) /** * Create the additional props, such as briefcases and uplinks. */ -void scenarioInitProps(void) +void scenario_init_props(void) { if (g_MpScenarios[g_MpSetup.scenario].initpropsfunc) { g_MpScenarios[g_MpSetup.scenario].initpropsfunc(); @@ -482,7 +482,7 @@ void scenarioInitProps(void) * At the start of each match, a hud message appears for all players containing * the challenge name if it's a challenge, or the scenario name if not. */ -void scenarioCreateMatchStartHudmsgs(void) +void scenario_create_match_start_hudmsgs(void) { s32 i; s32 prevplayernum = g_Vars.currentplayernum; @@ -491,45 +491,45 @@ void scenarioCreateMatchStartHudmsgs(void) if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) { #if VERSION >= VERSION_JPN_FINAL - sprintf(challengename, "%s\n", challengeGetNameBySlot(challengeGetCurrent())); + sprintf(challengename, "%s\n", challenge_get_name_by_slot(challenge_get_current())); #else - sprintf(challengename, "%s:\n", challengeGetNameBySlot(challengeGetCurrent())); + sprintf(challengename, "%s:\n", challenge_get_name_by_slot(challenge_get_current())); #endif } - sprintf(scenarioname, "%s\n", langGet(g_MpScenarioOverviews[g_MpSetup.scenario].name)); + sprintf(scenarioname, "%s\n", lang_get(g_MpScenarioOverviews[g_MpSetup.scenario].name)); for (i = 0; i < g_MpNumChrs; i++) { if (g_MpAllChrPtrs[i]->aibot == NULL) { - setCurrentPlayerNum(i); + set_current_player_num(i); if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) { #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(challengename, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(challengename, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); #else - hudmsgCreateWithFlags(challengename, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(challengename, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); #endif } #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(scenarioname, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(scenarioname, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); #else - hudmsgCreateWithFlags(scenarioname, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(scenarioname, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); #endif } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } /** * Called on every frame during a match, including while paused. */ -void scenarioTick(void) +void scenario_tick(void) { if (g_Vars.normmplayerisrunning) { if (g_Vars.lvframenum == 5) { - scenarioCreateMatchStartHudmsgs(); + scenario_create_match_start_hudmsgs(); } if (g_MpScenarios[g_MpSetup.scenario].tickfunc) { @@ -544,7 +544,7 @@ void scenarioTick(void) * If chr is provided then it will be a bot. * If chr is NULL then the handler should tick the current player instead. */ -void scenarioTickChr(struct chrdata *chr) +void scenario_tick_chr(struct chrdata *chr) { if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].tickchrfunc) { g_MpScenarios[g_MpSetup.scenario].tickchrfunc(chr); @@ -554,7 +554,7 @@ void scenarioTickChr(struct chrdata *chr) /** * Render any HUD information such as timers. */ -Gfx *scenarioRenderHud(Gfx *gdl) +Gfx *scenario_render_hud(Gfx *gdl) { s32 viewleft; s32 viewright; @@ -602,13 +602,13 @@ Gfx *scenarioRenderHud(Gfx *gdl) gDPSetRenderMode(gdl++, G_RM_OPA_SURF, G_RM_OPA_SURF2); gDPPipelineMode(gdl++, G_PM_1PRIMITIVE); - colour = var80087ce4[radarGetTeamIndex(chr->team)]; + colour = var80087ce4[radar_get_team_index(chr->team)]; gDPSetFillColor(gdl++, colour); - viewleft = viGetViewLeft(); - viewright = viewleft + viGetViewWidth(); - viewtop = viGetViewTop(); - viewheight = viGetViewHeight(); + viewleft = vi_get_view_left(); + viewright = viewleft + vi_get_view_width(); + viewtop = vi_get_view_top(); + viewheight = vi_get_view_height(); if (playercount >= 3) { if (cplayernum <= 1) { @@ -648,7 +648,7 @@ Gfx *scenarioRenderHud(Gfx *gdl) * * If no callback is registered, the default calculation below will apply. */ -void scenarioCalculatePlayerScore(struct mpchrconfig *mpchr, s32 chrnum, s32 *score, s32 *deaths) +void scenario_calculate_player_score(struct mpchrconfig *mpchr, s32 chrnum, s32 *score, s32 *deaths) { struct mpchrconfig *othermpchr; s32 i; @@ -681,7 +681,7 @@ void scenarioCalculatePlayerScore(struct mpchrconfig *mpchr, s32 chrnum, s32 *sc /** * Draw anything extra to the radar, such as props or the king of the hill room. */ -Gfx *scenarioRadarExtra(Gfx *gdl) +Gfx *scenario_radar_extra(Gfx *gdl) { if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].radarextrafunc) { return g_MpScenarios[g_MpSetup.scenario].radarextrafunc(gdl); @@ -695,7 +695,7 @@ Gfx *scenarioRadarExtra(Gfx *gdl) * * Return true if handled or false if the generic radar code should render it. */ -bool scenarioRadarChr(Gfx **gdl, struct prop *prop) +bool scenario_radar_chr(Gfx **gdl, struct prop *prop) { if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].radarchrfunc) { return g_MpScenarios[g_MpSetup.scenario].radarchrfunc(gdl, prop); @@ -709,7 +709,7 @@ bool scenarioRadarChr(Gfx **gdl, struct prop *prop) * * The prop may be a chr, weapon or object. */ -bool scenarioHighlightProp(struct prop *prop, s32 *colour) +bool scenario_highlight_prop(struct prop *prop, s32 *colour) { if (g_MpScenarios[g_MpSetup.scenario].highlightpropfunc) { if (g_MpScenarios[g_MpSetup.scenario].highlightpropfunc(prop, colour)) { @@ -731,7 +731,7 @@ bool scenarioHighlightProp(struct prop *prop, s32 *colour) colour[0] = 0; colour[1] = 0xcd; colour[2] = 0xff; - colour[3] = menuGetSinOscFrac(20) * 255; + colour[3] = menu_get_sin_osc_frac(20) * 255; return true; } } @@ -742,7 +742,7 @@ bool scenarioHighlightProp(struct prop *prop, s32 *colour) bool useteamcolour = false; if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { - struct chrdata *botchr = currentPlayerGetCommandingAibot(); + struct chrdata *botchr = current_player_get_commanding_aibot(); if (botchr) { if (botchr == prop->chr) { @@ -765,12 +765,12 @@ bool scenarioHighlightProp(struct prop *prop, s32 *colour) } if (useteamcolour) { - u32 tmp = g_TeamColours[radarGetTeamIndex(prop->chr->team)]; + u32 tmp = g_TeamColours[radar_get_team_index(prop->chr->team)]; colour[0] = tmp >> 24 & 0xff; colour[1] = tmp >> 16 & 0xff; colour[2] = tmp >> 8 & 0xff; - colour[3] = pulse ? (s32)(menuGetSinOscFrac(20) * 128) : 75; + colour[3] = pulse ? (s32)(menu_get_sin_osc_frac(20) * 128) : 75; return true; } @@ -778,7 +778,7 @@ bool scenarioHighlightProp(struct prop *prop, s32 *colour) colour[0] = 0; colour[1] = 0xcd; colour[2] = 0xff; - colour[3] = menuGetSinOscFrac(20) * 205; + colour[3] = menu_get_sin_osc_frac(20) * 205; return true; } } @@ -791,7 +791,7 @@ bool scenarioHighlightProp(struct prop *prop, s32 *colour) * * CTC uses this to ensure the chrs spawn near their base. */ -f32 scenarioChooseSpawnLocation(f32 chrradius, struct coord *pos, RoomNum *rooms, struct prop *prop) +f32 scenario_choose_spawn_location(f32 chrradius, struct coord *pos, RoomNum *rooms, struct prop *prop) { f32 result; @@ -800,7 +800,7 @@ f32 scenarioChooseSpawnLocation(f32 chrradius, struct coord *pos, RoomNum *rooms return result; } - return playerChooseGeneralSpawnLocation(chrradius, pos, rooms, prop); + return player_choose_general_spawn_location(chrradius, pos, rooms, prop); } /** @@ -810,7 +810,7 @@ f32 scenarioChooseSpawnLocation(f32 chrradius, struct coord *pos, RoomNum *rooms * stage specific such as pad and room numbers, then re-reads the setup * file to reload that information. */ -void scenarioReset(void) +void scenario_reset(void) { s32 i; s32 j; @@ -836,10 +836,10 @@ void scenarioReset(void) } break; case MPSCENARIO_HACKERCENTRAL: - htmReset(); + htm_reset(); break; case MPSCENARIO_HOLDTHEBRIEFCASE: - htbReset(); + htb_reset(); break; case MPSCENARIO_POPACAP: break; @@ -854,17 +854,17 @@ void scenarioReset(void) case INTROCMD_CASE: case INTROCMD_CASERESPAWN: if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE) { - ctcAddPad(cmd); + ctc_add_pad(cmd); } else if (g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL) { - htmAddPad(cmd[2]); + htm_add_pad(cmd[2]); } else if (g_MpSetup.scenario == MPSCENARIO_HOLDTHEBRIEFCASE) { - htbAddPad(cmd[2]); + htb_add_pad(cmd[2]); } cmd += 3; break; case INTROCMD_HILL: if (g_MpSetup.scenario == MPSCENARIO_KINGOFTHEHILL) { - kohAddHill(cmd); + koh_add_hill(cmd); } cmd += 2; break; @@ -905,7 +905,7 @@ void scenarioReset(void) * * CTC sets this to 4, while the others use the default limit of 8. */ -s32 scenarioGetMaxTeams(void) +s32 scenario_get_max_teams(void) { if (g_MpScenarios[g_MpSetup.scenario].maxteamsfunc) { return g_MpScenarios[g_MpSetup.scenario].maxteamsfunc(); @@ -917,7 +917,7 @@ s32 scenarioGetMaxTeams(void) /** * This callback is unused. */ -bool scenarioIsRoomHighlighted(RoomNum room) +bool scenario_is_room_highlighted(RoomNum room) { if (g_MpScenarios[g_MpSetup.scenario].isroomhighlightedfunc) { return g_MpScenarios[g_MpSetup.scenario].isroomhighlightedfunc(room); @@ -931,7 +931,7 @@ bool scenarioIsRoomHighlighted(RoomNum room) * * Used in CTC for the team bases and in KOH for the hill. */ -void scenarioHighlightRoom(RoomNum room, s32 *arg1, s32 *arg2, s32 *arg3) +void scenario_highlight_room(RoomNum room, s32 *arg1, s32 *arg2, s32 *arg3) { if (g_MpScenarios[g_MpSetup.scenario].highlightroomfunc) { g_MpScenarios[g_MpSetup.scenario].highlightroomfunc(room, arg1, arg2, arg3); @@ -945,7 +945,7 @@ struct menuitem g_MpScenarioMenuItems[] = { MENUITEMFLAG_LIST_WIDE | MENUITEMFLAG_LOCKABLEMINOR, 0x00000078, 0x0000004d, - scenarioScenarioMenuHandler, + scenario_scenario_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -966,7 +966,7 @@ struct menuitem g_MpQuickTeamScenarioMenuItems[] = { MENUITEMFLAG_LIST_WIDE | MENUITEMFLAG_LOCKABLEMINOR, 0x00000078, 0x0000004d, - scenarioScenarioMenuHandler, + scenario_scenario_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -985,7 +985,7 @@ struct menudialogdef g_MpQuickTeamScenarioMenuDialog = { * * This is a helper function used by HTM to create the terminal. */ -struct prop *scenarioCreateObj(s32 modelnum, s16 padnum, f32 arg2, u32 flags, u32 flags2, u32 flags3) +struct prop *scenario_create_obj(s32 modelnum, s16 padnum, f32 arg2, u32 flags, u32 flags2, u32 flags3) { struct defaultobj template = { 256, // extrascale @@ -1012,7 +1012,7 @@ struct prop *scenarioCreateObj(s32 modelnum, s16 padnum, f32 arg2, u32 flags, u3 0, // tiles }; - struct defaultobj *obj = mempAlloc(ALIGN16(sizeof(struct defaultobj)), MEMPOOL_STAGE); + struct defaultobj *obj = memp_alloc(ALIGN16(sizeof(struct defaultobj)), MEMPOOL_STAGE); *obj = template; obj->modelnum = modelnum; @@ -1023,9 +1023,9 @@ struct prop *scenarioCreateObj(s32 modelnum, s16 padnum, f32 arg2, u32 flags, u3 obj->extrascale = arg2 * 256; obj->hidden2 &= ~OBJHFLAG_DELETING; - setupCreateObject(obj, 123); - propActivate(obj->prop); - propEnable(obj->prop); + setup_create_object(obj, 123); + prop_activate(obj->prop); + prop_enable(obj->prop); return obj->prop; } @@ -1035,18 +1035,18 @@ struct prop *scenarioCreateObj(s32 modelnum, s16 padnum, f32 arg2, u32 flags, u3 * * This is a helper function used by PAC. */ -void scenarioCreateHudmsg(s32 playernum, char *message) +void scenario_create_hudmsg(s32 playernum, char *message) { if (playernum >= 0 && playernum < PLAYERCOUNT()) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); #else - hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); #endif - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } } @@ -1055,7 +1055,7 @@ void scenarioCreateHudmsg(s32 playernum, char *message) * * This is a helper function used by PAC. */ -bool scenarioChrsAreSameTeam(s32 playernum1, s32 playernum2) +bool scenario_chrs_are_same_team(s32 playernum1, s32 playernum2) { struct mpchrconfig *achr; struct mpchrconfig *bchr; @@ -1081,7 +1081,7 @@ bool scenarioChrsAreSameTeam(s32 playernum1, s32 playernum2) * * The return value is a TICKOP constant. */ -s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop) +s32 scenario_pick_up_briefcase(struct chrdata *chr, struct prop *prop) { struct defaultobj *obj = prop->obj; struct weaponobj *weapon = prop->weapon; @@ -1098,43 +1098,43 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop) g_ScenarioData.htb.token = chr->prop; if (chr->aibot) { - mpchr = g_MpAllChrConfigPtrs[mpPlayerGetIndex(chr)]; - propPlayPickupSound(prop, weapon->weaponnum); + mpchr = g_MpAllChrConfigPtrs[mp_player_get_index(chr)]; + prop_play_pickup_sound(prop, weapon->weaponnum); chr->aibot->hasbriefcase = true; - botinvGiveSingleWeapon(chr, WEAPON_BRIEFCASE2); + botinv_give_single_weapon(chr, WEAPON_BRIEFCASE2); } else { mpchr = MPCHR(g_Vars.playerstats[g_Vars.currentplayernum].mpindex); - invGiveSingleWeapon(WEAPON_BRIEFCASE2); - currentPlayerQueuePickupWeaponHudmsg(WEAPON_BRIEFCASE2, false); - weaponPlayPickupSound(WEAPON_BRIEFCASE2); + inv_give_single_weapon(WEAPON_BRIEFCASE2); + current_player_queue_pickup_weapon_hudmsg(WEAPON_BRIEFCASE2, false); + weapon_play_pickup_sound(WEAPON_BRIEFCASE2); } #if VERSION >= VERSION_JPN_FINAL // "%shas the Briefcase" - sprintf(text1, langGet(L_MPWEAPONS_000_2), scenarioRemoveLineBreaks(mpchr->name, 0), bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text1, lang_get(L_MPWEAPONS_000_2), scenario_remove_line_breaks(mpchr->name, 0), bgun_get_short_name(WEAPON_BRIEFCASE2)); #elif VERSION >= VERSION_PAL_BETA // "%shas the Briefcase" - sprintf(text1, langGet(L_MPWEAPONS_000_2), mpchr->name, bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text1, lang_get(L_MPWEAPONS_000_2), mpchr->name, bgun_get_short_name(WEAPON_BRIEFCASE2)); #else // "%shas the\n%s" - sprintf(text1, langGet(L_MPWEAPONS_000), mpchr->name, bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text1, lang_get(L_MPWEAPONS_000), mpchr->name, bgun_get_short_name(WEAPON_BRIEFCASE2)); #endif prevplayernum = g_Vars.currentplayernum; for (i = 0; i < PLAYERCOUNT(); i++) { if (chr->aibot || i != prevplayernum) { - setCurrentPlayerNum(i); + set_current_player_num(i); #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); #else - hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); #endif } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); if (chr->aibot) { obj->hidden |= OBJHFLAG_DELETING; @@ -1142,20 +1142,20 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop) } #if VERSION >= VERSION_NTSC_1_0 - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); return TICKOP_FREE; #else return TICKOP_GIVETOPLAYER; #endif } else if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE) { if (chr->aibot) { - mpchr = g_MpAllChrConfigPtrs[mpPlayerGetIndex(chr)]; + mpchr = g_MpAllChrConfigPtrs[mp_player_get_index(chr)]; } else { mpchr = MPCHR(g_Vars.playerstats[g_Vars.currentplayernum].mpindex); } if (weapon->team == mpchr->team) { - if ((chr->aibot && chr->aibot->hascase) || (!chr->aibot && invHasBriefcase())) { + if ((chr->aibot && chr->aibot->hascase) || (!chr->aibot && inv_has_briefcase())) { // The chr already has a case and they are "picking up" // their home case. ie. A point has just been scored mpchr->numpoints++; @@ -1167,41 +1167,41 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop) } if (chr->aibot) { - botinvDropOne(chr, WEAPON_BRIEFCASE2); + botinv_drop_one(chr, WEAPON_BRIEFCASE2); chr->aibot->hascase = false; } else { - sndStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1); - weaponCreateForPlayerDrop(WEAPON_BRIEFCASE2); - invRemoveItemByNum(WEAPON_BRIEFCASE2); + snd_start(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1); + weapon_create_for_player_drop(WEAPON_BRIEFCASE2); + inv_remove_item_by_num(WEAPON_BRIEFCASE2); } #if VERSION >= VERSION_JPN_FINAL // "You captured the %s Briefcase" - sprintf(text1, langGet(L_MPWEAPONS_004), scenarioRemoveLineBreaks(g_BossFile.teamnames[i], 0)); + sprintf(text1, lang_get(L_MPWEAPONS_004), scenario_remove_line_breaks(g_BossFile.teamnames[i], 0)); // "%scaptured our Briefcase" - sprintf(text2, langGet(L_MPWEAPONS_005), scenarioRemoveLineBreaks(mpchr->name, 0)); + sprintf(text2, lang_get(L_MPWEAPONS_005), scenario_remove_line_breaks(mpchr->name, 0)); // "%scaptured the %s Briefcase" - sprintf(text3, langGet(L_MPWEAPONS_006), scenarioRemoveLineBreaks(mpchr->name, 0), scenarioRemoveLineBreaks(g_BossFile.teamnames[i], 1)); + sprintf(text3, lang_get(L_MPWEAPONS_006), scenario_remove_line_breaks(mpchr->name, 0), scenario_remove_line_breaks(g_BossFile.teamnames[i], 1)); #elif VERSION >= VERSION_PAL_BETA // "You captured the %s Briefcase" - sprintf(text1, langGet(L_MPWEAPONS_004), g_BossFile.teamnames[i]); + sprintf(text1, lang_get(L_MPWEAPONS_004), g_BossFile.teamnames[i]); // "%scaptured our Briefcase" - sprintf(text2, langGet(L_MPWEAPONS_005), mpchr->name); + sprintf(text2, lang_get(L_MPWEAPONS_005), mpchr->name); // "%scaptured the %s Briefcase" - sprintf(text3, langGet(L_MPWEAPONS_006), mpchr->name, g_BossFile.teamnames[i]); + sprintf(text3, lang_get(L_MPWEAPONS_006), mpchr->name, g_BossFile.teamnames[i]); #else // "You captured the %s%s" - sprintf(text1, langGet(L_MPWEAPONS_004), g_BossFile.teamnames[i], bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text1, lang_get(L_MPWEAPONS_004), g_BossFile.teamnames[i], bgun_get_short_name(WEAPON_BRIEFCASE2)); // "%scaptured our %s" - sprintf(text2, langGet(L_MPWEAPONS_005), mpchr->name, bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text2, lang_get(L_MPWEAPONS_005), mpchr->name, bgun_get_short_name(WEAPON_BRIEFCASE2)); // "%scaptured the %s%s" - sprintf(text3, langGet(L_MPWEAPONS_006), mpchr->name, g_BossFile.teamnames[i], bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text3, lang_get(L_MPWEAPONS_006), mpchr->name, g_BossFile.teamnames[i], bgun_get_short_name(WEAPON_BRIEFCASE2)); #endif prevplayernum = g_Vars.currentplayernum; @@ -1211,28 +1211,28 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop) if (caseteam); for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); #if VERSION >= VERSION_JPN_FINAL if (!chr->aibot && i == prevplayernum) { - hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); } else if (caseteam == g_MpAllChrConfigPtrs[i]->team) { - hudmsgCreateWithFlags(text2, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(text2, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); } else { - hudmsgCreateWithFlags(text3, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(text3, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); } #else if (!chr->aibot && i == prevplayernum) { - hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); } else if (caseteam == g_MpAllChrConfigPtrs[i]->team) { - hudmsgCreateWithFlags(text2, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text2, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); } else { - hudmsgCreateWithFlags(text3, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text3, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); } #endif } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (chr->aibot) { @@ -1242,78 +1242,78 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop) return TICKOP_NONE; } else { // Picking up another team's case - if ((chr->aibot && !chr->aibot->hascase) || (!chr->aibot && !invHasBriefcase())) { + if ((chr->aibot && !chr->aibot->hascase) || (!chr->aibot && !inv_has_briefcase())) { // And we have no case currently, so go ahead and pick it up if (chr->aibot) { chr->aibot->hascase = true; - propPlayPickupSound(prop, weapon->weaponnum); + prop_play_pickup_sound(prop, weapon->weaponnum); } g_ScenarioData.ctc.tokens[weapon->team] = chr->prop; #if VERSION >= VERSION_JPN_FINAL // "%shas the %s Briefcase" - sprintf(text1, langGet(L_MPWEAPONS_000_3), scenarioRemoveLineBreaks(mpchr->name, 0), scenarioRemoveLineBreaks(g_BossFile.teamnames[weapon->team], 1)); + sprintf(text1, lang_get(L_MPWEAPONS_000_3), scenario_remove_line_breaks(mpchr->name, 0), scenario_remove_line_breaks(g_BossFile.teamnames[weapon->team], 1)); // "%shas our\nBriefcase" - sprintf(text2, langGet(L_MPWEAPONS_002), scenarioRemoveLineBreaks(mpchr->name, 0)); + sprintf(text2, lang_get(L_MPWEAPONS_002), scenario_remove_line_breaks(mpchr->name, 0)); // "Got the %s Briefcase" - sprintf(text3, langGet(L_MPWEAPONS_003), scenarioRemoveLineBreaks(g_BossFile.teamnames[weapon->team], 0)); + sprintf(text3, lang_get(L_MPWEAPONS_003), scenario_remove_line_breaks(g_BossFile.teamnames[weapon->team], 0)); #elif VERSION >= VERSION_PAL_BETA // "%shas the %s Briefcase" - sprintf(text1, langGet(L_MPWEAPONS_000_3), mpchr->name, g_BossFile.teamnames[weapon->team]); + sprintf(text1, lang_get(L_MPWEAPONS_000_3), mpchr->name, g_BossFile.teamnames[weapon->team]); // "%shas our\nBriefcase" - sprintf(text2, langGet(L_MPWEAPONS_002), mpchr->name); + sprintf(text2, lang_get(L_MPWEAPONS_002), mpchr->name); // "Got the %s Briefcase" - sprintf(text3, langGet(L_MPWEAPONS_003), g_BossFile.teamnames[weapon->team]); + sprintf(text3, lang_get(L_MPWEAPONS_003), g_BossFile.teamnames[weapon->team]); #else // "%shas the %s%s" - sprintf(text1, langGet(L_MPWEAPONS_001), mpchr->name, g_BossFile.teamnames[weapon->team], bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text1, lang_get(L_MPWEAPONS_001), mpchr->name, g_BossFile.teamnames[weapon->team], bgun_get_short_name(WEAPON_BRIEFCASE2)); // "%shas our %s" - sprintf(text2, langGet(L_MPWEAPONS_002), mpchr->name, bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text2, lang_get(L_MPWEAPONS_002), mpchr->name, bgun_get_short_name(WEAPON_BRIEFCASE2)); // "Got the %s%s" - sprintf(text3, langGet(L_MPWEAPONS_003), g_BossFile.teamnames[weapon->team], bgunGetShortName(WEAPON_BRIEFCASE2)); + sprintf(text3, lang_get(L_MPWEAPONS_003), g_BossFile.teamnames[weapon->team], bgun_get_short_name(WEAPON_BRIEFCASE2)); #endif prevplayernum = g_Vars.currentplayernum; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); #if VERSION >= VERSION_JPN_FINAL if (!chr->aibot && i == prevplayernum) { - hudmsgCreateWithFlags(text3, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(text3, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); } else if (weapon->team == g_MpAllChrConfigPtrs[i]->team) { - hudmsgCreateWithFlags(text2, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(text2, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); } else { - hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); } #else if (!chr->aibot && i == prevplayernum) { - hudmsgCreateWithFlags(text3, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text3, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); } else if (weapon->team == g_MpAllChrConfigPtrs[i]->team) { - hudmsgCreateWithFlags(text2, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text2, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); } else { - hudmsgCreateWithFlags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text1, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); } #endif } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); if (chr->aibot) { - botinvGiveSingleWeapon(chr, WEAPON_BRIEFCASE2); + botinv_give_single_weapon(chr, WEAPON_BRIEFCASE2); obj->hidden |= OBJHFLAG_DELETING; return TICKOP_NONE; } else { - invGiveWeaponsByProp(prop); + inv_give_weapons_by_prop(prop); #if VERSION >= VERSION_NTSC_1_0 - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); return TICKOP_FREE; #else return TICKOP_GIVETOPLAYER; @@ -1344,7 +1344,7 @@ s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop) * * For CTC, the token is warped back to its home base. */ -void scenarioHandleDroppedToken(struct chrdata *chr, struct prop *prop) +void scenario_handle_dropped_token(struct chrdata *chr, struct prop *prop) { s32 i; struct weaponobj *weapon = prop->weapon; @@ -1356,13 +1356,13 @@ void scenarioHandleDroppedToken(struct chrdata *chr, struct prop *prop) if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE) { for (i = 0; i < ARRAYCOUNT(g_ScenarioData.ctc.tokens); i++) { if (chr->prop == g_ScenarioData.ctc.tokens[i]) { - objFreeProjectile(&weapon->base); + obj_free_projectile(&weapon->base); g_ScenarioData.ctc.tokens[i] = prop; weapon->team = i; obj = prop->obj; - padUnpack(g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[i]].homepad, + pad_unpack(g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[i]].homepad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_ROOM, &pad); mtx00016d58(&mtx, 0, 0, 0, -pad.look.x, -pad.look.y, -pad.look.z, pad.up.x, pad.up.y, pad.up.z); @@ -1385,7 +1385,7 @@ void scenarioHandleDroppedToken(struct chrdata *chr, struct prop *prop) * * The return value is a TICKOP constant. */ -s32 scenarioPickUpUplink(struct chrdata *chr, struct prop *prop) +s32 scenario_pick_up_uplink(struct chrdata *chr, struct prop *prop) { s32 i; char message[64]; @@ -1400,40 +1400,40 @@ s32 scenarioPickUpUplink(struct chrdata *chr, struct prop *prop) g_ScenarioData.htm.uplink = chr->prop; if (chr->aibot) { - mpchr = g_MpAllChrConfigPtrs[mpPlayerGetIndex(chr)]; + mpchr = g_MpAllChrConfigPtrs[mp_player_get_index(chr)]; } else { mpchr = MPCHR(g_Vars.playerstats[g_Vars.currentplayernum].mpindex); } #if VERSION >= VERSION_JPN_FINAL // "%shas the\nData Uplink%s" - sprintf(message, langGet(L_MPWEAPONS_000), scenarioRemoveLineBreaks(mpchr->name, 0)); + sprintf(message, lang_get(L_MPWEAPONS_000), scenario_remove_line_breaks(mpchr->name, 0)); #elif VERSION >= VERSION_PAL_BETA // "%shas the\nData Uplink%s" - sprintf(message, langGet(L_MPWEAPONS_000), mpchr->name); + sprintf(message, lang_get(L_MPWEAPONS_000), mpchr->name); #else // "%shas the\n%s" - sprintf(message, langGet(L_MPWEAPONS_000), mpchr->name, bgunGetShortName(WEAPON_DATAUPLINK)); + sprintf(message, lang_get(L_MPWEAPONS_000), mpchr->name, bgun_get_short_name(WEAPON_DATAUPLINK)); #endif playernum = g_Vars.currentplayernum; for (i = 0; i < PLAYERCOUNT(); i++) { if (chr->aibot || i != playernum) { - setCurrentPlayerNum(i); + set_current_player_num(i); #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); #else - hudmsgCreateWithFlags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(message, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); #endif } } - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); if (chr->aibot) { - propPlayPickupSound(prop, WEAPON_DATAUPLINK); - botinvGiveSingleWeapon(chr, WEAPON_DATAUPLINK); + prop_play_pickup_sound(prop, WEAPON_DATAUPLINK); + botinv_give_single_weapon(chr, WEAPON_DATAUPLINK); chr->aibot->hasuplink = true; #if VERSION >= VERSION_NTSC_1_0 @@ -1444,12 +1444,12 @@ s32 scenarioPickUpUplink(struct chrdata *chr, struct prop *prop) return TICKOP_NONE; } else { - invGiveSingleWeapon(WEAPON_DATAUPLINK); - currentPlayerQueuePickupWeaponHudmsg(WEAPON_DATAUPLINK, false); - weaponPlayPickupSound(WEAPON_DATAUPLINK); + inv_give_single_weapon(WEAPON_DATAUPLINK); + current_player_queue_pickup_weapon_hudmsg(WEAPON_DATAUPLINK, false); + weapon_play_pickup_sound(WEAPON_DATAUPLINK); #if VERSION >= VERSION_NTSC_1_0 - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); return TICKOP_FREE; #else return TICKOP_GIVETOPLAYER; @@ -1466,13 +1466,13 @@ s32 scenarioPickUpUplink(struct chrdata *chr, struct prop *prop) /** * Handle a terminal being activated with the data uplink. */ -void scenarioHandleActivatedProp(struct chrdata *chr, struct prop *prop) +void scenario_handle_activated_prop(struct chrdata *chr, struct prop *prop) { if (g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL) { struct defaultobj *obj = prop->obj; if (obj->flags3 & OBJFLAG3_HTMTERMINAL) { - u32 mpindex = mpPlayerGetIndex(chr); + u32 mpindex = mp_player_get_index(chr); if ((obj->hidden & OBJHFLAG_ACTIVATED_BY_BOND) == 0) { obj->hidden &= 0x0fffffff; diff --git a/src/game/mplayer/scenarios/capturethecase.inc b/src/game/mplayer/scenarios/capturethecase.inc index b701a69c2..4fea0ff3d 100644 --- a/src/game/mplayer/scenarios/capturethecase.inc +++ b/src/game/mplayer/scenarios/capturethecase.inc @@ -18,7 +18,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_222, // "One-Hit Kills" MPOPTION_ONEHITKILLS, - menuhandlerMpOneHitKills, + menuhandler_mp_one_hit_kills, }, { MENUITEMTYPE_DROPDOWN, @@ -26,7 +26,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_223, // "Slow Motion" 0, - menuhandlerMpSlowMotion, + menuhandler_mp_slow_motion, }, { MENUITEMTYPE_CHECKBOX, @@ -34,7 +34,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_224, // "Fast Movement" MPOPTION_FASTMOVEMENT, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -42,7 +42,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_225, // "Display Team" MPOPTION_DISPLAYTEAM, - menuhandlerMpDisplayTeam, + menuhandler_mp_display_team, }, { MENUITEMTYPE_CHECKBOX, @@ -50,7 +50,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_226, // "No Radar" MPOPTION_NORADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -58,7 +58,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_227, // "No Auto-Aim" MPOPTION_NOAUTOAIM, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -66,7 +66,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_493, // "Kills Score" MPOPTION_KILLSSCORE, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -82,7 +82,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_236, // "Show on Radar" MPOPTION_CTC_SHOWONRADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -107,7 +107,7 @@ struct menudialogdef g_CtcOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_220, // "Capture Options" g_CtcOptionsMenuItems, - mpOptionsMenuDialog, + mp_options_menu_dialog, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -117,7 +117,7 @@ struct weaponobj g_CtcTokenObj1; struct weaponobj g_CtcTokenObj2; struct weaponobj g_CtcTokenObj3; -void ctcInit(void) +void ctc_init(void) { s32 i, j, k; g_MpSetup.options |= MPOPTION_TEAMSENABLED; @@ -141,29 +141,29 @@ void ctcInit(void) if (g_MpSetup.chrslots & (1 << k)) { struct mpchrconfig *mpchr = MPCHR(k); - while (mpchr->team >= scenarioGetMaxTeams()) { - mpchr->team -= scenarioGetMaxTeams(); + while (mpchr->team >= scenario_get_max_teams()) { + mpchr->team -= scenario_get_max_teams(); } } } } -s32 ctcNumProps(void) +s32 ctc_num_props(void) { return 4; } -void ctcTick(void) +void ctc_tick(void) { // empty } -void ctcTickChr(struct chrdata *chr) +void ctc_tick_chr(struct chrdata *chr) { if (chr); } -void ctcInitProps(void) +void ctc_init_props(void) { struct mpchrconfig *mpchr; struct weaponobj *tmp; @@ -230,15 +230,15 @@ void ctcInitProps(void) if (g_MpSetup.chrslots & (1 << k)) { mpchr = MPCHR(k); - while (mpchr->team >= scenarioGetMaxTeams()) { - mpchr->team -= scenarioGetMaxTeams(); + while (mpchr->team >= scenario_get_max_teams()) { + mpchr->team -= scenario_get_max_teams(); } #if VERSION >= VERSION_NTSC_1_0 mpindex = func0f18d0e8(k); if (mpindex >= 0) { - struct chrdata *chr = mpGetChrFromPlayerIndex(mpindex); + struct chrdata *chr = mp_get_chr_from_player_index(mpindex); if (chr) { chr->team = 1 << mpchr->team; @@ -246,7 +246,7 @@ void ctcInitProps(void) } #else if (func0f18d0e8(k) >= 0) { - struct chrdata *chr = mpGetChrFromPlayerIndex(func0f18d0e8(k)); + struct chrdata *chr = mp_get_chr_from_player_index(func0f18d0e8(k)); if (chr) { chr->team = 1 << mpchr->team; @@ -281,7 +281,7 @@ void ctcInitProps(void) tmp = &g_CtcTokenObj0; tmp->base.pad = g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[0]].homepad; - setupPlaceWeapon(tmp, 1000); + setup_place_weapon(tmp, 1000); g_ScenarioData.ctc.tokens[0] = tmp->base.prop; @@ -296,7 +296,7 @@ void ctcInitProps(void) tmp = &g_CtcTokenObj1; tmp->base.pad = g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[1]].homepad; - setupPlaceWeapon(tmp, 1001); + setup_place_weapon(tmp, 1001); g_ScenarioData.ctc.tokens[1] = tmp->base.prop; @@ -311,7 +311,7 @@ void ctcInitProps(void) tmp = &g_CtcTokenObj2; tmp->base.pad = g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[2]].homepad; - setupPlaceWeapon(tmp, 1002); + setup_place_weapon(tmp, 1002); g_ScenarioData.ctc.tokens[2] = tmp->base.prop; @@ -326,7 +326,7 @@ void ctcInitProps(void) tmp = &g_CtcTokenObj3; tmp->base.pad = g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[3]].homepad; - setupPlaceWeapon(tmp, 1003); + setup_place_weapon(tmp, 1003); g_ScenarioData.ctc.tokens[3] = tmp->base.prop; @@ -338,12 +338,12 @@ void ctcInitProps(void) for (i = 0; i < ARRAYCOUNT(g_ScenarioData.ctc.playercountsperteam); i++) { if (g_ScenarioData.ctc.playercountsperteam[i] && g_ScenarioData.ctc.baserooms[i] != -1) { - roomSetLightOp(g_ScenarioData.ctc.baserooms[i], LIGHTOP_HIGHLIGHT, 0, 0, 0); + room_set_light_op(g_ScenarioData.ctc.baserooms[i], LIGHTOP_HIGHLIGHT, 0, 0, 0); } } } -void ctcCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths) +void ctc_calculate_player_score(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths) { struct mpchrconfig *loopmpchr; s32 i; @@ -370,12 +370,12 @@ void ctcCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score *deaths = mpchr->numdeaths; } -Gfx *ctcRadarExtra(Gfx *gdl) +Gfx *ctc_radar_extra(Gfx *gdl) { if (g_MpSetup.options & MPOPTION_CTC_SHOWONRADAR) { s32 i; - for (i = 0; i < scenarioGetMaxTeams(); i++) { + for (i = 0; i < scenario_get_max_teams(); i++) { if (g_ScenarioData.ctc.tokens[i] && g_ScenarioData.ctc.tokens[i]->type != PROPTYPE_CHR && g_ScenarioData.ctc.tokens[i]->type != PROPTYPE_PLAYER) { @@ -383,7 +383,7 @@ Gfx *ctcRadarExtra(Gfx *gdl) dist.x = g_ScenarioData.ctc.tokens[i]->pos.x - g_Vars.currentplayer->prop->pos.x; dist.y = g_ScenarioData.ctc.tokens[i]->pos.y - g_Vars.currentplayer->prop->pos.y; dist.z = g_ScenarioData.ctc.tokens[i]->pos.z - g_Vars.currentplayer->prop->pos.z; - gdl = radarDrawDot(gdl, g_ScenarioData.ctc.tokens[i], &dist, g_TeamColours[i], 0, 1); + gdl = radar_draw_dot(gdl, g_ScenarioData.ctc.tokens[i], &dist, g_TeamColours[i], 0, 1); } } } @@ -391,20 +391,20 @@ Gfx *ctcRadarExtra(Gfx *gdl) return gdl; } -bool ctcRadarChr(Gfx **gdl, struct prop *prop) +bool ctc_radar_chr(Gfx **gdl, struct prop *prop) { s32 i; if (g_MpSetup.options & MPOPTION_CTC_SHOWONRADAR) { - for (i = 0; i < scenarioGetMaxTeams(); i++) { + for (i = 0; i < scenario_get_max_teams(); i++) { if (prop == g_ScenarioData.ctc.tokens[i] && (g_ScenarioData.ctc.tokens[i]->type == PROPTYPE_CHR || g_ScenarioData.ctc.tokens[i]->type == PROPTYPE_PLAYER)) { struct coord dist; - s32 colour = g_TeamColours[radarGetTeamIndex(prop->chr->team)]; + s32 colour = g_TeamColours[radar_get_team_index(prop->chr->team)]; dist.x = g_ScenarioData.ctc.tokens[i]->pos.x - g_Vars.currentplayer->prop->pos.x; dist.y = g_ScenarioData.ctc.tokens[i]->pos.y - g_Vars.currentplayer->prop->pos.y; dist.z = g_ScenarioData.ctc.tokens[i]->pos.z - g_Vars.currentplayer->prop->pos.z; - *gdl = radarDrawDot(*gdl, g_ScenarioData.ctc.tokens[i], &dist, + *gdl = radar_draw_dot(*gdl, g_ScenarioData.ctc.tokens[i], &dist, g_TeamColours[i], colour, 1); return true; } @@ -414,7 +414,7 @@ bool ctcRadarChr(Gfx **gdl, struct prop *prop) return false; } -bool ctcHighlightProp(struct prop *prop, s32 *colour) +bool ctc_highlight_prop(struct prop *prop, s32 *colour) { struct defaultobj *obj = prop->obj; @@ -438,7 +438,7 @@ bool ctcHighlightProp(struct prop *prop, s32 *colour) return false; } -void ctcAddPad(s32 *cmd) +void ctc_add_pad(s32 *cmd) { s32 i; @@ -457,13 +457,13 @@ void ctcAddPad(s32 *cmd) } } -bool ctcChooseSpawnLocation(f32 arg0, struct coord *pos, RoomNum *rooms, struct prop *prop, f32 *arg4) +bool ctc_choose_spawn_location(f32 arg0, struct coord *pos, RoomNum *rooms, struct prop *prop, f32 *arg4) { struct chrdata *chr = prop->chr; - s32 index = radarGetTeamIndex(chr->team); + s32 index = radar_get_team_index(chr->team); if (g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[index]].numspawnpads > 0) { - *arg4 = playerChooseSpawnLocation(arg0, pos, rooms, prop, + *arg4 = player_choose_spawn_location(arg0, pos, rooms, prop, g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[index]].spawnpads, g_ScenarioData.ctc.spawnpadsperteam[g_ScenarioData.ctc.teamindexes[index]].numspawnpads); return true; @@ -472,12 +472,12 @@ bool ctcChooseSpawnLocation(f32 arg0, struct coord *pos, RoomNum *rooms, struct return false; } -s32 ctcGetMaxTeams(void) +s32 ctc_get_max_teams(void) { return 4; } -bool ctcIsRoomHighlighted(RoomNum room) +bool ctc_is_room_highlighted(RoomNum room) { s32 i; @@ -490,7 +490,7 @@ bool ctcIsRoomHighlighted(RoomNum room) return false; } -void ctcHighlightRoom(RoomNum roomnum, s32 *arg1, s32 *arg2, s32 *arg3) +void ctc_highlight_room(RoomNum roomnum, s32 *arg1, s32 *arg2, s32 *arg3) { s32 i; diff --git a/src/game/mplayer/scenarios/combat.inc b/src/game/mplayer/scenarios/combat.inc index 74f4c6ad3..3f92dae6c 100644 --- a/src/game/mplayer/scenarios/combat.inc +++ b/src/game/mplayer/scenarios/combat.inc @@ -13,7 +13,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_222, // "One-Hit Kills" MPOPTION_ONEHITKILLS, - menuhandlerMpOneHitKills, + menuhandler_mp_one_hit_kills, }, { MENUITEMTYPE_DROPDOWN, @@ -21,7 +21,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_223, // "Slow Motion" 0, - menuhandlerMpSlowMotion, + menuhandler_mp_slow_motion, }, { MENUITEMTYPE_CHECKBOX, @@ -29,7 +29,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_224, // "Fast Movement" MPOPTION_FASTMOVEMENT, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -37,7 +37,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_225, // "Display Team" MPOPTION_DISPLAYTEAM, - menuhandlerMpDisplayTeam, + menuhandler_mp_display_team, }, { MENUITEMTYPE_CHECKBOX, @@ -45,7 +45,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_226, // "No Radar" MPOPTION_NORADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -53,7 +53,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_227, // "No Auto-Aim" MPOPTION_NOAUTOAIM, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -69,7 +69,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_228, // "No Player Highlight" MPOPTION_NOPLAYERHIGHLIGHT, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -77,7 +77,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_229, // "No Pickup Highlight" MPOPTION_NOPICKUPHIGHLIGHT, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -102,7 +102,7 @@ struct menudialogdef g_MpCombatOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_215, // "Combat Options" g_MpCombatOptionsMenuItems, - mpOptionsMenuDialog, + mp_options_menu_dialog, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; diff --git a/src/game/mplayer/scenarios/hackthatmac.inc b/src/game/mplayer/scenarios/hackthatmac.inc index d065929ec..595db9346 100644 --- a/src/game/mplayer/scenarios/hackthatmac.inc +++ b/src/game/mplayer/scenarios/hackthatmac.inc @@ -16,7 +16,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_222, // "One-Hit Kills" MPOPTION_ONEHITKILLS, - menuhandlerMpOneHitKills, + menuhandler_mp_one_hit_kills, }, { MENUITEMTYPE_DROPDOWN, @@ -24,7 +24,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_223, // "Slow Motion" 0, - menuhandlerMpSlowMotion, + menuhandler_mp_slow_motion, }, { MENUITEMTYPE_CHECKBOX, @@ -32,7 +32,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_224, // "Fast Movement" MPOPTION_FASTMOVEMENT, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -40,7 +40,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_225, // "Display Team" MPOPTION_DISPLAYTEAM, - menuhandlerMpDisplayTeam, + menuhandler_mp_display_team, }, { MENUITEMTYPE_CHECKBOX, @@ -48,7 +48,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_226, // "No Radar" MPOPTION_NORADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -56,7 +56,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_227, // "No Auto-Aim" MPOPTION_NOAUTOAIM, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -64,7 +64,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_493, // "Kills Score" MPOPTION_KILLSSCORE, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -80,7 +80,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_231, // "Highlight Terminal" MPOPTION_HTM_HIGHLIGHTTERMINAL, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -88,7 +88,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_238, // "Show on Radar" MPOPTION_HTM_SHOWONRADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -113,14 +113,14 @@ struct menudialogdef g_HtmOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_217, // "Hacker Options" g_HtmOptionsMenuItems, - mpOptionsMenuDialog, + mp_options_menu_dialog, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; struct weaponobj g_HtmUplinkObj; -void htmInit(void) +void htm_init(void) { g_ScenarioData.htm.uplink = NULL; } @@ -128,12 +128,12 @@ void htmInit(void) /** * Add one for the data uplink. */ -s32 htmNumProps(void) +s32 htm_num_props(void) { return HTM_NUM_TERMINALS + 1; } -void htmAddPad(s16 padnum) +void htm_add_pad(s16 padnum) { struct scenariodata_htm *data = &g_ScenarioData.htm; @@ -148,7 +148,7 @@ void htmAddPad(s16 padnum) } } -void htmReset(void) +void htm_reset(void) { s32 i; @@ -180,7 +180,7 @@ void htmReset(void) } } -void htbCreateUplink(void) +void htb_create_uplink(void) { struct weaponobj template = { 512, // extrascale @@ -252,7 +252,7 @@ void htbCreateUplink(void) g_HtmUplinkObj = template; g_HtmUplinkObj.base.pad = padnum; - setupPlaceWeapon(&g_HtmUplinkObj, 999); + setup_place_weapon(&g_HtmUplinkObj, 999); g_HtmUplinkObj.base.hidden2 &= ~OBJH2FLAG_CANREGEN; @@ -263,7 +263,7 @@ void htbCreateUplink(void) } } -void htmInitProps(void) +void htm_init_props(void) { struct scenariodata_htm *data = &g_ScenarioData.htm; struct prop *prop = g_Vars.activeprops; @@ -279,7 +279,7 @@ void htmInitProps(void) if (obj->type == OBJTYPE_AMMOCRATE || obj->type == OBJTYPE_MULTIAMMOCRATE) { if (obj->modelnum == MODEL_MULTI_AMMO_CRATE) { osSyncPrintf("HackThatMacInitProps -> Adding prop %d (%x)\n", i, obj->pad); - htmAddPad(obj->pad); + htm_add_pad(obj->pad); } } } @@ -289,14 +289,14 @@ void htmInitProps(void) } osSyncPrintf("HackThatMacInitProps -> Mid : %d Bank Pads\n", data->numpads); - osSyncPrintf("HackThatMacInitProps -> Generating %d random box pads from %d in the bank\n", htmNumProps(), data->numpads); + osSyncPrintf("HackThatMacInitProps -> Generating %d random box pads from %d in the bank\n", htm_num_props(), data->numpads); data->numterminals = 0; - // @bug: This should be < htmNumProps() - 1 to account for the data uplink, + // @bug: This should be < htm_num_props() - 1 to account for the data uplink, // or just < HTM_NUM_TERMINALS. If HTM_NUM_TERMINALS is set to 7 then it // will overflow the array. - while (data->numterminals < htmNumProps()) { + while (data->numterminals < htm_num_props()) { s32 padnum; do { @@ -309,30 +309,30 @@ void htmInitProps(void) data->padnums[rand] = -1; } - osSyncPrintf("HackThatMacInitProps -> %d/%d Random box pads generated - Listing\n", data->numterminals, htmNumProps()); + osSyncPrintf("HackThatMacInitProps -> %d/%d Random box pads generated - Listing\n", data->numterminals, htm_num_props()); for (i = 0; i < data->numterminals; i++) { osSyncPrintf("Pad %d -> Pad Id = %d\n", i, data->terminals[i].padnum); } for (i = 0; i < HTM_NUM_TERMINALS; i++) { - data->terminals[i].prop = scenarioCreateObj(MODEL_GOODPC, data->terminals[i].padnum, 0.2f, + data->terminals[i].prop = scenario_create_obj(MODEL_GOODPC, data->terminals[i].padnum, 0.2f, OBJFLAG_FALL | OBJFLAG_INVINCIBLE | OBJFLAG_FORCENOBOUNCE, OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS, OBJFLAG3_HTMTERMINAL | OBJFLAG3_INTERACTABLE); osSyncPrintf("HackThatMacInitProps -> Building and adding custom prop %d - Pad=%d, Ptr=%08x\n", i, data->terminals[i].padnum, data->terminals[i].prop); - htbRemoveAmmoCrateAtPad(data->terminals[i].padnum); + htb_remove_ammo_crate_at_pad(data->terminals[i].padnum); } var800869ec = NULL; - htbCreateUplink(); + htb_create_uplink(); osSyncPrintf("HackThatMacInitProps -> End\n"); } -void htmTick(void) +void htm_tick(void) { u8 stack[8]; s32 i; @@ -367,16 +367,16 @@ void htmTick(void) // Check if a player is holding it if (g_ScenarioData.htm.uplink == NULL) { for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); - if (invHasDataUplink()) { + if (inv_has_data_uplink()) { g_ScenarioData.htm.uplink = g_Vars.currentplayer->prop; break; } } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); // Check if a simulant is holding it if (g_ScenarioData.htm.uplink == NULL) { @@ -389,11 +389,11 @@ void htmTick(void) } if (g_ScenarioData.htm.uplink == NULL) { - htbCreateUplink(); + htb_create_uplink(); } } -void htmTickChr(struct chrdata *chr) +void htm_tick_chr(struct chrdata *chr) { struct scenariodata_htm *data = &g_ScenarioData.htm; bool hasuplink; @@ -403,9 +403,9 @@ void htmTickChr(struct chrdata *chr) if (chr) { hasuplink = chr->aibot->hasuplink; - playernum = mpPlayerGetIndex(chr); + playernum = mp_player_get_index(chr); } else { - hasuplink = invHasDataUplink() && bgunGetWeaponNum(HAND_RIGHT) == WEAPON_DATAUPLINK; + hasuplink = inv_has_data_uplink() && bgun_get_weapon_num(HAND_RIGHT) == WEAPON_DATAUPLINK; playernum = g_Vars.currentplayernum; } @@ -440,20 +440,20 @@ void htmTickChr(struct chrdata *chr) if (chr == NULL) { #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_018), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "Starting download." + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_018), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "Starting download." #else - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_018), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "Starting download." + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_018), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "Starting download." #endif - psCreate(NULL, data->terminals[data->dlterminalnum].prop, SFX_01BF, -1, + ps_create(NULL, data->terminals[data->dlterminalnum].prop, SFX_01BF, -1, -1, PSFLAG_REPEATING, PSFLAG2_MPPAUSABLE, PSTYPE_NONE, NULL, -1, NULL, -1, -1, -1, -1); } } } else { if (chr == NULL) { #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_019), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "You need to use the Data Uplink." + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_019), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "You need to use the Data Uplink." #else - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_019), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "You need to use the Data Uplink." + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_019), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "You need to use the Data Uplink." #endif snd00010718(NULL, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_01CC, 1, 1, -1, 1); } @@ -474,12 +474,12 @@ void htmTickChr(struct chrdata *chr) if (chr) { chrpos = &chr->prop->pos; - angle = (M_BADTAU - chrGetInverseTheta(chr)) * 57.295776367188f; + angle = (M_BADTAU - chr_get_inverse_theta(chr)) * 57.295776367188f; holdinguplink = chr->aibot->weaponnum == WEAPON_UNARMED; } else { chrpos = &g_Vars.currentplayer->prop->pos; angle = g_Vars.currentplayer->vv_theta; - holdinguplink = bgunGetWeaponNum(HAND_RIGHT) == WEAPON_DATAUPLINK; + holdinguplink = bgun_get_weapon_num(HAND_RIGHT) == WEAPON_DATAUPLINK; } dist.x = terminalpos->x - chrpos->x; @@ -524,11 +524,11 @@ void htmTickChr(struct chrdata *chr) if (chr == NULL) { // "Connection broken." #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_017), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_017), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); #else - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_017), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_017), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); #endif - psStopSound(data->terminals[data->dlterminalnum].prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(data->terminals[data->dlterminalnum].prop, PSTYPE_GENERAL, 0xffff); snd00010718(NULL, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_01CC, 1, 1, -1, 1); } @@ -545,11 +545,11 @@ void htmTickChr(struct chrdata *chr) if (chr == NULL) { // "Download successful." #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_016), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_016), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); #else - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_016), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_016), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); #endif - psStopSound(data->terminals[data->dlterminalnum].prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(data->terminals[data->dlterminalnum].prop, PSTYPE_GENERAL, 0xffff); snd00010718(NULL, 0, AL_VOL_FULL, AL_PAN_CENTER, SFX_01C1, 1, 1, -1, 1); } @@ -564,7 +564,7 @@ void htmTickChr(struct chrdata *chr) } } -Gfx *htmRenderHud(Gfx *gdl) +Gfx *htm_render_hud(Gfx *gdl) { struct scenariodata_htm *data = &g_ScenarioData.htm; s32 dltime; @@ -583,22 +583,22 @@ Gfx *htmRenderHud(Gfx *gdl) dltime = data->dltime240[g_Vars.currentplayernum]; if (data->dlterminalnum != -1 && g_Vars.currentplayernum == data->dlplayernum) { - viewleft = viGetViewLeft(); - viewright = viGetViewLeft() + viGetViewWidth(); - viewtop = viGetViewTop(); + viewleft = vi_get_view_left(); + viewright = vi_get_view_left() + vi_get_view_width(); + viewtop = vi_get_view_top(); t6 = (viewleft + viewright) / 2; - a1 = viGetViewWidth() / 3; + a1 = vi_get_view_width() / 3; barleft = t6 - a1 / 2; barright = t6 + a1 / 2; s1 = barleft + (s32) (a1 * (dltime / TICKS(4800.0f))); gdl = text0f153628(gdl); - gdl = textSetPrimColour(gdl, 0x60000060); + gdl = text_set_prim_colour(gdl, 0x60000060); gDPFillRectangle(gdl++, barleft, viewtop + 8, barright, viewtop + 16); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, 0xc00000d0); + gdl = text_set_prim_colour(gdl, 0xc00000d0); v1 = barleft + 1; a0 = barleft; @@ -616,7 +616,7 @@ Gfx *htmRenderHud(Gfx *gdl) return gdl; } -void htmCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths) +void htm_calculate_player_score(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths) { struct mpchrconfig *loopmpchr; s32 i; @@ -650,7 +650,7 @@ void htmCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score *deaths = mpchr->numdeaths; } -Gfx *htmRadarExtra(Gfx *gdl) +Gfx *htm_radar_extra(Gfx *gdl) { struct scenariodata_htm *data = &g_ScenarioData.htm; struct coord dist; @@ -675,7 +675,7 @@ Gfx *htmRadarExtra(Gfx *gdl) dist.y = data->uplink->pos.y - g_Vars.currentplayer->prop->pos.y; dist.z = data->uplink->pos.z - g_Vars.currentplayer->prop->pos.z; - gdl = radarDrawDot(gdl, data->uplink, &dist, 0x00ff0000, 0x00000000, true); + gdl = radar_draw_dot(gdl, data->uplink, &dist, 0x00ff0000, 0x00000000, true); } // Show the terminal @@ -691,7 +691,7 @@ Gfx *htmRadarExtra(Gfx *gdl) bf = 0; af = 0; } else if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { - u32 colour = g_TeamColours[radarGetTeamIndex(data->terminals[i].team)]; + u32 colour = g_TeamColours[radar_get_team_index(data->terminals[i].team)]; rf = (colour >> 24) & 0xff; gf = ((colour >> 16) & 0xff); bf = ((colour >> 8) & 0xff); @@ -724,7 +724,7 @@ Gfx *htmRadarExtra(Gfx *gdl) ai = 255; } - gdl = radarDrawDot(gdl, data->terminals[i].prop, &sp88, + gdl = radar_draw_dot(gdl, data->terminals[i].prop, &sp88, (ri << 24) | (gi << 16) | (bi << 8) | ai, 0x00000000, true); } @@ -734,7 +734,7 @@ Gfx *htmRadarExtra(Gfx *gdl) return gdl; } -bool htmRadarChr(Gfx **gdl, struct prop *prop) +bool htm_radar_chr(Gfx **gdl, struct prop *prop) { if ((g_MpSetup.options & MPOPTION_HTM_SHOWONRADAR) && g_ScenarioData.htm.uplink) { if (prop == g_ScenarioData.htm.uplink && @@ -745,10 +745,10 @@ bool htmRadarChr(Gfx **gdl, struct prop *prop) dist.z = prop->pos.z - g_Vars.currentplayer->prop->pos.z; if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { - u32 colour = g_TeamColours[radarGetTeamIndex(prop->chr->team)]; - *gdl = radarDrawDot(*gdl, g_ScenarioData.htm.uplink, &dist, colour, 0, 1); + u32 colour = g_TeamColours[radar_get_team_index(prop->chr->team)]; + *gdl = radar_draw_dot(*gdl, g_ScenarioData.htm.uplink, &dist, colour, 0, 1); } else { - *gdl = radarDrawDot(*gdl, g_ScenarioData.htm.uplink, &dist, 0x00ff0000, 0, 1); + *gdl = radar_draw_dot(*gdl, g_ScenarioData.htm.uplink, &dist, 0x00ff0000, 0, 1); } return true; @@ -758,7 +758,7 @@ bool htmRadarChr(Gfx **gdl, struct prop *prop) return false; } -bool htmHighlightProp(struct prop *prop, s32 *colour) +bool htm_highlight_prop(struct prop *prop, s32 *colour) { if (g_MpSetup.options & MPOPTION_HTM_HIGHLIGHTTERMINAL) { bool highlight = false; diff --git a/src/game/mplayer/scenarios/holdthebriefcase.inc b/src/game/mplayer/scenarios/holdthebriefcase.inc index 9b9ffe1e3..bdd74f42d 100644 --- a/src/game/mplayer/scenarios/holdthebriefcase.inc +++ b/src/game/mplayer/scenarios/holdthebriefcase.inc @@ -16,7 +16,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_222, // "One-Hit Kills" MPOPTION_ONEHITKILLS, - menuhandlerMpOneHitKills, + menuhandler_mp_one_hit_kills, }, { MENUITEMTYPE_DROPDOWN, @@ -24,7 +24,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_223, // "Slow Motion" 0, - menuhandlerMpSlowMotion, + menuhandler_mp_slow_motion, }, { MENUITEMTYPE_CHECKBOX, @@ -32,7 +32,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_224, // "Fast Movement" MPOPTION_FASTMOVEMENT, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -40,7 +40,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_225, // "Display Team" MPOPTION_DISPLAYTEAM, - menuhandlerMpDisplayTeam, + menuhandler_mp_display_team, }, { MENUITEMTYPE_CHECKBOX, @@ -48,7 +48,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_226, // "No Radar" MPOPTION_NORADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -56,7 +56,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_227, // "No Auto-Aim" MPOPTION_NOAUTOAIM, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -64,7 +64,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_493, // "Kills Score" MPOPTION_KILLSSCORE, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -80,7 +80,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_237, // "Highlight Briefcase" MPOPTION_HTB_HIGHLIGHTBRIEFCASE, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -88,7 +88,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_238, // "Show on Radar" MPOPTION_HTB_SHOWONRADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -113,7 +113,7 @@ struct menudialogdef g_HtbOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_216, // "Briefcase Options" g_HtbOptionsMenuItems, - mpOptionsMenuDialog, + mp_options_menu_dialog, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -122,12 +122,12 @@ struct defaultobj *var800869ec = NULL; struct weaponobj g_HtbTokenObj; -void htbInit(void) +void htb_init(void) { g_ScenarioData.htb.token = NULL; } -void htbAddPad(s16 padnum) +void htb_add_pad(s16 padnum) { struct scenariodata_htb *data = &g_ScenarioData.htb; @@ -142,12 +142,12 @@ void htbAddPad(s16 padnum) } } -s32 htbNumProps(void) +s32 htb_num_props(void) { return 1; } -void htbRemoveAmmoCrateAtPad(s16 padnum) +void htb_remove_ammo_crate_at_pad(s16 padnum) { struct prop *prop = g_Vars.activeprops; @@ -168,7 +168,7 @@ void htbRemoveAmmoCrateAtPad(s16 padnum) } } -void htbReset(void) +void htb_reset(void) { s32 i; @@ -179,7 +179,7 @@ void htbReset(void) } } -void htbCreateToken(void) +void htb_create_token(void) { struct weaponobj template = { 256, // extrascale @@ -255,7 +255,7 @@ void htbCreateToken(void) g_HtbTokenObj = template; g_HtbTokenObj.base.pad = g_ScenarioData.htb.tokenpad; - setupPlaceWeapon(&g_HtbTokenObj, 999); + setup_place_weapon(&g_HtbTokenObj, 999); g_HtbTokenObj.base.hidden2 &= ~OBJH2FLAG_CANREGEN; @@ -266,13 +266,13 @@ void htbCreateToken(void) } } -void htbInitProps(void) +void htb_init_props(void) { var800869ec = NULL; - htbCreateToken(); + htb_create_token(); } -void htbTick(void) +void htb_tick(void) { s32 i; u32 prevplayernum = g_Vars.currentplayernum; @@ -306,16 +306,16 @@ void htbTick(void) // Check if a player is holding it if (g_ScenarioData.htb.token == NULL) { for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); - if (invHasBriefcase()) { + if (inv_has_briefcase()) { g_ScenarioData.htb.token = g_Vars.currentplayer->prop; break; } } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); // Check if a simulant is holding it if (g_ScenarioData.htb.token == NULL) { @@ -333,7 +333,7 @@ void htbTick(void) } if (g_ScenarioData.htb.token == NULL) { - htbCreateToken(); + htb_create_token(); } if (g_ScenarioData.htb.token == NULL) { @@ -348,31 +348,31 @@ void htbTick(void) } } -void htbTickChr(struct chrdata *chr) +void htb_tick_chr(struct chrdata *chr) { if (chr) { if (chr->aibot->hasbriefcase) { chr->aibot->htbheldtimer60 += g_Vars.lvupdate240; if (chr->aibot->htbheldtimer60 >= TICKS(7200)) { - sndStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1); - g_MpAllChrConfigPtrs[mpPlayerGetIndex(chr)]->numpoints++; + snd_start(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1); + g_MpAllChrConfigPtrs[mp_player_get_index(chr)]->numpoints++; chr->aibot->htbheldtimer60 = 0; } } else { chr->aibot->htbheldtimer60 = 0; } } else { - if (invHasBriefcase()) { + if (inv_has_briefcase()) { g_Vars.currentplayerstats->tokenheldtime += g_Vars.lvupdate240; if (g_Vars.currentplayerstats->tokenheldtime >= TICKS(7200)) { - sndStart(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_MP_SCOREPOINT, NULL, -1, -1, -1, -1, -1); g_MpAllChrConfigPtrs[g_Vars.currentplayernum]->numpoints++; #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_024), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "1 Point!" + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_024), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); // "1 Point!" #else - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_024), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "1 Point!" + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_024), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); // "1 Point!" #endif g_Vars.currentplayerstats->tokenheldtime = 0; } @@ -389,7 +389,7 @@ void htbTickChr(struct chrdata *chr) * * PAL recognises that mins will always be 0 and simplifies the calculation. */ -Gfx *htbRenderHud(Gfx *gdl) +Gfx *htb_render_hud(Gfx *gdl) { s32 time240; s32 mins; @@ -400,9 +400,9 @@ Gfx *htbRenderHud(Gfx *gdl) s32 y; char text[64]; - if (invHasBriefcase()) { - x = viGetViewLeft() + viGetViewWidth() / 2; - y = viGetViewTop() + 10; + if (inv_has_briefcase()) { + x = vi_get_view_left() + vi_get_view_width() / 2; + y = vi_get_view_top() + 10; time240 = TICKS(7200) - g_Vars.currentplayerstats->tokenheldtime; @@ -417,7 +417,7 @@ Gfx *htbRenderHud(Gfx *gdl) #endif gdl = text0f153628(gdl); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x -= textwidth / 2; textwidth += x; @@ -425,10 +425,10 @@ Gfx *htbRenderHud(Gfx *gdl) #if VERSION >= VERSION_NTSC_1_0 gdl = text0f153990(gdl, x, y, textwidth, textheight); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, vi_get_width(), vi_get_height(), 0, 0); #else gdl = text0f153858(gdl, &x, &y, &textwidth, &textheight); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, vi_get_width(), vi_get_height(), 0, 0); #endif gdl = text0f153780(gdl); @@ -437,7 +437,7 @@ Gfx *htbRenderHud(Gfx *gdl) return gdl; } -void htbCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths) +void htb_calculate_player_score(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths) { struct mpchrconfig *loopmpchr; s32 i; @@ -466,7 +466,7 @@ void htbCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score *deaths = mpchr->numdeaths; } -Gfx *htbRadarExtra(Gfx *gdl) +Gfx *htb_radar_extra(Gfx *gdl) { if ((g_MpSetup.options & MPOPTION_HTB_SHOWONRADAR) && g_ScenarioData.htb.token != NULL && @@ -476,13 +476,13 @@ Gfx *htbRadarExtra(Gfx *gdl) dist.x = g_ScenarioData.htb.pos.x - g_Vars.currentplayer->prop->pos.x; dist.y = g_ScenarioData.htb.pos.y - g_Vars.currentplayer->prop->pos.y; dist.z = g_ScenarioData.htb.pos.z - g_Vars.currentplayer->prop->pos.z; - gdl = radarDrawDot(gdl, g_ScenarioData.htb.token, &dist, 0x00ff0000, 0, 1); + gdl = radar_draw_dot(gdl, g_ScenarioData.htb.token, &dist, 0x00ff0000, 0, 1); } return gdl; } -bool htbRadarChr(Gfx **gdl, struct prop *prop) +bool htb_radar_chr(Gfx **gdl, struct prop *prop) { if ((g_MpSetup.options & MPOPTION_HTB_SHOWONRADAR) && g_ScenarioData.htb.token && @@ -494,10 +494,10 @@ bool htbRadarChr(Gfx **gdl, struct prop *prop) dist.z = prop->pos.z - g_Vars.currentplayer->prop->pos.z; if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { - u32 colour = g_TeamColours[radarGetTeamIndex(prop->chr->team)]; - *gdl = radarDrawDot(*gdl, g_ScenarioData.htb.token, &dist, colour, 0, 1); + u32 colour = g_TeamColours[radar_get_team_index(prop->chr->team)]; + *gdl = radar_draw_dot(*gdl, g_ScenarioData.htb.token, &dist, colour, 0, 1); } else { - *gdl = radarDrawDot(*gdl, g_ScenarioData.htb.token, &dist, 0x00ff0000, 0, 1); + *gdl = radar_draw_dot(*gdl, g_ScenarioData.htb.token, &dist, 0x00ff0000, 0, 1); } return true; @@ -507,7 +507,7 @@ bool htbRadarChr(Gfx **gdl, struct prop *prop) return false; } -bool htbHighlightProp(struct prop *prop, s32 *colour) +bool htb_highlight_prop(struct prop *prop, s32 *colour) { if ((g_MpSetup.options & MPOPTION_HTB_HIGHLIGHTBRIEFCASE) && prop == g_ScenarioData.htb.token) { colour[0] = 0; diff --git a/src/game/mplayer/scenarios/kingofthehill.inc b/src/game/mplayer/scenarios/kingofthehill.inc index 2a837ff23..9262dd44a 100644 --- a/src/game/mplayer/scenarios/kingofthehill.inc +++ b/src/game/mplayer/scenarios/kingofthehill.inc @@ -13,7 +13,7 @@ * Points are awarded to each player in the hill at the time that it is won. */ -MenuItemHandlerResult menuhandlerMpHillTime(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_hill_time(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -23,7 +23,7 @@ MenuItemHandlerResult menuhandlerMpHillTime(s32 operation, struct menuitem *item g_Vars.mphilltime = (u8)data->slider.value; break; case MENUOP_GETSLIDERLABEL: - sprintf(data->slider.label, langGet(L_MPWEAPONS_023), data->slider.value + 10); // "%ds/Point" + sprintf(data->slider.label, lang_get(L_MPWEAPONS_023), data->slider.value + 10); // "%ds/Point" break; } @@ -37,7 +37,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_222, // "One-Hit Kills" MPOPTION_ONEHITKILLS, - menuhandlerMpOneHitKills, + menuhandler_mp_one_hit_kills, }, { MENUITEMTYPE_DROPDOWN, @@ -45,7 +45,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_223, // "Slow Motion" 0, - menuhandlerMpSlowMotion, + menuhandler_mp_slow_motion, }, { MENUITEMTYPE_CHECKBOX, @@ -53,7 +53,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_224, // "Fast Movement" MPOPTION_FASTMOVEMENT, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -61,7 +61,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_225, // "Display Team" MPOPTION_DISPLAYTEAM, - menuhandlerMpDisplayTeam, + menuhandler_mp_display_team, }, { MENUITEMTYPE_CHECKBOX, @@ -69,7 +69,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_226, // "No Radar" MPOPTION_NORADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -77,7 +77,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_227, // "No Auto-Aim" MPOPTION_NOAUTOAIM, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -85,7 +85,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_493, // "Kills Score" MPOPTION_KILLSSCORE, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -101,7 +101,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_233, // "Hill on Radar" MPOPTION_KOH_HILLONRADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -109,7 +109,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_234, // "Mobile Hill" MPOPTION_KOH_MOBILEHILL, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SLIDER, @@ -117,7 +117,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_235, // "Time" 0x0000006e, - menuhandlerMpHillTime, + menuhandler_mp_hill_time, }, { MENUITEMTYPE_SEPARATOR, @@ -142,22 +142,22 @@ struct menudialogdef g_KohOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_219, // "Hill Options" g_KohOptionsMenuItems, - mpOptionsMenuDialog, + mp_options_menu_dialog, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; -void kohReadSave(struct savebuffer *buffer) +void koh_read_save(struct savebuffer *buffer) { - g_Vars.mphilltime = savebufferReadBits(buffer, 8); + g_Vars.mphilltime = savebuffer_read_bits(buffer, 8); } -void kohWriteSave(struct savebuffer *buffer) +void koh_write_save(struct savebuffer *buffer) { - savebufferOr(buffer, g_Vars.mphilltime, 8); + savebuffer_or(buffer, g_Vars.mphilltime, 8); } -void kohInit(void) +void koh_init(void) { s32 i; @@ -181,7 +181,7 @@ void kohInit(void) } } -void kohInitProps(void) +void koh_init_props(void) { s16 pad_id = 0; struct pad pad; @@ -195,17 +195,17 @@ void kohInitProps(void) g_ScenarioData.koh.hillindex = 0; } - padUnpack(pad_id, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(pad_id, PADFIELD_POS | PADFIELD_ROOM, &pad); g_ScenarioData.koh.hillrooms[0] = pad.room; g_ScenarioData.koh.hillrooms[1] = -1; g_ScenarioData.koh.hillpos.x = pad.pos.x; g_ScenarioData.koh.hillpos.y = pad.pos.y; g_ScenarioData.koh.hillpos.z = pad.pos.z; - g_ScenarioData.koh.hillpos.y = cdFindFloorYColourTypeAtPos(&g_ScenarioData.koh.hillpos, &g_ScenarioData.koh.hillrooms[0], 0, 0); + g_ScenarioData.koh.hillpos.y = cd_find_floor_y_colour_type_at_pos(&g_ScenarioData.koh.hillpos, &g_ScenarioData.koh.hillrooms[0], 0, 0); g_ScenarioData.koh.movehill = false; - roomSetLightOp(g_ScenarioData.koh.hillrooms[0], LIGHTOP_HIGHLIGHT, 0, 0, 0); + room_set_light_op(g_ScenarioData.koh.hillrooms[0], LIGHTOP_HIGHLIGHT, 0, 0, 0); } /** @@ -215,7 +215,7 @@ void kohInitProps(void) * To make this code readable, constants have been used to map appropriate names * to the underlying variable. */ -void kohTick(void) +void koh_tick(void) { s32 i; s32 hillteam; @@ -267,7 +267,7 @@ void kohTick(void) && g_ScenarioData.koh.colourfracb >= .95f) { // The old hill is now "natural enough" to set it back to full // natural colour and actually choose a new hill. - roomSetLightOp(g_ScenarioData.koh.hillrooms[0], LIGHTOP_NONE, 0, 0, 0); + room_set_light_op(g_ScenarioData.koh.hillrooms[0], LIGHTOP_NONE, 0, 0, 0); // Choose the new hill. Note that hillcount refers to the number of // hill options, which is always >= 2. @@ -285,7 +285,7 @@ void kohTick(void) g_ScenarioData.koh.hillindex = 0; } - padUnpack(padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); g_ScenarioData.koh.hillrooms[0] = pad.room; g_ScenarioData.koh.hillrooms[1] = -1; @@ -294,9 +294,9 @@ void kohTick(void) g_ScenarioData.koh.hillpos.y = pad.pos.y; g_ScenarioData.koh.hillpos.z = pad.pos.z; - g_ScenarioData.koh.hillpos.y = cdFindFloorYColourTypeAtPos(&g_ScenarioData.koh.hillpos, g_ScenarioData.koh.hillrooms, NULL, NULL); + g_ScenarioData.koh.hillpos.y = cd_find_floor_y_colour_type_at_pos(&g_ScenarioData.koh.hillpos, g_ScenarioData.koh.hillrooms, NULL, NULL); - roomSetLightOp(g_ScenarioData.koh.hillrooms[0], LIGHTOP_HIGHLIGHT, 0, 0, 0); + room_set_light_op(g_ScenarioData.koh.hillrooms[0], LIGHTOP_HIGHLIGHT, 0, 0, 0); g_ScenarioData.koh.occupiedteam = -1; g_ScenarioData.koh.elapsed240 = 0; @@ -319,7 +319,7 @@ void kohTick(void) if (inhill) { chr = prop->chr; - if (!chrIsDead(chr)) { + if (!chr_is_dead(chr)) { chrsinhill[numchrsinhill] = prop; numchrsinhill++; } @@ -339,7 +339,7 @@ void kohTick(void) for (s0 = 0, numteamsinhill = 0; s0 < numchrsinhill; s0++) { chr = chrsinhill[s0]->chr; - teamindex = radarGetTeamIndex(chr->team); + teamindex = radar_get_team_index(chr->team); if (teamsinhill[teamindex] == 0) { numteamsinhill++; @@ -410,43 +410,43 @@ void kohTick(void) // So if these don't match then the hill is turning into a team // colour rather than going green. if (hillteam != g_ScenarioData.koh.occupiedteam) { - sndStart(var80095200, SFX_MP_HILLENTERED, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_MP_HILLENTERED, 0, -1, -1, -1, -1, -1); g_ScenarioData.koh.occupiedteam = hillteam; g_ScenarioData.koh.elapsed240 = 0; // "%has captured the Hill!" #if VERSION >= VERSION_JPN_FINAL - sprintf(text, langGet(L_MPWEAPONS_022), scenarioRemoveLineBreaks(g_BossFile.teamnames[hillteam], 0)); + sprintf(text, lang_get(L_MPWEAPONS_022), scenario_remove_line_breaks(g_BossFile.teamnames[hillteam], 0)); #else - sprintf(text, langGet(L_MPWEAPONS_022), &g_BossFile.teamnames[hillteam]); + sprintf(text, lang_get(L_MPWEAPONS_022), &g_BossFile.teamnames[hillteam]); #endif prevplayernum2 = g_Vars.currentplayernum; for (playernum1 = 0; playernum1 < PLAYERCOUNT(); playernum1++) { - setCurrentPlayerNum(playernum1); + set_current_player_num(playernum1); chr = g_Vars.currentplayer->prop->chr; #if VERSION >= VERSION_JPN_FINAL - if (radarGetTeamIndex(chr->team) == g_ScenarioData.koh.occupiedteam) { + if (radar_get_team_index(chr->team) == g_ScenarioData.koh.occupiedteam) { // "We have the Hill!" - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_021), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_021), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); } else { - hudmsgCreateWithFlags(text, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(text, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); } #else - if (radarGetTeamIndex(chr->team) == g_ScenarioData.koh.occupiedteam) { + if (radar_get_team_index(chr->team) == g_ScenarioData.koh.occupiedteam) { // "We have the Hill!" - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_021), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_021), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); } else { - hudmsgCreateWithFlags(text, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text, HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); } #endif } - setCurrentPlayerNum(prevplayernum2); + set_current_player_num(prevplayernum2); } else { // A team is remaining in the hill. // Only tick the hill timer if they have exclusive occupancy. @@ -455,14 +455,14 @@ void kohTick(void) if (g_ScenarioData.koh.elapsed240 >= g_Vars.mphilltime * TICKS(240) + TICKS(2400)) { // Scored a point - sndStart(var80095200, SFX_MP_SCOREPOINT, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_MP_SCOREPOINT, 0, -1, -1, -1, -1, -1); // @bug: There is no check for a chr being dead here. // If a player dies in the hill and waits on the // "press start" screen while their team mate scores the // hill, the dead player will always be awarded a point. for (playernum2 = 0; playernum2 < g_MpNumChrs; playernum2++) { - if (radarGetTeamIndex(g_MpAllChrPtrs[playernum2]->team) == g_ScenarioData.koh.occupiedteam) { + if (radar_get_team_index(g_MpAllChrPtrs[playernum2]->team) == g_ScenarioData.koh.occupiedteam) { prop = g_MpAllChrPtrs[playernum2]->prop; if (prop->rooms[0] == g_ScenarioData.koh.hillrooms[0]) { @@ -475,19 +475,19 @@ void kohTick(void) for (playernum2 = 0; playernum2 < g_MpNumChrs; playernum2++) { if (g_MpAllChrPtrs[playernum2]->aibot == NULL - && radarGetTeamIndex(g_MpAllChrPtrs[playernum2]->team) == g_ScenarioData.koh.occupiedteam) { - setCurrentPlayerNum(playernum2); + && radar_get_team_index(g_MpAllChrPtrs[playernum2]->team) == g_ScenarioData.koh.occupiedteam) { + set_current_player_num(playernum2); // "King of the Hill!" #if VERSION >= VERSION_JPN_FINAL - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_020), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_020), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_NOWRAP); #else - hudmsgCreateWithFlags(langGet(L_MPWEAPONS_020), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(lang_get(L_MPWEAPONS_020), HUDMSGTYPE_MPSCENARIO, HUDMSGFLAG_ONLYIFALIVE); #endif } } - setCurrentPlayerNum(prevplayernum1); + set_current_player_num(prevplayernum1); g_ScenarioData.koh.occupiedteam = -1; g_ScenarioData.koh.elapsed240 = 0; @@ -549,7 +549,7 @@ void kohTick(void) } } -Gfx *kohRenderHud(Gfx *gdl) +Gfx *koh_render_hud(Gfx *gdl) { s32 time240; s32 mins; @@ -561,9 +561,9 @@ Gfx *kohRenderHud(Gfx *gdl) struct chrdata *chr = g_Vars.currentplayer->prop->chr; char text[64]; - if (radarGetTeamIndex(chr->team) == g_ScenarioData.koh.occupiedteam && !g_ScenarioData.koh.movehill) { - x = viGetViewLeft() + viGetViewWidth() / 2; - y = viGetViewTop() + 10; + if (radar_get_team_index(chr->team) == g_ScenarioData.koh.occupiedteam && !g_ScenarioData.koh.movehill) { + x = vi_get_view_left() + vi_get_view_width() / 2; + y = vi_get_view_top() + 10; time240 = g_Vars.mphilltime * TICKS(240) - g_ScenarioData.koh.elapsed240; time240 += VERSION >= VERSION_PAL_BETA ? TICKS(2640) - 1 : 2400; @@ -583,7 +583,7 @@ Gfx *kohRenderHud(Gfx *gdl) } gdl = text0f153628(gdl); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x -= textwidth / 2; textwidth += x; @@ -591,10 +591,10 @@ Gfx *kohRenderHud(Gfx *gdl) #if VERSION >= VERSION_NTSC_1_0 gdl = text0f153990(gdl, x, y, textwidth, textheight); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, vi_get_width(), vi_get_height(), 0, 0); #else gdl = text0f153858(gdl, &x, &y, &textwidth, &textheight); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, vi_get_width(), vi_get_height(), 0, 0); #endif gdl = text0f153780(gdl); } @@ -602,7 +602,7 @@ Gfx *kohRenderHud(Gfx *gdl) return gdl; } -void kohCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths) +void koh_calculate_player_score(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths) { struct mpchrconfig *loopmpchr; s32 i; @@ -629,7 +629,7 @@ void kohCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score *deaths = mpchr->numdeaths; } -Gfx *kohRadarExtra(Gfx *gdl) +Gfx *koh_radar_extra(Gfx *gdl) { if (g_MpSetup.options & MPOPTION_KOH_HILLONRADAR && !g_ScenarioData.koh.movehill) { struct coord dist; @@ -644,13 +644,13 @@ Gfx *kohRadarExtra(Gfx *gdl) colour = g_TeamColours[g_ScenarioData.koh.occupiedteam]; } - gdl = radarDrawDot(gdl, NULL, &dist, colour, 0, 1); + gdl = radar_draw_dot(gdl, NULL, &dist, colour, 0, 1); } return gdl; } -void kohAddHill(s32 *cmd) +void koh_add_hill(s32 *cmd) { if (g_ScenarioData.koh.hillcount < ARRAYCOUNT(g_ScenarioData.koh.hillpads)) { g_ScenarioData.koh.hillpads[g_ScenarioData.koh.hillcount] = cmd[1]; @@ -658,12 +658,12 @@ void kohAddHill(s32 *cmd) } } -bool kohIsRoomHighlighted(RoomNum room) +bool koh_is_room_highlighted(RoomNum room) { return room == g_ScenarioData.koh.hillrooms[0]; } -void kohHighlightRoom(RoomNum roomnum, s32 *arg1, s32 *arg2, s32 *arg3) +void koh_highlight_room(RoomNum roomnum, s32 *arg1, s32 *arg2, s32 *arg3) { if (roomnum == g_ScenarioData.koh.hillrooms[0]) { f32 a = *arg1; diff --git a/src/game/mplayer/scenarios/popacap.inc b/src/game/mplayer/scenarios/popacap.inc index 7ffccfb10..1f1c86bef 100644 --- a/src/game/mplayer/scenarios/popacap.inc +++ b/src/game/mplayer/scenarios/popacap.inc @@ -14,7 +14,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_222, // "One-Hit Kills" MPOPTION_ONEHITKILLS, - menuhandlerMpOneHitKills, + menuhandler_mp_one_hit_kills, }, { MENUITEMTYPE_DROPDOWN, @@ -22,7 +22,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_223, // "Slow Motion" 0, - menuhandlerMpSlowMotion, + menuhandler_mp_slow_motion, }, { MENUITEMTYPE_CHECKBOX, @@ -30,7 +30,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_224, // "Fast Movement" MPOPTION_FASTMOVEMENT, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -38,7 +38,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_225, // "Display Team" MPOPTION_DISPLAYTEAM, - menuhandlerMpDisplayTeam, + menuhandler_mp_display_team, }, { MENUITEMTYPE_CHECKBOX, @@ -46,7 +46,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_226, // "No Radar" MPOPTION_NORADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -54,7 +54,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_227, // "No Auto-Aim" MPOPTION_NOAUTOAIM, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -62,7 +62,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_493, // "Kills Score" MPOPTION_KILLSSCORE, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -78,7 +78,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_230, // "Highlight Target" MPOPTION_PAC_HIGHLIGHTTARGET, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_CHECKBOX, @@ -86,7 +86,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_238, // "Show on Radar" MPOPTION_PAC_SHOWONRADAR, - menuhandlerMpCheckboxOption, + menuhandler_mp_checkbox_option, }, { MENUITEMTYPE_SEPARATOR, @@ -111,12 +111,12 @@ struct menudialogdef g_PacOptionsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_218, // "Pop a Cap Options" g_PacOptionsMenuItems, - mpOptionsMenuDialog, + mp_options_menu_dialog, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; -void pacReset(void) +void pac_reset(void) { s32 i; s32 j; @@ -160,17 +160,17 @@ void pacReset(void) osSyncPrintf("PopACapReset -> Done\n"); } -void pacInit(void) +void pac_init(void) { - pacReset(); + pac_reset(); } -void pacInitProps(void) +void pac_init_props(void) { - pacReset(); + pac_reset(); } -bool pacHighlightProp(struct prop *prop, s32 *colour) +bool pac_highlight_prop(struct prop *prop, s32 *colour) { struct scenariodata_pac *data = &g_ScenarioData.pac; @@ -188,7 +188,7 @@ bool pacHighlightProp(struct prop *prop, s32 *colour) return false; } -void pacApplyNextVictim(void) +void pac_apply_next_victim(void) { struct scenariodata_pac *data = &g_ScenarioData.pac; s32 vplayernum; @@ -207,44 +207,44 @@ void pacApplyNextVictim(void) for (i = 0; i < PLAYERCOUNT(); i++) { if (vplayernum == i) { - sprintf(text, langGet(L_MPWEAPONS_013)); // "You are the victim!" - } else if (scenarioChrsAreSameTeam(vplayernum, i)) { + sprintf(text, lang_get(L_MPWEAPONS_013)); // "You are the victim!" + } else if (scenario_chrs_are_same_team(vplayernum, i)) { #if VERSION >= VERSION_JPN_FINAL - sprintf(text, langGet(L_MPWEAPONS_014), scenarioRemoveLineBreaks(g_MpAllChrConfigPtrs[vplayernum]->name, 0)); // "Protect %s!" + sprintf(text, lang_get(L_MPWEAPONS_014), scenario_remove_line_breaks(g_MpAllChrConfigPtrs[vplayernum]->name, 0)); // "Protect %s!" #else - sprintf(text, langGet(L_MPWEAPONS_014), g_MpAllChrConfigPtrs[vplayernum]->name); // "Protect %s!" + sprintf(text, lang_get(L_MPWEAPONS_014), g_MpAllChrConfigPtrs[vplayernum]->name); // "Protect %s!" #endif } else { #if VERSION >= VERSION_JPN_FINAL - sprintf(text, langGet(L_MPWEAPONS_015), scenarioRemoveLineBreaks(g_MpAllChrConfigPtrs[vplayernum]->name, 0)); // "Get %s!" + sprintf(text, lang_get(L_MPWEAPONS_015), scenario_remove_line_breaks(g_MpAllChrConfigPtrs[vplayernum]->name, 0)); // "Get %s!" #else - sprintf(text, langGet(L_MPWEAPONS_015), g_MpAllChrConfigPtrs[vplayernum]->name); // "Get %s!" + sprintf(text, lang_get(L_MPWEAPONS_015), g_MpAllChrConfigPtrs[vplayernum]->name); // "Get %s!" #endif } - scenarioCreateHudmsg(i, text); + scenario_create_hudmsg(i, text); } } -void pacHandleDeath(s32 aplayernum, s32 vplayernum) +void pac_handle_death(s32 aplayernum, s32 vplayernum) { struct scenariodata_pac *data = &g_ScenarioData.pac; if (data->victimindex >= 0 && vplayernum == data->victims[data->victimindex]) { if (aplayernum != vplayernum) { if (aplayernum >= 0) { - if (scenarioChrsAreSameTeam(aplayernum, vplayernum)) { - scenarioCreateHudmsg(aplayernum, langGet(L_MPWEAPONS_008)); // "You're supposed to look" - scenarioCreateHudmsg(aplayernum, langGet(L_MPWEAPONS_009)); // "after your friends!" + if (scenario_chrs_are_same_team(aplayernum, vplayernum)) { + scenario_create_hudmsg(aplayernum, lang_get(L_MPWEAPONS_008)); // "You're supposed to look" + scenario_create_hudmsg(aplayernum, lang_get(L_MPWEAPONS_009)); // "after your friends!" } else { data->killcounts[aplayernum]++; - scenarioCreateHudmsg(aplayernum, langGet(L_MPWEAPONS_010)); // "Well done!" - scenarioCreateHudmsg(aplayernum, langGet(L_MPWEAPONS_011)); // "You popped a cap!" - scenarioCreateHudmsg(aplayernum, langGet(L_MPWEAPONS_012)); // "Have 2 Points..." + scenario_create_hudmsg(aplayernum, lang_get(L_MPWEAPONS_010)); // "Well done!" + scenario_create_hudmsg(aplayernum, lang_get(L_MPWEAPONS_011)); // "You popped a cap!" + scenario_create_hudmsg(aplayernum, lang_get(L_MPWEAPONS_012)); // "Have 2 Points..." } } - pacApplyNextVictim(); + pac_apply_next_victim(); } else { #if VERSION >= VERSION_NTSC_1_0 data->age240 = 0; @@ -253,12 +253,12 @@ void pacHandleDeath(s32 aplayernum, s32 vplayernum) } } -void pacTick(void) +void pac_tick(void) { struct scenariodata_pac *data = &g_ScenarioData.pac; if (data->victimindex == -1) { - pacApplyNextVictim(); + pac_apply_next_victim(); osSyncPrintf("PopACapTick : Current Victim = %d (Player %d)\n", data->victimindex, data->victims[data->victimindex]); } @@ -274,13 +274,13 @@ void pacTick(void) if (data->age240 > (u32)TICKS(240 * 60)) { data->age240 = 0; data->survivalcounts[data->victims[data->victimindex]]++; - scenarioCreateHudmsg(data->victims[data->victimindex], langGet(L_MPWEAPONS_007)); // "Have a point for living!" + scenario_create_hudmsg(data->victims[data->victimindex], lang_get(L_MPWEAPONS_007)); // "Have a point for living!" } } } } -Gfx *pacRenderHud(Gfx *gdl) +Gfx *pac_render_hud(Gfx *gdl) { struct scenariodata_pac *data = &g_ScenarioData.pac; s32 time240; @@ -299,8 +299,8 @@ Gfx *pacRenderHud(Gfx *gdl) #endif { time240 = TICKS(60 * 240) - data->age240; - x = viGetViewLeft() + viGetViewWidth() / 2; - y = viGetViewTop() + 10; + x = vi_get_view_left() + vi_get_view_width() / 2; + y = vi_get_view_top() + 10; if (time240 < 0) { time240 = 0; @@ -312,7 +312,7 @@ Gfx *pacRenderHud(Gfx *gdl) sprintf(text, "%d:%02d", mins, secs); gdl = text0f153628(gdl); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x -= textwidth / 2; textwidth += x; @@ -320,10 +320,10 @@ Gfx *pacRenderHud(Gfx *gdl) #if VERSION >= VERSION_NTSC_1_0 gdl = text0f153990(gdl, x, y, textwidth, textheight); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0xa0, vi_get_width(), vi_get_height(), 0, 0); #else gdl = text0f153858(gdl, &x, &y, &textwidth, &textheight); - gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, vi_get_width(), vi_get_height(), 0, 0); #endif gdl = text0f153780(gdl); } @@ -331,7 +331,7 @@ Gfx *pacRenderHud(Gfx *gdl) return gdl; } -void pacCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *arg3) +void pac_calculate_player_score(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *arg3) { struct mpchrconfig *loopmpchr; s32 i; @@ -366,12 +366,12 @@ void pacCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score *arg3 = mpchr->numdeaths; } -Gfx *pacRadarExtra(Gfx *gdl) +Gfx *pac_radar_extra(Gfx *gdl) { return gdl; } -bool pacRadarChr(Gfx **gdl, struct prop *prop) +bool pac_radar_chr(Gfx **gdl, struct prop *prop) { struct scenariodata_pac *data = &g_ScenarioData.pac; struct coord dist; @@ -385,10 +385,10 @@ bool pacRadarChr(Gfx **gdl, struct prop *prop) dist.z = prop->pos.z - g_Vars.currentplayer->prop->pos.z; if (g_MpSetup.options & MPOPTION_TEAMSENABLED) { - u32 colour = g_TeamColours[radarGetTeamIndex(prop->chr->team)]; - *gdl = radarDrawDot(*gdl, vprop, &dist, colour, 0, 1); + u32 colour = g_TeamColours[radar_get_team_index(prop->chr->team)]; + *gdl = radar_draw_dot(*gdl, vprop, &dist, colour, 0, 1); } else { - *gdl = radarDrawDot(*gdl, vprop, &dist, 0x00ff0000, 0, 1); + *gdl = radar_draw_dot(*gdl, vprop, &dist, 0x00ff0000, 0, 1); } return true; diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c index 915f09fe5..8741751ad 100644 --- a/src/game/mplayer/setup.c +++ b/src/game/mplayer/setup.c @@ -31,22 +31,22 @@ struct menudialogdef g_MpChangeTeamNameMenuDialog; struct menudialogdef g_MpEditSimulantMenuDialog; struct menudialogdef g_MpSaveSetupNameMenuDialog; -MenuItemHandlerResult menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_drop_out(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - menuPopDialog(); + menu_pop_dialog(); + menu_pop_dialog(); } return 0; } -char *mpGetCurrentPlayerName(struct menuitem *item) +char *mp_get_current_player_name(struct menuitem *item) { return g_PlayerConfigsArray[g_MpPlayerNum].base.name; } -MenuItemHandlerResult menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_teams_label(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) == 0) { @@ -72,7 +72,7 @@ struct menuitem g_MpDropOutMenuItems[] = { 0, L_MPMENU_197, // "Drop Out" 0, - menuhandlerMpDropOut, + menuhandler_mp_drop_out, }, { MENUITEMTYPE_SELECTABLE, @@ -115,19 +115,19 @@ struct mparena g_MpArenas[] = { { 1, 0, L_MPMENU_136 }, // "Random" }; -s32 mpGetNumStages(void) +s32 mp_get_num_stages(void) { return 17; } -s16 mpChooseRandomStage(void) +s16 mp_choose_random_stage(void) { s32 i; s32 numchallengescomplete = 0; s32 index; for (i = 0; i < 16; i++) { - if (challengeIsFeatureUnlocked(g_MpArenas[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_MpArenas[i].requirefeature)) { numchallengescomplete++; } } @@ -135,7 +135,7 @@ s16 mpChooseRandomStage(void) index = random() % numchallengescomplete; for (i = 0; i < 16; i++) { - if (challengeIsFeatureUnlocked(g_MpArenas[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_MpArenas[i].requirefeature)) { if (index == 0) { return g_MpArenas[i].stagenum; } @@ -147,7 +147,7 @@ s16 mpChooseRandomStage(void) return STAGE_MP_SKEDAR; } -MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_arena_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[] = { { 0, L_MPMENU_116 }, // "Dark" @@ -162,7 +162,7 @@ MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, u switch (operation) { case MENUOP_GETOPTIONCOUNT: for (i = 0; i < ARRAYCOUNT(g_MpArenas); i++) { - if (challengeIsFeatureUnlocked(g_MpArenas[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_MpArenas[i].requirefeature)) { count++; } } @@ -171,9 +171,9 @@ MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, u break; case MENUOP_GETOPTIONTEXT: for (i = 0; i < ARRAYCOUNT(g_MpArenas); i++) { - if (challengeIsFeatureUnlocked(g_MpArenas[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_MpArenas[i].requirefeature)) { if (count == data->list.value) { - return (s32)langGet(g_MpArenas[i].name); + return (s32)lang_get(g_MpArenas[i].name); } count++; @@ -182,7 +182,7 @@ MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, u break; case MENUOP_SET: for (i = 0; i < ARRAYCOUNT(g_MpArenas); i++) { - if (challengeIsFeatureUnlocked(g_MpArenas[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_MpArenas[i].requirefeature)) { if (count == data->list.value) { break; } @@ -199,7 +199,7 @@ MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, u data->list.value = count; } - if (challengeIsFeatureUnlocked(g_MpArenas[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_MpArenas[i].requirefeature)) { count++; } } @@ -207,34 +207,34 @@ MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, u case MENUOP_GETOPTGROUPCOUNT: data->list.value = 3; - if (!challengeIsFeatureUnlocked(MPFEATURE_STAGE_COMPLEX) - && !challengeIsFeatureUnlocked(MPFEATURE_STAGE_TEMPLE) - && !challengeIsFeatureUnlocked(MPFEATURE_STAGE_FELICITY)) { + if (!challenge_is_feature_unlocked(MPFEATURE_STAGE_COMPLEX) + && !challenge_is_feature_unlocked(MPFEATURE_STAGE_TEMPLE) + && !challenge_is_feature_unlocked(MPFEATURE_STAGE_FELICITY)) { data->list.value--; } break; case MENUOP_GETOPTGROUPTEXT: count = data->list.value; - if (!challengeIsFeatureUnlocked(MPFEATURE_STAGE_COMPLEX) - && !challengeIsFeatureUnlocked(MPFEATURE_STAGE_TEMPLE) - && !challengeIsFeatureUnlocked(MPFEATURE_STAGE_FELICITY) + if (!challenge_is_feature_unlocked(MPFEATURE_STAGE_COMPLEX) + && !challenge_is_feature_unlocked(MPFEATURE_STAGE_TEMPLE) + && !challenge_is_feature_unlocked(MPFEATURE_STAGE_FELICITY) && count > 0) { count++; } - return (s32)langGet(groups[count].name); + return (s32)lang_get(groups[count].name); case MENUOP_GETGROUPSTARTINDEX: groupindex = data->list.value; - if (!challengeIsFeatureUnlocked(MPFEATURE_STAGE_COMPLEX) - && !challengeIsFeatureUnlocked(MPFEATURE_STAGE_TEMPLE) - && !challengeIsFeatureUnlocked(MPFEATURE_STAGE_FELICITY) + if (!challenge_is_feature_unlocked(MPFEATURE_STAGE_COMPLEX) + && !challenge_is_feature_unlocked(MPFEATURE_STAGE_TEMPLE) + && !challenge_is_feature_unlocked(MPFEATURE_STAGE_FELICITY) && groupindex == 1) { groupindex++; } for (i = 0; i < groups[groupindex].offset; i++) { - if (challengeIsFeatureUnlocked(g_MpArenas[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_MpArenas[i].requirefeature)) { count++; } } @@ -245,7 +245,7 @@ MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, u return 0; } -MenuItemHandlerResult menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_control_style(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { L_OPTIONS_239, // "1.1" @@ -259,61 +259,61 @@ MenuItemHandlerResult menuhandlerMpControlStyle(s32 operation, struct menuitem * data->dropdown.value = 4; break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(labels[data->dropdown.value]); + return (s32) lang_get(labels[data->dropdown.value]); case MENUOP_SET: - optionsSetControlMode(g_MpPlayerNum, data->dropdown.value); + options_set_control_mode(g_MpPlayerNum, data->dropdown.value); break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = optionsGetControlMode(g_MpPlayerNum); + data->dropdown.value = options_get_control_mode(g_MpPlayerNum); break; } return 0; } -MenuItemHandlerResult menuhandlerMpWeaponSlot(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_weapon_slot(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->dropdown.value = mpGetNumWeaponOptions(); + data->dropdown.value = mp_get_num_weapon_options(); break; case MENUOP_GETOPTIONTEXT: - return (s32) mpGetWeaponLabel(data->dropdown.value); + return (s32) mp_get_weapon_label(data->dropdown.value); case MENUOP_SET: - mpSetWeaponSlot(item->param3, data->dropdown.value); + mp_set_weapon_slot(item->param3, data->dropdown.value); break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = mpGetWeaponSlot(item->param3); + data->dropdown.value = mp_get_weapon_slot(item->param3); } return 0; } -char *mpMenuTextWeaponNameForSlot(struct menuitem *item) +char *mp_menu_text_weapon_name_for_slot(struct menuitem *item) { - return mpGetWeaponLabel(mpGetWeaponSlot(item->param)); + return mp_get_weapon_label(mp_get_weapon_slot(item->param)); } -MenuItemHandlerResult menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_weapon_set_dropdown(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: data->dropdown.value = func0f189058(item->param); break; case MENUOP_GETOPTIONTEXT: - return (s32) mpGetWeaponSetName(data->dropdown.value); + return (s32) mp_get_weapon_set_name(data->dropdown.value); case MENUOP_SET: - mpSetWeaponSet(data->dropdown.value); + mp_set_weapon_set(data->dropdown.value); break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = mpGetWeaponSet(); + data->dropdown.value = mp_get_weapon_set(); break; } return 0; } -MenuItemHandlerResult menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_control_checkbox(s32 operation, struct menuitem *item, union handlerdata *data) { s32 val; @@ -350,7 +350,7 @@ MenuItemHandlerResult menuhandlerMpControlCheckbox(s32 operation, struct menuite return 0; } -MenuItemHandlerResult menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_aim_control(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { #if VERSION >= VERSION_PAL_FINAL @@ -367,19 +367,19 @@ MenuItemHandlerResult menuhandlerMpAimControl(s32 operation, struct menuitem *it data->dropdown.value = 2; break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(labels[data->dropdown.value]); + return (s32) lang_get(labels[data->dropdown.value]); case MENUOP_SET: - optionsSetAimControl(g_MpPlayerNum, data->dropdown.value); + options_set_aim_control(g_MpPlayerNum, data->dropdown.value); break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = optionsGetAimControl(g_MpPlayerNum); + data->dropdown.value = options_get_aim_control(g_MpPlayerNum); break; } return 0; } -MenuItemHandlerResult menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_checkbox_option(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -397,7 +397,7 @@ MenuItemHandlerResult menuhandlerMpCheckboxOption(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_teams_enabled(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKDISABLED) { if (g_MpSetup.scenario == MPSCENARIO_CAPTURETHECASE || @@ -408,10 +408,10 @@ MenuItemHandlerResult menuhandlerMpTeamsEnabled(s32 operation, struct menuitem * return false; } - return menuhandlerMpCheckboxOption(operation, item, data); + return menuhandler_mp_checkbox_option(operation, item, data); } -MenuItemHandlerResult menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_display_option_checkbox(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: @@ -431,17 +431,17 @@ MenuItemHandlerResult menuhandlerMpDisplayOptionCheckbox(s32 operation, struct m return 0; } -MenuItemHandlerResult menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_confirm_save_chr(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - filemgrPushSelectLocationDialog(6, FILETYPE_MPPLAYER); + menu_pop_dialog(); + filemgr_push_select_location_dialog(6, FILETYPE_MPPLAYER); } return 0; } -MenuItemHandlerResult menuhandlerMpSetupName(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_setup_name(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; @@ -453,35 +453,35 @@ MenuItemHandlerResult menuhandlerMpSetupName(s32 operation, struct menuitem *ite strcpy(g_MpSetup.name, name); break; case MENUOP_SET: - filemgrPushSelectLocationDialog(7, FILETYPE_MPSETUP); + filemgr_push_select_location_dialog(7, FILETYPE_MPSETUP); break; } return 0; } -MenuItemHandlerResult menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_save_setup_overwrite(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - filemgrSaveOrLoad(&g_MpSetup.fileguid, FILEOP_SAVE_MPSETUP, 0); + menu_pop_dialog(); + filemgr_save_or_load(&g_MpSetup.fileguid, FILEOP_SAVE_MPSETUP, 0); } return 0; } -MenuItemHandlerResult menuhandlerMpSaveSetupCopy(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_save_setup_copy(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - menuPopDialog(); - menuPushDialog(&g_MpSaveSetupNameMenuDialog); + menu_pop_dialog(); + menu_push_dialog(&g_MpSaveSetupNameMenuDialog); } return 0; } #if VERSION >= VERSION_NTSC_1_0 -char *mpMenuTextSetupName(struct menuitem *item) +char *mp_menu_text_setup_name(struct menuitem *item) { return g_MpSetup.name; } @@ -550,11 +550,11 @@ MenuItemHandlerResult func0f179d6c(s32 operation, struct menuitem *item, union h /** * This function is used by both player body selection and bot body selection. */ -MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpbodynum, s32 mpheadnum, bool isplayer) +MenuItemHandlerResult mp_character_body_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpbodynum, s32 mpheadnum, bool isplayer) { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->carousel.value = mpGetNumBodies(); + data->carousel.value = mp_get_num_bodies(); break; case MENUOP_11: g_Menus[g_MpPlayerNum].menumodel.newanimnum = ANIM_01FC; @@ -581,7 +581,7 @@ MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem g_Menus[g_MpPlayerNum].menumodel.zoom = 30; break; case MENUOP_21: - if (!challengeIsFeatureUnlocked(mpGetBodyRequiredFeature(data->carousel.value))) { + if (!challenge_is_feature_unlocked(mp_get_body_required_feature(data->carousel.value))) { return 1; } break; @@ -597,7 +597,7 @@ MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem case MENUOP_CHECKPREFOCUSED: g_Menus[g_MpPlayerNum].menumodel.removingpiece = false; - menuConfigureModel(&g_Menus[g_MpPlayerNum].menumodel, 0, 0, 0, 0, 0, 0, 1, MENUMODELFLAG_HASSCALE); + menu_configure_model(&g_Menus[g_MpPlayerNum].menumodel, 0, 0, 0, 0, 0, 0, 1, MENUMODELFLAG_HASSCALE); g_Menus[g_MpPlayerNum].menumodel.curposx = 8.2f; g_Menus[g_MpPlayerNum].menumodel.newposx = 8.2f; @@ -626,16 +626,16 @@ MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_character_body(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: - if (g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum < mpGetNumHeads()) { + if (g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum < mp_get_num_heads()) { #if VERSION >= VERSION_NTSC_1_0 if (!data->carousel.unk04) #endif { - g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum = mpGetMpheadnumByMpbodynum(data->carousel.value); + g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum = mp_get_mpheadnum_by_mpbodynum(data->carousel.value); } } g_PlayerConfigsArray[g_MpPlayerNum].base.mpbodynum = data->carousel.value; @@ -643,14 +643,14 @@ MenuItemHandlerResult menuhandlerMpCharacterBody(s32 operation, struct menuitem break; case MENUOP_CHECKPREFOCUSED: #if VERSION >= VERSION_NTSC_1_0 - mpCharacterBodyMenuHandler(operation, item, data, + mp_character_body_menu_handler(operation, item, data, g_PlayerConfigsArray[g_MpPlayerNum].base.mpbodynum, g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum, true); #endif return true; } - return mpCharacterBodyMenuHandler(operation, item, data, + return mp_character_body_menu_handler(operation, item, data, g_PlayerConfigsArray[g_MpPlayerNum].base.mpbodynum, g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum, true); } @@ -667,14 +667,14 @@ MenuDialogHandlerResult menudialog0017a174(s32 operation, struct menudialogdef * && g_Menus[g_MpPlayerNum].curdialog->focuseditem != &dialogdef->items[1] && g_Menus[g_MpPlayerNum].curdialog->focuseditem != &dialogdef->items[2]) { union handlerdata data; - menuhandlerMpCharacterBody(MENUOP_11, &dialogdef->items[2], &data); + menuhandler_mp_character_body(MENUOP_11, &dialogdef->items[2], &data); } } return 0; } -MenuItemHandlerResult mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_challenges_list_handler(s32 operation, struct menuitem *item, union handlerdata *data) { Gfx *gdl; struct menuitemrenderdata *renderdata; @@ -689,7 +689,7 @@ MenuItemHandlerResult mpChallengesListHandler(s32 operation, struct menuitem *it switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->list.value = challengeGetAutoFocusedIndex(g_MpPlayerNum); + data->list.value = challenge_get_auto_focused_index(g_MpPlayerNum); break; case MENUOP_RENDER: maxplayers = 4; @@ -706,11 +706,11 @@ MenuItemHandlerResult mpChallengesListHandler(s32 operation, struct menuitem *it gdl = text0f153628(gdl); - name = challengeGetName2(g_MpPlayerNum, challengeindex); + name = challenge_get_name2(g_MpPlayerNum, challengeindex); - gdl = textRenderProjected(gdl, &x, &y, name, + gdl = text_render_projected(gdl, &x, &y, name, g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, - viGetWidth(), viGetHeight(), 0, 0); + vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); @@ -720,20 +720,20 @@ MenuItemHandlerResult mpChallengesListHandler(s32 operation, struct menuitem *it gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); for (i = 0, loopx = 10; i < maxplayers; i++) { #if VERSION >= VERSION_NTSC_1_0 - if (challengeIsCompletedByPlayerWithNumPlayers2(g_MpPlayerNum, challengeindex, i + 1)) { + if (challenge_is_completed_by_player_with_num_players2(g_MpPlayerNum, challengeindex, i + 1)) { gDPSetEnvColorViaWord(gdl++, 0xb2efff00 | (renderdata->colour & 0xff) * 255 / 256); } else { gDPSetEnvColorViaWord(gdl++, 0x30407000 | (renderdata->colour & 0xff) * 255 / 256); } #else - if (challengeIsCompletedByPlayerWithNumPlayers2(g_MpPlayerNum, challengeindex, i + 1)) { + if (challenge_is_completed_by_player_with_num_players2(g_MpPlayerNum, challengeindex, i + 1)) { gDPSetEnvColorViaWord(gdl++, 0xb2efffff); } else { gDPSetEnvColorViaWord(gdl++, 0x304070ff); @@ -769,67 +769,67 @@ MenuItemHandlerResult mpChallengesListHandler(s32 operation, struct menuitem *it const char var7f1b7ea8[] = "Menu99 -> Calling Camera Module Start\n"; const char var7f1b7ed0[] = "Menu99 -> Calling Camera Module Finish\n"; -char *mpMenuTextKills(struct menuitem *item) +char *mp_menu_text_kills(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].kills); return g_StringPointer; } -char *mpMenuTextDeaths(struct menuitem *item) +char *mp_menu_text_deaths(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].deaths); return g_StringPointer; } -char *mpMenuTextGamesPlayed(struct menuitem *item) +char *mp_menu_text_games_played(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].gamesplayed); return g_StringPointer; } -char *mpMenuTextGamesWon(struct menuitem *item) +char *mp_menu_text_games_won(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].gameswon); return g_StringPointer; } -char *mpMenuTextGamesLost(struct menuitem *item) +char *mp_menu_text_games_lost(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].gameslost); return g_StringPointer; } -char *mpMenuTextHeadShots(struct menuitem *item) +char *mp_menu_text_head_shots(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].headshots); return g_StringPointer; } -char *mpMenuTextMedalAccuracy(struct menuitem *item) +char *mp_menu_text_medal_accuracy(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].accuracymedals); return g_StringPointer; } -char *mpMenuTextMedalHeadShot(struct menuitem *item) +char *mp_menu_text_medal_head_shot(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].headshotmedals); return g_StringPointer; } -char *mpMenuTextMedalKillMaster(struct menuitem *item) +char *mp_menu_text_medal_kill_master(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].killmastermedals); return g_StringPointer; } -char *mpMenuTextMedalSurvivor(struct menuitem *item) +char *mp_menu_text_medal_survivor(struct menuitem *item) { \ sprintf(g_StringPointer, "%d\n", g_PlayerConfigsArray[g_MpPlayerNum].survivormedals); return g_StringPointer; } -char *mpMenuTextAmmoUsed(struct menuitem *item) +char *mp_menu_text_ammo_used(struct menuitem *item) { s32 value = g_PlayerConfigsArray[g_MpPlayerNum].ammoused; @@ -849,13 +849,13 @@ char *mpMenuTextAmmoUsed(struct menuitem *item) return g_StringPointer; } -char *mpMenuTextDistance(struct menuitem *item) +char *mp_menu_text_distance(struct menuitem *item) { sprintf(g_StringPointer, "%s%s%.1fkm\n", "", "", g_PlayerConfigsArray[g_MpPlayerNum].distance / 10.0f); return g_StringPointer; } -char *mpMenuTextTime(struct menuitem *item) +char *mp_menu_text_time(struct menuitem *item) { u32 raw = g_PlayerConfigsArray[g_MpPlayerNum].time; s32 secs = raw % 60; @@ -883,7 +883,7 @@ char *mpMenuTextTime(struct menuitem *item) return g_StringPointer; } -char *mpMenuTextAccuracy(struct menuitem *item) +char *mp_menu_text_accuracy(struct menuitem *item) { #if VERSION < VERSION_NTSC_1_0 if (g_PlayerConfigsArray[g_MpPlayerNum].gamesplayed < 8) { @@ -895,7 +895,7 @@ char *mpMenuTextAccuracy(struct menuitem *item) return g_StringPointer; } -void mpFormatDamageValue(char *dst, f32 damage) +void mp_format_damage_value(char *dst, f32 damage) { #if VERSION >= VERSION_NTSC_1_0 if (damage < 1000) { @@ -927,19 +927,19 @@ void mpFormatDamageValue(char *dst, f32 damage) #endif } -char *mpMenuTextPainReceived(struct menuitem *item) +char *mp_menu_text_pain_received(struct menuitem *item) { - mpFormatDamageValue(g_StringPointer, g_PlayerConfigsArray[g_MpPlayerNum].painreceived / 10.0f); + mp_format_damage_value(g_StringPointer, g_PlayerConfigsArray[g_MpPlayerNum].painreceived / 10.0f); return g_StringPointer; } -char *mpMenuTextDamageDealt(struct menuitem *item) +char *mp_menu_text_damage_dealt(struct menuitem *item) { - mpFormatDamageValue(g_StringPointer, g_PlayerConfigsArray[g_MpPlayerNum].damagedealt / 10.0f); + mp_format_damage_value(g_StringPointer, g_PlayerConfigsArray[g_MpPlayerNum].damagedealt / 10.0f); return g_StringPointer; } -MenuItemHandlerResult mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_medal_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_RENDER) { Gfx *gdl = data->type19.gdl; @@ -953,7 +953,7 @@ MenuItemHandlerResult mpMedalMenuHandler(s32 operation, struct menuitem *item, u gDPSetTextureConvert(gdl++, G_TC_FILT); gDPSetTextureFilter(gdl++, G_TF_POINT); - texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -997,14 +997,14 @@ MenuItemHandlerResult mpMedalMenuHandler(s32 operation, struct menuitem *item, u return 0; } -char *mpMenuTitleStatsForPlayerName(struct menudialogdef *dialogdef) +char *mp_menu_title_stats_for_player_name(struct menudialogdef *dialogdef) { // "Stats for %s" - sprintf(g_StringPointer, langGet(L_MPMENU_145), g_PlayerConfigsArray[g_MpPlayerNum].base.name); + sprintf(g_StringPointer, lang_get(L_MPMENU_145), g_PlayerConfigsArray[g_MpPlayerNum].base.name); return g_StringPointer; } -MenuItemHandlerResult menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_username_password(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_PlayerConfigsArray[g_MpPlayerNum].title != MPPLAYERTITLE_PERFECT) { @@ -1046,7 +1046,7 @@ struct menuitem g_MpSavePlayerMenuItems[] = { 0, L_MPMENU_194, // "Yes" 0, - menuhandlerMpConfirmSaveChr, + menuhandler_mp_confirm_save_chr, }, { MENUITEMTYPE_END }, }; @@ -1077,7 +1077,7 @@ struct menuitem g_MpSaveSetupNameMenuItems[] = { 0, 0, 0, - menuhandlerMpSetupName, + menuhandler_mp_setup_name, }, { MENUITEMTYPE_END }, }; @@ -1098,14 +1098,14 @@ struct menuitem g_MpSaveSetupExistsMenuItems[] = { 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SMALLFONT, L_MPWEAPONS_230, // "Name:" - (uintptr_t)&mpMenuTextSetupName, + (uintptr_t)&mp_menu_text_setup_name, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, - (uintptr_t)&filemgrMenuTextDeviceName, + (uintptr_t)&filemgr_menu_text_device_name, 0, NULL, }, @@ -1124,7 +1124,7 @@ struct menuitem g_MpSaveSetupExistsMenuItems[] = { 0, L_MPMENU_185, // "Save Over Original" 0, - menuhandlerMpSaveSetupOverwrite, + menuhandler_mp_save_setup_overwrite, }, { MENUITEMTYPE_SELECTABLE, @@ -1132,7 +1132,7 @@ struct menuitem g_MpSaveSetupExistsMenuItems[] = { 0, L_MPMENU_186, // "Save Copy" 0, - menuhandlerMpSaveSetupCopy, + menuhandler_mp_save_setup_copy, }, { MENUITEMTYPE_SELECTABLE, @@ -1161,7 +1161,7 @@ struct menuitem g_MpWeaponsMenuItems[] = { MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_DROPDOWN_BELOW | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_174, // "Set:" 0, - menuhandlerMpWeaponSetDropdown, + menuhandler_mp_weapon_set_dropdown, }, { MENUITEMTYPE_SEPARATOR, @@ -1185,7 +1185,7 @@ struct menuitem g_MpWeaponsMenuItems[] = { MENUITEMFLAG_DROPDOWN_BELOW | MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_MPWEAPONSLOT, L_MPMENU_176, // "1:" 0, - menuhandlerMpWeaponSlot, + menuhandler_mp_weapon_slot, }, { MENUITEMTYPE_DROPDOWN, @@ -1193,7 +1193,7 @@ struct menuitem g_MpWeaponsMenuItems[] = { MENUITEMFLAG_DROPDOWN_BELOW | MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_MPWEAPONSLOT, L_MPMENU_177, // "2:" 1, - menuhandlerMpWeaponSlot, + menuhandler_mp_weapon_slot, }, { MENUITEMTYPE_DROPDOWN, @@ -1201,7 +1201,7 @@ struct menuitem g_MpWeaponsMenuItems[] = { MENUITEMFLAG_DROPDOWN_BELOW | MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_MPWEAPONSLOT, L_MPMENU_178, // "3:" 2, - menuhandlerMpWeaponSlot, + menuhandler_mp_weapon_slot, }, { MENUITEMTYPE_DROPDOWN, @@ -1209,7 +1209,7 @@ struct menuitem g_MpWeaponsMenuItems[] = { MENUITEMFLAG_DROPDOWN_BELOW | MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_MPWEAPONSLOT, L_MPMENU_179, // "4:" 3, - menuhandlerMpWeaponSlot, + menuhandler_mp_weapon_slot, }, { MENUITEMTYPE_DROPDOWN, @@ -1217,7 +1217,7 @@ struct menuitem g_MpWeaponsMenuItems[] = { MENUITEMFLAG_DROPDOWN_BELOW | MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_MPWEAPONSLOT, L_MPMENU_180, // "5:" 4, - menuhandlerMpWeaponSlot, + menuhandler_mp_weapon_slot, }, { MENUITEMTYPE_DROPDOWN, @@ -1225,7 +1225,7 @@ struct menuitem g_MpWeaponsMenuItems[] = { MENUITEMFLAG_DROPDOWN_BELOW | MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_MPWEAPONSLOT, L_MPMENU_181, // "6:" 5, - menuhandlerMpWeaponSlot, + menuhandler_mp_weapon_slot, }, { MENUITEMTYPE_SEPARATOR, @@ -1262,7 +1262,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_DROPDOWN_BELOW | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_174, // "Set:" 0, - menuhandlerMpWeaponSetDropdown, + menuhandler_mp_weapon_set_dropdown, }, { MENUITEMTYPE_SEPARATOR, @@ -1277,7 +1277,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_176, // "1:" - (uintptr_t)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mp_menu_text_weapon_name_for_slot, NULL, }, { @@ -1285,7 +1285,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 1, MENUITEMFLAG_00000002, L_MPMENU_177, // "2:" - (uintptr_t)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mp_menu_text_weapon_name_for_slot, NULL, }, { @@ -1293,7 +1293,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 2, MENUITEMFLAG_00000002, L_MPMENU_178, // "3:" - (uintptr_t)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mp_menu_text_weapon_name_for_slot, NULL, }, { @@ -1301,7 +1301,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 3, MENUITEMFLAG_00000002, L_MPMENU_179, // "4:" - (uintptr_t)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mp_menu_text_weapon_name_for_slot, NULL, }, { @@ -1309,7 +1309,7 @@ struct menuitem g_MpQuickTeamWeaponsMenuItems[] = { 4, MENUITEMFLAG_00000002, L_MPMENU_180, // "5:" - (uintptr_t)&mpMenuTextWeaponNameForSlot, + (uintptr_t)&mp_menu_text_weapon_name_for_slot, NULL, }, { @@ -1347,7 +1347,7 @@ struct menuitem g_MpPlayerOptionsMenuItems[] = { 0, L_MPMENU_168, // "Highlight Pickups" MPDISPLAYOPTION_HIGHLIGHTPICKUPS, - menuhandlerMpDisplayOptionCheckbox, + menuhandler_mp_display_option_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1355,7 +1355,7 @@ struct menuitem g_MpPlayerOptionsMenuItems[] = { 0, L_MPMENU_169, // "Highlight Players" MPDISPLAYOPTION_HIGHLIGHTPLAYERS, - menuhandlerMpDisplayOptionCheckbox, + menuhandler_mp_display_option_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1363,7 +1363,7 @@ struct menuitem g_MpPlayerOptionsMenuItems[] = { 0, L_MPMENU_170, // "Highlight Teams" MPDISPLAYOPTION_HIGHLIGHTTEAMS, - menuhandlerMpDisplayOptionCheckbox, + menuhandler_mp_display_option_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1371,7 +1371,7 @@ struct menuitem g_MpPlayerOptionsMenuItems[] = { 0, L_MPMENU_171, // "Radar" MPDISPLAYOPTION_RADAR, - menuhandlerMpDisplayOptionCheckbox, + menuhandler_mp_display_option_checkbox, }, { MENUITEMTYPE_SEPARATOR, @@ -1408,7 +1408,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_200, // "Control Style" 0, - menuhandlerMpControlStyle, + menuhandler_mp_control_style, }, { MENUITEMTYPE_CHECKBOX, @@ -1416,7 +1416,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_201, // "Reverse Pitch" OPTION_FORWARDPITCH, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1424,7 +1424,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_202, // "Look Ahead" OPTION_LOOKAHEAD, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1432,7 +1432,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_203, // "Head Roll" OPTION_HEADROLL, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1440,7 +1440,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_204, // "Auto-Aim" OPTION_AUTOAIM, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_DROPDOWN, @@ -1448,7 +1448,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_205, // "Aim Control" 0, - menuhandlerMpAimControl, + menuhandler_mp_aim_control, }, { MENUITEMTYPE_SEPARATOR, @@ -1464,7 +1464,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_206, // "Sight on Screen" OPTION_SIGHTONSCREEN, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1472,7 +1472,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_207, // "Show Target" OPTION_ALWAYSSHOWTARGET, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1480,7 +1480,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_208, // "Zoom Range" OPTION_SHOWZOOMRANGE, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1488,7 +1488,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_209, // "Ammo on Screen" OPTION_AMMOONSCREEN, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1496,7 +1496,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_210, // "Gun Function" OPTION_SHOWGUNFUNCTION, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_CHECKBOX, @@ -1504,7 +1504,7 @@ struct menuitem g_MpControlMenuItems[] = { 0, L_MPMENU_211, // "Paintball" OPTION_PAINTBALL, - menuhandlerMpControlCheckbox, + menuhandler_mp_control_checkbox, }, { MENUITEMTYPE_SEPARATOR, @@ -1541,7 +1541,7 @@ struct menuitem g_MpCompletedChallengesMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x00000078, 0x0000004d, - mpChallengesListHandler, + mp_challenges_list_handler, }, { MENUITEMTYPE_END }, }; @@ -1556,7 +1556,7 @@ struct menudialogdef g_MpCompletedChallengesMenuDialog = { }; #if VERSION >= VERSION_NTSC_1_0 -char *mpMenuTextUsernamePassword(struct menuitem *item) +char *mp_menu_text_username_password(struct menuitem *item) { // Phrases included here to assist people searching the code for them: // EnTROpIcDeCAy @@ -1616,7 +1616,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_146, // "Kills:" - (uintptr_t)&mpMenuTextKills, + (uintptr_t)&mp_menu_text_kills, NULL, }, { @@ -1624,7 +1624,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_147, // "Deaths:" - (uintptr_t)&mpMenuTextDeaths, + (uintptr_t)&mp_menu_text_deaths, NULL, }, { @@ -1632,7 +1632,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_148, // "Accuracy:" - (uintptr_t)&mpMenuTextAccuracy, + (uintptr_t)&mp_menu_text_accuracy, NULL, }, { @@ -1640,7 +1640,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_149, // "Head Shots:" - (uintptr_t)&mpMenuTextHeadShots, + (uintptr_t)&mp_menu_text_head_shots, NULL, }, { @@ -1656,7 +1656,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_150, // "Ammo Used:" - (uintptr_t)&mpMenuTextAmmoUsed, + (uintptr_t)&mp_menu_text_ammo_used, NULL, }, { @@ -1664,7 +1664,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_151, // "Damage Dealt:" - (uintptr_t)&mpMenuTextDamageDealt, + (uintptr_t)&mp_menu_text_damage_dealt, NULL, }, { @@ -1672,7 +1672,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_152, // "Pain Received:" - (uintptr_t)&mpMenuTextPainReceived, + (uintptr_t)&mp_menu_text_pain_received, NULL, }, { @@ -1688,7 +1688,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_153, // "Games Played:" - (uintptr_t)&mpMenuTextGamesPlayed, + (uintptr_t)&mp_menu_text_games_played, NULL, }, { @@ -1696,7 +1696,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_154, // "Games Won:" - (uintptr_t)&mpMenuTextGamesWon, + (uintptr_t)&mp_menu_text_games_won, NULL, }, { @@ -1704,7 +1704,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_155, // "Games Lost:" - (uintptr_t)&mpMenuTextGamesLost, + (uintptr_t)&mp_menu_text_games_lost, NULL, }, { @@ -1712,7 +1712,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_156, // "Time:" - (uintptr_t)&mpMenuTextTime, + (uintptr_t)&mp_menu_text_time, NULL, }, { @@ -1720,7 +1720,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 0, 0, L_MPMENU_157, // "Distance:" - (uintptr_t)&mpMenuTextDistance, + (uintptr_t)&mp_menu_text_distance, NULL, }, { @@ -1744,32 +1744,32 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { 2, MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_159, // "Accuracy:" - (uintptr_t)&mpMenuTextMedalAccuracy, - mpMedalMenuHandler, + (uintptr_t)&mp_menu_text_medal_accuracy, + mp_medal_menu_handler, }, { MENUITEMTYPE_LABEL, 1, MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_160, // "Head Shot:" - (uintptr_t)&mpMenuTextMedalHeadShot, - mpMedalMenuHandler, + (uintptr_t)&mp_menu_text_medal_head_shot, + mp_medal_menu_handler, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_161, // "KillMaster:" - (uintptr_t)&mpMenuTextMedalKillMaster, - mpMedalMenuHandler, + (uintptr_t)&mp_menu_text_medal_kill_master, + mp_medal_menu_handler, }, { MENUITEMTYPE_LABEL, 3, MENUITEMFLAG_LIST_CUSTOMRENDER, L_MPMENU_162, // "Survivor:" - (uintptr_t)&mpMenuTextMedalSurvivor, - mpMedalMenuHandler, + (uintptr_t)&mp_menu_text_medal_survivor, + mp_medal_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -1791,7 +1791,7 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&mpMenuTextPlayerTitle, + (uintptr_t)&mp_menu_text_player_title, 0, NULL, }, @@ -1801,19 +1801,19 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { MENUITEMFLAG_SMALLFONT, L_MPWEAPONS_219, // "USERNAME:" 0, - menuhandlerMpUsernamePassword, + menuhandler_mp_username_password, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, #if VERSION >= VERSION_NTSC_1_0 - (uintptr_t)&mpMenuTextUsernamePassword, + (uintptr_t)&mp_menu_text_username_password, #else 0x51f0, #endif 0, - menuhandlerMpUsernamePassword, + menuhandler_mp_username_password, }, { MENUITEMTYPE_LABEL, @@ -1821,19 +1821,19 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { MENUITEMFLAG_SMALLFONT, L_MPWEAPONS_220, // "PASSWORD:" 0, - menuhandlerMpUsernamePassword, + menuhandler_mp_username_password, }, { MENUITEMTYPE_LABEL, (VERSION >= VERSION_NTSC_1_0 ? 1 : 0), MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT, #if VERSION >= VERSION_NTSC_1_0 - (uintptr_t)&mpMenuTextUsernamePassword, + (uintptr_t)&mp_menu_text_username_password, #else 0x51f1, #endif 0, - menuhandlerMpUsernamePassword, + menuhandler_mp_username_password, }, { MENUITEMTYPE_SEPARATOR, @@ -1856,14 +1856,14 @@ struct menuitem g_MpPlayerStatsMenuItems[] = { struct menudialogdef g_MpPlayerStatsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&mpMenuTitleStatsForPlayerName, + (uintptr_t)&mp_menu_title_stats_for_player_name, g_MpPlayerStatsMenuItems, NULL, MENUDIALOGFLAG_DISABLEITEMSCROLL | MENUDIALOGFLAG_SMOOTHSCROLLABLE, &g_MpCompletedChallengesMenuDialog, }; -MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4) +MenuItemHandlerResult mp_character_head_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4) { f32 diffframe; s32 headnum; @@ -1877,7 +1877,7 @@ MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->carousel.value = mpGetNumHeads2(); + data->carousel.value = mp_get_num_heads2(); break; case MENUOP_11: #if VERSION >= VERSION_PAL_BETA @@ -1889,17 +1889,17 @@ MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem g_Menus[g_MpPlayerNum].menumodel.newroty = diffframe; g_Menus[g_MpPlayerNum].menumodel.curroty = diffframe; - if (mpheadnum < mpGetNumHeads2()) { - headnum = mpGetHeadId(mpheadnum); + if (mpheadnum < mp_get_num_heads2()) { + headnum = mp_get_head_id(mpheadnum); g_Menus[g_MpPlayerNum].menumodel.newparams = MENUMODELPARAMS_SET_FILENUM(g_HeadsAndBodies[headnum].filenum); g_Menus[g_MpPlayerNum].menumodel.isperfecthead = false; } else { - headnum = mpGetBeauHeadId(func0f14a9f8(mpheadnum - mpGetNumHeads2())); + headnum = mp_get_beau_head_id(func0f14a9f8(mpheadnum - mp_get_num_heads2())); g_Menus[g_MpPlayerNum].menumodel.newparams = MENUMODELPARAMS_SET_FILENUM(g_HeadsAndBodies[headnum].filenum); g_Menus[g_MpPlayerNum].menumodel.isperfecthead = true; - g_Menus[g_MpPlayerNum].menumodel.perfectheadnum = mpheadnum - mpGetNumHeads2(); + g_Menus[g_MpPlayerNum].menumodel.perfectheadnum = mpheadnum - mp_get_num_heads2(); } g_Menus[g_MpPlayerNum].menumodel.zoomtimer60 = 0; @@ -1907,7 +1907,7 @@ MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem g_Menus[g_MpPlayerNum].menumodel.zoom = 30; break; case MENUOP_21: - if (!challengeIsFeatureUnlocked(mpGetHeadRequiredFeature(data->carousel.value))) { + if (!challenge_is_feature_unlocked(mp_get_head_required_feature(data->carousel.value))) { return 1; } break; @@ -1920,9 +1920,9 @@ MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem g_Menus[g_MpPlayerNum].menumodel.loaddelay = 3; #endif - mpGetNumHeads2(); + mp_get_num_heads2(); - menuConfigureModel(&g_Menus[g_MpPlayerNum].menumodel, 0, 0, 0, 0, 0, 0, 1, MENUMODELFLAG_HASSCALE); + menu_configure_model(&g_Menus[g_MpPlayerNum].menumodel, 0, 0, 0, 0, 0, 0, 1, MENUMODELFLAG_HASSCALE); g_Menus[g_MpPlayerNum].menumodel.curposx = 0; g_Menus[g_MpPlayerNum].menumodel.curposy = 0; @@ -1943,18 +1943,18 @@ MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_character_head(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum = data->carousel.value; } - return mpCharacterHeadMenuHandler(operation, item, data, g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum, 1); + return mp_character_head_menu_handler(operation, item, data, g_PlayerConfigsArray[g_MpPlayerNum].base.mpheadnum, 1); } -char *mpMenuTextBodyName(struct menuitem *item) +char *mp_menu_text_body_name(struct menuitem *item) { - return mpGetBodyName(g_PlayerConfigsArray[g_MpPlayerNum].base.mpbodynum); + return mp_get_body_name(g_PlayerConfigsArray[g_MpPlayerNum].base.mpbodynum); } void func0f17b8f0(void) @@ -1962,7 +1962,7 @@ void func0f17b8f0(void) func0f0f139c(g_MpCharacterMenuItems, -0.4f); } -MenuItemHandlerResult mpPlayerNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_player_name_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; s32 i; @@ -2004,38 +2004,38 @@ MenuItemHandlerResult mpPlayerNameMenuHandler(s32 operation, struct menuitem *it return 0; } -MenuItemHandlerResult mpLoadSettingsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_load_settings_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->list.value = mpGetNumUnlockedPresets(); + data->list.value = mp_get_num_unlocked_presets(); if (g_FileLists[1] != NULL) { data->list.value += g_FileLists[1]->numfiles; } break; case MENUOP_GETOPTIONTEXT: - if (data->list.value < mpGetNumUnlockedPresets()) { - return (s32)mpGetPresetNameBySlot(data->list.value); + if (data->list.value < mp_get_num_unlocked_presets()) { + return (s32)mp_get_preset_name_by_slot(data->list.value); } if (g_FileLists[1] != NULL) { - func0f0d564c(g_FileLists[1]->files[data->list.value - mpGetNumUnlockedPresets()].name, g_StringPointer, false); + func0f0d564c(g_FileLists[1]->files[data->list.value - mp_get_num_unlocked_presets()].name, g_StringPointer, false); return (s32)g_StringPointer; } break; case MENUOP_SET: - mpCloseDialogsForNewSetup(); + mp_close_dialogs_for_new_setup(); - if (data->list.value < mpGetNumUnlockedPresets()) { + if (data->list.value < mp_get_num_unlocked_presets()) { mp0f18dec4(data->list.value); } else if (g_FileLists[1] != NULL) { - struct filelistfile *file = &g_FileLists[1]->files[data->list.value - mpGetNumUnlockedPresets()]; + struct filelistfile *file = &g_FileLists[1]->files[data->list.value - mp_get_num_unlocked_presets()]; struct fileguid guid; guid.fileid = file->fileid; guid.deviceserial = file->deviceserial; - filemgrSaveOrLoad(&guid, FILEOP_LOAD_MPSETUP, 0); + filemgr_save_or_load(&guid, FILEOP_LOAD_MPSETUP, 0); } if (item->param == 1) { @@ -2058,28 +2058,28 @@ MenuItemHandlerResult mpLoadSettingsMenuHandler(s32 operation, struct menuitem * break; case MENUOP_GETOPTGROUPTEXT: if (data->list.value == 0) { - return (s32)langGet(L_MPMENU_141); // "Presets" + return (s32)lang_get(L_MPMENU_141); // "Presets" } if (g_FileLists[1] != NULL) { - return (s32)filemgrGetDeviceNameOrStartIndex(1, operation, data->list.value - 1); + return (s32)filemgr_get_device_name_or_start_index(1, operation, data->list.value - 1); } break; case MENUOP_GETGROUPSTARTINDEX: if (data->list.value == 0) { data->list.groupstartindex = 0; } else { - data->list.groupstartindex = mpGetNumUnlockedPresets(); + data->list.groupstartindex = mp_get_num_unlocked_presets(); if (g_FileLists[1] != NULL) { - data->list.groupstartindex += filemgrGetDeviceNameOrStartIndex(1, operation, data->list.value - 1); + data->list.groupstartindex += filemgr_get_device_name_or_start_index(1, operation, data->list.value - 1); } } break; case MENUOP_LISTITEMFOCUS: - if (data->list.value < mpGetNumUnlockedPresets()) { + if (data->list.value < mp_get_num_unlocked_presets()) { g_Menus[g_MpPlayerNum].mpsetup.slotindex = 0xffff; } else { - g_Menus[g_MpPlayerNum].mpsetup.slotindex = data->list.value - mpGetNumUnlockedPresets(); + g_Menus[g_MpPlayerNum].mpsetup.slotindex = data->list.value - mp_get_num_unlocked_presets(); } break; } @@ -2087,7 +2087,7 @@ MenuItemHandlerResult mpLoadSettingsMenuHandler(s32 operation, struct menuitem * return 0; } -char *mpMenuTextMpconfigMarquee(struct menuitem *item) +char *mp_menu_text_mpconfig_marquee(struct menuitem *item) { char filename[20]; u16 numsims; @@ -2103,7 +2103,7 @@ char *mpMenuTextMpconfigMarquee(struct menuitem *item) arenanum = 0; #endif - mpsetupfileGetOverview(g_FileLists[1]->files[g_Menus[g_MpPlayerNum].mpsetup.slotindex].name, + mpsetupfile_get_overview(g_FileLists[1]->files[g_Menus[g_MpPlayerNum].mpsetup.slotindex].name, filename, &numsims, &stagenum, &scenarionum); for (i = 0; i < ARRAYCOUNT(g_MpArenas); i++) { @@ -2115,20 +2115,20 @@ char *mpMenuTextMpconfigMarquee(struct menuitem *item) #if VERSION >= VERSION_NTSC_1_0 if (scenarionum <= 5 && arenanum != -1 && numsims >= 0 && filename[0] != '\0' && numsims <= MAX_BOTS) { // "%s: Scenario: %s Arena: %s Simulants: %d" - sprintf(g_StringPointer, langGet(L_MPMENU_140), + sprintf(g_StringPointer, lang_get(L_MPMENU_140), filename, - langGet(g_MpScenarioOverviews[scenarionum].name), - langGet(g_MpArenas[arenanum].name), + lang_get(g_MpScenarioOverviews[scenarionum].name), + lang_get(g_MpArenas[arenanum].name), numsims); } else { return ""; } #else // "%s: Scenario: %s Arena: %s Simulants: %d" - sprintf(g_StringPointer, langGet(L_MPMENU_140), + sprintf(g_StringPointer, lang_get(L_MPMENU_140), filename, - langGet(g_MpScenarioOverviews[scenarionum].name), - langGet(g_MpArenas[arenanum].name), + lang_get(g_MpScenarioOverviews[scenarionum].name), + lang_get(g_MpArenas[arenanum].name), numsims); #endif @@ -2138,7 +2138,7 @@ char *mpMenuTextMpconfigMarquee(struct menuitem *item) return ""; } -MenuItemHandlerResult mpLoadPlayerMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_load_player_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 i; struct fileguid guid; @@ -2154,7 +2154,7 @@ MenuItemHandlerResult mpLoadPlayerMenuHandler(s32 operation, struct menuitem *it data->list.value = g_FileLists[0]->numfiles; break; case MENUOP_GETOPTIONTEXT: - filemgrGetSelectName(g_StringPointer, &g_FileLists[0]->files[data->list.value], FILETYPE_MPPLAYER); + filemgr_get_select_name(g_StringPointer, &g_FileLists[0]->files[data->list.value], FILETYPE_MPPLAYER); return (s32)g_StringPointer; case MENUOP_SET: file = &g_FileLists[0]->files[data->list.value]; @@ -2164,7 +2164,7 @@ MenuItemHandlerResult mpLoadPlayerMenuHandler(s32 operation, struct menuitem *it if (file->fileid == g_PlayerConfigsArray[i].fileguid.fileid && file->deviceserial == g_PlayerConfigsArray[i].fileguid.deviceserial) { if ((g_MpSetup.chrslots & (1 << i)) == 0) { - mpPlayerSetDefaults(i, true); + mp_player_set_defaults(i, true); } else { available = false; } @@ -2175,11 +2175,11 @@ MenuItemHandlerResult mpLoadPlayerMenuHandler(s32 operation, struct menuitem *it guid.fileid = file->fileid; guid.deviceserial = file->deviceserial; - menuPopDialog(); + menu_pop_dialog(); - filemgrSaveOrLoad(&guid, FILEOP_LOAD_MPPLAYER, g_MpPlayerNum); + filemgr_save_or_load(&guid, FILEOP_LOAD_MPPLAYER, g_MpPlayerNum); } else { - filemgrPushErrorDialog(FILEERROR_ALREADYLOADED); + filemgr_push_error_dialog(FILEERROR_ALREADYLOADED); } break; case MENUOP_GETSELECTEDINDEX: @@ -2189,16 +2189,16 @@ MenuItemHandlerResult mpLoadPlayerMenuHandler(s32 operation, struct menuitem *it data->list.value = g_FileLists[0]->numdevices; break; case MENUOP_GETOPTGROUPTEXT: - return filemgrGetDeviceNameOrStartIndex(0, operation, data->list.value); + return filemgr_get_device_name_or_start_index(0, operation, data->list.value); case MENUOP_GETGROUPSTARTINDEX: - data->list.groupstartindex = filemgrGetDeviceNameOrStartIndex(0, operation, data->list.value); + data->list.groupstartindex = filemgr_get_device_name_or_start_index(0, operation, data->list.value); return 0; } return 0; } -MenuItemHandlerResult menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_time_limit_slider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -2209,15 +2209,15 @@ MenuItemHandlerResult menuhandlerMpTimeLimitSlider(s32 operation, struct menuite break; case MENUOP_GETSLIDERLABEL: if (data->slider.value == 60) { - sprintf(data->slider.label, langGet(L_MPMENU_112)); // "No Limit" + sprintf(data->slider.label, lang_get(L_MPMENU_112)); // "No Limit" } else { - sprintf(data->slider.label, langGet(L_MPMENU_114), data->slider.value + 1); // "%d Min" + sprintf(data->slider.label, lang_get(L_MPMENU_114), data->slider.value + 1); // "%d Min" } } return 0; } -MenuItemHandlerResult menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_score_limit_slider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: @@ -2228,36 +2228,36 @@ MenuItemHandlerResult menuhandlerMpScoreLimitSlider(s32 operation, struct menuit break; case MENUOP_GETSLIDERLABEL: if (data->slider.value == 100) { - sprintf(data->slider.label, langGet(L_MPMENU_112)); // "No Limit" + sprintf(data->slider.label, lang_get(L_MPMENU_112)); // "No Limit" } else { - sprintf(data->slider.label, langGet(L_MPMENU_113), data->slider.value + 1); // "%d" + sprintf(data->slider.label, lang_get(L_MPMENU_113), data->slider.value + 1); // "%d" } } return 0; } -MenuItemHandlerResult menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_team_score_limit_slider(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETSLIDER: - data->slider.value = mpCalculateTeamScoreLimit(); + data->slider.value = mp_calculate_team_score_limit(); break; case MENUOP_SET: g_MpSetup.teamscorelimit = data->slider.value; break; case MENUOP_GETSLIDERLABEL: if (data->slider.value == 400) { - sprintf(data->slider.label, langGet(L_MPMENU_112)); // "No Limit" + sprintf(data->slider.label, lang_get(L_MPMENU_112)); // "No Limit" } else { - sprintf(data->slider.label, langGet(L_MPMENU_113), data->slider.value + 1); // "%d" + sprintf(data->slider.label, lang_get(L_MPMENU_113), data->slider.value + 1); // "%d" } } return 0; } -MenuItemHandlerResult menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_restore_score_defaults(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f187fec(); @@ -2266,7 +2266,7 @@ MenuItemHandlerResult menuhandlerMpRestoreScoreDefaults(s32 operation, struct me return 0; } -MenuItemHandlerResult menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_handicap_player(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: @@ -2281,14 +2281,14 @@ MenuItemHandlerResult menuhandlerMpHandicapPlayer(s32 operation, struct menuitem g_PlayerConfigsArray[item->param].handicap = (u16)data->slider.value; break; case MENUOP_GETSLIDERLABEL: - sprintf(data->slider.label, "%s%s%.00f%%\n", "", "", mpHandicapToDamageScale(g_PlayerConfigsArray[item->param].handicap) * 100); + sprintf(data->slider.label, "%s%s%.00f%%\n", "", "", mp_handicap_to_damage_scale(g_PlayerConfigsArray[item->param].handicap) * 100); break; } return 0; } -char *mpMenuTextHandicapPlayerName(struct menuitem *item) +char *mp_menu_text_handicap_player_name(struct menuitem *item) { if (g_MpSetup.chrslots & (1 << item->param)) { return g_PlayerConfigsArray[item->param].base.name; @@ -2297,7 +2297,7 @@ char *mpMenuTextHandicapPlayerName(struct menuitem *item) return ""; } -MenuItemHandlerResult menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_restore_handicap_defaults(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -2310,22 +2310,22 @@ MenuItemHandlerResult menuhandlerMpRestoreHandicapDefaults(s32 operation, struct return 0; } -MenuDialogHandlerResult menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_mp_ready(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { if (g_PlayerConfigsArray[g_MpPlayerNum].fileguid.fileid && g_PlayerConfigsArray[g_MpPlayerNum].fileguid.deviceserial) { - filemgrSaveOrLoad(&g_PlayerConfigsArray[g_MpPlayerNum].fileguid, FILEOP_SAVE_MPPLAYER, g_MpPlayerNum); + filemgr_save_or_load(&g_PlayerConfigsArray[g_MpPlayerNum].fileguid, FILEOP_SAVE_MPPLAYER, g_MpPlayerNum); } } return false; } -MenuDialogHandlerResult menudialogMpSimulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_mp_simulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if ((u8)g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.name[0] == '\0') { - menuPopDialog(); + menu_pop_dialog(); } } @@ -2337,7 +2337,7 @@ struct menuitem g_MpCharacterMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_SELECTABLE_CENTRE | MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_DARKERBG, - (uintptr_t)&mpMenuTextBodyName, + (uintptr_t)&mp_menu_text_body_name, 0, NULL, }, @@ -2347,7 +2347,7 @@ struct menuitem g_MpCharacterMenuItems[] = { 0, 0, 0x00000022, - menuhandlerMpCharacterHead, + menuhandler_mp_character_head, }, { MENUITEMTYPE_CAROUSEL, @@ -2355,7 +2355,7 @@ struct menuitem g_MpCharacterMenuItems[] = { 0, 0, 0x0000001b, - menuhandlerMpCharacterBody, + menuhandler_mp_character_body, }, { MENUITEMTYPE_END }, }; @@ -2376,7 +2376,7 @@ struct menuitem g_MpPlayerNameMenuItems[] = { 0, 0, 0, - mpPlayerNameMenuHandler, + mp_player_name_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -2397,13 +2397,13 @@ struct menuitem g_MpLoadSettingsMenuItems[] = { 0, 0x00000078, 0x00000042, - mpLoadSettingsMenuHandler, + mp_load_settings_menu_handler, }, { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&mpMenuTextMpconfigMarquee, + (uintptr_t)&mp_menu_text_mpconfig_marquee, 0, NULL, }, @@ -2426,13 +2426,13 @@ struct menuitem g_MpLoadPresetMenuItems[] = { 0, 0x00000078, 0x00000042, - mpLoadSettingsMenuHandler, + mp_load_settings_menu_handler, }, { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&mpMenuTextMpconfigMarquee, + (uintptr_t)&mp_menu_text_mpconfig_marquee, 0, NULL, }, @@ -2455,7 +2455,7 @@ struct menuitem g_MpLoadPlayerMenuItems[] = { 0, 0x0000007e, 0x00000042, - mpLoadPlayerMenuHandler, + mp_load_player_menu_handler, }, { MENUITEMTYPE_LABEL, @@ -2484,7 +2484,7 @@ struct menuitem g_MpArenaMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, 0x00000078, 0x0000004d, - mpArenaMenuHandler, + mp_arena_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -2505,7 +2505,7 @@ struct menuitem g_MpLimitsMenuItems[] = { MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_108, // "Time" 0x0000003c, - menuhandlerMpTimeLimitSlider, + menuhandler_mp_time_limit_slider, }, { MENUITEMTYPE_SLIDER, @@ -2513,7 +2513,7 @@ struct menuitem g_MpLimitsMenuItems[] = { MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_109, // "Score" 0x00000064, - menuhandlerMpScoreLimitSlider, + menuhandler_mp_score_limit_slider, }, { MENUITEMTYPE_SLIDER, @@ -2521,7 +2521,7 @@ struct menuitem g_MpLimitsMenuItems[] = { MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, L_MISC_447, // "Team Score" 0x00000190, - menuhandlerMpTeamScoreLimitSlider, + menuhandler_mp_team_score_limit_slider, }, { MENUITEMTYPE_SEPARATOR, @@ -2537,7 +2537,7 @@ struct menuitem g_MpLimitsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LOCKABLEMAJOR, L_MPMENU_110, // "Restore Defaults" 0, - menuhandlerMpRestoreScoreDefaults, + menuhandler_mp_restore_score_defaults, }, { MENUITEMTYPE_SELECTABLE, @@ -2564,33 +2564,33 @@ struct menuitem g_MpHandicapsMenuItems[] = { MENUITEMTYPE_SLIDER, 0, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextHandicapPlayerName, + (uintptr_t)&mp_menu_text_handicap_player_name, 0x000000ff, - menuhandlerMpHandicapPlayer, + menuhandler_mp_handicap_player, }, { MENUITEMTYPE_SLIDER, 1, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextHandicapPlayerName, + (uintptr_t)&mp_menu_text_handicap_player_name, 0x000000ff, - menuhandlerMpHandicapPlayer, + menuhandler_mp_handicap_player, }, { MENUITEMTYPE_SLIDER, 2, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextHandicapPlayerName, + (uintptr_t)&mp_menu_text_handicap_player_name, 0x000000ff, - menuhandlerMpHandicapPlayer, + menuhandler_mp_handicap_player, }, { MENUITEMTYPE_SLIDER, 3, MENUITEMFLAG_LESSLEFTPADDING | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextHandicapPlayerName, + (uintptr_t)&mp_menu_text_handicap_player_name, 0x000000ff, - menuhandlerMpHandicapPlayer, + menuhandler_mp_handicap_player, }, { MENUITEMTYPE_SEPARATOR, @@ -2606,7 +2606,7 @@ struct menuitem g_MpHandicapsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LOCKABLEMAJOR, L_MPMENU_110, // "Restore Defaults" 0, - menuhandlerMpRestoreHandicapDefaults, + menuhandler_mp_restore_handicap_defaults, }, { MENUITEMTYPE_SELECTABLE, @@ -2644,12 +2644,12 @@ struct menudialogdef g_MpReadyMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU_105, // "Ready!" g_MpReadyMenuItems, - menudialogMpReady, + menudialog_mp_ready, MENUDIALOGFLAG_CLOSEONSELECT, NULL, }; -MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_add_change_simulant_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 i; s32 count = 0; @@ -2665,7 +2665,7 @@ MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menui switch (operation) { case MENUOP_GETOPTIONCOUNT: for (i = 0; i < ARRAYCOUNT(g_BotProfiles); i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { count++; } } @@ -2674,9 +2674,9 @@ MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menui break; case MENUOP_GETOPTIONTEXT: for (i = 0; i < ARRAYCOUNT(g_BotProfiles); i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { if (count == data->list.value) { - return (s32)langGet(g_BotProfiles[i].name); + return (s32)lang_get(g_BotProfiles[i].name); } count++; @@ -2688,14 +2688,14 @@ MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menui creating = false; if (botnum < 0) { - botnum = mpGetSlotForNewBot(); + botnum = mp_get_slot_for_new_bot(); creating = 1; } else if ((g_MpSetup.chrslots & (1 << (botnum + 4))) == 0) { creating = 1; } for (i = 0; i < ARRAYCOUNT(g_BotProfiles); i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { if (count == data->list.value) { break; } @@ -2705,21 +2705,21 @@ MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menui } if (creating) { - mpCreateBotFromProfile(botnum, i); + mp_create_bot_from_profile(botnum, i); } else { g_BotConfigsArray[botnum].type = g_BotProfiles[i].type; if (g_BotConfigsArray[botnum].type == BOTTYPE_GENERAL) { - mpSetBotDifficulty(botnum, g_BotProfiles[i].difficulty); + mp_set_bot_difficulty(botnum, g_BotProfiles[i].difficulty); } } - mpGenerateBotNames(); + mp_generate_bot_names(); g_Menus[g_MpPlayerNum].mpsetup.slotcount = data->list.value; break; case MENUOP_LISTITEMFOCUS: for (i = 0; i < ARRAYCOUNT(g_BotProfiles); i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { if (count == data->list.value) { break; } @@ -2737,10 +2737,10 @@ MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menui data->list.value = 2; break; case MENUOP_GETOPTGROUPTEXT: - return (s32)langGet(groups[data->list.value].name); + return (s32)lang_get(groups[data->list.value].name); case MENUOP_GETGROUPSTARTINDEX: for (i = 0; i < groups[data->list.value].offset; i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { count++; } } @@ -2752,17 +2752,17 @@ MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menui return 0; } -char *mpMenuTextSimulantDescription(struct menuitem *item) +char *mp_menu_text_simulant_description(struct menuitem *item) { - return langGet(L_MISC_106 + g_Menus[g_MpPlayerNum].mpsetup.unke24); + return lang_get(L_MISC_106 + g_Menus[g_MpPlayerNum].mpsetup.unke24); } -MenuItemHandlerResult menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_simulant_head(s32 operation, struct menuitem *item, union handlerdata *data) { s32 start = 0; if (item->param2 == 1) { - start = mpGetNumHeads(); + start = mp_get_num_heads(); } /** @@ -2782,16 +2782,16 @@ MenuItemHandlerResult menuhandlerMpSimulantHead(s32 operation, struct menuitem * break; } - return mpCharacterHeadMenuHandler(operation, item, data, g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.mpheadnum, 0); + return mp_character_head_menu_handler(operation, item, data, g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.mpheadnum, 0); } -MenuItemHandlerResult menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_simulant_body(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.mpbodynum = data->carousel.value; } - return mpCharacterBodyMenuHandler(operation, item, data, + return mp_character_body_menu_handler(operation, item, data, g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.mpbodynum, g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.mpheadnum, false); @@ -2805,22 +2805,22 @@ MenuDialogHandlerResult menudialog0017ccfc(s32 operation, struct menudialogdef * && g_Menus[g_MpPlayerNum].curdialog->focuseditem != &dialogdef->items[0] && g_Menus[g_MpPlayerNum].curdialog->focuseditem != &dialogdef->items[1]) { union handlerdata data; - menuhandlerMpCharacterBody(MENUOP_11, &dialogdef->items[1], &data); + menuhandler_mp_character_body(MENUOP_11, &dialogdef->items[1], &data); } } - return menudialogMpSimulant(operation, dialogdef, data); + return menudialog_mp_simulant(operation, dialogdef, data); } -MenuItemHandlerResult mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_bot_difficulty_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 count = 0; s32 i; switch (operation) { case MENUOP_SET: - mpSetBotDifficulty(g_Menus[g_MpPlayerNum].mpsetup.slotindex, data->dropdown.value); - mpGenerateBotNames(); + mp_set_bot_difficulty(g_Menus[g_MpPlayerNum].mpsetup.slotindex, data->dropdown.value); + mp_generate_bot_names(); break; case MENUOP_GETSELECTEDINDEX: if (g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].difficulty >= 0 @@ -2832,7 +2832,7 @@ MenuItemHandlerResult mpBotDifficultyMenuHandler(s32 operation, struct menuitem break; case MENUOP_GETOPTIONCOUNT: for (i = 0; i < BOTDIFF_DISABLED; i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { count++; } } @@ -2841,10 +2841,10 @@ MenuItemHandlerResult mpBotDifficultyMenuHandler(s32 operation, struct menuitem break; case MENUOP_GETOPTIONTEXT: for (i = 0; i < BOTDIFF_DISABLED; i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { if (count == data->dropdown.value) { // "Meat", "Easy", "Normal" etc - return (s32) langGet(L_MISC_082 + i); + return (s32) lang_get(L_MISC_082 + i); } count++; @@ -2857,66 +2857,66 @@ MenuItemHandlerResult mpBotDifficultyMenuHandler(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_delete_simulant(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - mpRemoveSimulant(g_Menus[g_MpPlayerNum].mpsetup.slotindex); - menuPopDialog(); + mp_remove_simulant(g_Menus[g_MpPlayerNum].mpsetup.slotindex); + menu_pop_dialog(); } return 0; } -char *mpMenuTitleEditSimulant(struct menudialogdef *dialogdef) +char *mp_menu_title_edit_simulant(struct menudialogdef *dialogdef) { sprintf(g_StringPointer, "%s", &g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].base.name); return g_StringPointer; } -MenuItemHandlerResult menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_change_simulant_type(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; s32 count = 0; - s32 profilenum = mpFindBotProfile( + s32 profilenum = mp_find_bot_profile( g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].type, g_BotConfigsArray[g_Menus[g_MpPlayerNum].mpsetup.slotindex].difficulty); for (i = 0; i < profilenum; i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { count++; } } g_Menus[g_MpPlayerNum].mpsetup.slotcount = count; - menuPushDialog(&g_MpChangeSimulantMenuDialog); + menu_push_dialog(&g_MpChangeSimulantMenuDialog); } return 0; } -MenuItemHandlerResult menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_clear_all_simulants(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; for (i = 0; i < MAX_BOTS; i++) { - mpRemoveSimulant(i); + mp_remove_simulant(i); } } return 0; } -MenuItemHandlerResult menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_add_simulant(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: g_Menus[g_MpPlayerNum].mpsetup.slotindex = -1; - menuPushDialog(&g_MpAddSimulantMenuDialog); + menu_push_dialog(&g_MpAddSimulantMenuDialog); break; case MENUOP_CHECKDISABLED: - if (mpHasUnusedBotSlots() == 0) { + if (mp_has_unused_bot_slots() == 0) { return true; } } @@ -2924,27 +2924,27 @@ MenuItemHandlerResult menuhandlerMpAddSimulant(s32 operation, struct menuitem *i return 0; } -MenuItemHandlerResult menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_simulant_slot(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_SET: g_Menus[g_MpPlayerNum].mpsetup.slotindex = item->param; if ((g_MpSetup.chrslots & (1 << (item->param + 4))) == 0) { - menuPushDialog(&g_MpAddSimulantMenuDialog); + menu_push_dialog(&g_MpAddSimulantMenuDialog); } else if (IS4MB()) { - menuPushDialog(&g_MpEditSimulant4MbMenuDialog); + menu_push_dialog(&g_MpEditSimulant4MbMenuDialog); } else { - menuPushDialog(&g_MpEditSimulantMenuDialog); + menu_push_dialog(&g_MpEditSimulantMenuDialog); } break; case MENUOP_CHECKHIDDEN: - if (item->param >= 4 && !challengeIsFeatureUnlocked(MPFEATURE_8BOTS)) { + if (item->param >= 4 && !challenge_is_feature_unlocked(MPFEATURE_8BOTS)) { return true; } break; case MENUOP_CHECKDISABLED: - if (!mpIsSimSlotEnabled(item->param)) { + if (!mp_is_sim_slot_enabled(item->param)) { return true; } } @@ -2952,7 +2952,7 @@ MenuItemHandlerResult menuhandlerMpSimulantSlot(s32 operation, struct menuitem * return 0; } -char *mpMenuTextSimulantName(struct menuitem *item) +char *mp_menu_text_simulant_name(struct menuitem *item) { s32 index = item->param; @@ -2976,7 +2976,7 @@ char *func0f17d3dc(struct menuitem *item) return g_StringPointer; } -MenuDialogHandlerResult menudialogMpSimulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_mp_simulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Menus[g_MpPlayerNum].mpsetup.slotcount = 0; @@ -2992,13 +2992,13 @@ struct menuitem g_MpAddChangeSimulantMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, 0x00000078, 0x00000042, - mpAddChangeSimulantMenuHandler, + mp_add_change_simulant_menu_handler, }, { MENUITEMTYPE_MARQUEE, 0, MENUITEMFLAG_SMALLFONT | MENUITEMFLAG_MARQUEE_FADEBOTHSIDES, - (uintptr_t)&mpMenuTextSimulantDescription, + (uintptr_t)&mp_menu_text_simulant_description, 0, NULL, }, @@ -3018,7 +3018,7 @@ struct menudialogdef g_MpChangeSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_102, // "Change Simulant" g_MpAddChangeSimulantMenuItems, - menudialogMpSimulant, + menudialog_mp_simulant, MENUDIALOGFLAG_CLOSEONSELECT | MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -3030,7 +3030,7 @@ struct menuitem g_MpSimulantCharacterMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, 0, 0x00000025, - menuhandlerMpSimulantHead, + menuhandler_mp_simulant_head, }, { MENUITEMTYPE_CAROUSEL, @@ -3038,7 +3038,7 @@ struct menuitem g_MpSimulantCharacterMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, 0, 0x0000001b, - menuhandlerMpSimulantBody, + menuhandler_mp_simulant_body, }, { MENUITEMTYPE_END }, }; @@ -3059,7 +3059,7 @@ struct menuitem g_MpEditSimulantMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_095, // "Difficulty:" 0, - mpBotDifficultyMenuHandler, + mp_bot_difficulty_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -3067,7 +3067,7 @@ struct menuitem g_MpEditSimulantMenuItems[] = { 0, L_MPMENU_096, // "Change Type..." 0, - menuhandlerMpChangeSimulantType, + menuhandler_mp_change_simulant_type, }, { MENUITEMTYPE_SELECTABLE, @@ -3091,7 +3091,7 @@ struct menuitem g_MpEditSimulantMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_098, // "Delete Simulant" 0, - menuhandlerMpDeleteSimulant, + menuhandler_mp_delete_simulant, }, { MENUITEMTYPE_SELECTABLE, @@ -3106,9 +3106,9 @@ struct menuitem g_MpEditSimulantMenuItems[] = { struct menudialogdef g_MpEditSimulantMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&mpMenuTitleEditSimulant, + (uintptr_t)&mp_menu_title_edit_simulant, g_MpEditSimulantMenuItems, - menudialogMpSimulant, + menudialog_mp_simulant, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -3120,7 +3120,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_084, // "Add Simulant..." 0, - menuhandlerMpAddSimulant, + menuhandler_mp_add_simulant, }, { MENUITEMTYPE_SEPARATOR, @@ -3135,64 +3135,64 @@ struct menuitem g_MpSimulantsMenuItems[] = { 0, 0, L_MPMENU_085, // "1:" - (uintptr_t)&mpMenuTextSimulantName, - menuhandlerMpSimulantSlot, + (uintptr_t)&mp_menu_text_simulant_name, + menuhandler_mp_simulant_slot, }, { MENUITEMTYPE_SELECTABLE, 1, 0, L_MPMENU_086, // "2:" - (uintptr_t)&mpMenuTextSimulantName, - menuhandlerMpSimulantSlot, + (uintptr_t)&mp_menu_text_simulant_name, + menuhandler_mp_simulant_slot, }, { MENUITEMTYPE_SELECTABLE, 2, 0, L_MPMENU_087, // "3:" - (uintptr_t)&mpMenuTextSimulantName, - menuhandlerMpSimulantSlot, + (uintptr_t)&mp_menu_text_simulant_name, + menuhandler_mp_simulant_slot, }, { MENUITEMTYPE_SELECTABLE, 3, 0, L_MPMENU_088, // "4:" - (uintptr_t)&mpMenuTextSimulantName, - menuhandlerMpSimulantSlot, + (uintptr_t)&mp_menu_text_simulant_name, + menuhandler_mp_simulant_slot, }, { MENUITEMTYPE_SELECTABLE, 4, 0, L_MPMENU_089, // "5:" - (uintptr_t)&mpMenuTextSimulantName, - menuhandlerMpSimulantSlot, + (uintptr_t)&mp_menu_text_simulant_name, + menuhandler_mp_simulant_slot, }, { MENUITEMTYPE_SELECTABLE, 5, 0, L_MPMENU_090, // "6:" - (uintptr_t)&mpMenuTextSimulantName, - menuhandlerMpSimulantSlot, + (uintptr_t)&mp_menu_text_simulant_name, + menuhandler_mp_simulant_slot, }, { MENUITEMTYPE_SELECTABLE, 6, 0, L_MPMENU_091, // "7:" - (uintptr_t)&mpMenuTextSimulantName, - menuhandlerMpSimulantSlot, + (uintptr_t)&mp_menu_text_simulant_name, + menuhandler_mp_simulant_slot, }, { MENUITEMTYPE_SELECTABLE, 7, 0, L_MPMENU_092, // "8:" - (uintptr_t)&mpMenuTextSimulantName, - menuhandlerMpSimulantSlot, + (uintptr_t)&mp_menu_text_simulant_name, + menuhandler_mp_simulant_slot, }, { MENUITEMTYPE_SEPARATOR, @@ -3208,7 +3208,7 @@ struct menuitem g_MpSimulantsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_093, // "Clear All" 0, - menuhandlerMpClearAllSimulants, + menuhandler_mp_clear_all_simulants, }, { MENUITEMTYPE_SELECTABLE, @@ -3225,15 +3225,15 @@ struct menudialogdef g_MpSimulantsMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_083, // "Simulants" g_MpSimulantsMenuItems, - menudialogMpSimulants, + menudialog_mp_simulants, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; -MenuItemHandlerResult menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams) +MenuItemHandlerResult menuhandler_mp_n_teams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams) { if (operation == MENUOP_SET) { - s32 numchrs = mpGetNumChrs(); + s32 numchrs = mp_get_num_chrs(); s32 array[] = {0, 0, 0, 0}; s32 somevalue = (numchrs + numteams - 1) / numteams; s32 teamsremaining = numteams; @@ -3252,7 +3252,7 @@ MenuItemHandlerResult menuhandlerMpNTeams(s32 operation, struct menuitem *item, i = (start + 1) % numchrs; do { - struct mpchrconfig *mpchr = mpGetChrConfigBySlotNum(i); + struct mpchrconfig *mpchr = mp_get_chr_config_by_slot_num(i); #if VERSION >= VERSION_NTSC_1_0 if (teamsremaining); @@ -3302,28 +3302,28 @@ MenuItemHandlerResult menuhandlerMpNTeams(s32 operation, struct menuitem *item, i = (i + 1) % numchrs; } while (true); - menuPopDialog(); + menu_pop_dialog(); } return 0; } -MenuItemHandlerResult menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_two_teams(s32 operation, struct menuitem *item, union handlerdata *data) { - return menuhandlerMpNTeams(operation, item, data, 2); + return menuhandler_mp_n_teams(operation, item, data, 2); } -MenuItemHandlerResult menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_three_teams(s32 operation, struct menuitem *item, union handlerdata *data) { - return menuhandlerMpNTeams(operation, item, data, 3); + return menuhandler_mp_n_teams(operation, item, data, 3); } -MenuItemHandlerResult menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_four_teams(s32 operation, struct menuitem *item, union handlerdata *data) { - return menuhandlerMpNTeams(operation, item, data, 4); + return menuhandler_mp_n_teams(operation, item, data, 4); } -MenuItemHandlerResult menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_maximum_teams(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -3335,19 +3335,19 @@ MenuItemHandlerResult menuhandlerMpMaximumTeams(s32 operation, struct menuitem * mpchr->team = team++; - if (team >= scenarioGetMaxTeams()) { + if (team >= scenario_get_max_teams()) { team = 0; } } } - menuPopDialog(); + menu_pop_dialog(); } return 0; } -MenuItemHandlerResult menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_humans_vs_simulants(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { s32 i; @@ -3360,13 +3360,13 @@ MenuItemHandlerResult menuhandlerMpHumansVsSimulants(s32 operation, struct menui } } - menuPopDialog(); + menu_pop_dialog(); } return 0; } -MenuItemHandlerResult menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_human_simulant_pairs(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { u8 team_ids[4] = {0, 1, 2, 3}; @@ -3390,15 +3390,15 @@ MenuItemHandlerResult menuhandlerMpHumanSimulantPairs(s32 operation, struct menu } } - menuPopDialog(); + menu_pop_dialog(); } return 0; } -char *mpMenuTextChrNameForTeamSetup(struct menuitem *item) +char *mp_menu_text_chr_name_for_team_setup(struct menuitem *item) { - struct mpchrconfig *mpchr = mpGetChrConfigBySlotNum(item->param); + struct mpchrconfig *mpchr = mp_get_chr_config_by_slot_num(item->param); if (mpchr) { return mpchr->name; @@ -3411,7 +3411,7 @@ MenuItemHandlerResult func0f17dac4(s32 operation, struct menuitem *item, union h { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->list.value = scenarioGetMaxTeams(); + data->list.value = scenario_get_max_teams(); break; case MENUOP_GETOPTIONTEXT: if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) == 0) { @@ -3421,20 +3421,20 @@ MenuItemHandlerResult func0f17dac4(s32 operation, struct menuitem *item, union h return (s32) g_BossFile.teamnames[data->list.value]; } - return menuhandlerMpTeamsLabel(operation, item, data); + return menuhandler_mp_teams_label(operation, item, data); } -MenuItemHandlerResult menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_team_slot(s32 operation, struct menuitem *item, union handlerdata *data) { struct mpchrconfig *mpchr; switch (operation) { case MENUOP_SET: - mpchr = mpGetChrConfigBySlotNum(item->param); + mpchr = mp_get_chr_config_by_slot_num(item->param); mpchr->team = data->dropdown.value; break; case MENUOP_GETSELECTEDINDEX: - mpchr = mpGetChrConfigBySlotNum(item->param); + mpchr = mp_get_chr_config_by_slot_num(item->param); if (!mpchr) { data->dropdown.value = 0xff; @@ -3444,25 +3444,25 @@ MenuItemHandlerResult menuhandlerMpTeamSlot(s32 operation, struct menuitem *item break; case MENUOP_CHECKDISABLED: - mpchr = mpGetChrConfigBySlotNum(item->param); + mpchr = mp_get_chr_config_by_slot_num(item->param); if (!mpchr) { return 1; } - return menuhandlerMpTeamsLabel(operation, item, data); + return menuhandler_mp_teams_label(operation, item, data); } return func0f17dac4(operation, item, data); } -char *mpMenuTextSelectTuneOrTunes(struct menuitem *item) +char *mp_menu_text_select_tune_or_tunes(struct menuitem *item) { - if (mpGetUsingMultipleTunes()) { - return langGet(L_MPMENU_069); // "Select Tune" + if (mp_get_using_multiple_tunes()) { + return lang_get(L_MPMENU_069); // "Select Tune" } - return langGet(L_MPMENU_068); // "Select Tunes" + return lang_get(L_MPMENU_068); // "Select Tunes" } struct menuitem g_MpAutoTeamMenuItems[] = { @@ -3472,7 +3472,7 @@ struct menuitem g_MpAutoTeamMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_076, // "Two Teams" 0, - menuhandlerMpTwoTeams, + menuhandler_mp_two_teams, }, { MENUITEMTYPE_SELECTABLE, @@ -3480,7 +3480,7 @@ struct menuitem g_MpAutoTeamMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_077, // "Three Teams" 0, - menuhandlerMpThreeTeams, + menuhandler_mp_three_teams, }, { MENUITEMTYPE_SELECTABLE, @@ -3488,7 +3488,7 @@ struct menuitem g_MpAutoTeamMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_078, // "Four Teams" 0, - menuhandlerMpFourTeams, + menuhandler_mp_four_teams, }, { MENUITEMTYPE_SELECTABLE, @@ -3496,7 +3496,7 @@ struct menuitem g_MpAutoTeamMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_079, // "Maximum Teams" 0, - menuhandlerMpMaximumTeams, + menuhandler_mp_maximum_teams, }, { MENUITEMTYPE_SELECTABLE, @@ -3504,7 +3504,7 @@ struct menuitem g_MpAutoTeamMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_080, // "Humans vs. Simulants" 0, - menuhandlerMpHumansVsSimulants, + menuhandler_mp_humans_vs_simulants, }, { MENUITEMTYPE_SELECTABLE, @@ -3512,7 +3512,7 @@ struct menuitem g_MpAutoTeamMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_081, // "Human-Simulant Pairs" 0, - menuhandlerMpHumanSimulantPairs, + menuhandler_mp_human_simulant_pairs, }, { MENUITEMTYPE_SEPARATOR, @@ -3549,7 +3549,7 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_071, // "Teams Enabled" 0x00000002, - menuhandlerMpTeamsEnabled, + menuhandler_mp_teams_enabled, }, #if VERSION >= VERSION_PAL_FINAL { @@ -3566,103 +3566,103 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMFLAG_LESSLEFTPADDING, L_MPMENU_072, // "Teams:" 0, - menuhandlerMpTeamsLabel, + menuhandler_mp_teams_label, }, { MENUITEMTYPE_DROPDOWN, 0, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 1, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 2, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 3, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 4, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 5, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 6, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 7, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 8, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 9, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 10, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 11, MENUITEMFLAG_ADJUSTWIDTH | MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, #else { @@ -3679,103 +3679,103 @@ struct menuitem g_MpTeamsMenuItems[] = { MENUITEMFLAG_LESSLEFTPADDING, L_MPMENU_072, // "Teams:" 0, - menuhandlerMpTeamsLabel, + menuhandler_mp_teams_label, }, { MENUITEMTYPE_DROPDOWN, 0, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 1, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 2, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 3, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 4, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 5, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 6, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 7, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 8, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 9, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 10, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, { MENUITEMTYPE_DROPDOWN, 11, MENUITEMFLAG_LOCKABLEMINOR, - (uintptr_t)&mpMenuTextChrNameForTeamSetup, + (uintptr_t)&mp_menu_text_chr_name_for_team_setup, 0, - menuhandlerMpTeamSlot, + menuhandler_mp_team_slot, }, #endif { @@ -3830,13 +3830,13 @@ u32 var80085ce8[] = { * If multiple tracks are disabled, the listing contains the track listing plus * 3 items for Select All, Select None and Randomize. */ -MenuItemHandlerResult mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_select_tune_list_handler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->list.value = mpGetNumUnlockedTracks(); + data->list.value = mp_get_num_unlocked_tracks(); - if (mpGetUsingMultipleTunes()) { + if (mp_get_using_multiple_tunes()) { data->list.value += 3; } else { data->list.value++; @@ -3844,74 +3844,74 @@ MenuItemHandlerResult mpSelectTuneListHandler(s32 operation, struct menuitem *it break; case MENUOP_GETOPTIONTEXT: { - s32 numtracks = mpGetNumUnlockedTracks(); + s32 numtracks = mp_get_num_unlocked_tracks(); if (data->list.value < numtracks) { - return (s32) mpGetTrackName(data->list.value); + return (s32) mp_get_track_name(data->list.value); } - if (mpGetUsingMultipleTunes()) { - return (s32) langGet(var80085ce8[1 + data->list.value - numtracks]); + if (mp_get_using_multiple_tunes()) { + return (s32) lang_get(var80085ce8[1 + data->list.value - numtracks]); } - return (s32) langGet(var80085ce8[data->list.value - numtracks]); + return (s32) lang_get(var80085ce8[data->list.value - numtracks]); } case MENUOP_SET: { - s32 numtracks = mpGetNumUnlockedTracks(); + s32 numtracks = mp_get_num_unlocked_tracks(); if (data->list.value < numtracks) { if (data->list.unk04 == 0) { - mpSetTrackSlotEnabled(data->list.value); + mp_set_track_slot_enabled(data->list.value); } g_Vars.modifiedfiles |= MODFILE_MPSETUP; - } else if (mpGetUsingMultipleTunes()) { + } else if (mp_get_using_multiple_tunes()) { s32 index = data->list.value - numtracks; switch (index) { case 0: - mpEnableAllMultiTracks(); + mp_enable_all_multi_tracks(); g_Vars.modifiedfiles |= MODFILE_MPSETUP; break; case 1: - mpDisableAllMultiTracks(); + mp_disable_all_multi_tracks(); g_Vars.modifiedfiles |= MODFILE_MPSETUP; break; case 2: - mpRandomiseMultiTracks(); + mp_randomise_multi_tracks(); g_Vars.modifiedfiles |= MODFILE_MPSETUP; break; } } else { - mpSetTrackToRandom(); + mp_set_track_to_random(); g_Vars.modifiedfiles |= MODFILE_MPSETUP; } } break; case MENUOP_GETSELECTEDINDEX: - if (mpGetUsingMultipleTunes()) { + if (mp_get_using_multiple_tunes()) { data->list.value = 0x000fffff; } else { - s32 slotnum = mpGetCurrentTrackSlotNum(); + s32 slotnum = mp_get_current_track_slot_num(); if (slotnum < 0) { - data->list.value = mpGetNumUnlockedTracks(); + data->list.value = mp_get_num_unlocked_tracks(); } else { data->list.value = slotnum; } } break; case MENUOP_LISTITEMFOCUS: - if (data->list.value < mpGetNumUnlockedTracks()) { - musicStartTrackAsMenu(mpGetTrackMusicNum(data->list.value)); + if (data->list.value < mp_get_num_unlocked_tracks()) { + music_start_track_as_menu(mp_get_track_music_num(data->list.value)); } break; case MENUOP_GETLISTITEMCHECKBOX: { - s32 numtracks = mpGetNumUnlockedTracks(); + s32 numtracks = mp_get_num_unlocked_tracks(); - if (mpGetUsingMultipleTunes() && data->list.value < numtracks) { - data->list.unk04 = mpIsMultiTrackSlotEnabled(data->list.value); + if (mp_get_using_multiple_tunes() && data->list.value < numtracks) { + data->list.unk04 = mp_is_multi_track_slot_enabled(data->list.value); } } break; @@ -3920,7 +3920,7 @@ MenuItemHandlerResult mpSelectTuneListHandler(s32 operation, struct menuitem *it return 0; } -MenuDialogHandlerResult menudialogMpSelectTune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_mp_select_tune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_MusicInterval240 = 80; @@ -3933,37 +3933,37 @@ MenuDialogHandlerResult menudialogMpSelectTune(s32 operation, struct menudialogd return false; } -char *mpMenuTextCurrentTrack(struct menuitem *item) +char *mp_menu_text_current_track(struct menuitem *item) { s32 slotnum; - if (mpGetUsingMultipleTunes()) { - return langGet(L_MPMENU_066); // "Multiple Tunes" + if (mp_get_using_multiple_tunes()) { + return lang_get(L_MPMENU_066); // "Multiple Tunes" } - slotnum = mpGetCurrentTrackSlotNum(); + slotnum = mp_get_current_track_slot_num(); if (slotnum >= 0) { - return mpGetTrackName(slotnum); + return mp_get_track_name(slotnum); } - return langGet(L_MPMENU_067); // "Random" + return lang_get(L_MPMENU_067); // "Random" } -MenuItemHandlerResult menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_multiple_tunes(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GET: - return mpGetUsingMultipleTunes(); + return mp_get_using_multiple_tunes(); case MENUOP_SET: - mpSetUsingMultipleTunes(data->checkbox.value); + mp_set_using_multiple_tunes(data->checkbox.value); g_Vars.modifiedfiles |= MODFILE_MPSETUP; } return 0; } -MenuItemHandlerResult mpTeamNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_team_name_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { char *name = data->keyboard.string; s32 i; @@ -4012,7 +4012,7 @@ MenuItemHandlerResult mpTeamNameMenuHandler(s32 operation, struct menuitem *item * colours are consecutive, so the index of the team is determined by * subtracting the first team's colour text ID. */ -char *mpMenuTextTeamName(struct menuitem *item) +char *mp_menu_text_team_name(struct menuitem *item) { s32 index = item->param2; index -= L_OPTIONS_008; @@ -4020,11 +4020,11 @@ char *mpMenuTextTeamName(struct menuitem *item) return g_BossFile.teamnames[index]; } -MenuItemHandlerResult menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_team_name_slot(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Menus[g_MpPlayerNum].mpsetup.slotindex = item->param2 - 0x5608; - menuPushDialog(&g_MpChangeTeamNameMenuDialog); + menu_push_dialog(&g_MpChangeTeamNameMenuDialog); } return 0; @@ -4032,7 +4032,7 @@ MenuItemHandlerResult menuhandlerMpTeamNameSlot(s32 operation, struct menuitem * char *func0f17e318(struct menudialogdef *dialogdef) { - sprintf(g_StringPointer, langGet(L_MPMENU_056), challengeGetNameBySlot(g_Menus[g_MpPlayerNum].mpsetup.slotindex)); + sprintf(g_StringPointer, lang_get(L_MPMENU_056), challenge_get_name_by_slot(g_Menus[g_MpPlayerNum].mpsetup.slotindex)); return g_StringPointer; } @@ -4043,11 +4043,11 @@ MenuItemHandlerResult menuhandler0017e38c(s32 operation, struct menuitem *item, { if (operation == MENUOP_SET) { #if VERSION >= VERSION_NTSC_1_0 - challengeUnsetCurrent(); + challenge_unset_current(); #endif - menuPopDialog(); - challengeSetCurrentBySlot(g_Menus[g_MpPlayerNum].mpsetup.slotindex); + menu_pop_dialog(); + challenge_set_current_by_slot(g_Menus[g_MpPlayerNum].mpsetup.slotindex); } return 0; @@ -4059,7 +4059,7 @@ MenuDialogHandlerResult menudialog0017e3fc(s32 operation, struct menudialogdef * case MENUOP_OPEN: g_Menus[g_MpPlayerNum].menumodel.curparams = 0; - g_Menus[g_MpPlayerNum].training.mpconfig = challengeLoadBySlot( + g_Menus[g_MpPlayerNum].training.mpconfig = challenge_load_by_slot( g_Menus[g_MpPlayerNum].training.unke1c, g_Menus[g_MpPlayerNum].menumodel.allocstart, g_Menus[g_MpPlayerNum].menumodel.alloclen); @@ -4068,7 +4068,7 @@ MenuDialogHandlerResult menudialog0017e3fc(s32 operation, struct menudialogdef * break; case MENUOP_TICK: if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) { - menuPopDialog(); + menu_pop_dialog(); } break; } @@ -4083,16 +4083,16 @@ struct menuitem g_MpSelectTunesMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, 0x00000078, 0x0000004d, - mpSelectTuneListHandler, + mp_select_tune_list_handler, }, { MENUITEMTYPE_END }, }; struct menudialogdef g_MpSelectTunesMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&mpMenuTextSelectTuneOrTunes, + (uintptr_t)&mp_menu_text_select_tune_or_tunes, g_MpSelectTunesMenuItems, - menudialogMpSelectTune, + menudialog_mp_select_tune, MENUDIALOGFLAG_MPLOCKABLE, NULL, }; @@ -4111,7 +4111,7 @@ struct menuitem g_MpSoundtrackMenuItems[] = { 0, 0, L_OPTIONS_003, // "" - (uintptr_t)&mpMenuTextCurrentTrack, + (uintptr_t)&mp_menu_text_current_track, NULL, }, { @@ -4126,7 +4126,7 @@ struct menuitem g_MpSoundtrackMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, - (uintptr_t)&mpMenuTextSelectTuneOrTunes, + (uintptr_t)&mp_menu_text_select_tune_or_tunes, 0, (void *)&g_MpSelectTunesMenuDialog, }, @@ -4136,7 +4136,7 @@ struct menuitem g_MpSoundtrackMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_064, // "Multiple Tunes" 0, - menuhandlerMpMultipleTunes, + menuhandler_mp_multiple_tunes, }, { MENUITEMTYPE_SEPARATOR, @@ -4173,7 +4173,7 @@ struct menuitem g_MpChangeTeamNameMenuItems[] = { 0, 0, 0, - mpTeamNameMenuHandler, + mp_team_name_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -4193,64 +4193,64 @@ struct menuitem g_MpTeamNamesMenuItems[] = { 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_008, // "Red" - (uintptr_t)&mpMenuTextTeamName, - menuhandlerMpTeamNameSlot, + (uintptr_t)&mp_menu_text_team_name, + menuhandler_mp_team_name_slot, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_009, // "Yellow" - (uintptr_t)&mpMenuTextTeamName, - menuhandlerMpTeamNameSlot, + (uintptr_t)&mp_menu_text_team_name, + menuhandler_mp_team_name_slot, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_010, // "Blue" - (uintptr_t)&mpMenuTextTeamName, - menuhandlerMpTeamNameSlot, + (uintptr_t)&mp_menu_text_team_name, + menuhandler_mp_team_name_slot, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_011, // "Magenta" - (uintptr_t)&mpMenuTextTeamName, - menuhandlerMpTeamNameSlot, + (uintptr_t)&mp_menu_text_team_name, + menuhandler_mp_team_name_slot, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_012, // "Cyan" - (uintptr_t)&mpMenuTextTeamName, - menuhandlerMpTeamNameSlot, + (uintptr_t)&mp_menu_text_team_name, + menuhandler_mp_team_name_slot, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_013, // "Orange" - (uintptr_t)&mpMenuTextTeamName, - menuhandlerMpTeamNameSlot, + (uintptr_t)&mp_menu_text_team_name, + menuhandler_mp_team_name_slot, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_014, // "Pink" - (uintptr_t)&mpMenuTextTeamName, - menuhandlerMpTeamNameSlot, + (uintptr_t)&mp_menu_text_team_name, + menuhandler_mp_team_name_slot, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_LOCKABLEMINOR, L_OPTIONS_015, // "Brown" - (uintptr_t)&mpMenuTextTeamName, - menuhandlerMpTeamNameSlot, + (uintptr_t)&mp_menu_text_team_name, + menuhandler_mp_team_name_slot, }, { MENUITEMTYPE_SEPARATOR, @@ -4332,7 +4332,7 @@ struct menuitem g_MpChallengesListOrDetailsMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x00000078, 0x0000004d, - mpChallengesListMenuHandler, + mp_challenges_list_menu_handler, }, #if VERSION < VERSION_NTSC_1_0 { @@ -4366,7 +4366,7 @@ struct menuitem g_MpChallengesListOrDetailsMenuItems[] = { 0, L_MPWEAPONS_171, // "Start Challenge" 0, - menuhandlerMpStartChallenge, + menuhandler_mp_start_challenge, }, { MENUITEMTYPE_SELECTABLE, @@ -4374,7 +4374,7 @@ struct menuitem g_MpChallengesListOrDetailsMenuItems[] = { 0, L_MPMENU_051, // "Abort Challenge" 0, - menuhandlerMpAbortChallenge, + menuhandler_mp_abort_challenge, }, { MENUITEMTYPE_END }, }; @@ -4382,12 +4382,12 @@ struct menuitem g_MpChallengesListOrDetailsMenuItems[] = { struct menudialogdef g_MpChallengeListOrDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, #if VERSION >= VERSION_NTSC_1_0 - (uintptr_t)&mpMenuTextChallengeName, + (uintptr_t)&mp_menu_text_challenge_name, #else 0x5032, #endif g_MpChallengesListOrDetailsMenuItems, - mpCombatChallengesMenuDialog, + mp_combat_challenges_menu_dialog, #if VERSION >= VERSION_NTSC_1_0 0x00000808, #else @@ -4401,12 +4401,12 @@ struct menudialogdef g_MpAdvancedSetupViaAdvChallengeMenuDialog; struct menudialogdef g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, #if VERSION >= VERSION_NTSC_1_0 - (uintptr_t)&mpMenuTextChallengeName, + (uintptr_t)&mp_menu_text_challenge_name, #else 0x5032, #endif g_MpChallengesListOrDetailsMenuItems, - mpCombatChallengesMenuDialog, + mp_combat_challenges_menu_dialog, #if VERSION >= VERSION_NTSC_1_0 0x00000808, &g_MpAdvancedSetupViaAdvChallengeMenuDialog, @@ -4461,7 +4461,7 @@ struct menudialogdef g_MpConfirmChallengeMenuDialog = { NULL, }; -MenuItemHandlerResult mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_challenges_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { Gfx *gdl; struct menuitemrenderdata *renderdata; @@ -4478,7 +4478,7 @@ MenuItemHandlerResult mpChallengesListMenuHandler(s32 operation, struct menuitem } break; case MENUOP_GETOPTIONCOUNT: - data->list.value = challengeGetNumAvailable(); + data->list.value = challenge_get_num_available(); break; case MENUOP_SET: if (data->list.unk04 != 0) { @@ -4488,11 +4488,11 @@ MenuItemHandlerResult mpChallengesListMenuHandler(s32 operation, struct menuitem g_Menus[g_MpPlayerNum].mpsetup.slotindex = data->list.value; if (item->param == 0) { - menuPushDialog(&g_MpConfirmChallengeViaListOrDetailsMenuDialog); + menu_push_dialog(&g_MpConfirmChallengeViaListOrDetailsMenuDialog); } else if (IS4MB()) { - menuPushDialog(&g_MpConfirmChallenge4MbMenuDialog); + menu_push_dialog(&g_MpConfirmChallenge4MbMenuDialog); } else { - menuPushDialog(&g_MpConfirmChallengeMenuDialog); + menu_push_dialog(&g_MpConfirmChallengeMenuDialog); } break; case MENUOP_GETSELECTEDINDEX: @@ -4520,7 +4520,7 @@ MenuItemHandlerResult mpChallengesListMenuHandler(s32 operation, struct menuitem y = renderdata->y + 1; gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, challengeGetNameBySlot(data->type19.unk04), g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, challenge_get_name_by_slot(data->type19.unk04), g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); gDPPipeSync(gdl++); @@ -4529,20 +4529,20 @@ MenuItemHandlerResult mpChallengesListMenuHandler(s32 operation, struct menuitem gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetTextureFilter(gdl++, G_TF_POINT); for (i = 0; i < maxchrs; i++) { #if VERSION >= VERSION_NTSC_1_0 - if (challengeIsCompletedByAnyChrWithNumPlayersBySlot(data->type19.unk04, i + 1)) { + if (challenge_is_completed_by_any_chr_with_num_players_by_slot(data->type19.unk04, i + 1)) { gDPSetEnvColorViaWord(gdl++, (renderdata->colour & 0xff) * 0xff >> 8 | 0xffe56500); } else { gDPSetEnvColorViaWord(gdl++, (renderdata->colour & 0xff) * 0xff >> 8 | 0x43430000); } #else - if (challengeIsCompletedByAnyChrWithNumPlayersBySlot(data->type19.unk04, i + 1)) { + if (challenge_is_completed_by_any_chr_with_num_players_by_slot(data->type19.unk04, i + 1)) { gDPSetEnvColorViaWord(gdl++, 0xffe565ff); } else { gDPSetEnvColorViaWord(gdl++, 0x434300ff); @@ -4586,7 +4586,7 @@ MenuItemHandlerResult menuhandler0017e9d8(s32 operation, struct menuitem *item, return 0; } -MenuItemHandlerResult menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_abort_challenge(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_BossFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -4595,13 +4595,13 @@ MenuItemHandlerResult menuhandlerMpAbortChallenge(s32 operation, struct menuitem } if (operation == MENUOP_SET) { - challengeRemovePlayerLock(); + challenge_remove_player_lock(); } return 0; } -MenuItemHandlerResult menuhandlerMpStartChallenge(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_start_challenge(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_BossFile.locktype != MPLOCKTYPE_CHALLENGE) { @@ -4609,34 +4609,34 @@ MenuItemHandlerResult menuhandlerMpStartChallenge(s32 operation, struct menuitem } } if (operation == MENUOP_SET) { - menuPushDialog(&g_MpReadyMenuDialog); + menu_push_dialog(&g_MpReadyMenuDialog); } return 0; } -char *mpMenuTextChallengeName(struct menuitem *item) +char *mp_menu_text_challenge_name(struct menuitem *item) { #if VERSION >= VERSION_NTSC_1_0 if (g_BossFile.locktype != MPLOCKTYPE_CHALLENGE) { - return langGet(L_MPMENU_050); // "Combat Challenges" + return lang_get(L_MPMENU_050); // "Combat Challenges" } #endif - sprintf(g_StringPointer, "%s:\n", challengeGetName(challengeGetCurrent())); + sprintf(g_StringPointer, "%s:\n", challenge_get_name(challenge_get_current())); return g_StringPointer; } -MenuDialogHandlerResult mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult mp_combat_challenges_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_TICK) { if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE && g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef - && !challengeIsLoaded()) { + && !challenge_is_loaded()) { g_Menus[g_MpPlayerNum].menumodel.curparams = 0x4fac5ace; - challengeLoadAndStoreCurrent( + challenge_load_and_store_current( g_Menus[g_MpPlayerNum].menumodel.allocstart, g_Menus[g_MpPlayerNum].menumodel.alloclen); } @@ -4644,7 +4644,7 @@ MenuDialogHandlerResult mpCombatChallengesMenuDialog(s32 operation, struct menud if (operation == MENUOP_CLOSE) { if (g_Menus[g_MpPlayerNum].menumodel.curparams == 0x4fac5ace) { - challengeUnsetCurrent(); + challenge_unset_current(); } } @@ -4654,7 +4654,7 @@ MenuDialogHandlerResult mpCombatChallengesMenuDialog(s32 operation, struct menud MenuItemHandlerResult menuhandler0017ec64(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - challengeSetCurrentBySlot(g_Menus[g_MpPlayerNum].mpsetup.slotindex); + challenge_set_current_by_slot(g_Menus[g_MpPlayerNum].mpsetup.slotindex); func0f0f820c(&g_MpQuickGoMenuDialog, 3); } @@ -4668,7 +4668,7 @@ struct menuitem g_MpChallengesMenuItems[] = { MENUITEMFLAG_LIST_CUSTOMRENDER, 0x00000078, 0x0000004d, - mpChallengesListMenuHandler, + mp_challenges_list_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -4677,12 +4677,12 @@ struct menudialogdef g_MpChallengesMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_050, // "Combat Challenges" g_MpChallengesMenuItems, - mpCombatChallengesMenuDialog, + mp_combat_challenges_menu_dialog, 0, NULL, }; -MenuItemHandlerResult menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_lock(s32 operation, struct menuitem *item, union handlerdata *data) { u16 labels[] = { L_MPMENU_045, // "None" @@ -4693,53 +4693,53 @@ MenuItemHandlerResult menuhandlerMpLock(s32 operation, struct menuitem *item, un switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->dropdown.value = mpGetLockType() == MPLOCKTYPE_CHALLENGE ? 1 : 5; + data->dropdown.value = mp_get_lock_type() == MPLOCKTYPE_CHALLENGE ? 1 : 5; break; case MENUOP_GETOPTIONTEXT: - if (mpGetLockType() == MPLOCKTYPE_CHALLENGE) { - return (s32) langGet(L_MPMENU_049); // "Challenge" + if (mp_get_lock_type() == MPLOCKTYPE_CHALLENGE) { + return (s32) lang_get(L_MPMENU_049); // "Challenge" } if (data->dropdown.value <= 3) { - return (s32) langGet(labels[data->dropdown.value]); + return (s32) lang_get(labels[data->dropdown.value]); } - if (mpGetLockType() == MPLOCKTYPE_PLAYER) { - return (s32) g_PlayerConfigsArray[mpGetLockPlayerNum()].base.name; + if (mp_get_lock_type() == MPLOCKTYPE_PLAYER) { + return (s32) g_PlayerConfigsArray[mp_get_lock_player_num()].base.name; } - return (s32) mpGetCurrentPlayerName(item); + return (s32) mp_get_current_player_name(item); case MENUOP_SET: - if (mpGetLockType() != MPLOCKTYPE_CHALLENGE) { - mpSetLock(data->dropdown.value, g_MpPlayerNum); + if (mp_get_lock_type() != MPLOCKTYPE_CHALLENGE) { + mp_set_lock(data->dropdown.value, g_MpPlayerNum); } g_Vars.modifiedfiles |= MODFILE_MPSETUP; break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = mpGetLockType() == MPLOCKTYPE_CHALLENGE ? 0 : mpGetLockType(); + data->dropdown.value = mp_get_lock_type() == MPLOCKTYPE_CHALLENGE ? 0 : mp_get_lock_type(); break; } return 0; } -MenuItemHandlerResult menuhandlerMpSavePlayer(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_save_player(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_PlayerConfigsArray[g_MpPlayerNum].fileguid.fileid == 0) { - filemgrPushSelectLocationDialog(6, FILETYPE_MPPLAYER); + filemgr_push_select_location_dialog(6, FILETYPE_MPPLAYER); } else { - menuPushDialog(&g_MpSavePlayerMenuDialog); + menu_push_dialog(&g_MpSavePlayerMenuDialog); } } return 0; } -char *mpMenuTextSavePlayerOrCopy(struct menuitem *item) +char *mp_menu_text_save_player_or_copy(struct menuitem *item) { if (g_PlayerConfigsArray[g_MpPlayerNum].fileguid.fileid == 0) { - return langGet(L_MPMENU_038); // "Save Player" + return lang_get(L_MPMENU_038); // "Save Player" } - return langGet(L_MPMENU_039); // "Save Copy of Player" + return lang_get(L_MPMENU_039); // "Save Copy of Player" } MenuItemHandlerResult menuhandler0017ef30(s32 operation, struct menuitem *item, union handlerdata *data) @@ -4759,42 +4759,42 @@ MenuItemHandlerResult menuhandler0017ef30(s32 operation, struct menuitem *item, return 0; } -MenuItemHandlerResult menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_save_settings(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_MpSetup.fileguid.fileid == 0) { - menuPushDialog(&g_MpSaveSetupNameMenuDialog); + menu_push_dialog(&g_MpSaveSetupNameMenuDialog); } else { #if VERSION >= VERSION_NTSC_1_0 - filemgrSetDevice1BySerial(g_MpSetup.fileguid.deviceserial); + filemgr_set_device1_by_serial(g_MpSetup.fileguid.deviceserial); #endif - menuPushDialog(&g_MpSaveSetupExistsMenuDialog); + menu_push_dialog(&g_MpSaveSetupExistsMenuDialog); } } return 0; } -char *mpMenuTextArenaName(struct menuitem *item) +char *mp_menu_text_arena_name(struct menuitem *item) { s32 i; for (i = 0; i != ARRAYCOUNT(g_MpArenas); i++) { if (g_MpArenas[i].stagenum == g_MpSetup.stagenum) { - return langGet(g_MpArenas[i].name); + return lang_get(g_MpArenas[i].name); } } return "\n"; } -char *mpMenuTextWeaponSetName(struct menuitem *item) +char *mp_menu_text_weapon_set_name(struct menuitem *item) { - return mpGetWeaponSetName(mpGetWeaponSet()); + return mp_get_weapon_set_name(mp_get_weapon_set()); } -MenuDialogHandlerResult menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_mp_game_setup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.mpsetupmenu = MPSETUPMENU_ADVSETUP; @@ -4804,7 +4804,7 @@ MenuDialogHandlerResult menudialogMpGameSetup(s32 operation, struct menudialogde return false; } -MenuDialogHandlerResult menudialogMpQuickGo(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_mp_quick_go(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.mpsetupmenu = MPSETUPMENU_QUICKGO; @@ -4813,13 +4813,13 @@ MenuDialogHandlerResult menudialogMpQuickGo(s32 operation, struct menudialogdef return false; } -void mpConfigureQuickTeamPlayers(void) +void mp_configure_quick_team_players(void) { s32 i; if (g_Vars.mpquickteam != MPQUICKTEAM_NONE) { for (i = 0; i < MAX_BOTS; i++) { - mpRemoveSimulant(i); + mp_remove_simulant(i); } switch (g_Vars.mpquickteam) { @@ -4857,7 +4857,7 @@ void mpConfigureQuickTeamPlayers(void) } } -void mpConfigureQuickTeamSimulants(void) +void mp_configure_quick_team_simulants(void) { struct mpchrconfig *mpchr; s32 numchrs; @@ -4869,25 +4869,25 @@ void mpConfigureQuickTeamSimulants(void) switch (g_Vars.mpquickteam) { case MPQUICKTEAM_PLAYERSANDSIMS: for (i = 0; i < g_Vars.mpquickteamnumsims; i++) { - botnum = mpGetSlotForNewBot(); + botnum = mp_get_slot_for_new_bot(); if (botnum >= 0) { - mpCreateBotFromProfile(botnum, g_Vars.mpsimdifficulty); + mp_create_bot_from_profile(botnum, g_Vars.mpsimdifficulty); } } - mpGenerateBotNames(); + mp_generate_bot_names(); break; case MPQUICKTEAM_PLAYERSVSSIMS: for (i = 0; i < g_Vars.mpquickteamnumsims; i++) { - botnum = mpGetSlotForNewBot(); + botnum = mp_get_slot_for_new_bot(); if (botnum >= 0) { - mpCreateBotFromProfile(botnum, g_Vars.mpsimdifficulty); + mp_create_bot_from_profile(botnum, g_Vars.mpsimdifficulty); } } - mpGenerateBotNames(); + mp_generate_bot_names(); for (i = 0; i < ARRAYCOUNT(g_BotConfigsArray); i++) { g_BotConfigsArray[i].base.team = 1; @@ -4895,20 +4895,20 @@ void mpConfigureQuickTeamSimulants(void) break; case MPQUICKTEAM_PLAYERSIMTEAMS: - for (i = mpGetNumChrs() - 1; i >= 0; i--) { - mpchr = mpGetChrConfigBySlotNum(i); + for (i = mp_get_num_chrs() - 1; i >= 0; i--) { + mpchr = mp_get_chr_config_by_slot_num(i); for (j = 0; j < g_Vars.unk0004a0; j++) { - botnum = mpGetSlotForNewBot(); + botnum = mp_get_slot_for_new_bot(); if (botnum >= 0) { - mpCreateBotFromProfile(botnum, g_Vars.mpsimdifficulty); + mp_create_bot_from_profile(botnum, g_Vars.mpsimdifficulty); g_BotConfigsArray[botnum].base.team = mpchr->team; } } } - mpGenerateBotNames(); + mp_generate_bot_names(); break; case MPQUICKTEAM_PLAYERSONLY: case MPQUICKTEAM_PLAYERSTEAMS: @@ -4919,7 +4919,7 @@ void mpConfigureQuickTeamSimulants(void) void func0f17f428(void) { - mpConfigureQuickTeamPlayers(); + mp_configure_quick_team_players(); if (IS4MB()) { func0f0f820c(&g_MpQuickGo4MbMenuDialog, MENUROOT_4MBMAINMENU); @@ -4928,7 +4928,7 @@ void func0f17f428(void) } } -MenuItemHandlerResult menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_finished_setup(s32 operation, struct menuitem *item, union handlerdata *data) { #if VERSION >= VERSION_NTSC_1_0 if (operation == MENUOP_CHECKPREFOCUSED) { @@ -4943,7 +4943,7 @@ MenuItemHandlerResult menuhandlerMpFinishedSetup(s32 operation, struct menuitem return 0; } -MenuItemHandlerResult menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_quick_team_separator(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_CHECKHIDDEN) { if (g_Vars.mpquickteam == MPQUICKTEAM_PLAYERSONLY) { @@ -4954,12 +4954,12 @@ MenuItemHandlerResult menuhandlerQuickTeamSeparator(s32 operation, struct menuit return 0; } -MenuItemHandlerResult menuhandlerPlayerTeam(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_player_team(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: #if VERSION >= VERSION_JPN_FINAL - data->dropdown.value = scenarioGetMaxTeams(); + data->dropdown.value = scenario_get_max_teams(); #else data->dropdown.value = MAX_TEAMS; #endif @@ -4971,8 +4971,8 @@ MenuItemHandlerResult menuhandlerPlayerTeam(s32 operation, struct menuitem *item break; case MENUOP_GETSELECTEDINDEX: #if VERSION >= VERSION_JPN_FINAL - if (g_Vars.mpplayerteams[item->param] >= scenarioGetMaxTeams()) { - g_Vars.mpplayerteams[item->param] %= scenarioGetMaxTeams(); + if (g_Vars.mpplayerteams[item->param] >= scenario_get_max_teams()) { + g_Vars.mpplayerteams[item->param] %= scenario_get_max_teams(); } #endif data->dropdown.value = g_Vars.mpplayerteams[item->param]; @@ -4987,11 +4987,11 @@ MenuItemHandlerResult menuhandlerPlayerTeam(s32 operation, struct menuitem *item return 0; } -MenuItemHandlerResult menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_number_of_simulants(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->dropdown.value = !challengeIsFeatureUnlocked(MPFEATURE_8BOTS) ? 4 : MAX_BOTS; + data->dropdown.value = !challenge_is_feature_unlocked(MPFEATURE_8BOTS) ? 4 : MAX_BOTS; break; case MENUOP_GETOPTIONTEXT: sprintf(g_StringPointer, "%d\n", data->dropdown.value + 1); @@ -5013,7 +5013,7 @@ MenuItemHandlerResult menuhandlerMpNumberOfSimulants(s32 operation, struct menui return 0; } -MenuItemHandlerResult menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_simulants_per_team(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: @@ -5038,7 +5038,7 @@ MenuItemHandlerResult menuhandlerMpSimulantsPerTeam(s32 operation, struct menuit return 0; } -MenuItemHandlerResult mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult mp_quick_team_simulant_difficulty_handler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 count = 0; s32 i; @@ -5046,7 +5046,7 @@ MenuItemHandlerResult mpQuickTeamSimulantDifficultyHandler(s32 operation, struct switch (operation) { case MENUOP_GETOPTIONCOUNT: for (i = 0; i < NUM_BOTDIFFS; i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { count++; } } @@ -5055,9 +5055,9 @@ MenuItemHandlerResult mpQuickTeamSimulantDifficultyHandler(s32 operation, struct break; case MENUOP_GETOPTIONTEXT: for (i = 0; i < NUM_BOTDIFFS; i++) { - if (challengeIsFeatureUnlocked(g_BotProfiles[i].requirefeature)) { + if (challenge_is_feature_unlocked(g_BotProfiles[i].requirefeature)) { if (count == data->dropdown.value) { - return (s32) langGet(i + L_MISC_082); + return (s32) lang_get(i + L_MISC_082); } count++; @@ -5081,13 +5081,13 @@ MenuItemHandlerResult mpQuickTeamSimulantDifficultyHandler(s32 operation, struct return 0; } -MenuItemHandlerResult menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_quick_team_option(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { g_Vars.mpquickteam = item->param; - if (mpGetWeaponSet() >= func0f189058(0)) { - mpSetWeaponSet(0); + if (mp_get_weapon_set() >= func0f189058(0)) { + mp_set_weapon_set(0); } if (g_Vars.mpquickteam == MPQUICKTEAM_PLAYERSONLY || @@ -5098,13 +5098,13 @@ MenuItemHandlerResult menuhandlerMpQuickTeamOption(s32 operation, struct menuite } } - menuPushDialog(&g_MpQuickTeamGameSetupMenuDialog); + menu_push_dialog(&g_MpQuickTeamGameSetupMenuDialog); } return 0; } -MenuDialogHandlerResult menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_combat_simulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_OPEN) { g_Vars.waitingtojoin[0] = false; @@ -5119,14 +5119,14 @@ MenuDialogHandlerResult menudialogCombatSimulator(s32 operation, struct menudial g_Vars.mpsetupmenu = MPSETUPMENU_GENERAL; g_Vars.mpquickteam = MPQUICKTEAM_NONE; g_Vars.usingadvsetup = false; - challengeUnsetCurrent(); - challengeRemovePlayerLock(); + challenge_unset_current(); + challenge_remove_player_lock(); } return false; } -MenuItemHandlerResult menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_mp_advanced_setup(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { func0f0f820c(&g_MpAdvancedSetupMenuDialog, 3); @@ -5139,7 +5139,7 @@ MenuItemHandlerResult menuhandlerMpAdvancedSetup(s32 operation, struct menuitem * When a player is loading a saved setup, check which dialogs the other players * have open and close them if they no longer apply or need to be updated. */ -void mpCloseDialogsForNewSetup(void) +void mp_close_dialogs_for_new_setup(void) { s32 i; s32 prevplayernum = g_MpPlayerNum; @@ -5183,7 +5183,7 @@ void mpCloseDialogsForNewSetup(void) // Close the leaf layer if (!ok) { - menuPopDialog(); + menu_pop_dialog(); } } } @@ -5217,7 +5217,7 @@ struct menuitem g_MpStuffMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_044, // "Lock" 0, - menuhandlerMpLock, + menuhandler_mp_lock, }, { MENUITEMTYPE_SEPARATOR, @@ -5233,7 +5233,7 @@ struct menuitem g_MpStuffMenuItems[] = { 0, L_OPTIONS_216, // "Ratio" 0, - menuhandlerScreenRatio, + menuhandler_screen_ratio, }, { MENUITEMTYPE_DROPDOWN, @@ -5241,7 +5241,7 @@ struct menuitem g_MpStuffMenuItems[] = { 0, L_MPWEAPONS_154, // "Split" 0, - menuhandlerScreenSplit, + menuhandler_screen_split, }, { MENUITEMTYPE_SEPARATOR, @@ -5302,7 +5302,7 @@ struct menuitem g_MpPlayerSetup234MenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_030, // "Name" - (uintptr_t)&mpGetCurrentPlayerName, + (uintptr_t)&mp_get_current_player_name, (void *)&g_MpPlayerNameMenuDialog, }, { @@ -5357,9 +5357,9 @@ struct menuitem g_MpPlayerSetup234MenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, 0, - (uintptr_t)&mpMenuTextSavePlayerOrCopy, + (uintptr_t)&mp_menu_text_save_player_or_copy, 0, - menuhandlerMpSavePlayer, + menuhandler_mp_save_player, }, { MENUITEMTYPE_END }, }; @@ -5434,7 +5434,7 @@ struct menuitem g_MpAdvancedSetupMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_019, // "Scenario" - (uintptr_t)&mpMenuTextScenarioShortName, + (uintptr_t)&mp_menu_text_scenario_short_name, (void *)&g_MpScenarioMenuDialog, }, { @@ -5443,14 +5443,14 @@ struct menuitem g_MpAdvancedSetupMenuItems[] = { 0, L_MPMENU_021, // "Options" 0, - menuhandlerMpOpenOptions, + menuhandler_mp_open_options, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_020, // "Arena" - (uintptr_t)&mpMenuTextArenaName, + (uintptr_t)&mp_menu_text_arena_name, (void *)&g_MpArenaMenuDialog, }, { @@ -5515,7 +5515,7 @@ struct menuitem g_MpAdvancedSetupMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LOCKABLEMAJOR, L_MPMENU_026, // "Save Settings" 0, - menuhandlerMpSaveSettings, + menuhandler_mp_save_settings, }, { MENUITEMTYPE_END }, }; @@ -5524,7 +5524,7 @@ struct menudialogdef g_MpAdvancedSetupMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_017, // "Game Setup" g_MpAdvancedSetupMenuItems, - menudialogMpGameSetup, + menudialog_mp_game_setup, MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpPlayerSetupViaAdvMenuDialog, }; @@ -5533,7 +5533,7 @@ struct menudialogdef g_MpAdvancedSetupViaAdvChallengeMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_017, // "Game Setup" g_MpAdvancedSetupMenuItems, - menudialogMpGameSetup, + menudialog_mp_game_setup, MENUDIALOGFLAG_MPLOCKABLE | MENUDIALOGFLAG_DROPOUTONCLOSE, &g_MpPlayerSetupViaAdvChallengeMenuDialog, }; @@ -5580,7 +5580,7 @@ struct menudialogdef g_MpQuickGoMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC_460, // "Quick Go" g_MpQuickGoMenuItems, - menudialogMpQuickGo, + menudialog_mp_quick_go, 0, NULL, }; @@ -5591,7 +5591,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG | MENUITEMFLAG_LOCKABLEMINOR, L_MPMENU_019, // "Scenario" - (uintptr_t)&mpMenuTextScenarioShortName, + (uintptr_t)&mp_menu_text_scenario_short_name, (void *)&g_MpQuickTeamScenarioMenuDialog, }, { @@ -5600,14 +5600,14 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MPMENU_021, // "Options" 0, - menuhandlerMpOpenOptions, + menuhandler_mp_open_options, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_020, // "Arena" - (uintptr_t)&mpMenuTextArenaName, + (uintptr_t)&mp_menu_text_arena_name, (void *)&g_MpArenaMenuDialog, }, { @@ -5615,7 +5615,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, MENUITEMFLAG_SELECTABLE_OPENSDIALOG, L_MPMENU_023, // "Weapons" - (uintptr_t)&mpMenuTextWeaponSetName, + (uintptr_t)&mp_menu_text_weapon_set_name, (void *)&g_MpQuickTeamWeaponsMenuDialog, }, { @@ -5632,7 +5632,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, 0x00000082, 0, - menuhandlerQuickTeamSeparator, + menuhandler_quick_team_separator, }, { MENUITEMTYPE_DROPDOWN, @@ -5640,7 +5640,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MISC_449, // "Player 1 Team" 0, - menuhandlerPlayerTeam, + menuhandler_player_team, }, { MENUITEMTYPE_DROPDOWN, @@ -5648,7 +5648,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MISC_450, // "Player 2 Team" 0, - menuhandlerPlayerTeam, + menuhandler_player_team, }, { MENUITEMTYPE_DROPDOWN, @@ -5656,7 +5656,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MISC_451, // "Player 3 Team" 0, - menuhandlerPlayerTeam, + menuhandler_player_team, }, { MENUITEMTYPE_DROPDOWN, @@ -5664,7 +5664,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MISC_452, // "Player 4 Team" 0, - menuhandlerPlayerTeam, + menuhandler_player_team, }, { MENUITEMTYPE_DROPDOWN, @@ -5672,7 +5672,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MISC_453, // "Number Of Simulants" 0, - menuhandlerMpNumberOfSimulants, + menuhandler_mp_number_of_simulants, }, { MENUITEMTYPE_DROPDOWN, @@ -5680,7 +5680,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MISC_454, // "Simulants Per Team" 0, - menuhandlerMpSimulantsPerTeam, + menuhandler_mp_simulants_per_team, }, { MENUITEMTYPE_DROPDOWN, @@ -5688,7 +5688,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MISC_455, // "Simulant Difficulty" 0, - mpQuickTeamSimulantDifficultyHandler, + mp_quick_team_simulant_difficulty_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -5704,7 +5704,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { 0, L_MISC_448, // "Finished Setup" 0, - menuhandlerMpFinishedSetup, + menuhandler_mp_finished_setup, }, { MENUITEMTYPE_SEPARATOR, @@ -5720,7 +5720,7 @@ struct menuitem g_MpQuickTeamGameSetupMenuItems[] = { MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LOCKABLEMAJOR, L_MPMENU_026, // "Save Settings" 0, - menuhandlerMpSaveSettings, + menuhandler_mp_save_settings, }, { MENUITEMTYPE_END }, }; @@ -5741,7 +5741,7 @@ struct menuitem g_MpQuickTeamMenuItems[] = { MENUITEMFLAG_BIGFONT, L_MISC_463, // "Players Only" 0, - menuhandlerMpQuickTeamOption, + menuhandler_mp_quick_team_option, }, { MENUITEMTYPE_SELECTABLE, @@ -5749,7 +5749,7 @@ struct menuitem g_MpQuickTeamMenuItems[] = { MENUITEMFLAG_BIGFONT, L_MISC_464, // "Players and Simulants" 0, - menuhandlerMpQuickTeamOption, + menuhandler_mp_quick_team_option, }, { MENUITEMTYPE_SEPARATOR, @@ -5765,7 +5765,7 @@ struct menuitem g_MpQuickTeamMenuItems[] = { MENUITEMFLAG_BIGFONT, L_MISC_465, // "Player Teams" 0, - menuhandlerMpQuickTeamOption, + menuhandler_mp_quick_team_option, }, { MENUITEMTYPE_SELECTABLE, @@ -5773,7 +5773,7 @@ struct menuitem g_MpQuickTeamMenuItems[] = { MENUITEMFLAG_BIGFONT, L_MISC_466, // "Players vs. Simulants" 0, - menuhandlerMpQuickTeamOption, + menuhandler_mp_quick_team_option, }, { MENUITEMTYPE_SELECTABLE, @@ -5781,7 +5781,7 @@ struct menuitem g_MpQuickTeamMenuItems[] = { MENUITEMFLAG_BIGFONT, L_MISC_467, // "Player-Simulant Teams" 0, - menuhandlerMpQuickTeamOption, + menuhandler_mp_quick_team_option, }, { MENUITEMTYPE_END }, }; @@ -5826,7 +5826,7 @@ struct menuitem g_CombatSimulatorMenuItems[] = { MENUITEMFLAG_BIGFONT, L_MISC_444, // "Advanced Setup" 0x00000003, - menuhandlerMpAdvancedSetup, + menuhandler_mp_advanced_setup, }, { MENUITEMTYPE_END }, }; @@ -5835,7 +5835,7 @@ struct menudialogdef g_CombatSimulatorMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC_445, // "Combat Simulator" g_CombatSimulatorMenuItems, - menudialogCombatSimulator, + menudialog_combat_simulator, MENUDIALOGFLAG_STARTSELECTS, NULL, }; @@ -5845,13 +5845,13 @@ void func0f17fcb0(s32 silent) g_Menus[g_MpPlayerNum].playernum = g_MpPlayerNum; if (IS4MB()) { - menuPushRootDialog(&g_AdvancedSetup4MbMenuDialog, MENUROOT_4MBMAINMENU); + menu_push_root_dialog(&g_AdvancedSetup4MbMenuDialog, MENUROOT_4MBMAINMENU); func0f0f8300(); } else { if (g_BossFile.locktype == MPLOCKTYPE_CHALLENGE) { - menuPushRootDialog(&g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog, MENUROOT_MPSETUP); + menu_push_root_dialog(&g_MpChallengeListOrDetailsViaAdvChallengeMenuDialog, MENUROOT_MPSETUP); } else { - menuPushRootDialog(&g_MpAdvancedSetupMenuDialog, MENUROOT_MPSETUP); + menu_push_root_dialog(&g_MpAdvancedSetupMenuDialog, MENUROOT_MPSETUP); } func0f0f8300(); @@ -5859,6 +5859,6 @@ void func0f17fcb0(s32 silent) if (!silent) { // Explosion sound - sndStart(var80095200, SFX_EXPLOSION_809A, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_EXPLOSION_809A, NULL, -1, -1, -1, -1, -1); } } diff --git a/src/game/mpstats.c b/src/game/mpstats.c index dfc66318a..ab3bac9b7 100644 --- a/src/game/mpstats.c +++ b/src/game/mpstats.c @@ -19,23 +19,23 @@ u32 var80070590 = 0x00000000; -void mpstatsIncrementPlayerShotCount(struct gset *gset, s32 region) +void mpstats_increment_player_shot_count(struct gset *gset, s32 region) { - if (!weaponHasFlag(gset->weaponnum, WEAPONFLAG_DONTCOUNTSHOTS)) { + if (!weapon_has_flag(gset->weaponnum, WEAPONFLAG_DONTCOUNTSHOTS)) { g_Vars.currentplayerstats->shotcount[region]++; } } -void mpstatsIncrementPlayerShotCount2(struct gset *gset, s32 region) +void mpstats_increment_player_shot_count2(struct gset *gset, s32 region) { if (region == 0) { - if (!weaponHasFlag(gset->weaponnum, WEAPONFLAG_DONTCOUNTSHOTS)) { + if (!weapon_has_flag(gset->weaponnum, WEAPONFLAG_DONTCOUNTSHOTS)) { var80070590 = 1; g_Vars.currentplayerstats->shotcount[region]++; } } else { if (var80070590) { - if (!weaponHasFlag(gset->weaponnum, WEAPONFLAG_DONTCOUNTSHOTS)) { + if (!weapon_has_flag(gset->weaponnum, WEAPONFLAG_DONTCOUNTSHOTS)) { g_Vars.currentplayerstats->shotcount[region]++; } @@ -49,37 +49,37 @@ void mpstats0f0b0520(void) var80070590 = 0; } -s32 mpstatsGetPlayerShotCountByRegion(u32 type) +s32 mpstats_get_player_shot_count_by_region(u32 type) { return g_Vars.currentplayerstats->shotcount[type]; } -void mpstatsIncrementTotalKillCount(void) +void mpstats_increment_total_kill_count(void) { g_Vars.killcount++; } -void mpstatsIncrementTotalKnockoutCount(void) +void mpstats_increment_total_knockout_count(void) { g_Vars.knockoutcount++; } -void mpstatsDecrementTotalKnockoutCount(void) +void mpstats_decrement_total_knockout_count(void) { g_Vars.knockoutcount--; } -u8 mpstatsGetTotalKnockoutCount(void) +u8 mpstats_get_total_knockout_count(void) { return g_Vars.knockoutcount; } -u32 mpstatsGetTotalKillCount(void) +u32 mpstats_get_total_kill_count(void) { return g_Vars.killcount; } -void mpstatsRecordPlayerKill(void) +void mpstats_record_player_kill(void) { char text[256]; s32 simulkills; @@ -90,12 +90,12 @@ void mpstatsRecordPlayerKill(void) g_Vars.currentplayer->killsthislife++; if (g_Vars.normmplayerisrunning) { - time = playerGetMissionTime(); + time = player_get_mission_time(); // Show HUD message // "Kill count: %d" - sprintf(text, "%s: %d\n", langGet(L_GUN_001), g_Vars.currentplayerstats->killcount); - hudmsgCreate(text, HUDMSGTYPE_DEFAULT); + sprintf(text, "%s: %d\n", lang_get(L_GUN_001), g_Vars.currentplayerstats->killcount); + hudmsg_create(text, HUDMSGTYPE_DEFAULT); // Update slowest/fastest two kills if (g_Vars.currentplayerstats->killcount > 1) { @@ -136,17 +136,17 @@ void mpstatsRecordPlayerKill(void) } } -s32 mpstatsGetPlayerKillCount(void) +s32 mpstats_get_player_kill_count(void) { return g_Vars.currentplayerstats->killcount; } -void mpstatsIncrementPlayerGgKillCount(void) +void mpstats_increment_player_gg_kill_count(void) { g_Vars.currentplayerstats->ggkillcount++; } -void mpstatsRecordPlayerDeath(void) +void mpstats_record_player_death(void) { char buffer[256]; @@ -154,19 +154,19 @@ void mpstatsRecordPlayerDeath(void) if (g_Vars.normmplayerisrunning) { if (g_Vars.currentplayer->deathcount == 1) { - sprintf(buffer, langGet(L_GUN_002)); // "Died once" + sprintf(buffer, lang_get(L_GUN_002)); // "Died once" } else { sprintf(buffer, "%s %d %s\n", - langGet(L_GUN_003), // "Died" + lang_get(L_GUN_003), // "Died" g_Vars.currentplayer->deathcount, - langGet(L_GUN_004)); // "times" + lang_get(L_GUN_004)); // "times" } - hudmsgCreate(buffer, HUDMSGTYPE_DEFAULT); + hudmsg_create(buffer, HUDMSGTYPE_DEFAULT); } } -void mpstatsRecordPlayerSuicide(void) +void mpstats_record_player_suicide(void) { char text[256]; s32 simulkills; @@ -176,15 +176,15 @@ void mpstatsRecordPlayerSuicide(void) struct mpchrconfig *mpchr; if (g_Vars.normmplayerisrunning) { - time = playerGetMissionTime(); + time = player_get_mission_time(); mpindex = g_Vars.currentplayerstats->mpindex; mpchr = MPCHR(mpindex); // Show HUD message // "Suicide count: %d" - sprintf(text, "%s: %d\n", langGet(L_GUN_005), mpchr->killcounts[mpindex]); - hudmsgCreate(text, HUDMSGTYPE_DEFAULT); + sprintf(text, "%s: %d\n", lang_get(L_GUN_005), mpchr->killcounts[mpindex]); + hudmsg_create(text, HUDMSGTYPE_DEFAULT); // Update slowest/fastest two kills if (g_Vars.currentplayerstats->killcount > 1) { @@ -225,7 +225,7 @@ void mpstatsRecordPlayerSuicide(void) } } -void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum) +void mpstats_record_death(s32 aplayernum, s32 vplayernum) { s32 vmpindex = -1; struct mpchrconfig *vmpchr = NULL; @@ -235,7 +235,7 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum) char text[256]; if (g_Vars.normmplayerisrunning && g_MpSetup.scenario == MPSCENARIO_POPACAP) { - pacHandleDeath(aplayernum, vplayernum); + pac_handle_death(aplayernum, vplayernum); } // Find attacker and victim mpchrs @@ -264,9 +264,9 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum) if (vplayernum < PLAYERCOUNT()) { prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(vplayernum); - mpstatsRecordPlayerSuicide(); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(vplayernum); + mpstats_record_player_suicide(); + set_current_player_num(prevplayernum); } } else { // Normal kill @@ -278,16 +278,16 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum) if (vplayernum < PLAYERCOUNT()) { // Victim was a player prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(vplayernum); + set_current_player_num(vplayernum); if (g_Vars.normmplayerisrunning && aplayernum >= 0) { // "Killed by %s" - sprintf(text, "%s %s", langGet(L_MISC_183), g_MpAllChrConfigPtrs[aplayernum]->name); - hudmsgCreate(text, HUDMSGTYPE_DEFAULT); + sprintf(text, "%s %s", lang_get(L_MISC_183), g_MpAllChrConfigPtrs[aplayernum]->name); + hudmsg_create(text, HUDMSGTYPE_DEFAULT); } - mpstatsRecordPlayerDeath(); - setCurrentPlayerNum(prevplayernum); + mpstats_record_player_death(); + set_current_player_num(prevplayernum); } } @@ -298,16 +298,16 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum) if (aplayernum >= 0 && aplayernum < PLAYERCOUNT()) { // Attacker was a player prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(aplayernum); + set_current_player_num(aplayernum); if (g_Vars.normmplayerisrunning && vplayernum >= 0) { // "Killed %s" - sprintf(text, "%s %s", langGet(L_MISC_184), g_MpAllChrConfigPtrs[vplayernum]->name); - hudmsgCreate(text, HUDMSGTYPE_DEFAULT); + sprintf(text, "%s %s", lang_get(L_MISC_184), g_MpAllChrConfigPtrs[vplayernum]->name); + hudmsg_create(text, HUDMSGTYPE_DEFAULT); } - mpstatsRecordPlayerKill(); - setCurrentPlayerNum(prevplayernum); + mpstats_record_player_kill(); + set_current_player_num(prevplayernum); } // If someone killed an aibot @@ -320,7 +320,7 @@ void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum) } if (g_Vars.normmplayerisrunning && aplayernum >= 0 && g_MpAllChrPtrs[aplayernum]->aibot) { - s32 index = mpGetWeaponSlotByWeaponNum(g_MpAllChrPtrs[aplayernum]->aibot->weaponnum); + s32 index = mp_get_weapon_slot_by_weapon_num(g_MpAllChrPtrs[aplayernum]->aibot->weaponnum); if (index >= 0) { if (aplayernum == vplayernum) { diff --git a/src/game/mtxf2lbulkasm.s b/src/game/mtxf2lbulkasm.s index f43ff8c67..cc9a7c60a 100644 --- a/src/game/mtxf2lbulkasm.s +++ b/src/game/mtxf2lbulkasm.s @@ -5,7 +5,7 @@ .text -glabel mtxF2LBulk +glabel mtx_f2l_bulk lui $t0, %hi(var8005ef10) addiu $t0, $t0, %lo(var8005ef10) lui $t1, 0xffff diff --git a/src/game/mtxf2lbulkasm_c.c b/src/game/mtxf2lbulkasm_c.c index a961a2e5c..cb95ee5b3 100644 --- a/src/game/mtxf2lbulkasm_c.c +++ b/src/game/mtxf2lbulkasm_c.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void mtxF2LBulk(Mtxf *mtx, s32 count) +void mtx_f2l_bulk(Mtxf *mtx, s32 count) { do { u32 m00 = (s32) (mtx->m[0][0] * var8005ef10[0]); diff --git a/src/game/music.c b/src/game/music.c index c6ed3dd5f..c5a127a6d 100644 --- a/src/game/music.c +++ b/src/game/music.c @@ -81,7 +81,7 @@ u32 var8008465cpf = 0; const char var7f1b7918[] = "MUSIC : activedeath=%d\n"; -u16 musicGetVolume(void) +u16 music_get_volume(void) { #if VERSION >= VERSION_NTSC_1_0 u32 volume; @@ -98,11 +98,11 @@ u16 musicGetVolume(void) return volume; #else - return optionsGetMusicVolume(); + return options_get_music_volume(); #endif } -void musicSetVolume(u16 volume) +void music_set_volume(u16 volume) { s32 i; @@ -114,7 +114,7 @@ void musicSetVolume(u16 volume) for (i = 0; i < ARRAYCOUNT(g_SeqChannels); i++) { if (g_SeqChannels[i].tracktype != TRACKTYPE_NONE && g_SeqChannels[i].tracktype != TRACKTYPE_AMBIENT) { - seqSetVolume(&g_SeqInstances[i], volume); + seq_set_volume(&g_SeqInstances[i], volume); } } @@ -123,7 +123,7 @@ void musicSetVolume(u16 volume) #endif } -bool musicIsTrackState(s32 tracktype, s32 state) +bool music_is_track_state(s32 tracktype, s32 state) { s32 i; @@ -143,7 +143,7 @@ bool musicIsTrackState(s32 tracktype, s32 state) return false; } -s32 musicGetTrackState(s32 tracktype) +s32 music_get_track_state(s32 tracktype) { s32 i; @@ -162,7 +162,7 @@ s32 musicGetTrackState(s32 tracktype) return AL_STOPPED; } -s32 musicGetChannelByTrackType(s32 tracktype) +s32 music_get_channel_by_track_type(s32 tracktype) { s32 i; @@ -175,7 +175,7 @@ s32 musicGetChannelByTrackType(s32 tracktype) return -1; } -void musicQueueStartEvent(u32 tracktype, u32 tracknum, f32 arg2, u16 volume) +void music_queue_start_event(u32 tracktype, u32 tracknum, f32 arg2, u16 volume) { if (!g_SndDisabled) { g_MusicEventQueue[g_MusicEventQueueLength].tracktype = tracktype; @@ -190,7 +190,7 @@ void musicQueueStartEvent(u32 tracktype, u32 tracknum, f32 arg2, u16 volume) } } -void musicQueueStopEvent(s32 tracktype) +void music_queue_stop_event(s32 tracktype) { if (!g_SndDisabled) { g_MusicEventQueue[g_MusicEventQueueLength].tracktype = tracktype; @@ -202,7 +202,7 @@ void musicQueueStopEvent(s32 tracktype) } } -void musicQueueFadeEvent(s32 tracktype, f32 arg1, bool keepafterfade) +void music_queue_fade_event(s32 tracktype, f32 arg1, bool keepafterfade) { if (!g_SndDisabled) { g_MusicEventQueue[g_MusicEventQueueLength].tracktype = tracktype; @@ -216,7 +216,7 @@ void musicQueueFadeEvent(s32 tracktype, f32 arg1, bool keepafterfade) } } -void musicReset(void) +void music_reset(void) { s32 i; @@ -228,11 +228,11 @@ void musicReset(void) } #if VERSION >= VERSION_NTSC_1_0 - musicSaveInterval(); - musicQueueStopAllEvent(); - musicRestoreInterval(); + music_save_interval(); + music_queue_stop_all_event(); + music_restore_interval(); #else - musicQueueStopAllEvent(); + music_queue_stop_all_event(); #endif g_MusicSoloDeathIsPlaying = false; @@ -244,7 +244,7 @@ void musicReset(void) } } -void musicQueueStopAllEvent(void) +void music_queue_stop_all_event(void) { #if VERSION >= VERSION_NTSC_1_0 g_MusicEventQueue[0].tracktype = TRACKTYPE_6; @@ -257,17 +257,17 @@ void musicQueueStopAllEvent(void) g_MusicEventQueueLength = 1; - musicTickEvents(); + music_tick_events(); } #if VERSION >= VERSION_NTSC_1_0 -void musicSaveInterval(void) +void music_save_interval(void) { g_MusicSavedInterval240 = g_MusicInterval240; g_MusicInterval240 = 0; } -void musicRestoreInterval(void) +void music_restore_interval(void) { g_MusicEventQueue[g_MusicEventQueueLength].tracktype = TRACKTYPE_6; g_MusicEventQueue[g_MusicEventQueueLength].eventtype = MUSICEVENTTYPE_SETINTERVAL; @@ -281,27 +281,27 @@ void musicRestoreInterval(void) } #endif -#define PRIMARYTRACK() (g_TemporaryPrimaryTrack != -1 ? g_TemporaryPrimaryTrack : stageGetPrimaryTrack(g_MusicStageNum)) -#define AMBIENTTRACK() (g_TemporaryAmbientTrack != -1 ? g_TemporaryAmbientTrack : stageGetAmbientTrack(g_MusicStageNum)) +#define PRIMARYTRACK() (g_TemporaryPrimaryTrack != -1 ? g_TemporaryPrimaryTrack : stage_get_primary_track(g_MusicStageNum)) +#define AMBIENTTRACK() (g_TemporaryAmbientTrack != -1 ? g_TemporaryAmbientTrack : stage_get_ambient_track(g_MusicStageNum)) -void musicStartPrimary(f32 arg0) +void music_start_primary(f32 arg0) { if (PRIMARYTRACK() >= 0) { - musicQueueStartEvent(TRACKTYPE_PRIMARY, PRIMARYTRACK(), arg0, musicGetVolume()); + music_queue_start_event(TRACKTYPE_PRIMARY, PRIMARYTRACK(), arg0, music_get_volume()); } } -void musicStartAmbient(f32 arg0) +void music_start_ambient(f32 arg0) { s32 pass = false; if (AMBIENTTRACK() >= 0) { if (g_TemporaryAmbientTrack != -1) { pass = true; - } else if (musicIsAnyPlayerInAmbientRoom()) { - if (g_Vars.tickmode != TICKMODE_CUTSCENE && AMBIENTTRACK() != stageGetAmbientTrack(g_MusicStageNum)) { - musicQueueStopEvent(TRACKTYPE_AMBIENT); - musicStartTemporaryAmbient(stageGetAmbientTrack(g_MusicStageNum)); + } else if (music_is_any_player_in_ambient_room()) { + if (g_Vars.tickmode != TICKMODE_CUTSCENE && AMBIENTTRACK() != stage_get_ambient_track(g_MusicStageNum)) { + music_queue_stop_event(TRACKTYPE_AMBIENT); + music_start_temporary_ambient(stage_get_ambient_track(g_MusicStageNum)); return; } @@ -310,16 +310,16 @@ void musicStartAmbient(f32 arg0) } if (pass) { - switch (musicGetTrackState(TRACKTYPE_AMBIENT)) { + switch (music_get_track_state(TRACKTYPE_AMBIENT)) { case AL_STOPPED: case AL_STOPPING: - musicQueueStartEvent(TRACKTYPE_AMBIENT, AMBIENTTRACK(), arg0, VOLUME(g_SfxVolume)); + music_queue_start_event(TRACKTYPE_AMBIENT, AMBIENTTRACK(), arg0, VOLUME(g_SfxVolume)); break; } } } -bool musicIsAnyPlayerInAmbientRoom(void) +bool music_is_any_player_in_ambient_room(void) { s32 i; @@ -327,7 +327,7 @@ bool musicIsAnyPlayerInAmbientRoom(void) return false; } - if (lvIsPaused()) { + if (lv_is_paused()) { return false; } @@ -360,17 +360,17 @@ bool musicIsAnyPlayerInAmbientRoom(void) return false; } -void musicStartNrg(f32 arg0) +void music_start_nrg(f32 arg0) { - musicQueueStartEvent(TRACKTYPE_NRG, stageGetNrgTrack(g_MusicStageNum), arg0, musicGetVolume()); + music_queue_start_event(TRACKTYPE_NRG, stage_get_nrg_track(g_MusicStageNum), arg0, music_get_volume()); } /** * Not called. */ -void musicStartWatch(f32 arg0) +void music_start_watch(f32 arg0) { - musicQueueStartEvent(TRACKTYPE_MENU, menuChooseMusic(), arg0, musicGetVolume()); + music_queue_start_event(TRACKTYPE_MENU, menu_choose_music(), arg0, music_get_volume()); } /** @@ -378,15 +378,15 @@ void musicStartWatch(f32 arg0) * * Used in credits and the soundtrack dialog in MP setup. */ -void musicStartTrackAsMenu(s32 tracknum) +void music_start_track_as_menu(s32 tracknum) { if (tracknum != g_MenuTrack) { - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicQueueFadeEvent(TRACKTYPE_PRIMARY, 0.5f, FADETYPE_PAUSE); - musicQueueFadeEvent(TRACKTYPE_NRG, 0.5f, FADETYPE_PAUSE); - musicQueueFadeEvent(TRACKTYPE_AMBIENT, 0.5f, FADETYPE_PAUSE); - musicQueueStartEvent(TRACKTYPE_MENU, tracknum, 0, musicGetVolume()); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_queue_fade_event(TRACKTYPE_PRIMARY, 0.5f, FADETYPE_PAUSE); + music_queue_fade_event(TRACKTYPE_NRG, 0.5f, FADETYPE_PAUSE); + music_queue_fade_event(TRACKTYPE_AMBIENT, 0.5f, FADETYPE_PAUSE); + music_queue_start_event(TRACKTYPE_MENU, tracknum, 0, music_get_volume()); } g_MenuTrack = tracknum; @@ -395,66 +395,66 @@ void musicStartTrackAsMenu(s32 tracknum) /** * Used when starting combat simulator matches. */ -void musicSetStageAndStartMusic(s32 stagenum) +void music_set_stage_and_start_music(s32 stagenum) { g_MusicStageNum = stagenum; - musicStartPrimary(0); + music_start_primary(0); - if (stageGetAmbientTrack(g_MusicStageNum) >= 0) { - musicStartAmbient(0); + if (stage_get_ambient_track(g_MusicStageNum) >= 0) { + music_start_ambient(0); } } /** * Used for solo missions. */ -void musicSetStage(s32 stagenum) +void music_set_stage(s32 stagenum) { g_MusicStageNum = stagenum; } -void musicStop(void) +void music_stop(void) { #if VERSION >= VERSION_NTSC_1_0 - musicSaveInterval(); - musicQueueStopAllEvent(); - musicRestoreInterval(); + music_save_interval(); + music_queue_stop_all_event(); + music_restore_interval(); #else - musicQueueStopAllEvent(); + music_queue_stop_all_event(); #endif } -void musicActivateNrg(void) +void music_activate_nrg(void) { #if VERSION >= VERSION_NTSC_1_0 if (!g_MusicNrgIsActive) #endif { - if (stageGetNrgTrack(g_MusicStageNum) >= 0) { - musicQueueStopEvent(TRACKTYPE_NRG); - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicQueueFadeEvent(TRACKTYPE_PRIMARY, 0.5, FADETYPE_PAUSE); - musicStartNrg(0); + if (stage_get_nrg_track(g_MusicStageNum) >= 0) { + music_queue_stop_event(TRACKTYPE_NRG); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_queue_fade_event(TRACKTYPE_PRIMARY, 0.5, FADETYPE_PAUSE); + music_start_nrg(0); g_MusicNrgIsActive = true; } } } -void musicDeactivateNrg(void) +void music_deactivate_nrg(void) { #if VERSION >= VERSION_NTSC_1_0 if (g_MusicNrgIsActive) #endif { - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicQueueFadeEvent(TRACKTYPE_NRG, 1, FADETYPE_STOP); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_queue_fade_event(TRACKTYPE_NRG, 1, FADETYPE_STOP); if (g_Vars.dontplaynrg == false) { - musicStartPrimary(0.5); + music_start_primary(0.5); } g_MusicNrgIsActive = false; @@ -464,90 +464,90 @@ void musicDeactivateNrg(void) /** * Called in many places when opening a pause menu. */ -void musicStartMenu(void) +void music_start_menu(void) { - musicStartTrackAsMenu(menuChooseMusic()); + music_start_track_as_menu(menu_choose_music()); } -void musicEndMenu(void) +void music_end_menu(void) { - musicQueueFadeEvent(TRACKTYPE_MENU, 1, FADETYPE_STOP); + music_queue_fade_event(TRACKTYPE_MENU, 1, FADETYPE_STOP); - if (musicIsTrackState(TRACKTYPE_NRG, AL_PLAYING)) { - musicStartNrg(1); + if (music_is_track_state(TRACKTYPE_NRG, AL_PLAYING)) { + music_start_nrg(1); } else { - musicStartPrimary(1); + music_start_primary(1); } g_MenuTrack = -1; } -void musicStartSoloDeath(void) +void music_start_solo_death(void) { g_MusicSoloDeathIsPlaying = true; #if VERSION >= VERSION_NTSC_1_0 - musicSaveInterval(); + music_save_interval(); #endif - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicUnsetXReason(-1); - musicQueueStopEvent(TRACKTYPE_NRG); - musicQueueStopEvent(TRACKTYPE_PRIMARY); - musicQueueStopEvent(TRACKTYPE_AMBIENT); - musicQueueStartEvent(TRACKTYPE_PRIMARY, MUSIC_DEATH_SOLO, 0, VOLUME(g_SfxVolume) > musicGetVolume() ? VOLUME(g_SfxVolume) : musicGetVolume()); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_unset_x_reason(-1); + music_queue_stop_event(TRACKTYPE_NRG); + music_queue_stop_event(TRACKTYPE_PRIMARY); + music_queue_stop_event(TRACKTYPE_AMBIENT); + music_queue_start_event(TRACKTYPE_PRIMARY, MUSIC_DEATH_SOLO, 0, VOLUME(g_SfxVolume) > music_get_volume() ? VOLUME(g_SfxVolume) : music_get_volume()); #if VERSION >= VERSION_NTSC_1_0 - musicRestoreInterval(); + music_restore_interval(); #endif } -void _musicStartMpDeath(f32 arg0) +void _music_start_mp_death(f32 arg0) { #if VERSION >= VERSION_NTSC_1_0 - musicSaveInterval(); - musicQueueStartEvent(TRACKTYPE_DEATH, MUSIC_DEATH_MP, arg0, VOLUME(g_SfxVolume) > musicGetVolume() ? VOLUME(g_SfxVolume) : musicGetVolume()); - musicRestoreInterval(); + music_save_interval(); + music_queue_start_event(TRACKTYPE_DEATH, MUSIC_DEATH_MP, arg0, VOLUME(g_SfxVolume) > music_get_volume() ? VOLUME(g_SfxVolume) : music_get_volume()); + music_restore_interval(); #else - musicQueueStartEvent(TRACKTYPE_DEATH, MUSIC_DEATH_MP, arg0, VOLUME(g_SfxVolume) > musicGetVolume() ? VOLUME(g_SfxVolume) : musicGetVolume()); + music_queue_start_event(TRACKTYPE_DEATH, MUSIC_DEATH_MP, arg0, VOLUME(g_SfxVolume) > music_get_volume() ? VOLUME(g_SfxVolume) : music_get_volume()); #endif } -void musicStartMpDeath(void) +void music_start_mp_death(void) { #if VERSION >= VERSION_NTSC_1_0 - musicSaveInterval(); + music_save_interval(); #endif - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicQueueStopEvent(TRACKTYPE_AMBIENT); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_queue_stop_event(TRACKTYPE_AMBIENT); if (g_MusicNrgIsActive) { - musicQueueFadeEvent(TRACKTYPE_NRG, 0.1f, FADETYPE_PAUSE); + music_queue_fade_event(TRACKTYPE_NRG, 0.1f, FADETYPE_PAUSE); } else { - musicQueueFadeEvent(TRACKTYPE_PRIMARY, 0.1f, FADETYPE_PAUSE); + music_queue_fade_event(TRACKTYPE_PRIMARY, 0.1f, FADETYPE_PAUSE); } - _musicStartMpDeath(0); + _music_start_mp_death(0); g_MusicDeathTimer240 = TICKS(1200); g_MusicMpDeathIsPlaying = true; #if VERSION >= VERSION_NTSC_1_0 - musicRestoreInterval(); + music_restore_interval(); #endif } -void musicEndDeath(void) +void music_end_death(void) { - musicQueueFadeEvent(TRACKTYPE_DEATH, 2, FADETYPE_STOP); + music_queue_fade_event(TRACKTYPE_DEATH, 2, FADETYPE_STOP); if (g_MusicNrgIsActive) { - musicStartNrg(2); + music_start_nrg(2); } else { - musicStartPrimary(2); + music_start_primary(2); } g_MusicMpDeathIsPlaying = false; @@ -561,22 +561,22 @@ void musicEndDeath(void) * * The track type used is primary. */ -void musicPlayTrackIsolated(s32 tracknum) +void music_play_track_isolated(s32 tracknum) { #if VERSION >= VERSION_NTSC_1_0 - musicSaveInterval(); + music_save_interval(); #endif - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicUnsetXReason(-1); - musicQueueStopEvent(TRACKTYPE_NRG); - musicQueueStopEvent(TRACKTYPE_PRIMARY); - musicQueueStopEvent(TRACKTYPE_AMBIENT); - musicQueueStartEvent(TRACKTYPE_PRIMARY, tracknum, 0, musicGetVolume()); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_unset_x_reason(-1); + music_queue_stop_event(TRACKTYPE_NRG); + music_queue_stop_event(TRACKTYPE_PRIMARY); + music_queue_stop_event(TRACKTYPE_AMBIENT); + music_queue_start_event(TRACKTYPE_PRIMARY, tracknum, 0, music_get_volume()); #if VERSION >= VERSION_NTSC_1_0 - musicRestoreInterval(); + music_restore_interval(); #endif } @@ -585,23 +585,23 @@ void musicPlayTrackIsolated(s32 tracknum) * * It's used by the AI scripting language, specifically when ending CI training. */ -void musicPlayDefaultTracks(void) +void music_play_default_tracks(void) { - musicQueueStopEvent(TRACKTYPE_PRIMARY); - musicQueueStopEvent(TRACKTYPE_AMBIENT); - musicStartPrimary(0.5f); + music_queue_stop_event(TRACKTYPE_PRIMARY); + music_queue_stop_event(TRACKTYPE_AMBIENT); + music_start_primary(0.5f); } /** * Used by the title screen, as well as AF1's NRG theme which never ends. */ -void musicStartTemporaryPrimary(s32 tracknum) +void music_start_temporary_primary(s32 tracknum) { - musicQueueStopEvent(TRACKTYPE_PRIMARY); + music_queue_stop_event(TRACKTYPE_PRIMARY); g_TemporaryPrimaryTrack = tracknum; - musicStartPrimary(0.5f); + music_start_primary(0.5f); } /** @@ -611,23 +611,23 @@ void musicStartTemporaryPrimary(s32 tracknum) * * The NRG theme will not play while a cutscene theme is active. */ -void musicStartCutscene(s32 tracknum) +void music_start_cutscene(s32 tracknum) { u32 volume; - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicUnsetXReason(-1); - musicQueueStopEvent(TRACKTYPE_NRG); - musicQueueStopEvent(TRACKTYPE_PRIMARY); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_unset_x_reason(-1); + music_queue_stop_event(TRACKTYPE_NRG); + music_queue_stop_event(TRACKTYPE_PRIMARY); - if (g_SfxVolume < musicGetVolume()) { - volume = musicGetVolume(); + if (g_SfxVolume < music_get_volume()) { + volume = music_get_volume(); } else { volume = g_SfxVolume; } - musicQueueStartEvent(TRACKTYPE_PRIMARY, tracknum, 0, volume); + music_queue_start_event(TRACKTYPE_PRIMARY, tracknum, 0, volume); g_Vars.dontplaynrg = true; } @@ -635,14 +635,14 @@ void musicStartCutscene(s32 tracknum) /** * Used by AI scripting on each stage. */ -void musicEndCutscene(void) +void music_end_cutscene(void) { g_Vars.dontplaynrg = false; if (!g_IsTitleDemo) { - musicQueueStopEvent(TRACKTYPE_PRIMARY); - musicQueueStopEvent(TRACKTYPE_AMBIENT); - musicStartPrimary(0.5f); + music_queue_stop_event(TRACKTYPE_PRIMARY); + music_queue_stop_event(TRACKTYPE_AMBIENT); + music_start_primary(0.5f); } } @@ -650,21 +650,21 @@ void musicEndCutscene(void) * Used by AI scripting, and only to set the ambient track during the Defection * intro and Extraction outro to traffic noises. */ -void musicStartTemporaryAmbient(s32 tracknum) +void music_start_temporary_ambient(s32 tracknum) { g_TemporaryAmbientTrack = tracknum; - musicQueueStopEvent(TRACKTYPE_AMBIENT); + music_queue_stop_event(TRACKTYPE_AMBIENT); - musicQueueStartEvent(TRACKTYPE_AMBIENT, tracknum, 0, VOLUME(g_SfxVolume)); + music_queue_start_event(TRACKTYPE_AMBIENT, tracknum, 0, VOLUME(g_SfxVolume)); } -void musicEndTemporaryAmbient(void) +void music_end_temporary_ambient(void) { g_TemporaryAmbientTrack = -1; - musicQueueStopEvent(TRACKTYPE_AMBIENT); + music_queue_stop_event(TRACKTYPE_AMBIENT); } -void musicSetXReason(s32 reason, u32 minsecs, u32 maxsecs) +void music_set_x_reason(s32 reason, u32 minsecs, u32 maxsecs) { if (g_AudioXReasonsActive[reason] == false) { g_AudioXReasonsActive[reason] = true; @@ -673,7 +673,7 @@ void musicSetXReason(s32 reason, u32 minsecs, u32 maxsecs) } } -void musicUnsetXReason(s32 reason) +void music_unset_x_reason(s32 reason) { s32 i; @@ -688,25 +688,25 @@ void musicUnsetXReason(s32 reason) #if VERSION >= VERSION_NTSC_1_0 if (g_MusicNrgIsActive) { - musicDeactivateNrg(); + music_deactivate_nrg(); } #endif } } /** - * Called by musicTick every 0.25 seconds. + * Called by music_tick every 0.25 seconds. */ -void musicTickAmbient(void) +void music_tick_ambient(void) { if (g_TemporaryAmbientTrack == -1) { - if (musicIsAnyPlayerInAmbientRoom()) { - musicStartAmbient(1); - } else if (musicGetTrackState(TRACKTYPE_AMBIENT) == AL_PLAYING) { - musicQueueFadeEvent(TRACKTYPE_AMBIENT, 1, FADETYPE_PAUSE); + if (music_is_any_player_in_ambient_room()) { + music_start_ambient(1); + } else if (music_get_track_state(TRACKTYPE_AMBIENT) == AL_PLAYING) { + music_queue_fade_event(TRACKTYPE_AMBIENT, 1, FADETYPE_PAUSE); } - } else if (stageGetAmbientTrack(g_MusicStageNum) >= 0) { - musicStartAmbient(1); + } else if (stage_get_ambient_track(g_MusicStageNum) >= 0) { + music_start_ambient(1); } } diff --git a/src/game/nbomb.c b/src/game/nbomb.c index 9ef9e2839..e97c11408 100644 --- a/src/game/nbomb.c +++ b/src/game/nbomb.c @@ -88,7 +88,7 @@ Gfx *func0f006c80(Gfx *gdl, struct coord *arg1, struct coord *arg2, struct coord sp64.y /= dist; sp64.z /= dist; - vertices = gfxAllocateVertices(3); + vertices = gfx_allocate_vertices(3); MAKEVERTEX(0, sp7c); MAKEVERTEX(1, sp70); @@ -114,7 +114,7 @@ Gfx *func0f006c80(Gfx *gdl, struct coord *arg1, struct coord *arg2, struct coord Gfx *func0f0073ac(Gfx *gdl, struct coord *pos, f32 arg2) { - Mtxf *modelmtx = gfxAllocateMatrix(); + Mtxf *modelmtx = gfx_allocate_matrix(); Vtx *vertices; Col *colours; Mtxf sp104; @@ -134,14 +134,14 @@ Gfx *func0f0073ac(Gfx *gdl, struct coord *pos, f32 arg2) spf8[0].y = 0.0f; spf8[0].z = -100.0f; - mtx4LoadIdentity(&sp104); - mtx4LoadTranslation(pos, &sp104); - mtx00015be0(camGetWorldToScreenMtxf(), &sp104); - mtxF2L(&sp104, modelmtx); + mtx4_load_identity(&sp104); + mtx4_load_translation(pos, &sp104); + mtx00015be0(cam_get_world_to_screen_mtxf(), &sp104); + mtx_f2l(&sp104, modelmtx); gSPMatrix(gdl++, osVirtualToPhysical(modelmtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - texSelect(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, true, NULL); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -163,14 +163,14 @@ Gfx *func0f0073ac(Gfx *gdl, struct coord *pos, f32 arg2) gDPSetRenderMode(gdl++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); gDPSetTexturePersp(gdl++, G_TP_PERSP); - texSelect(&gdl, NULL, 2, 1, 2, true, NULL); + tex_select(&gdl, NULL, 2, 1, 2, true, NULL); gDPSetRenderMode(gdl++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); var8009cb00 = 2048.0f * g_20SecIntervalFrac; var8009cb04 = 0; - vertices = gfxAllocateVertices(6); + vertices = gfx_allocate_vertices(6); MAKEVERTEX(0, spb0[0]); MAKEVERTEX(1, spb0[1]); @@ -179,7 +179,7 @@ Gfx *func0f0073ac(Gfx *gdl, struct coord *pos, f32 arg2) MAKEVERTEX(4, spb0[4]); MAKEVERTEX(5, spb0[5]); - colours = gfxAllocateColours(1); + colours = gfx_allocate_colours(1); colours[0].word = 0xff00007f; @@ -193,7 +193,7 @@ Gfx *func0f0073ac(Gfx *gdl, struct coord *pos, f32 arg2) var8009cb04 = 1; - vertices = gfxAllocateVertices(6); + vertices = gfx_allocate_vertices(6); MAKEVERTEX(0, spb0[0]); MAKEVERTEX(1, spb0[1]); @@ -228,7 +228,7 @@ Gfx *func0f008558(Gfx *gdl, s32 depth) var8009cb04 = 0; - vertices = gfxAllocateVertices(6); + vertices = gfx_allocate_vertices(6); MAKEVERTEX(0, sp5c[0]); MAKEVERTEX(1, sp5c[1]); @@ -246,7 +246,7 @@ Gfx *func0f008558(Gfx *gdl, s32 depth) var8009cb04 = 1; - vertices = gfxAllocateVertices(6); + vertices = gfx_allocate_vertices(6); MAKEVERTEX(0, sp5c[0]); MAKEVERTEX(1, sp5c[1]); @@ -275,7 +275,7 @@ void nbomb0f0093c4(f32 *arg0) guNormalize(&arg0[1], &arg0[2], &arg0[3]); } -void nbombReset(struct nbomb *nbomb) +void nbomb_reset(struct nbomb *nbomb) { nbomb->age240 = 0; #if VERSION >= VERSION_PAL_BETA @@ -288,7 +288,7 @@ void nbombReset(struct nbomb *nbomb) * If nbomb->age240 is 311 to 349, return a scaled number between 127 and 0 * If nbomb->age240 is 350+, return 0 */ -s32 nbombCalculateAlpha(struct nbomb *nbomb) +s32 nbomb_calculate_alpha(struct nbomb *nbomb) { s32 alpha = 127; @@ -308,7 +308,7 @@ s32 nbombCalculateAlpha(struct nbomb *nbomb) * * The gdl sets up a single vertex but has no colour or triangles. */ -Gfx *nbombCreateGdl(void) +Gfx *nbomb_create_gdl(void) { Vtx *vertices; u32 gdlsizes[] = { 0x0a30, 0x0330 }; // 1 player, 2+ players @@ -322,9 +322,9 @@ Gfx *nbombCreateGdl(void) var8009cb00 = (s32)(g_20SecIntervalFrac * 64.0f * 32.0f * 16.0f) % 0x800; - gdl = gdlstart = gfxAllocate(gdlsizes[index]); + gdl = gdlstart = gfx_allocate(gdlsizes[index]); - texSelect(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, 1, NULL); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -336,7 +336,7 @@ Gfx *nbombCreateGdl(void) gDPSetRenderMode(gdl++, G_RM_ZB_XLU_SURF, G_RM_ZB_XLU_SURF2); gDPSetTexturePersp(gdl++, G_TP_PERSP); - vertices = gfxAllocateVertices(1); + vertices = gfx_allocate_vertices(1); vertices[0].z = 0; vertices[0].t = 0; @@ -361,7 +361,7 @@ Gfx *nbombCreateGdl(void) struct sndstate *g_NbombAudioHandle = NULL; -Gfx *nbombRender(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl) +Gfx *nbomb_render(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl) { f32 divider = 2048; Mtxf *mtx; @@ -372,11 +372,11 @@ Gfx *nbombRender(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl) u32 colour; Col *colours; - mtx = gfxAllocateMatrix(); + mtx = gfx_allocate_matrix(); var80061644 = 2000.0f; - colour = nbombCalculateAlpha(nbomb); + colour = nbomb_calculate_alpha(nbomb); - colours = gfxAllocateColours(2); + colours = gfx_allocate_colours(2); colours[0].word = colour; colours[1].word = 0xffffff00; @@ -386,19 +386,19 @@ Gfx *nbombRender(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl) sp3c.y = 0; sp3c.z = -100; - mtx4LoadIdentity(&sp48); - mtx4LoadTranslation(&nbomb->pos, &sp48); + mtx4_load_identity(&sp48); + mtx4_load_translation(&nbomb->pos, &sp48); sp3c.x = 0; sp3c.y = nbomb->unk14 / divider * M_TAU; sp3c.z = 0; - mtx4LoadRotation(&sp3c, &sp88); + mtx4_load_rotation(&sp3c, &sp88); mtx00015f04(nbomb->radius / 2000.0f, &sp88); - mtx4MultMtx4(&sp48, &sp88, &spc8); + mtx4_mult_mtx4(&sp48, &sp88, &spc8); - mtx00015be0(camGetWorldToScreenMtxf(), &spc8); - mtxF2L(&spc8, mtx); + mtx00015be0(cam_get_world_to_screen_mtxf(), &spc8); + mtx_f2l(&spc8, mtx); gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -424,7 +424,7 @@ void func0f0099a4(void) } } -void nbombInflictDamage(struct nbomb *nbomb) +void nbomb_inflict_damage(struct nbomb *nbomb) { s32 index = 0; u32 stack; @@ -462,7 +462,7 @@ void nbombInflictDamage(struct nbomb *nbomb) if (index < 52) { roomnums[index] = i; index++; - roomFlashLighting(i, -38, -180); + room_flash_lighting(i, -38, -180); } } } @@ -472,7 +472,7 @@ void nbombInflictDamage(struct nbomb *nbomb) if (1); // Iterate props in the affected rooms and damage any chrs - roomGetProps(roomnums, propnums, 256); + room_get_props(roomnums, propnums, 256); propnumptr = propnums; @@ -497,7 +497,7 @@ void nbombInflictDamage(struct nbomb *nbomb) struct coord vector = {0, 0, 0}; f32 damage = 0.01f * g_Vars.lvupdate60freal; - chrDamageByMisc(chr, damage, &vector, &gset, nbomb->ownerprop); + chr_damage_by_misc(chr, damage, &vector, &gset, nbomb->ownerprop); #if VERSION >= VERSION_NTSC_1_0 if (chr->actiontype); @@ -506,7 +506,7 @@ void nbombInflictDamage(struct nbomb *nbomb) chr->chrflags |= CHRCFLAG_TRIGGERSHOTLIST; if (chr->hidden & CHRHFLAG_CLOAKED) { - chrUncloak(chr, true); + chr_uncloak(chr, true); } } @@ -519,7 +519,7 @@ void nbombInflictDamage(struct nbomb *nbomb) } } -void nbombTick(struct nbomb *nbomb) +void nbomb_tick(struct nbomb *nbomb) { if (nbomb->age240 >= 0) { s32 age60; @@ -542,7 +542,7 @@ void nbombTick(struct nbomb *nbomb) nbomb->radius *= 500.0f; - nbombInflictDamage(nbomb); + nbomb_inflict_damage(nbomb); age60 = nbomb->age240 / 4; @@ -564,7 +564,7 @@ void nbombTick(struct nbomb *nbomb) } } -void nbombsTick(void) +void nbombs_tick(void) { s32 i; s32 youngest240 = 20000; @@ -576,7 +576,7 @@ void nbombsTick(void) for (i = 0; i < ARRAYCOUNT(g_Nbombs); i++) { if (g_Vars.lvupdate240 != 0 && g_Nbombs[i].age240 >= 0) { - nbombTick(&g_Nbombs[i]); + nbomb_tick(&g_Nbombs[i]); if (g_Nbombs[i].age240 < youngest240) { youngest240 = g_Nbombs[i].age240; @@ -591,13 +591,13 @@ void nbombsTick(void) if (youngest240 < TICKS(350)) { if (g_Vars.lvupdate240 != 0) { if (g_NbombAudioHandle == 0) { - sndStart(var80095200, SFX_SHIP_HUM, &g_NbombAudioHandle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_SHIP_HUM, &g_NbombAudioHandle, -1, -1, -1, -1, -1); } volume = AL_VOL_FULL; if (g_NbombAudioHandle) { - f32 speed = menuGetSinOscFrac(20) * 0.02f + 0.4f; + f32 speed = menu_get_sin_osc_frac(20) * 0.02f + 0.4f; if (youngest240 > TICKS(300)) { volume = (1.0f - (f32)(youngest240 - TICKS(300)) / (PAL ? 41.0f : 50.0f)) * AL_VOL_FULL; @@ -642,7 +642,7 @@ void nbombsTick(void) } } -Gfx *nbombsRender(Gfx *gdl) +Gfx *nbombs_render(Gfx *gdl) { s32 i; Gfx *subgdl = NULL; @@ -650,17 +650,17 @@ Gfx *nbombsRender(Gfx *gdl) for (i = 0; i < ARRAYCOUNT(g_Nbombs); i++) { if (g_Nbombs[i].age240 >= 0) { if (!subgdl) { - subgdl = nbombCreateGdl(); + subgdl = nbomb_create_gdl(); } - gdl = nbombRender(gdl, &g_Nbombs[i], subgdl); + gdl = nbomb_render(gdl, &g_Nbombs[i], subgdl); } } return gdl; } -void nbombCreateStorm(struct coord *pos, struct prop *ownerprop) +void nbomb_create_storm(struct coord *pos, struct prop *ownerprop) { u32 stack; s32 oldest240; @@ -689,7 +689,7 @@ void nbombCreateStorm(struct coord *pos, struct prop *ownerprop) } } - nbombReset(&g_Nbombs[index]); + nbomb_reset(&g_Nbombs[index]); g_Nbombs[index].pos.x = pos->x; g_Nbombs[index].pos.y = pos->y; @@ -701,7 +701,7 @@ void nbombCreateStorm(struct coord *pos, struct prop *ownerprop) // Newer versions only play audio if the handles are null, // while ntsc-beta clears the handles then plays them unconditionally. if (g_Nbombs[index].audiohandle20 == NULL) { - sndStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle20, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle20, -1, -1, -1, -1, -1); if (g_Nbombs[index].audiohandle20) { union audioparam param; @@ -711,7 +711,7 @@ void nbombCreateStorm(struct coord *pos, struct prop *ownerprop) } if (g_Nbombs[index].audiohandle24 == NULL) { - sndStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle24, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle24, -1, -1, -1, -1, -1); if (g_Nbombs[index].audiohandle24) { union audioparam param; @@ -723,7 +723,7 @@ void nbombCreateStorm(struct coord *pos, struct prop *ownerprop) g_Nbombs[index].audiohandle20 = NULL; g_Nbombs[index].audiohandle24 = NULL; - sndStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle20, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle20, -1, -1, -1, -1, -1); if (g_Nbombs[index].audiohandle20) { union audioparam param; @@ -731,7 +731,7 @@ void nbombCreateStorm(struct coord *pos, struct prop *ownerprop) audioPostEvent(g_Nbombs[index].audiohandle20, AL_SNDP_PITCH_EVT, param.s32); } - sndStart(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle24, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_LAUNCH_ROCKET, &g_Nbombs[index].audiohandle24, -1, -1, -1, -1, -1); if (g_Nbombs[index].audiohandle24) { union audioparam param; @@ -741,9 +741,9 @@ void nbombCreateStorm(struct coord *pos, struct prop *ownerprop) #endif } -bool doorIsOpenOrOpening(s32 tagnum) +bool door_is_open_or_opening(s32 tagnum) { - struct defaultobj *obj = objFindByTagId(tagnum); + struct defaultobj *obj = obj_find_by_tag_id(tagnum); if (obj && obj->prop && obj->type == OBJTYPE_DOOR) { struct doorobj *door = (struct doorobj *)obj; @@ -765,9 +765,9 @@ bool doorIsOpenOrOpening(s32 tagnum) return false; } -f32 gasGetDoorFrac(s32 tagnum) +f32 gas_get_door_frac(s32 tagnum) { - struct defaultobj *obj = objFindByTagId(tagnum); + struct defaultobj *obj = obj_find_by_tag_id(tagnum); if (obj && obj->prop && obj->type == OBJTYPE_DOOR) { struct doorobj *door = (struct doorobj *)obj; @@ -781,7 +781,7 @@ f32 gasGetDoorFrac(s32 tagnum) * Checks if the player is inside an nbomb storm, and if so renders the black * storm texture directly over the screen. */ -Gfx *nbombRenderOverlay(Gfx *gdl) +Gfx *nbomb_render_overlay(Gfx *gdl) { bool inside = false; struct coord campos; @@ -811,7 +811,7 @@ Gfx *nbombRenderOverlay(Gfx *gdl) f32 zdiff = campos.f[2] - g_Nbombs[i].pos.f[2]; if (sqrtf(xdiff * xdiff + ydiff * ydiff + zdiff * zdiff) < g_Nbombs[i].radius) { - u32 alpha = nbombCalculateAlpha(&g_Nbombs[i]); + u32 alpha = nbomb_calculate_alpha(&g_Nbombs[i]); inside = true; @@ -823,13 +823,13 @@ Gfx *nbombRenderOverlay(Gfx *gdl) } if (inside) { - colours = gfxAllocateColours(1); - vertices = gfxAllocateVertices(4); + colours = gfx_allocate_colours(1); + vertices = gfx_allocate_vertices(4); - viewleft = viGetViewLeft() * 10; - viewtop = viGetViewTop() * 10; - viewright = (s16) (viGetViewLeft() + viGetViewWidth()) * 10; - viewbottom = (s16) (viGetViewTop() + viGetViewHeight()) * 10; + viewleft = vi_get_view_left() * 10; + viewtop = vi_get_view_top() * 10; + viewright = (s16) (vi_get_view_left() + vi_get_view_width()) * 10; + viewbottom = (s16) (vi_get_view_top() + vi_get_view_height()) * 10; s = (s32) (8.0f * g_20SecIntervalFrac * 128.0f * 32.0f) % 2048; t = (s16) ((s32) (campos.f[1] * 8.0f) % 2048) + (s16) (2.0f * g_20SecIntervalFrac * 128.0f * 32.0f); @@ -843,7 +843,7 @@ Gfx *nbombRenderOverlay(Gfx *gdl) if (1); - texSelect(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, true, NULL); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); @@ -900,7 +900,7 @@ Gfx *nbombRenderOverlay(Gfx *gdl) return gdl; } -Gfx *gasRender(Gfx *gdl) +Gfx *gas_render(Gfx *gdl) { bool show = false; f32 alphafrac = 1.0f; @@ -933,7 +933,7 @@ Gfx *gasRender(Gfx *gdl) campos.z = g_Vars.currentplayer->cam_pos.z; for (i = 0; i < ARRAYCOUNT(gasrooms); i++) { - if (bgRoomContainsCoord(&campos, gasrooms[i])) { + if (bg_room_contains_coord(&campos, gasrooms[i])) { show = true; } } @@ -948,13 +948,13 @@ Gfx *gasRender(Gfx *gdl) if (distance < 1328.0f) { show = true; alphafrac = 1.0f - distance / 1328.0f; - intensityfrac = gasGetDoorFrac(0x32); + intensityfrac = gas_get_door_frac(0x32); } } else { - if (bgRoomContainsCoord(&campos, 0x91)) { + if (bg_room_contains_coord(&campos, 0x91)) { // In the small room between the first two doors - f32 frac1 = gasGetDoorFrac(0x30); - f32 frac2 = gasGetDoorFrac(0x31); + f32 frac1 = gas_get_door_frac(0x30); + f32 frac2 = gas_get_door_frac(0x31); if (frac2 > frac1) { intensityfrac = frac2; @@ -978,12 +978,12 @@ Gfx *gasRender(Gfx *gdl) } if (show) { - Col *colours = gfxAllocateColours(1); - Vtx *vertices = gfxAllocateVertices(8); - s16 viewleft = viGetViewLeft() * 10; - s16 viewtop = viGetViewTop() * 10; - s16 viewright = (s16) (viGetViewLeft() + viGetViewWidth()) * 10; - s16 viewbottom = (s16) (viGetViewTop() + viGetViewHeight()) * 10; + Col *colours = gfx_allocate_colours(1); + Vtx *vertices = gfx_allocate_vertices(8); + s16 viewleft = vi_get_view_left() * 10; + s16 viewtop = vi_get_view_top() * 10; + s16 viewright = (s16) (vi_get_view_left() + vi_get_view_width()) * 10; + s16 viewbottom = (s16) (vi_get_view_top() + vi_get_view_height()) * 10; f32 lookx = g_Vars.currentplayer->cam_look.x; f32 lookz = g_Vars.currentplayer->cam_look.z; f32 camposx = g_Vars.currentplayer->cam_pos.x; @@ -1001,8 +1001,8 @@ Gfx *gasRender(Gfx *gdl) sp78 = atan2f(-lookx, lookz) / M_BADTAU; - layer2s = ((s32) (2.0f * ((menuGetSinOscFrac(4.0f) - 0.5f) / 6.0f + sp78 + f16 * 1.5f) * 128.0f * 32.0f) % 2048); - layer1s = ((s32) (2.0f * ((menuGetCosOscFrac(4.0f) - 0.5f) / -9.0f + sp78 + f16) * 128.0f * 32.0f) % 2048); + layer2s = ((s32) (2.0f * ((menu_get_sin_osc_frac(4.0f) - 0.5f) / 6.0f + sp78 + f16 * 1.5f) * 128.0f * 32.0f) % 2048); + layer1s = ((s32) (2.0f * ((menu_get_cos_osc_frac(4.0f) - 0.5f) / -9.0f + sp78 + f16) * 128.0f * 32.0f) % 2048); layer2t = (s16) ((s32) (campos.y * 8.0f) % 2048) + (s16) (2.0f * g_20SecIntervalFrac * 128.0f * 32.0f); layer1t = (s16) ((s32) (campos.y * 8.0f) % 2048) + (s16) (2.0f * g_20SecIntervalFrac * 64.0f * 32.0f); @@ -1013,7 +1013,7 @@ Gfx *gasRender(Gfx *gdl) if (1); - texSelect(&gdl, &g_TexGeneralConfigs[6], 4, 1, 2, true, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[6], 4, 1, 2, true, NULL); gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); diff --git a/src/game/objectives.c b/src/game/objectives.c index 61e147e26..48f3d729a 100644 --- a/src/game/objectives.c +++ b/src/game/objectives.c @@ -38,17 +38,17 @@ s32 g_ObjectiveLastIndex = -1; bool g_ObjectiveChecksDisabled = false; #if PIRACYCHECKS -u32 xorBaffbeff(u32 value) +u32 xor_baffbeff(u32 value) { return value ^ 0xbaffbeff; } -u32 xorBabeffff(u32 value) +u32 xor_babeffff(u32 value) { return value ^ 0xbabeffff; } -u32 xorBoobless(u32 value) +u32 xor_boobless(u32 value) { return value ^ 0xb00b1e55; } @@ -60,7 +60,7 @@ void func0f095350(u32 arg0, u32 *arg1) __osPiGetAccess(); - ptr = (u32 *)(xorBoobless(0x04600010 ^ 0xb00b1e55) | 0xa0000000); + ptr = (u32 *)(xor_boobless(0x04600010 ^ 0xb00b1e55) | 0xa0000000); value = *ptr; @@ -74,7 +74,7 @@ void func0f095350(u32 arg0, u32 *arg1) } #endif -void tagsReset(void) +void tags_reset(void) { s32 index = 0; struct tag *tag = g_TagsLinkedList; @@ -91,7 +91,7 @@ void tagsReset(void) if (g_NumTags) { u32 size = index * 4; - g_TagPtrs = mempAlloc(ALIGN16(size), MEMPOOL_STAGE); + g_TagPtrs = memp_alloc(ALIGN16(size), MEMPOOL_STAGE); for (index = 0; index < g_NumTags; index++) { g_TagPtrs[index] = NULL; @@ -107,22 +107,22 @@ void tagsReset(void) #if PIRACYCHECKS { - // mtxGetObfuscatedRomBase() returns the value at ROM offset 0xa5c. + // mtx_get_obfuscated_rom_base() returns the value at ROM offset 0xa5c. // This value should be 0x1740fff9. - u32 dummy = xorBaffbeff(0xb0000a5c ^ 0xbaffbeff); - u32 expected = xorBabeffff(0x1740fff9 ^ 0xbabeffff); + u32 dummy = xor_baffbeff(0xb0000a5c ^ 0xbaffbeff); + u32 expected = xor_babeffff(0x1740fff9 ^ 0xbabeffff); - if (mtxGetObfuscatedRomBase() != expected) { + if (mtx_get_obfuscated_rom_base() != expected) { // Read 4KB from a random ROM location within 128KB from the start of // the ROM, and write it to a random memory location between 0x80010000 // and 0x80030ff8. This will corrupt instructions in the lib segment. - dmaExec((u8 *)((random() & 0x1fff8) + 0x80010000), random() & 0x1fffe, 0x1000); + dma_exec((u8 *)((random() & 0x1fff8) + 0x80010000), random() & 0x1fffe, 0x1000); } } #endif } -struct tag *tagFindById(s32 tag_id) +struct tag *tag_find_by_id(s32 tag_id) { struct tag *tag = NULL; @@ -133,7 +133,7 @@ struct tag *tagFindById(s32 tag_id) return tag; } -s32 objGetTagNum(struct defaultobj *obj) +s32 obj_get_tag_num(struct defaultobj *obj) { struct tag *tag = g_TagsLinkedList; @@ -150,9 +150,9 @@ s32 objGetTagNum(struct defaultobj *obj) return -1; } -struct defaultobj *objFindByTagId(s32 tag_id) +struct defaultobj *obj_find_by_tag_id(s32 tag_id) { - struct tag *tag = tagFindById(tag_id); + struct tag *tag = tag_find_by_id(tag_id); struct defaultobj *obj = NULL; if (tag) { @@ -166,21 +166,21 @@ struct defaultobj *objFindByTagId(s32 tag_id) return obj; } -s32 objectiveGetCount(void) +s32 objective_get_count(void) { return g_ObjectiveLastIndex + 1; } -char *objectiveGetText(s32 index) +char *objective_get_text(s32 index) { if (index < 10 && g_Objectives[index]) { - return langGet(g_Objectives[index]->text); + return lang_get(g_Objectives[index]->text); } return NULL; } -u32 objectiveGetDifficultyBits(s32 index) +u32 objective_get_difficulty_bits(s32 index) { if (index < 10 && g_Objectives[index]) { return g_Objectives[index]->difficulties; @@ -196,7 +196,7 @@ u32 objectiveGetDifficultyBits(s32 index) * requirement in the objective to decide whether to change it to incomplete or * failed. */ -s32 objectiveCheck(s32 index) +s32 objective_check(s32 index) { u32 stack[5]; s32 objstatus = OBJECTIVE_COMPLETE; @@ -217,46 +217,46 @@ s32 objectiveCheck(s32 index) switch ((u8)cmd[0]) { case OBJECTIVETYPE_DESTROYOBJ: { - struct defaultobj *obj = objFindByTagId(cmd[1]); - if (obj && obj->prop && objIsHealthy(obj)) { + struct defaultobj *obj = obj_find_by_tag_id(cmd[1]); + if (obj && obj->prop && obj_is_healthy(obj)) { reqstatus = OBJECTIVE_INCOMPLETE; } } break; case OBJECTIVETYPE_COMPFLAGS: - if (!chrHasStageFlag(NULL, cmd[1])) { + if (!chr_has_stage_flag(NULL, cmd[1])) { reqstatus = OBJECTIVE_INCOMPLETE; } break; case OBJECTIVETYPE_FAILFLAGS: - if (chrHasStageFlag(NULL, cmd[1])) { + if (chr_has_stage_flag(NULL, cmd[1])) { reqstatus = OBJECTIVE_FAILED; } break; case OBJECTIVETYPE_COLLECTOBJ: { - struct defaultobj *obj = objFindByTagId(cmd[1]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[1]); s32 prevplayernum; s32 collected = false; s32 i; - if (!obj || !obj->prop || !objIsHealthy(obj)) { + if (!obj || !obj->prop || !obj_is_healthy(obj)) { reqstatus = OBJECTIVE_FAILED; } else { prevplayernum = g_Vars.currentplayernum; for (i = 0; i < PLAYERCOUNT(); i++) { if (g_Vars.players[i] == g_Vars.bond || g_Vars.players[i] == g_Vars.coop) { - setCurrentPlayerNum(i); + set_current_player_num(i); - if (invHasProp(obj->prop)) { + if (inv_has_prop(obj->prop)) { collected = true; break; } } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); if (!collected) { reqstatus = OBJECTIVE_INCOMPLETE; @@ -266,7 +266,7 @@ s32 objectiveCheck(s32 index) break; case OBJECTIVETYPE_THROWOBJ: { - struct defaultobj *obj = objFindByTagId(cmd[1]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[1]); if (obj && obj->prop) { s32 i; @@ -274,25 +274,25 @@ s32 objectiveCheck(s32 index) for (i = 0; i < PLAYERCOUNT(); i++) { if (g_Vars.players[i] == g_Vars.bond || g_Vars.players[i] == g_Vars.coop) { - setCurrentPlayerNum(i); + set_current_player_num(i); - if (invHasProp(obj->prop)) { + if (inv_has_prop(obj->prop)) { reqstatus = OBJECTIVE_INCOMPLETE; break; } } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } } break; case OBJECTIVETYPE_HOLOGRAPH: { - struct defaultobj *obj = objFindByTagId(cmd[1]); + struct defaultobj *obj = obj_find_by_tag_id(cmd[1]); if (cmd[2] == 0) { - if (!obj || !obj->prop || !objIsHealthy(obj)) { + if (!obj || !obj->prop || !obj_is_healthy(obj)) { reqstatus = OBJECTIVE_FAILED; } else { reqstatus = OBJECTIVE_INCOMPLETE; @@ -329,27 +329,27 @@ s32 objectiveCheck(s32 index) } } - cmd = cmd + setupGetCmdLength(cmd); + cmd = cmd + setup_get_cmd_length(cmd); } } } - if (debugForceAllObjectivesComplete()) { + if (debug_force_all_objectives_complete()) { objstatus = OBJECTIVE_COMPLETE; } return objstatus; } -bool objectiveIsAllComplete(void) +bool objective_is_all_complete(void) { s32 i; - for (i = 0; i < objectiveGetCount(); i++) { - u32 diffbits = objectiveGetDifficultyBits(i); + for (i = 0; i < objective_get_count(); i++) { + u32 diffbits = objective_get_difficulty_bits(i); - if ((1 << lvGetDifficulty() & diffbits) && - objectiveCheck(i) != OBJECTIVE_COMPLETE) { + if ((1 << lv_get_difficulty() & diffbits) && + objective_check(i) != OBJECTIVE_COMPLETE) { return false; } } @@ -357,30 +357,30 @@ bool objectiveIsAllComplete(void) return true; } -void objectivesDisableChecking(void) +void objectives_disable_checking(void) { g_ObjectiveChecksDisabled = true; } #if VERSION >= VERSION_NTSC_1_0 -void objectivesShowHudmsg(char *buffer, s32 hudmsgtype) +void objectives_show_hudmsg(char *buffer, s32 hudmsgtype) { s32 prevplayernum = g_Vars.currentplayernum; s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); if (g_Vars.currentplayer == g_Vars.bond || g_Vars.currentplayer == g_Vars.coop) { - hudmsgCreateWithFlags(buffer, hudmsgtype, HUDMSGFLAG_DELAY | HUDMSGFLAG_ALLOWDUPES); + hudmsg_create_with_flags(buffer, hudmsgtype, HUDMSGFLAG_DELAY | HUDMSGFLAG_ALLOWDUPES); } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } #endif -void objectivesCheckAll(void) +void objectives_check_all(void) { s32 availableindex = 0; s32 i; @@ -388,63 +388,63 @@ void objectivesCheckAll(void) if (!g_ObjectiveChecksDisabled) { for (i = 0; i <= g_ObjectiveLastIndex; i++) { - s32 status = objectiveCheck(i); + s32 status = objective_check(i); if (g_ObjectiveStatuses[i] != status) { g_ObjectiveStatuses[i] = status; - if (objectiveGetDifficultyBits(i) & (1 << lvGetDifficulty())) { + if (objective_get_difficulty_bits(i) & (1 << lv_get_difficulty())) { #if VERSION >= VERSION_JPN_FINAL u8 jpnstr[] = {0, 0, 0}; jpnstr[0] = 0x80; jpnstr[1] = 0x80 | (0x11 + availableindex); - sprintf(buffer, "%s %s: ", langGet(L_MISC_044), jpnstr); // "Objective" + sprintf(buffer, "%s %s: ", lang_get(L_MISC_044), jpnstr); // "Objective" #else - sprintf(buffer, "%s %d: ", langGet(L_MISC_044), availableindex + 1); // "Objective" + sprintf(buffer, "%s %d: ", lang_get(L_MISC_044), availableindex + 1); // "Objective" #endif #if VERSION >= VERSION_NTSC_1_0 // NTSC 1.0 and above shows objective messages to everyone, // while beta only shows them to the current player. if (status == OBJECTIVE_COMPLETE) { - strcat(buffer, langGet(L_MISC_045)); // "Completed" - objectivesShowHudmsg(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE); + strcat(buffer, lang_get(L_MISC_045)); // "Completed" + objectives_show_hudmsg(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE); } else if (status == OBJECTIVE_INCOMPLETE) { - strcat(buffer, langGet(L_MISC_046)); // "Incomplete" - objectivesShowHudmsg(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE); + strcat(buffer, lang_get(L_MISC_046)); // "Incomplete" + objectives_show_hudmsg(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE); } else if (status == OBJECTIVE_FAILED) { - strcat(buffer, langGet(L_MISC_047)); // "Failed" - objectivesShowHudmsg(buffer, HUDMSGTYPE_OBJECTIVEFAILED); + strcat(buffer, lang_get(L_MISC_047)); // "Failed" + objectives_show_hudmsg(buffer, HUDMSGTYPE_OBJECTIVEFAILED); } #else if (status == OBJECTIVE_COMPLETE) { - strcat(buffer, langGet(L_MISC_045)); // "Completed" - hudmsgCreateWithFlags(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE, HUDMSGFLAG_ALLOWDUPES); + strcat(buffer, lang_get(L_MISC_045)); // "Completed" + hudmsg_create_with_flags(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE, HUDMSGFLAG_ALLOWDUPES); } else if (status == OBJECTIVE_INCOMPLETE) { - strcat(buffer, langGet(L_MISC_046)); // "Incomplete" - hudmsgCreateWithFlags(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE, HUDMSGFLAG_ALLOWDUPES); + strcat(buffer, lang_get(L_MISC_046)); // "Incomplete" + hudmsg_create_with_flags(buffer, HUDMSGTYPE_OBJECTIVECOMPLETE, HUDMSGFLAG_ALLOWDUPES); } else if (status == OBJECTIVE_FAILED) { - strcat(buffer, langGet(L_MISC_047)); // "Failed" - hudmsgCreateWithFlags(buffer, HUDMSGTYPE_OBJECTIVEFAILED, HUDMSGFLAG_ALLOWDUPES); + strcat(buffer, lang_get(L_MISC_047)); // "Failed" + hudmsg_create_with_flags(buffer, HUDMSGTYPE_OBJECTIVEFAILED, HUDMSGFLAG_ALLOWDUPES); } #endif } } - if (objectiveGetDifficultyBits(i) & (1 << lvGetDifficulty())) { + if (objective_get_difficulty_bits(i) & (1 << lv_get_difficulty())) { availableindex++; } } } } -void objectiveCheckRoomEntered(s32 currentroom) +void objective_check_room_entered(s32 currentroom) { struct criteria_roomentered *criteria = g_RoomEnteredCriterias; while (criteria) { if (criteria->status == OBJECTIVE_INCOMPLETE) { - s32 room = chrGetPadRoom(NULL, criteria->pad); + s32 room = chr_get_pad_room(NULL, criteria->pad); if (room >= 0 && room == currentroom) { criteria->status = OBJECTIVE_COMPLETE; @@ -455,20 +455,20 @@ void objectiveCheckRoomEntered(s32 currentroom) } } -void objectiveCheckThrowInRoom(s32 arg0, RoomNum *inrooms) +void objective_check_throw_in_room(s32 arg0, RoomNum *inrooms) { struct criteria_throwinroom *criteria = g_ThrowInRoomCriterias; while (criteria) { if (criteria->status == OBJECTIVE_INCOMPLETE && criteria->unk04 == arg0) { - s32 room = chrGetPadRoom(NULL, criteria->pad); + s32 room = chr_get_pad_room(NULL, criteria->pad); if (room >= 0) { RoomNum requirerooms[2]; requirerooms[0] = room; requirerooms[1] = -1; - if (arrayIntersects(requirerooms, inrooms)) { + if (array_intersects(requirerooms, inrooms)) { criteria->status = OBJECTIVE_COMPLETE; } } @@ -478,7 +478,7 @@ void objectiveCheckThrowInRoom(s32 arg0, RoomNum *inrooms) } } -void objectiveCheckHolograph(f32 maxdist) +void objective_check_holograph(f32 maxdist) { struct criteria_holograph *criteria = g_HolographCriterias; @@ -488,12 +488,12 @@ void objectiveCheckHolograph(f32 maxdist) } if (criteria->status == OBJECTIVE_INCOMPLETE) { - struct defaultobj *obj = objFindByTagId(criteria->obj); + struct defaultobj *obj = obj_find_by_tag_id(criteria->obj); if (obj && obj->prop && (obj->prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) && obj->prop->z >= 0 - && objIsHealthy(obj)) { + && obj_is_healthy(obj)) { struct coord sp9c; f32 sp94[2]; f32 sp8c[2]; @@ -511,18 +511,18 @@ void objectiveCheckHolograph(f32 maxdist) f32 sp70[2]; func0f06803c(&sp9c, sp94, sp8c, sp78, sp70); - if (sp78[0] > camGetScreenLeft() - && sp78[0] < camGetScreenLeft() + camGetScreenWidth() - && sp70[0] > camGetScreenLeft() - && sp70[0] < camGetScreenLeft() + camGetScreenWidth() - && sp78[1] > camGetScreenTop() - && sp78[1] < camGetScreenTop() + camGetScreenHeight() - && sp70[1] > camGetScreenTop() - && sp70[1] < camGetScreenTop() + camGetScreenHeight()) { + if (sp78[0] > cam_get_screen_left() + && sp78[0] < cam_get_screen_left() + cam_get_screen_width() + && sp70[0] > cam_get_screen_left() + && sp70[0] < cam_get_screen_left() + cam_get_screen_width() + && sp78[1] > cam_get_screen_top() + && sp78[1] < cam_get_screen_top() + cam_get_screen_height() + && sp70[1] > cam_get_screen_top() + && sp70[1] < cam_get_screen_top() + cam_get_screen_height()) { criteria->status = OBJECTIVE_COMPLETE; if (g_Vars.stagenum == STAGE_CITRAINING) { - struct trainingdata *data = dtGetData(); + struct trainingdata *data = dt_get_data(); data->holographedpc = true; } } diff --git a/src/game/objectivesreset.c b/src/game/objectivesreset.c index 495a2d1de..22d69ec98 100644 --- a/src/game/objectivesreset.c +++ b/src/game/objectivesreset.c @@ -6,11 +6,11 @@ #include "data.h" #include "types.h" -void objectivesReset(void) +void objectives_reset(void) { s32 i; - if (mainGetStageNum() < STAGE_TITLE) { + if (main_get_stage_num() < STAGE_TITLE) { g_ObjectiveLastIndex = -1; for (i = 0; i < ARRAYCOUNT(g_ObjectiveStatuses); i++) { @@ -31,19 +31,19 @@ void objectivesReset(void) g_HolographCriterias = NULL; } -void tagInsert(struct tag *tag) +void tag_insert(struct tag *tag) { tag->next = g_TagsLinkedList; g_TagsLinkedList = tag; } -void briefingInsert(struct briefingobj *briefing) +void briefing_insert(struct briefingobj *briefing) { briefing->next = g_BriefingObjs; g_BriefingObjs = briefing; } -void objectiveInsert(struct objective *objective) +void objective_insert(struct objective *objective) { g_Objectives[objective->index] = objective; @@ -52,19 +52,19 @@ void objectiveInsert(struct objective *objective) } } -void objectiveAddRoomEnteredCriteria(struct criteria_roomentered *criteria) +void objective_add_room_entered_criteria(struct criteria_roomentered *criteria) { criteria->next = g_RoomEnteredCriterias; g_RoomEnteredCriterias = criteria; } -void objectiveAddThrowInRoomCriteria(struct criteria_throwinroom *criteria) +void objective_add_throw_in_room_criteria(struct criteria_throwinroom *criteria) { criteria->next = g_ThrowInRoomCriterias; g_ThrowInRoomCriterias = criteria; } -void objectiveAddHolographCriteria(struct criteria_holograph *criteria) +void objective_add_holograph_criteria(struct criteria_holograph *criteria) { criteria->next = g_HolographCriterias; g_HolographCriterias = criteria; diff --git a/src/game/objectivesstop.c b/src/game/objectivesstop.c index 190a7d18e..2f07e3b31 100644 --- a/src/game/objectivesstop.c +++ b/src/game/objectivesstop.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void objectivesStop(void) +void objectives_stop(void) { s32 i; diff --git a/src/game/options.c b/src/game/options.c index 9a38dbe18..e0b62026f 100644 --- a/src/game/options.c +++ b/src/game/options.c @@ -24,97 +24,97 @@ u8 g_ScreenSplit = SCREENSPLIT_HORIZONTAL; u16 var8008231cnb = 0x7fff; #endif -s32 optionsGetControlMode(s32 mpchrnum) +s32 options_get_control_mode(s32 mpchrnum) { return g_PlayerConfigsArray[mpchrnum].controlmode; } -void optionsSetControlMode(s32 mpchrnum, s32 mode) +void options_set_control_mode(s32 mpchrnum, s32 mode) { g_PlayerConfigsArray[mpchrnum].controlmode = mode; } -s32 optionsGetContpadNum1(s32 mpchrnum) +s32 options_get_contpad_num1(s32 mpchrnum) { return g_PlayerConfigsArray[mpchrnum].contpad1; } -s32 optionsGetContpadNum2(s32 mpchrnum) +s32 options_get_contpad_num2(s32 mpchrnum) { return g_PlayerConfigsArray[mpchrnum].contpad2; } -s32 optionsGetForwardPitch(s32 mpchrnum) +s32 options_get_forward_pitch(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_FORWARDPITCH) != 0; } -s32 optionsGetAutoAim(s32 mpchrnum) +s32 options_get_auto_aim(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_AUTOAIM) != 0; } -s32 optionsGetLookAhead(s32 mpchrnum) +s32 options_get_look_ahead(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_LOOKAHEAD) != 0; } -s32 optionsGetAimControl(s32 mpchrnum) +s32 options_get_aim_control(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_AIMCONTROL) != 0; } -s32 optionsGetSightOnScreen(s32 mpchrnum) +s32 options_get_sight_on_screen(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_SIGHTONSCREEN) != 0; } -s32 optionsGetAmmoOnScreen(s32 mpchrnum) +s32 options_get_ammo_on_screen(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_AMMOONSCREEN) != 0; } -s32 optionsGetShowGunFunction(s32 mpchrnum) +s32 options_get_show_gun_function(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_SHOWGUNFUNCTION) != 0; } -s32 optionsGetAlwaysShowTarget(s32 mpchrnum) +s32 options_get_always_show_target(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_ALWAYSSHOWTARGET) != 0; } -s32 optionsGetShowZoomRange(s32 mpchrnum) +s32 options_get_show_zoom_range(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_SHOWZOOMRANGE) != 0; } -s32 optionsGetPaintball(s32 mpchrnum) +s32 options_get_paintball(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_PAINTBALL) != 0; } -s32 optionsGetShowMissionTime(s32 mpchrnum) +s32 options_get_show_mission_time(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_SHOWMISSIONTIME) != 0; } -u8 optionsGetInGameSubtitles(void) +u8 options_get_in_game_subtitles(void) { return g_InGameSubtitles; } -u8 optionsGetCutsceneSubtitles(void) +u8 options_get_cutscene_subtitles(void) { return g_CutsceneSubtitles; } -s32 optionsGetHeadRoll(s32 mpchrnum) +s32 options_get_head_roll(s32 mpchrnum) { return (g_PlayerConfigsArray[mpchrnum].options & OPTION_HEADROLL) != 0; } -void optionsSetForwardPitch(s32 mpchrnum, bool enable) +void options_set_forward_pitch(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_FORWARDPITCH; @@ -123,7 +123,7 @@ void optionsSetForwardPitch(s32 mpchrnum, bool enable) } } -void optionsSetAutoAim(s32 mpchrnum, bool enable) +void options_set_auto_aim(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_AUTOAIM; @@ -132,7 +132,7 @@ void optionsSetAutoAim(s32 mpchrnum, bool enable) } } -void optionsSetLookAhead(s32 mpchrnum, bool enable) +void options_set_look_ahead(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_LOOKAHEAD; @@ -141,7 +141,7 @@ void optionsSetLookAhead(s32 mpchrnum, bool enable) } } -void optionsSetAimControl(s32 mpchrnum, s32 index) +void options_set_aim_control(s32 mpchrnum, s32 index) { if (index) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_AIMCONTROL; @@ -150,7 +150,7 @@ void optionsSetAimControl(s32 mpchrnum, s32 index) } } -void optionsSetSightOnScreen(s32 mpchrnum, bool enable) +void options_set_sight_on_screen(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_SIGHTONSCREEN; @@ -159,7 +159,7 @@ void optionsSetSightOnScreen(s32 mpchrnum, bool enable) } } -void optionsSetAmmoOnScreen(s32 mpchrnum, bool enable) +void options_set_ammo_on_screen(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_AMMOONSCREEN; @@ -168,7 +168,7 @@ void optionsSetAmmoOnScreen(s32 mpchrnum, bool enable) } } -void optionsSetShowGunFunction(s32 mpchrnum, bool enable) +void options_set_show_gun_function(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_SHOWGUNFUNCTION; @@ -177,7 +177,7 @@ void optionsSetShowGunFunction(s32 mpchrnum, bool enable) } } -void optionsSetAlwaysShowTarget(s32 mpchrnum, bool enable) +void options_set_always_show_target(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_ALWAYSSHOWTARGET; @@ -186,7 +186,7 @@ void optionsSetAlwaysShowTarget(s32 mpchrnum, bool enable) } } -void optionsSetShowZoomRange(s32 mpchrnum, bool enable) +void options_set_show_zoom_range(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_SHOWZOOMRANGE; @@ -195,7 +195,7 @@ void optionsSetShowZoomRange(s32 mpchrnum, bool enable) } } -void optionsSetPaintball(s32 mpchrnum, bool enable) +void options_set_paintball(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_PAINTBALL; @@ -204,7 +204,7 @@ void optionsSetPaintball(s32 mpchrnum, bool enable) } } -void optionsSetShowMissionTime(s32 mpchrnum, bool enable) +void options_set_show_mission_time(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_SHOWMISSIONTIME; @@ -213,17 +213,17 @@ void optionsSetShowMissionTime(s32 mpchrnum, bool enable) } } -void optionsSetInGameSubtitles(s32 enable) +void options_set_in_game_subtitles(s32 enable) { g_InGameSubtitles = enable; } -void optionsSetCutsceneSubtitles(s32 enable) +void options_set_cutscene_subtitles(s32 enable) { g_CutsceneSubtitles = enable; } -void optionsSetHeadRoll(s32 mpchrnum, bool enable) +void options_set_head_roll(s32 mpchrnum, bool enable) { if (enable) { g_PlayerConfigsArray[mpchrnum].options |= OPTION_HEADROLL; @@ -232,7 +232,7 @@ void optionsSetHeadRoll(s32 mpchrnum, bool enable) } } -s32 optionsGetEffectiveScreenSize(void) +s32 options_get_effective_screen_size(void) { if (IS4MB()) { return SCREENSIZE_FULL; @@ -278,41 +278,41 @@ s32 optionsGetEffectiveScreenSize(void) } #if VERSION >= VERSION_NTSC_1_0 -s32 optionsGetScreenSize(void) +s32 options_get_screen_size(void) { return g_ScreenSize; } #endif -void optionsSetScreenSize(s32 size) +void options_set_screen_size(s32 size) { g_ScreenSize = size; } -s32 optionsGetScreenRatio(void) +s32 options_get_screen_ratio(void) { return g_ScreenRatio; } -void optionsSetScreenRatio(s32 ratio) +void options_set_screen_ratio(s32 ratio) { g_ScreenRatio = ratio; } -u8 optionsGetScreenSplit(void) +u8 options_get_screen_split(void) { return g_ScreenSplit; } -void optionsSetScreenSplit(u8 split) +void options_set_screen_split(u8 split) { g_ScreenSplit = split; } -u16 optionsGetMusicVolume(void) +u16 options_get_music_volume(void) { #if VERSION >= VERSION_NTSC_1_0 - return musicGetVolume(); + return music_get_volume(); #else if (g_Vars.stagenum == STAGE_CREDITS) { return 0x7fff; @@ -322,12 +322,12 @@ u16 optionsGetMusicVolume(void) #endif } -void optionsSetMusicVolume(u16 volume) +void options_set_music_volume(u16 volume) { #if VERSION >= VERSION_NTSC_1_0 - musicSetVolume(volume); + music_set_volume(volume); #else var8008231cnb = volume; - musicSetVolume(var8008231cnb); + music_set_volume(var8008231cnb); #endif } diff --git a/src/game/pad.c b/src/game/pad.c index 71194c330..a46852d54 100644 --- a/src/game/pad.c +++ b/src/game/pad.c @@ -15,7 +15,7 @@ struct covercandidate *g_CoverCandidates; u16 g_NumSpecialCovers; u16 *g_SpecialCoverNums; -void padUnpack(s32 padnum, u32 fields, struct pad *pad) +void pad_unpack(s32 padnum, u32 fields, struct pad *pad) { s32 offset; u32 *header; @@ -145,7 +145,7 @@ void padUnpack(s32 padnum, u32 fields, struct pad *pad) } } -bool padHasBboxData(s32 padnum) +bool pad_has_bbox_data(s32 padnum) { u32 offset = g_PadOffsets[padnum]; u32 *header = (u32 *)&g_StageSetup.padfiledata[offset]; @@ -153,11 +153,11 @@ bool padHasBboxData(s32 padnum) return ((*header >> 14) & PADFLAG_HASBBOXDATA) != 0; } -void padGetCentre(s32 padnum, struct coord *coord) +void pad_get_centre(s32 padnum, struct coord *coord) { struct pad pad; - padUnpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad); coord->x = pad.pos.f[0] + ( (pad.bbox.xmin + pad.bbox.xmax) * pad.normal.f[0] + @@ -183,7 +183,7 @@ void padGetCentre(s32 padnum, struct coord *coord) * When such a door is placed on a pad, this function is called. It adjusts the * pad's orientation to compensate for the model. */ -void padRotateForDoor(s32 padnum) +void pad_rotate_for_door(s32 padnum) { u32 stack; u32 *ptr; @@ -230,7 +230,7 @@ void padRotateForDoor(s32 padnum) } } -void padCopyBboxFromPad(s32 padnum, struct pad *src) +void pad_copy_bbox_from_pad(s32 padnum, struct pad *src) { u32 offset = g_PadOffsets[padnum]; f32 *fbuffer = (f32 *)&g_StageSetup.padfiledata[offset]; @@ -262,7 +262,7 @@ void padCopyBboxFromPad(s32 padnum, struct pad *src) } } -void padSetFlag(s32 padnum, u32 flag) +void pad_set_flag(s32 padnum, u32 flag) { u32 offset = g_PadOffsets[padnum]; u32 *header = (u32 *)&g_StageSetup.padfiledata[offset]; @@ -270,7 +270,7 @@ void padSetFlag(s32 padnum, u32 flag) *header = *header ^ ((*header >> 14) ^ ((*header >> 14) | flag)) << 14; } -void padUnsetFlag(s32 padnum, u32 flag) +void pad_unset_flag(s32 padnum, u32 flag) { u32 offset = g_PadOffsets[padnum]; u32 *header = (u32 *)&g_StageSetup.padfiledata[offset]; @@ -283,12 +283,12 @@ bool func0f1162c4(s32 padnum, s32 arg1) return padnum; } -s32 coverGetCount(void) +s32 cover_get_count(void) { return g_PadsFile->numcovers; } -bool coverUnpack(s32 covernum, struct cover *cover) +bool cover_unpack(s32 covernum, struct cover *cover) { struct coverdefinition *def; @@ -313,12 +313,12 @@ bool coverUnpack(s32 covernum, struct cover *cover) return true; } -u16 getNumSpecialCovers(void) +u16 get_num_special_covers(void) { return g_NumSpecialCovers; } -bool coverUnpackBySpecialNum(s32 index, struct cover *cover) +bool cover_unpack_by_special_num(s32 index, struct cover *cover) { // Probable @bug: last check should be index >= g_NumSpecialCovers // This function is never called though. @@ -326,14 +326,14 @@ bool coverUnpackBySpecialNum(s32 index, struct cover *cover) return false; } - if (coverUnpack(g_SpecialCoverNums[index], cover)) { + if (cover_unpack(g_SpecialCoverNums[index], cover)) { return true; } return false; } -s32 coverGetNumBySpecialNum(s32 index) +s32 cover_get_num_by_special_num(s32 index) { // Probable @bug: last check should be index >= g_NumSpecialCovers // This function is never called though. @@ -349,7 +349,7 @@ s32 func0f116450(s32 arg0, s32 arg1) return arg0; } -bool coverIsInUse(s32 covernum) +bool cover_is_in_use(s32 covernum) { // @bug: Second condition should be >= if (covernum < 0 || covernum > g_PadsFile->numcovers) { @@ -359,7 +359,7 @@ bool coverIsInUse(s32 covernum) return g_CoverFlags[covernum] & COVERFLAG_INUSE; } -void coverSetInUse(s32 covernum, bool enable) +void cover_set_in_use(s32 covernum, bool enable) { if (covernum >= 0 && covernum < g_PadsFile->numcovers) { if (enable) { @@ -370,17 +370,17 @@ void coverSetInUse(s32 covernum, bool enable) } } -void coverSetFlag(s32 covernum, u32 flag) +void cover_set_flag(s32 covernum, u32 flag) { g_CoverFlags[covernum] |= flag; } -void coverUnsetFlag(s32 covernum, u32 flag) +void cover_unset_flag(s32 covernum, u32 flag) { g_CoverFlags[covernum] &= ~flag; } -void coverSetOutOfSight(s32 covernum, bool enable) +void cover_set_out_of_sight(s32 covernum, bool enable) { if (covernum >= 0 && covernum < g_PadsFile->numcovers) { if (enable) { @@ -391,7 +391,7 @@ void coverSetOutOfSight(s32 covernum, bool enable) } } -bool coverIsSpecial(struct cover *cover) +bool cover_is_special(struct cover *cover) { return (cover->flags & (COVERFLAG_SPECIAL1 | COVERFLAG_SPECIAL2 | COVERFLAG_SPECIAL3)) != 0; } diff --git a/src/game/padhalllv.c b/src/game/padhalllv.c index 7d55e2be9..3c511c53b 100644 --- a/src/game/padhalllv.c +++ b/src/game/padhalllv.c @@ -16,16 +16,16 @@ * Path Finding * * Usage: - * - The caller calls waypointFindClosestToPos() twice to find the from and to waypoints. + * - The caller calls waypoint_find_closest_to_pos() twice to find the from and to waypoints. * - The caller allocates an array of waypoint pointers (typically 6 elements). - * - The caller calls navFindRoute() with the two waypoints, a pointer to the array and the array length. - * - navFindRoute() writes the waypoint pointers into the array and returns the number of elements written. + * - The caller calls nav_find_route() with the two waypoints, a pointer to the array and the array length. + * - nav_find_route() writes the waypoint pointers into the array and returns the number of elements written. * * If there are more waypoints in the path than the array can fit, only the first waypoints are written. * In this case, the caller should re-run the path finding once some of the path has been traversed to get the next * waypoints. However, there is randomness involved in path finding. To ensure the same path is used, the caller can - * preseed the random number generator for the path finder. It can do this by calling navSetSeed() with a random - * seed before calling navFindRoute(), and it should call navSetSeed() with a zero seed to clear it for the + * preseed the random number generator for the path finder. It can do this by calling nav_set_seed() with a random + * seed before calling nav_find_route(), and it should call nav_set_seed() with a zero seed to clear it for the * next caller. * * The algorithm is hierarchical, and uses Dijkstra's algorithm but with a cost of 1 for every segment and breaks ties @@ -52,7 +52,7 @@ u32 g_NavSeed[2] = {0}; -void navSetSeed(u32 upper, u32 lower) +void nav_set_seed(u32 upper, u32 lower) { g_NavSeed[0] = upper; g_NavSeed[1] = lower; @@ -73,7 +73,7 @@ void navSetSeed(u32 upper, u32 lower) * The function will return NULL if there are no waypoints at all within the * position's room or its neighbours. */ -struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms) +struct waypoint *waypoint_find_closest_to_pos(struct coord *pos, RoomNum *rooms) { struct waypoint *closest = NULL; RoomNum allrooms[30]; @@ -94,8 +94,8 @@ struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms) allrooms[i] = -1; for (i = 0; rooms[i] != -1; i++) { - bgRoomGetNeighbours(rooms[i], neighbours, ARRAYCOUNT(neighbours)); - roomsAppend(neighbours, allrooms, ARRAYCOUNT(allrooms)); + bg_room_get_neighbours(rooms[i], neighbours, ARRAYCOUNT(neighbours)); + rooms_append(neighbours, allrooms, ARRAYCOUNT(allrooms)); } if (g_StageSetup.waypoints != NULL) { @@ -110,7 +110,7 @@ struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms) u32 stack; struct pad pad; - padUnpack(waypoint->padnum, PADFIELD_POS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_POS, &pad); sqdist = (pos->f[0] - pad.pos.f[0]) * (pos->f[0] - pad.pos.f[0]) + (pos->f[1] - pad.pos.f[1]) * (pos->f[1] - pad.pos.f[1]) @@ -154,19 +154,19 @@ struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms) struct pad pad; RoomNum padrooms[8]; - padUnpack(candwaypoints[i]->padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(candwaypoints[i]->padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); padrooms[0] = pad.room; padrooms[1] = -1; - if (cdTestLos05(pos, rooms, &pad.pos, padrooms, CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2) != CDRESULT_COLLISION) { - s32 cdresult = cdExamCylMove05(pos, rooms, &pad.pos, padrooms, CDTYPE_BG | CDTYPE_PATHBLOCKER, true, 0.0f, 0.0f); + if (cd_test_los05(pos, rooms, &pad.pos, padrooms, CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2) != CDRESULT_COLLISION) { + s32 cdresult = cd_exam_cyl_move05(pos, rooms, &pad.pos, padrooms, CDTYPE_BG | CDTYPE_PATHBLOCKER, true, 0.0f, 0.0f); if (cdresult == CDRESULT_ERROR) { checkmore[i] = false; } else if (cdresult == CDRESULT_COLLISION) { checkmore[i] = true; - cdGetEdge(&sp250[i], &sp1d8[i], 441, "padhalllv.c"); + cd_get_edge(&sp250[i], &sp1d8[i], 441, "padhalllv.c"); } else { closest = candwaypoints[i]; break; @@ -191,7 +191,7 @@ struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms) RoomNum tmprooms[8]; f32 mult; - padUnpack(candwaypoints[i]->padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(candwaypoints[i]->padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); padrooms[0] = pad.room; padrooms[1] = -1; @@ -209,7 +209,7 @@ struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms) tmppos.y = pos->y; tmppos.z = sp250[i].f[2] + sp98.f[2]; - if (cdTestCylMove04(pos, rooms, &tmppos, tmprooms, CDTYPE_BG | CDTYPE_PATHBLOCKER, 1, 0.0f, 0.0f) != CDRESULT_COLLISION) { + if (cd_test_cyl_move04(pos, rooms, &tmppos, tmprooms, CDTYPE_BG | CDTYPE_PATHBLOCKER, 1, 0.0f, 0.0f) != CDRESULT_COLLISION) { closest = candwaypoints[i]; break; } @@ -218,7 +218,7 @@ struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms) tmppos.y = pos->y; tmppos.z = sp1d8[i].z - sp98.z; - if (cdTestCylMove04(pos, rooms, &tmppos, tmprooms, CDTYPE_BG | CDTYPE_PATHBLOCKER, 1, 0.0f, 0.0f) != CDRESULT_COLLISION) { + if (cd_test_cyl_move04(pos, rooms, &tmppos, tmprooms, CDTYPE_BG | CDTYPE_PATHBLOCKER, 1, 0.0f, 0.0f) != CDRESULT_COLLISION) { closest = candwaypoints[i]; break; } @@ -249,7 +249,7 @@ struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms) * * padrandomroutes is always true. */ -struct waygroup *waygroupChooseNeighbour(s32 *groupnums, s32 step, u32 ignoremask) +struct waygroup *waygroup_choose_neighbour(s32 *groupnums, s32 step, u32 ignoremask) { struct waygroup *groups = g_StageSetup.waygroups; struct waygroup *best = NULL; @@ -272,7 +272,7 @@ struct waygroup *waygroupChooseNeighbour(s32 *groupnums, s32 step, u32 ignoremas } else { u64 seed = ((u64)g_NavSeed[0] << 32) | g_NavSeed[1]; - if (rngRotateSeed(&seed) % 2 == 0) { + if (rng_rotate_seed(&seed) % 2 == 0) { break; } } @@ -288,7 +288,7 @@ struct waygroup *waygroupChooseNeighbour(s32 *groupnums, s32 step, u32 ignoremas /** * Iterate the given groupnums and set their step if they don't already have one. */ -void waygroupSetStepIfUndiscovered(s32 *groupnums, s32 step, u32 ignoremask) +void waygroup_set_step_if_undiscovered(s32 *groupnums, s32 step, u32 ignoremask) { struct waygroup *groups = g_StageSetup.waygroups; @@ -309,14 +309,14 @@ void waygroupSetStepIfUndiscovered(s32 *groupnums, s32 step, u32 ignoremask) * Do one scan of all waygroups, finding ones at the given step. * Set their neighbours to step + 1 if they haven't been discovered yet. */ -bool waygroupDiscoverOneStep(struct waygroup *group, s32 step, u32 ignoremask) +bool waygroup_discover_one_step(struct waygroup *group, s32 step, u32 ignoremask) { bool discovered = false; while (group->neighbours) { if (group->step == step) { discovered = true; - waygroupSetStepIfUndiscovered(group->neighbours, step + 1, ignoremask); + waygroup_set_step_if_undiscovered(group->neighbours, step + 1, ignoremask); } group++; @@ -335,7 +335,7 @@ bool waygroupDiscoverOneStep(struct waygroup *group, s32 step, u32 ignoremask) * If discoverall is false, the discovery stops once the to group is discovered. * If discoverall is true, groups beyond the to group are also discovered. */ -bool waygroupDiscoverSteps(struct waygroup *from, struct waygroup *to, struct waygroup *groups, bool discoverall, u32 ignoremask) +bool waygroup_discover_steps(struct waygroup *from, struct waygroup *to, struct waygroup *groups, bool discoverall, u32 ignoremask) { bool result = true; struct waygroup *group; @@ -348,7 +348,7 @@ bool waygroupDiscoverSteps(struct waygroup *from, struct waygroup *to, struct wa from->step = 0; for (step = 0; (discoverall || to->step < 0) && result; step++) { - result = waygroupDiscoverOneStep(groups, step, ignoremask); + result = waygroup_discover_one_step(groups, step, ignoremask); } return result; @@ -359,10 +359,10 @@ bool waygroupDiscoverSteps(struct waygroup *from, struct waygroup *to, struct wa * * The groups along the chosen route will have their step numbers set >= 10000. */ -bool waygroupFindRoute(struct waygroup *from, struct waygroup *to, struct waygroup *groups) +bool waygroup_find_route(struct waygroup *from, struct waygroup *to, struct waygroup *groups) { u32 stack[2]; - bool result = waygroupDiscoverSteps(from, to, groups, false, IGNORE_INWARDS); + bool result = waygroup_discover_steps(from, to, groups, false, IGNORE_INWARDS); if (result) { struct waygroup *curto = to; @@ -370,7 +370,7 @@ bool waygroupFindRoute(struct waygroup *from, struct waygroup *to, struct waygro while (step >= 0) { curto->step += 10000; - curto = waygroupChooseNeighbour(curto->neighbours, step, IGNORE_OUTWARDS); + curto = waygroup_choose_neighbour(curto->neighbours, step, IGNORE_OUTWARDS); step--; } @@ -393,7 +393,7 @@ bool waygroupFindRoute(struct waygroup *from, struct waygroup *to, struct waygro * * padrandomroutes is always true. */ -struct waypoint *waypointChooseNeighbour(s32 *pointnums, s32 step, s32 groupnum, u32 ignoremask) +struct waypoint *waypoint_choose_neighbour(s32 *pointnums, s32 step, s32 groupnum, u32 ignoremask) { struct waypoint *points = g_StageSetup.waypoints; struct waypoint *best = NULL; @@ -416,7 +416,7 @@ struct waypoint *waypointChooseNeighbour(s32 *pointnums, s32 step, s32 groupnum, } else { u64 seed = ((u64)g_NavSeed[0] << 32) | g_NavSeed[1]; - if (rngRotateSeed(&seed) % 2 == 0) { + if (rng_rotate_seed(&seed) % 2 == 0) { break; } } @@ -432,7 +432,7 @@ struct waypoint *waypointChooseNeighbour(s32 *pointnums, s32 step, s32 groupnum, /** * Iterate the given pointnums and set their step if they don't already have one. */ -void waypointSetStepIfUndiscovered(s32 *pointnums, s32 value, s32 groupnum, u32 ignoremask) +void waypoint_set_step_if_undiscovered(s32 *pointnums, s32 value, s32 groupnum, u32 ignoremask) { struct waypoint *waypoints = g_StageSetup.waypoints; @@ -453,7 +453,7 @@ void waypointSetStepIfUndiscovered(s32 *pointnums, s32 value, s32 groupnum, u32 * Scan the waypoints in the given list, finding ones at the given step. * Set their neighbours to step + 1 if they haven't been discovered yet. */ -bool waypointDiscoverOneStep(s32 *pointnums, s32 step, s32 groupnum, u32 ignoremask) +bool waypoint_discover_one_step(s32 *pointnums, s32 step, s32 groupnum, u32 ignoremask) { bool result = false; struct waypoint *points = g_StageSetup.waypoints; @@ -463,7 +463,7 @@ bool waypointDiscoverOneStep(s32 *pointnums, s32 step, s32 groupnum, u32 ignorem if (step == point->step && point->neighbours) { result = true; - waypointSetStepIfUndiscovered(point->neighbours, step + 1, groupnum, ignoremask); + waypoint_set_step_if_undiscovered(point->neighbours, step + 1, groupnum, ignoremask); } pointnums++; @@ -484,7 +484,7 @@ bool waypointDiscoverOneStep(s32 *pointnums, s32 step, s32 groupnum, u32 ignorem * If discoverall is false, the discovery stops once the to point is discovered. * If discoverall is true, points beyond the to point are also discovered. */ -void waypointDiscoverSteps(struct waypoint *from, struct waypoint *to, bool discoverall, u32 ignoremask) +void waypoint_discover_steps(struct waypoint *from, struct waypoint *to, bool discoverall, u32 ignoremask) { struct waygroup *groups = g_StageSetup.waygroups; struct waypoint *points = g_StageSetup.waypoints; @@ -504,7 +504,7 @@ void waypointDiscoverSteps(struct waypoint *from, struct waypoint *to, bool disc more = true; for (i = 0; (discoverall || to->step < 0) && more; i++) { - more = waypointDiscoverOneStep(groups[from->groupnum].waypoints, i, from->groupnum, ignoremask); + more = waypoint_discover_one_step(groups[from->groupnum].waypoints, i, from->groupnum, ignoremask); } } @@ -515,19 +515,19 @@ void waypointDiscoverSteps(struct waypoint *from, struct waypoint *to, bool disc * * The from and to points should be in the same waygroup. */ -void waypointFindRoute(struct waypoint *from, struct waypoint *to) +void waypoint_find_route(struct waypoint *from, struct waypoint *to) { struct waypoint *curto; s32 value; - waypointDiscoverSteps(from, to, false, IGNORE_INWARDS); + waypoint_discover_steps(from, to, false, IGNORE_INWARDS); value = to->step - 1; curto = to; while (value >= 0) { curto->step += 10000; - curto = waypointChooseNeighbour(curto->neighbours, value, from->groupnum, IGNORE_OUTWARDS); + curto = waypoint_choose_neighbour(curto->neighbours, value, from->groupnum, IGNORE_OUTWARDS); value--; } @@ -541,14 +541,14 @@ void waypointFindRoute(struct waypoint *from, struct waypoint *to) * * The from and to points should be in the same waygroup. */ -s32 waypointCollectLocal(struct waypoint *from, struct waypoint *to, struct waypoint **arr, s32 arrlen) +s32 waypoint_collect_local(struct waypoint *from, struct waypoint *to, struct waypoint **arr, s32 arrlen) { struct waypoint **arrptr = arr; struct waypoint *curfrom; s32 step; if (arrlen >= 2) { - waypointFindRoute(from, to); + waypoint_find_route(from, to); *arr = from; arrptr++; @@ -558,7 +558,7 @@ s32 waypointCollectLocal(struct waypoint *from, struct waypoint *to, struct wayp step = 10001; while (step <= to->step && step < arrlen) { - curfrom = waypointChooseNeighbour(curfrom->neighbours, step, from->groupnum, IGNORE_INWARDS); + curfrom = waypoint_choose_neighbour(curfrom->neighbours, step, from->groupnum, IGNORE_INWARDS); *arrptr = curfrom; arrptr++; step++; @@ -577,7 +577,7 @@ s32 waypointCollectLocal(struct waypoint *from, struct waypoint *to, struct wayp * * If there are multiple paths between the two waygroups, choose one at random. */ -void waypointFindSegmentIntoGroup(struct waygroup *fromgroup, struct waygroup *togroup, struct waypoint **frompoint, struct waypoint **topoint) +void waypoint_find_segment_into_group(struct waygroup *fromgroup, struct waygroup *togroup, struct waypoint **frompoint, struct waypoint **topoint) { struct waypoint *points = g_StageSetup.waypoints; struct waygroup *groups = g_StageSetup.waygroups; @@ -610,7 +610,7 @@ void waypointFindSegmentIntoGroup(struct waygroup *fromgroup, struct waygroup *t } else { u64 seed = ((u64)g_NavSeed[0] << 32) | g_NavSeed[1]; - if ((rngRotateSeed(&seed) % 2) == 0) { + if ((rng_rotate_seed(&seed) % 2) == 0) { break; } } @@ -631,7 +631,7 @@ void waypointFindSegmentIntoGroup(struct waygroup *fromgroup, struct waygroup *t * * The return value is the number of elements populated into the array. */ -s32 navFindRoute(struct waypoint *frompoint, struct waypoint *topoint, struct waypoint **arr, s32 arrlen) +s32 nav_find_route(struct waypoint *frompoint, struct waypoint *topoint, struct waypoint **arr, s32 arrlen) { struct waypoint **arrptr = arr; struct waygroup *groups = g_StageSetup.waygroups; @@ -640,19 +640,19 @@ s32 navFindRoute(struct waypoint *frompoint, struct waypoint *topoint, struct wa struct waygroup *fromgroup = &groups[frompoint->groupnum]; struct waygroup *togroup = &groups[topoint->groupnum]; - if (waygroupFindRoute(fromgroup, togroup, groups)) { + if (waygroup_find_route(fromgroup, togroup, groups)) { struct waypoint *curfrompoint = frompoint; struct waygroup *curfromgroup = fromgroup; s32 step; for (step = fromgroup->step + 1; step <= togroup->step && arrlen >= 2; step++) { s32 numwritten; - struct waygroup *nextfromgroup = waygroupChooseNeighbour(curfromgroup->neighbours, step, IGNORE_INWARDS); + struct waygroup *nextfromgroup = waygroup_choose_neighbour(curfromgroup->neighbours, step, IGNORE_INWARDS); struct waypoint *curgrouplastwp; struct waypoint *nextgroupfirstwp; - waypointFindSegmentIntoGroup(curfromgroup, nextfromgroup, &curgrouplastwp, &nextgroupfirstwp); - numwritten = waypointCollectLocal(curfrompoint, curgrouplastwp, arrptr, arrlen) - 1; + waypoint_find_segment_into_group(curfromgroup, nextfromgroup, &curgrouplastwp, &nextgroupfirstwp); + numwritten = waypoint_collect_local(curfrompoint, curgrouplastwp, arrptr, arrlen) - 1; arrlen -= numwritten; arrptr += numwritten; @@ -661,7 +661,7 @@ s32 navFindRoute(struct waypoint *frompoint, struct waypoint *topoint, struct wa curfromgroup = nextfromgroup; } - arrptr += waypointCollectLocal(curfrompoint, topoint, arrptr, arrlen) - 1; + arrptr += waypoint_collect_local(curfrompoint, topoint, arrptr, arrlen) - 1; } } @@ -671,7 +671,7 @@ s32 navFindRoute(struct waypoint *frompoint, struct waypoint *topoint, struct wa return arrptr - arr; } -void waypointResetAllSteps(void) +void waypoint_reset_all_steps(void) { struct waypoint *waypoint = g_StageSetup.waypoints; @@ -681,7 +681,7 @@ void waypointResetAllSteps(void) } } -struct waypoint *waypointFindRandomAtStep(s32 *pointnums, s32 step) +struct waypoint *waypoint_find_random_at_step(s32 *pointnums, s32 step) { s32 len = 0; s32 randomindex; @@ -712,7 +712,7 @@ struct waypoint *waypointFindRandomAtStep(s32 *pointnums, s32 step) return NULL; } -struct waygroup *waygroupFindRandomAtStep(s32 *groupnums, s32 step) +struct waygroup *waygroup_find_random_at_step(s32 *groupnums, s32 step) { s32 len = 0; s32 randomindex; @@ -746,7 +746,7 @@ struct waygroup *waygroupFindRandomAtStep(s32 *groupnums, s32 step) /** * Try to find a waypoint not on the route towards the target, and return it. */ -struct waypoint *navChooseRetreatPoint(struct waypoint *chrpoint, struct waypoint *tarpoint) +struct waypoint *nav_choose_retreat_point(struct waypoint *chrpoint, struct waypoint *tarpoint) { if (g_StageSetup.waygroups) { struct waygroup *chrgroup = &g_StageSetup.waygroups[chrpoint->groupnum]; @@ -755,37 +755,37 @@ struct waypoint *navChooseRetreatPoint(struct waypoint *chrpoint, struct waypoin s32 stack; if (chrgroup == targroup) { - waypointResetAllSteps(); + waypoint_reset_all_steps(); // Mark steps from target to chr - waypointDiscoverSteps(tarpoint, chrpoint, true, IGNORE_NONE); + waypoint_discover_steps(tarpoint, chrpoint, true, IGNORE_NONE); // If the chr has a neighbouring waypoint into another group (room), select it - result = waypointFindRandomAtStep(chrpoint->neighbours, -1); + result = waypoint_find_random_at_step(chrpoint->neighbours, -1); if (result) { return result; } // Otherwise, choose a waypoint not between the two points - result = waypointFindRandomAtStep(chrpoint->neighbours, chrpoint->step + 1); + result = waypoint_find_random_at_step(chrpoint->neighbours, chrpoint->step + 1); if (result) { return result; } } else { - waygroupDiscoverSteps(targroup, chrgroup, g_StageSetup.waygroups, false, IGNORE_INWARDS); + waygroup_discover_steps(targroup, chrgroup, g_StageSetup.waygroups, false, IGNORE_INWARDS); if (chrgroup->step >= 0) { // Find a neighbouring group not in the route to target - struct waygroup *safetygroup = waygroupFindRandomAtStep(chrgroup->neighbours, -1); + struct waygroup *safetygroup = waygroup_find_random_at_step(chrgroup->neighbours, -1); if (safetygroup) { struct waypoint *segfrompoint; struct waypoint *segtopoint; struct waypoint *route[3]; - waypointFindSegmentIntoGroup(chrgroup, safetygroup, &segfrompoint, &segtopoint); + waypoint_find_segment_into_group(chrgroup, safetygroup, &segfrompoint, &segtopoint); // Return the entry waypoint in safetygroup if (segfrompoint == chrpoint) { @@ -793,7 +793,7 @@ struct waypoint *navChooseRetreatPoint(struct waypoint *chrpoint, struct waypoin } // Return first waypoint towards safetygroup - if (waypointCollectLocal(chrpoint, segfrompoint, route, 3) >= 3) { + if (waypoint_collect_local(chrpoint, segfrompoint, route, 3) >= 3) { return route[1]; } } else { @@ -801,17 +801,17 @@ struct waypoint *navChooseRetreatPoint(struct waypoint *chrpoint, struct waypoin // ie. The chr and target are at opposite ends of the level, and the level is mostly linear. // Choose a group one step closer to the target - struct waygroup *safetygroup = waygroupChooseNeighbour(chrgroup->neighbours, chrgroup->step - 1, IGNORE_INWARDS); + struct waygroup *safetygroup = waygroup_choose_neighbour(chrgroup->neighbours, chrgroup->step - 1, IGNORE_INWARDS); if (safetygroup) { struct waypoint *segfrompoint; struct waypoint *segtopoint; - waypointFindSegmentIntoGroup(chrgroup, safetygroup, &segfrompoint, &segtopoint); - waypointDiscoverSteps(segfrompoint, chrpoint, true, IGNORE_NONE); + waypoint_find_segment_into_group(chrgroup, safetygroup, &segfrompoint, &segtopoint); + waypoint_discover_steps(segfrompoint, chrpoint, true, IGNORE_NONE); // Return first waypoint towards safetygroup - result = waypointChooseNeighbour(chrpoint->neighbours, chrpoint->step + 1, chrpoint->groupnum, IGNORE_INWARDS); + result = waypoint_choose_neighbour(chrpoint->neighbours, chrpoint->step + 1, chrpoint->groupnum, IGNORE_INWARDS); if (result) { return result; @@ -836,7 +836,7 @@ struct waypoint *navChooseRetreatPoint(struct waypoint *chrpoint, struct waypoin * A's group and B's group then group B is removed from group A's neighbour * list. */ -void navDisableSegmentInDirection(struct waypoint *a, struct waypoint *b) +void nav_disable_segment_in_direction(struct waypoint *a, struct waypoint *b) { struct waygroup *agroup = &g_StageSetup.waygroups[a->groupnum]; s32 bindex = b - g_StageSetup.waypoints; @@ -892,7 +892,7 @@ void navDisableSegmentInDirection(struct waypoint *a, struct waypoint *b) * This code assumes that A's neighbours array is big enough to add the new * neighbour, which it will be if B was disabled previously. */ -void navEnableSegmentInDirection(struct waypoint *a, struct waypoint *b) +void nav_enable_segment_in_direction(struct waypoint *a, struct waypoint *b) { struct waygroup *agroup = &g_StageSetup.waygroups[a->groupnum]; s32 bpointnum = b - g_StageSetup.waypoints; @@ -920,14 +920,14 @@ void navEnableSegmentInDirection(struct waypoint *a, struct waypoint *b) } } -void navDisableSegment(struct waypoint *a, struct waypoint *b) +void nav_disable_segment(struct waypoint *a, struct waypoint *b) { - navDisableSegmentInDirection(a, b); - navDisableSegmentInDirection(b, a); + nav_disable_segment_in_direction(a, b); + nav_disable_segment_in_direction(b, a); } -void navEnableSegment(struct waypoint *a, struct waypoint *b) +void nav_enable_segment(struct waypoint *a, struct waypoint *b) { - navEnableSegmentInDirection(a, b); - navEnableSegmentInDirection(b, a); + nav_enable_segment_in_direction(a, b); + nav_enable_segment_in_direction(b, a); } diff --git a/src/game/pak.c b/src/game/pak.c index 88e461dc4..345969b78 100644 --- a/src/game/pak.c +++ b/src/game/pak.c @@ -203,7 +203,7 @@ #endif /** - * In NTSC Beta the functions joyDisableCyclicPolling and joyEnableCyclicPolling + * In NTSC Beta the functions joy_disable_cyclic_polling and joy_enable_cyclic_polling * take two arguments: __LINE__ and __FILE__. In newer versions of the game * these functions take no arguments. This macro is here to avoid using VERSION * checks everywhere where these are called. @@ -215,9 +215,9 @@ #endif #if VERSION >= VERSION_NTSC_1_0 -#define SETBANNER(banner) if (var80075d14) { menuSetBanner(banner, true); } +#define SETBANNER(banner) if (var80075d14) { menu_set_banner(banner, true); } #else -#define SETBANNER(banner) menuSetBanner(banner, true) +#define SETBANNER(banner) menu_set_banner(banner, true) #endif #define PAKFEATURE_MEMORY 0x01 @@ -329,14 +329,14 @@ u8 g_PaksPlugged = 0; bool var80075d14 = true; #endif -u32 pakGetBlockSize(s8 device) +u32 pak_get_block_size(s8 device) { return device == SAVEDEVICE_GAMEPAK ? 0x10 : 0x20; } -u32 pakAlign(s8 device, u32 size) +u32 pak_align(s8 device, u32 size) { - return pakGetBlockSize(device) == 0x20 ? align32(size) : align16(size); + return pak_get_block_size(device) == 0x20 ? align32(size) : align16(size); } void pak0f116650(void) @@ -344,18 +344,18 @@ void pak0f116650(void) // empty } -s32 pakGetAlignedFileLenByBodyLen(s8 device, u32 bodylen) +s32 pak_get_aligned_file_len_by_body_len(s8 device, u32 bodylen) { - return pakAlign(device, sizeof(struct pakfileheader) + bodylen); + return pak_align(device, sizeof(struct pakfileheader) + bodylen); } -u32 pakGetBodyLenByFileLen(u32 filelen) +u32 pak_get_body_len_by_file_len(u32 filelen) { return filelen - sizeof(struct pakfileheader); } #if VERSION >= VERSION_NTSC_1_0 -u32 pakGenerateSerial(s8 device) +u32 pak_generate_serial(s8 device) { s32 value; s32 rand; @@ -373,7 +373,7 @@ u32 pakGenerateSerial(s8 device) } #endif -bool mempakIsOkay(s8 device) +bool mempak_is_okay(s8 device) { if (g_Paks[device].type == PAKTYPE_MEMORY) { switch (g_Paks[device].state) { @@ -391,9 +391,9 @@ bool mempakIsOkay(s8 device) return false; } -s32 pakGetFileIdsByType(s8 device, u32 filetype, u32 *fileids) +s32 pak_get_file_ids_by_type(s8 device, u32 filetype, u32 *fileids) { - return _pakGetFileIdsByType(device, filetype, fileids); + return _pak_get_file_ids_by_type(device, filetype, fileids); } s32 pak0f1167d8(s8 device) @@ -401,24 +401,24 @@ s32 pak0f1167d8(s8 device) return pak0f119298(device); } -s32 pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3) +s32 pak_read_body_at_guid(s8 device, s32 fileid, u8 *body, s32 arg3) { - return _pakReadBodyAtGuid(device, fileid, body, arg3); + return _pak_read_body_at_guid(device, fileid, body, arg3); } -s32 pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *body, s32 *outfileid, u8 *olddata) +s32 pak_save_at_guid(s8 device, s32 fileid, s32 filetype, u8 *body, s32 *outfileid, u8 *olddata) { - return _pakSaveAtGuid(device, fileid, filetype, body, outfileid, olddata); + return _pak_save_at_guid(device, fileid, filetype, body, outfileid, olddata); } -bool pakDeleteFile(s8 device, s32 fileid) +bool pak_delete_file(s8 device, s32 fileid) { - return _pakDeleteFile(device, fileid); + return _pak_delete_file(device, fileid); } -PakErr1 pakDeleteGameNote(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name) +PakErr1 pak_delete_game_note(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name) { - return _pakDeleteGameNote(device, company_code, game_code, game_name, ext_name); + return _pak_delete_game_note(device, company_code, game_code, game_name, ext_name); } PakErr1 pak0f1168c4(s8 device, struct pakdata **arg1) @@ -426,19 +426,19 @@ PakErr1 pak0f1168c4(s8 device, struct pakdata **arg1) return pak0f116df0(device, arg1); } -s32 pakCreateCameraFile(s8 device, s32 *outfileid) +s32 pak_create_camera_file(s8 device, s32 *outfileid) { - return _pakCreateCameraFile(device, outfileid); + return _pak_create_camera_file(device, outfileid); } -s32 pakGetType(s8 device) +s32 pak_get_type(s8 device) { - return _pakGetType(device); + return _pak_get_type(device); } -s32 pakGetSerial(s8 device) +s32 pak_get_serial(s8 device) { - return _pakGetSerial(device); + return _pak_get_serial(device); } void pak0f116984(s8 arg0, u8 *arg1, u8 *arg2) @@ -477,19 +477,19 @@ void pak0f1169c8(s8 device, bool tick) if ((g_Vars.paksneededforgame | g_Vars.paksneededformenu) & (1 << device)) { g_PaksPlugged &= ~(1 << device); - pakCheckPlugged(); - pakCheckPlugged(); + pak_check_plugged(); + pak_check_plugged(); if (tick) { g_JoyPfsPollMasterEnabled = false; - pakTickState(device); - pakTickState(device); - pakTickState(device); - pakTickState(device); - pakTickState(device); - pakTickState(device); - pakTickState(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); g_JoyPfsPollMasterEnabled = true; } @@ -500,22 +500,22 @@ void pak0f1169c8(s8 device, bool tick) if ((g_Vars.paksneededforgame | g_Vars.paksneededformenu) & (1 << device)) { g_PaksPlugged &= ~(1 << device); - pakCheckPlugged(); + pak_check_plugged(); if (tick) { - pakTickState(device); - pakTickState(device); - pakTickState(device); - pakTickState(device); - pakTickState(device); - pakTickState(device); - pakTickState(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); + pak_tick_state(device); } } #endif } -bool mempakIsReady(s8 device) +bool mempak_is_ready(s8 device) { if (g_Paks[device].state == PAKSTATE_READY && g_Paks[device].type == PAKTYPE_MEMORY) { return true; @@ -524,7 +524,7 @@ bool mempakIsReady(s8 device) return false; } -bool mempakIsReadyOrFull(s8 device) +bool mempak_is_ready_or_full(s8 device) { if ((g_Paks[device].state == PAKSTATE_READY || g_Paks[device].state == PAKSTATE_MEM_ENTER_FULL @@ -542,17 +542,17 @@ void pak0f116bdc(s8 device, u8 *arg1, u8 *arg2) *arg2 = g_Paks[device].unk2bb; } -void pakSetTemporarilyPlugged(s8 index) +void pak_set_temporarily_plugged(s8 index) { - joySetPfsTemporarilyPlugged(index); + joy_set_pfs_temporarily_plugged(index); } -u16 _pakGetSerial(s8 device) +u16 _pak_get_serial(s8 device) { return g_Paks[device].serial; } -u32 _pakGetType(s8 device) +u32 _pak_get_type(s8 device) { return g_Paks[device].type; } @@ -569,7 +569,7 @@ ubool pak0f116d4c(s8 device) return g_Paks[device].unk2b8_05 && !g_Paks[device].isgbcamera; } -void pakSetState(s8 device, s32 state) +void pak_set_state(s8 device, s32 state) { g_Paks[device].state = state; } @@ -578,8 +578,8 @@ PakErr1 pak0f116df0(s8 device, struct pakdata **pakdata) { *pakdata = NULL; - if (mempakIsReadyOrFull(device)) { - if (pakQueryTotalUsage(device)) { + if (mempak_is_ready_or_full(device)) { + if (pak_query_total_usage(device)) { *pakdata = &g_Paks[device].pakdata; return PAK_ERR1_OK; } @@ -590,16 +590,16 @@ PakErr1 pak0f116df0(s8 device, struct pakdata **pakdata) return PAK_ERR1_NOPAK; } -PakErr1 _pakDeleteGameNote(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name) +PakErr1 _pak_delete_game_note(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name) { s32 result; - if (mempakIsReadyOrFull(device)) { - joyDisableCyclicPolling(JOYARGS(738)); - result = pakDeleteGameNote3(PFS(device), company_code, game_code, game_name, ext_name); - joyEnableCyclicPolling(JOYARGS(740)); + if (mempak_is_ready_or_full(device)) { + joy_disable_cyclic_polling(JOYARGS(738)); + result = pak_delete_game_note3(PFS(device), company_code, game_code, game_name, ext_name); + joy_enable_cyclic_polling(JOYARGS(740)); - if (pakHandleResult(result, device, true, LINE_825)) { + if (pak_handle_result(result, device, true, LINE_825)) { g_Paks[device].unk2b8_02 = 1; return PAK_ERR1_OK; } @@ -629,16 +629,16 @@ const char var7f1ad8b0n0[] = "????????"; #endif #if VERSION >= VERSION_NTSC_1_0 -s32 _pakDeleteFile(s8 device, s32 fileid) +s32 _pak_delete_file(s8 device, s32 fileid) { struct pakfileheader header; - s32 result = pakFindFile(device, fileid, &header); + s32 result = pak_find_file(device, fileid, &header); if (result == -1) { return 1; } - result = pakWriteFileAtOffset(device, result, header.filetype, NULL, 0, NULL, NULL, 0, header.generation + 1); + result = pak_write_file_at_offset(device, result, header.filetype, NULL, 0, NULL, NULL, 0, header.generation + 1); if (result) { return result; @@ -647,17 +647,17 @@ s32 _pakDeleteFile(s8 device, s32 fileid) return 0; } #else -s32 _pakDeleteFile(s8 device, s32 fileid) +s32 _pak_delete_file(s8 device, s32 fileid) { struct pakfileheader header; u32 result; - u32 tmp = pakFindFile(device, fileid, &header); + u32 tmp = pak_find_file(device, fileid, &header); - if (tmp && (!tmp || tmp >= pakGetPdNumBytes(device) || ((pakGetBlockSize(device) - 1U) & tmp))) { + if (tmp && (!tmp || tmp >= pak_get_pd_num_bytes(device) || ((pak_get_block_size(device) - 1U) & tmp))) { return 3; } - result = pakWriteFileAtOffset(device, tmp, header.filetype, NULL, 0, NULL, NULL, 0, header.generation + 1); + result = pak_write_file_at_offset(device, tmp, header.filetype, NULL, 0, NULL, NULL, 0, header.generation + 1); if (result) { return result; @@ -667,12 +667,12 @@ s32 _pakDeleteFile(s8 device, s32 fileid) } #endif -s32 pakGetPlugCount(s8 device) +s32 pak_get_plug_count(s8 device) { return g_Paks[device].plugcount; } -u32 pakGetMaxFileSize(s8 device) +u32 pak_get_max_file_size(s8 device) { if (device != SAVEDEVICE_GAMEPAK) { return 0x4c0; @@ -681,7 +681,7 @@ u32 pakGetMaxFileSize(s8 device) return 0x100; } -s32 pakGetBodyLenByType(s8 device, u32 filetype) +s32 pak_get_body_len_by_type(s8 device, u32 filetype) { s32 len = 0; @@ -690,7 +690,7 @@ s32 pakGetBodyLenByType(s8 device, u32 filetype) case PAKFILETYPE_BLANK: break; case PAKFILETYPE_TERMINATOR: - len = pakGetMaxFileSize(device) - sizeof(struct pakfileheader); + len = pak_get_max_file_size(device) - sizeof(struct pakfileheader); break; case PAKFILETYPE_BOSS: len = 0x5b; @@ -780,27 +780,27 @@ void pak0f1171b4(s8 device, s32 arg1, s32 arg2) g_Paks[device].unk2b8_06 = arg2; } -s32 pakGetUnk008(s8 device) +s32 pak_get_unk008(s8 device) { return g_Paks[device].unk008; } -void pakSetUnk008(s8 device, s32 value) +void pak_set_unk008(s8 device, s32 value) { g_Paks[device].unk008 = value; } -s32 pakGetUnk270(s8 device) +s32 pak_get_unk270(s8 device) { return g_Paks[device].unk270; } -s32 pakGetRumbleState(s8 device) +s32 pak_get_rumble_state(s8 device) { return g_Paks[device].rumblestate; } -void pakSetRumbleState(s8 device, s32 state) +void pak_set_rumble_state(s8 device, s32 state) { g_Paks[device].rumblestate = state; } @@ -820,16 +820,16 @@ void pak0f1173e4(s8 device) g_Paks[device].unk2b8_01 = 0; } -bool pakRetrieveBlockFromCache(s8 device, u32 offset, u8 *dst) +bool pak_retrieve_block_from_cache(s8 device, u32 offset, u8 *dst) { - u32 blocksize = pakGetBlockSize(device); + u32 blocksize = pak_get_block_size(device); u32 stack; s32 i; if (g_Paks[device].headercachecount < MAX_HEADERCACHE_ENTRIES) { for (i = 0; i < g_Paks[device].headercachecount; i++) { if (offset / blocksize == g_Paks[device].headercache[i].blocknum) { - memcpy(dst, g_Paks[device].headercache[i].payload, pakGetBlockSize(device)); + memcpy(dst, g_Paks[device].headercache[i].payload, pak_get_block_size(device)); return true; } } @@ -838,7 +838,7 @@ bool pakRetrieveBlockFromCache(s8 device, u32 offset, u8 *dst) return false; } -PakErr2 pakReadHeaderAtOffset(s8 device, u32 offset, struct pakfileheader *header) +PakErr2 pak_read_header_at_offset(s8 device, u32 offset, struct pakfileheader *header) { struct pakfileheader localheader; struct pakfileheader *headerptr; @@ -849,16 +849,16 @@ PakErr2 pakReadHeaderAtOffset(s8 device, u32 offset, struct pakfileheader *heade headerptr = header ? header : &localheader; - blocknum = offset / pakGetBlockSize(device); + blocknum = offset / pak_get_block_size(device); if (blocknum >= g_Paks[device].pdnumblocks) { return PAK_ERR2_BADOFFSET; } - if (!pakRetrieveHeaderFromCache(device, blocknum, headerptr)) { - result = pakReadWriteBlock(device, PFS(device), g_Paks[device].pdnoteindex, 0, offset, sizeof(sp38), sp38); + if (!pak_retrieve_header_from_cache(device, blocknum, headerptr)) { + result = pak_read_write_block(device, PFS(device), g_Paks[device].pdnoteindex, 0, offset, sizeof(sp38), sp38); - if (pakHandleResult(result, device, true, LINE_1058) == 0) { + if (pak_handle_result(result, device, true, LINE_1058) == 0) { if (result == PAK_ERR1_NOPAK) { return PAK_ERR2_NOPAK; } @@ -867,7 +867,7 @@ PakErr2 pakReadHeaderAtOffset(s8 device, u32 offset, struct pakfileheader *heade } memcpy(headerptr, sp38, sizeof(struct pakfileheader)); - pakCalculateChecksum(&sp38[0x08], &sp38[0x10], checksum); + pak_calculate_checksum(&sp38[0x08], &sp38[0x10], checksum); if (headerptr->headersum[0] != checksum[0] || headerptr->headersum[1] != checksum[1]) { return PAK_ERR2_CHECKSUM; @@ -877,14 +877,14 @@ PakErr2 pakReadHeaderAtOffset(s8 device, u32 offset, struct pakfileheader *heade return PAK_ERR2_INCOMPLETE; } - if ((argFindByPrefix(1, "-forceversion") ? 1 : 0) != headerptr->version) { + if ((arg_find_by_prefix(1, "-forceversion") ? 1 : 0) != headerptr->version) { return PAK_ERR2_VERSION; } if (g_PakDebugPakCache) { - pakSaveHeaderToCache(device, blocknum, (struct pakfileheader *) sp38); + pak_save_header_to_cache(device, blocknum, (struct pakfileheader *) sp38); - if (!pakRetrieveHeaderFromCache(device, blocknum, headerptr)) { + if (!pak_retrieve_header_from_cache(device, blocknum, headerptr)) { #if VERSION >= VERSION_NTSC_1_0 osSyncPrintf("Pak %d -> Header Cache 2 - FATAL ERROR\n"); #else @@ -902,7 +902,7 @@ PakErr2 pakReadHeaderAtOffset(s8 device, u32 offset, struct pakfileheader *heade return PAK_ERR2_OK; } -void pakDumpBuffer(u8 *buffer, u32 len, char *name) +void pak_dump_buffer(u8 *buffer, u32 len, char *name) { s32 i; char line[256]; @@ -926,15 +926,15 @@ void pakDumpBuffer(u8 *buffer, u32 len, char *name) osSyncPrintf(line); } -void pakDumpEeprom(void) +void pak_dump_eeprom(void) { u8 buffer[2048]; - joyDisableCyclicPolling(JOYARGS(1098)); + joy_disable_cyclic_polling(JOYARGS(1098)); osEepromLongRead(&g_PiMesgQueue, 0, buffer, 2048); - joyEnableCyclicPolling(JOYARGS(1100)); + joy_enable_cyclic_polling(JOYARGS(1100)); - pakDumpBuffer(buffer, 2048, "EEPROM DUMP"); + pak_dump_buffer(buffer, 2048, "EEPROM DUMP"); } /** @@ -946,7 +946,7 @@ void pakDumpEeprom(void) * a swap file reserved for atomic writes. The new file is written into the * swap file, then the old file is marked as swap. */ -s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfileid, u8 *olddataptr) +s32 _pak_save_at_guid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfileid, u8 *olddataptr) { struct pakfileheader header; struct pakfileheader swapheader; @@ -959,9 +959,9 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil u8 olddata[0x800]; // Find the file to be "replaced" - oldoffset = pakFindFile(device, fileid, &header); + oldoffset = pak_find_file(device, fileid, &header); - if (oldoffset && (!oldoffset || oldoffset >= pakGetPdNumBytes(device) || ((pakGetBlockSize(device) - 1) & oldoffset))) { + if (oldoffset && (!oldoffset || oldoffset >= pak_get_pd_num_bytes(device) || ((pak_get_block_size(device) - 1) & oldoffset))) { return 3; } @@ -971,10 +971,10 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil // Find all files on the pak of the same filetype, // then iterate them to find the swap file - pakGetFileIdsByType(device, header.filetype, fileids); + pak_get_file_ids_by_type(device, header.filetype, fileids); // NTSC Beta initialises swapoffset to -1 so it can detect if the loop below - // has been entered. But in NTSC 1.0 they realised that pakFindFile can + // has been entered. But in NTSC 1.0 they realised that pak_find_file can // return -1, so they initialised the variable to 0xeeeeeeee instead and // added the check for -1 in the loop below. #if VERSION >= VERSION_NTSC_1_0 @@ -984,7 +984,7 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil #endif for (i = 0; fileids[i] != 0; i++) { - swapoffset = pakFindFile(device, fileids[i], &swapheader); + swapoffset = pak_find_file(device, fileids[i], &swapheader); #if VERSION >= VERSION_NTSC_1_0 if (swapoffset == -1) { @@ -1006,7 +1006,7 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil // know which swap space was going to be used? Maybe controller paks don't // use the olddataptr optimisation? if (device == SAVEDEVICE_GAMEPAK) { - result = pakReadBodyAtGuid(device, swapfileid, olddata, -1); + result = pak_read_body_at_guid(device, swapfileid, olddata, -1); // NTSC 1.0 just writes the same thing a different way #if VERSION >= VERSION_NTSC_1_0 @@ -1027,7 +1027,7 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil } // Write the new file into the swap space - result = pakWriteFileAtOffset(device, swapoffset, filetype, newdata, 0, outfileid, olddataptr, fileid, header.generation + 1); + result = pak_write_file_at_offset(device, swapoffset, filetype, newdata, 0, outfileid, olddataptr, fileid, header.generation + 1); if (result != 0) { return 4; @@ -1041,7 +1041,7 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil // and returns an OK value. NTSC Final makes it return an error instead. // @bug: The 0xeeeeeeee check should have been done earlier for swapoffset // instead. As it turns out, if swap space wasn't found then - // pakWriteFileAtOffset would have returned an error above and this function + // pak_write_file_at_offset would have returned an error above and this function // would have returned before this check occurs. And oldoffset will never be // 0xeeeeeeee (even with 4GB of storage) because 0xeeeeeeee is not aligned // to a 16-byte boundary. So this bug is harmless. @@ -1051,11 +1051,11 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil } if (oldoffset != 0xeeeeeeee) { - pakWriteFileAtOffset(device, oldoffset, filetype, NULL, 0, NULL, NULL, swapfileid, header.generation); + pak_write_file_at_offset(device, oldoffset, filetype, NULL, 0, NULL, NULL, swapfileid, header.generation); } #else if (oldoffset != -1) { - pakWriteFileAtOffset(device, oldoffset, filetype, NULL, 0, NULL, NULL, swapfileid, header.generation); + pak_write_file_at_offset(device, oldoffset, filetype, NULL, 0, NULL, NULL, swapfileid, header.generation); } #endif @@ -1063,9 +1063,9 @@ s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfil } #if VERSION >= VERSION_NTSC_1_0 -PakErr1 pakInitPak(OSMesgQueue *mq, OSPfs *pfs, s32 channel, s32 *arg3) +PakErr1 pak_init_pak(OSMesgQueue *mq, OSPfs *pfs, s32 channel, s32 *arg3) #else -PakErr1 pakInitPak(OSMesgQueue *mq, OSPfs *pfs, s32 channel) +PakErr1 pak_init_pak(OSMesgQueue *mq, OSPfs *pfs, s32 channel) #endif { if (pfs) { @@ -1083,12 +1083,12 @@ PakErr1 pakInitPak(OSMesgQueue *mq, OSPfs *pfs, s32 channel) return PAK_ERR1_OK; } -PakErr1 _pakReadWriteBlock(OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer) +PakErr1 _pak_read_write_block(OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer) { u32 newaddress; #if VERSION >= VERSION_NTSC_1_0 - joyPollPfs(2); + joy_poll_pfs(2); #endif if (pfs) { @@ -1100,7 +1100,7 @@ PakErr1 _pakReadWriteBlock(OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 le if (newaddress >= 256) { #if VERSION < VERSION_NTSC_1_0 u32 stack; - crashSetMessage("ILLEGAL EEPROM ADDRESS (>=256)"); + crash_set_message("ILLEGAL EEPROM ADDRESS (>=256)"); CRASH(); #endif } @@ -1110,24 +1110,24 @@ PakErr1 _pakReadWriteBlock(OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 le } if (flag == OS_WRITE) { - return pakWriteEeprom(newaddress, buffer, len); + return pak_write_eeprom(newaddress, buffer, len); } if (flag == OS_READ) { - return pakReadEeprom(newaddress, buffer, len); + return pak_read_eeprom(newaddress, buffer, len); } return PAK_ERR1_EEPROMINVALIDOP; } -PakErr1 pakQueryNumNotes(OSPfs *pfs, s32 *max_files, s32 *files_used) +PakErr1 pak_query_num_notes(OSPfs *pfs, s32 *max_files, s32 *files_used) { if (pfs) { s32 result; - joyDisableCyclicPolling(JOYARGS(1308)); + joy_disable_cyclic_polling(JOYARGS(1308)); result = osPfsNumFiles(pfs, max_files, files_used); - joyEnableCyclicPolling(JOYARGS(1310)); + joy_enable_cyclic_polling(JOYARGS(1310)); return result; } @@ -1142,14 +1142,14 @@ PakErr1 pakQueryNumNotes(OSPfs *pfs, s32 *max_files, s32 *files_used) return PAK_ERR1_OK; } -PakErr1 pakQueryNumFreeBytes(OSPfs *pfs, s32 *bytes_not_used) +PakErr1 pak_query_num_free_bytes(OSPfs *pfs, s32 *bytes_not_used) { if (pfs) { s32 result; - joyDisableCyclicPolling(JOYARGS(1337)); + joy_disable_cyclic_polling(JOYARGS(1337)); result = osPfsFreeBlocks(pfs, bytes_not_used); - joyEnableCyclicPolling(JOYARGS(1339)); + joy_enable_cyclic_polling(JOYARGS(1339)); return result; } @@ -1163,14 +1163,14 @@ PakErr1 pakQueryNumFreeBytes(OSPfs *pfs, s32 *bytes_not_used) return PAK_ERR1_OK; } -PakErr1 pakQueryNoteState(OSPfs *pfs, s32 file_no, OSPfsState *note) +PakErr1 pak_query_note_state(OSPfs *pfs, s32 file_no, OSPfsState *note) { if (pfs) { s32 result; - joyDisableCyclicPolling(JOYARGS(1363)); + joy_disable_cyclic_polling(JOYARGS(1363)); result = osPfsFileState(pfs, file_no, note); - joyEnableCyclicPolling(JOYARGS(1365)); + joy_enable_cyclic_polling(JOYARGS(1365)); return result; } @@ -1193,7 +1193,7 @@ PakErr1 pakQueryNoteState(OSPfs *pfs, s32 file_no, OSPfsState *note) const char var7f1b3c08[] = "Call to osPfsReSizeFile -> pfs=%x, cc=%u, gc=%u, gn=%s, en=%s, l=%d\n"; -PakErr1 pakAllocateNote(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 size, s32 *file_no) +PakErr1 pak_allocate_note(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 size, s32 *file_no) { if (pfs) { return osPfsAllocateFile(pfs, company_code, game_code, game_name, ext_name, size, file_no); @@ -1208,7 +1208,7 @@ PakErr1 pakAllocateNote(OSPfs *pfs, u16 company_code, u32 game_code, char *game_ return PAK_ERR1_OK; } -PakErr1 pakDeleteGameNote3(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name) +PakErr1 pak_delete_game_note3(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name) { if (pfs) { return osPfsDeleteFile(pfs, company_code, game_code, game_name, ext_name); @@ -1221,7 +1221,7 @@ PakErr1 pakDeleteGameNote3(OSPfs *pfs, u16 company_code, u32 game_code, char *ga return PAK_ERR1_OK; } -PakErr1 pakFindNote(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 *file_no) +PakErr1 pak_find_note(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 *file_no) { if (pfs) { return osPfsFindFile(pfs, company_code, game_code, game_name, ext_name, file_no); @@ -1237,10 +1237,10 @@ PakErr1 pakFindNote(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name u16 calcedsum[4]; *file_no = 0; - ret = pakReadWriteBlock(SAVEDEVICE_GAMEPAK, 0, 0, 0, 0, align16(0x10), (u8 *) &header); + ret = pak_read_write_block(SAVEDEVICE_GAMEPAK, 0, 0, 0, 0, align16(0x10), (u8 *) &header); - if (pakHandleResult(ret, SAVEDEVICE_GAMEPAK, true, LINE_1551)) { - pakCalculateChecksum((u8 *) &header + 8, (u8 *) (&header + 1), calcedsum); + if (pak_handle_result(ret, SAVEDEVICE_GAMEPAK, true, LINE_1551)) { + pak_calculate_checksum((u8 *) &header + 8, (u8 *) (&header + 1), calcedsum); if (header.headersum[0] == calcedsum[0] && header.headersum[1] == calcedsum[1]) { return PAK_ERR1_OK; @@ -1256,14 +1256,14 @@ PakErr1 pakFindNote(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name return PAK_ERR1_EEPROMMISSING; } -PakErr1 _pakResizeNote(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name, u32 numbytes) +PakErr1 _pak_resize_note(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name, u32 numbytes) { if (pfs) { s32 result; - joyDisableCyclicPolling(JOYARGS(1496)); + joy_disable_cyclic_polling(JOYARGS(1496)); result = osPfsReSizeFile(pfs, company_code, game_code, game_name, ext_name, numbytes); - joyEnableCyclicPolling(JOYARGS(1498)); + joy_enable_cyclic_polling(JOYARGS(1498)); return result; } @@ -1295,31 +1295,31 @@ const char var7f1b3df8[] = "Pak_SetThisGameSetupFile -> Pak=%d, File=%d, EEPROM= const char var7f1adbd8nb[] = "RWI : Pak_OneNewFile - Using a snug in a bug offset\n"; #endif -s32 pakGetPdNumBlocks(s8 device) +s32 pak_get_pd_num_blocks(s8 device) { return g_Paks[device].pdnumblocks; } -s32 pakGetPdNumPages(s8 device) +s32 pak_get_pd_num_pages(s8 device) { return g_Paks[device].pdnumpages; } -u32 pakGetPdNumBytes(s8 device) +u32 pak_get_pd_num_bytes(s8 device) { return g_Paks[device].pdnumbytes; } -s32 pakQueryNumFreePages(s8 device) +s32 pak_query_num_free_pages(s8 device) { s32 bytesfree; - pakQueryNumFreeBytes(PFS(device), &bytesfree); + pak_query_num_free_bytes(PFS(device), &bytesfree); return bytesfree / 256; } -s32 pakGetNumPagesRequired(void) +s32 pak_get_num_pages_required(void) { return NUM_PAGES; } @@ -1328,13 +1328,13 @@ s32 pakGetNumPagesRequired(void) * Determine if the pak could accommodate a new camera file, * considering the possibility of resizing the game note to make it larger. */ -bool pakCanFitCameraFileInPak(s8 device) +bool pak_can_fit_camera_file_in_pak(s8 device) { if (device != SAVEDEVICE_GAMEPAK) { s32 pagesneeded; - u32 bytesneeded = pakGetMaxFileSize(device); + u32 bytesneeded = pak_get_max_file_size(device); - if (pakCheckFileCanFitInNote(device, PAKFILETYPE_CAMERA, NULL) == 0) { + if (pak_check_file_can_fit_in_note(device, PAKFILETYPE_CAMERA, NULL) == 0) { return true; } @@ -1356,15 +1356,15 @@ bool pakCanFitCameraFileInPak(s8 device) * Determine how many camera files the pak could accommodate, * considering the possibility of resizing the game note to make it larger. */ -s32 pakGetNumFreeCameraSpacesInPak(s8 device) +s32 pak_get_num_free_camera_spaces_in_pak(s8 device) { if (device != SAVEDEVICE_GAMEPAK) { s32 numspaces = 0; s32 pagesneeded; u32 bytesneeded; - bytesneeded = pakGetMaxFileSize(device); - pakCheckFileCanFitInNote(device, PAKFILETYPE_CAMERA, &numspaces); + bytesneeded = pak_get_max_file_size(device); + pak_check_file_can_fit_in_note(device, PAKFILETYPE_CAMERA, &numspaces); pagesneeded = bytesneeded / 256; if (bytesneeded & 0xff) { @@ -1380,14 +1380,14 @@ s32 pakGetNumFreeCameraSpacesInPak(s8 device) return 0; } -s32 _pakCreateCameraFile(s8 device, s32 *outfileid) +s32 _pak_create_camera_file(s8 device, s32 *outfileid) { - if (device != SAVEDEVICE_GAMEPAK && pakCanFitCameraFileInPak(device)) { + if (device != SAVEDEVICE_GAMEPAK && pak_can_fit_camera_file_in_pak(device)) { s32 result; - u32 bytesneeded = pakGetMaxFileSize(device); + u32 bytesneeded = pak_get_max_file_size(device); - if (pakCheckFileCanFitInNote(device, PAKFILETYPE_CAMERA, NULL) != 0) { - s32 pages = pakGetPdNumPages(device); + if (pak_check_file_can_fit_in_note(device, PAKFILETYPE_CAMERA, NULL) != 0) { + s32 pages = pak_get_pd_num_pages(device); s32 pagesneeded = bytesneeded / 256; if (bytesneeded & 0xff) { @@ -1396,7 +1396,7 @@ s32 _pakCreateCameraFile(s8 device, s32 *outfileid) pages += pagesneeded; - if (!pakResizeNote(device, pages)) { + if (!pak_resize_note(device, pages)) { return 4; } } @@ -1413,7 +1413,7 @@ s32 _pakCreateCameraFile(s8 device, s32 *outfileid) return 14; } -bool pakResizeNote(s8 device, s32 numpages) +bool pak_resize_note(s8 device, s32 numpages) { s32 stack1[2]; s32 errno; @@ -1422,12 +1422,12 @@ bool pakResizeNote(s8 device, s32 numpages) OSPfsState *note; u32 numbytes; - pakGetPdNumPages(device); - pakQueryNumFreePages(device); + pak_get_pd_num_pages(device); + pak_query_num_free_pages(device); numbytes = numpages * 256; - errno = _pakResizeNote(PFS(device), ROM_COMPANYCODE, ROM_GAMECODE, g_PakNoteGameName, g_PakNoteExtName, numbytes); - pakHandleResult(errno, device, true, LINE_1802); + errno = _pak_resize_note(PFS(device), ROM_COMPANYCODE, ROM_GAMECODE, g_PakNoteGameName, g_PakNoteExtName, numbytes); + pak_handle_result(errno, device, true, LINE_1802); if (errno == PAK_ERR1_OK) { devicedata = &g_Paks[device]; @@ -1439,7 +1439,7 @@ bool pakResizeNote(s8 device, s32 numpages) note->file_size = devicedata->pakdata.pagesused * 256; devicedata->pdnumbytes = numbytes; - devicedata->pdnumblocks = devicedata->pdnumbytes / pakGetBlockSize(device); + devicedata->pdnumblocks = devicedata->pdnumbytes / pak_get_block_size(device); devicedata->pdnumpages = devicedata->pdnumbytes / 256; return true; @@ -1487,7 +1487,7 @@ u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid) struct pakfileheader header; s32 ret; s32 zero = 0; - s32 filelen = pakGetAlignedFileLenByBodyLen(device, pakGetBodyLenByType(device, filetype)); + s32 filelen = pak_get_aligned_file_len_by_body_len(device, pak_get_body_len_by_type(device, filetype)); s32 bestoffset = -1; u32 offset = 0; bool foundperfectblank = false; @@ -1500,7 +1500,7 @@ u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid) } while (offset < g_Paks[device].pdnumbytes) { - ret = pakReadHeaderAtOffset(device, offset, &header); + ret = pak_read_header_at_offset(device, offset, &header); if (ret == PAK_ERR2_OK) { if (header.filetype & PAKFILETYPE_TERMINATOR) { @@ -1536,7 +1536,7 @@ u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid) } #endif else { - offset += pakGetBlockSize(device); + offset += pak_get_block_size(device); } } @@ -1548,17 +1548,17 @@ u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid) } if (offset == 0 || - (offset && offset < pakGetPdNumBytes(device) && ((pakGetBlockSize(device) - 1) & offset) == 0)) { + (offset && offset < pak_get_pd_num_bytes(device) && ((pak_get_block_size(device) - 1) & offset) == 0)) { if (bestoffset == -1) { return 14; } // Write the file - if (pakWriteFileAtOffset(device, bestoffset, filetype, NULL, 0, outfileid, NULL, 0, 1) == 0) { + if (pak_write_file_at_offset(device, bestoffset, filetype, NULL, 0, outfileid, NULL, 0, 1) == 0) { #if VERSION >= VERSION_NTSC_FINAL if (foundblank) { u32 endoffset = bestoffset + filelen; - pakRepairAsBlank(device, &endoffset, NULL); + pak_repair_as_blank(device, &endoffset, NULL); return 0; } @@ -1572,9 +1572,9 @@ u32 pak0f118674(s8 device, u32 filetype, s32 *outfileid) #endif // Write new terminator after file - bestoffset += pakGetAlignedFileLenByBodyLen(device, pakGetBodyLenByType(device, filetype)); + bestoffset += pak_get_aligned_file_len_by_body_len(device, pak_get_body_len_by_type(device, filetype)); - if (pakWriteFileAtOffset(device, bestoffset, PAKFILETYPE_TERMINATOR, NULL, 0, NULL, NULL, 0, 1) == 0) { + if (pak_write_file_at_offset(device, bestoffset, PAKFILETYPE_TERMINATOR, NULL, 0, NULL, NULL, 0, 1) == 0) { return 0; } @@ -1595,7 +1595,7 @@ void pak0f1189d0(void) // empty } -void paksInit(void) +void paks_init(void) { #if VERSION >= VERSION_NTSC_1_0 u8 prevvalue = g_Vars.paksneededformenu; @@ -1604,31 +1604,31 @@ void paksInit(void) g_Vars.pakstocheck = 0; for (i = 0; i < ARRAYCOUNT(g_Paks); i++) { - pakSetDefaults(i); + pak_set_defaults(i); } for (i = 0; i < ARRAYCOUNT(g_Paks); i++) { #if VERSION >= VERSION_JPN_FINAL - pakSetFeatures(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 2054, "pak/pak.c"); + pak_set_features(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 2054, "pak/pak.c"); #elif VERSION >= VERSION_PAL_BETA - pakSetFeatures(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 2049, "pak.c"); + pak_set_features(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 2049, "pak.c"); #elif VERSION >= VERSION_NTSC_FINAL - pakSetFeatures(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 2049, "pak/pak.c"); + pak_set_features(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 2049, "pak/pak.c"); #else - pakSetFeatures(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 2016, "pak.c"); + pak_set_features(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 2016, "pak.c"); #endif } - pakProbeEeprom(); - joyRecordPfsState(0x10); + pak_probe_eeprom(); + joy_record_pfs_state(0x10); g_Vars.paksneededformenu = 0x10; pak0f1169c8(SAVEDEVICE_GAMEPAK, true); - bossfileLoadFull(); + bossfile_load_full(); - gamefileLoadDefaults(&g_GameFile); - gamefileApplyOptions(&g_GameFile); + gamefile_load_defaults(&g_GameFile); + gamefile_apply_options(&g_GameFile); g_GameFileGuid.deviceserial = 0; g_Vars.pakstocheck = 0xf5; @@ -1638,41 +1638,41 @@ void paksInit(void) s32 j; for (i = 0; i < ARRAYCOUNT(g_Paks); i++) { - pakSetDefaults(i); + pak_set_defaults(i); } g_Vars.paksneededforgame = 0x1f; for (i = 0; i < ARRAYCOUNT(g_Paks); i++) { - pakSetFeatures(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 1929, "pak.c"); + pak_set_features(i, PAKFEATURE_MEMORY | PAKFEATURE_RUMBLE | PAKFEATURE_GAMEBOY, 1929, "pak.c"); } - pakProbeEeprom(); + pak_probe_eeprom(); osSyncPrintf("Pak_Make -> Dumping details of file types found\n"); for (j = 0; j < 9; j++) { - s32 len = pakGetBodyLenByType(0, 1 << j); + s32 len = pak_get_body_len_by_type(0, 1 << j); pak0f1114a0nb(1 << j); - // The use of i in pakGetAlignedFileLenByBodyLen is likely a bug, + // The use of i in pak_get_aligned_file_len_by_body_len is likely a bug, // but this is debug code anyway osSyncPrintf("Type %d -> ", 1 << j); - osSyncPrintf(", dSize=%u, fSize=%u\n", len, pakGetAlignedFileLenByBodyLen(i, len)); + osSyncPrintf(", dSize=%u, fSize=%u\n", len, pak_get_aligned_file_len_by_body_len(i, len)); } osSyncPrintf("Pak_Make -> Checking for inserted pakz\n"); - pakExecuteDebugOperations(); + pak_execute_debug_operations(); osSyncPrintf("Pak_Make -> Loading Boss File\n"); - if (!bossfileLoadFull()) { + if (!bossfile_load_full()) { osSyncPrintf("Pak_Make -> Boss file load failed - Try to make a new one\n"); } osSyncPrintf("Pak_Make -> Setting up default game file\n"); - gamefileLoadDefaults(&g_GameFile); - gamefileApplyOptions(&g_GameFile); + gamefile_load_defaults(&g_GameFile); + gamefile_apply_options(&g_GameFile); g_GameFileGuid.deviceserial = 0; g_Vars.paksneededforgame = 0; @@ -1699,9 +1699,9 @@ const char var7f1b407c[] = "Pak Return Code = Unknown - %d\n"; const char var7f1b407c[] = "Pak Return Code = Unknown - %d"; #endif -void pakCalculateChecksum(u8 *start, u8 *end, u16 *checksum) +void pak_calculate_checksum(u8 *start, u8 *end, u16 *checksum) { - crcCalculateU16Pair(start, end, checksum); + crc_calculate_u16_pair(start, end, checksum); } s32 pak0f118b04(s8 device, u32 fileid) @@ -1710,7 +1710,7 @@ s32 pak0f118b04(s8 device, u32 fileid) s32 result = pak0f1167d8(device); if (result == 0) { - offset = pakFindFile(device, fileid, 0); + offset = pak_find_file(device, fileid, 0); #if VERSION >= VERSION_NTSC_1_0 if (offset == -1) { @@ -1718,8 +1718,8 @@ s32 pak0f118b04(s8 device, u32 fileid) } #endif - if (offset == 0 || (offset != 0 && offset < pakGetPdNumBytes(device) && ((pakGetBlockSize(device) - 1) & offset) == 0)) { - if (!pakReplaceFileAtOffsetWithBlank(device, offset)) { + if (offset == 0 || (offset != 0 && offset < pak_get_pd_num_bytes(device) && ((pak_get_block_size(device) - 1) & offset) == 0)) { + if (!pak_replace_file_at_offset_with_blank(device, offset)) { return 4; } } else { @@ -1732,7 +1732,7 @@ s32 pak0f118b04(s8 device, u32 fileid) return 0; } -s32 _pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3) +s32 _pak_read_body_at_guid(s8 device, s32 fileid, u8 *body, s32 arg3) { s32 offset; struct pakfileheader header; @@ -1740,7 +1740,7 @@ s32 _pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3) u16 checksum[2]; if (!pak0f1167d8(device)) { - offset = pakFindFile(device, fileid, NULL); + offset = pak_find_file(device, fileid, NULL); #if VERSION >= VERSION_NTSC_1_0 if (offset == -1) { @@ -1748,7 +1748,7 @@ s32 _pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3) } #endif - if (offset == 0 || (offset && offset < pakGetPdNumBytes(device) && ((pakGetBlockSize(device) - 1) & offset) == 0)) { + if (offset == 0 || (offset && offset < pak_get_pd_num_bytes(device) && ((pak_get_block_size(device) - 1) & offset) == 0)) { result = pak0f11b86c(device, offset, body, &header, arg3); if (result) { @@ -1761,7 +1761,7 @@ s32 _pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3) if (header.occupied) { if (!arg3) { - pakCalculateChecksum(body, body + header.bodylen, checksum); + pak_calculate_checksum(body, body + header.bodylen, checksum); if (header.bodysum[0] != checksum[0] || header.bodysum[1] != checksum[1]) { return 8; @@ -1780,7 +1780,7 @@ s32 _pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3) return 0; } -s32 _pakGetFileIdsByType(s8 device, u32 filetype, u32 *fileids) +s32 _pak_get_file_ids_by_type(s8 device, u32 filetype, u32 *fileids) { struct pakfileheader header; u32 offset = 0; @@ -1792,7 +1792,7 @@ s32 _pakGetFileIdsByType(s8 device, u32 filetype, u32 *fileids) return result; } - result = pakGetFilesystemLength(device, &fslen); + result = pak_get_filesystem_length(device, &fslen); if (result != 0) { return result; @@ -1804,7 +1804,7 @@ s32 _pakGetFileIdsByType(s8 device, u32 filetype, u32 *fileids) return pak0f1167d8(device); } - result = pakReadHeaderAtOffset(device, offset, &header); + result = pak_read_header_at_offset(device, offset, &header); while (result == PAK_ERR2_OK) { if ((filetype & PAKFILETYPE_ALL) || (filetype & header.filetype)) { @@ -1818,7 +1818,7 @@ s32 _pakGetFileIdsByType(s8 device, u32 filetype, u32 *fileids) break; } - result = pakReadHeaderAtOffset(device, offset, &header); + result = pak_read_header_at_offset(device, offset, &header); } fileids[len] = 0; @@ -1854,7 +1854,7 @@ s32 pak0f118eb0(s8 device, u32 *dst) return ret; } - while (pakReadHeaderAtOffset(device, offset, &header) == 0) { + while (pak_read_header_at_offset(device, offset, &header) == 0) { if (PAKFILETYPE_BLANK == header.filetype) { numblanks++; } @@ -1867,7 +1867,7 @@ s32 pak0f118eb0(s8 device, u32 *dst) return 0; } -s32 pakDefrag(s8 device) +s32 pak_defrag(s8 device) { s32 result = pak0f1167d8(device); @@ -1875,7 +1875,7 @@ s32 pakDefrag(s8 device) return result; } - pakMergeBlanks(device); + pak_merge_blanks(device); return 0; } @@ -1885,7 +1885,7 @@ s32 pakDefrag(s8 device) * * Return 0 if it can fit, otherwise 5. */ -s32 pakCheckFileCanFitInNote(s8 device, s32 filetype, s32 *numspaces) +s32 pak_check_file_can_fit_in_note(s8 device, s32 filetype, s32 *numspaces) { struct pakfileheader header; u32 filelen; @@ -1894,17 +1894,17 @@ s32 pakCheckFileCanFitInNote(s8 device, s32 filetype, s32 *numspaces) u32 offset; u32 roomtogrow; - filelen = pakGetAlignedFileLenByBodyLen(device, pakGetBodyLenByType(device, filetype)); + filelen = pak_get_aligned_file_len_by_body_len(device, pak_get_body_len_by_type(device, filetype)); hasspace = false; - pakGetFilesystemLength(device, &fslen); + pak_get_filesystem_length(device, &fslen); if (numspaces != NULL) { *numspaces = 0; } - for (offset = 0; pakReadHeaderAtOffset(device, offset, &header) == PAK_ERR2_OK && offset < fslen; offset += header.filelen) { + for (offset = 0; pak_read_header_at_offset(device, offset, &header) == PAK_ERR2_OK && offset < fslen; offset += header.filelen) { if (PAKFILETYPE_BLANK == header.filetype && header.filelen >= filelen) { hasspace = true; @@ -1920,7 +1920,7 @@ s32 pakCheckFileCanFitInNote(s8 device, s32 filetype, s32 *numspaces) *numspaces += roomtogrow / filelen; } - if (!hasspace && roomtogrow >= pakGetMaxFileSize(device)) { + if (!hasspace && roomtogrow >= pak_get_max_file_size(device)) { hasspace = true; } @@ -1969,7 +1969,7 @@ void pak0f119340(u32 arg0) } } -s32 pakFindFile(s8 device, u32 fileid, struct pakfileheader *headerptr) +s32 pak_find_file(s8 device, u32 fileid, struct pakfileheader *headerptr) { // NTSC 1.0 adds error checking #if VERSION >= VERSION_NTSC_1_0 @@ -1978,9 +1978,9 @@ s32 pakFindFile(s8 device, u32 fileid, struct pakfileheader *headerptr) u32 fslen; s32 ret; - pakGetFilesystemLength(device, &fslen); + pak_get_filesystem_length(device, &fslen); - ret = pakReadHeaderAtOffset(device, offset, &header); + ret = pak_read_header_at_offset(device, offset, &header); while (ret == PAK_ERR2_OK && offset < fslen) { if (fileid == header.fileid) { @@ -1993,7 +1993,7 @@ s32 pakFindFile(s8 device, u32 fileid, struct pakfileheader *headerptr) offset += header.filelen; - ret = pakReadHeaderAtOffset(device, offset, &header); + ret = pak_read_header_at_offset(device, offset, &header); } if (ret == PAK_ERR2_NOPAK) { @@ -2006,9 +2006,9 @@ s32 pakFindFile(s8 device, u32 fileid, struct pakfileheader *headerptr) u32 fslen; s32 offset = 0; - pakGetFilesystemLength(device, &fslen); + pak_get_filesystem_length(device, &fslen); - while (pakReadHeaderAtOffset(device, offset, &header) == PAK_ERR2_OK && offset < fslen) { + while (pak_read_header_at_offset(device, offset, &header) == PAK_ERR2_OK && offset < fslen) { if (fileid == header.fileid) { if (headerptr) { memcpy(headerptr, &header, sizeof(struct pakfileheader)); @@ -2025,9 +2025,9 @@ s32 pakFindFile(s8 device, u32 fileid, struct pakfileheader *headerptr) } #if VERSION >= VERSION_NTSC_FINAL -bool pakWriteBlankFile(s8 device, u32 offset, struct pakfileheader *header) +bool pak_write_blank_file(s8 device, u32 offset, struct pakfileheader *header) { - if (pakWriteFileAtOffset(device, offset, PAKFILETYPE_BLANK, NULL, pakGetBodyLenByFileLen(header->filelen), NULL, NULL, 0, 1) == 0) { + if (pak_write_file_at_offset(device, offset, PAKFILETYPE_BLANK, NULL, pak_get_body_len_by_file_len(header->filelen), NULL, NULL, 0, 1) == 0) { return true; } @@ -2057,11 +2057,11 @@ bool pakWriteBlankFile(s8 device, u32 offset, struct pakfileheader *header) * corresponding to the starting offset and the function takes a shortcut by * starting the scan at the end of the header. */ -bool pakRepairAsBlank(s8 device, u32 *offsetptr, struct pakfileheader *header) +bool pak_repair_as_blank(s8 device, u32 *offsetptr, struct pakfileheader *header) { struct pakfileheader iterheader; - u32 maxfilesize = pakGetMaxFileSize(device); + u32 maxfilesize = pak_get_max_file_size(device); u32 start = *offsetptr; u32 start2 = *offsetptr; u32 offset = *offsetptr; @@ -2082,7 +2082,7 @@ bool pakRepairAsBlank(s8 device, u32 *offsetptr, struct pakfileheader *header) #endif while (offset < g_Paks[device].pdnumbytes) { - result = pakReadHeaderAtOffset(device, offset, &iterheader); + result = pak_read_header_at_offset(device, offset, &iterheader); #if VERSION >= VERSION_NTSC_FINAL if (1); @@ -2097,7 +2097,7 @@ bool pakRepairAsBlank(s8 device, u32 *offsetptr, struct pakfileheader *header) } // No header at this offset - offset += pakGetBlockSize(device); + offset += pak_get_block_size(device); // For controller paks, consider giving up if (device != SAVEDEVICE_GAMEPAK && offset - start > maxfilesize) { @@ -2107,7 +2107,7 @@ bool pakRepairAsBlank(s8 device, u32 *offsetptr, struct pakfileheader *header) // If the end was reached, write a terminator at the starting offset if (offset >= g_Paks[device].pdnumbytes) { - pakWriteFileAtOffset(device, start, PAKFILETYPE_TERMINATOR, NULL, 0, NULL, NULL, 0, 1); + pak_write_file_at_offset(device, start, PAKFILETYPE_TERMINATOR, NULL, 0, NULL, NULL, 0, 1); return true; } #elif VERSION >= VERSION_NTSC_1_0 @@ -2125,7 +2125,7 @@ bool pakRepairAsBlank(s8 device, u32 *offsetptr, struct pakfileheader *header) } // No header at this offset - offset += pakGetBlockSize(device); + offset += pak_get_block_size(device); if (offset - start > maxfilesize) { osSyncPrintf("Pak %d -> Pak_RepairAsBlank -> Fault Speads Over More Than One File - TERMINAL", device); @@ -2145,7 +2145,7 @@ bool pakRepairAsBlank(s8 device, u32 *offsetptr, struct pakfileheader *header) } // No header at this offset - offset += pakGetBlockSize(device); + offset += pak_get_block_size(device); if (offset - start > maxfilesize) { osSyncPrintf("Pak %d -> Pak_RepairAsBlank -> Fault Speads Over More Than One File - TERMINAL", device); @@ -2155,12 +2155,12 @@ bool pakRepairAsBlank(s8 device, u32 *offsetptr, struct pakfileheader *header) #endif } - bodylen = pakGetBodyLenByFileLen(offset - start); + bodylen = pak_get_body_len_by_file_len(offset - start); osSyncPrintf("Pak %d -> Pak_RepairAsBlank - St=%u, Ed=%u, Gap=%u, Blank Size=%u\n", device, start, offset, offset - start, bodylen); // Write the blank file ranging from to the start to the current offset - result = pakWriteFileAtOffset(device, start, PAKFILETYPE_BLANK, NULL, bodylen, NULL, NULL, 0, 1); + result = pak_write_file_at_offset(device, start, PAKFILETYPE_BLANK, NULL, bodylen, NULL, NULL, 0, 1); if (result != 0) { osSyncPrintf("Pak %d -> Pak_RepairAsBlank - Fatal Error at tOffset %u\n", device, offset); @@ -2204,7 +2204,7 @@ struct serialcount { * - Removes files if partially written * - Returns 1 if filesystem is good, or 0 if unrepairable */ -s32 pakRepairFilesystem(s8 device) +s32 pak_repair_filesystem(s8 device) { s32 ret; bool fatal = false; @@ -2247,14 +2247,14 @@ s32 pakRepairFilesystem(s8 device) offset = 0; while (!fatal && offset < g_Paks[device].pdnumbytes) { - ret = pakReadHeaderAtOffset(device, offset, &header); + ret = pak_read_header_at_offset(device, offset, &header); if (ret == PAK_ERR2_OK) { if (header.filetype & PAKFILETYPE_BLANK) { #if VERSION >= VERSION_NTSC_FINAL break; #else - fatal = !pakRepairAsBlank(device, &offset, NULL); + fatal = !pak_repair_as_blank(device, &offset, NULL); continue; #endif } @@ -2270,7 +2270,7 @@ s32 pakRepairFilesystem(s8 device) #endif { // File overflows the device length -> replace with terminator - ret = pakWriteFileAtOffset(device, offset, PAKFILETYPE_TERMINATOR, NULL, 0, NULL, NULL, 0, 1); + ret = pak_write_file_at_offset(device, offset, PAKFILETYPE_TERMINATOR, NULL, 0, NULL, NULL, 0, 1); if (ret != 0) { fatal = true; @@ -2288,10 +2288,10 @@ s32 pakRepairFilesystem(s8 device) if (header.generation < headers[i].generation) { // The header that was just read is older -> delete it - fatal = pakRepairAsBlank(device, &offset, &header) == 0; + fatal = pak_repair_as_blank(device, &offset, &header) == 0; } else { // The header that was just read is newer -> delete the older one - fatal = pakRepairAsBlank(device, &headeroffsets[i], &headers[i]) == 0; + fatal = pak_repair_as_blank(device, &headeroffsets[i], &headers[i]) == 0; headeroffsets[i] = -1; // Add this header to the list @@ -2319,9 +2319,9 @@ s32 pakRepairFilesystem(s8 device) if (ret == PAK_ERR2_NOPAK) { return 1; } else if (ret == PAK_ERR2_CHECKSUM) { - fatal = pakRepairAsBlank(device, &offset, NULL) == false; + fatal = pak_repair_as_blank(device, &offset, NULL) == false; } else if (ret == PAK_ERR2_INCOMPLETE) { - if (!pakRepairAsBlank(device, &offset, &header)) { + if (!pak_repair_as_blank(device, &offset, &header)) { fatal = true; break; } @@ -2340,9 +2340,9 @@ s32 pakRepairFilesystem(s8 device) } #else if (ret == PAK_ERR2_CHECKSUM) { - fatal = pakRepairAsBlank(device, &offset, NULL) == false; + fatal = pak_repair_as_blank(device, &offset, NULL) == false; } else if (ret == PAK_ERR2_INCOMPLETE) { - fatal = pakRepairAsBlank(device, &offset, &header) == false; + fatal = pak_repair_as_blank(device, &offset, &header) == false; } else if (ret == PAK_ERR2_VERSION) { foundotherversion = true; break; @@ -2366,7 +2366,7 @@ s32 pakRepairFilesystem(s8 device) #if VERSION >= VERSION_NTSC_1_0 while (!foundotherversion && !fatal && offset < g_Paks[device].pdnumbytes) { - ret = pakReadHeaderAtOffset(device, offset, &header); + ret = pak_read_header_at_offset(device, offset, &header); if (ret == 0) { // success if (header.filetype & PAKFILETYPE_BLANK) { @@ -2374,7 +2374,7 @@ s32 pakRepairFilesystem(s8 device) } else if (offset) { #if VERSION < VERSION_NTSC_FINAL if (header.deviceserial != g_Paks[device].serial) { - if (pakRepairAsBlank(device, &offset, &header)) { + if (pak_repair_as_blank(device, &offset, &header)) { // empty } else { fatal = true; @@ -2407,7 +2407,7 @@ s32 pakRepairFilesystem(s8 device) } #else while (!foundotherversion && !fatal && offset < g_Paks[device].pdnumbytes) { - ret = pakReadHeaderAtOffset(device, offset, &header); + ret = pak_read_header_at_offset(device, offset, &header); if (ret == PAK_ERR2_OK) { if (header.filetype & PAKFILETYPE_TERMINATOR) { @@ -2441,7 +2441,7 @@ s32 pakRepairFilesystem(s8 device) offset = 0; while (offset < g_Paks[device].pdnumbytes) { - ret = pakReadHeaderAtOffset(device, offset, &header); + ret = pak_read_header_at_offset(device, offset, &header); if (ret == PAK_ERR2_NOPAK); @@ -2493,14 +2493,14 @@ s32 pakRepairFilesystem(s8 device) #if VERSION >= VERSION_PAL_BETA if (g_Paks[device].serial < 0x10) { - g_Paks[device].serial = pakGenerateSerial(device); + g_Paks[device].serial = pak_generate_serial(device); } #endif offset = 0; while (offset < g_Paks[device].pdnumbytes) { - ret = pakReadHeaderAtOffset(device, offset, &header); + ret = pak_read_header_at_offset(device, offset, &header); if (ret != PAK_ERR2_OK) { break; @@ -2512,7 +2512,7 @@ s32 pakRepairFilesystem(s8 device) } if (header.deviceserial != g_Paks[device].serial) { - pakWriteBlankFile(device, offset, &header); + pak_write_blank_file(device, offset, &header); } } @@ -2537,7 +2537,7 @@ s32 pakRepairFilesystem(s8 device) #if VERSION >= VERSION_NTSC_1_0 if (device != SAVEDEVICE_GAMEPAK && g_Paks[device].serial == 0) { - g_Paks[device].serial = pakGenerateSerial(device); + g_Paks[device].serial = pak_generate_serial(device); return -1; } #else @@ -2555,7 +2555,7 @@ s32 pakRepairFilesystem(s8 device) * Find all game files on the game pak and write random data into them. * This should cause a checksum mismatch the next time the file is read. */ -void pakCorrupt(void) +void pak_corrupt(void) { struct pakfileheader header; u32 fileids[1025]; @@ -2564,20 +2564,20 @@ void pakCorrupt(void) s32 j; u8 payload[8]; - pakGetFileIdsByType(SAVEDEVICE_GAMEPAK, PAKFILETYPE_GAME, fileids); + pak_get_file_ids_by_type(SAVEDEVICE_GAMEPAK, PAKFILETYPE_GAME, fileids); for (i = 0; fileids[i] != 0; i++) { for (j = 0; j < 8; j++) { payload[j] = random() & 0xff; } - address = pakFindFile(SAVEDEVICE_GAMEPAK, fileids[i], &header); + address = pak_find_file(SAVEDEVICE_GAMEPAK, fileids[i], &header); address += i * 8; address += 0x30; - joyDisableCyclicPolling(); + joy_disable_cyclic_polling(); osEepromLongWrite(&g_PiMesgQueue, address, payload, sizeof(payload)); - joyEnableCyclicPolling(); + joy_enable_cyclic_polling(); } } #endif @@ -2588,9 +2588,9 @@ void pakCorrupt(void) * NTSC Beta forgets to include return values. */ #if VERSION >= VERSION_NTSC_1_0 -bool pakCreateInitialFiles(s8 device) +bool pak_create_initial_files(s8 device) #else -void pakCreateInitialFiles(s8 device) +void pak_create_initial_files(s8 device) #endif { struct pakfileheader header; @@ -2616,7 +2616,7 @@ void pakCreateInitialFiles(s8 device) #endif // Iterate all files on the pak and decrease the counts per filetype - if (pakGetFileIdsByType(device, PAKFILETYPE_ALL, fileids) != 0) { + if (pak_get_file_ids_by_type(device, PAKFILETYPE_ALL, fileids) != 0) { #if VERSION >= VERSION_NTSC_1_0 return false; #else @@ -2626,11 +2626,11 @@ void pakCreateInitialFiles(s8 device) for (i = 0; fileids[i] != 0; i++) { #if VERSION >= VERSION_NTSC_1_0 - if (pakFindFile(device, fileids[i], &header) == -1) { + if (pak_find_file(device, fileids[i], &header) == -1) { return false; } #else - pakFindFile(device, fileids[i], &header); + pak_find_file(device, fileids[i], &header); #endif for (j = 0; j < ARRAYCOUNT(filetypes); j++) { @@ -2681,7 +2681,7 @@ void pakCreateInitialFiles(s8 device) #endif } -s32 pakFindMaxFileId(s8 device) +s32 pak_find_max_file_id(s8 device) { struct pakfileheader header; u32 fileids[1025]; @@ -2689,12 +2689,12 @@ s32 pakFindMaxFileId(s8 device) s32 max = 0; s32 i; - result = pakGetFileIdsByType(device, PAKFILETYPE_ALL, fileids); + result = pak_get_file_ids_by_type(device, PAKFILETYPE_ALL, fileids); #if VERSION >= VERSION_NTSC_1_0 if (result == 0) { for (i = 0; fileids[i] != 0; i++) { - s32 offset = pakFindFile(device, fileids[i], &header); + s32 offset = pak_find_file(device, fileids[i], &header); if (offset == -1) { return -1; @@ -2709,7 +2709,7 @@ s32 pakFindMaxFileId(s8 device) } #else for (i = 0; fileids[i] != 0; i++) { - s32 offset = pakFindFile(device, fileids[i], &header); + s32 offset = pak_find_file(device, fileids[i], &header); if (header.fileid > max) { max = header.fileid; @@ -2722,14 +2722,14 @@ s32 pakFindMaxFileId(s8 device) return max; } -void pakMergeBlanks(s8 device) +void pak_merge_blanks(s8 device) { struct pakfileheader header; u32 offset = 0; u32 nextoffset; s32 mergestartoffset = 0xffff; - while (pakReadHeaderAtOffset(device, offset, &header) == PAK_ERR2_OK) { + while (pak_read_header_at_offset(device, offset, &header) == PAK_ERR2_OK) { nextoffset = offset + header.filelen; if (offset); @@ -2738,7 +2738,7 @@ void pakMergeBlanks(s8 device) if (mergestartoffset != 0xffff) { u32 filelen = offset - mergestartoffset + header.filelen - sizeof(struct pakfileheader); - if (pakWriteFileAtOffset(device, mergestartoffset, PAKFILETYPE_BLANK, NULL, filelen, NULL, NULL, 0, 1) != 0) { + if (pak_write_file_at_offset(device, mergestartoffset, PAKFILETYPE_BLANK, NULL, filelen, NULL, NULL, 0, 1) != 0) { osSyncPrintf("> Pak_DefragPak_Level1 - Merge of two blanks failed"); } @@ -2755,24 +2755,24 @@ void pakMergeBlanks(s8 device) } } -void paksReset(void) +void paks_reset(void) { // empty } -s32 pakGetFeatures(s8 device) +s32 pak_get_features(s8 device) { return g_Paks[device].features; } -void pakSetFeatures(s8 device, u8 features, u32 line, char *file) +void pak_set_features(s8 device, u8 features, u32 line, char *file) { if (g_Paks[device].features == 0) { g_Paks[device].features = features; if ((g_Paks[device].features & PAKFEATURE_MEMORY) && g_Paks[device].headercache == NULL) { g_Paks[device].headercachecount = 0; - g_Paks[device].headercache = mempAlloc(align32(sizeof(struct pakheadercache) * MAX_HEADERCACHE_ENTRIES), MEMPOOL_PERMANENT); + g_Paks[device].headercache = memp_alloc(align32(sizeof(struct pakheadercache) * MAX_HEADERCACHE_ENTRIES), MEMPOOL_PERMANENT); // This would have been used in an osSyncPrintf call. // Perhaps using the strings at var7f1b4318 through var7f1b43ac? @@ -2781,7 +2781,7 @@ void pakSetFeatures(s8 device, u8 features, u32 line, char *file) } } -void pakRemoveAllFeatures(s8 device, u32 arg1, u32 arg2) +void pak_remove_all_features(s8 device, u32 arg1, u32 arg2) { if (g_Paks[device].features) { g_Paks[device].features = 0; @@ -2822,7 +2822,7 @@ const char var7f1b43f8[] = "Pak -> Pak_MakeOne - Id=%d is finished\n"; const char var7f1b43f8[] = "Pak -> Pak_MakeOne - Id=%d is finished"; #endif -void pakSetDefaults(s8 device) +void pak_set_defaults(s8 device) { g_Paks[device].unk274 = 3; g_Paks[device].features = 0; @@ -2852,19 +2852,19 @@ void pakSetDefaults(s8 device) #endif } -PakErr1 pakReadWriteBlock(s8 device, OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer) +PakErr1 pak_read_write_block(s8 device, OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer) { s32 result; - len = pakAlign(device, len); + len = pak_align(device, len); - joyDisableCyclicPolling(JOYARGS(3096)); - result = _pakReadWriteBlock(pfs, file_no, flag, address, len, buffer); - joyEnableCyclicPolling(JOYARGS(3098)); + joy_disable_cyclic_polling(JOYARGS(3096)); + result = _pak_read_write_block(pfs, file_no, flag, address, len, buffer); + joy_enable_cyclic_polling(JOYARGS(3098)); return result; } -bool pakQueryTotalUsage(s8 device) +bool pak_query_total_usage(s8 device) { struct pak *pak = &g_Paks[device]; s32 noteerrors[16]; @@ -2882,23 +2882,23 @@ bool pakQueryTotalUsage(s8 device) return true; } - ret = pakQueryNumNotes(PFS(device), &pak->notestotal, &pak->notesused); + ret = pak_query_num_notes(PFS(device), &pak->notestotal, &pak->notesused); - if (!pakHandleResult(ret, device, true, LINE_3486)) { + if (!pak_handle_result(ret, device, true, LINE_3486)) { pak->unk2b8_02 = false; return false; } - ret = pakQueryNumFreeBytes(PFS(device), &bytesfree); + ret = pak_query_num_free_bytes(PFS(device), &bytesfree); pak->pakdata.pagesfree = ((bytesfree + 255) & 0xffff) >> 8; - if (!pakHandleResult(ret, device, true, LINE_3495)) { + if (!pak_handle_result(ret, device, true, LINE_3495)) { pak->unk2b8_02 = false; return false; } for (i = 0; i < ARRAYCOUNT(noteerrors); i++) { - noteerrors[i] = pakQueryNoteState(PFS(device), i, &pak->pakdata.notes[i]); + noteerrors[i] = pak_query_note_state(PFS(device), i, &pak->pakdata.notes[i]); if (noteerrors[i] != PAK_ERR1_OK) { pak->pakdata.notesinuse[i] = false; @@ -2918,19 +2918,19 @@ bool pakQueryTotalUsage(s8 device) return true; } -void pakQueryPdSize(s8 device) +void pak_query_pd_size(s8 device) { u32 stack; OSPfsState note; s32 result; - joyDisableCyclicPolling(JOYARGS(3242)); - result = pakQueryNoteState(PFS(device), g_Paks[device].pdnoteindex, ¬e); - joyEnableCyclicPolling(JOYARGS(3244)); + joy_disable_cyclic_polling(JOYARGS(3242)); + result = pak_query_note_state(PFS(device), g_Paks[device].pdnoteindex, ¬e); + joy_enable_cyclic_polling(JOYARGS(3244)); - if (pakHandleResult(result, device, true, LINE_3599)) { + if (pak_handle_result(result, device, true, LINE_3599)) { g_Paks[device].pdnumbytes = note.file_size; - g_Paks[device].pdnumblocks = g_Paks[device].pdnumbytes / pakGetBlockSize(device); + g_Paks[device].pdnumblocks = g_Paks[device].pdnumbytes / pak_get_block_size(device); g_Paks[device].pdnumpages = g_Paks[device].pdnumbytes / 256; g_Paks[device].pdnumnotes = g_Paks[device].pdnumbytes / (256 * NUM_PAGES); } @@ -2954,20 +2954,20 @@ bool pak0f1147b8nb(s8 device) osSyncPrintf("Pak %d -> Pak_Memory_Init1"); - joyDisableCyclicPolling(3272, "pak.c"); - ret = pakInitPak(&g_PiMesgQueue, PFS(device), device); - joyEnableCyclicPolling(3274, "pak.c"); + joy_disable_cyclic_polling(3272, "pak.c"); + ret = pak_init_pak(&g_PiMesgQueue, PFS(device), device); + joy_enable_cyclic_polling(3274, "pak.c"); - if (!pakHandleResult(ret, device, true, 3276)) { + if (!pak_handle_result(ret, device, true, 3276)) { return false; } g_Paks[device].state = PAKSTATE_MEM_DISPATCH; if (device == SAVEDEVICE_GAMEPAK) { - pakExecuteDebugOperations(); - pakExecuteDebugOperations(); - pakExecuteDebugOperations(); + pak_execute_debug_operations(); + pak_execute_debug_operations(); + pak_execute_debug_operations(); } return true; @@ -2984,7 +2984,7 @@ const char var7f1b44bc[] = "Pak %d -> Searching for the game file"; * Prepare a controller pak for use by making sure a note is allocated and that * the filesystem is good, among other things. */ -bool mempakPrepare(s8 device) +bool mempak_prepare(s8 device) { u32 stack1; struct pak *pak; @@ -3013,7 +3013,7 @@ bool mempakPrepare(s8 device) g_Paks[device].type = PAKTYPE_MEMORY; g_Paks[device].unk2b8_02 = true; - pakQueryTotalUsage(device); + pak_query_total_usage(device); #if VERSION >= VERSION_NTSC_1_0 if (g_Paks[device].state == PAKSTATE_UNPLUGGING) { @@ -3022,35 +3022,35 @@ bool mempakPrepare(s8 device) #endif // Find the PD note if it exists - joyDisableCyclicPolling(JOYARGS(3319)); - sp48 = pakFindNote(PFS(device), ROM_COMPANYCODE, ROM_GAMECODE, g_PakNoteGameName, g_PakNoteExtName, &g_Paks[device].pdnoteindex); - joyEnableCyclicPolling(JOYARGS(3321)); + joy_disable_cyclic_polling(JOYARGS(3319)); + sp48 = pak_find_note(PFS(device), ROM_COMPANYCODE, ROM_GAMECODE, g_PakNoteGameName, g_PakNoteExtName, &g_Paks[device].pdnoteindex); + joy_enable_cyclic_polling(JOYARGS(3321)); // If it doesn't exist, allocate it if (sp48 != PAK_ERR1_OK) { pak = &g_Paks[device]; - pakHandleResult(sp48, device, false, LINE_3654); + pak_handle_result(sp48, device, false, LINE_3654); g_Paks[device].pdnumnotes = (pak->pakdata.pagesfree > 128) ? 2 : 1; notesize = g_Paks[device].pdnumnotes * (256 * NUM_PAGES); - joyDisableCyclicPolling(JOYARGS(3336)); - sp48 = pakAllocateNote(PFS(device), ROM_COMPANYCODE, ROM_GAMECODE, g_PakNoteGameName, g_PakNoteExtName, notesize, &g_Paks[device].pdnoteindex); - joyEnableCyclicPolling(JOYARGS(3338)); + joy_disable_cyclic_polling(JOYARGS(3336)); + sp48 = pak_allocate_note(PFS(device), ROM_COMPANYCODE, ROM_GAMECODE, g_PakNoteGameName, g_PakNoteExtName, notesize, &g_Paks[device].pdnoteindex); + joy_enable_cyclic_polling(JOYARGS(3338)); g_Paks[device].unk2b8_02 = true; - if (pakHandleResult(sp48, device, true, LINE_3668)) { + if (pak_handle_result(sp48, device, true, LINE_3668)) { error1 = true; } else { return false; } } - pakQueryTotalUsage(device); - pakQueryPdSize(device); + pak_query_total_usage(device); + pak_query_pd_size(device); #if VERSION >= VERSION_NTSC_1_0 g_Paks[device].showdatalost = false; @@ -3064,7 +3064,7 @@ bool mempakPrepare(s8 device) #if VERSION >= VERSION_NTSC_1_0 // If it's a new note, create the filesystem if (error1) { - serial = pakCreateFilesystem(device); + serial = pak_create_filesystem(device); if (serial != -1) { g_Paks[device].serial = serial; @@ -3075,8 +3075,8 @@ bool mempakPrepare(s8 device) // Check the filesystem for errors and try to recreate it if broken if (!error2) { - if (pakRepairFilesystem(device) == -1) { - serial = pakCreateFilesystem(device); + if (pak_repair_filesystem(device) == -1) { + serial = pak_create_filesystem(device); if (serial != -1) { g_Paks[device].serial = serial; @@ -3091,15 +3091,15 @@ bool mempakPrepare(s8 device) } if (!error2) { - maxfileid = pakFindMaxFileId(device); + maxfileid = pak_find_max_file_id(device); if (maxfileid != -1) { g_Paks[device].maxfileid = maxfileid; - if (pakGetFileIdsByType(device, PAKFILETYPE_TERMINATOR, fileids) == 0 && pakCreateInitialFiles(device)) { + if (pak_get_file_ids_by_type(device, PAKFILETYPE_TERMINATOR, fileids) == 0 && pak_create_initial_files(device)) { g_Paks[device].state = (device == SAVEDEVICE_GAMEPAK) ? PAKSTATE_READY : PAKSTATE_MEM_POST_PREPARE; - filelistInvalidatePak(device); + filelist_invalidate_pak(device); return true; } @@ -3108,26 +3108,26 @@ bool mempakPrepare(s8 device) g_Paks[device].state = PAKSTATE_22; - filelistInvalidatePak(device); + filelist_invalidate_pak(device); return false; #else if (!error1) { - if (!pakRepairFilesystem(device)) { + if (!pak_repair_filesystem(device)) { error1 = true; } } - if (argFindByPrefix(1, "-forcewipe")) { - pakWipe(device, 0, g_Paks[device].pdnumblocks); - } else if (error1 || argFindByPrefix(1, "-forcescrub")) { - g_Paks[device].serial = pakCreateFilesystem(device); + if (arg_find_by_prefix(1, "-forcewipe")) { + pak_wipe(device, 0, g_Paks[device].pdnumblocks); + } else if (error1 || arg_find_by_prefix(1, "-forcescrub")) { + g_Paks[device].serial = pak_create_filesystem(device); } - g_Paks[device].maxfileid = pakFindMaxFileId(device); + g_Paks[device].maxfileid = pak_find_max_file_id(device); - pakGetFileIdsByType(device, PAKFILETYPE_TERMINATOR, fileids); - pakCreateInitialFiles(device); + pak_get_file_ids_by_type(device, PAKFILETYPE_TERMINATOR, fileids); + pak_create_initial_files(device); g_Paks[device].state = (device == SAVEDEVICE_GAMEPAK) ? PAKSTATE_READY : PAKSTATE_MEM_POST_PREPARE; @@ -3140,25 +3140,25 @@ const char var7f1ae40cnb[] = "Pak %d -> Initialisation - No swap file"; const char var7f1ae434nb[] = "Pak %d -> Initialisation - Found a swap file"; #endif -bool pakProbe(s8 device) +bool pak_probe(s8 device) { bool plugged = false; s32 ret; bool done = false; #if VERSION >= VERSION_NTSC_1_0 - joyDisableCyclicPolling(); + joy_disable_cyclic_polling(); // Try memory pak - ret = pakInitPak(&g_PiMesgQueue, PFS(device), device, NULL); + ret = pak_init_pak(&g_PiMesgQueue, PFS(device), device, NULL); - if (pakHandleResult(ret, device, true, LINE_3829)) { + if (pak_handle_result(ret, device, true, LINE_3829)) { g_Paks[device].state = PAKSTATE_MEM_DISPATCH; if (device == SAVEDEVICE_GAMEPAK) { - pakExecuteDebugOperations(); - pakExecuteDebugOperations(); - pakExecuteDebugOperations(); + pak_execute_debug_operations(); + pak_execute_debug_operations(); + pak_execute_debug_operations(); } plugged = true; @@ -3177,7 +3177,7 @@ bool pakProbe(s8 device) // Try rumble pak ret = osMotorProbe(&g_PiMesgQueue, PFS(device), device); - if (pakHandleResult(ret, device, false, LINE_3865)) { + if (pak_handle_result(ret, device, false, LINE_3865)) { g_Paks[device].type = PAKTYPE_RUMBLE; g_Paks[device].state = PAKSTATE_READY; g_Paks[device].rumblestate = RUMBLESTATE_1; @@ -3194,7 +3194,7 @@ bool pakProbe(s8 device) // Try game boy pak ret = osGbpakInit(&g_PiMesgQueue, PFS(device), device); - if (pakHandleResult(ret, device, false, LINE_3889)) { + if (pak_handle_result(ret, device, false, LINE_3889)) { if (IS4MB()) { g_Paks[device].type = PAKTYPE_NONE; g_Paks[device].state = PAKSTATE_22; @@ -3213,7 +3213,7 @@ bool pakProbe(s8 device) } } - joyEnableCyclicPolling(); + joy_enable_cyclic_polling(); return plugged; #else @@ -3221,33 +3221,33 @@ bool pakProbe(s8 device) return true; } - joyDisableCyclicPolling(JOYARGS(3434)); + joy_disable_cyclic_polling(JOYARGS(3434)); // Try memory pak - ret = pakInitPak(&g_PiMesgQueue, PFS(device), device); + ret = pak_init_pak(&g_PiMesgQueue, PFS(device), device); - if (pakHandleResult(ret, device, true, 3437)) { - joyEnableCyclicPolling(JOYARGS(3439)); + if (pak_handle_result(ret, device, true, 3437)) { + joy_enable_cyclic_polling(JOYARGS(3439)); return true; } // Try rumble pak ret = osMotorProbe(&g_PiMesgQueue, PFS(device), device); - if (pakHandleResult(ret, device, false, 3446)) { - joyEnableCyclicPolling(JOYARGS(3448)); + if (pak_handle_result(ret, device, false, 3446)) { + joy_enable_cyclic_polling(JOYARGS(3448)); return true; } // Try game boy pak ret = osGbpakInit(&g_PiMesgQueue, PFS(device), device); - if (pakHandleResult(ret, device, false, 3455)) { - joyEnableCyclicPolling(JOYARGS(3457)); + if (pak_handle_result(ret, device, false, 3455)) { + joy_enable_cyclic_polling(JOYARGS(3457)); return true; } - joyEnableCyclicPolling(JOYARGS(3462)); + joy_enable_cyclic_polling(JOYARGS(3462)); return false; #endif @@ -3266,7 +3266,7 @@ void pak0f114dd4nb(s8 device) pak->rumblestate = RUMBLESTATE_1; pak->unk00c = PAK00C_03; - if (pakProbe(device)) { + if (pak_probe(device)) { if (pak->features & PAKFEATURE_MEMORY) { if (pak0f1147b8nb(device)) { pak->plugcount++; @@ -3278,11 +3278,11 @@ void pak0f114dd4nb(s8 device) if (pak->features & PAKFEATURE_RUMBLE) { if (device != SAVEDEVICE_GAMEPAK) { - joyDisableCyclicPolling(3514, "pak.c"); + joy_disable_cyclic_polling(3514, "pak.c"); ret = osMotorProbe(&g_PiMesgQueue, PFS(device), device); - joyEnableCyclicPolling(3516, "pak.c"); + joy_enable_cyclic_polling(3516, "pak.c"); - if (pakHandleResult(ret, device, 1, 3518)) { + if (pak_handle_result(ret, device, 1, 3518)) { pak->type = PAKTYPE_RUMBLE; pak->state = PAKSTATE_READY; pak->plugcount++; @@ -3305,7 +3305,7 @@ void pak0f114dd4nb(s8 device) /** * Replace data between the given blocks with '!'. */ -void pakWipe(s8 device, u32 blocknumstart, u32 blocknumend) +void pak_wipe(s8 device, u32 blocknumstart, u32 blocknumend) { u8 buffer[128]; u32 i; @@ -3314,16 +3314,16 @@ void pakWipe(s8 device, u32 blocknumstart, u32 blocknumend) osSyncPrintf("Pak %d -> About to wipe blocks %d to %d of the game file with the wipe byte %d", device, blocknumstart, blocknumend, '!'); #endif - for (i = 0; i < pakGetBlockSize(device); i++) { + for (i = 0; i < pak_get_block_size(device); i++) { buffer[i] = '!'; } for (i = blocknumstart; i < blocknumend; i++) { - s32 result = pakReadWriteBlock(device, PFS(device), g_Paks[device].pdnoteindex, PFS_WRITE, i * pakGetBlockSize(device), pakGetBlockSize(device), buffer); + s32 result = pak_read_write_block(device, PFS(device), g_Paks[device].pdnoteindex, PFS_WRITE, i * pak_get_block_size(device), pak_get_block_size(device), buffer); g_Paks[device].headercachecount = 0; - if (!pakHandleResult(result, device, true, LINE_3948)) { + if (!pak_handle_result(result, device, true, LINE_3948)) { #if VERSION >= VERSION_NTSC_1_0 osSyncPrintf("Pak %d -> Game file wipe failed\n", device); #else @@ -3335,7 +3335,7 @@ void pakWipe(s8 device, u32 blocknumstart, u32 blocknumend) } } -void pakSaveHeaderToCache(s8 device, s32 blocknum, struct pakfileheader *header) +void pak_save_header_to_cache(s8 device, s32 blocknum, struct pakfileheader *header) { struct pak *pak = &g_Paks[device]; s32 count; @@ -3344,7 +3344,7 @@ void pakSaveHeaderToCache(s8 device, s32 blocknum, struct pakfileheader *header) s32 j; s32 k; s32 i; - s32 endblocknum = header->filelen / pakGetBlockSize(device) + blocknum; + s32 endblocknum = header->filelen / pak_get_block_size(device) + blocknum; for (i = 0; i < ARRAYCOUNT(overview); i++) { overview[i] = -1; @@ -3355,7 +3355,7 @@ void pakSaveHeaderToCache(s8 device, s32 blocknum, struct pakfileheader *header) for (i = 0; i < pak->headercachecount; i++) { struct pakfileheader *tmp = (struct pakfileheader *) pak->headercache[i].payload; - for (j = 0; j < tmp->filelen / pakGetBlockSize(device); j++) { + for (j = 0; j < tmp->filelen / pak_get_block_size(device); j++) { overview[pak->headercache[i].blocknum + j] = i; } } @@ -3371,7 +3371,7 @@ void pakSaveHeaderToCache(s8 device, s32 blocknum, struct pakfileheader *header) // Save the header into the cache pak->headercache[pak->headercachecount].blocknum = blocknum; - memcpy(pak->headercache[pak->headercachecount].payload, header, pakGetBlockSize(device)); + memcpy(pak->headercache[pak->headercachecount].payload, header, pak_get_block_size(device)); pak->headercachecount++; @@ -3381,7 +3381,7 @@ void pakSaveHeaderToCache(s8 device, s32 blocknum, struct pakfileheader *header) for (i = 0; i < pak->headercachecount; i++) { if (pak->headercache[i].blocknum != -1) { pak->headercache[count].blocknum = pak->headercache[i].blocknum; - memcpy(&pak->headercache[count].payload, &pak->headercache[i].payload, pakGetBlockSize(device)); + memcpy(&pak->headercache[count].payload, &pak->headercache[i].payload, pak_get_block_size(device)); count++; } } @@ -3389,7 +3389,7 @@ void pakSaveHeaderToCache(s8 device, s32 blocknum, struct pakfileheader *header) pak->headercachecount = count; } -bool pakRetrieveHeaderFromCache(s8 device, s32 blocknum, struct pakfileheader *dst) +bool pak_retrieve_header_from_cache(s8 device, s32 blocknum, struct pakfileheader *dst) { struct pak *pak = &g_Paks[device]; s32 i; @@ -3415,7 +3415,7 @@ bool pakRetrieveHeaderFromCache(s8 device, s32 blocknum, struct pakfileheader *d * * Return the pak's serial on success, or -1 on failure. */ -s32 pakCreateFilesystem(s8 device) +s32 pak_create_filesystem(s8 device) { u8 data[32]; s32 address; @@ -3426,26 +3426,26 @@ s32 pakCreateFilesystem(s8 device) data[i] = random() & 0xff; } - address = pakGetAlignedFileLenByBodyLen(device, pakGetBodyLenByType(device, PAKFILETYPE_TERMINATOR)); + address = pak_get_aligned_file_len_by_body_len(device, pak_get_body_len_by_type(device, PAKFILETYPE_TERMINATOR)); g_Paks[device].maxfileid = 0x10; #if VERSION >= VERSION_NTSC_1_0 - g_Paks[device].serial = pakGenerateSerial(device); + g_Paks[device].serial = pak_generate_serial(device); #else g_Paks[device].serial = 0x10 + random() % 0x1ff0; #endif g_Paks[device].headercachecount = 0; - pakWriteFileAtOffset(device, 0, PAKFILETYPE_TERMINATOR, NULL, 0, NULL, NULL, 0, 1); + pak_write_file_at_offset(device, 0, PAKFILETYPE_TERMINATOR, NULL, 0, NULL, NULL, 0, 1); - result = pakReadWriteBlock(device, PFS(device), g_Paks[device].pdnoteindex, PFS_WRITE, address, pakGetBlockSize(device), data); + result = pak_read_write_block(device, PFS(device), g_Paks[device].pdnoteindex, PFS_WRITE, address, pak_get_block_size(device), data); #if VERSION >= VERSION_NTSC_1_0 - if (pakHandleResult(result, device, true, LINE_4140) == 0) { + if (pak_handle_result(result, device, true, LINE_4140) == 0) { return -1; } #else - pakHandleResult(result, device, true, LINE_4140); + pak_handle_result(result, device, true, LINE_4140); #endif return g_Paks[device].serial; @@ -3460,14 +3460,14 @@ s32 pak0f11b6ec(s8 device) return 0; } -bool pakGetFilesystemLength(s8 device, u32 *outlen) +bool pak_get_filesystem_length(s8 device, u32 *outlen) { struct pakfileheader header; s32 offset = 0; u32 stack[2]; while (offset < g_Paks[device].pdnumbytes) { - s32 ret = pakReadHeaderAtOffset(device, offset, &header); + s32 ret = pak_read_header_at_offset(device, offset, &header); offset += header.filelen; #if VERSION >= VERSION_NTSC_1_0 @@ -3532,14 +3532,14 @@ s32 pak0f11b86c(s8 device, u32 offset, u8 *data, struct pakfileheader *header, s } #endif - blocksize = pakGetBlockSize(device); + blocksize = pak_get_block_size(device); isoneblock = bodylen && data && (bool)(bodylen + sizeof(struct pakfileheader) <= blocksize); if (header == NULL) { header = &headerstack; } - ret = pakReadHeaderAtOffset(device, offset, header); + ret = pak_read_header_at_offset(device, offset, header); if (ret != 0) { return ret; @@ -3556,7 +3556,7 @@ s32 pak0f11b86c(s8 device, u32 offset, u8 *data, struct pakfileheader *header, s #endif if (isoneblock) { - if (pakRetrieveBlockFromCache(device, offset, buffer)) { + if (pak_retrieve_block_from_cache(device, offset, buffer)) { for (i = 0; i < bodylen; i++) { data[i] = buffer[sizeof(struct pakfileheader) + i]; } @@ -3569,7 +3569,7 @@ s32 pak0f11b86c(s8 device, u32 offset, u8 *data, struct pakfileheader *header, s bodylen = 0; } - alignedfilelen = pakGetAlignedFileLenByBodyLen(device, header->bodylen); + alignedfilelen = pak_get_aligned_file_len_by_body_len(device, header->bodylen); filelen = (bodylen == 0 ? header->bodylen : bodylen) + sizeof(struct pakfileheader); @@ -3577,20 +3577,20 @@ s32 pak0f11b86c(s8 device, u32 offset, u8 *data, struct pakfileheader *header, s filelen = alignedfilelen; } - joyDisableCyclicPolling(JOYARGS(4008)); + joy_disable_cyclic_polling(JOYARGS(4008)); for (i = 0; i != filelen; i++) { - offsetinblock = i % pakGetBlockSize(device); - blocknum = i / pakGetBlockSize(device); + offsetinblock = i % pak_get_block_size(device); + blocknum = i / pak_get_block_size(device); if (offsetinblock == 0) { - s32 absoluteoffset = pakGetBlockSize(device) * blocknum + offset; + s32 absoluteoffset = pak_get_block_size(device) * blocknum + offset; s32 ret; - ret = pakReadWriteBlock(device, PFS(device), g_Paks[device].pdnoteindex, OS_READ, absoluteoffset, pakGetBlockSize(device), sp58); + ret = pak_read_write_block(device, PFS(device), g_Paks[device].pdnoteindex, OS_READ, absoluteoffset, pak_get_block_size(device), sp58); - if (!pakHandleResult(ret, device, true, LINE_4394)) { - joyEnableCyclicPolling(JOYARGS(4032)); + if (!pak_handle_result(ret, device, true, LINE_4394)) { + joy_enable_cyclic_polling(JOYARGS(4032)); if (ret == 1) { return 1; @@ -3606,7 +3606,7 @@ s32 pak0f11b86c(s8 device, u32 offset, u8 *data, struct pakfileheader *header, s } } - joyEnableCyclicPolling(JOYARGS(4054)); + joy_enable_cyclic_polling(JOYARGS(4054)); return 0; } @@ -3621,15 +3621,15 @@ const char var7f1b4574[] = "Pak %d -> Delete file offset (file id %d) failed"; const char var7f1b45a8[] = "Pak %d -> Delete file offset failed - Bad Offset passed"; #endif -bool pakReplaceFileAtOffsetWithBlank(s8 device, u32 offset) +bool pak_replace_file_at_offset_with_blank(s8 device, u32 offset) { struct pakfileheader header; s32 result; - result = pakReadHeaderAtOffset(device, offset, &header); + result = pak_read_header_at_offset(device, offset, &header); if (result == PAK_ERR2_OK) { - result = pakWriteFileAtOffset(device, offset, PAKFILETYPE_BLANK, NULL, header.filelen - sizeof(struct pakfileheader), NULL, NULL, 0, 1); + result = pak_write_file_at_offset(device, offset, PAKFILETYPE_BLANK, NULL, header.filelen - sizeof(struct pakfileheader), NULL, NULL, 0, 1); if (result == 0) { return true; @@ -3640,7 +3640,7 @@ bool pakReplaceFileAtOffsetWithBlank(s8 device, u32 offset) } #if !MATCHING || VERSION >= VERSION_NTSC_1_0 -s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 bodylenarg, s32 *outfileid, u8 *olddata, u32 fileid, u32 generation) +s32 pak_write_file_at_offset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 bodylenarg, s32 *outfileid, u8 *olddata, u32 fileid, u32 generation) { u8 headerbytes[sizeof(struct pakfileheader)]; struct pakfileheader *headerptr; @@ -3662,11 +3662,11 @@ s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 b u8 *newfileu8ptr; u8 *headeru8ptr; - blocksize = pakGetBlockSize(device); + blocksize = pak_get_block_size(device); generation &= 0x1ff; - bodylen = bodylenarg ? bodylenarg : pakGetBodyLenByType(device, filetype); - filelen = pakGetAlignedFileLenByBodyLen(device, bodylen); + bodylen = bodylenarg ? bodylenarg : pak_get_body_len_by_type(device, filetype); + filelen = pak_get_aligned_file_len_by_body_len(device, bodylen); // Build the header bytes on the stack headerptr = (struct pakfileheader *) headerbytes; @@ -3679,7 +3679,7 @@ s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 b headerptr->deviceserial = g_Paks[device].serial; headerptr->filelen = filelen; - version = argFindByPrefix(1, "-forceversion") ? 1 : 0; + version = arg_find_by_prefix(1, "-forceversion") ? 1 : 0; headerptr->version = version; headerptr->bodylen = bodylen; @@ -3694,7 +3694,7 @@ s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 b headerptr->occupied = newdata ? 1 : 0; if (headerptr->occupied) { - pakCalculateChecksum(newdata, newdata + headerptr->bodylen, headerptr->bodysum); + pak_calculate_checksum(newdata, newdata + headerptr->bodylen, headerptr->bodysum); } else { headerptr->bodysum[0] = 0xffff; headerptr->bodysum[1] = 0xffff; @@ -3743,7 +3743,7 @@ s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 b numblocks++; } - joyDisableCyclicPolling(JOYARGS(4292)); + joy_disable_cyclic_polling(JOYARGS(4292)); // Write the header with writecompleted = 0, followed by the data, then // rewrite the header with writecompleted = 1. This allows the game to @@ -3752,10 +3752,10 @@ s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 b newheader->writecompleted = j ? 1 : 0; // Checksum the header part after the checksums themselves - pakCalculateChecksum((u8 *) (newheader->bodysum + 2), (u8 *) (newheader + 1), newheader->headersum); + pak_calculate_checksum((u8 *) (newheader->bodysum + 2), (u8 *) (newheader + 1), newheader->headersum); for (i = 0; i != numblocks; i++) { - s32 offsetinfile = pakGetBlockSize(device) * i; + s32 offsetinfile = pak_get_block_size(device) * i; bool writethisblock = false; if (offsetinfile < sizeof(struct pakfileheader)) { @@ -3788,10 +3788,10 @@ s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 b } if (writethisblock) { - result = pakReadWriteBlock(device, PFS(device), g_Paks[device].pdnoteindex, OS_WRITE, offset + i * blocksize, pakGetBlockSize(device), &newfilebytes[offsetinfile]); + result = pak_read_write_block(device, PFS(device), g_Paks[device].pdnoteindex, OS_WRITE, offset + i * blocksize, pak_get_block_size(device), &newfilebytes[offsetinfile]); - if (!pakHandleResult(result, device, true, LINE_4742)) { - joyEnableCyclicPolling(JOYARGS(4380)); + if (!pak_handle_result(result, device, true, LINE_4742)) { + joy_enable_cyclic_polling(JOYARGS(4380)); if (result == PAK_ERR1_NOPAK) { return 1; @@ -3803,10 +3803,10 @@ s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 b } } - joyEnableCyclicPolling(JOYARGS(4393)); + joy_enable_cyclic_polling(JOYARGS(4393)); if (g_PakDebugPakCache) { - pakSaveHeaderToCache(device, offset / pakGetBlockSize(device), newheader); + pak_save_header_to_cache(device, offset / pak_get_block_size(device), newheader); } return 0; @@ -3819,7 +3819,7 @@ const char var7f1ae614nb[] = "pak.c"; const char var7f1ae61cnb[] = "pak.c"; GLOBAL_ASM( -glabel pakWriteFileAtOffset +glabel pak_write_file_at_offset /* f115bd8: 27bddf40 */ addiu $sp,$sp,-8384 /* f115bdc: afb70044 */ sw $s7,0x44($sp) /* f115be0: 0004be00 */ sll $s7,$a0,0x18 @@ -3840,7 +3840,7 @@ glabel pakWriteFileAtOffset /* f115c1c: afb00028 */ sw $s0,0x28($sp) /* f115c20: afa520c4 */ sw $a1,0x20c4($sp) /* f115c24: afa720cc */ sw $a3,0x20cc($sp) -/* f115c28: 0fc4428c */ jal pakGetBlockSize +/* f115c28: 0fc4428c */ jal pak_get_block_size /* f115c2c: 01e02025 */ or $a0,$t7,$zero /* f115c30: 8fb220e0 */ lw $s2,0x20e0($sp) /* f115c34: 8fa320d0 */ lw $v1,0x20d0($sp) @@ -3854,14 +3854,14 @@ glabel pakWriteFileAtOffset /* f115c50: 00172600 */ sll $a0,$s7,0x18 /* f115c54: 0004ce03 */ sra $t9,$a0,0x18 /* f115c58: 03202025 */ or $a0,$t9,$zero -/* f115c5c: 0fc444f9 */ jal pakGetBodyLenByType +/* f115c5c: 0fc444f9 */ jal pak_get_body_len_by_type /* f115c60: 02802825 */ or $a1,$s4,$zero /* f115c64: 00408825 */ or $s1,$v0,$zero .NB0f115c68: /* f115c68: 00172600 */ sll $a0,$s7,0x18 /* f115c6c: 00044e03 */ sra $t1,$a0,0x18 /* f115c70: 01202025 */ or $a0,$t1,$zero -/* f115c74: 0fc442ae */ jal pakGetAlignedFileLenByBodyLen +/* f115c74: 0fc442ae */ jal pak_get_aligned_file_len_by_body_len /* f115c78: 02202825 */ or $a1,$s1,$zero /* f115c7c: 0040b025 */ or $s6,$v0,$zero /* f115c80: 8fa220dc */ lw $v0,0x20dc($sp) @@ -3923,7 +3923,7 @@ glabel pakWriteFileAtOffset /* f115d58: 3c057f1b */ lui $a1,%hi(var7f1b45e4) /* f115d5c: a618000c */ sh $t8,0xc($s0) /* f115d60: a60c000a */ sh $t4,0xa($s0) -/* f115d64: 0c004e18 */ jal argFindByPrefix +/* f115d64: 0c004e18 */ jal arg_find_by_prefix /* f115d68: 24a5e5fc */ addiu $a1,$a1,%lo(var7f1b45e4) /* f115d6c: 10400003 */ beqz $v0,.NB0f115d7c /* f115d70: 8fa420d4 */ lw $a0,0x20d4($sp) @@ -3997,7 +3997,7 @@ glabel pakWriteFileAtOffset /* f115e6c: 27a620b4 */ addiu $a2,$sp,0x20b4 /* f115e70: 000c7240 */ sll $t6,$t4,0x9 /* f115e74: 000e7d42 */ srl $t7,$t6,0x15 -/* f115e78: 0fc44b9b */ jal pakCalculateChecksum +/* f115e78: 0fc44b9b */ jal pak_calculate_checksum /* f115e7c: 01e72821 */ addu $a1,$t7,$a3 /* f115e80: 10000003 */ beqz $zero,.NB0f115e90 /* f115e84: 8fa720cc */ lw $a3,0x20cc($sp) @@ -4088,7 +4088,7 @@ glabel pakWriteFileAtOffset /* f115fa0: 24430001 */ addiu $v1,$v0,0x1 .NB0f115fa4: /* f115fa4: 24a5e60c */ addiu $a1,$a1,%lo(var7f1ae60cnb) -/* f115fa8: 0c00581b */ jal joyDisableCyclicPolling +/* f115fa8: 0c00581b */ jal joy_disable_cyclic_polling /* f115fac: afa30098 */ sw $v1,0x98($sp) /* f115fb0: 0000f025 */ or $s8,$zero,$zero .NB0f115fb4: @@ -4105,7 +4105,7 @@ glabel pakWriteFileAtOffset .NB0f115fd8: /* f115fd8: 27a410a4 */ addiu $a0,$sp,0x10a4 /* f115fdc: 27a510ac */ addiu $a1,$sp,0x10ac -/* f115fe0: 0fc44b9b */ jal pakCalculateChecksum +/* f115fe0: 0fc44b9b */ jal pak_calculate_checksum /* f115fe4: 02403025 */ or $a2,$s2,$zero /* f115fe8: 8fa90098 */ lw $t1,0x98($sp) /* f115fec: 11200067 */ beqz $t1,.NB0f11618c @@ -4113,7 +4113,7 @@ glabel pakWriteFileAtOffset .NB0f115ff4: /* f115ff4: 0004c603 */ sra $t8,$a0,0x18 /* f115ff8: 03002025 */ or $a0,$t8,$zero -/* f115ffc: 0fc4428c */ jal pakGetBlockSize +/* f115ffc: 0fc4428c */ jal pak_get_block_size /* f116000: 00008025 */ or $s0,$zero,$zero /* f116004: 00550019 */ multu $v0,$s5 /* f116008: 8fad10a4 */ lw $t5,0x10a4($sp) @@ -4181,7 +4181,7 @@ glabel pakWriteFileAtOffset .NB0f1160f0: /* f1160f0: 032b8021 */ addu $s0,$t9,$t3 .NB0f1160f4: -/* f1160f4: 0fc4428c */ jal pakGetBlockSize +/* f1160f4: 0fc4428c */ jal pak_get_block_size /* f1160f8: 01402025 */ or $a0,$t2,$zero /* f1160fc: 8faf0058 */ lw $t7,0x58($sp) /* f116100: 00172600 */ sll $a0,$s7,0x18 @@ -4193,7 +4193,7 @@ glabel pakWriteFileAtOffset /* f116118: afb10010 */ sw $s1,0x10($sp) /* f11611c: 01802025 */ or $a0,$t4,$zero /* f116120: 02002825 */ or $a1,$s0,$zero -/* f116124: 0fc450ea */ jal pakReadWriteBlock +/* f116124: 0fc450ea */ jal pak_read_write_block /* f116128: 24070001 */ addiu $a3,$zero,0x1 /* f11612c: 00172e00 */ sll $a1,$s7,0x18 /* f116130: 00054e03 */ sra $t1,$a1,0x18 @@ -4201,12 +4201,12 @@ glabel pakWriteFileAtOffset /* f116138: 01202825 */ or $a1,$t1,$zero /* f11613c: 00402025 */ or $a0,$v0,$zero /* f116140: 24060001 */ addiu $a2,$zero,0x1 -/* f116144: 0fc458cb */ jal pakHandleResult +/* f116144: 0fc458cb */ jal pak_handle_result /* f116148: 24071119 */ addiu $a3,$zero,0x1119 /* f11614c: 1440000b */ bnez $v0,.NB0f11617c /* f116150: 3c057f1b */ lui $a1,%hi(var7f1ae614nb) /* f116154: 24a5e614 */ addiu $a1,$a1,%lo(var7f1ae614nb) -/* f116158: 0c005834 */ jal joyEnableCyclicPolling +/* f116158: 0c005834 */ jal joy_enable_cyclic_polling /* f11615c: 2404111c */ addiu $a0,$zero,0x111c /* f116160: 24010001 */ addiu $at,$zero,0x1 /* f116164: 16010003 */ bne $s0,$at,.NB0f116174 @@ -4229,7 +4229,7 @@ glabel pakWriteFileAtOffset /* f116198: 00000000 */ sll $zero,$zero,0x0 /* f11619c: 3c057f1b */ lui $a1,%hi(var7f1ae61cnb) /* f1161a0: 24a5e61c */ addiu $a1,$a1,%lo(var7f1ae61cnb) -/* f1161a4: 0c005834 */ jal joyEnableCyclicPolling +/* f1161a4: 0c005834 */ jal joy_enable_cyclic_polling /* f1161a8: 24041129 */ addiu $a0,$zero,0x1129 /* f1161ac: 3c0d8008 */ lui $t5,%hi(g_PakDebugPakCache) /* f1161b0: 8dad80b0 */ lw $t5,%lo(g_PakDebugPakCache)($t5) @@ -4237,7 +4237,7 @@ glabel pakWriteFileAtOffset /* f1161b8: 0004ce03 */ sra $t9,$a0,0x18 /* f1161bc: 51a00010 */ beqzl $t5,.NB0f116200 /* f1161c0: 00001025 */ or $v0,$zero,$zero -/* f1161c4: 0fc4428c */ jal pakGetBlockSize +/* f1161c4: 0fc4428c */ jal pak_get_block_size /* f1161c8: 03202025 */ or $a0,$t9,$zero /* f1161cc: 8faa20c4 */ lw $t2,0x20c4($sp) /* f1161d0: 00172600 */ sll $a0,$s7,0x18 @@ -4250,7 +4250,7 @@ glabel pakWriteFileAtOffset /* f1161ec: 0007000d */ break 0x7 .NB0f1161f0: /* f1161f0: 02403025 */ or $a2,$s2,$zero -/* f1161f4: 0fc45454 */ jal pakSaveHeaderToCache +/* f1161f4: 0fc45454 */ jal pak_save_header_to_cache /* f1161f8: 00000000 */ sll $zero,$zero,0x0 /* f1161fc: 00001025 */ or $v0,$zero,$zero .NB0f116200: @@ -4269,7 +4269,7 @@ glabel pakWriteFileAtOffset ); #endif -bool pakRepair(s8 device) +bool pak_repair(s8 device) { s32 result; @@ -4278,16 +4278,16 @@ bool pakRepair(s8 device) case PAKSTATE_MEM_DEVICEERROR: break; default: - joyDisableCyclicPolling(JOYARGS(4425)); + joy_disable_cyclic_polling(JOYARGS(4425)); result = osPfsChecker(PFS(device)); - joyEnableCyclicPolling(JOYARGS(4427)); + joy_enable_cyclic_polling(JOYARGS(4427)); if (result == PAK_ERR1_OK) { g_Paks[device].state = PAKSTATE_PROBE; return true; } - pakHandleResult(result, device, false, LINE_4801); + pak_handle_result(result, device, false, LINE_4801); #if VERSION >= VERSION_NTSC_1_0 g_Paks[device].state = PAKSTATE_22; @@ -4311,7 +4311,7 @@ const char var7f1b4628[] = "paksNeedToBeLive4Menu=%x\n"; const char var7f1b4644[] = "g_LastPackPattern=%x\n"; -bool pakHandleResult(s32 err1, s8 device, bool arg2, u32 line) +bool pak_handle_result(s32 err1, s8 device, bool arg2, u32 line) { if (err1 == PAK_ERR1_OK) { return true; @@ -4368,19 +4368,19 @@ bool pakHandleResult(s32 err1, s8 device, bool arg2, u32 line) } #if VERSION >= VERSION_NTSC_1_0 -void paksTick(void) +void paks_tick(void) { s32 i; if (g_Vars.pakstocheck) { g_MpPlayerNum = 0; - menuSetBanner(MENUBANNER_CHECKINGPAK, true); + menu_set_banner(MENUBANNER_CHECKINGPAK, true); var80075d14 = false; if (g_Vars.pakstocheck & 0x0f) { - joySetPfsPollEnabled(0); + joy_set_pfs_poll_enabled(0); // Waiting for some timer if ((g_Vars.pakstocheck & 0x0f) >= 10) { @@ -4391,7 +4391,7 @@ void paksTick(void) g_Vars.pakstocheck--; } } else { - joyPollPfs(2); + joy_poll_pfs(2); for (i = 0; i < 4; i++) { if (g_Vars.pakstocheck & (1 << (i + 4))) { @@ -4403,12 +4403,12 @@ void paksTick(void) } } - if (!joyIsPfsPollEnabled()) { - joySetPfsPollEnabled(true); - joySetDefaultPfsPollInterval(); + if (!joy_is_pfs_poll_enabled()) { + joy_set_pfs_poll_enabled(true); + joy_set_default_pfs_poll_interval(); } - menuSetBanner(-1, true); + menu_set_banner(-1, true); var80075d14 = true; } @@ -4431,7 +4431,7 @@ void pak0f11c6d0(void) g_Paks[i].state = PAKSTATE_UNPLUGGING; g_PaksPlugged &= ~(1 << i); g_MpPlayerNum = i; - menuSetBanner(-1, true); + menu_set_banner(-1, true); break; } } @@ -4440,61 +4440,61 @@ void pak0f11c6d0(void) } #endif -void pakExecuteDebugOperations(void) +void pak_execute_debug_operations(void) { #if VERSION >= VERSION_NTSC_1_0 static u32 g_PakDebugDumpEeprom = 0; bool disablepolling = false; s8 i; - mainOverrideVariable("forcescrub", &g_PakDebugForceScrub); - mainOverrideVariable("pakdump", &g_PakDebugPakDump); - mainOverrideVariable("pakcache", &g_PakDebugPakCache); - mainOverrideVariable("pakinit", &g_PakDebugPakInit); - mainOverrideVariable("corruptme", &g_PakDebugCorruptMe); - mainOverrideVariable("wipeeeprom", &g_PakDebugWipeEeprom); - mainOverrideVariable("dumpeeprom", &g_PakDebugDumpEeprom); + main_override_variable("forcescrub", &g_PakDebugForceScrub); + main_override_variable("pakdump", &g_PakDebugPakDump); + main_override_variable("pakcache", &g_PakDebugPakCache); + main_override_variable("pakinit", &g_PakDebugPakInit); + main_override_variable("corruptme", &g_PakDebugCorruptMe); + main_override_variable("wipeeeprom", &g_PakDebugWipeEeprom); + main_override_variable("dumpeeprom", &g_PakDebugDumpEeprom); if (g_PakDebugCorruptMe) { g_PakDebugCorruptMe = false; - pakCorrupt(); + pak_corrupt(); } if (g_PakDebugPakDump) { - pakDumpPak(); + pak_dump_pak(); g_PakDebugPakDump = false; } if (g_PakDebugDumpEeprom) { g_PakDebugDumpEeprom = false; - pakDumpEeprom(); + pak_dump_eeprom(); } if (g_PakDebugWipeEeprom) { - pakWipe(SAVEDEVICE_GAMEPAK, 0, 0x80); + pak_wipe(SAVEDEVICE_GAMEPAK, 0, 0x80); g_PakDebugWipeEeprom = false; } if (g_PakDebugPakInit) { s32 device = g_PakDebugPakInit - 1; - joyDisableCyclicPolling(); - pakInitPak(&g_PiMesgQueue, PFS(device), device, 0); - joyEnableCyclicPolling(); + joy_disable_cyclic_polling(); + pak_init_pak(&g_PiMesgQueue, PFS(device), device, 0); + joy_enable_cyclic_polling(); g_PakDebugPakInit = false; } if (g_PakDebugForceScrub) { - pakCreateFilesystem(SAVEDEVICE_GAMEPAK); + pak_create_filesystem(SAVEDEVICE_GAMEPAK); g_PakDebugForceScrub = false; } - pakCheckPlugged(); + pak_check_plugged(); for (i = 0; i < ARRAYCOUNT(g_Paks); i++) { if (g_Paks[i].features) { - pakTickState(i); + pak_tick_state(i); } } @@ -4519,48 +4519,48 @@ void pakExecuteDebugOperations(void) static u32 g_PakDebugDumpEeprom = 0; s8 i; - osSyncPrintf("lvGetPause = %s", lvIsPaused() ? "TRUE" : "FALSE"); - osSyncPrintf("MP_GetPause = %s", mpIsPaused() ? "TRUE" : "FALSE"); + osSyncPrintf("lvGetPause = %s", lv_is_paused() ? "TRUE" : "FALSE"); + osSyncPrintf("MP_GetPause = %s", mp_is_paused() ? "TRUE" : "FALSE"); osSyncPrintf("getnumplayers = %d", PLAYERCOUNT()); - mainOverrideVariable("forcecrc", &g_PakDebugForceCrc); - mainOverrideVariable("forcescrub", &g_PakDebugForceScrub); - mainOverrideVariable("dumph", &g_PakDebugPakDump); - mainOverrideVariable("pakcache", &g_PakDebugPakCache); - mainOverrideVariable("pakinit", &g_PakDebugPakInit); - mainOverrideVariable("dumpeeprom", &g_PakDebugDumpEeprom); + main_override_variable("forcecrc", &g_PakDebugForceCrc); + main_override_variable("forcescrub", &g_PakDebugForceScrub); + main_override_variable("dumph", &g_PakDebugPakDump); + main_override_variable("pakcache", &g_PakDebugPakCache); + main_override_variable("pakinit", &g_PakDebugPakInit); + main_override_variable("dumpeeprom", &g_PakDebugDumpEeprom); if (g_PakDebugDumpEeprom) { g_PakDebugDumpEeprom = false; - pakDumpEeprom(); + pak_dump_eeprom(); } if (g_PakDebugPakInit) { s32 device = g_PakDebugPakInit - 1; - joyDisableCyclicPolling(4558, "pak.c"); - pakInitPak(&g_PiMesgQueue, PFS(device), device); - joyEnableCyclicPolling(4560, "pak.c"); + joy_disable_cyclic_polling(4558, "pak.c"); + pak_init_pak(&g_PiMesgQueue, PFS(device), device); + joy_enable_cyclic_polling(4560, "pak.c"); g_PakDebugPakInit = false; } if (g_PakDebugForceCrc) { - pakWipe(SAVEDEVICE_GAMEPAK, 0x4d, 0x4e); + pak_wipe(SAVEDEVICE_GAMEPAK, 0x4d, 0x4e); g_PakDebugForceCrc = false; } if (g_PakDebugForceScrub) { - pakCreateFilesystem(SAVEDEVICE_GAMEPAK); + pak_create_filesystem(SAVEDEVICE_GAMEPAK); g_PakDebugForceScrub = false; } - pakCheckPlugged(); - pakDumpPak(); + pak_check_plugged(); + pak_dump_pak(); for (i = 0; i < ARRAYCOUNT(g_Paks); i++) { if (g_Paks[i].features) { - pakTickState(i); + pak_tick_state(i); } } #endif @@ -4610,7 +4610,7 @@ const char var7f1ae9acnb[] = "Pak -> Connector Check Failed"; const char var7f1ae9ccnb[] = "Pak -> osGbpakReadId - Failed"; #endif -void pakCheckPlugged(void) +void pak_check_plugged(void) { #if VERSION >= VERSION_NTSC_1_0 if (g_Vars.tickmode != TICKMODE_CUTSCENE || g_MenuData.count > 0) { @@ -4623,7 +4623,7 @@ void pakCheckPlugged(void) for (i = 0; i < ARRAYCOUNT(g_Paks); i++) { if ((g_Vars.paksneededforgame | g_Vars.paksneededformenu) & (1 << i)) { if (paksconnected == 0xff) { - paksconnected = joyShiftPfsStates(); + paksconnected = joy_shift_pfs_states(); } if (((paksconnected & (1 << i)) != (oldplugged & (1 << i)))) { @@ -4635,7 +4635,7 @@ void pakCheckPlugged(void) // pak unplugged g_Paks[i].state = PAKSTATE_UNPLUGGING; newplugged &= ~(1 << i); - filelistInvalidatePak(i); + filelist_invalidate_pak(i); } } } @@ -4646,7 +4646,7 @@ void pakCheckPlugged(void) } #else if (g_Vars.tickmode != TICKMODE_CUTSCENE) { - u32 paksconnected = joyShiftPfsStates(); + u32 paksconnected = joy_shift_pfs_states(); u8 oldplugged = g_PaksPlugged; u8 newplugged = g_PaksPlugged; s32 i; @@ -4674,7 +4674,7 @@ void pakCheckPlugged(void) #endif } -void gbpakHandleError(u32 err) +void gbpak_handle_error(u32 err) { #if VERSION >= VERSION_NTSC_1_0 switch (err) { @@ -4739,33 +4739,33 @@ bool pak0f116768nb(s8 device) return true; } - gbpakHandleError(ret); + gbpak_handle_error(ret); return false; } - gbpakHandleError(ret); + gbpak_handle_error(ret); return false; } #endif -bool gbpakRead(s8 device, u16 address, u8 *buffer, u16 size) +bool gbpak_read(s8 device, u16 address, u8 *buffer, u16 size) { s32 result = osGbpakReadWrite(PFS(device), OS_READ, address, buffer, size); if (result) { - gbpakHandleError(result); + gbpak_handle_error(result); return false; } return true; } -bool gbpakWrite(s8 device, u16 address, u8 *buffer, u16 size) +bool gbpak_write(s8 device, u16 address, u8 *buffer, u16 size) { s32 result = osGbpakReadWrite(PFS(device), OS_WRITE, address, buffer, size); if (result) { - gbpakHandleError(result); + gbpak_handle_error(result); return false; } @@ -4789,7 +4789,7 @@ bool pak0f11cd00(s8 device, u16 arg1, char *arg2, s32 arg3, s32 arg4) buffer[i] = '\n'; } - gbpakWrite(device, 0, buffer, sizeof(buffer)); + gbpak_write(device, 0, buffer, sizeof(buffer)); #else bool result = false; s32 i; @@ -4810,14 +4810,14 @@ bool pak0f11cd00(s8 device, u16 arg1, char *arg2, s32 arg3, s32 arg4) } #endif - if (gbpakWrite(device, 0x4000, buffer, 32)) { + if (gbpak_write(device, 0x4000, buffer, 32)) { result = true; } } else { result = true; } - if (result && gbpakWrite(device, arg1, arg2, arg3)) { + if (result && gbpak_write(device, arg1, arg2, arg3)) { result = true; } @@ -4835,7 +4835,7 @@ bool pak0f11ce00(s8 device, u16 arg1, char *arg2, s32 arg3, bool arg4) buffer[i] = 0; } - gbpakWrite(device, 0, buffer, sizeof(buffer)); + gbpak_write(device, 0, buffer, sizeof(buffer)); #else bool result = false; s32 i; @@ -4849,14 +4849,14 @@ bool pak0f11ce00(s8 device, u16 arg1, char *arg2, s32 arg3, bool arg4) buffer[31] = (s32)(arg1 + 0xffff6000) / 0x2000; - if (gbpakWrite(device, 0x4000, buffer, sizeof(buffer))) { + if (gbpak_write(device, 0x4000, buffer, sizeof(buffer))) { result = true; } } else { result = true; } - if (result && gbpakRead(device, arg1, arg2, arg3)) { + if (result && gbpak_read(device, arg1, arg2, arg3)) { result = true; } @@ -4877,11 +4877,11 @@ bool gbpak0f11cef8(s8 device) spac[i] = 2; } - if (!gbpakWrite(device, 0x4000, spac, sizeof(spac))) { + if (!gbpak_write(device, 0x4000, spac, sizeof(spac))) { return false; } - if (!gbpakRead(device, 0xafe0, sp8c, sizeof(sp8c))) { + if (!gbpak_read(device, 0xafe0, sp8c, sizeof(sp8c))) { return false; } @@ -4889,11 +4889,11 @@ bool gbpak0f11cef8(s8 device) spac[i] = 8; } - if (!gbpakWrite(device, 0x4000, spac, sizeof(spac))) { + if (!gbpak_write(device, 0x4000, spac, sizeof(spac))) { return false; } - if (!gbpakRead(device, 0xbfe0, sp6c, sizeof(sp6c))) { + if (!gbpak_read(device, 0xbfe0, sp6c, sizeof(sp6c))) { return false; } @@ -4901,7 +4901,7 @@ bool gbpak0f11cef8(s8 device) spac[i] = 16; } - if (!gbpakWrite(device, 0x4000, spac, sizeof(spac))) { + if (!gbpak_write(device, 0x4000, spac, sizeof(spac))) { return false; } @@ -4920,7 +4920,7 @@ bool gbpak0f11cef8(s8 device) sp2c[0] |= 1; - if (!gbpakWrite(device, 0xa000, sp2c, sizeof(sp2c))) { + if (!gbpak_write(device, 0xa000, sp2c, sizeof(sp2c))) { return false; } } @@ -4948,11 +4948,11 @@ u32 pak0f116d1cnb(s8 device) writebuffer[i] = 0x10; } - if (gbpakWrite(device, 0x4000, writebuffer, sizeof(writebuffer)) == 0) { + if (gbpak_write(device, 0x4000, writebuffer, sizeof(writebuffer)) == 0) { return 0; } - if (gbpakRead(device, 0xa000, readbuffer, sizeof(readbuffer)) == 0) { + if (gbpak_read(device, 0xa000, readbuffer, sizeof(readbuffer)) == 0) { return 0; } @@ -5141,7 +5141,7 @@ void gbpak0f1172c8nb(s8 device, s32 arg1) buffer[i] = arg1 / 2; } - gbpakWrite(device, 0x4000, buffer, sizeof(buffer)); + gbpak_write(device, 0x4000, buffer, sizeof(buffer)); } #endif @@ -5173,7 +5173,7 @@ bool gbpak0f11d680(s8 device, bool arg1) addr = 0xa000 + (arg1 & 1 ? 0x1000 : 0) + offset; - if (gbpakRead(device, addr, &g_Paks[device].unk2c4[offset], size) == 0) { + if (gbpak_read(device, addr, &g_Paks[device].unk2c4[offset], size) == 0) { return false; } @@ -5217,7 +5217,7 @@ bool pak0f11d7c4(s8 device) * linear; the two bits for each pixel are in neighbouring bytes using the same * bit index. It also appears that the GBC format is column major. */ -void pakConvertFromGbcImage(u8 *src, u8 *dst) +void pak_convert_from_gbc_image(u8 *src, u8 *dst) { s32 i; s32 j; @@ -5279,7 +5279,7 @@ void pak0f11d9c4(s8 device, u8 *arg1, u8 *arg2, u32 arg3) break; case PAK00C_01: if (arg1 != NULL) { - pakConvertFromGbcImage(g_Paks[device].unk2c4, sp60); + pak_convert_from_gbc_image(g_Paks[device].unk2c4, sp60); for (i = 0; i < 128; i++) { for (j = 0; j < 128; j++) { @@ -5290,7 +5290,7 @@ void pak0f11d9c4(s8 device, u8 *arg1, u8 *arg2, u32 arg3) break; case PAK00C_02: if (arg1 != NULL) { - pakConvertFromGbcImage(g_Paks[device].unk2c4, sp60); + pak_convert_from_gbc_image(g_Paks[device].unk2c4, sp60); for (i = 0; i < 128; i++) { for (j = 0; j < 128; j++) { @@ -5301,7 +5301,7 @@ void pak0f11d9c4(s8 device, u8 *arg1, u8 *arg2, u32 arg3) break; case PAK00C_03: if (arg1 != NULL) { - pakConvertFromGbcImage(g_Paks[device].unk2c4, arg1); + pak_convert_from_gbc_image(g_Paks[device].unk2c4, arg1); } break; } @@ -5337,7 +5337,7 @@ void pak0f11d9c4(s8 device, u8 *arg1, u8 *arg2, u32 arg3) } #if VERSION >= VERSION_NTSC_1_0 -void pakRumble(s32 device, f32 numsecs, s32 onduration, s32 offduration) +void pak_rumble(s32 device, f32 numsecs, s32 onduration, s32 offduration) { if (g_Paks[device].state == PAKSTATE_READY && g_Paks[device].type == PAKTYPE_RUMBLE @@ -5352,7 +5352,7 @@ void pakRumble(s32 device, f32 numsecs, s32 onduration, s32 offduration) } } #else -void pakRumble(s8 device, f32 numsecs, s32 onduration, s32 offduration) +void pak_rumble(s8 device, f32 numsecs, s32 onduration, s32 offduration) { u8 index = g_Vars.playertojoymap[device]; @@ -5370,7 +5370,7 @@ void pakRumble(s8 device, f32 numsecs, s32 onduration, s32 offduration) } #endif -void paksStop(bool disablepolling) +void paks_stop(bool disablepolling) { s8 i; @@ -5380,42 +5380,42 @@ void paksStop(bool disablepolling) if (type); if (type != PAKTYPE_MEMORY && type != PAKTYPE_GAMEBOY) { - joyStopRumble(i, disablepolling); + joy_stop_rumble(i, disablepolling); } } } -void pakDisableRumbleForPlayer(s8 playernum) +void pak_disable_rumble_for_player(s8 playernum) { s32 i; s32 tmp = playernum; s32 contpads[2]; #if VERSION >= VERSION_NTSC_1_0 - joyGetContpadNumsForPlayer(tmp, &contpads[0], &contpads[1]); + joy_get_contpad_nums_for_player(tmp, &contpads[0], &contpads[1]); for (i = 0; i < 2; i++) { if (contpads[i] >= 0 && g_Paks[contpads[i]].type == PAKTYPE_RUMBLE) { g_Paks[contpads[i]].rumblestate = RUMBLESTATE_DISABLED_STOPPING; - joyStopRumble(contpads[i], true); + joy_stop_rumble(contpads[i], true); } } #else if (g_Paks[playernum].type == PAKTYPE_RUMBLE) { g_Paks[playernum].rumblestate = RUMBLESTATE_DISABLED_STOPPING; - joyStopRumble(playernum, true); + joy_stop_rumble(playernum, true); } #endif } -void pakEnableRumbleForPlayer(s8 playernum) +void pak_enable_rumble_for_player(s8 playernum) { s32 i; s32 tmp = playernum; s32 contpads[2]; #if VERSION >= VERSION_NTSC_1_0 - joyGetContpadNumsForPlayer(tmp, &contpads[0], &contpads[1]); + joy_get_contpad_nums_for_player(tmp, &contpads[0], &contpads[1]); for (i = 0; i < 2; i++) { if (contpads[i] >= 0 @@ -5432,7 +5432,7 @@ void pakEnableRumbleForPlayer(s8 playernum) #endif } -void pakDisableRumbleForAllPlayers(void) +void pak_disable_rumble_for_all_players(void) { s32 i; @@ -5440,17 +5440,17 @@ void pakDisableRumbleForAllPlayers(void) for (i = 0; i < MAX_PLAYERS; i++) { if (g_Paks[i].type == PAKTYPE_RUMBLE) { g_Paks[i].rumblestate = RUMBLESTATE_DISABLED_STOPPING; - joyStopRumble(i, true); + joy_stop_rumble(i, true); } } #else for (i = 0; i < MAX_PLAYERS; i++) { - pakDisableRumbleForPlayer(i); + pak_disable_rumble_for_player(i); } #endif } -void pakEnableRumbleForAllPlayers(void) +void pak_enable_rumble_for_all_players(void) { s32 i; @@ -5462,7 +5462,7 @@ void pakEnableRumbleForAllPlayers(void) } #else for (i = 0; i < MAX_PLAYERS; i++) { - pakEnableRumbleForPlayer(i); + pak_enable_rumble_for_player(i); } #endif } @@ -5474,21 +5474,21 @@ s32 pak0f11df84(s32 arg0) } #endif -void pakDumpPak(void) +void pak_dump_pak(void) { // empty } void pak0f117f94nb(s8 device); -void pakTickState(s8 device) +void pak_tick_state(s8 device) { #if VERSION == VERSION_NTSC_1_0 if (g_Paks[device].showdatalost) { SETBANNER(-1); - if (menuIsReadyForPakError(device, PAKERRORDIALOG_DATALOST)) { - menuPushPakErrorDialog(device, PAKERRORDIALOG_DATALOST); + if (menu_is_ready_for_pak_error(device, PAKERRORDIALOG_DATALOST)) { + menu_push_pak_error_dialog(device, PAKERRORDIALOG_DATALOST); g_Paks[device].showdatalost = false; } } @@ -5511,7 +5511,7 @@ void pakTickState(s8 device) case PAKSTATE_PROBE: #if VERSION >= VERSION_NTSC_1_0 SETBANNER(-1); - pakProbe(device); + pak_probe(device); #else pak0f114dd4nb(device); #endif @@ -5554,11 +5554,11 @@ void pakTickState(s8 device) break; case PAKSTATE_MEM_PREPARE: #if VERSION >= VERSION_NTSC_1_0 - joyDisableCyclicPolling(); - mempakPrepare(device); - joyEnableCyclicPolling(); + joy_disable_cyclic_polling(); + mempak_prepare(device); + joy_enable_cyclic_polling(); #else - mempakPrepare(device); + mempak_prepare(device); #endif break; case PAKSTATE_MEM_POST_PREPARE: @@ -5578,16 +5578,16 @@ void pakTickState(s8 device) { s32 ret; - joyDisableCyclicPolling(5914, "pak.c"); + joy_disable_cyclic_polling(5914, "pak.c"); ret = osGbpakInit(&g_PiMesgQueue, PFS(device), device); - joyEnableCyclicPolling(5916, "pak.c"); + joy_enable_cyclic_polling(5916, "pak.c"); if (ret == 0) { g_Paks[device].type = PAKTYPE_GAMEBOY; g_Paks[device].unk008 = PAK008_00; g_Paks[device].state = PAKSTATE_GB_POST_PREPARE1; } else { - gbpakHandleError(ret); + gbpak_handle_error(ret); g_Paks[device].type = PAKTYPE_GAMEBOY_ERROR; g_Paks[device].state = PAKSTATE_NOPAK; } @@ -5608,9 +5608,9 @@ void pakTickState(s8 device) g_Paks[device].state = PAKSTATE_READY; #else if (g_Paks[device].type == PAKTYPE_GAMEBOY) { - joyDisableCyclicPolling(5960, "pak.c"); + joy_disable_cyclic_polling(5960, "pak.c"); pak0f117f94nb(device); - joyEnableCyclicPolling(5962, "pak.c"); + joy_enable_cyclic_polling(5962, "pak.c"); g_Paks[device].state = PAKSTATE_13; } else { @@ -5627,8 +5627,8 @@ void pakTickState(s8 device) if ((g_Vars.paksneededformenu & (1 << device))) #endif { - if (menuIsReadyForPakError(device, PAKERRORDIALOG_CORRUPT)) { - menuPushPakErrorDialog(device, PAKERRORDIALOG_CORRUPT); + if (menu_is_ready_for_pak_error(device, PAKERRORDIALOG_CORRUPT)) { + menu_push_pak_error_dialog(device, PAKERRORDIALOG_CORRUPT); g_Paks[device].state = PAKSTATE_MEM_CORRUPT; } else { // empty @@ -5637,8 +5637,8 @@ void pakTickState(s8 device) break; #if VERSION >= VERSION_NTSC_1_0 case PAKSTATE_GB_OPEN_UNREADABLE: - if (menuIsReadyForPakError(device, PAKERRORDIALOG_GB_UNREADABLE)) { - menuPushPakErrorDialog(device, PAKERRORDIALOG_GB_UNREADABLE); + if (menu_is_ready_for_pak_error(device, PAKERRORDIALOG_GB_UNREADABLE)) { + menu_push_pak_error_dialog(device, PAKERRORDIALOG_GB_UNREADABLE); g_Paks[device].state = PAKSTATE_GB_IDLE_UNREADABLE; } break; @@ -5653,8 +5653,8 @@ void pakTickState(s8 device) if (g_Vars.paksneededformenu & (1 << device)) #endif { - if (menuIsReadyForPakError(device, PAKERRORDIALOG_DEVICEERROR)) { - menuPushPakErrorDialog(device, PAKERRORDIALOG_DEVICEERROR); + if (menu_is_ready_for_pak_error(device, PAKERRORDIALOG_DEVICEERROR)) { + menu_push_pak_error_dialog(device, PAKERRORDIALOG_DEVICEERROR); g_Paks[device].state = PAKSTATE_MEM_DEVICEERROR; } else { // empty @@ -5668,8 +5668,8 @@ void pakTickState(s8 device) if (g_Vars.paksneededformenu & (1 << device)) #endif { - if (menuIsReadyForPakError(device, PAKERRORDIALOG_FULL)) { - menuPushPakErrorDialog(device, PAKERRORDIALOG_FULL); + if (menu_is_ready_for_pak_error(device, PAKERRORDIALOG_FULL)) { + menu_push_pak_error_dialog(device, PAKERRORDIALOG_FULL); g_Paks[device].state = PAKSTATE_MEM_FULL; } else { // empty @@ -5688,8 +5688,8 @@ void pakTickState(s8 device) if (g_Paks[device].showdatalost) { SETBANNER(-1); - if (menuIsReadyForPakError(device, PAKERRORDIALOG_DATALOST)) { - menuPushPakErrorDialog(device, PAKERRORDIALOG_DATALOST); + if (menu_is_ready_for_pak_error(device, PAKERRORDIALOG_DATALOST)) { + menu_push_pak_error_dialog(device, PAKERRORDIALOG_DATALOST); g_Paks[device].showdatalost = false; } } @@ -5724,19 +5724,19 @@ void pak0f11e3b4(void) #endif #if VERSION < VERSION_NTSC_1_0 -s32 gbpakIdentifyGame(s8 device); +s32 gbpak_identify_game(s8 device); void pak0f117f94nb(s8 device) { struct pak *pak = &g_Paks[device]; - pak->unk2b8_05 = gbpakIdentifyGame(device); + pak->unk2b8_05 = gbpak_identify_game(device); if (pak); if (pak); if (pak->unk008 == PAK008_12) { - pak->unk2b8_05 = gbpakIdentifyGame(device); + pak->unk2b8_05 = gbpak_identify_game(device); if (pak->unk2b8_05 && pak->isgbcamera) { pak->unk008 = PAK008_00; @@ -5797,8 +5797,8 @@ void pak0f117f94nb(s8 device) } if (pak->unk008 == PAK008_09) { - if (gbpak0f11d680(device, pakGetUnk270(device)) && pak0f11d7c4(device)) { - pakSetUnk008(device, PAK008_11); + if (gbpak0f11d680(device, pak_get_unk270(device)) && pak0f11d7c4(device)) { + pak_set_unk008(device, PAK008_11); } } } @@ -5810,48 +5810,48 @@ void pak0f11e3bc(s8 device) g_Paks[device].unk008 = PAK008_00; } -void pakProbeEeprom(void) +void pak_probe_eeprom(void) { s32 type; - joyDisableCyclicPolling(JOYARGS(6199)); + joy_disable_cyclic_polling(JOYARGS(6199)); type = osEepromProbe(&g_PiMesgQueue); - joyEnableCyclicPolling(JOYARGS(6201)); + joy_enable_cyclic_polling(JOYARGS(6201)); if (type == EEPROM_TYPE_16K) { g_PakHasEeprom = true; - if (argFindByPrefix(1, "-scrub")) { - pakCreateFilesystem(SAVEDEVICE_GAMEPAK); + if (arg_find_by_prefix(1, "-scrub")) { + pak_create_filesystem(SAVEDEVICE_GAMEPAK); } } else { g_PakHasEeprom = false; } } -PakErr1 pakReadEeprom(u8 address, u8 *buffer, u32 len) +PakErr1 pak_read_eeprom(u8 address, u8 *buffer, u32 len) { s32 result; - joyDisableCyclicPolling(JOYARGS(6234)); + joy_disable_cyclic_polling(JOYARGS(6234)); result = osEepromLongRead(&g_PiMesgQueue, address, buffer, len); - joyEnableCyclicPolling(JOYARGS(6236)); + joy_enable_cyclic_polling(JOYARGS(6236)); return result == PAK_ERR1_OK ? PAK_ERR1_OK : PAK_ERR1_EEPROMREADFAILED; } -PakErr1 pakWriteEeprom(u8 address, u8 *buffer, u32 len) +PakErr1 pak_write_eeprom(u8 address, u8 *buffer, u32 len) { s32 result; - joyDisableCyclicPolling(JOYARGS(6269)); + joy_disable_cyclic_polling(JOYARGS(6269)); result = osEepromLongWrite(&g_PiMesgQueue, address, buffer, len); - joyEnableCyclicPolling(JOYARGS(6271)); + joy_enable_cyclic_polling(JOYARGS(6271)); return result == PAK_ERR1_OK ? PAK_ERR1_OK : PAK_ERR1_EEPROMWRITEFAILED; } -void pakSetBitflag(s32 flagnum, u8 *bitstream, bool set) +void pak_set_bitflag(s32 flagnum, u8 *bitstream, bool set) { u32 byteindex = (u32)flagnum / 8; u8 mask = 1 << ((u32)flagnum % 8); @@ -5863,7 +5863,7 @@ void pakSetBitflag(s32 flagnum, u8 *bitstream, bool set) } } -bool pakHasBitflag(u32 flagnum, u8 *bitstream) +bool pak_has_bitflag(u32 flagnum, u8 *bitstream) { u32 byteindex = flagnum / 8; u8 mask = 1 << (flagnum % 8); @@ -5871,12 +5871,12 @@ bool pakHasBitflag(u32 flagnum, u8 *bitstream) return bitstream[byteindex] & mask ? 1 : 0; } -void pakClearAllBitflags(u8 *flags) +void pak_clear_all_bitflags(u8 *flags) { s32 i; for (i = 0; i <= GAMEFILEFLAG_4E; i++) { - pakSetBitflag(i, flags, false); + pak_set_bitflag(i, flags, false); } } @@ -5894,7 +5894,7 @@ u32 pak0f11e610(u32 arg0) * an asterisk if they are invalid font codes or if the character doesn't exist * in PD's font. */ -void pakN64FontCodeToAscii(char *src, char *dst, s32 len) +void pak_n64_font_code_to_ascii(char *src, char *dst, s32 len) { char buffer[256]; s32 i; @@ -5948,14 +5948,14 @@ void pakN64FontCodeToAscii(char *src, char *dst, s32 len) strcpy(dst, buffer); } -s8 pakFindBySerial(s32 findserial) +s8 pak_find_by_serial(s32 findserial) { s8 device = -1; s32 i; for (i = 0; i < ARRAYCOUNT(g_Paks); i++) { - if (mempakIsReady(i)) { - s32 serial = pakGetSerial(i); + if (mempak_is_ready(i)) { + s32 serial = pak_get_serial(i); if (findserial == serial) { device = i; @@ -5977,15 +5977,15 @@ s32 pak0f11e750(s8 device) u8 buffer[32]; buffer[0] = 0x0a; - return gbpakWrite(device, 0, buffer, sizeof(buffer)); + return gbpak_write(device, 0, buffer, sizeof(buffer)); } -bool gbpakIsAnyPerfectDark(void) +bool gbpak_is_any_perfect_dark(void) { s8 i; for (i = 0; i < MAX_PLAYERS; i++) { - if (gbpakIdentifyGame(i) == GBGAME_PD) { + if (gbpak_identify_game(i) == GBGAME_PD) { return true; } } @@ -5997,7 +5997,7 @@ bool gbpakIsAnyPerfectDark(void) * Probable @bug: This function is probably intended to be a "strings are equal" * check, however it's actually checking if either string starts with the other. */ -bool gbpakStrcmp(char *a, char *b) +bool gbpak_strcmp(char *a, char *b) { while (*a != '\0' && *b != '\0') { if (*a != *b) { @@ -6013,7 +6013,7 @@ bool gbpakStrcmp(char *a, char *b) bool pak0f11eaec(s8 device); -s32 gbpakIdentifyGame(s8 device) +s32 gbpak_identify_game(s8 device) { #if VERSION >= VERSION_NTSC_1_0 OSGbpakId id; @@ -6027,7 +6027,7 @@ s32 gbpakIdentifyGame(s8 device) return GBGAME_OTHER; } - joyDisableCyclicPolling(); + joy_disable_cyclic_polling(); ret = osGbpakReadId(PFS(device), &id, &status); @@ -6061,7 +6061,7 @@ s32 gbpakIdentifyGame(s8 device) if (var80075cb0 == id.company_code) { // PerfDark or PerfDark - if (gbpakStrcmp(var80075cb4, id.game_title) || gbpakStrcmp(var80075cc0, id.game_title)) { + if (gbpak_strcmp(var80075cb4, id.game_title) || gbpak_strcmp(var80075cc0, id.game_title)) { g_Paks[device].isgbcamera = false; g_Paks[device].isgbpd = true; game = GBGAME_PD; @@ -6078,7 +6078,7 @@ s32 gbpakIdentifyGame(s8 device) } } - joyEnableCyclicPolling(); + joy_enable_cyclic_polling(); if (ok) { return game; @@ -6091,15 +6091,15 @@ s32 gbpakIdentifyGame(s8 device) u8 status; u32 stack; - joyDisableCyclicPolling(7045, "pak.c"); + joy_disable_cyclic_polling(7045, "pak.c"); if (g_Paks[device].type != PAKTYPE_GAMEBOY) { - joyEnableCyclicPolling(7050, "pak.c"); + joy_enable_cyclic_polling(7050, "pak.c"); return GBGAME_OTHER; } if (osGbpakGetStatus(PFS(device), &status) != PAK_ERR1_OK) { - joyEnableCyclicPolling(7057, "pak.c"); + joy_enable_cyclic_polling(7057, "pak.c"); return GBGAME_OTHER; } @@ -6108,46 +6108,46 @@ s32 gbpakIdentifyGame(s8 device) } if ((status & OS_GBPAK_GBCART_ON) == 0) { - joyEnableCyclicPolling(7071, "pak.c"); + joy_enable_cyclic_polling(7071, "pak.c"); return GBGAME_OTHER; } if ((status & OS_GBPAK_GBCART_ON) == 0) { - joyEnableCyclicPolling(7078, "pak.c"); + joy_enable_cyclic_polling(7078, "pak.c"); return GBGAME_OTHER; } if (osGbpakPower(PFS(device), OS_GBPAK_POWER_ON) != PAK_ERR1_OK) { - joyEnableCyclicPolling(7085, "pak.c"); + joy_enable_cyclic_polling(7085, "pak.c"); return GBGAME_OTHER; } if (osGbpakReadId(PFS(device), &id, &status) != PAK_ERR1_OK) { - joyEnableCyclicPolling(7096, "pak.c"); + joy_enable_cyclic_polling(7096, "pak.c"); return GBGAME_OTHER; } if (var80075cb0 == id.company_code) { // POCKETCAMERA or GAMEBOYCAMERA - if (gbpakStrcmp(var80078058nb, id.game_title) || gbpakStrcmp(var80078068nb, id.game_title)) { + if (gbpak_strcmp(var80078058nb, id.game_title) || gbpak_strcmp(var80078068nb, id.game_title)) { g_Paks[device].isgbcamera = true; g_Paks[device].isgbpd = false; - joyEnableCyclicPolling(7111, "pak.c"); + joy_enable_cyclic_polling(7111, "pak.c"); } } if (var80078054nb == id.company_code) { // PerfDark or GAMEBOYCAMERA - if (gbpakStrcmp(var80078078nb, id.game_title) || gbpakStrcmp(var80078084nb, id.game_title)) { + if (gbpak_strcmp(var80078078nb, id.game_title) || gbpak_strcmp(var80078084nb, id.game_title)) { g_Paks[device].isgbcamera = false; g_Paks[device].isgbpd = true; pak0f11eaec(device); - joyEnableCyclicPolling(7135, "pak.c"); + joy_enable_cyclic_polling(7135, "pak.c"); return GBGAME_PD; } } - joyEnableCyclicPolling(7140, "pak.c"); + joy_enable_cyclic_polling(7140, "pak.c"); return GBGAME_OTHER; #endif @@ -6200,9 +6200,9 @@ bool pak0f11eaec(s8 device) } #if VERSION >= VERSION_NTSC_1_0 - gbpakStrcmp("PerfDark\n", sp38); + gbpak_strcmp("PerfDark\n", sp38); #else - gbpakStrcmp("PerfDark", sp38); + gbpak_strcmp("PerfDark", sp38); #endif if (!pak0f11ce00(device, 0xa000, sp38, 32, true)) { @@ -6226,20 +6226,20 @@ bool pak0f11eaec(s8 device) * It reads data from the game boy pak, unsets a bit, writes it, reads it back, * sets the bit, writes it and then reads it back. */ -void gbpakFiddle(s8 device) +void gbpak_fiddle(s8 device) { u8 buffer[32]; - if (gbpakRead(device, 0xa000, buffer, sizeof(buffer))) { + if (gbpak_read(device, 0xa000, buffer, sizeof(buffer))) { pak0f11e750(device); buffer[0] &= 0x7f; - if (gbpakWrite(device, 0xa000, buffer, sizeof(buffer))) { - if (gbpakRead(device, 0xa000, buffer, sizeof(buffer))) { + if (gbpak_write(device, 0xa000, buffer, sizeof(buffer))) { + if (gbpak_read(device, 0xa000, buffer, sizeof(buffer))) { buffer[0] |= 0x80; - if (gbpakWrite(device, 0xa000, buffer, sizeof(buffer))) { - gbpakRead(device, 0xa000, buffer, sizeof(buffer)); + if (gbpak_write(device, 0xa000, buffer, sizeof(buffer))) { + gbpak_read(device, 0xa000, buffer, sizeof(buffer)); } } } diff --git a/src/game/pdmode.c b/src/game/pdmode.c index 93ad30885..348fe69b4 100644 --- a/src/game/pdmode.c +++ b/src/game/pdmode.c @@ -10,12 +10,12 @@ #include "data.h" #include "types.h" -f32 pdmodeGetEnemyReactionSpeed(void) +f32 pdmode_get_enemy_reaction_speed(void) { return 0; } -f32 pdmodeGetEnemyHealth(void) +f32 pdmode_get_enemy_health(void) { if (g_MissionConfig.pdmode) { return g_MissionConfig.pdmodehealthf; @@ -24,7 +24,7 @@ f32 pdmodeGetEnemyHealth(void) return 1; } -f32 pdmodeGetEnemyDamage(void) +f32 pdmode_get_enemy_damage(void) { if (g_MissionConfig.pdmode) { return g_MissionConfig.pdmodedamagef; @@ -33,7 +33,7 @@ f32 pdmodeGetEnemyDamage(void) return 1; } -f32 pdmodeGetEnemyAccuracy(void) +f32 pdmode_get_enemy_accuracy(void) { if (g_MissionConfig.pdmode) { return g_MissionConfig.pdmodeaccuracyf; @@ -47,7 +47,7 @@ void func0f01b148(u32 arg0) var800624e0 = arg0; } -void titleSetNextStage(s32 stagenum) +void title_set_next_stage(s32 stagenum) { g_TitleNextStage = stagenum; } diff --git a/src/game/player.c b/src/game/player.c index 6bba2f05a..1b7b6bb5a 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -211,7 +211,7 @@ s32 g_NumDeathAnimations = 0; * @dangerous: If there are too many pads (24+) in the setup then array * overflows may occur. */ -f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstrooms, struct prop *prop, s16 *pads, s32 numpads) +f32 player_choose_spawn_location(f32 chrradius, struct coord *dstpos, RoomNum *dstrooms, struct prop *prop, s16 *pads, s32 numpads) { u8 verybadpads[24]; u8 badpads[24]; @@ -244,7 +244,7 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr // Iterate all spawn pads and populate the category arrays for (p = 0; p < numpads; p++) { bestsqdist = U32_MAX; - padUnpack(pads[p], PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(pads[p], PADFIELD_POS | PADFIELD_ROOM, &pad); verybadpads[p] = false; badpads[p] = false; @@ -254,7 +254,7 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr for (i = 0; i < playercount; i++) { if (g_Vars.players[i]->prop && g_Vars.players[i]->prop != prop - && (!prop || chrCompareTeams(prop->chr, g_Vars.players[i]->prop->chr, COMPARE_ENEMIES))) { + && (!prop || chr_compare_teams(prop->chr, g_Vars.players[i]->prop->chr, COMPARE_ENEMIES))) { xdiff = g_Vars.players[i]->prop->pos.x - pad.pos.x; ydiff = g_Vars.players[i]->prop->pos.y - pad.pos.y; zdiff = g_Vars.players[i]->prop->pos.z - pad.pos.z; @@ -265,11 +265,11 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr bestsqdist = sqdist; } - if (bgRoomIsOnPlayerScreen(pad.room, i)) { + if (bg_room_is_on_player_screen(pad.room, i)) { verybadpads[p] = true; } - if (verybadpads[p] || bgRoomIsOnPlayerStandby(pad.room, i)) { + if (verybadpads[p] || bg_room_is_on_player_standby(pad.room, i)) { badpads[p] = true; } } @@ -279,12 +279,12 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr tmppadrooms[0] = pad.room; tmppadrooms[1] = -1; - bgRoomGetNeighbours(pad.room, neighbours, 20); + bg_room_get_neighbours(pad.room, neighbours, 20); for (i = 0; i < g_BotCount; i++) { if (g_MpBotChrPtrs[i]->prop && g_MpBotChrPtrs[i]->prop != prop - && (!prop || chrCompareTeams(prop->chr, g_MpBotChrPtrs[i], COMPARE_ENEMIES))) { + && (!prop || chr_compare_teams(prop->chr, g_MpBotChrPtrs[i], COMPARE_ENEMIES))) { xdiff = g_MpBotChrPtrs[i]->prop->pos.x - pad.pos.x; ydiff = g_MpBotChrPtrs[i]->prop->pos.y - pad.pos.y; zdiff = g_MpBotChrPtrs[i]->prop->pos.z - pad.pos.z; @@ -295,11 +295,11 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr bestsqdist = sqdist; } - if (arrayIntersects(tmppadrooms, g_MpBotChrPtrs[i]->prop->rooms)) { + if (array_intersects(tmppadrooms, g_MpBotChrPtrs[i]->prop->rooms)) { verybadpads[p] = true; } - if (verybadpads[p] || arrayIntersects(neighbours, g_MpBotChrPtrs[i]->prop->rooms)) { + if (verybadpads[p] || array_intersects(neighbours, g_MpBotChrPtrs[i]->prop->rooms)) { badpads[p] = true; } } @@ -318,7 +318,7 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr p = i; \ while (sllen < 4) { if (padsqdists[p] > 1000 * 1000 && !badpads[p]) { - padUnpack(pads[p], PADFIELD_POS | PADFIELD_ROOM | PADFIELD_LOOK, &pad); + pad_unpack(pads[p], PADFIELD_POS | PADFIELD_ROOM | PADFIELD_LOOK, &pad); slrooms[sllen][0] = pad.room; slrooms[sllen][1] = -1; @@ -330,12 +330,12 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr slangles[sllen] = atan2f(pad.look.x, pad.look.z); #if VERSION >= VERSION_NTSC_1_0 - if (chrAdjustPosForSpawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) { + if (chr_adjust_pos_for_spawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) { slpadindexes[sllen] = p; sllen++; } #else - if (chrAdjustPosForSpawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false)) { + if (chr_adjust_pos_for_spawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false)) { slpadindexes[sllen] = p; sllen++; } @@ -357,7 +357,7 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr while (sllen < 4) { if (padsqdists[p] > 1000 * 1000 && !verybadpads[p]) { - padUnpack(pads[p], PADFIELD_POS | PADFIELD_ROOM | PADFIELD_LOOK, &pad); + pad_unpack(pads[p], PADFIELD_POS | PADFIELD_ROOM | PADFIELD_LOOK, &pad); slrooms[sllen][0] = pad.room; slrooms[sllen][1] = -1; @@ -369,12 +369,12 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr slangles[sllen] = atan2f(pad.look.x, pad.look.z); #if VERSION >= VERSION_NTSC_1_0 - if (chrAdjustPosForSpawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) { + if (chr_adjust_pos_for_spawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) { slpadindexes[sllen] = p; sllen++; } #else - if (chrAdjustPosForSpawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false)) { + if (chr_adjust_pos_for_spawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false)) { slpadindexes[sllen] = p; sllen++; } @@ -418,7 +418,7 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr } // Add this pad to the shortlist - padUnpack(pads[i], PADFIELD_POS | PADFIELD_ROOM | PADFIELD_LOOK, &pad); + pad_unpack(pads[i], PADFIELD_POS | PADFIELD_ROOM | PADFIELD_LOOK, &pad); slrooms[sllen][0] = pad.room; slrooms[sllen][1] = -1; @@ -430,12 +430,12 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr slangles[sllen] = atan2f(pad.look.x, pad.look.z); #if VERSION >= VERSION_NTSC_1_0 - if (chrAdjustPosForSpawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) { + if (chr_adjust_pos_for_spawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false, false)) { slpadindexes[sllen] = i; sllen++; } #else - if (chrAdjustPosForSpawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false)) { + if (chr_adjust_pos_for_spawn(chrradius, &slpositions[sllen], slrooms[sllen], slangles[sllen], true, false)) { slpadindexes[sllen] = i; sllen++; } @@ -452,12 +452,12 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr dstpos->y = slpositions[p].y; dstpos->z = slpositions[p].z; - roomsCopy(slrooms[p], dstrooms); + rooms_copy(slrooms[p], dstrooms); dstangle = slangles[p]; } else { // No shortlisted pads, so pick a random one from the full selection - padUnpack(pads[random() % numpads], PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); + pad_unpack(pads[random() % numpads], PADFIELD_POS | PADFIELD_LOOK | PADFIELD_ROOM, &pad); dstrooms[0] = pad.room; dstrooms[1] = -1; @@ -472,12 +472,12 @@ f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstr return dstangle; } -f32 playerChooseGeneralSpawnLocation(f32 chrradius, struct coord *pos, RoomNum *rooms, struct prop *prop) +f32 player_choose_general_spawn_location(f32 chrradius, struct coord *pos, RoomNum *rooms, struct prop *prop) { - return playerChooseSpawnLocation(chrradius, pos, rooms, prop, g_SpawnPoints, g_NumSpawnPoints); + return player_choose_spawn_location(chrradius, pos, rooms, prop, g_SpawnPoints, g_NumSpawnPoints); } -void playerStartNewLife(void) +void player_start_new_life(void) { struct coord pos = {0, 0, 0}; RoomNum rooms[8]; @@ -486,7 +486,7 @@ void playerStartNewLife(void) f32 groundy; s32 i; - pakEnableRumbleForPlayer(g_Vars.currentplayernum); + pak_enable_rumble_for_player(g_Vars.currentplayernum); g_Vars.currentplayer->dostartnewlife = false; @@ -504,19 +504,19 @@ void playerStartNewLife(void) } } - splatResetChr(g_Vars.currentplayer->prop->chr); - playerLoadDefaults(); + splat_reset_chr(g_Vars.currentplayer->prop->chr); + player_load_defaults(); g_Vars.currentplayer->isdead = false; g_Vars.currentplayer->healthdamagetype = DAMAGETYPE_7; g_Vars.currentplayer->damagetype = DAMAGETYPE_7; g_Vars.currentplayer->gunammooff = 0; g_Vars.currentplayer->gunsightoff = 2; - hudmsgsSetOn(0xffffffff); + hudmsgs_set_on(0xffffffff); - angle = M_BADTAU - scenarioChooseSpawnLocation(30, &pos, rooms, g_Vars.currentplayer->prop); // var7f1ad534 + angle = M_BADTAU - scenario_choose_spawn_location(30, &pos, rooms, g_Vars.currentplayer->prop); // var7f1ad534 - groundy = cdFindGroundInfoAtCyl(&pos, 30, rooms, + groundy = cd_find_ground_info_at_cyl(&pos, 30, rooms, &g_Vars.currentplayer->floorcol, &g_Vars.currentplayer->floortype, &g_Vars.currentplayer->floorflags, @@ -529,7 +529,7 @@ void playerStartNewLife(void) g_Vars.currentplayer->vv_theta = angle * 360.0f / M_BADTAU; g_Vars.currentplayer->vv_ground = groundy; - playerResetBond(&g_Vars.currentplayer->bond2, &pos); + player_reset_bond(&g_Vars.currentplayer->bond2, &pos); g_Vars.currentplayer->bond2.unk00.x = -sinf(angle); g_Vars.currentplayer->bond2.unk00.y = 0; @@ -539,12 +539,12 @@ void playerStartNewLife(void) g_Vars.currentplayer->prop->pos.f[1] = g_Vars.currentplayer->bondprevpos.f[1] = pos.f[1]; g_Vars.currentplayer->prop->pos.f[2] = g_Vars.currentplayer->bondprevpos.f[2] = pos.f[2]; - propDeregisterRooms(g_Vars.currentplayer->prop); + prop_deregister_rooms(g_Vars.currentplayer->prop); g_Vars.currentplayer->prop->rooms[0] = rooms[0]; g_Vars.currentplayer->prop->rooms[1] = -1; - playerSetCamPropertiesInBounds(&pos, &g_Vars.currentplayer->bond2.unk28, + player_set_cam_properties_in_bounds(&pos, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, rooms[0]); if (g_Vars.coopplayernum >= 0) { @@ -557,8 +557,8 @@ void playerStartNewLife(void) } for (i = 1; i != ARRAYCOUNT(g_Weapons); i++) { - if (invHasSingleWeaponOrProp(i)) { - s32 ammotype = bgunGetAmmoTypeForWeapon(i, FUNC_PRIMARY); + if (inv_has_single_weapon_or_prop(i)) { + s32 ammotype = bgun_get_ammo_type_for_weapon(i, FUNC_PRIMARY); if (ammotype >= 0 && ammotype <= AMMOTYPE_ECM_MINE) { ammotypesheld[ammotype] = true; @@ -572,14 +572,14 @@ void playerStartNewLife(void) } } } else { - invClear(); + inv_clear(); for (i = 0; i < ARRAYCOUNT(g_Vars.currentplayer->ammoheldarr); i++) { g_Vars.currentplayer->ammoheldarr[i] = 0; } } - invGiveSingleWeapon(WEAPON_UNARMED); + inv_give_single_weapon(WEAPON_UNARMED); if (cmd) { if (cmd); @@ -605,16 +605,16 @@ void playerStartNewLife(void) case INTROCMD_WEAPON: if (cmd[3] == 0) { if (cmd[2] >= 0) { - invGiveDoubleWeapon(cmd[1], cmd[2]); + inv_give_double_weapon(cmd[1], cmd[2]); } else { - invGiveSingleWeapon(cmd[1]); + inv_give_single_weapon(cmd[1]); } } cmd += 4; break; case INTROCMD_AMMO: if (cmd[3] == 0) { - bgunSetAmmoQuantity(cmd[1], cmd[2]); + bgun_set_ammo_quantity(cmd[1], cmd[2]); } cmd += 4; break; @@ -646,13 +646,13 @@ void playerStartNewLife(void) g_Vars.currentplayer->apparentarmour = 0; } - bmoveUpdateRooms(g_Vars.currentplayer); - playerSpawn(); + bmove_update_rooms(g_Vars.currentplayer); + player_spawn(); if (g_Vars.normmplayerisrunning) { - playerStartChrFade(120, 1); + player_start_chr_fade(120, 1); } else { - playerStartChrFade(0, 1); + player_start_chr_fade(0, 1); } if (g_Vars.currentplayer->prop->chr) { @@ -660,7 +660,7 @@ void playerStartNewLife(void) } } -void playerLoadDefaults(void) +void player_load_defaults(void) { if (!g_Vars.mplayerisrunning || g_Vars.currentplayer->model00d4 == NULL) { g_Vars.currentplayer->vv_eyeheight = 159; @@ -686,7 +686,7 @@ void playerLoadDefaults(void) g_Vars.currentplayer->bondmovemode = -1; g_Vars.currentplayer->walkinitmove = 0; - bmoveSetMode(MOVEMODE_WALK); + bmove_set_mode(MOVEMODE_WALK); g_Vars.currentplayer->bondperimenabled = true; g_Vars.currentplayer->periminfo.header.type = GEOTYPE_CYL; @@ -699,9 +699,9 @@ void playerLoadDefaults(void) g_Vars.currentplayer->bondactivateorreload = false; g_Vars.currentplayer->isdead = false; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_DUEL) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_DUEL) { g_Vars.currentplayer->bondhealth = 0.01f; - } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MAIANSOS) { + } else if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MAIANSOS) { g_Vars.currentplayer->bondhealth = 0.5f; } else { g_Vars.currentplayer->bondhealth = 1; @@ -804,7 +804,7 @@ void playerLoadDefaults(void) g_Vars.currentplayer->prevoverexposureblue = 0; } -bool playerSpawnAnti(struct chrdata *hostchr, bool force) +bool player_spawn_anti(struct chrdata *hostchr, bool force) { struct prop *hostprop; union modelrwdata *chrrootrwdata; @@ -817,67 +817,67 @@ bool playerSpawnAnti(struct chrdata *hostchr, bool force) playerchr->hidden |= CHRHFLAG_WARPONSCREEN; playerchr->radius = hostchr->radius; - if (chrMoveToPos(playerchr, &hostchr->prop->pos, hostchr->prop->rooms, chrGetInverseTheta(hostchr), false) || force) { + if (chr_move_to_pos(playerchr, &hostchr->prop->pos, hostchr->prop->rooms, chr_get_inverse_theta(hostchr), false) || force) { if (hostchr->weapons_held[0] && hostchr->weapons_held[1]) { // Dual wielding struct weaponobj *weapon1 = hostchr->weapons_held[0]->weapon; struct weaponobj *weapon2 = hostchr->weapons_held[1]->weapon; #if VERSION >= VERSION_NTSC_1_0 - invGiveSingleWeapon(weapon1->weaponnum); - invGiveDoubleWeapon(weapon1->weaponnum, weapon1->weaponnum); - bgunEquipWeapon2(HAND_RIGHT, weapon1->weaponnum); - bgunEquipWeapon2(HAND_LEFT, weapon1->weaponnum); + inv_give_single_weapon(weapon1->weaponnum); + inv_give_double_weapon(weapon1->weaponnum, weapon1->weaponnum); + bgun_equip_weapon2(HAND_RIGHT, weapon1->weaponnum); + bgun_equip_weapon2(HAND_LEFT, weapon1->weaponnum); #else - invGiveDoubleWeapon(weapon1->weaponnum, weapon2->weaponnum); - bgunEquipWeapon2(HAND_RIGHT, weapon1->weaponnum); - bgunEquipWeapon2(HAND_LEFT, weapon2->weaponnum); + inv_give_double_weapon(weapon1->weaponnum, weapon2->weaponnum); + bgun_equip_weapon2(HAND_RIGHT, weapon1->weaponnum); + bgun_equip_weapon2(HAND_LEFT, weapon2->weaponnum); #endif } else if (hostchr->weapons_held[0]) { // Right hand only struct weaponobj *weapon = hostchr->weapons_held[0]->weapon; if (weapon->weaponnum == WEAPON_SUPERDRAGON) { - invGiveSingleWeapon(WEAPON_DRAGON); - bgunEquipWeapon2(HAND_RIGHT, WEAPON_DRAGON); + inv_give_single_weapon(WEAPON_DRAGON); + bgun_equip_weapon2(HAND_RIGHT, WEAPON_DRAGON); } else { - invGiveSingleWeapon(weapon->weaponnum); - bgunEquipWeapon2(HAND_RIGHT, weapon->weaponnum); + inv_give_single_weapon(weapon->weaponnum); + bgun_equip_weapon2(HAND_RIGHT, weapon->weaponnum); } } else if (hostchr->weapons_held[1]) { // Left hand only struct weaponobj *weapon = hostchr->weapons_held[1]->weapon; if (weapon->weaponnum == WEAPON_SUPERDRAGON) { - invGiveSingleWeapon(WEAPON_DRAGON); - bgunEquipWeapon2(HAND_RIGHT, WEAPON_DRAGON); + inv_give_single_weapon(WEAPON_DRAGON); + bgun_equip_weapon2(HAND_RIGHT, WEAPON_DRAGON); } else { - invGiveSingleWeapon(weapon->weaponnum); - bgunEquipWeapon2(HAND_RIGHT, weapon->weaponnum); + inv_give_single_weapon(weapon->weaponnum); + bgun_equip_weapon2(HAND_RIGHT, weapon->weaponnum); } } else { // Unarmed - invGiveSingleWeapon(WEAPON_UNARMED); - bgunEquipWeapon2(HAND_RIGHT, WEAPON_UNARMED); + inv_give_single_weapon(WEAPON_UNARMED); + bgun_equip_weapon2(HAND_RIGHT, WEAPON_UNARMED); } g_Vars.currentplayer->invdowntime = TICKS(-40); g_Vars.currentplayer->usedowntime = TICKS(-40); - bgunGiveMaxAmmo(true); + bgun_give_max_ammo(true); - g_Vars.currentplayer->bondhealth = (chrGetMaxDamage(hostchr) - hostchr->damage) * 0.125f; + g_Vars.currentplayer->bondhealth = (chr_get_max_damage(hostchr) - hostchr->damage) * 0.125f; if (g_Vars.currentplayer->bondhealth > 1) { g_Vars.currentplayer->bondhealth = 1; } - chrSetShield(playerchr, chrGetShield(hostchr)); + chr_set_shield(playerchr, chr_get_shield(hostchr)); g_Vars.currentplayer->haschrbody = false; g_Vars.currentplayer->model00d4 = NULL; - chrRemove(g_Vars.currentplayer->prop, false); + chr_remove(g_Vars.currentplayer->prop, false); if (hostchr->bodynum == BODY_SKEDAR) { g_Vars.antiheadnum = HEAD_MRBLONDE; @@ -887,12 +887,12 @@ bool playerSpawnAnti(struct chrdata *hostchr, bool force) g_Vars.antibodynum = hostchr->bodynum; } - playerTickChrBody(); - modelCopyAnimData(hostchr->model, playerchr->model); + player_tick_chr_body(); + model_copy_anim_data(hostchr->model, playerchr->model); func0f02e9a0(playerchr, 12); - chrrootrwdata = modelGetNodeRwData(hostchr->model, hostchr->model->definition->rootnode); - playerrootrwdata = modelGetNodeRwData(playerchr->model, playerchr->model->definition->rootnode); + chrrootrwdata = model_get_node_rw_data(hostchr->model, hostchr->model->definition->rootnode); + playerrootrwdata = model_get_node_rw_data(playerchr->model, playerchr->model->definition->rootnode); playerrootrwdata->chrinfo = chrrootrwdata->chrinfo; @@ -907,11 +907,11 @@ bool playerSpawnAnti(struct chrdata *hostchr, bool force) playerchr->radius = hostchr->radius; g_Vars.currentplayer->bond2.radius = hostchr->radius; - chrRemove(hostprop, true); - propDeregisterRooms(hostprop); - propDelist(hostprop); - propDisable(hostprop); - propFree(hostprop); + chr_remove(hostprop, true); + prop_deregister_rooms(hostprop); + prop_delist(hostprop); + prop_disable(hostprop); + prop_free(hostprop); return true; } @@ -921,7 +921,7 @@ bool playerSpawnAnti(struct chrdata *hostchr, bool force) return false; } -void playerSpawn(void) +void player_spawn(void) { f32 xdiff; f32 ydiff; @@ -945,18 +945,18 @@ void playerSpawn(void) g_Vars.currentplayer->startnewbonddie = true; g_Vars.currentplayer->killsthislife = 0; - g_Vars.currentplayer->lifestarttime60 = playerGetMissionTime(); + g_Vars.currentplayer->lifestarttime60 = player_get_mission_time(); g_Vars.currentplayer->healthdisplaytime60 = 0; - invGiveSingleWeapon(WEAPON_UNARMED); - playerSetShieldFrac(0); + inv_give_single_weapon(WEAPON_UNARMED); + player_set_shield_frac(0); - if (cheatIsActive(CHEAT_JOSHIELD)) { - playerSetShieldFrac(1); + if (cheat_is_active(CHEAT_JOSHIELD)) { + player_set_shield_frac(1); } - if (cheatIsActive(CHEAT_SUPERSHIELD)) { - playerSetShieldFrac(1); + if (cheat_is_active(CHEAT_SUPERSHIELD)) { + player_set_shield_frac(1); g_Vars.currentplayer->armourscale = 2; } @@ -965,30 +965,30 @@ void playerSpawn(void) numsqdists = 0; force = false; - invGiveSingleWeapon(WEAPON_SUICIDEPILL); - bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE); - bgunEquipWeapon2(HAND_RIGHT, WEAPON_UNARMED); + inv_give_single_weapon(WEAPON_SUICIDEPILL); + bgun_equip_weapon2(HAND_LEFT, WEAPON_NONE); + bgun_equip_weapon2(HAND_RIGHT, WEAPON_UNARMED); if (g_Vars.lvframenum > 0) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(g_Vars.bondplayernum); + set_current_player_num(g_Vars.bondplayernum); bgun0f0a0c08(&sp84, &sp9c); - mtx4RotateVec(camGetProjectionMtxF(), &sp9c, &sp90); - mtx4TransformVec(camGetProjectionMtxF(), &sp84, &sp78); - setCurrentPlayerNum(prevplayernum); + mtx4_rotate_vec(cam_get_projection_mtxf(), &sp9c, &sp90); + mtx4_transform_vec(cam_get_projection_mtxf(), &sp84, &sp78); + set_current_player_num(prevplayernum); } if (g_Vars.currentplayer->model00d4 == NULL) { - playerTickChrBody(); + player_tick_chr_body(); } - for (i = 0; i < chrsGetNumSlots(); i++) { + for (i = 0; i < chrs_get_num_slots(); i++) { if (g_ChrSlots[i].model && g_ChrSlots[i].prop && (g_ChrSlots[i].hidden & CHRHFLAG_BASICGUARD) && (g_ChrSlots[i].chrflags & CHRCFLAG_HIDDEN) == 0 && g_ChrSlots[i].prop->type == PROPTYPE_CHR - && !chrIsDead(&g_ChrSlots[i]) + && !chr_is_dead(&g_ChrSlots[i]) && (g_ChrSlots[i].prop->flags & PROPFLAG_ENABLED)) { if (g_Vars.bond->prop) { xdiff = g_ChrSlots[i].prop->pos.x - g_Vars.bond->prop->pos.x; @@ -1004,7 +1004,7 @@ void playerSpawn(void) if (g_Vars.lvframenum > 0 && (g_ChrSlots[i].hidden & CHRHFLAG_ONBONDSSCREEN) - && func0f06b39c(&sp78, &sp90, &g_ChrSlots[i].prop->pos, modelGetEffectiveScale(g_ChrSlots[i].model)) + && func0f06b39c(&sp78, &sp90, &g_ChrSlots[i].prop->pos, model_get_effective_scale(g_ChrSlots[i].model)) && (random() % 8)) { sqdist += 1000 * 1000; } @@ -1065,7 +1065,7 @@ void playerSpawn(void) // If no chrs can be spawned into, iterate the list again but this // time allowing the spawn to happen on-screen (force = true). for (i = 0; i < numsqdists; i++) { - if (playerSpawnAnti(sortedchrs[i], force)) { + if (player_spawn_anti(sortedchrs[i], force)) { break; } @@ -1085,26 +1085,26 @@ void playerSpawn(void) g_Vars.currentplayer->prop->chr->blurnumtimesdied = 0; } } else { - bgunEquipWeapon2(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]); - bgunEquipWeapon2(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]); + bgun_equip_weapon2(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]); + bgun_equip_weapon2(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]); #if VERSION >= VERSION_NTSC_1_0 if (g_Vars.currentplayer->model00d4 == NULL && (IS8MB() || g_Vars.fourmeg2player || g_MpAllChrPtrs[g_Vars.currentplayernum] == NULL)) { - playerTickChrBody(); + player_tick_chr_body(); } #else if (g_Vars.currentplayer->model00d4 == NULL) { - playerTickChrBody(); + player_tick_chr_body(); } #endif } } - playerUpdatePerimInfo(); + player_update_perim_info(); } -void playerResetBond(struct playerbond *pb, struct coord *pos) +void player_reset_bond(struct playerbond *pb, struct coord *pos) { pb->unk10.x = pos->x; pb->unk10.y = pos->y; @@ -1125,20 +1125,20 @@ void playerResetBond(struct playerbond *pb, struct coord *pos) pb->radius = 30; } -void playersTickAllChrBodies(void) +void players_tick_all_chr_bodies(void) { s32 prevplayernum = g_Vars.currentplayernum; s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); - playerTickChrBody(); + set_current_player_num(i); + player_tick_chr_body(); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } -void playerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2) +void player_choose_body_and_head(s32 *bodynum, s32 *headnum, s32 *arg2) { s32 outfit; bool solo; @@ -1153,30 +1153,30 @@ void playerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2) } if (g_Vars.normmplayerisrunning) { - if (g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.mpheadnum < mpGetNumHeads2()) { - *headnum = mpGetHeadId(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.mpheadnum); + if (g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.mpheadnum < mp_get_num_heads2()) { + *headnum = mp_get_head_id(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.mpheadnum); } else { - *headnum = g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.mpheadnum - mpGetNumHeads2(); + *headnum = g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.mpheadnum - mp_get_num_heads2(); if (arg2) { *arg2 = true; } } - *bodynum = mpGetBodyId(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.mpbodynum); + *bodynum = mp_get_body_id(g_PlayerConfigsArray[g_Vars.currentplayerstats->mpindex].base.mpbodynum); return; } outfit = g_Vars.currentplayer->bondtype; solo = !(g_Vars.coopplayernum >= 0) || (g_Vars.currentplayer != g_Vars.coop); - if (cheatIsActive(CHEAT_PLAYASELVIS)) { + if (cheat_is_active(CHEAT_PLAYASELVIS)) { *bodynum = BODY_THEKING; *headnum = HEAD_ELVIS; return; } - if (g_Vars.stagenum == STAGE_VILLA && lvGetDifficulty() >= DIFF_PA) { + if (g_Vars.stagenum == STAGE_VILLA && lv_get_difficulty() >= DIFF_PA) { outfit = OUTFIT_NEGOTIATOR; } @@ -1267,7 +1267,7 @@ void playerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2) * these structures are already allocated elsewhere in memory due to the two * players being able to see each other at any time. */ -void playerTickChrBody(void) +void player_tick_chr_body(void) { f32 turnangle = (360.0f - g_Vars.currentplayer->vv_theta) * M_BADTAU / 360.0f; @@ -1319,7 +1319,7 @@ void playerTickChrBody(void) }; s32 weaponmodelnum; - s32 weaponnum = bgunGetWeaponNum2(HAND_RIGHT); + s32 weaponnum = bgun_get_weapon_num2(HAND_RIGHT); s32 bodynum = BODY_DARK_COMBAT; s32 headnum = HEAD_DARK_COMBAT; bool sp60 = false; @@ -1328,13 +1328,13 @@ void playerTickChrBody(void) u32 stack3[2]; g_Vars.currentplayer->haschrbody = true; - playerChooseBodyAndHead(&bodynum, &headnum, &sp60); + player_choose_body_and_head(&bodynum, &headnum, &sp60); if (g_Vars.tickmode == TICKMODE_CUTSCENE) { weaponnum = g_DefaultWeapons[0]; } - weaponmodelnum = playermgrGetModelOfWeapon(weaponnum); + weaponmodelnum = playermgr_get_model_of_weapon(weaponnum); if (IS4MB()) { bodynum = BODY_DARK_COMBAT; @@ -1344,8 +1344,8 @@ void playerTickChrBody(void) if (!g_Vars.mplayerisrunning || (IS4MB() && PLAYERCOUNT() == 1)) { // 1 player if (g_Vars.currentplayer->gunmem2 == NULL) { - if (!var8009dfc0 && bgunChangeGunMem(GUNMEMOWNER_CHRBODY)) { - g_Vars.currentplayer->gunmem2 = bgunGetGunMem(); + if (!var8009dfc0 && bgun_change_gun_mem(GUNMEMOWNER_CHRBODY)) { + g_Vars.currentplayer->gunmem2 = bgun_get_gun_mem(); } else { if (var8009dfc0); @@ -1360,7 +1360,7 @@ void playerTickChrBody(void) offset1 = 0; var8007fc0c = 8; - osSyncPrintf("Gunmem: 0x%08x\n", bgunGetGunMem()); + osSyncPrintf("Gunmem: 0x%08x\n", bgun_get_gun_mem()); allocation = g_Vars.currentplayer->gunmem2; model = (struct model *)(allocation + offset1); @@ -1382,52 +1382,52 @@ void playerTickChrBody(void) offset1 += sizeof(struct weaponobj); offset1 = ALIGN64(offset1); - offset2 = offset1 + ALIGN64(fileGetInflatedSize(g_HeadsAndBodies[bodynum].filenum)); + offset2 = offset1 + ALIGN64(file_get_inflated_size(g_HeadsAndBodies[bodynum].filenum)); if (headnum >= 0) { - offset2 += ALIGN64(fileGetInflatedSize(g_HeadsAndBodies[headnum].filenum)); + offset2 += ALIGN64(file_get_inflated_size(g_HeadsAndBodies[headnum].filenum)); } if (weaponmodelnum >= 0) { - offset2 += ALIGN64(fileGetInflatedSize(g_ModelStates[weaponmodelnum].fileid)); + offset2 += ALIGN64(file_get_inflated_size(g_ModelStates[weaponmodelnum].fileid)); } offset2 += 0x4000; - bgunCalculateGunMemCapacity(); + bgun_calculate_gun_mem_capacity(); spe8 = g_Vars.currentplayer->gunmem2 + offset2; - texInitPool(&texpool, spe8, bgunCalculateGunMemCapacity() - offset2); - bodymodeldef = modeldefLoad(g_HeadsAndBodies[bodynum].filenum, allocation + offset1, offset2 - offset1, &texpool); - offset1 = ALIGN64(fileGetLoadedSize(g_HeadsAndBodies[bodynum].filenum) + offset1); + tex_init_pool(&texpool, spe8, bgun_calculate_gun_mem_capacity() - offset2); + bodymodeldef = modeldef_load(g_HeadsAndBodies[bodynum].filenum, allocation + offset1, offset2 - offset1, &texpool); + offset1 = ALIGN64(file_get_loaded_size(g_HeadsAndBodies[bodynum].filenum) + offset1); if (headnum >= 0) { - headmodeldef = modeldefLoad(g_HeadsAndBodies[headnum].filenum, allocation + offset1, offset2 - offset1, &texpool); - offset1 = ALIGN64(fileGetLoadedSize(g_HeadsAndBodies[headnum].filenum) + offset1); + headmodeldef = modeldef_load(g_HeadsAndBodies[headnum].filenum, allocation + offset1, offset2 - offset1, &texpool); + offset1 = ALIGN64(file_get_loaded_size(g_HeadsAndBodies[headnum].filenum) + offset1); } - modelAllocateRwData(bodymodeldef); + model_allocate_rw_data(bodymodeldef); if (headmodeldef != NULL) { - modelAllocateRwData(headmodeldef); + model_allocate_rw_data(headmodeldef); } - modelInit(model, bodymodeldef, rwdatas, false); - animInit(model->anim); + model_init(model, bodymodeldef, rwdatas, false); + anim_init(model->anim); model->rwdatalen = 256; - texGetPoolLeftPos(&texpool); + tex_get_pool_left_pos(&texpool); // @TODO: Figure out these arguments osSyncPrintf("Jo using %d bytes gunmem (gunmemsize %d)\n"); - osSyncPrintf("Gunmem: bondmeml 0x%08x size 0x%08x\n", bgunGetGunMem(), bgunCalculateGunMemCapacity()); + osSyncPrintf("Gunmem: bondmeml 0x%08x size 0x%08x\n", bgun_get_gun_mem(), bgun_calculate_gun_mem_capacity()); osSyncPrintf("Gunmem: tex block free 0x%08x\n"); osSyncPrintf("Gunmem: Free at end %d\n"); - texGetPoolLeftPos(&texpool); + tex_get_pool_left_pos(&texpool); } else { // 2-4 players if (g_HeadsAndBodies[bodynum].modeldef == NULL) { - g_HeadsAndBodies[bodynum].modeldef = modeldefLoadToNew(g_HeadsAndBodies[bodynum].filenum); + g_HeadsAndBodies[bodynum].modeldef = modeldef_load_to_new(g_HeadsAndBodies[bodynum].filenum); } bodymodeldef = g_HeadsAndBodies[bodynum].modeldef; @@ -1437,13 +1437,13 @@ void playerTickChrBody(void) } else if (sp60) { headmodeldef = func0f18e57c(headnum, &headnum); } else if (g_Vars.normmplayerisrunning && IS8MB()) { - g_HeadsAndBodies[headnum].modeldef = modeldefLoadToNew(g_HeadsAndBodies[headnum].filenum); + g_HeadsAndBodies[headnum].modeldef = modeldef_load_to_new(g_HeadsAndBodies[headnum].filenum); headmodeldef = g_HeadsAndBodies[headnum].modeldef; g_FileInfo[g_HeadsAndBodies[headnum].filenum].loadedsize = 0; - bodyCalculateHeadOffset(headmodeldef, headnum, bodynum); + body_calculate_head_offset(headmodeldef, headnum, bodynum); } else { if (g_HeadsAndBodies[headnum].modeldef == NULL) { - g_HeadsAndBodies[headnum].modeldef = modeldefLoadToNew(g_HeadsAndBodies[headnum].filenum); + g_HeadsAndBodies[headnum].modeldef = modeldef_load_to_new(g_HeadsAndBodies[headnum].filenum); } headmodeldef = g_HeadsAndBodies[headnum].modeldef; @@ -1464,12 +1464,12 @@ void playerTickChrBody(void) chr->chrflags |= CHRCFLAG_FORCETOGROUND; - modelSetRootPosition(g_Vars.currentplayer->model00d4, &g_Vars.currentplayer->prop->pos); - chrSetLookAngle(g_Vars.currentplayer->prop->chr, turnangle); + model_set_root_position(g_Vars.currentplayer->model00d4, &g_Vars.currentplayer->prop->pos); + chr_set_look_angle(g_Vars.currentplayer->prop->chr, turnangle); chr->headnum = headnum; chr->bodynum = bodynum; - chr->race = bodyGetRace(chr->bodynum); + chr->race = body_get_race(chr->bodynum); chr->radius = g_Vars.currentplayer->bond2.radius; g_Vars.currentplayer->vv_eyeheight = (s32)g_HeadsAndBodies[bodynum].height; @@ -1498,74 +1498,74 @@ void playerTickChrBody(void) if (weaponmodelnum >= 0) { if (g_Vars.mplayerisrunning == false) { - weaponmodeldef = modeldefLoad(g_ModelStates[weaponmodelnum].fileid, allocation + offset1, offset2 - offset1, &texpool); - fileGetLoadedSize(g_ModelStates[weaponmodelnum].fileid); - modelAllocateRwData(weaponmodeldef); + weaponmodeldef = modeldef_load(g_ModelStates[weaponmodelnum].fileid, allocation + offset1, offset2 - offset1, &texpool); + file_get_loaded_size(g_ModelStates[weaponmodelnum].fileid); + model_allocate_rw_data(weaponmodeldef); } else { weaponobj = NULL; weaponmodeldef = NULL; } - weaponCreateForChr(chr, weaponmodelnum, weaponnum, 0, weaponobj, weaponmodeldef); + weapon_create_for_chr(chr, weaponmodelnum, weaponnum, 0, weaponobj, weaponmodeldef); } - chr->fireslots[0] = bgunAllocateFireslot(); + chr->fireslots[0] = bgun_allocate_fireslot(); func0f02e9a0(chr, 0); - bmoveUpdateRooms(g_Vars.currentplayer); + bmove_update_rooms(g_Vars.currentplayer); } else { struct chrdata *chr = g_Vars.currentplayer->prop->chr; if (chr->model->anim == NULL) { chr->chrflags |= CHRCFLAG_FORCETOGROUND; func0f02e9a0(chr, 0); - modelSetRootPosition(g_Vars.currentplayer->model00d4, &g_Vars.currentplayer->prop->pos); - chrSetLookAngle(g_Vars.currentplayer->prop->chr, turnangle); - bmoveUpdateRooms(g_Vars.currentplayer); + model_set_root_position(g_Vars.currentplayer->model00d4, &g_Vars.currentplayer->prop->pos); + chr_set_look_angle(g_Vars.currentplayer->prop->chr, turnangle); + bmove_update_rooms(g_Vars.currentplayer); } } } -void playerRemoveChrBody(void) +void player_remove_chr_body(void) { if (g_Vars.currentplayer->haschrbody) { if (!g_Vars.mplayerisrunning || (IS4MB() && PLAYERCOUNT() == 1)) { g_Vars.currentplayer->haschrbody = false; - chrRemove(g_Vars.currentplayer->prop, false); + chr_remove(g_Vars.currentplayer->prop, false); g_Vars.currentplayer->model00d4 = NULL; - bmoveUpdateRooms(g_Vars.currentplayer); - bgunFreeGunMem(); + bmove_update_rooms(g_Vars.currentplayer); + bgun_free_gun_mem(); g_Vars.currentplayer->gunmem2 = NULL; } } } -void playerSetTickMode(s32 tickmode) +void player_set_tick_mode(s32 tickmode) { g_Vars.tickmode = tickmode; g_Vars.in_cutscene = false; } -void playerBeginGeFadeIn(void) +void player_begin_ge_fade_in(void) { - playerSetTickMode(TICKMODE_GE_FADEIN); + player_set_tick_mode(TICKMODE_GE_FADEIN); g_PlayerTriggerGeFadeIn = false; } -void playersBeginMpSwirl(void) +void players_begin_mp_swirl(void) { - playerSetTickMode(TICKMODE_MPSWIRL); + player_set_tick_mode(TICKMODE_MPSWIRL); g_PlayerTriggerGeFadeIn = false; - bmoveSetMode(MOVEMODE_WALK); + bmove_set_mode(MOVEMODE_WALK); g_MpSwirlRotateSpeed = 0; g_MpSwirlAngleDegrees = -90; g_MpSwirlForwardSpeed = 0; g_MpSwirlDistance = 80; - envChooseAndApply(mainGetStageNum(), false); + env_choose_and_apply(main_get_stage_num(), false); } -void playerTickMpSwirl(void) +void player_tick_mp_swirl(void) { f32 angle; struct coord pos = {0, 0, 0}; @@ -1573,7 +1573,7 @@ void playerTickMpSwirl(void) struct coord up = {0, 1, 0}; s32 i; - playerSetCameraMode(CAMERAMODE_THIRDPERSON); + player_set_camera_mode(CAMERAMODE_THIRDPERSON); // This function is called once for each player per frame, // but the swirl position should only be updated once per frame, @@ -1624,62 +1624,62 @@ void playerTickMpSwirl(void) look.y = g_Vars.currentplayer->bond2.unk10.y - pos.y; look.z = g_Vars.currentplayer->bond2.unk10.z - pos.z; - playerMoveCameraFromPosRooms(&pos, &up, &look, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms); + player_move_camera_from_pos_rooms(&pos, &up, &look, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms); if (g_MpSwirlDistance < 5.0f) { - playerEndCutscene(); + player_end_cutscene(); } } void player0f0b9a20(void) { - playerSetTickMode(TICKMODE_NORMAL); + player_set_tick_mode(TICKMODE_NORMAL); g_PlayerTriggerGeFadeIn = false; - bmoveSetMode(MOVEMODE_WALK); + bmove_set_mode(MOVEMODE_WALK); - if (mainGetStageNum() == STAGE_TEST_LEN) { - playerSetFadeColour(0, 0, 0, 1); - playerSetFadeFrac(0, 1); + if (main_get_stage_num() == STAGE_TEST_LEN) { + player_set_fade_colour(0, 0, 0, 1); + player_set_fade_frac(0, 1); } else if (var80070748 != 0) { - playerSetFadeColour(0, 0, 0, 1); - playerSetFadeFrac(60, 0); + player_set_fade_colour(0, 0, 0, 1); + player_set_fade_frac(60, 0); } - envChooseAndApply(mainGetStageNum(), false); - bgunEquipWeapon2(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]); - bgunEquipWeapon2(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]); + env_choose_and_apply(main_get_stage_num(), false); + bgun_equip_weapon2(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]); + bgun_equip_weapon2(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]); var8007074c = 0; } -void playerEndCutscene(void) +void player_end_cutscene(void) { if (g_IsTitleDemo) { - mainChangeToStage(STAGE_TITLE); + main_change_to_stage(STAGE_TITLE); } else if (g_Vars.autocutplaying) { g_Vars.autocutfinished = true; } else { - playerSetTickMode(TICKMODE_NORMAL); + player_set_tick_mode(TICKMODE_NORMAL); g_PlayerTriggerGeFadeIn = false; - bmoveSetModeForAllPlayers(MOVEMODE_WALK); + bmove_set_mode_for_all_players(MOVEMODE_WALK); } } -void playerPrepareMoveCameraToPad(s16 pad) +void player_prepare_move_camera_to_pad(s16 pad) { - playerSetTickMode(TICKMODE_WARP); + player_set_tick_mode(TICKMODE_WARP); g_PlayerTriggerGeFadeIn = false; - bmoveSetModeForAllPlayers(MOVEMODE_CUTSCENE); - playersClearMemCamRoom(); + bmove_set_mode_for_all_players(MOVEMODE_CUTSCENE); + players_clear_mem_cam_room(); g_MoveCameraPad = pad; } -void playerPrepareMoveCameraToPreset(struct camerapresetobj *preset, bool hasdir, s32 arg2) +void player_prepare_move_camera_to_preset(struct camerapresetobj *preset, bool hasdir, s32 arg2) { - playerSetTickMode(TICKMODE_WARP); + player_set_tick_mode(TICKMODE_WARP); g_PlayerTriggerGeFadeIn = false; - bmoveSetModeForAllPlayers(MOVEMODE_CUTSCENE); - playersClearMemCamRoom(); + bmove_set_mode_for_all_players(MOVEMODE_CUTSCENE); + players_clear_mem_cam_room(); g_MoveCameraPad = -1; @@ -1688,12 +1688,12 @@ void playerPrepareMoveCameraToPreset(struct camerapresetobj *preset, bool hasdir g_MoveCameraArg2 = arg2; } -void playerPrepareMoveCameraToPos(f32 posangle, f32 rotangle, f32 range, f32 height1, f32 height2, s32 padnum) +void player_prepare_move_camera_to_pos(f32 posangle, f32 rotangle, f32 range, f32 height1, f32 height2, s32 padnum) { - playerSetTickMode(TICKMODE_WARP); + player_set_tick_mode(TICKMODE_WARP); g_PlayerTriggerGeFadeIn = false; - bmoveSetModeForAllPlayers(MOVEMODE_CUTSCENE); - playersClearMemCamRoom(); + bmove_set_mode_for_all_players(MOVEMODE_CUTSCENE); + players_clear_mem_cam_room(); g_MoveCameraPad = -1; @@ -1707,7 +1707,7 @@ void playerPrepareMoveCameraToPos(f32 posangle, f32 rotangle, f32 range, f32 hei g_MoveCameraPosPad = padnum; } -void playerChangeCamera(void) +void player_change_camera(void) { struct pad pad; struct coord pos = {0, 0, 0}; @@ -1716,13 +1716,13 @@ void playerChangeCamera(void) s32 fromroom; struct coord frompos; - playerSetCameraMode(CAMERAMODE_THIRDPERSON); + player_set_camera_mode(CAMERAMODE_THIRDPERSON); if (g_MoveCameraPad >= 0) { // Move to an exact position with a static direction of 0, 0, 1. // Used by device and holo training to warp player back to room, // and Deep Sea teleports - padUnpack(g_MoveCameraPad, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(g_MoveCameraPad, PADFIELD_POS | PADFIELD_ROOM, &pad); frompos.x = pad.pos.x; frompos.y = pad.pos.y; @@ -1740,7 +1740,7 @@ void playerChangeCamera(void) pos.y = g_MoveCameraPreset->y; pos.z = g_MoveCameraPreset->z; - padUnpack(g_MoveCameraPreset->pad, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(g_MoveCameraPreset->pad, PADFIELD_POS | PADFIELD_ROOM, &pad); fromroom = pad.room; @@ -1759,7 +1759,7 @@ void playerChangeCamera(void) // Move to a location within a specified range and angle of the pad, // with options for the direction and height offset from the pad. // Used by AI command 00f4, but that command is not used. - padUnpack(g_MoveCameraPosPad, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(g_MoveCameraPosPad, PADFIELD_POS | PADFIELD_ROOM, &pad); fromroom = pad.room; @@ -1786,15 +1786,15 @@ void playerChangeCamera(void) } } - playerMoveCameraFromPosRoom(&pos, &up, &look, &frompos, fromroom); + player_move_camera_from_pos_room(&pos, &up, &look, &frompos, fromroom); } -void playerStartCutscene2(void) +void player_start_cutscene2(void) { - playerSetTickMode(TICKMODE_CUTSCENE); + player_set_tick_mode(TICKMODE_CUTSCENE); g_PlayerTriggerGeFadeIn = false; - bmoveSetModeForAllPlayers(MOVEMODE_CUTSCENE); - playersClearMemCamRoom(); + bmove_set_mode_for_all_players(MOVEMODE_CUTSCENE); + players_clear_mem_cam_room(); #if PAL g_CutsceneCurAnimFrame240 = var8009e388pf; @@ -1808,17 +1808,17 @@ void playerStartCutscene2(void) g_CutsceneTweenDuration60 = -1; g_InCutscene = 1; - paksStop(true); - g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_CUTSCENE && g_CutsceneCurAnimFrame60 < animGetNumFrames(g_CutsceneAnimNum) - 1; + paks_stop(true); + g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_CUTSCENE && g_CutsceneCurAnimFrame60 < anim_get_num_frames(g_CutsceneAnimNum) - 1; g_Vars.cutsceneskip60ths = 0; } -void playerStartCutscene(s16 animnum) +void player_start_cutscene(s16 animnum) { if ((!g_IsTitleDemo && !g_Vars.autocutplaying) || !g_Vars.in_cutscene || !g_CutsceneSkipRequested) { - joyDisableTemporarily(); + joy_disable_temporarily(); if (g_Vars.tickmode != TICKMODE_CUTSCENE) { g_CutsceneSkipRequested = false; @@ -1826,18 +1826,18 @@ void playerStartCutscene(s16 animnum) } if (g_Vars.tickmode != TICKMODE_CUTSCENE) { - playersTickAllChrBodies(); + players_tick_all_chr_bodies(); } g_CutsceneAnimNum = animnum; if (g_Vars.currentplayer->haschrbody) { - playerStartCutscene2(); + player_start_cutscene2(); } } } -void playerReorientForCutsceneStop(s32 tweenduration60) +void player_reorient_for_cutscene_stop(s32 tweenduration60) { struct coord rot; struct coord translate; @@ -1849,21 +1849,21 @@ void playerReorientForCutsceneStop(s32 tweenduration60) u32 stack; g_CutsceneTweenDuration60 = tweenduration60; - lastframe = animGetNumFrames(g_CutsceneAnimNum) - 1; - animLoadHeader(g_CutsceneAnimNum); - frameslot = animLoadFrame(g_CutsceneAnimNum, lastframe); - animForgetFrameBirths(); - animGetRotTranslateScale(0, 0, &g_Skel20, g_CutsceneAnimNum, frameslot, &rot, &translate, &scale); - mtx4LoadRotation(&rot, &rotmtx); + lastframe = anim_get_num_frames(g_CutsceneAnimNum) - 1; + anim_load_header(g_CutsceneAnimNum); + frameslot = anim_load_frame(g_CutsceneAnimNum, lastframe); + anim_forget_frame_births(); + anim_get_rot_translate_scale(0, 0, &g_Skel20, g_CutsceneAnimNum, frameslot, &rot, &translate, &scale); + mtx4_load_rotation(&rot, &rotmtx); theta = atan2f(-rotmtx.m[2][0], -rotmtx.m[2][2]); theta = (M_BADTAU - theta) * 57.304901123047f; g_Vars.bond->vv_theta = theta; - chrSetLookAngle(g_Vars.bond->prop->chr, (360 - theta) * 0.017450513318181f); + chr_set_look_angle(g_Vars.bond->prop->chr, (360 - theta) * 0.017450513318181f); } -void playerTickCutscene(bool arg0) +void player_tick_cutscene(bool arg0) { struct coord pos; struct coord up; @@ -1873,10 +1873,10 @@ void playerTickCutscene(bool arg0) struct coord scale; u8 frameslot; Mtxf rotmtx; - f32 translatescale = bgGetStageTranslationThing(); + f32 translatescale = bg_get_stage_translation_thing(); f32 fovy; s32 endframe; - s8 contpadnum = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); + s8 contpadnum = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); u16 buttons; #if PAL u8 stack3[0x2c]; @@ -1890,14 +1890,14 @@ void playerTickCutscene(bool arg0) f32 sp54[4]; if (arg0) { - buttons = joyGetButtons(contpadnum, 0xffff); + buttons = joy_get_buttons(contpadnum, 0xffff); } else { buttons = 0; } - animLoadHeader(g_CutsceneAnimNum); + anim_load_header(g_CutsceneAnimNum); - endframe = animGetNumFrames(g_CutsceneAnimNum) - 1; + endframe = anim_get_num_frames(g_CutsceneAnimNum) - 1; if (g_Vars.currentplayerindex == 0) { g_Vars.cutsceneskip60ths = 0; @@ -1913,7 +1913,7 @@ void playerTickCutscene(bool arg0) if (g_Anims[g_CutsceneAnimNum].flags & ANIMFLAG_HASCUTSKIPFRAMES) { while (g_CutsceneCurAnimFrame60 < endframe - && animIsFrameCutSkipped(g_CutsceneAnimNum, g_CutsceneCurAnimFrame60)) { + && anim_is_frame_cut_skipped(g_CutsceneAnimNum, g_CutsceneCurAnimFrame60)) { #if PAL g_CutsceneCurAnimFrame240 += 1.2f; g_CutsceneCurAnimFrame60 = floorf(g_CutsceneCurAnimFrame240 + 0.01f); @@ -1941,15 +1941,15 @@ void playerTickCutscene(bool arg0) } g_Vars.in_cutscene = (g_Vars.tickmode == TICKMODE_CUTSCENE && g_CutsceneCurAnimFrame60 < endframe); - frameslot = animLoadFrame(g_CutsceneAnimNum, g_CutsceneCurAnimFrame60); - animForgetFrameBirths(); - animGetRotTranslateScale(0, 0, &g_Skel20, g_CutsceneAnimNum, frameslot, &rot, &translate, &scale); + frameslot = anim_load_frame(g_CutsceneAnimNum, g_CutsceneCurAnimFrame60); + anim_forget_frame_births(); + anim_get_rot_translate_scale(0, 0, &g_Skel20, g_CutsceneAnimNum, frameslot, &rot, &translate, &scale); pos.x = translate.x * translatescale; pos.y = translate.y * translatescale; pos.z = translate.z * translatescale; - mtx4LoadRotation(&rot, &rotmtx); + mtx4_load_rotation(&rot, &rotmtx); up.x = rotmtx.m[1][0]; up.y = rotmtx.m[1][1]; @@ -1959,8 +1959,8 @@ void playerTickCutscene(bool arg0) look.y = -rotmtx.m[2][1]; look.z = -rotmtx.m[2][2]; - fovy = animGetCameraValue(1, g_CutsceneAnimNum, frameslot); - g_CutsceneBlurFrac = animGetCameraValue(2, g_CutsceneAnimNum, frameslot); + fovy = anim_get_camera_value(1, g_CutsceneAnimNum, frameslot); + g_CutsceneBlurFrac = anim_get_camera_value(2, g_CutsceneAnimNum, frameslot); g_CutsceneTweenFrac = 0; if (g_CutsceneTweenDuration60 > 0 && endframe - g_CutsceneCurAnimFrame60 <= g_CutsceneTweenDuration60) { @@ -1971,7 +1971,7 @@ void playerTickCutscene(bool arg0) g_CutsceneTweenFrac = tweenfrac; sp104 = 1 - cosf(RAD(90, 1.5705462694168f) * tweenfrac); - bmoveSetMode(MOVEMODE_WALK); + bmove_set_mode(MOVEMODE_WALK); pos.x += sp104 * (g_Vars.bond->bond2.unk10.x - pos.x); pos.y += sp104 * (g_Vars.bond->bond2.unk10.y - pos.y); @@ -1984,8 +1984,8 @@ void playerTickCutscene(bool arg0) quaternion0f097044(&spc4, sp74); quaternion0f097044(&sp84, sp64); quaternion0f0976c0(sp64, sp74); - quaternionSlerp(sp74, sp64, sp104, sp54); - quaternionToMtx(sp54, &rotmtx); + quaternion_slerp(sp74, sp64, sp104, sp54); + quaternion_to_mtx(sp54, &rotmtx); up.x = rotmtx.m[1][0]; up.y = rotmtx.m[1][1]; @@ -1999,10 +1999,10 @@ void playerTickCutscene(bool arg0) fovy += tweenfrac * (60 - fovy); } - playerSetCameraMode(CAMERAMODE_THIRDPERSON); - playerMoveCamera(&pos, &up, &look); - playermgrSetFovY(fovy); - viSetFovY(fovy); + player_set_camera_mode(CAMERAMODE_THIRDPERSON); + player_move_camera(&pos, &up, &look); + playermgr_set_fov_y(fovy); + vi_set_fov_y(fovy); if (g_Vars.currentplayerindex == 0) { g_CutsceneCurTotalFrame60f += g_Vars.lvupdate60freal; @@ -2033,12 +2033,12 @@ void playerTickCutscene(bool arg0) #endif } -f32 playerGetCutsceneBlurFrac(void) +f32 player_get_cutscene_blur_frac(void) { return g_CutsceneBlurFrac; } -void playerSetZoomFovY(f32 fovy, f32 timemax) +void player_set_zoom_fov_y(f32 fovy, f32 timemax) { g_Vars.currentplayer->zoomintime = 0; g_Vars.currentplayer->zoomintimemax = timemax; @@ -2046,7 +2046,7 @@ void playerSetZoomFovY(f32 fovy, f32 timemax) g_Vars.currentplayer->zoominfovynew = fovy; } -f32 playerGetZoomFovY(void) +f32 player_get_zoom_fov_y(void) { if (g_Vars.currentplayer->zoomintimemax > g_Vars.currentplayer->zoomintime) { return g_Vars.currentplayer->zoominfovynew; @@ -2055,18 +2055,18 @@ f32 playerGetZoomFovY(void) return g_Vars.currentplayer->zoominfovy; } -void playerTweenFovY(f32 targetfovy) +void player_tween_fov_y(f32 targetfovy) { - if (playerGetZoomFovY() != targetfovy) { + if (player_get_zoom_fov_y() != targetfovy) { if (g_Vars.currentplayer->zoominfovy > targetfovy) { - playerSetZoomFovY(targetfovy, (g_Vars.currentplayer->zoominfovy - targetfovy) * 15.0f / 30.0f); + player_set_zoom_fov_y(targetfovy, (g_Vars.currentplayer->zoominfovy - targetfovy) * 15.0f / 30.0f); } else { - playerSetZoomFovY(targetfovy, (targetfovy - g_Vars.currentplayer->zoominfovy) * 15.0f / 30.0f); + player_set_zoom_fov_y(targetfovy, (targetfovy - g_Vars.currentplayer->zoominfovy) * 15.0f / 30.0f); } } } -f32 playerGetTeleportFovY(void) +f32 player_get_teleport_fov_y(void) { f32 time; u32 fovyoffset; @@ -2088,7 +2088,7 @@ f32 playerGetTeleportFovY(void) return fovyoffset + 60.0f; } -void playerUpdateZoom(void) +void player_update_zoom(void) { f32 scale; f32 fovy; @@ -2110,13 +2110,13 @@ void playerUpdateZoom(void) g_Vars.currentplayer->zoominfovy = g_Vars.currentplayer->zoominfovynew; } - playermgrSetFovY(g_Vars.currentplayer->zoominfovy); - viSetFovY(g_Vars.currentplayer->zoominfovy); + playermgr_set_fov_y(g_Vars.currentplayer->zoominfovy); + vi_set_fov_y(g_Vars.currentplayer->zoominfovy); if (g_Vars.currentplayer->teleportstate != TELEPORTSTATE_INACTIVE) { - fovy = playerGetTeleportFovY(); - playermgrSetFovY(fovy); - viSetFovY(fovy); + fovy = player_get_teleport_fov_y(); + playermgr_set_fov_y(fovy); + vi_set_fov_y(fovy); } if (g_Vars.currentplayer->zoominfovy >= 15) { @@ -2131,17 +2131,17 @@ void playerUpdateZoom(void) scale = 0.1; } - stage = stageGetCurrent(); - bgSetScaleBg2Gfx((1 - (1 - stage->unk34) * (1 - scale) * (10.f / 9.0f)) * scale); + stage = stage_get_current(); + bg_set_scale_bg2gfx((1 - (1 - stage->unk34) * (1 - scale) * (10.f / 9.0f)) * scale); } -void playerStopAudioForPause(void) +void player_stop_audio_for_pause(void) { struct hand *hand; s32 i; - alarmStopAudio(); - gasStopAudio(); + alarm_stop_audio(); + gas_stop_audio(); for (i = 0; i < 2; i++) { hand = &g_Vars.currentplayer->hands[i]; @@ -2155,7 +2155,7 @@ void playerStopAudioForPause(void) u32 var8007083c = 0; u32 g_GlobalMenuRoot = 0; -void playerTickPauseMenu(void) +void player_tick_pause_menu(void) { bool opened = false; @@ -2167,10 +2167,10 @@ void playerTickPauseMenu(void) switch (g_GlobalMenuRoot) { case MENUROOT_TRAINING: case MENUROOT_MAINMENU: - opened = soloChoosePauseDialog(); + opened = solo_choose_pause_dialog(); break; case MENUROOT_FILEMGR: - opened = filemgrConsiderPushingFileSelectDialog(); + opened = filemgr_consider_pushing_file_select_dialog(); break; case MENUROOT_4MBMAINMENU: case MENUROOT_MPSETUP: @@ -2179,8 +2179,8 @@ void playerTickPauseMenu(void) } if (opened) { - struct trainingdata *data = dtGetData(); - lvSetPaused(true); + struct trainingdata *data = dt_get_data(); + lv_set_paused(true); g_Vars.currentplayer->pausemode = PAUSEMODE_PAUSED; if ((g_GlobalMenuRoot == MENUROOT_MAINMENU || g_GlobalMenuRoot == MENUROOT_TRAINING) @@ -2195,7 +2195,7 @@ void playerTickPauseMenu(void) } } - musicStartMenu(); + music_start_menu(); } break; case PAUSEMODE_PAUSED: @@ -2206,15 +2206,15 @@ void playerTickPauseMenu(void) g_Vars.currentplayer->pausetime60 += g_Vars.diffframe60; if (g_Vars.currentplayer->pausetime60 >= 20) { - lvSetPaused(false); + lv_set_paused(false); g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED; - musicEndMenu(); + music_end_menu(); } break; } } -void playerPause(s32 root) +void player_pause(s32 root) { g_GlobalMenuRoot = root; @@ -2223,11 +2223,11 @@ void playerPause(s32 root) } } -void playerUnpause(void) +void player_unpause(void) { if (g_Vars.currentplayer->pausemode == PAUSEMODE_PAUSED) { - lvSetPaused(false); - musicEndMenu(); + lv_set_paused(false); + music_end_menu(); g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED; } } @@ -2235,7 +2235,7 @@ void playerUnpause(void) Gfx *player0f0baf84(Gfx *gdl) { if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) { - Mtx *a = gfxAllocateMatrix(); + Mtx *a = gfx_allocate_matrix(); u16 b; guPerspective(a, &b, g_Vars.currentplayer->zoominfovy, @@ -2248,7 +2248,7 @@ Gfx *player0f0baf84(Gfx *gdl) return gdl; } -Gfx *playerDrawFade(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac) +Gfx *player_draw_fade(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac) { if (frac > 0) { gDPPipeSync(gdl++); @@ -2263,8 +2263,8 @@ Gfx *playerDrawFade(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac) gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2); gDPSetCombineMode(gdl++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); gDPSetPrimColor(gdl++, 0, 0, r, g, b, (s32)(frac * 255)); - gDPFillRectangle(gdl++, viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), viGetViewTop() + viGetViewHeight()); + gDPFillRectangle(gdl++, vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), vi_get_view_top() + vi_get_view_height()); gDPPipeSync(gdl++); gDPSetColorDither(gdl++, G_CD_BAYER); gDPSetTexturePersp(gdl++, G_TP_PERSP); @@ -2274,16 +2274,16 @@ Gfx *playerDrawFade(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac) return gdl; } -Gfx *playerDrawStoredFade(Gfx *gdl) +Gfx *player_draw_stored_fade(Gfx *gdl) { - return playerDrawFade(gdl, + return player_draw_fade(gdl, g_Vars.currentplayer->colourscreenred, g_Vars.currentplayer->colourscreengreen, g_Vars.currentplayer->colourscreenblue, g_Vars.currentplayer->colourscreenfrac); } -void playerSetFadeColour(s32 r, s32 g, s32 b, f32 frac) +void player_set_fade_colour(s32 r, s32 g, s32 b, f32 frac) { g_Vars.currentplayer->colourscreenred = r; g_Vars.currentplayer->colourscreengreen = g; @@ -2291,7 +2291,7 @@ void playerSetFadeColour(s32 r, s32 g, s32 b, f32 frac) g_Vars.currentplayer->colourscreenfrac = frac; } -void playerAdjustFade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac) +void player_adjust_fade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac) { g_Vars.currentplayer->colourfadetime60 = 0; g_Vars.currentplayer->colourfadetimemax60 = maxfadetime; @@ -2305,21 +2305,21 @@ void playerAdjustFade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac) g_Vars.currentplayer->colourfadefracnew = frac; } -void playerSetFadeFrac(f32 maxfadetime, f32 frac) +void player_set_fade_frac(f32 maxfadetime, f32 frac) { - playerAdjustFade(maxfadetime, + player_adjust_fade(maxfadetime, g_Vars.currentplayer->colourscreenred, g_Vars.currentplayer->colourscreengreen, g_Vars.currentplayer->colourscreenblue, frac); } -bool playerIsFadeComplete(void) +bool player_is_fade_complete(void) { return g_Vars.currentplayer->colourfadetimemax60 < 0; } -void playerUpdateColourScreenProperties(void) +void player_update_colour_screen_properties(void) { if (g_Vars.currentplayer->colourfadetimemax60 >= 0) { g_Vars.currentplayer->colourfadetime60 += g_Vars.lvupdate60freal; @@ -2341,7 +2341,7 @@ void playerUpdateColourScreenProperties(void) } } -void playerStartChrFade(f32 duration60, f32 targetfrac) +void player_start_chr_fade(f32 duration60, f32 targetfrac) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; @@ -2353,7 +2353,7 @@ void playerStartChrFade(f32 duration60, f32 targetfrac) } } -void playerTickChrFade(void) +void player_tick_chr_fade(void) { if (g_Vars.currentplayer->bondfadetimemax60 >= 0) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; @@ -2417,12 +2417,12 @@ struct healthdamagetype g_HealthDamageTypes[] = { * Make the health bar appear. If called while the health bar is already open, * the health displayed will be updated and the show timer will be reset. */ -void playerDisplayHealth(void) +void player_display_health(void) { switch (g_Vars.currentplayer->healthshowmode) { case HEALTHSHOWMODE_HIDDEN: g_Vars.currentplayer->oldhealth = g_Vars.currentplayer->bondhealth; - g_Vars.currentplayer->oldarmour = playerGetShieldFrac(); + g_Vars.currentplayer->oldarmour = player_get_shield_frac(); break; case HEALTHSHOWMODE_OPENING: case HEALTHSHOWMODE_PREVIOUS: @@ -2434,7 +2434,7 @@ void playerDisplayHealth(void) break; case HEALTHSHOWMODE_CLOSING: g_Vars.currentplayer->oldhealth = g_Vars.currentplayer->bondhealth; - g_Vars.currentplayer->oldarmour = playerGetShieldFrac(); + g_Vars.currentplayer->oldarmour = player_get_shield_frac(); break; } @@ -2452,7 +2452,7 @@ void playerDisplayHealth(void) g_Vars.currentplayer->healthshowmode = HEALTHSHOWMODE_UPDATING; break; case HEALTHSHOWMODE_CLOSING: - g_Vars.currentplayer->healthshowtime = g_HealthDamageTypes[g_Vars.currentplayer->healthdamagetype].openendframe * playerGetHealthBarHeightFrac(); + g_Vars.currentplayer->healthshowtime = g_HealthDamageTypes[g_Vars.currentplayer->healthdamagetype].openendframe * player_get_health_bar_height_frac(); g_Vars.currentplayer->healthshowmode = HEALTHSHOWMODE_OPENING; break; } @@ -2461,7 +2461,7 @@ void playerDisplayHealth(void) /** * Update properties relating to the damage flash and health bar updating. */ -void playerTickDamageAndHealth(void) +void player_tick_damage_and_health(void) { /** * Handle flash of red when the player is damaged. @@ -2477,8 +2477,8 @@ void playerTickDamageAndHealth(void) if (g_Vars.currentplayer->damageshowtime >= 0.0f) { if (g_Vars.currentplayer->damageshowtime == 0) { // This is the first frame of damage - bgunSetSightVisible(GUNSIGHTREASON_DAMAGE, false); - g_Vars.currentplayer->damagetype = (s32)(playerGetHealthFrac() * 8.0f); + bgun_set_sight_visible(GUNSIGHTREASON_DAMAGE, false); + g_Vars.currentplayer->damagetype = (s32)(player_get_health_frac() * 8.0f); if (g_Vars.currentplayer->damagetype > DAMAGETYPE_7) { g_Vars.currentplayer->damagetype = DAMAGETYPE_7; @@ -2518,17 +2518,17 @@ void playerTickDamageAndHealth(void) alpha = g_DamageTypes[g_Vars.currentplayer->damagetype].maxalpha * (totalframes - flashdoneframes) / (totalframes - flashfullframe); } - playerSetFadeColour( + player_set_fade_colour( g_DamageTypes[g_Vars.currentplayer->damagetype].red, g_DamageTypes[g_Vars.currentplayer->damagetype].green, g_DamageTypes[g_Vars.currentplayer->damagetype].blue, alpha); } } else { g_Vars.currentplayer->damageshowtime = -1; - playerSetFadeColour(0xff, 0xff, 0xff, 0); + player_set_fade_colour(0xff, 0xff, 0xff, 0); if (!g_Vars.currentplayer->isdead) { - bgunSetSightVisible(GUNSIGHTREASON_DAMAGE, true); + bgun_set_sight_visible(GUNSIGHTREASON_DAMAGE, true); } } } @@ -2539,9 +2539,9 @@ void playerTickDamageAndHealth(void) * This works similarly to the damage code above, in that the health bar is * split into 8 parts and the current part is used to look up settings. */ - if (playerIsHealthVisible()) { + if (player_is_health_visible()) { if (g_Vars.currentplayer->healthshowmode == HEALTHSHOWMODE_OPENING) { - g_Vars.currentplayer->healthdamagetype = (s32)((playerGetHealthFrac() + playerGetShieldFrac()) * 8.0f); + g_Vars.currentplayer->healthdamagetype = (s32)((player_get_health_frac() + player_get_shield_frac()) * 8.0f); if (g_Vars.currentplayer->healthdamagetype > DAMAGETYPE_7) { g_Vars.currentplayer->healthdamagetype = DAMAGETYPE_7; @@ -2574,7 +2574,7 @@ void playerTickDamageAndHealth(void) g_Vars.currentplayer->apparentarmour = g_Vars.currentplayer->oldarmour; g_Vars.currentplayer->healthshowtime += g_Vars.diffframe60freal; - if (currentPlayerIsMenuOpenInSoloOrMp()) { + if (current_player_is_menu_open_in_solo_or_mp()) { g_Vars.currentplayer->healthshowmode = HEALTHSHOWMODE_CURRENT; } @@ -2597,12 +2597,12 @@ void playerTickDamageAndHealth(void) frac = 1; } - if (currentPlayerIsMenuOpenInSoloOrMp()) { + if (current_player_is_menu_open_in_solo_or_mp()) { g_Vars.currentplayer->healthshowmode = HEALTHSHOWMODE_CURRENT; } healthdiff = g_Vars.currentplayer->oldhealth - g_Vars.currentplayer->bondhealth; - armourdiff = g_Vars.currentplayer->oldarmour - playerGetShieldFrac(); + armourdiff = g_Vars.currentplayer->oldarmour - player_get_shield_frac(); g_Vars.currentplayer->apparenthealth = g_Vars.currentplayer->oldhealth - frac * healthdiff; g_Vars.currentplayer->apparentarmour = g_Vars.currentplayer->oldarmour - frac * armourdiff; @@ -2613,15 +2613,15 @@ void playerTickDamageAndHealth(void) break; case HEALTHSHOWMODE_CURRENT: g_Vars.currentplayer->apparenthealth = g_Vars.currentplayer->bondhealth; - g_Vars.currentplayer->apparentarmour = playerGetShieldFrac(); + g_Vars.currentplayer->apparentarmour = player_get_shield_frac(); g_Vars.currentplayer->healthshowtime += g_Vars.diffframe60freal; - if (currentPlayerIsMenuOpenInSoloOrMp()) { + if (current_player_is_menu_open_in_solo_or_mp()) { g_Vars.currentplayer->healthshowtime = g_HealthDamageTypes[g_Vars.currentplayer->healthdamagetype].closestartframe; } if (g_Vars.currentplayer->healthshowtime >= g_HealthDamageTypes[g_Vars.currentplayer->healthdamagetype].closestartframe - && !currentPlayerIsMenuOpenInSoloOrMp()) { + && !current_player_is_menu_open_in_solo_or_mp()) { g_Vars.currentplayer->healthshowmode = HEALTHSHOWMODE_CLOSING; g_Vars.currentplayer->healthshowtime = g_HealthDamageTypes[g_Vars.currentplayer->healthdamagetype].closestartframe; } @@ -2642,7 +2642,7 @@ void playerTickDamageAndHealth(void) } } -bool playerIsDamageVisible(void) +bool player_is_damage_visible(void) { return g_Vars.currentplayer->damageshowtime >= 0; } @@ -2653,7 +2653,7 @@ bool playerIsDamageVisible(void) * May be called while the red flash is already happening, which may result in * the fade being reset to the full alpha point. */ -void playerDisplayDamage(void) +void player_display_damage(void) { /** * @bug: This should be using damagetype (not healthdamagetype) as the array @@ -2670,13 +2670,13 @@ void playerDisplayDamage(void) } } -Gfx *playerRenderHealthBar(Gfx *gdl) +Gfx *player_render_health_bar(Gfx *gdl) { Mtxf matrix; - Mtxf *addr = gfxAllocateMatrix(); + Mtxf *addr = gfx_allocate_matrix(); mtx00016ae4(&matrix, 0, 370, 0, 0, 0, 0, 0, 0, -1); - mtxF2L(&matrix, addr); + mtx_f2l(&matrix, addr); gSPMatrix(gdl++, osVirtualToPhysical((void *)addr), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPPipeSync(gdl++); @@ -2687,21 +2687,21 @@ Gfx *playerRenderHealthBar(Gfx *gdl) gDPSetPrimColorViaWord(gdl++, 0, 0, 0xe6e6e600); gSPClearGeometryMode(gdl++, G_CULL_BOTH); - gdl = healthbarDraw(gdl, NULL, 0, 0); + gdl = healthbar_draw(gdl, NULL, 0, 0); - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); return gdl; } -void playerSurroundWithExplosions(s32 arg0) +void player_surround_with_explosions(s32 arg0) { g_Vars.currentplayer->bondexploding = true; g_Vars.currentplayer->bondnextexplode = arg0 + g_Vars.lvframe60; g_Vars.currentplayer->bondcurexplode = 0; } -void playerTickExplode(void) +void player_tick_explode(void) { g_Vars.currentplayer->bondcurexplode++; @@ -2722,13 +2722,13 @@ void playerTickExplode(void) pos.y += 200.0f * RANDOMFRAC() - 100.0f; - explosionCreateSimple(NULL, &pos, g_Vars.currentplayer->prop->rooms, EXPLOSIONTYPE_BONDEXPLODE, g_Vars.currentplayernum); + explosion_create_simple(NULL, &pos, g_Vars.currentplayer->prop->rooms, EXPLOSIONTYPE_BONDEXPLODE, g_Vars.currentplayernum); g_Vars.currentplayer->bondnextexplode = g_Vars.lvframe60 + TICKS(15) + (random() % TICKS(15)); } } -void playerResetLoResIf4Mb(void) +void player_reset_lo_res_if_4mb(void) { if (IS4MB()) { #if VERSION >= VERSION_PAL_BETA @@ -2752,18 +2752,18 @@ void playerResetLoResIf4Mb(void) } } -void playerSetHiResEnabled(bool enable) +void player_set_hi_res_enabled(bool enable) { g_HiResEnabled = enable; } -s16 playerGetFbWidth(void) +s16 player_get_fb_width(void) { s16 width = g_ViModes[g_ViRes].fbwidth; return width; } -s16 playerGetFbHeight(void) +s16 player_get_fb_height(void) { s16 height = g_ViModes[g_ViRes].fbheight; @@ -2775,26 +2775,26 @@ s16 playerGetFbHeight(void) } #if VERSION >= VERSION_NTSC_1_0 -bool playerHasSharedViewport(void) +bool player_has_shared_viewport(void) { if ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) - && menuGetRoot() == MENUROOT_MPENDSCREEN + && menu_get_root() == MENUROOT_MPENDSCREEN && var8009dfc0 == 0) { return true; } - return (g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE; + return (g_InCutscene && !g_MainIsEndscreen) || menu_get_root() == MENUROOT_COOPCONTINUE; } #endif -s16 playerGetViewportWidth(void) +s16 player_get_viewport_width(void) { s16 width; #if VERSION >= VERSION_NTSC_1_0 - if (!playerHasSharedViewport()) + if (!player_has_shared_viewport()) #else - if ((!g_InCutscene || g_MainIsEndscreen) && menuGetRoot() != MENUROOT_COOPCONTINUE) + if ((!g_InCutscene || g_MainIsEndscreen) && menu_get_root() != MENUROOT_COOPCONTINUE) #endif { if (PLAYERCOUNT() >= 3) { @@ -2805,7 +2805,7 @@ s16 playerGetViewportWidth(void) width--; } } else if (PLAYERCOUNT() == 2) { - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player) { + if (options_get_screen_split() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player) { // 2 players vsplit width = g_ViModes[g_ViRes].width / 2; @@ -2828,12 +2828,12 @@ s16 playerGetViewportWidth(void) return width; } -s16 playerGetViewportLeft(void) +s16 player_get_viewport_left(void) { #if VERSION >= VERSION_NTSC_1_0 - s32 something = !playerHasSharedViewport(); + s32 something = !player_has_shared_viewport(); #else - s32 something = !((g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE); + s32 something = !((g_InCutscene && !g_MainIsEndscreen) || menu_get_root() == MENUROOT_COOPCONTINUE); #endif s16 left; @@ -2846,7 +2846,7 @@ s16 playerGetViewportLeft(void) left = g_ViModes[g_ViRes].fbwidth - g_ViModes[g_ViRes].width; } } else if (PLAYERCOUNT() == 2 && something != 0) { - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player) { + if (options_get_screen_split() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player) { if (g_Vars.currentplayernum == 1) { // 2 players vsplit - right side left = (g_ViModes[g_ViRes].width / 2) + g_ViModes[g_ViRes].fbwidth - g_ViModes[g_ViRes].width; @@ -2866,15 +2866,15 @@ s16 playerGetViewportLeft(void) return left; } -s16 playerGetViewportHeight(void) +s16 player_get_viewport_height(void) { s16 height; if (PLAYERCOUNT() >= 2 #if VERSION >= VERSION_NTSC_1_0 - && !playerHasSharedViewport() + && !player_has_shared_viewport() #else - && !((g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE) + && !((g_InCutscene && !g_MainIsEndscreen) || menu_get_root() == MENUROOT_COOPCONTINUE) #endif ) { s16 tmp = g_ViModes[g_ViRes].fullheight; @@ -2886,7 +2886,7 @@ s16 playerGetViewportHeight(void) } if (PLAYERCOUNT() == 2) { - if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { + if (options_get_screen_split() == SCREENSPLIT_VERTICAL) { height = tmp; } else if (g_Vars.currentplayernum == 0 && IS8MB()) { height--; @@ -2895,9 +2895,9 @@ s16 playerGetViewportHeight(void) height--; } } else { - if (optionsGetEffectiveScreenSize() == SCREENSIZE_WIDE) { + if (options_get_effective_screen_size() == SCREENSIZE_WIDE) { height = g_ViModes[g_ViRes].wideheight; - } else if (optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA) { + } else if (options_get_effective_screen_size() == SCREENSIZE_CINEMA) { height = g_ViModes[g_ViRes].cinemaheight; } else if (g_InCutscene && !var8009dfc0) { if (g_CutsceneTweenDuration60 >= 1) { @@ -2917,29 +2917,29 @@ s16 playerGetViewportHeight(void) return height; } -s16 playerGetViewportTop(void) +s16 player_get_viewport_top(void) { s16 top; if (PLAYERCOUNT() >= 2 #if VERSION >= VERSION_NTSC_1_0 - && !playerHasSharedViewport() + && !player_has_shared_viewport() #else && (!g_InCutscene || g_MainIsEndscreen) - && menuGetRoot() != MENUROOT_COOPCONTINUE + && menu_get_root() != MENUROOT_COOPCONTINUE #endif ) { top = g_ViModes[g_ViRes].fulltop; #if VERSION >= VERSION_NTSC_1_0 - if (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL || PLAYERCOUNT() != 2) + if (options_get_screen_split() != SCREENSPLIT_VERTICAL || PLAYERCOUNT() != 2) #else - if (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL) + if (options_get_screen_split() != SCREENSPLIT_VERTICAL) #endif { if (PLAYERCOUNT() == 2 && g_Vars.currentplayernum == 1 - && optionsGetScreenSplit() != SCREENSPLIT_VERTICAL + && options_get_screen_split() != SCREENSPLIT_VERTICAL && !g_Vars.fourmeg2player) { // 2 players hsplit - bottom side top = g_ViModes[g_ViRes].fulltop + g_ViModes[g_ViRes].fullheight / 2; @@ -2949,8 +2949,8 @@ s16 playerGetViewportTop(void) } } } else { - if (optionsGetEffectiveScreenSize() == SCREENSIZE_WIDE) { - if (g_InCutscene && optionsGetCutsceneSubtitles() && g_Vars.stagenum != STAGE_CITRAINING) { + if (options_get_effective_screen_size() == SCREENSIZE_WIDE) { + if (g_InCutscene && options_get_cutscene_subtitles() && g_Vars.stagenum != STAGE_CITRAINING) { if (g_CutsceneTweenDuration60 >= 1) { f32 a = g_ViModes[g_ViRes].fulltop; f32 b = g_ViModes[g_ViRes].widetop; @@ -2963,11 +2963,11 @@ s16 playerGetViewportTop(void) } else { top = g_ViModes[g_ViRes].widetop; } - } else if (optionsGetEffectiveScreenSize() == SCREENSIZE_CINEMA) { + } else if (options_get_effective_screen_size() == SCREENSIZE_CINEMA) { top = g_ViModes[g_ViRes].cinematop; } else { if (g_InCutscene && !var8009dfc0 - && (!optionsGetCutsceneSubtitles() || g_Vars.stagenum == STAGE_CITRAINING)) { + && (!options_get_cutscene_subtitles() || g_Vars.stagenum == STAGE_CITRAINING)) { if (g_CutsceneTweenDuration60 >= 1) { f32 a = g_ViModes[g_ViRes].widetop; f32 b = g_ViModes[g_ViRes].fulltop; @@ -2986,12 +2986,12 @@ s16 playerGetViewportTop(void) return top; } -f32 playerGetAspectRatio(void) +f32 player_get_aspect_ratio(void) { f32 result; s16 stack; - s16 height = playerGetViewportHeight(); - s16 width = playerGetViewportWidth(); + s16 height = player_get_viewport_height(); + s16 width = player_get_viewport_width(); result = (f32)width / (f32)height; result = g_ViModes[g_ViRes].yscale * result; @@ -2999,20 +2999,20 @@ f32 playerGetAspectRatio(void) return result; } -void playerUpdateShake(void) +void player_update_shake(void) { struct coord coord = {0, 0, 0}; if (g_Vars.currentplayer->isdead == false) { - explosionsUpdateShake(&g_Vars.currentplayer->bond2.unk10, &g_Vars.currentplayer->bond2.unk1c, &coord); + explosions_update_shake(&g_Vars.currentplayer->bond2.unk10, &g_Vars.currentplayer->bond2.unk1c, &coord); } else { - viShake(0); + vi_shake(0); } } -void playerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist) +void player_auto_walk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist) { - playerSetTickMode(TICKMODE_AUTOWALK); + player_set_tick_mode(TICKMODE_AUTOWALK); g_Vars.currentplayer->autocontrol_aimpad = aimpad; g_Vars.currentplayer->autocontrol_walkspeed = walkspeed; @@ -3021,7 +3021,7 @@ void playerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist) g_Vars.currentplayer->autocontrol_dist = dist; } -void playerLaunchSlayerRocket(struct weaponobj *rocket) +void player_launch_slayer_rocket(struct weaponobj *rocket) { g_Vars.currentplayer->slayerrocket = rocket; g_Vars.currentplayer->visionmode = VISIONMODE_SLAYERROCKET; @@ -3036,7 +3036,7 @@ void playerLaunchSlayerRocket(struct weaponobj *rocket) g_Vars.currentplayer->badrockettime = 0; } -void playerTickTeleport(f32 *aspectratio) +void player_tick_teleport(f32 *aspectratio) { if (g_Vars.currentplayer->teleportstate) { // empty @@ -3096,15 +3096,15 @@ void playerTickTeleport(f32 *aspectratio) } if (g_Vars.currentplayer->teleportstate != TELEPORTSTATE_INACTIVE) { - f32 fovy = playerGetTeleportFovY(); - playermgrSetFovY(fovy); - viSetFovY(fovy); + f32 fovy = player_get_teleport_fov_y(); + playermgr_set_fov_y(fovy); + vi_set_fov_y(fovy); } } -void playerConfigureVi(void) +void player_configure_vi(void) { - f32 ratio = playerGetAspectRatio(); + f32 ratio = player_get_aspect_ratio(); g_ViRes = VIRES_LO; text0f1531dc(false); @@ -3113,21 +3113,21 @@ void playerConfigureVi(void) var800800f0jf = 0; #endif - playermgrSetFovY(60); - playermgrSetAspectRatio(ratio); - playermgrSetViewSize(playerGetViewportWidth(), playerGetViewportHeight()); - playermgrSetViewPosition(playerGetViewportLeft(), playerGetViewportTop()); + playermgr_set_fov_y(60); + playermgr_set_aspect_ratio(ratio); + playermgr_set_view_size(player_get_viewport_width(), player_get_viewport_height()); + playermgr_set_view_position(player_get_viewport_left(), player_get_viewport_top()); - viSetMode(g_ViModes[g_ViRes].xscale); + vi_set_mode(g_ViModes[g_ViRes].xscale); - viSetFovAspectAndSize(60, ratio, playerGetViewportWidth(), playerGetViewportHeight()); + vi_set_fov_aspect_and_size(60, ratio, player_get_viewport_width(), player_get_viewport_height()); - viSetViewPosition(playerGetViewportLeft(), playerGetViewportTop()); - viSetSize(playerGetFbWidth(), playerGetFbHeight()); - viSetBufSize(playerGetFbWidth(), playerGetFbHeight()); + vi_set_view_position(player_get_viewport_left(), player_get_viewport_top()); + vi_set_size(player_get_fb_width(), player_get_fb_height()); + vi_set_buf_size(player_get_fb_width(), player_get_fb_height()); } -void playerTick(bool arg0) +void player_tick(bool arg0) { f32 aspectratio; f32 f20; @@ -3152,17 +3152,17 @@ void playerTick(bool arg0) var800800f0jf = 0; #endif - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { - aspectratio = playerGetAspectRatio() * 1.33333333f; + if (options_get_screen_ratio() == SCREENRATIO_16_9) { + aspectratio = player_get_aspect_ratio() * 1.33333333f; } else { - aspectratio = playerGetAspectRatio(); + aspectratio = player_get_aspect_ratio(); } #if PAL aspectratio *= 1.1904761791229f; #endif - mainOverrideVariable("tps", &var8007083c); + main_override_variable("tps", &var8007083c); if (var8007083c != TELEPORTSTATE_INACTIVE) { var8007083c = TELEPORTSTATE_INACTIVE; @@ -3171,7 +3171,7 @@ void playerTick(bool arg0) } if (g_Vars.currentplayer->teleportstate != TELEPORTSTATE_INACTIVE) { - playerTickTeleport(&aspectratio); + player_tick_teleport(&aspectratio); } if (g_Vars.stagenum == STAGE_TEST_OLD && func0f01ad5c()) { @@ -3179,36 +3179,36 @@ void playerTick(bool arg0) return; } - playermgrSetFovY(60); - playermgrSetAspectRatio(aspectratio); - playermgrSetViewSize(playerGetViewportWidth(), playerGetViewportHeight()); - playermgrSetViewPosition(playerGetViewportLeft(), playerGetViewportTop()); + playermgr_set_fov_y(60); + playermgr_set_aspect_ratio(aspectratio); + playermgr_set_view_size(player_get_viewport_width(), player_get_viewport_height()); + playermgr_set_view_position(player_get_viewport_left(), player_get_viewport_top()); - viSetMode(g_ViModes[g_ViRes].xscale); - viSetFovAspectAndSize(60, aspectratio, playerGetViewportWidth(), playerGetViewportHeight()); - viSetViewPosition(playerGetViewportLeft(), playerGetViewportTop()); - viSetSize(playerGetFbWidth(), playerGetFbHeight()); - viSetBufSize(playerGetFbWidth(), playerGetFbHeight()); + vi_set_mode(g_ViModes[g_ViRes].xscale); + vi_set_fov_aspect_and_size(60, aspectratio, player_get_viewport_width(), player_get_viewport_height()); + vi_set_view_position(player_get_viewport_left(), player_get_viewport_top()); + vi_set_size(player_get_fb_width(), player_get_fb_height()); + vi_set_buf_size(player_get_fb_width(), player_get_fb_height()); - playerUpdateColourScreenProperties(); - playerTickChrFade(); + player_update_colour_screen_properties(); + player_tick_chr_fade(); - bmoveSetAutoAimY(optionsGetAutoAim(g_Vars.currentplayerstats->mpindex)); - bmoveSetAutoAimX(optionsGetAutoAim(g_Vars.currentplayerstats->mpindex)); - bmoveSetAutoMoveCentreEnabled(optionsGetLookAhead(g_Vars.currentplayerstats->mpindex)); - bgunSetGunAmmoVisible(GUNAMMOREASON_OPTION, optionsGetAmmoOnScreen(g_Vars.currentplayerstats->mpindex)); - bgunSetSightVisible(GUNSIGHTREASON_1, true); + bmove_set_auto_aim_y(options_get_auto_aim(g_Vars.currentplayerstats->mpindex)); + bmove_set_auto_aim_x(options_get_auto_aim(g_Vars.currentplayerstats->mpindex)); + bmove_set_auto_move_centre_enabled(options_get_look_ahead(g_Vars.currentplayerstats->mpindex)); + bgun_set_gun_ammo_visible(GUNAMMOREASON_OPTION, options_get_ammo_on_screen(g_Vars.currentplayerstats->mpindex)); + bgun_set_sight_visible(GUNSIGHTREASON_1, true); if ((g_Vars.tickmode == TICKMODE_GE_FADEIN || g_Vars.tickmode == TICKMODE_NORMAL) && !g_InCutscene && !g_MainIsEndscreen) { g_Vars.currentplayer->bondviewlevtime60 += g_Vars.lvupdate60; } if (g_Vars.currentplayer->devicesactive & DEVICE_SUICIDEPILL) { - playerDieByShooter(g_Vars.currentplayernum, true); + player_die_by_shooter(g_Vars.currentplayernum, true); } - playerTickDamageAndHealth(); - playerTickExplode(); + player_tick_damage_and_health(); + player_tick_explode(); if (g_Vars.currentplayer->eyespy) { // The stage uses an eyespy @@ -3221,7 +3221,7 @@ void playerTick(bool arg0) eyespy->deployed = false; eyespy->held = true; eyespy->active = false; - psStopSound(eyespy->prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(eyespy->prop, PSTYPE_GENERAL, 0xffff); chr->chrflags |= CHRCFLAG_HIDDEN; chr->chrflags |= CHRCFLAG_INVINCIBLE; g_Vars.currentplayer->devicesactive &= ~DEVICE_EYESPY; @@ -3231,30 +3231,30 @@ void playerTick(bool arg0) #if VERSION >= VERSION_NTSC_1_0 if (g_Vars.currentplayer->eyespy->active) { // And is being controlled - s8 contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); - u16 buttons = arg0 ? joyGetButtons(contpad1, 0xffff) : 0; + s8 contpad1 = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); + u16 buttons = arg0 ? joy_get_buttons(contpad1, 0xffff) : 0; if (g_Vars.currentplayer->isdead == false && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED && (buttons & START_BUTTON)) { if (g_Vars.mplayerisrunning == false) { - playerPause(MENUROOT_MAINMENU); + player_pause(MENUROOT_MAINMENU); } else { - mpPushPauseDialog(); + mp_push_pause_dialog(); } } } #endif if (g_Vars.lvupdate240) { - eyespyProcessInput(arg0); + eyespy_process_input(arg0); } } else { // Eyespy is held // If eyespy is activated, launch it if ((g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit & DEVICE_EYESPY) && g_PlayersWithControl[playernum] - && !eyespyTryLaunch()) { + && !eyespy_try_launch()) { // Launch failed eyespy->held = true; eyespy->active = false; @@ -3273,7 +3273,7 @@ void playerTick(bool arg0) eyespy->camerashuttertime = 0; eyespy->startuptimer60 = 0; eyespy->prop->chr->soundtimer = TICKS(10); - sndStart(var80095200, SFX_DETONATE, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_DETONATE, NULL, -1, -1, -1, -1, -1); } g_Vars.currentplayer->invdowntime = TICKS(-40); @@ -3281,12 +3281,12 @@ void playerTick(bool arg0) } } - if (lvIsPaused()) { - playerStopAudioForPause(); + if (lv_is_paused()) { + player_stop_audio_for_pause(); } if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) { - playerTickPauseMenu(); + player_tick_pause_menu(); } if (g_Vars.currentplayer->visionmode == VISIONMODE_SLAYERROCKET) { @@ -3308,12 +3308,12 @@ void playerTick(bool arg0) // In a cutscene s32 i; - playerTickChrBody(); + player_tick_chr_body(); if (g_Vars.currentplayer->haschrbody) { g_Vars.currentplayer->invdowntime = TICKS(-40); - bmoveTick(0, 0, 0, 1); - playerTickCutscene(arg0); + bmove_tick(0, 0, 0, 1); + player_tick_cutscene(arg0); g_Vars.currentplayer->invdowntime = TICKS(-40); } @@ -3325,26 +3325,26 @@ void playerTick(bool arg0) && g_Vars.currentplayer->eyespy->active) { // Controlling an eyespy struct coord sp308; - playermgrSetFovY(120); - viSetFovY(120); + playermgr_set_fov_y(120); + vi_set_fov_y(120); sp308.x = g_Vars.currentplayer->eyespy->prop->pos.x; sp308.y = g_Vars.currentplayer->eyespy->prop->pos.y; sp308.z = g_Vars.currentplayer->eyespy->prop->pos.z; - playerTickChrBody(); - bmoveTick(0, 0, 0, 1); - playerSetCameraMode(CAMERAMODE_EYESPY); + player_tick_chr_body(); + bmove_tick(0, 0, 0, 1); + player_set_camera_mode(CAMERAMODE_EYESPY); #if VERSION >= VERSION_JPN_FINAL - playerMoveCameraFromPosRooms(&sp308, &g_Vars.currentplayer->eyespy->up, &g_Vars.currentplayer->eyespy->look, + player_move_camera_from_pos_rooms(&sp308, &g_Vars.currentplayer->eyespy->up, &g_Vars.currentplayer->eyespy->look, &g_Vars.currentplayer->eyespy->prop->pos, g_Vars.currentplayer->eyespy->prop->rooms); #else - playerMoveCamera(&sp308, &g_Vars.currentplayer->eyespy->up, &g_Vars.currentplayer->eyespy->look); + player_move_camera(&sp308, &g_Vars.currentplayer->eyespy->up, &g_Vars.currentplayer->eyespy->look); #endif } else if (g_Vars.currentplayer->teleportstate == TELEPORTSTATE_WHITE) { // Deep Sea teleport - playerTickChrBody(); + player_tick_chr_body(); g_MoveCameraPad = g_Vars.currentplayer->teleportcamerapad; - bmoveTick(0, 0, 0, 1); - playerChangeCamera(); + bmove_tick(0, 0, 0, 1); + player_change_camera(); } else if (g_Vars.currentplayer->visionmode == (u32)VISIONMODE_SLAYERROCKET) { // Controlling a Slayer rocket struct coord rocketpos = {0, 0, 0}; @@ -3354,10 +3354,10 @@ void playerTick(bool arg0) bool rocketok = false; struct weaponobj *rocket = g_Vars.currentplayer->slayerrocket; - playerSetCameraMode(CAMERAMODE_THIRDPERSON); - playerTickChrBody(); - bmoveTick(0, 0, 0, 1); - playerUpdateShake(); + player_set_camera_mode(CAMERAMODE_THIRDPERSON); + player_tick_chr_body(); + bmove_tick(0, 0, 0, 1); + player_update_shake(); if (rocket && rocket->base.prop) { f32 sp2b8[3][3]; @@ -3385,7 +3385,7 @@ void playerTick(bool arg0) rocketpos.y = rocket->base.prop->pos.y; rocketpos.z = rocket->base.prop->pos.z; - bgFindRoomsByPos(&rocketpos, inrooms, aboverooms, 20, &bestroom); + bg_find_rooms_by_pos(&rocketpos, inrooms, aboverooms, 20, &bestroom); if (inrooms[0] == -1) { outofbounds = true; @@ -3417,10 +3417,10 @@ void playerTick(bool arg0) if (rocket->base.hidden & OBJHFLAG_PROJECTILE) { struct projectile *projectile = rocket->base.projectile; - u32 mode = optionsGetControlMode(g_Vars.currentplayerstats->mpindex); + u32 mode = options_get_control_mode(g_Vars.currentplayerstats->mpindex); f32 targetspeed; - s8 contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); - s8 contpad2 = optionsGetContpadNum2(g_Vars.currentplayerstats->mpindex); + s8 contpad1 = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); + s8 contpad2 = options_get_contpad_num2(g_Vars.currentplayerstats->mpindex); s8 stickx = 0; s8 sticky = 0; Mtxf sp1fc; @@ -3449,72 +3449,72 @@ void playerTick(bool arg0) || mode == CONTROLMODE_21) { if (g_PlayersWithControl[g_Vars.currentplayernum]) { if (mode == CONTROLMODE_21 || mode == CONTROLMODE_22) { - if (joyGetButtons(contpad1, A_BUTTON | B_BUTTON) - || joyGetButtons(contpad2, A_BUTTON | B_BUTTON) - || joyGetButtons(contpad2, Z_TRIG)) { + if (joy_get_buttons(contpad1, A_BUTTON | B_BUTTON) + || joy_get_buttons(contpad2, A_BUTTON | B_BUTTON) + || joy_get_buttons(contpad2, Z_TRIG)) { slow = true; } - if (joyGetButtonsPressedThisFrame(contpad1, Z_TRIG)) { + if (joy_get_buttons_pressed_this_frame(contpad1, Z_TRIG)) { explode = true; } } else { - if (joyGetButtons(contpad1, A_BUTTON | B_BUTTON) - || joyGetButtons(contpad2, A_BUTTON | B_BUTTON) - || joyGetButtons(contpad1, Z_TRIG)) { + if (joy_get_buttons(contpad1, A_BUTTON | B_BUTTON) + || joy_get_buttons(contpad2, A_BUTTON | B_BUTTON) + || joy_get_buttons(contpad1, Z_TRIG)) { slow = true; } - if (joyGetButtonsPressedThisFrame(contpad2, Z_TRIG)) { + if (joy_get_buttons_pressed_this_frame(contpad2, Z_TRIG)) { explode = true; } } - stickx = joyGetStickX(contpad1); - sticky = joyGetStickY(contpad1); + stickx = joy_get_stick_x(contpad1); + sticky = joy_get_stick_y(contpad1); } else { slow = true; } - if (joyGetButtons(contpad1, START_BUTTON) || joyGetButtons(contpad2, START_BUTTON)) { + if (joy_get_buttons(contpad1, START_BUTTON) || joy_get_buttons(contpad2, START_BUTTON)) { pause = true; } } else { if (g_PlayersWithControl[g_Vars.currentplayernum]) { if (mode == CONTROLMODE_13 || mode == CONTROLMODE_14) { - if (joyGetButtonsPressedThisFrame(contpad1, A_BUTTON)) { + if (joy_get_buttons_pressed_this_frame(contpad1, A_BUTTON)) { explode = true; } - if (joyGetButtons(contpad1, B_BUTTON | Z_TRIG | L_TRIG | R_TRIG)) { + if (joy_get_buttons(contpad1, B_BUTTON | Z_TRIG | L_TRIG | R_TRIG)) { slow = true; } } else { - if (joyGetButtonsPressedThisFrame(contpad1, Z_TRIG)) { + if (joy_get_buttons_pressed_this_frame(contpad1, Z_TRIG)) { explode = true; } - if (joyGetButtons(contpad1, A_BUTTON | B_BUTTON | L_TRIG | R_TRIG)) { + if (joy_get_buttons(contpad1, A_BUTTON | B_BUTTON | L_TRIG | R_TRIG)) { slow = true; } } - stickx = joyGetStickX(contpad1); - sticky = joyGetStickY(contpad1); + stickx = joy_get_stick_x(contpad1); + sticky = joy_get_stick_y(contpad1); } else { slow = true; } - if (joyGetButtons(contpad1, START_BUTTON)) { + if (joy_get_buttons(contpad1, START_BUTTON)) { pause = true; } } if (pause) { if (g_Vars.mplayerisrunning == false) { - playerPause(MENUROOT_MAINMENU); + player_pause(MENUROOT_MAINMENU); } else { - mpPushPauseDialog(); + mp_push_pause_dialog(); } } @@ -3544,9 +3544,9 @@ void playerTick(bool arg0) sp15c[2] = sp2b8[1][1] >= 0 ? f20 : -f20; sp15c[3] = 0; - quaternionMultQuaternion(sp15c, sp14c, sp13c); - quaternionToMtx(sp13c, &sp1fc); - mtx4RotateVecInPlace(&sp1fc, &projectile->speed); + quaternion_mult_quaternion(sp15c, sp14c, sp13c); + quaternion_to_mtx(sp13c, &sp1fc); + mtx4_rotate_vec_in_place(&sp1fc, &projectile->speed); projectile->powerlimit240 = -1; projectile->flags |= PROJECTILEFLAG_NOTIMELIMIT; @@ -3593,11 +3593,11 @@ void playerTick(bool arg0) projectile->speed.y = (projectile->speed.y * newspeed) / prevspeed; projectile->speed.z = (projectile->speed.z * newspeed) / prevspeed; - mtx3ToMtx4(sp2b8, &sp1bc); + mtx3_to_mtx4(sp2b8, &sp1bc); quaternion0f097044(&sp1bc, sp12c); - quaternionMultQuaternion(sp13c, sp12c, sp11c); - quaternionToMtx(sp11c, &sp17c); - mtx4ToMtx3(&sp17c, sp2b8); + quaternion_mult_quaternion(sp13c, sp12c, sp11c); + quaternion_to_mtx(sp11c, &sp17c); + mtx4_to_mtx3(&sp17c, sp2b8); rocket->base.realrot[0][0] = sp2b8[0][0] * sp2a8; rocket->base.realrot[0][1] = sp2b8[0][1] * sp2a8; @@ -3623,9 +3623,9 @@ void playerTick(bool arg0) g_Vars.currentplayer->waitforzrelease = true; if (rocket && rocket->base.prop) { - playerMoveCameraFromPosRooms(&rocketpos, &sp2e4, &sp2f0, &rocket->base.prop->pos, rocket->base.prop->rooms); + player_move_camera_from_pos_rooms(&rocketpos, &sp2e4, &sp2f0, &rocket->base.prop->pos, rocket->base.prop->rooms); } else { - playerMoveCameraFromPosRooms(&rocketpos, &sp2e4, &sp2f0, NULL, NULL); + player_move_camera_from_pos_rooms(&rocketpos, &sp2e4, &sp2f0, NULL, NULL); } } else if (g_Vars.tickmode == TICKMODE_NORMAL) { // Normal movement @@ -3637,16 +3637,16 @@ void playerTick(bool arg0) struct chrdata *chr; s32 i; - playerRemoveChrBody(); + player_remove_chr_body(); if (g_PlayersWithControl[g_Vars.currentplayernum]) { - bmoveTick(1, 1, arg0, 0); + bmove_tick(1, 1, arg0, 0); } else { - bmoveTick(0, 0, 0, 1); + bmove_tick(0, 0, 0, 1); } - playerUpdateShake(); - playerSetCameraMode(CAMERAMODE_DEFAULT); + player_update_shake(); + player_set_camera_mode(CAMERAMODE_DEFAULT); spf4.x = g_Vars.currentplayer->bond2.unk10.x; spf4.y = g_Vars.currentplayer->bond2.unk10.y; @@ -3656,7 +3656,7 @@ void playerTick(bool arg0) spf4.y = b + spf4.y; spf4.z = c + spf4.z; - playerMoveCameraFromPosRooms(&spf4, + player_move_camera_from_pos_rooms(&spf4, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, &g_Vars.currentplayer->prop->pos, @@ -3680,26 +3680,26 @@ void playerTick(bool arg0) | 1 << CHEAT_HOTSHOT | 1 << CHEAT_HITANDRUN | 1 << CHEAT_ALIEN)) == 0) { - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { - prop = chrSpawnAtCoord(BODY_DARK_COMBAT, HEAD_VD, + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + prop = chr_spawn_at_coord(BODY_DARK_COMBAT, HEAD_VD, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta / 2), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); - } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR) { - prop = chrSpawnAtCoord(BODY_MRBLONDE, HEAD_MRBLONDE, + } else if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR) { + prop = chr_spawn_at_coord(BODY_MRBLONDE, HEAD_MRBLONDE, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } else { - prop = chrSpawnAtCoord(BODY_DARK_COMBAT, HEAD_VD, + prop = chr_spawn_at_coord(BODY_DARK_COMBAT, HEAD_VD, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta / 2), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } @@ -3715,37 +3715,37 @@ void playerTick(bool arg0) chr->accuracyrating = 100; chr->speedrating = 100; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { - chrAddHealth(chr, 40); + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + chr_add_health(chr, 40); } else { - chrAddHealth(chr, 20); + chr_add_health(chr, 20); } - chrSetMaxDamage(chr, 4); + chr_set_max_damage(chr, 4); chr->chrflags |= CHRCFLAG_NEVERSLEEP; chr->hidden |= CHRHFLAG_CLOAKED; chr->cloakfadefinished = true; chr->cloakfadefrac = 0; - chrGiveWeapon(chr, MODEL_CHRFALCON2, WEAPON_FALCON2, 0); + chr_give_weapon(chr, MODEL_CHRFALCON2, WEAPON_FALCON2, 0); } } - if (cheatIsActive(CHEAT_PUGILIST)) { - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR) { - prop = chrSpawnAtCoord(BODY_MRBLONDE, HEAD_MRBLONDE, + if (cheat_is_active(CHEAT_PUGILIST)) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR) { + prop = chr_spawn_at_coord(BODY_MRBLONDE, HEAD_MRBLONDE, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } else { - prop = chrSpawnAtCoord(BODY_CARRINGTON, HEAD_JAMIE, + prop = chr_spawn_at_coord(BODY_CARRINGTON, HEAD_JAMIE, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_PUGILIST_BUDDY), + ailist_find_by_id(GAILIST_INIT_PUGILIST_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } @@ -3761,10 +3761,10 @@ void playerTick(bool arg0) chr->accuracyrating = 100; chr->speedrating = 100; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { - chrAddHealth(chr, 40); + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + chr_add_health(chr, 40); } else { - chrAddHealth(chr, 20); + chr_add_health(chr, 20); } chr->chrflags |= CHRCFLAG_NEVERSLEEP; @@ -3772,24 +3772,24 @@ void playerTick(bool arg0) chr->cloakfadefinished = true; chr->cloakfadefrac = 0; - chrSetMaxDamage(chr, 20); + chr_set_max_damage(chr, 20); } } - if (cheatIsActive(CHEAT_HITANDRUN)) { - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR) { - prop = chrSpawnAtCoord(BODY_MRBLONDE, HEAD_MRBLONDE, + if (cheat_is_active(CHEAT_HITANDRUN)) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR) { + prop = chr_spawn_at_coord(BODY_MRBLONDE, HEAD_MRBLONDE, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } else { - prop = chrSpawnAtCoord(BODY_MRBLONDE, HEAD_MARK2, + prop = chr_spawn_at_coord(BODY_MRBLONDE, HEAD_MARK2, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } @@ -3805,37 +3805,37 @@ void playerTick(bool arg0) chr->accuracyrating = 50; chr->speedrating = 100; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { - chrAddHealth(chr, 20); + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + chr_add_health(chr, 20); } else { - chrAddHealth(chr, 10); + chr_add_health(chr, 10); } - chrSetMaxDamage(chr, 10); + chr_set_max_damage(chr, 10); chr->chrflags |= CHRCFLAG_NEVERSLEEP; chr->hidden |= CHRHFLAG_CLOAKED; chr->cloakfadefinished = true; chr->cloakfadefrac = 0; - chrGiveWeapon(chr, MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0); + chr_give_weapon(chr, MODEL_CHRAVENGER, WEAPON_K7AVENGER, 0); } } - if (cheatIsActive(CHEAT_HOTSHOT)) { - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR) { - prop = chrSpawnAtCoord(BODY_MRBLONDE, HEAD_MRBLONDE, + if (cheat_is_active(CHEAT_HOTSHOT)) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR) { + prop = chr_spawn_at_coord(BODY_MRBLONDE, HEAD_MRBLONDE, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } else { - prop = chrSpawnAtCoord(BODY_CISOLDIER, HEAD_CHRIST, + prop = chr_spawn_at_coord(BODY_CISOLDIER, HEAD_CHRIST, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } @@ -3851,38 +3851,38 @@ void playerTick(bool arg0) chr->accuracyrating = 50; chr->speedrating = 100; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { - chrAddHealth(chr, 40); + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + chr_add_health(chr, 40); } else { - chrAddHealth(chr, 20); + chr_add_health(chr, 20); } - chrSetMaxDamage(chr, 10); + chr_set_max_damage(chr, 10); chr->chrflags |= CHRCFLAG_NEVERSLEEP; chr->hidden |= CHRHFLAG_CLOAKED; chr->cloakfadefinished = true; chr->cloakfadefrac = 0; - chrGiveWeapon(chr, MODEL_CHRDY357TRENT, WEAPON_DY357LX, 0); - chrGiveWeapon(chr, MODEL_CHRDY357, WEAPON_DY357MAGNUM, OBJFLAG_WEAPON_LEFTHANDED); + chr_give_weapon(chr, MODEL_CHRDY357TRENT, WEAPON_DY357LX, 0); + chr_give_weapon(chr, MODEL_CHRDY357, WEAPON_DY357MAGNUM, OBJFLAG_WEAPON_LEFTHANDED); } } - if (cheatIsActive(CHEAT_ALIEN)) { - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR) { - prop = chrSpawnAtCoord(BODY_MRBLONDE, HEAD_MRBLONDE, + if (cheat_is_active(CHEAT_ALIEN)) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR) { + prop = chr_spawn_at_coord(BODY_MRBLONDE, HEAD_MRBLONDE, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } else { - prop = chrSpawnAtCoord(BODY_ELVIS1, HEAD_MAIAN_S, + prop = chr_spawn_at_coord(BODY_ELVIS1, HEAD_MAIAN_S, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms, BADDEG2RAD(g_Vars.currentplayer->vv_theta), - ailistFindById(GAILIST_INIT_DEFAULT_BUDDY), + ailist_find_by_id(GAILIST_INIT_DEFAULT_BUDDY), SPAWNFLAG_ALLOWONSCREEN); } @@ -3898,20 +3898,20 @@ void playerTick(bool arg0) chr->accuracyrating = 100; chr->speedrating = 100; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { - chrAddHealth(chr, 40); + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + chr_add_health(chr, 40); } else { - chrAddHealth(chr, 20); + chr_add_health(chr, 20); } - chrSetMaxDamage(chr, 10); + chr_set_max_damage(chr, 10); chr->chrflags |= CHRCFLAG_NEVERSLEEP; chr->hidden |= CHRHFLAG_CLOAKED; chr->cloakfadefinished = true; chr->cloakfadefrac = 0; - chrGiveWeapon(chr, MODEL_CHRRCP120, WEAPON_RCP120, 0); + chr_give_weapon(chr, MODEL_CHRRCP120, WEAPON_RCP120, 0); } } @@ -3919,26 +3919,26 @@ void playerTick(bool arg0) } } } else if (g_Vars.tickmode == TICKMODE_GE_FADEIN || g_Vars.tickmode == TICKMODE_GE_FADEOUT) { - playerRemoveChrBody(); - bmoveTick(1, 1, arg0, 0); - playerUpdateShake(); - playerSetCameraMode(CAMERAMODE_DEFAULT); - playerMoveCameraFromPosRooms(&g_Vars.currentplayer->bond2.unk10, + player_remove_chr_body(); + bmove_tick(1, 1, arg0, 0); + player_update_shake(); + player_set_camera_mode(CAMERAMODE_DEFAULT); + player_move_camera_from_pos_rooms(&g_Vars.currentplayer->bond2.unk10, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, &g_Vars.currentplayer->prop->pos, g_Vars.currentplayer->prop->rooms); } else if (g_Vars.tickmode == TICKMODE_MPSWIRL) { // Start of an MP match where the camera circles around the player - playerTickChrBody(); - bmoveTick(0, 0, 0, 1); - playerTickMpSwirl(); + player_tick_chr_body(); + bmove_tick(0, 0, 0, 1); + player_tick_mp_swirl(); } else if (g_Vars.tickmode == TICKMODE_WARP) { // Eg. In CI training, warping from device hallways // to device room at the end of a training session - playerTickChrBody(); - bmoveTick(0, 0, 0, 1); - playerChangeCamera(); + player_tick_chr_body(); + bmove_tick(0, 0, 0, 1); + player_change_camera(); } else if (g_Vars.tickmode == TICKMODE_AUTOWALK) { // Extraction bodyguard room and Duel f32 targetangle; @@ -3951,10 +3951,10 @@ void playerTick(bool arg0) struct pad pad; f32 speedfrac; - playerRemoveChrBody(); - padUnpack(g_Vars.currentplayer->autocontrol_aimpad, PADFIELD_POS, &pad); + player_remove_chr_body(); + pad_unpack(g_Vars.currentplayer->autocontrol_aimpad, PADFIELD_POS, &pad); - if (mainGetStageNum() == g_Stages[STAGEINDEX_EXTRACTION].id + if (main_get_stage_num() == g_Stages[STAGEINDEX_EXTRACTION].id && g_Vars.currentplayer->autocontrol_aimpad == 0x19) { pad.pos.x -= 100; } @@ -4012,11 +4012,11 @@ void playerTick(bool arg0) xdist = sqrtf(xdist * xdist + zdist * zdist); if (xdist < g_Vars.currentplayer->autocontrol_dist) { - playerSetTickMode(TICKMODE_NORMAL); + player_set_tick_mode(TICKMODE_NORMAL); } } else { if (diffangle >= -0.2f && diffangle <= 0.2f) { - playerSetTickMode(TICKMODE_NORMAL); + player_set_tick_mode(TICKMODE_NORMAL); } } @@ -4033,10 +4033,10 @@ void playerTick(bool arg0) } g_Vars.currentplayer->autocontrol_y = g_Vars.currentplayer->autocontrol_walkspeed * speedfrac; - bmoveTick(1, 1, 0, 1); - playerUpdateShake(); - playerSetCameraMode(CAMERAMODE_DEFAULT); - playerMoveCameraFromPosRooms(&g_Vars.currentplayer->bond2.unk10, + bmove_tick(1, 1, 0, 1); + player_update_shake(); + player_set_camera_mode(CAMERAMODE_DEFAULT); + player_move_camera_from_pos_rooms(&g_Vars.currentplayer->bond2.unk10, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, &g_Vars.currentplayer->prop->pos, @@ -4054,62 +4054,62 @@ void playerTick(bool arg0) // Also a leftover from GE? Maybe cancelling fade in mission intros? if (var8007074c) { - s8 contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); + s8 contpad1 = options_get_contpad_num1(g_Vars.currentplayerstats->mpindex); - if (!lvIsPaused() + if (!lv_is_paused() && arg0 - && joyGetButtonsPressedThisFrame(contpad1, A_BUTTON | B_BUTTON | Z_TRIG | START_BUTTON | L_TRIG | R_TRIG)) { + && joy_get_buttons_pressed_this_frame(contpad1, A_BUTTON | B_BUTTON | Z_TRIG | START_BUTTON | L_TRIG | R_TRIG)) { var8007074c = 2; - if (playerIsFadeComplete()) { + if (player_is_fade_complete()) { if (g_Vars.currentplayer->colourscreenfrac == 0) { - playerSetFadeColour(0, 0, 0, 0); - playerSetFadeFrac(60, 1); + player_set_fade_colour(0, 0, 0, 0); + player_set_fade_frac(60, 1); } } else { if (g_Vars.currentplayer->colourfadefracnew == 0) { - playerSetFadeFrac(g_Vars.currentplayer->colourfadetime60, 1); + player_set_fade_frac(g_Vars.currentplayer->colourfadetime60, 1); } } } if (var8007074c == 2 - && playerIsFadeComplete() + && player_is_fade_complete() && g_Vars.currentplayer->colourscreenfrac == 1) { func0000e990(); } } if (g_PlayerTriggerGeFadeIn) { - playerBeginGeFadeIn(); + player_begin_ge_fade_in(); } // Handle mission exit on death if (g_Vars.currentplayer->isdead) { if (g_Vars.currentplayer->redbloodfinished == false) { - bgunHandlePlayerDead(); + bgun_handle_player_dead(); } if (g_Vars.currentplayer->redbloodfinished && g_Vars.currentplayer->deathanimfinished) { if (g_Vars.mplayerisrunning == false) { - mainEndStage(); + main_end_stage(); } else if (g_Vars.coopplayernum >= 0) { if (g_Vars.currentplayer == g_Vars.bond && g_Vars.coop->isdead && g_Vars.coop->redbloodfinished && g_Vars.coop->deathanimfinished) { - mainEndStage(); + main_end_stage(); } else { - chrsClearRefsToPlayer(g_Vars.currentplayernum); + chrs_clear_refs_to_player(g_Vars.currentplayernum); } } else if (g_Vars.antiplayernum >= 0 && g_Vars.currentplayer == g_Vars.bond) { - mainEndStage(); + main_end_stage(); } } } - if (g_Vars.tickmode == TICKMODE_GE_FADEOUT && playerIsFadeComplete()) { - mainEndStage(); + if (g_Vars.tickmode == TICKMODE_GE_FADEOUT && player_is_fade_complete()) { + main_end_stage(); } } @@ -4178,27 +4178,27 @@ struct var80070ba4 var80070ba4[4][7] = { // [wieldmode][turnmode] }, }; -void playerSetGlobalDrawWorldOffset(s32 room) +void player_set_global_draw_world_offset(s32 room) { - roomGetPos(room, &g_Vars.currentplayer->globaldrawworldoffset); + room_get_pos(room, &g_Vars.currentplayer->globaldrawworldoffset); g_Vars.currentplayer->globaldrawworldbgoffset.x = g_Vars.currentplayer->globaldrawworldoffset.x; g_Vars.currentplayer->globaldrawworldbgoffset.y = g_Vars.currentplayer->globaldrawworldoffset.y; g_Vars.currentplayer->globaldrawworldbgoffset.z = g_Vars.currentplayer->globaldrawworldoffset.z; - roomSetLastForOffset(room); + room_set_last_for_offset(room); } -void playerSetGlobalDrawCameraOffset(void) +void player_set_global_draw_camera_offset(void) { g_Vars.currentplayer->globaldrawcameraoffset.x = g_Vars.currentplayer->globaldrawworldoffset.x; g_Vars.currentplayer->globaldrawcameraoffset.y = g_Vars.currentplayer->globaldrawworldoffset.y; g_Vars.currentplayer->globaldrawcameraoffset.z = g_Vars.currentplayer->globaldrawworldoffset.z; - mtx4RotateVecInPlace(camGetWorldToScreenMtxf(), &g_Vars.currentplayer->globaldrawcameraoffset); + mtx4_rotate_vec_in_place(cam_get_world_to_screen_mtxf(), &g_Vars.currentplayer->globaldrawcameraoffset); } -void playerAllocateMatrices(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up) +void player_allocate_matrices(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up) { Mtx spd0; LookAt *lookat; @@ -4211,15 +4211,15 @@ void playerAllocateMatrices(struct coord *cam_pos, struct coord *cam_look, struc s32 i; s32 j; - scale = bgGetScaleBg2Gfx(); - playerSetGlobalDrawWorldOffset(g_Vars.currentplayer->cam_room); + scale = bg_get_scale_bg2gfx(); + player_set_global_draw_world_offset(g_Vars.currentplayer->cam_room); - g_Vars.currentplayer->mtxl005c = gfxAllocateMatrix(); - g_Vars.currentplayer->mtxl0060 = gfxAllocateMatrix(); - g_Vars.currentplayer->mtxf0064 = gfxAllocateMatrix(); - g_Vars.currentplayer->mtxf0068 = gfxAllocateMatrix(); + g_Vars.currentplayer->mtxl005c = gfx_allocate_matrix(); + g_Vars.currentplayer->mtxl0060 = gfx_allocate_matrix(); + g_Vars.currentplayer->mtxf0064 = gfx_allocate_matrix(); + g_Vars.currentplayer->mtxf0068 = gfx_allocate_matrix(); - lookat = gfxAllocateLookAt(2); + lookat = gfx_allocate_look_at(2); sp74.x = (cam_pos->x - g_Vars.currentplayer->globaldrawworldoffset.x) * scale; sp74.y = (cam_pos->y - g_Vars.currentplayer->globaldrawworldoffset.y) * scale; @@ -4249,9 +4249,9 @@ void playerAllocateMatrices(struct coord *cam_pos, struct coord *cam_look, struc cam_look->x, cam_look->y, cam_look->z, cam_up->x, cam_up->y, cam_up->z); - s1 = gfxAllocateMatrix(); - s0 = gfxAllocateMatrix(); - mtx4MultMtx4(camGetMtxF1754(), &sp8c, s0); + s1 = gfx_allocate_matrix(); + s0 = gfx_allocate_matrix(); + mtx4_mult_mtx4(cam_get_mtxf1754(), &sp8c, s0); for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { @@ -4263,22 +4263,22 @@ void playerAllocateMatrices(struct coord *cam_pos, struct coord *cam_look, struc } } - camSetMtxF006c(s0); + cam_set_mtxf006c(s0); guMtxF2L(s0->m, s1); - camSetOrthogonalMtxL(s1); + cam_set_orthogonal_mtxl(s1); mtx00015f04(scale, &sp8c); guMtxF2L(sp8c.m, g_Vars.currentplayer->mtxl005c); mtx00016820(g_Vars.currentplayer->mtxl005c, g_Vars.currentplayer->mtxl0060); - camSetMtxL173c(g_Vars.currentplayer->mtxl005c); - camSetMtxL1738(g_Vars.currentplayer->mtxl0060); - camSetWorldToScreenMtxf(g_Vars.currentplayer->mtxf0064); - camSetProjectionMtxF(g_Vars.currentplayer->mtxf0068); - camSetLookAt(lookat); + cam_set_mtxl173c(g_Vars.currentplayer->mtxl005c); + cam_set_mtxl1738(g_Vars.currentplayer->mtxl0060); + cam_set_world_to_screen_mtxf(g_Vars.currentplayer->mtxf0064); + cam_set_projection_mtxf(g_Vars.currentplayer->mtxf0068); + cam_set_look_at(lookat); cam0f0b5838(); - playerSetGlobalDrawCameraOffset(); + player_set_global_draw_camera_offset(); } -Gfx *playerUpdateShootRot(Gfx *gdl) +Gfx *player_update_shoot_rot(Gfx *gdl) { struct coord sp3c; struct coord sp30; @@ -4287,7 +4287,7 @@ Gfx *playerUpdateShootRot(Gfx *gdl) f32 rotx; f32 roty; - playerAllocateMatrices(&g_Vars.currentplayer->cam_pos, + player_allocate_matrices(&g_Vars.currentplayer->cam_pos, &g_Vars.currentplayer->cam_look, &g_Vars.currentplayer->cam_up); bgun0f0a0c08(&sp30, &sp3c); @@ -4321,7 +4321,7 @@ Gfx *playerUpdateShootRot(Gfx *gdl) * May be called while the shield is already being displayed, in which case the * effect is restarted. */ -void playerDisplayShield(void) +void player_display_shield(void) { if (g_Vars.currentplayer->shieldshowtime < 0) { s32 rand = ((g_Vars.currentplayer->shieldshowrnd >> 16) % 200) * 4 + 800; @@ -4336,7 +4336,7 @@ void playerDisplayShield(void) /** * Render the current player's shield from the first person perspective. */ -Gfx *playerRenderShield(Gfx *gdl) +Gfx *player_render_shield(Gfx *gdl) { f32 sp90[2]; f32 sp88[2]; @@ -4350,7 +4350,7 @@ Gfx *playerRenderShield(Gfx *gdl) s32 add; if (g_Vars.currentplayer->shieldshowtime >= 0) { - shield = playerGetShieldFrac() * 8; + shield = player_get_shield_frac() * 8; maxrot = ((g_Vars.currentplayer->shieldshowrnd >> 16) % 200) * 4 + 800; maxrotf = maxrot; f20 = (60 - g_Vars.currentplayer->shieldshowtime) * (1.0f / 60.0f); @@ -4362,13 +4362,13 @@ Gfx *playerRenderShield(Gfx *gdl) } f20 = (sinf(g_Vars.currentplayer->shieldshowrot * (M_BADTAU / maxrotf)) + 1) * 0.5f; - sp90[0] = camGetScreenLeft() + camGetScreenWidth() * f20; + sp90[0] = cam_get_screen_left() + cam_get_screen_width() * f20; f20 = (cosf(g_Vars.currentplayer->shieldshowrot * (M_BADTAU / maxrotf)) + 1) * 0.5f; - sp90[1] = camGetScreenTop() + camGetScreenHeight() * f20; + sp90[1] = cam_get_screen_top() + cam_get_screen_height() * f20; - sp88[0] = camGetScreenWidth() * (1.0f + 0.002f * ((g_Vars.currentplayer->shieldshowrnd >> 20) % 100) + (g_Vars.currentplayer->shieldshowtime * (0.2f + 0.002f * (g_Vars.currentplayer->shieldshowrnd % 100)) * (1.0f / 60.0f))); - sp88[1] = camGetScreenHeight() * (1.0f + 0.002f * ((g_Vars.currentplayer->shieldshowrnd >> 24) % 100) + (g_Vars.currentplayer->shieldshowtime * (0.2f + 0.002f * ((g_Vars.currentplayer->shieldshowrnd >> 8) % 100)) * (1.0f / 60.0f))); + sp88[0] = cam_get_screen_width() * (1.0f + 0.002f * ((g_Vars.currentplayer->shieldshowrnd >> 20) % 100) + (g_Vars.currentplayer->shieldshowtime * (0.2f + 0.002f * (g_Vars.currentplayer->shieldshowrnd % 100)) * (1.0f / 60.0f))); + sp88[1] = cam_get_screen_height() * (1.0f + 0.002f * ((g_Vars.currentplayer->shieldshowrnd >> 24) % 100) + (g_Vars.currentplayer->shieldshowtime * (0.2f + 0.002f * ((g_Vars.currentplayer->shieldshowrnd >> 8) % 100)) * (1.0f / 60.0f))); chr0f0295f8(shield, &red, &green, &blue); @@ -4407,7 +4407,7 @@ Gfx *playerRenderShield(Gfx *gdl) } f20 = 1 - g_Vars.currentplayer->shieldshowtime * (1.0f / 60.0f); - texSelect(&gdl, &g_TexShieldConfigs[0], 4, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexShieldConfigs[0], 4, 1, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_2CYCLE); gDPSetRenderMode(gdl++, G_RM_PASS, G_RM_CLD_SURF2); @@ -4431,43 +4431,43 @@ Gfx *playerRenderShield(Gfx *gdl) return gdl; } -Gfx *playerRenderHud(Gfx *gdl) +Gfx *player_render_hud(Gfx *gdl) { if (g_Vars.currentplayer->cameramode == CAMERAMODE_THIRDPERSON) { - gdl = boltbeamsRender(gdl); - gdl = bgRenderArtifacts(gdl); - gdl = hudmsgsRender(gdl); + gdl = boltbeams_render(gdl); + gdl = bg_render_artifacts(gdl); + gdl = hudmsgs_render(gdl); if (g_Vars.currentplayer->isdead == false) { - gdl = playerDrawStoredFade(gdl); + gdl = player_draw_stored_fade(gdl); } if (g_Vars.stagenum == STAGE_ESCAPE) { - gdl = gasRender(gdl); + gdl = gas_render(gdl); } return gdl; } if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY) { - bgunTickGameplay2(); - gdl = boltbeamsRender(gdl); - bgunRender(&gdl); - gdl = lasersightRenderDot(gdl); + bgun_tick_gameplay2(); + gdl = boltbeams_render(gdl); + bgun_render(&gdl); + gdl = lasersight_render_dot(gdl); if (g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) { - gdl = bgRenderArtifacts(gdl); + gdl = bg_render_artifacts(gdl); } if (g_NbombsActive) { - gdl = nbombRenderOverlay(gdl); + gdl = nbomb_render_overlay(gdl); } if (g_Vars.stagenum == STAGE_ESCAPE) { - gdl = gasRender(gdl); + gdl = gas_render(gdl); } - gdl = playerRenderShield(gdl); + gdl = player_render_shield(gdl); // Adjust eyes shutting if (g_Vars.currentplayer->eyesshut) { @@ -4492,18 +4492,18 @@ Gfx *playerRenderHud(Gfx *gdl) && g_InCutscene == 0 && (!g_Vars.currentplayer->eyespy || (g_Vars.currentplayer->eyespy && !g_Vars.currentplayer->eyespy->active)) && ((g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit) & DEVICE_NIGHTVISION)) { - gdl = bviewDrawNvLens(gdl); - gdl = bviewDrawNvBinoculars(gdl); + gdl = bview_draw_nv_lens(gdl); + gdl = bview_draw_nv_binoculars(gdl); } else if (g_Vars.currentplayer->isdead == false && g_InCutscene == 0 && (!g_Vars.currentplayer->eyespy || (g_Vars.currentplayer->eyespy && !g_Vars.currentplayer->eyespy->active)) && ((g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit) & DEVICE_IRSCANNER)) { - gdl = bviewDrawIrLens(gdl); - gdl = bviewDrawIrBinoculars(gdl); + gdl = bview_draw_ir_lens(gdl); + gdl = bview_draw_ir_binoculars(gdl); } if (g_Vars.currentplayer->eyesshutfrac > 0) { - gdl = playerDrawFade(gdl, 0, 0, 0, g_Vars.currentplayer->eyesshutfrac); + gdl = player_draw_fade(gdl, 0, 0, 0, g_Vars.currentplayer->eyesshutfrac); } } @@ -4511,10 +4511,10 @@ Gfx *playerRenderHud(Gfx *gdl) // Draw menu if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY && g_Vars.currentplayer->mpmenuon) { - s32 a = viGetViewLeft(); - s32 b = viGetViewTop(); - s32 c = viGetViewLeft() + viGetViewWidth(); - s32 d = viGetViewTop() + viGetViewHeight(); + s32 a = vi_get_view_left(); + s32 b = vi_get_view_top(); + s32 c = vi_get_view_left() + vi_get_view_width(); + s32 d = vi_get_view_top() + vi_get_view_height(); gdl = text0f153628(gdl); gdl = text0f153a34(gdl, a, b, c, d, 0x000000a0); @@ -4522,13 +4522,13 @@ Gfx *playerRenderHud(Gfx *gdl) } if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY - && playerIsHealthVisible() + && player_is_health_visible() && func0f0f0c68()) { - gdl = playerRenderHealthBar(gdl); + gdl = player_render_health_bar(gdl); } if (g_Vars.normmplayerisrunning == false) { - objectivesCheckAll(); + objectives_check_all(); } if (g_Vars.currentplayer->isdead) { @@ -4538,35 +4538,35 @@ Gfx *playerRenderHud(Gfx *gdl) bool pass = false; if (g_Vars.currentplayer->isdead == 1) { - pakDisableRumbleForPlayer(g_Vars.currentplayernum); + pak_disable_rumble_for_player(g_Vars.currentplayernum); g_Vars.currentplayer->isdead = 2; pass = true; } if (pass) { if (g_Vars.mplayerisrunning == false) { - musicStartSoloDeath(); + music_start_solo_death(); } else { - musicStartMpDeath(); + music_start_mp_death(); } } else { if (g_Vars.currentplayer->redbloodfinished) { - playerSetFadeColour(0x96, 0, 0, 0.70588237f); + player_set_fade_colour(0x96, 0, 0, 0.70588237f); } else { g_Vars.currentplayer->redbloodfinished = true; } } } - if (modelGetCurAnimFrame(&g_Vars.currentplayer->model) >= modelGetAnimEndFrame(&g_Vars.currentplayer->model) + if (model_get_cur_anim_frame(&g_Vars.currentplayer->model) >= model_get_anim_end_frame(&g_Vars.currentplayer->model) && g_Vars.currentplayer->redbloodfinished) { if (g_Vars.currentplayer->deathanimfinished == false) { g_Vars.currentplayer->deathanimfinished = true; - playerAdjustFade(60, 0, 0, 0, 1); - playerStartChrFade(120, 0); + player_adjust_fade(60, 0, 0, 0, 1); + player_start_chr_fade(120, 0); } - if (playerIsFadeComplete()) { + if (player_is_fade_complete()) { bool canrestart = false; if (g_Vars.mplayerisrunning) { @@ -4580,7 +4580,7 @@ Gfx *playerRenderHud(Gfx *gdl) if (g_Vars.antiplayernum >= 0 && g_Vars.currentplayer == g_Vars.anti) { // Anti - if (joyGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000) && !mpIsPaused()) { + if (joy_get_buttons(options_get_contpad_num1(g_Vars.currentplayerstats->mpindex), 0xb000) && !mp_is_paused()) { g_Vars.currentplayer->dostartnewlife = true; } } else { @@ -4593,15 +4593,15 @@ Gfx *playerRenderHud(Gfx *gdl) f32 stealhealth; f32 shield; - canrestart = joyGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000) - && !mpIsPaused(); + canrestart = joy_get_buttons(options_get_contpad_num1(g_Vars.currentplayerstats->mpindex), 0xb000) + && !mp_is_paused(); // Get ready to respawn. // The other player's health will be halved. buddyplayernum = g_Vars.currentplayer == g_Vars.coop ? g_Vars.bondplayernum : g_Vars.coopplayernum; - setCurrentPlayerNum(buddyplayernum); - shield = chrGetShield(g_Vars.currentplayer->prop->chr) * 0.125f; + set_current_player_num(buddyplayernum); + shield = chr_get_shield(g_Vars.currentplayer->prop->chr) * 0.125f; totalhealth = g_Vars.currentplayer->bondhealth + shield; #if VERSION >= VERSION_NTSC_FINAL @@ -4610,21 +4610,21 @@ Gfx *playerRenderHud(Gfx *gdl) // the player could respawn on the other side of the exit trigger. // Additionally, the logic for coopcanrestart is different. if (totalhealth > 0.125f - && !(mainGetStageNum() == STAGE_DEEPSEA && chrHasStageFlag(NULL, 0x00000200))) { + && !(main_get_stage_num() == STAGE_DEEPSEA && chr_has_stage_flag(NULL, 0x00000200))) { if (canrestart) { - playerDisplayHealth(); + player_display_health(); stealhealth = totalhealth * 0.5f; if (stealhealth < shield) { - chrSetShield(g_Vars.currentplayer->prop->chr, (shield - stealhealth) * 8.0f); + chr_set_shield(g_Vars.currentplayer->prop->chr, (shield - stealhealth) * 8.0f); } else { - chrSetShield(g_Vars.currentplayer->prop->chr, 0); + chr_set_shield(g_Vars.currentplayer->prop->chr, 0); g_Vars.currentplayer->bondhealth -= stealhealth - shield; } // Back to the player who died - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); g_Vars.currentplayer->dostartnewlife = true; g_Vars.currentplayer->oldhealth = 0; g_Vars.currentplayer->oldarmour = 0; @@ -4632,29 +4632,29 @@ Gfx *playerRenderHud(Gfx *gdl) g_Vars.currentplayer->apparentarmour = 0; g_Vars.currentplayer->stealhealth = stealhealth; } else { - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } g_Vars.currentplayer->coopcanrestart = true; } else { // Can't respawn - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } #else if (totalhealth > 0.125f && canrestart) { - playerDisplayHealth(); + player_display_health(); stealhealth = totalhealth * 0.5f; if (stealhealth < shield) { - chrSetShield(g_Vars.currentplayer->prop->chr, (shield - stealhealth) * 8.0f); + chr_set_shield(g_Vars.currentplayer->prop->chr, (shield - stealhealth) * 8.0f); } else { - chrSetShield(g_Vars.currentplayer->prop->chr, 0); + chr_set_shield(g_Vars.currentplayer->prop->chr, 0); g_Vars.currentplayer->bondhealth -= stealhealth - shield; } // Back to the player who died - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); g_Vars.currentplayer->dostartnewlife = true; g_Vars.currentplayer->oldhealth = 0; g_Vars.currentplayer->oldarmour = 0; @@ -4662,7 +4662,7 @@ Gfx *playerRenderHud(Gfx *gdl) g_Vars.currentplayer->apparentarmour = 0; g_Vars.currentplayer->stealhealth = stealhealth; } else { - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (totalhealth > 0.125f) { @@ -4700,8 +4700,8 @@ Gfx *playerRenderHud(Gfx *gdl) } } - if (joyGetButtons(optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex), 0xb000) - && !mpIsPaused() + if (joy_get_buttons(options_get_contpad_num1(g_Vars.currentplayerstats->mpindex), 0xb000) + && !mp_is_paused() && g_NumReasonsToEndMpMatch == 0) { canrestart = true; } @@ -4716,69 +4716,69 @@ Gfx *playerRenderHud(Gfx *gdl) } if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY) { - gdl = bgunDrawSight(gdl); + gdl = bgun_draw_sight(gdl); - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { - gdl = bviewDrawHorizonScanner(gdl); + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { + gdl = bview_draw_horizon_scanner(gdl); } - if (optionsGetAmmoOnScreen(g_Vars.currentplayerstats->mpindex)) { - gdl = bgunDrawHud(gdl); + if (options_get_ammo_on_screen(g_Vars.currentplayerstats->mpindex)) { + gdl = bgun_draw_hud(gdl); } #if VERSION >= VERSION_NTSC_1_0 - gdl = radarRender(gdl); - gdl = hudmsgsRender(gdl); + gdl = radar_render(gdl); + gdl = hudmsgs_render(gdl); #else - gdl = hudmsgsRender(gdl); - gdl = radarRender(gdl); + gdl = hudmsgs_render(gdl); + gdl = radar_render(gdl); #endif - gdl = playerDrawStoredFade(gdl); + gdl = player_draw_stored_fade(gdl); } else { - gdl = bgRenderArtifacts(gdl); + gdl = bg_render_artifacts(gdl); if (g_Vars.currentplayer->eyespy) { if (g_Vars.currentplayer->eyespy->startuptimer60 < TICKS(50)) { - gdl = bviewDrawFisheye(gdl, 0xffffffff, 255, 0, g_Vars.currentplayer->eyespy->startuptimer60, g_Vars.currentplayer->eyespy->hit); + gdl = bview_draw_fisheye(gdl, 0xffffffff, 255, 0, g_Vars.currentplayer->eyespy->startuptimer60, g_Vars.currentplayer->eyespy->hit); } else { s32 time = g_Vars.currentplayer->eyespy->camerashuttertime; if (time > 0) { if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) { - gdl = bviewDrawFisheye(gdl, 0xffffffff, 255, time, TICKS(50), g_Vars.currentplayer->eyespy->hit); + gdl = bview_draw_fisheye(gdl, 0xffffffff, 255, time, TICKS(50), g_Vars.currentplayer->eyespy->hit); } else { - gdl = bviewDrawFisheye(gdl, 0xffffffff, 255, 0, TICKS(50), g_Vars.currentplayer->eyespy->hit); + gdl = bview_draw_fisheye(gdl, 0xffffffff, 255, 0, TICKS(50), g_Vars.currentplayer->eyespy->hit); } g_Vars.currentplayer->eyespy->camerashuttertime -= g_Vars.lvupdate60; } else { - gdl = bviewDrawFisheye(gdl, 0xffffffff, 255, 0, TICKS(50), g_Vars.currentplayer->eyespy->hit); + gdl = bview_draw_fisheye(gdl, 0xffffffff, 255, 0, TICKS(50), g_Vars.currentplayer->eyespy->hit); } } - gdl = bviewDrawEyespyMetrics(gdl); + gdl = bview_draw_eyespy_metrics(gdl); } if (g_Vars.currentplayer->mpmenuon) { - s32 a = viGetViewLeft(); - s32 b = viGetViewTop(); - s32 c = viGetViewLeft() + viGetViewWidth(); - s32 d = viGetViewTop() + viGetViewHeight(); + s32 a = vi_get_view_left(); + s32 b = vi_get_view_top(); + s32 c = vi_get_view_left() + vi_get_view_width(); + s32 d = vi_get_view_top() + vi_get_view_height(); gdl = text0f153628(gdl); gdl = text0f153a34(gdl, a, b, c, d, 0x000000a0); gdl = text0f153780(gdl); } - gdl = hudmsgsRender(gdl); - gdl = playerDrawStoredFade(gdl); + gdl = hudmsgs_render(gdl); + gdl = player_draw_stored_fade(gdl); } return gdl; } -void playerDie(bool force) +void player_die(bool force) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; s32 shooter; @@ -4789,10 +4789,10 @@ void playerDie(bool force) shooter = g_Vars.currentplayernum; } - playerDieByShooter(shooter, force); + player_die_by_shooter(shooter, force); } -void playerDieByShooter(u32 shooter, bool force) +void player_die_by_shooter(u32 shooter, bool force) { #if VERSION >= VERSION_NTSC_1_0 if (!g_Vars.currentplayer->isdead && (force || !g_Vars.currentplayer->invincible)) @@ -4805,19 +4805,19 @@ void playerDieByShooter(u32 shooter, bool force) func0f0f8120(); g_MpPlayerNum = prevplayernum; - hudmsgsRemoveForDeadPlayer(g_Vars.currentplayernum); + hudmsgs_remove_for_dead_player(g_Vars.currentplayernum); if (g_Vars.mplayerisrunning) { - mpstatsRecordDeath(shooter, g_Vars.currentplayernum); + mpstats_record_death(shooter, g_Vars.currentplayernum); } - chrUncloak(g_Vars.currentplayer->prop->chr, true); + chr_uncloak(g_Vars.currentplayer->prop->chr, true); if (g_Vars.mplayerisrunning && (g_Vars.antiplayernum < 0 || g_Vars.currentplayernum != g_Vars.antiplayernum || shooter != g_Vars.antiplayernum)) { - currentPlayerDropAllItems(); + current_player_drop_all_items(); } g_Vars.currentplayer->isdead = true; @@ -4836,18 +4836,18 @@ void playerDieByShooter(u32 shooter, bool force) g_Vars.currentplayer->bondtankexplode = true; } - bmoveSetMode(MOVEMODE_WALK); - bgunHandlePlayerDead(); + bmove_set_mode(MOVEMODE_WALK); + bgun_handle_player_dead(); - if (playerGetMissionTime() - g_Vars.currentplayer->lifestarttime60 < g_Vars.currentplayerstats->shortestlife) { - g_Vars.currentplayerstats->shortestlife = playerGetMissionTime() - g_Vars.currentplayer->lifestarttime60; + if (player_get_mission_time() - g_Vars.currentplayer->lifestarttime60 < g_Vars.currentplayerstats->shortestlife) { + g_Vars.currentplayerstats->shortestlife = player_get_mission_time() - g_Vars.currentplayer->lifestarttime60; } - g_Vars.currentplayer->lifestarttime60 = playerGetMissionTime(); + g_Vars.currentplayer->lifestarttime60 = player_get_mission_time(); } } -void playerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z) +void player_check_if_shot_in_back(s32 attackerplayernum, f32 x, f32 z) { if (g_Vars.normmplayerisrunning) { s32 victimplayernum = g_Vars.currentplayernum; @@ -4870,7 +4870,7 @@ void playerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z) * * A return value of 0 means zero height, while 1 means full expanded height. */ -f32 playerGetHealthBarHeightFrac(void) +f32 player_get_health_bar_height_frac(void) { f32 done; f32 total; @@ -4891,32 +4891,32 @@ f32 playerGetHealthBarHeightFrac(void) return 1; } -bool playerIsHealthVisible(void) +bool player_is_health_visible(void) { return g_Vars.currentplayer->healthshowmode != HEALTHSHOWMODE_HIDDEN; } // Never called -void playerSetInvincible(bool enable) +void player_set_invincible(bool enable) { if (enable) { - cheatActivate(CHEAT_INVINCIBLE); + cheat_activate(CHEAT_INVINCIBLE); } else { - cheatDeactivate(CHEAT_INVINCIBLE); + cheat_deactivate(CHEAT_INVINCIBLE); } } -void playerSetBondVisible(bool visible) +void player_set_bond_visible(bool visible) { g_Vars.bondvisible = visible; } -void playerSetBondCollisionsEnabled(bool enabled) +void player_set_bond_collisions_enabled(bool enabled) { g_Vars.bondcollisions = enabled; } -void playerSetCameraMode(s32 mode) +void player_set_camera_mode(s32 mode) { g_Vars.currentplayer->cameramode = mode; } @@ -4931,7 +4931,7 @@ void playerSetCameraMode(s32 mode) * the function is assuming the previous values came from memcampos which is * not the case when controlling the eyespy or a Slayer rocket. */ -void playerMoveCameraFromPosRooms(struct coord *pos, struct coord *up, struct coord *look, struct coord *prevgoodpos, RoomNum *prevgoodrooms) +void player_move_camera_from_pos_rooms(struct coord *pos, struct coord *up, struct coord *look, struct coord *prevgoodpos, RoomNum *prevgoodrooms) { bool done = false; RoomNum inrooms[21]; @@ -4949,7 +4949,7 @@ void playerMoveCameraFromPosRooms(struct coord *pos, struct coord *up, struct co // Remove values from rooms if that room doesn't contain the coord, // and shuffle the array back when removing values. for (i = 0; rooms[i] != -1; i++) { - if (!bgRoomContainsCoord(pos, rooms[i])) { + if (!bg_room_contains_coord(pos, rooms[i])) { s32 j; #if VERSION >= VERSION_NTSC_1_0 @@ -4973,15 +4973,15 @@ void playerMoveCameraFromPosRooms(struct coord *pos, struct coord *up, struct co // In most cases there is one room containing the given pos if (rooms[0] != -1 && rooms[1] == -1) { - playerSetCamPropertiesInBounds(pos, up, look, rooms[0]); + player_set_cam_properties_in_bounds(pos, up, look, rooms[0]); done = true; } if (!done) { for (i = 0; rooms[i] != -1; i++) { if ((g_Rooms[rooms[i]].flags & ROOMFLAG_COMPLICATEDPORTALS) == 0) { - if (bgTestPosInRoom(pos, rooms[i])) { - playerSetCamPropertiesInBounds(pos, up, look, rooms[i]); + if (bg_test_pos_in_room(pos, rooms[i])) { + player_set_cam_properties_in_bounds(pos, up, look, rooms[i]); done = true; break; } @@ -4993,8 +4993,8 @@ void playerMoveCameraFromPosRooms(struct coord *pos, struct coord *up, struct co if (!done) { for (i = 0; rooms[i] != -1; i++) { if (g_Rooms[rooms[i]].flags & ROOMFLAG_COMPLICATEDPORTALS) { - if (bgTestPosInRoom(pos, rooms[i])) { - playerSetCamPropertiesInBounds(pos, up, look, rooms[i]); + if (bg_test_pos_in_room(pos, rooms[i])) { + player_set_cam_properties_in_bounds(pos, up, look, rooms[i]); done = true; break; } @@ -5004,69 +5004,69 @@ void playerMoveCameraFromPosRooms(struct coord *pos, struct coord *up, struct co } if (!done) { - bgFindRoomsByPos(pos, inrooms, aboverooms, 20, &bestroom); + bg_find_rooms_by_pos(pos, inrooms, aboverooms, 20, &bestroom); if (inrooms[0] != -1) { - tmp = room = cdFindFloorRoomAtPos(pos, inrooms); + tmp = room = cd_find_floor_room_at_pos(pos, inrooms); if (room > 0) { - playerSetCamPropertiesInBounds(pos, up, look, tmp); + player_set_cam_properties_in_bounds(pos, up, look, tmp); } else { - playerSetCamPropertiesInBounds(pos, up, look, inrooms[0]); + player_set_cam_properties_in_bounds(pos, up, look, inrooms[0]); } } else if (aboverooms[0] != -1) { - tmp = room = cdFindFloorRoomAtPos(pos, aboverooms); + tmp = room = cd_find_floor_room_at_pos(pos, aboverooms); if (room > 0) { - playerSetCamPropertiesOutOfBounds(pos, up, look, tmp); + player_set_cam_properties_out_of_bounds(pos, up, look, tmp); } else { - playerSetCamPropertiesOutOfBounds(pos, up, look, aboverooms[0]); + player_set_cam_properties_out_of_bounds(pos, up, look, aboverooms[0]); } } else { if (bestroom != -1) { - playerSetCamPropertiesOutOfBounds(pos, up, look, bestroom); + player_set_cam_properties_out_of_bounds(pos, up, look, bestroom); } else { - playerSetCamPropertiesOutOfBounds(pos, up, look, 1); + player_set_cam_properties_out_of_bounds(pos, up, look, 1); } } } } -void playerMoveCameraFromPosRoom(struct coord *pos, struct coord *up, struct coord *look, struct coord *frompos, s32 fromroom) +void player_move_camera_from_pos_room(struct coord *pos, struct coord *up, struct coord *look, struct coord *frompos, s32 fromroom) { RoomNum fromrooms[2]; fromrooms[0] = fromroom; fromrooms[1] = -1; - playerMoveCameraFromPosRooms(pos, up, look, frompos, fromrooms); + player_move_camera_from_pos_rooms(pos, up, look, frompos, fromrooms); } -void playerMoveCamera(struct coord *pos, struct coord *up, struct coord *look) +void player_move_camera(struct coord *pos, struct coord *up, struct coord *look) { if (g_Vars.currentplayer->memcamroom >= 0) { - playerMoveCameraFromPosRoom(pos, up, look, &g_Vars.currentplayer->memcampos, g_Vars.currentplayer->memcamroom); + player_move_camera_from_pos_room(pos, up, look, &g_Vars.currentplayer->memcampos, g_Vars.currentplayer->memcamroom); } else { - playerMoveCameraFromPosRooms(pos, up, look, NULL, NULL); + player_move_camera_from_pos_rooms(pos, up, look, NULL, NULL); } } -void playerSetCamPropertiesInBounds(struct coord *pos, struct coord *up, struct coord *look, s32 room) +void player_set_cam_properties_in_bounds(struct coord *pos, struct coord *up, struct coord *look, s32 room) { g_Vars.currentplayer->memcampos.x = pos->x; g_Vars.currentplayer->memcampos.y = pos->y; g_Vars.currentplayer->memcampos.z = pos->z; g_Vars.currentplayer->memcamroom = room; - playerSetCamProperties(pos, up, look, room); + player_set_cam_properties(pos, up, look, room); } -void playerSetCamPropertiesOutOfBounds(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) { - playerClearMemCamRoom(); - playerSetCamProperties(pos, up, look, room); + player_clear_mem_cam_room(); + player_set_cam_properties(pos, up, look, room); } -void playerSetCamProperties(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) { struct player *player = g_Vars.currentplayer; @@ -5082,46 +5082,46 @@ void playerSetCamProperties(struct coord *pos, struct coord *up, struct coord *l player->cam_room = room; } -void playerClearMemCamRoom(void) +void player_clear_mem_cam_room(void) { g_Vars.currentplayer->memcamroom = -1; } -void playersClearMemCamRoom(void) +void players_clear_mem_cam_room(void) { s32 prevplayernum = g_Vars.currentplayernum; s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); - playerClearMemCamRoom(); + set_current_player_num(i); + player_clear_mem_cam_room(); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } -void playerSetPerimEnabled(struct prop *prop, bool enable) +void player_set_perim_enabled(struct prop *prop, bool enable) { - u32 playernum = playermgrGetPlayerNumByProp(prop); + u32 playernum = playermgr_get_player_num_by_prop(prop); if (g_Vars.players[playernum]->haschrbody) { - chrSetPerimEnabled(prop->chr, enable); + chr_set_perim_enabled(prop->chr, enable); } if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK) { if (g_Vars.currentplayer->unk1af0) { - objSetPerimEnabled(g_Vars.currentplayer->unk1af0, enable); + obj_set_perim_enabled(g_Vars.currentplayer->unk1af0, enable); } } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { - objSetPerimEnabled(g_Vars.currentplayer->hoverbike, enable); + obj_set_perim_enabled(g_Vars.currentplayer->hoverbike, enable); } g_Vars.players[playernum]->bondperimenabled = enable; } -bool playerUpdateGeometry(struct prop *prop, u8 **start, u8 **end) +bool player_update_geometry(struct prop *prop, u8 **start, u8 **end) { - s32 playernum = playermgrGetPlayerNumByProp(prop); + s32 playernum = playermgr_get_player_num_by_prop(prop); if (g_Vars.players[playernum]->bondperimenabled && (!g_Vars.mplayerisrunning || !g_Vars.players[playernum]->isdead)) { @@ -5145,7 +5145,7 @@ bool playerUpdateGeometry(struct prop *prop, u8 **start, u8 **end) return false; } -void playerUpdatePerimInfo(void) +void player_update_perim_info(void) { g_Vars.currentplayer->periminfo.header.type = GEOTYPE_CYL; g_Vars.currentplayer->periminfo.header.flags = GEOFLAG_WALL | GEOFLAG_BLOCK_SHOOT; @@ -5178,9 +5178,9 @@ void playerUpdatePerimInfo(void) * ymax is the top of the head, minus some if crouching, and always at least 80 * units above the feet. */ -void playerGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) +void player_get_bbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) { - s32 playernum = playermgrGetPlayerNumByProp(prop); + s32 playernum = playermgr_get_player_num_by_prop(prop); *radius = g_Vars.players[playernum]->bond2.radius; *ymin = g_Vars.currentplayer->vv_manground + 30; @@ -5198,14 +5198,14 @@ void playerGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) } } -f32 playerGetHealthFrac(void) +f32 player_get_health_frac(void) { return g_Vars.currentplayer->bondhealth; } -f32 playerGetShieldFrac(void) +f32 player_get_shield_frac(void) { - f32 frac = chrGetShield(g_Vars.currentplayer->prop->chr) * 0.125f; + f32 frac = chr_get_shield(g_Vars.currentplayer->prop->chr) * 0.125f; if (frac < 0) { frac = 0; @@ -5218,7 +5218,7 @@ f32 playerGetShieldFrac(void) return frac; } -void playerSetShieldFrac(f32 frac) +void player_set_shield_frac(f32 frac) { if (frac < 0) { frac = 0; @@ -5228,10 +5228,10 @@ void playerSetShieldFrac(f32 frac) frac = 1; } - chrSetShield(g_Vars.currentplayer->prop->chr, frac * 8); + chr_set_shield(g_Vars.currentplayer->prop->chr, frac * 8); } -s32 playerGetMissionTime(void) +s32 player_get_mission_time(void) { #if PAL return g_Vars.currentplayer->bondviewlevtime60 * 60 / 50; @@ -5240,29 +5240,29 @@ s32 playerGetMissionTime(void) #endif } -s32 playerTickBeams(struct prop *prop) +s32 player_tick_beams(struct prop *prop) { - beamTick(&g_Vars.players[playermgrGetPlayerNumByProp(prop)]->hands[0].beam); - beamTick(&g_Vars.players[playermgrGetPlayerNumByProp(prop)]->hands[1].beam); + beam_tick(&g_Vars.players[playermgr_get_player_num_by_prop(prop)]->hands[0].beam); + beam_tick(&g_Vars.players[playermgr_get_player_num_by_prop(prop)]->hands[1].beam); if (prop->chr && g_Vars.mplayerisrunning) { struct chrdata *chr = prop->chr; if (chr->fireslots[0] >= 0) { - beamTick(&g_Fireslots[chr->fireslots[0]].beam); + beam_tick(&g_Fireslots[chr->fireslots[0]].beam); } if (chr->fireslots[1] >= 0) { - beamTick(&g_Fireslots[chr->fireslots[1]].beam); + beam_tick(&g_Fireslots[chr->fireslots[1]].beam); } } return 0; } -s32 playerTickThirdPerson(struct prop *prop) +s32 player_tick_third_person(struct prop *prop) { - s32 playernum = playermgrGetPlayerNumByProp(prop); + s32 playernum = playermgr_get_player_num_by_prop(prop); struct player *player = g_Vars.players[playernum]; struct chrdata *chr = prop->chr; s32 i; @@ -5292,7 +5292,7 @@ s32 playerTickThirdPerson(struct prop *prop) chr->chrflags |= CHRCFLAG_FORCETOGROUND; player->bondperimenabled = false; - tickop1 = chrTick(prop); + tickop1 = chr_tick(prop); player->bondperimenabled = true; player->vv_ground = chr->ground; @@ -5307,24 +5307,24 @@ s32 playerTickThirdPerson(struct prop *prop) spe8 = player->model00d4->matrices; } - mtx00015be4(camGetProjectionMtxF(), spe8, &spa8); + mtx00015be4(cam_get_projection_mtxf(), spe8, &spa8); sp9c.x = spa8.m[3][0] + spa8.m[1][0] * 7; sp9c.y = spa8.m[3][1] + spa8.m[1][1] * 7; sp9c.z = spa8.m[3][2] + spa8.m[1][2] * 7; - player->vv_theta = (M_BADTAU - chrGetInverseTheta(chr)) * 360.0f / M_BADTAU; + player->vv_theta = (M_BADTAU - chr_get_inverse_theta(chr)) * 360.0f / M_BADTAU; player->vv_verta = 0; } else { sp9c.x = player->prop->pos.x; sp9c.y = player->prop->pos.y; sp9c.z = player->prop->pos.z; - player->vv_theta = (M_BADTAU - chrGetInverseTheta(chr)) * 360.0f / M_BADTAU; + player->vv_theta = (M_BADTAU - chr_get_inverse_theta(chr)) * 360.0f / M_BADTAU; player->vv_verta = 0; } - bmoveUpdateVerta(); + bmove_update_verta(); bmove0f0cc19c(&sp9c); return tickop1; @@ -5339,13 +5339,13 @@ s32 playerTickThirdPerson(struct prop *prop) chr->actiontype = ACT_BONDMULTI; if ((chr->hidden & CHRHFLAG_00000800) == 0) { - leftprop = chrGetHeldProp(chr, HAND_LEFT); - rightprop = chrGetHeldProp(chr, HAND_RIGHT); - animnum = modelGetAnimNum(chr->model); + leftprop = chr_get_held_prop(chr, HAND_LEFT); + rightprop = chr_get_held_prop(chr, HAND_RIGHT); + animnum = model_get_anim_num(chr->model); - playerChooseThirdPersonAnimation(chr, bmoveGetCrouchPosByPlayer(playernum), player->speedsideways, player->speedforwards, player->speedtheta, &player->angleoffset, &chr->act_bondmulti.animcfg); + player_choose_third_person_animation(chr, bmove_get_crouch_pos_by_player(playernum), player->speedsideways, player->speedforwards, player->speedtheta, &player->angleoffset, &chr->act_bondmulti.animcfg); - if (chrIsDead(chr)) { + if (chr_is_dead(chr)) { shootrotx = 0; shootroty = 0; } else { @@ -5353,10 +5353,10 @@ s32 playerTickThirdPerson(struct prop *prop) shootroty = player->shootroty; } - if (modelGetAnimNum(chr->model) == animnum) { + if (model_get_anim_num(chr->model) == animnum) { if (chr->act_bondmulti.animcfg) { chr->hidden2 &= ~CHRH2FLAG_AUTOANIM; - chrCalculateAimEndProperties(chr, chr->act_bondmulti.animcfg, leftprop != NULL, rightprop != NULL, shootrotx); + chr_calculate_aim_end_properties(chr, chr->act_bondmulti.animcfg, leftprop != NULL, rightprop != NULL, shootrotx); } else { chr->hidden2 |= CHRH2FLAG_AUTOANIM; chr->aimendback = shootrotx; @@ -5368,20 +5368,20 @@ s32 playerTickThirdPerson(struct prop *prop) chr->aimendsideback = shootroty; chr->aimendcount = 10; - chrSetFiring(chr, HAND_RIGHT, player->hands[HAND_RIGHT].flashon); - chrSetFiring(chr, HAND_LEFT, player->hands[HAND_LEFT].flashon); + chr_set_firing(chr, HAND_RIGHT, player->hands[HAND_RIGHT].flashon); + chr_set_firing(chr, HAND_LEFT, player->hands[HAND_LEFT].flashon); } sp80.x = prop->pos.x; sp80.y = prop->pos.y; sp80.z = prop->pos.z; - modelGetRootPosition(chr->model, &sp8c); + model_get_root_position(chr->model, &sp8c); sp8c.x = prop->pos.x; sp8c.z = prop->pos.z; - modelSetRootPosition(chr->model, &sp8c); + model_set_root_position(chr->model, &sp8c); angle = (360.0f - player->vv_theta) * 0.017450513318181f - player->angleoffset; @@ -5391,11 +5391,11 @@ s32 playerTickThirdPerson(struct prop *prop) angle += M_BADTAU; } - chrSetLookAngle(chr, angle); + chr_set_look_angle(chr, angle); chr->chrflags |= CHRHFLAG_DROPPINGITEM; - tickop2 = chrTick(prop); + tickop2 = chr_tick(prop); prop->pos.x = sp80.x; prop->pos.y = sp80.y; @@ -5403,7 +5403,7 @@ s32 playerTickThirdPerson(struct prop *prop) if ((chr->hidden & CHRHFLAG_00000800) == 0) { for (i = 0; i < 2; i++) { - if (chrGetGunPos(chr, i, &player->chrmuzzlelastpos[i])) { + if (chr_get_gun_pos(chr, i, &player->chrmuzzlelastpos[i])) { player->chrmuzzlelast[i] = g_Vars.lvframenum; } else if (player->chrmuzzlelast[i] < g_Vars.lvframenum - 1) { player->chrmuzzlelastpos[i].x = player->hands[i].muzzlepos.x; @@ -5419,16 +5419,16 @@ s32 playerTickThirdPerson(struct prop *prop) } if (PLAYERCOUNT() == 1) { - chrUpdateCloak(chr); + chr_update_cloak(chr); } if (player->haschrbody && chr->model) { - modelGetRootPosition(chr->model, &sp5c); + model_get_root_position(chr->model, &sp5c); sp5c.x = prop->pos.x; sp5c.z = prop->pos.z; - modelSetRootPosition(chr->model, &sp5c); + model_set_root_position(chr->model, &sp5c); } chr->ground = player->vv_ground; @@ -5437,11 +5437,11 @@ s32 playerTickThirdPerson(struct prop *prop) if (g_Vars.mplayerisrunning) { if (chr->weapons_held[0] && (chr->weapons_held[0]->obj->hidden & OBJHFLAG_DELETING)) { - objFree(chr->weapons_held[0]->obj, true, false); + obj_free(chr->weapons_held[0]->obj, true, false); } if (chr->weapons_held[1] && (chr->weapons_held[1]->obj->hidden & OBJHFLAG_DELETING)) { - objFree(chr->weapons_held[1]->obj, true, false); + obj_free(chr->weapons_held[1]->obj, true, false); } } @@ -5457,10 +5457,10 @@ s32 playerTickThirdPerson(struct prop *prop) * * Despite the function name, this is also used for bots. */ -void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 speedsideways, f32 speedforwards, f32 speedtheta, f32 *angleoffset, struct attackanimconfig **animcfgptr) +void player_choose_third_person_animation(struct chrdata *chr, s32 crouchpos, f32 speedsideways, f32 speedforwards, f32 speedtheta, f32 *angleoffset, struct attackanimconfig **animcfgptr) { - struct prop *leftprop = chrGetHeldProp(chr, HAND_LEFT); - struct prop *rightprop = chrGetHeldProp(chr, HAND_RIGHT); + struct prop *leftprop = chr_get_held_prop(chr, HAND_LEFT); + struct prop *rightprop = chr_get_held_prop(chr, HAND_RIGHT); struct weaponobj *leftgun = NULL; struct weaponobj *rightgun = NULL; s16 animnum = 0; @@ -5486,9 +5486,9 @@ void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 sp rightgun = rightprop->weapon; } - prevanimnum = modelGetAnimNum(chr->model); + prevanimnum = model_get_anim_num(chr->model); - if (chrIsDead(chr)) { + if (chr_is_dead(chr)) { // Choose a death animation bool found = false; @@ -5512,15 +5512,15 @@ void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 sp struct prop *chrprop = chr->prop; if (chrprop->type == PROPTYPE_PLAYER - && g_Vars.players[playermgrGetPlayerNumByProp(chrprop)]->bondmovemode == MOVEMODE_BIKE) { + && g_Vars.players[playermgr_get_player_num_by_prop(chrprop)]->bondmovemode == MOVEMODE_BIKE) { // Player on a hoverbike if (leftprop && rightprop) { wieldmode = WIELDMODE_DUALGUNS; } else if (!leftprop && !rightprop) { wieldmode = WIELDMODE_UNARMED; - } else if (leftgun && weaponHasFlag(leftgun->weaponnum, WEAPONFLAG_ONEHANDED)) { + } else if (leftgun && weapon_has_flag(leftgun->weaponnum, WEAPONFLAG_ONEHANDED)) { wieldmode = WIELDMODE_PISTOL; - } else if (rightgun && weaponHasFlag(rightgun->weaponnum, WEAPONFLAG_ONEHANDED)) { + } else if (rightgun && weapon_has_flag(rightgun->weaponnum, WEAPONFLAG_ONEHANDED)) { wieldmode = WIELDMODE_PISTOL; } else { wieldmode = WIELDMODE_HEAVY; @@ -5544,13 +5544,13 @@ void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 sp wieldmode = WIELDMODE_DUALGUNS; } else if (!leftprop && !rightprop) { wieldmode = WIELDMODE_UNARMED; - } else if (leftgun && !weaponHasFlag(leftgun->weaponnum, WEAPONFLAG_AICANUSE)) { + } else if (leftgun && !weapon_has_flag(leftgun->weaponnum, WEAPONFLAG_AICANUSE)) { wieldmode = WIELDMODE_UNARMED; - } else if (rightgun && !weaponHasFlag(rightgun->weaponnum, WEAPONFLAG_AICANUSE)) { + } else if (rightgun && !weapon_has_flag(rightgun->weaponnum, WEAPONFLAG_AICANUSE)) { wieldmode = WIELDMODE_UNARMED; - } else if (leftgun && weaponHasFlag(leftgun->weaponnum, WEAPONFLAG_ONEHANDED)) { + } else if (leftgun && weapon_has_flag(leftgun->weaponnum, WEAPONFLAG_ONEHANDED)) { wieldmode = WIELDMODE_PISTOL; - } else if (rightgun && weaponHasFlag(rightgun->weaponnum, WEAPONFLAG_ONEHANDED)) { + } else if (rightgun && weapon_has_flag(rightgun->weaponnum, WEAPONFLAG_ONEHANDED)) { wieldmode = WIELDMODE_PISTOL; } else { wieldmode = WIELDMODE_HEAVY; @@ -5601,7 +5601,7 @@ void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 sp } } else if (turnspeed < 0.4f || (chr->prop->type == PROPTYPE_PLAYER - && g_Vars.players[playermgrGetPlayerNumByProp(chr->prop)]->headanim == HEADANIM_RESTING)) { + && g_Vars.players[playermgr_get_player_num_by_prop(chr->prop)]->headanim == HEADANIM_RESTING)) { turnmode = TURNMODE_STAND_SOFTTURN; speed = 2.0f * turnspeed; @@ -5674,35 +5674,35 @@ void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 sp if (reconfigure) { if (chr->model->anim->animnum2 == 0) { - modelSetAnimation(chr->model, animnum, false, startframe >= 0 ? startframe : 0, speed, 16); + model_set_animation(chr->model, animnum, false, startframe >= 0 ? startframe : 0, speed, 16); if (startframe >= 0) { - modelSetAnimLooping(chr->model, startframe, 16); + model_set_anim_looping(chr->model, startframe, 16); } if (endframe >= 0) { - modelSetAnimEndFrame(chr->model, endframe); + model_set_anim_end_frame(chr->model, endframe); } } } else { - if (speed != modelGetAnimSpeed(chr->model)) { - modelSetAnimSpeed(chr->model, speed, 1); + if (speed != model_get_anim_speed(chr->model)) { + model_set_anim_speed(chr->model, speed, 1); } } *animcfgptr = animcfg; } -Gfx *playerRender(struct prop *prop, Gfx *gdl, bool xlupass) +Gfx *player_render(struct prop *prop, Gfx *gdl, bool xlupass) { - if (g_Vars.players[playermgrGetPlayerNumByProp(prop)]->haschrbody) { - gdl = chrRender(prop, gdl, xlupass); + if (g_Vars.players[playermgr_get_player_num_by_prop(prop)]->haschrbody) { + gdl = chr_render(prop, gdl, xlupass); } return gdl; } -Gfx *playerLoadMatrix(Gfx *gdl) +Gfx *player_load_matrix(Gfx *gdl) { gSPMatrix(gdl++, g_Vars.currentplayer->mtxl005c, G_MTX_LOAD); return gdl; @@ -5715,12 +5715,12 @@ void player0f0c3320(Mtxf *matrices, s32 count) s32 j; for (i = 0, j = 0; i < count; i++, j += sizeof(Mtxf)) { - mtx00015be4(camGetProjectionMtxF(), (Mtxf *)((uintptr_t)matrices + j), &sp40); + mtx00015be4(cam_get_projection_mtxf(), (Mtxf *)((uintptr_t)matrices + j), &sp40); sp40.m[3][0] -= g_Vars.currentplayer->globaldrawworldoffset.x; sp40.m[3][1] -= g_Vars.currentplayer->globaldrawworldoffset.y; sp40.m[3][2] -= g_Vars.currentplayer->globaldrawworldoffset.z; - mtxF2L(&sp40, matrices + i); + mtx_f2l(&sp40, matrices + i); } } diff --git a/src/game/playermgr.c b/src/game/playermgr.c index 01d47c65e..caaf46d6d 100644 --- a/src/game/playermgr.c +++ b/src/game/playermgr.c @@ -11,7 +11,7 @@ #include "data.h" #include "types.h" -void playermgrInit(void) +void playermgr_init(void) { s32 i; @@ -24,7 +24,7 @@ void playermgrInit(void) g_Vars.antiplayernum = -1; } -void playermgrReset(void) +void playermgr_reset(void) { g_Vars.players[0] = NULL; g_Vars.players[1] = NULL; @@ -46,7 +46,7 @@ void playermgrReset(void) g_Vars.anti = NULL; } -void playermgrAllocatePlayers(s32 count) +void playermgr_allocate_players(s32 count) { g_Vars.players[0] = NULL; g_Vars.players[1] = NULL; @@ -57,10 +57,10 @@ void playermgrAllocatePlayers(s32 count) s32 i; for (i = 0; i < count; i++) { - playermgrAllocatePlayer(i); + playermgr_allocate_player(i); } - setCurrentPlayerNum(0); + set_current_player_num(0); g_Vars.bond = g_Vars.players[g_Vars.bondplayernum]; if (g_Vars.coopplayernum >= 0) { @@ -71,13 +71,13 @@ void playermgrAllocatePlayers(s32 count) g_Vars.anti = g_Vars.players[g_Vars.antiplayernum]; } } else { - playermgrAllocatePlayer(0); - setCurrentPlayerNum(0); + playermgr_allocate_player(0); + set_current_player_num(0); if (g_Vars.fourmeg2player) { - playermgrSetViewSize(playerGetFbWidth(), playerGetFbHeight() * 2); + playermgr_set_view_size(player_get_fb_width(), player_get_fb_height() * 2); } else { - playermgrSetViewSize(playerGetFbWidth(), playerGetFbHeight()); + playermgr_set_view_size(player_get_fb_width(), player_get_fb_height()); } g_Vars.coop = NULL; @@ -86,7 +86,7 @@ void playermgrAllocatePlayers(s32 count) } } -void playermgrAllocatePlayer(s32 index) +void playermgr_allocate_player(s32 index) { struct hand hand = { {0}, @@ -214,7 +214,7 @@ void playermgrAllocatePlayer(s32 index) s32 i; - g_Vars.players[index] = mempAlloc(sizeof(struct player), MEMPOOL_STAGE); + g_Vars.players[index] = memp_alloc(sizeof(struct player), MEMPOOL_STAGE); g_Vars.players[index]->cameramode = CAMERAMODE_DEFAULT; g_Vars.players[index]->memcampos.x = 0; @@ -542,7 +542,7 @@ void playermgrAllocatePlayer(s32 index) g_Vars.players[index]->equipcuritem = 0; g_Vars.players[index]->angleoffset = 0; - g_Vars.players[index]->invincible = cheatIsActive(CHEAT_INVINCIBLE); + g_Vars.players[index]->invincible = cheat_is_active(CHEAT_INVINCIBLE); g_Vars.players[index]->healthdamagetype = 7; g_Vars.players[index]->vv_height = 1; g_Vars.players[index]->vv_eyeheight = 1; @@ -647,7 +647,7 @@ void playermgrAllocatePlayer(s32 index) g_Vars.bondcollisions = true; } -void playermgrCalculateAiBuddyNums(void) +void playermgr_calculate_ai_buddy_nums(void) { s32 i; s32 playernum = g_Vars.currentplayernum; @@ -661,15 +661,15 @@ void playermgrCalculateAiBuddyNums(void) } } -void setCurrentPlayerNum(s32 playernum) +void set_current_player_num(s32 playernum) { g_Vars.currentplayernum = playernum; g_Vars.currentplayer = g_Vars.players[playernum]; g_Vars.currentplayerstats = &g_Vars.playerstats[playernum]; - g_Vars.currentplayerindex = playermgrGetOrderOfPlayer(playernum); + g_Vars.currentplayerindex = playermgr_get_order_of_player(playernum); } -s32 playermgrGetPlayerNumByProp(struct prop *prop) +s32 playermgr_get_player_num_by_prop(struct prop *prop) { s32 i; @@ -682,29 +682,29 @@ s32 playermgrGetPlayerNumByProp(struct prop *prop) return -1; } -void playermgrSetViewSize(s32 width, s32 height) +void playermgr_set_view_size(s32 width, s32 height) { g_Vars.currentplayer->viewwidth = width; g_Vars.currentplayer->viewheight = height; } -void playermgrSetViewPosition(s32 viewleft, s32 viewtop) +void playermgr_set_view_position(s32 viewleft, s32 viewtop) { g_Vars.currentplayer->viewleft = viewleft; g_Vars.currentplayer->viewtop = viewtop; } -void playermgrSetFovY(f32 fovy) +void playermgr_set_fov_y(f32 fovy) { g_Vars.currentplayer->fovy = fovy; } -void playermgrSetAspectRatio(f32 aspect) +void playermgr_set_aspect_ratio(f32 aspect) { g_Vars.currentplayer->aspect = aspect; } -s32 playermgrGetModelOfWeapon(s32 weapon) +s32 playermgr_get_model_of_weapon(s32 weapon) { s32 model; @@ -766,18 +766,18 @@ s32 playermgrGetModelOfWeapon(s32 weapon) return model; } -void playermgrDeleteWeapon(s32 hand) +void playermgr_delete_weapon(s32 hand) { - weaponDeleteFromChr(g_Vars.currentplayer->prop->chr, hand); + weapon_delete_from_chr(g_Vars.currentplayer->prop->chr, hand); } -void playermgrCreateWeapon(s32 hand) +void playermgr_create_weapon(s32 hand) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; if (chr->weapons_held[hand] == NULL) { - s32 weaponnum = bgunGetWeaponNum(hand); - s32 modelnum = playermgrGetModelOfWeapon(weaponnum); + s32 weaponnum = bgun_get_weapon_num(hand); + s32 modelnum = playermgr_get_model_of_weapon(weaponnum); if (hand == HAND_LEFT && weaponnum == WEAPON_REMOTEMINE) { modelnum = -1; @@ -792,12 +792,12 @@ void playermgrCreateWeapon(s32 hand) flags = OBJFLAG_WEAPON_LEFTHANDED; } - weaponCreateForChr(chr, modelnum, weaponnum, flags, NULL, NULL); + weapon_create_for_chr(chr, modelnum, weaponnum, flags, NULL, NULL); } } } -void playermgrShuffle(void) +void playermgr_shuffle(void) { s32 i; @@ -816,7 +816,7 @@ void playermgrShuffle(void) } } -s32 playermgrGetOrderOfPlayer(s32 playernum) +s32 playermgr_get_order_of_player(s32 playernum) { s32 index = 0; s32 i; @@ -836,7 +836,7 @@ s32 playermgrGetOrderOfPlayer(s32 playernum) return index; } -s32 playermgrGetPlayerAtOrder(s32 ordernum) +s32 playermgr_get_player_at_order(s32 ordernum) { s32 i; diff --git a/src/game/playerreset.c b/src/game/playerreset.c index 4aca4a153..5b7b4acbb 100644 --- a/src/game/playerreset.c +++ b/src/game/playerreset.c @@ -24,7 +24,7 @@ #include "data.h" #include "types.h" -void playerInitEyespy(void) +void player_init_eyespy(void) { struct prop *prop; struct pad pad; @@ -34,7 +34,7 @@ void playerInitEyespy(void) if (g_Vars.currentplayer->eyespy == NULL) { /** - * To create the eyespy's prop, a pad must be passed to bodyAllocateEyespy. + * To create the eyespy's prop, a pad must be passed to body_allocate_eyespy. * However the eyespy doesn't have a pad because it's held by the * player, so it needs to choose one from the stage. The method used * will increment the chosen pad number each time the stage is loaded @@ -44,11 +44,11 @@ void playerInitEyespy(void) * the camspy will start in a trigger point for the mid cutscene, * causing the mid cutscene to play instead of the intro. */ - padUnpack(nextpad++, PADFIELD_ROOM | PADFIELD_POS, &pad); - prop = bodyAllocateEyespy(&pad, pad.room); + pad_unpack(nextpad++, PADFIELD_ROOM | PADFIELD_POS, &pad); + prop = body_allocate_eyespy(&pad, pad.room); if (prop) { - g_Vars.currentplayer->eyespy = mempAlloc(sizeof(struct eyespy), MEMPOOL_STAGE); + g_Vars.currentplayer->eyespy = memp_alloc(sizeof(struct eyespy), MEMPOOL_STAGE); if (g_Vars.currentplayer->eyespy) { g_Vars.currentplayer->eyespy->prop = prop; @@ -86,11 +86,11 @@ void playerInitEyespy(void) playerchr = g_Vars.currentplayer->prop->chr; propchr->team = playerchr->team; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { g_Vars.currentplayer->eyespy->mode = EYESPYMODE_DRUGSPY; g_Weapons[WEAPON_EYESPY]->name = L_GUN_061; // "DrugSpy" g_Weapons[WEAPON_EYESPY]->shortname = L_GUN_061; // "DrugSpy" - } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR || stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { + } else if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR || stage_get_index(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { g_Vars.currentplayer->eyespy->mode = EYESPYMODE_BOMBSPY; } else { g_Vars.currentplayer->eyespy->mode = EYESPYMODE_CAMSPY; @@ -107,7 +107,7 @@ struct cmd32 { s32 param3; }; -void playerReset(void) +void player_reset(void) { struct coord pos = {0, 0, 0}; RoomNum rooms[8]; @@ -124,7 +124,7 @@ void playerReset(void) s32 bodynum; s32 headnum; - playerResetLoResIf4Mb(); + player_reset_lo_res_if_4mb(); func0f18e558(); g_InCutscene = false; @@ -150,7 +150,7 @@ void playerReset(void) g_PlayersWithControl[3] = true; g_PlayerInvincible = false; - playerSetTickMode(TICKMODE_GE_FADEIN); + player_set_tick_mode(TICKMODE_GE_FADEIN); g_PlayerTriggerGeFadeIn = 0; var80070748 = 0; @@ -181,13 +181,13 @@ void playerReset(void) break; case INTROCMD_WEAPON: if (cmd->param3 == 0 && g_Vars.currentplayer != g_Vars.anti) { - modelmgrLoadProjectileModeldefs(cmd->param1); + modelmgr_load_projectile_modeldefs(cmd->param1); if (cmd->param2 >= 0) { - modelmgrLoadProjectileModeldefs(cmd->param2); - invGiveDoubleWeapon(cmd->param1, cmd->param2); + modelmgr_load_projectile_modeldefs(cmd->param2); + inv_give_double_weapon(cmd->param1, cmd->param2); } else { - invGiveSingleWeapon(cmd->param1); + inv_give_single_weapon(cmd->param1); } if (!hasdefaultweapon) { @@ -208,7 +208,7 @@ void playerReset(void) break; case INTROCMD_AMMO: if (cmd->param3 == 0 && g_Vars.currentplayer != g_Vars.anti) { - bgunSetAmmoQuantity(cmd->param1, cmd->param2); + bgun_set_ammo_quantity(cmd->param1, cmd->param2); } cmd = (struct cmd32 *)((uintptr_t)cmd + 16); break; @@ -249,131 +249,131 @@ void playerReset(void) } } - invGiveSingleWeapon(WEAPON_UNARMED); + inv_give_single_weapon(WEAPON_UNARMED); - if (cheatIsActive(CHEAT_TRENTSMAGNUM)) { - invGiveSingleWeapon(WEAPON_DY357LX); - bgunSetAmmoQuantity(AMMOTYPE_MAGNUM, 80); + if (cheat_is_active(CHEAT_TRENTSMAGNUM)) { + inv_give_single_weapon(WEAPON_DY357LX); + bgun_set_ammo_quantity(AMMOTYPE_MAGNUM, 80); } - if (cheatIsActive(CHEAT_FARSIGHT)) { - invGiveSingleWeapon(WEAPON_FARSIGHT); - bgunSetAmmoQuantity(AMMOTYPE_FARSIGHT, 80); + if (cheat_is_active(CHEAT_FARSIGHT)) { + inv_give_single_weapon(WEAPON_FARSIGHT); + bgun_set_ammo_quantity(AMMOTYPE_FARSIGHT, 80); } - if (cheatIsActive(CHEAT_CLOAKINGDEVICE)) { - invGiveSingleWeapon(WEAPON_CLOAKINGDEVICE); + if (cheat_is_active(CHEAT_CLOAKINGDEVICE)) { + inv_give_single_weapon(WEAPON_CLOAKINGDEVICE); #if VERSION >= VERSION_PAL_FINAL - bgunSetAmmoQuantity(AMMOTYPE_CLOAK, TICKS(7200)); + bgun_set_ammo_quantity(AMMOTYPE_CLOAK, TICKS(7200)); #else - bgunSetAmmoQuantity(AMMOTYPE_CLOAK, 7200); + bgun_set_ammo_quantity(AMMOTYPE_CLOAK, 7200); #endif } - if (cheatIsActive(CHEAT_PERFECTDARKNESS)) { - invGiveSingleWeapon(WEAPON_NIGHTVISION); + if (cheat_is_active(CHEAT_PERFECTDARKNESS)) { + inv_give_single_weapon(WEAPON_NIGHTVISION); } - if (cheatIsActive(CHEAT_RTRACKER)) { - invGiveSingleWeapon(WEAPON_RTRACKER); + if (cheat_is_active(CHEAT_RTRACKER)) { + inv_give_single_weapon(WEAPON_RTRACKER); } - if (cheatIsActive(CHEAT_ROCKETLAUNCHER)) { - invGiveSingleWeapon(WEAPON_ROCKETLAUNCHER); - bgunSetAmmoQuantity(AMMOTYPE_ROCKET, 10); + if (cheat_is_active(CHEAT_ROCKETLAUNCHER)) { + inv_give_single_weapon(WEAPON_ROCKETLAUNCHER); + bgun_set_ammo_quantity(AMMOTYPE_ROCKET, 10); } - if (cheatIsActive(CHEAT_SNIPERRIFLE)) { - invGiveSingleWeapon(WEAPON_SNIPERRIFLE); - bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200); + if (cheat_is_active(CHEAT_SNIPERRIFLE)) { + inv_give_single_weapon(WEAPON_SNIPERRIFLE); + bgun_set_ammo_quantity(AMMOTYPE_RIFLE, 200); } - if (cheatIsActive(CHEAT_XRAYSCANNER)) { - invGiveSingleWeapon(WEAPON_XRAYSCANNER); + if (cheat_is_active(CHEAT_XRAYSCANNER)) { + inv_give_single_weapon(WEAPON_XRAYSCANNER); } - if (cheatIsActive(CHEAT_SUPERDRAGON)) { - invGiveSingleWeapon(WEAPON_SUPERDRAGON); - bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200); - bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, 20); + if (cheat_is_active(CHEAT_SUPERDRAGON)) { + inv_give_single_weapon(WEAPON_SUPERDRAGON); + bgun_set_ammo_quantity(AMMOTYPE_RIFLE, 200); + bgun_set_ammo_quantity(AMMOTYPE_DEVASTATOR, 20); } - if (cheatIsActive(CHEAT_LAPTOPGUN)) { - invGiveSingleWeapon(WEAPON_LAPTOPGUN); - bgunSetAmmoQuantity(AMMOTYPE_SMG, 200); + if (cheat_is_active(CHEAT_LAPTOPGUN)) { + inv_give_single_weapon(WEAPON_LAPTOPGUN); + bgun_set_ammo_quantity(AMMOTYPE_SMG, 200); } - if (cheatIsActive(CHEAT_PHOENIX)) { - invGiveSingleWeapon(WEAPON_PHOENIX); - bgunSetAmmoQuantity(AMMOTYPE_PISTOL, 200); + if (cheat_is_active(CHEAT_PHOENIX)) { + inv_give_single_weapon(WEAPON_PHOENIX); + bgun_set_ammo_quantity(AMMOTYPE_PISTOL, 200); } #if VERSION >= VERSION_NTSC_1_0 - if (cheatIsActive(CHEAT_PSYCHOSISGUN) || cheatIsActive(CHEAT_ALLGUNS)) { - bgunSetAmmoQuantity(AMMOTYPE_PSYCHOSIS, 4); + if (cheat_is_active(CHEAT_PSYCHOSISGUN) || cheat_is_active(CHEAT_ALLGUNS)) { + bgun_set_ammo_quantity(AMMOTYPE_PSYCHOSIS, 4); - if (cheatIsActive(CHEAT_PSYCHOSISGUN)) { - invGiveSingleWeapon(WEAPON_PSYCHOSISGUN); + if (cheat_is_active(CHEAT_PSYCHOSISGUN)) { + inv_give_single_weapon(WEAPON_PSYCHOSISGUN); } } #else - if (cheatIsActive(CHEAT_PSYCHOSISGUN)) { - invGiveSingleWeapon(WEAPON_PSYCHOSISGUN); - bgunSetAmmoQuantity(AMMOTYPE_PSYCHOSIS, 4); + if (cheat_is_active(CHEAT_PSYCHOSISGUN)) { + inv_give_single_weapon(WEAPON_PSYCHOSISGUN); + bgun_set_ammo_quantity(AMMOTYPE_PSYCHOSIS, 4); } #endif - if (cheatIsActive(CHEAT_PP9I)) { - invGiveSingleWeapon(WEAPON_PP9I); - bgunSetAmmoQuantity(AMMOTYPE_PISTOL, 200); + if (cheat_is_active(CHEAT_PP9I)) { + inv_give_single_weapon(WEAPON_PP9I); + bgun_set_ammo_quantity(AMMOTYPE_PISTOL, 200); } - if (cheatIsActive(CHEAT_CC13)) { - invGiveSingleWeapon(WEAPON_CC13); - bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200); + if (cheat_is_active(CHEAT_CC13)) { + inv_give_single_weapon(WEAPON_CC13); + bgun_set_ammo_quantity(AMMOTYPE_RIFLE, 200); } - if (cheatIsActive(CHEAT_KL01313)) { - invGiveSingleWeapon(WEAPON_KL01313); - bgunSetAmmoQuantity(AMMOTYPE_SMG, 200); + if (cheat_is_active(CHEAT_KL01313)) { + inv_give_single_weapon(WEAPON_KL01313); + bgun_set_ammo_quantity(AMMOTYPE_SMG, 200); } - if (cheatIsActive(CHEAT_KF7SPECIAL)) { - invGiveSingleWeapon(WEAPON_KF7SPECIAL); - bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200); + if (cheat_is_active(CHEAT_KF7SPECIAL)) { + inv_give_single_weapon(WEAPON_KF7SPECIAL); + bgun_set_ammo_quantity(AMMOTYPE_RIFLE, 200); } - if (cheatIsActive(CHEAT_ZZT)) { - invGiveSingleWeapon(WEAPON_ZZT); - bgunSetAmmoQuantity(AMMOTYPE_SMG, 200); + if (cheat_is_active(CHEAT_ZZT)) { + inv_give_single_weapon(WEAPON_ZZT); + bgun_set_ammo_quantity(AMMOTYPE_SMG, 200); } - if (cheatIsActive(CHEAT_DMC)) { - invGiveSingleWeapon(WEAPON_DMC); - bgunSetAmmoQuantity(AMMOTYPE_SMG, 200); + if (cheat_is_active(CHEAT_DMC)) { + inv_give_single_weapon(WEAPON_DMC); + bgun_set_ammo_quantity(AMMOTYPE_SMG, 200); } - if (cheatIsActive(CHEAT_AR53)) { - invGiveSingleWeapon(WEAPON_AR53); - bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200); + if (cheat_is_active(CHEAT_AR53)) { + inv_give_single_weapon(WEAPON_AR53); + bgun_set_ammo_quantity(AMMOTYPE_RIFLE, 200); } - if (cheatIsActive(CHEAT_RCP45)) { - invGiveSingleWeapon(WEAPON_RCP45); - bgunSetAmmoQuantity(AMMOTYPE_SMG, 200); + if (cheat_is_active(CHEAT_RCP45)) { + inv_give_single_weapon(WEAPON_RCP45); + bgun_set_ammo_quantity(AMMOTYPE_SMG, 200); } if (!hasdefaultweapon) { g_DefaultWeapons[HAND_RIGHT] = WEAPON_UNARMED; } - g_Vars.currentplayer->prop = propAllocate(); + g_Vars.currentplayer->prop = prop_allocate(); g_Vars.currentplayer->prop->chr = NULL; g_Vars.currentplayer->prop->type = PROPTYPE_PLAYER; - propActivate(g_Vars.currentplayer->prop); - propEnable(g_Vars.currentplayer->prop); - chrInit(g_Vars.currentplayer->prop, NULL); + prop_activate(g_Vars.currentplayer->prop); + prop_enable(g_Vars.currentplayer->prop); + chr_init(g_Vars.currentplayer->prop, NULL); if (g_Vars.coopplayernum >= 0) { g_Vars.currentplayer->prop->chr->team = TEAM_ALLY; @@ -392,24 +392,24 @@ void playerReset(void) } if (haseyespy) { - playerInitEyespy(); + player_init_eyespy(); } if (g_NumSpawnPoints > 0) { if (g_Vars.coopplayernum >= 0) { - turnanglerad = M_BADTAU - scenarioChooseSpawnLocation(30, &pos, rooms, g_Vars.currentplayer->prop); + turnanglerad = M_BADTAU - scenario_choose_spawn_location(30, &pos, rooms, g_Vars.currentplayer->prop); } else if (g_Vars.antiplayernum >= 0) { - turnanglerad = M_BADTAU - scenarioChooseSpawnLocation(30, &pos, rooms, g_Vars.currentplayer->prop); + turnanglerad = M_BADTAU - scenario_choose_spawn_location(30, &pos, rooms, g_Vars.currentplayer->prop); } else { if (g_Vars.mplayerisrunning == 0) { g_NumSpawnPoints = 1; } - turnanglerad = M_BADTAU - scenarioChooseSpawnLocation(30, &pos, rooms, g_Vars.currentplayer->prop); + turnanglerad = M_BADTAU - scenario_choose_spawn_location(30, &pos, rooms, g_Vars.currentplayer->prop); } } - groundy = cdFindGroundInfoAtCyl(&pos, 30, rooms, + groundy = cd_find_ground_info_at_cyl(&pos, 30, rooms, &g_Vars.currentplayer->floorcol, &g_Vars.currentplayer->floortype, &g_Vars.currentplayer->floorflags, @@ -421,7 +421,7 @@ void playerReset(void) g_Vars.currentplayer->vv_ground = groundy; g_Vars.currentplayer->vv_theta = (turnanglerad * 360.0f) / M_BADTAU; - playerResetBond(&g_Vars.currentplayer->bond2, &pos); + player_reset_bond(&g_Vars.currentplayer->bond2, &pos); g_Vars.currentplayer->bond2.unk00.x = -sinf(turnanglerad); g_Vars.currentplayer->bond2.unk00.y = 0; @@ -431,16 +431,16 @@ void playerReset(void) g_Vars.currentplayer->prop->pos.f[1] = g_Vars.currentplayer->bondprevpos.f[1] = pos.f[1]; g_Vars.currentplayer->prop->pos.f[2] = g_Vars.currentplayer->bondprevpos.f[2] = pos.f[2]; - propDeregisterRooms(g_Vars.currentplayer->prop); + prop_deregister_rooms(g_Vars.currentplayer->prop); g_Vars.currentplayer->prop->rooms[0] = rooms[0]; g_Vars.currentplayer->prop->rooms[1] = -1; - playerSetCamPropertiesInBounds(&pos, + player_set_cam_properties_in_bounds(&pos, &g_Vars.currentplayer->bond2.unk28, &g_Vars.currentplayer->bond2.unk1c, rooms[0]); - numchrs = chrsGetNumSlots(); + numchrs = chrs_get_num_slots(); for (i = 0; i < numchrs; i++) { chr = &g_ChrSlots[i]; @@ -450,10 +450,10 @@ void playerReset(void) } } - bmoveUpdateRooms(g_Vars.currentplayer); + bmove_update_rooms(g_Vars.currentplayer); if (g_Vars.normmplayerisrunning) { - playersBeginMpSwirl(); + players_begin_mp_swirl(); } else { player0f0b9a20(); } @@ -471,7 +471,7 @@ void playerReset(void) g_Vars.aibuddies[i] = NULL; } - playerChooseBodyAndHead(&bodynum, &headnum, 0); + player_choose_body_and_head(&bodynum, &headnum, 0); g_Vars.currentplayer->prop->chr->bodynum = bodynum; g_Vars.currentplayer->prop->chr->headnum = headnum; } diff --git a/src/game/portal.c b/src/game/portal.c index d9bbae897..51ac07fb4 100644 --- a/src/game/portal.c +++ b/src/game/portal.c @@ -73,7 +73,7 @@ struct var8009dd78 var8009dd78[10]; u16 *g_PortalXluFracs; s32 g_NumPortalXluFracs; -void portalSetXluFrac2(s32 portalnum, f32 frac) +void portal_set_xlu_frac2(s32 portalnum, f32 frac) { if (portalnum >= 0) { u8 value = (u32)(255 * frac); @@ -82,7 +82,7 @@ void portalSetXluFrac2(s32 portalnum, f32 frac) } } -void portalSetXluFrac(s32 portalnum, f32 frac) +void portal_set_xlu_frac(s32 portalnum, f32 frac) { if (portalnum >= 0) { u8 value = (u32)(15 * frac) & 0xf; @@ -90,14 +90,14 @@ void portalSetXluFrac(s32 portalnum, f32 frac) } } -f32 portalGetXluFrac2(s32 arg0) +f32 portal_get_xlu_frac2(s32 arg0) { f32 value = (g_PortalXluFracs[arg0] & 0xff) * 0.0039215688593686f; return value; } -f32 portalGetXluFrac(s32 arg0) +f32 portal_get_xlu_frac(s32 arg0) { f32 value = ((g_PortalXluFracs[arg0] & 0xf00) >> 8) * 0.06666667f; @@ -108,21 +108,21 @@ void portal0f0b65a8(s32 numportals) { if (numportals > 0) { g_NumPortalXluFracs = numportals; - g_PortalXluFracs = mempAlloc(ALIGN16(numportals * 2), MEMPOOL_STAGE); + g_PortalXluFracs = memp_alloc(ALIGN16(numportals * 2), MEMPOOL_STAGE); } else { g_PortalXluFracs = NULL; } } -void portalsReset(void) +void portals_reset(void) { if (g_PortalXluFracs) { struct prop *prop; s32 i; for (i = 0; i < g_NumPortalXluFracs; i++) { - portalSetXluFrac(i, 1); - portalSetXluFrac2(i, 1); + portal_set_xlu_frac(i, 1); + portal_set_xlu_frac2(i, 1); } prop = g_Vars.activeprops; @@ -136,13 +136,13 @@ void portalsReset(void) struct tintedglassobj *glass = (struct tintedglassobj *)obj; if (glass->portalnum >= 0) { - portalSetXluFrac(glass->portalnum, 0); + portal_set_xlu_frac(glass->portalnum, 0); } } else if (obj->type == OBJTYPE_GLASS) { struct glassobj *glass = (struct glassobj *)obj; if (glass->portalnum >= 0) { - portalSetXluFrac(glass->portalnum, 0); + portal_set_xlu_frac(glass->portalnum, 0); } } } @@ -152,13 +152,13 @@ void portalsReset(void) } for (i = 0; i < g_NumPortalXluFracs; i++) { - portalGetXluFrac(i); - portalGetXluFrac2(i); + portal_get_xlu_frac(i); + portal_get_xlu_frac2(i); } } } -void acousticReset(void) +void acoustic_reset(void) { s32 i; s32 j; @@ -171,7 +171,7 @@ void acousticReset(void) osSyncPrintf("Acoustic Reset -> Allocating %d bytes for %d roomacousticdata structures\n", size, g_Vars.roomcount); - g_RoomAcousticData = mempAlloc(size, MEMPOOL_STAGE); + g_RoomAcousticData = memp_alloc(size, MEMPOOL_STAGE); for (i = 0; i < g_Vars.roomcount; i++) { bool allgood = true; diff --git a/src/game/portalconv.s b/src/game/portalconv.s index bed95b763..52166680d 100644 --- a/src/game/portalconv.s +++ b/src/game/portalconv.s @@ -10,7 +10,7 @@ glabel var7f1b76d0 .text -glabel portalConvertCoordinates +glabel portal_convert_coordinates mfc1 $t7, $f20 lui $a3, %hi(g_Vars) addiu $a3, $a3, %lo(g_Vars) diff --git a/src/game/portalconv_c.c b/src/game/portalconv_c.c index 287e4e936..9e6800dae 100644 --- a/src/game/portalconv_c.c +++ b/src/game/portalconv_c.c @@ -11,7 +11,7 @@ * C that can be dropped in place of the handwritten function by linking the * different file. */ -s32 portalConvertCoordinates(s32 portalnum, s32 *start, struct portalthing2 *things) +s32 portal_convert_coordinates(s32 portalnum, s32 *start, struct portalthing2 *things) { Mtxf *mtx = g_Vars.currentplayer->worldtoscreenmtx; struct portalvertices *pvertices = (struct portalvertices *) ((uintptr_t) g_BgPortals + g_BgPortals[portalnum].verticesoffset); diff --git a/src/game/prop.c b/src/game/prop.c index 0b264d055..1d90bf9be 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -58,7 +58,7 @@ f32 g_AutoAimScale = 1; * 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). */ -void propsSort(void) +void props_sort(void) { s32 count = 0; struct prop *prop = g_Vars.activeprops; @@ -109,9 +109,9 @@ void propsSort(void) } /** - * Enable a prop. This is the opposite of disabling (see propDisable below). + * Enable a prop. This is the opposite of disabling (see prop_disable below). */ -void propEnable(struct prop *prop) +void prop_enable(struct prop *prop) { prop->flags |= PROPFLAG_ENABLED; } @@ -124,7 +124,7 @@ void propEnable(struct prop *prop) * Due to a probable bug, these props can be damaged by explosives which causes * them to become enabled. */ -void propDisable(struct prop *prop) +void prop_disable(struct prop *prop) { struct prop **ptr; @@ -141,7 +141,7 @@ void propDisable(struct prop *prop) * Allocate a prop. The prop is taken from the head of the freeprops list and * initialised. */ -struct prop *propAllocate(void) +struct prop *prop_allocate(void) { struct prop *prop = g_Vars.freeprops; @@ -187,7 +187,7 @@ struct prop *propAllocate(void) * * The prop is inserted to the head of the freeprops list. */ -void propFree(struct prop *prop) +void prop_free(struct prop *prop) { if (prop->type == PROPTYPE_CHR) { g_Vars.propstates[prop->propstateindex].chrpropcount--; @@ -206,11 +206,11 @@ void propFree(struct prop *prop) * Insert the prop to the head of activeprops. The prop must not be in any list * prior to calling this function. * - * If this function is being called from propsTickPlayer (which iterates active props) + * If this function is being called from props_tick_player (which iterates active props) * then the prop will do its next tick on the next frame, due to it being * inserted at the head. */ -void propActivate(struct prop *prop) +void prop_activate(struct prop *prop) { if (g_Vars.activeprops && g_Vars.activeprops != g_Vars.pausedprops) { if (prop != g_Vars.activeprops && !prop->prev) { @@ -236,11 +236,11 @@ void propActivate(struct prop *prop) } /** - * Similar to propActivate, but the prop inserted to the tail of the activeprops - * list. This makes the prop tick on the current frame if called from propsTickPlayer, - * because propsTickPlayer iterates the activeprops list from head to tail. + * Similar to prop_activate, but the prop inserted to the tail of the activeprops + * list. This makes the prop tick on the current frame if called from props_tick_player, + * because props_tick_player iterates the activeprops list from head to tail. */ -void propActivateThisFrame(struct prop *prop) +void prop_activate_this_frame(struct prop *prop) { if (g_Vars.activepropstail && g_Vars.activepropstail != g_Vars.pausedprops) { if (prop != g_Vars.activepropstail && !prop->next) { @@ -273,7 +273,7 @@ void propActivateThisFrame(struct prop *prop) /** * Remove the prop from its current list (activeprops or pausedprops). */ -void propDelist(struct prop *prop) +void prop_delist(struct prop *prop) { if (prop->active) { if (prop == g_Vars.activeprops) { @@ -312,7 +312,7 @@ void propDelist(struct prop *prop) prop->backgroundedframes = 0; } -void propReparent(struct prop *mover, struct prop *adopter) +void prop_reparent(struct prop *mover, struct prop *adopter) { mover->parent = adopter; @@ -325,7 +325,7 @@ void propReparent(struct prop *mover, struct prop *adopter) adopter->child = mover; } -void propDetach(struct prop *prop) +void prop_detach(struct prop *prop) { if (prop->parent) { if (prop == prop->parent->child) { @@ -346,7 +346,7 @@ void propDetach(struct prop *prop) } } -Gfx *propRender(Gfx *gdl, struct prop *prop, bool xlupass) +Gfx *prop_render(Gfx *gdl, struct prop *prop, bool xlupass) { switch (prop->type) { case 0: @@ -354,19 +354,19 @@ Gfx *propRender(Gfx *gdl, struct prop *prop, bool xlupass) case PROPTYPE_OBJ: case PROPTYPE_DOOR: case PROPTYPE_WEAPON: - gdl = objRender(prop, gdl, xlupass); + gdl = obj_render(prop, gdl, xlupass); break; case PROPTYPE_CHR: - gdl = chrRender(prop, gdl, xlupass); + gdl = chr_render(prop, gdl, xlupass); break; case PROPTYPE_PLAYER: - gdl = playerRender(prop, gdl, xlupass); + gdl = player_render(prop, gdl, xlupass); break; case PROPTYPE_EXPLOSION: - gdl = explosionRender(prop, gdl, xlupass); + gdl = explosion_render(prop, gdl, xlupass); break; case PROPTYPE_SMOKE: - gdl = smokeRender(prop, gdl, xlupass); + gdl = smoke_render(prop, gdl, xlupass); break; } @@ -391,7 +391,7 @@ Gfx *propRender(Gfx *gdl, struct prop *prop, bool xlupass) * terminal in the pre-bg pass and the screen in the post-bg pass, likely to * avoid Z-fighting issues. */ -Gfx *propsRender(Gfx *gdl, RoomNum renderroomnum, s32 renderpass, RoomNum *roomnumsbyprop) +Gfx *props_render(Gfx *gdl, RoomNum renderroomnum, s32 renderpass, RoomNum *roomnumsbyprop) { struct prop **ptr; struct prop *prop; @@ -411,7 +411,7 @@ Gfx *propsRender(Gfx *gdl, RoomNum renderroomnum, s32 renderpass, RoomNum *roomn if (prop) { if ((renderpass == RENDERPASS_OPA_PREBG && (prop->flags & (PROPFLAG_DRAWONTOP | PROPFLAG_RENDERPOSTBG)) == 0) || (renderpass == RENDERPASS_OPA_POSTBG && (prop->flags & (PROPFLAG_DRAWONTOP | PROPFLAG_RENDERPOSTBG)) == PROPFLAG_RENDERPOSTBG)) { - gdl = propRender(gdl, prop, false); + gdl = prop_render(gdl, prop, false); } } } @@ -430,10 +430,10 @@ Gfx *propsRender(Gfx *gdl, RoomNum renderroomnum, s32 renderpass, RoomNum *roomn if (prop) { if (prop->flags & PROPFLAG_DRAWONTOP) { - gdl = propRender(gdl, prop, false); + gdl = prop_render(gdl, prop, false); } - gdl = propRender(gdl, prop, true); + gdl = prop_render(gdl, prop, true); } } @@ -442,12 +442,12 @@ Gfx *propsRender(Gfx *gdl, RoomNum renderroomnum, s32 renderpass, RoomNum *roomn } } - gdl = bgScissorToViewport(gdl); + gdl = bg_scissor_to_viewport(gdl); return gdl; } -void weaponPlayWhooshSound(s32 weaponnum, struct prop *prop) +void weapon_play_whoosh_sound(s32 weaponnum, struct prop *prop) { s32 soundnum = -1; f32 speed = 1; @@ -473,7 +473,7 @@ void weaponPlayWhooshSound(s32 weaponnum, struct prop *prop) OSPri prevpri = osGetThreadPri(0); osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); - handle = sndStart(var80095200, soundnum, NULL, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, soundnum, NULL, -1, -1, -1, -1, -1); if (handle) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(s32 *)&speed); @@ -481,14 +481,14 @@ void weaponPlayWhooshSound(s32 weaponnum, struct prop *prop) osSetThreadPri(0, prevpri); #else - handle = sndStart(var80095200, soundnum, NULL, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, soundnum, NULL, -1, -1, -1, -1, -1); if (handle) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(s32 *)&speed); } #endif } else { - psCreate(NULL, prop, soundnum, -1, + ps_create(NULL, prop, soundnum, -1, -1, 0, 0, PSTYPE_NONE, NULL, speed, NULL, -1, -1, -1, -1); } } @@ -536,7 +536,7 @@ void func0f060bac(s32 weaponnum, struct prop *prop) OSPri prevpri = osGetThreadPri(0); osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); - handle = sndStart(var80095200, soundnum, 0, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, soundnum, 0, -1, -1, -1, -1, -1); if (handle) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(s32 *)&speed); @@ -544,14 +544,14 @@ void func0f060bac(s32 weaponnum, struct prop *prop) osSetThreadPri(0, prevpri); #else - handle = sndStart(var80095200, soundnum, 0, -1, -1, -1, -1, -1); + handle = snd_start(var80095200, soundnum, 0, -1, -1, -1, -1, -1); if (handle) { audioPostEvent(handle, AL_SNDP_PITCH_EVT, *(s32 *)&speed); } #endif } else { - psCreate(NULL, prop, soundnum, -1, -1, 0, 0, PSTYPE_NONE, NULL, speed, NULL, -1, -1, -1, -1); + ps_create(NULL, prop, soundnum, -1, -1, 0, 0, PSTYPE_NONE, NULL, speed, NULL, -1, -1, -1, -1); } } } @@ -564,7 +564,7 @@ void func0f060bac(s32 weaponnum, struct prop *prop) * * The return value is the final prop that was hit. */ -struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpos2d, struct coord *gundir2d, struct coord *gunpos3d, struct coord *gundir3d, u32 arg6, f32 distance, bool cheap) +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 cheap) { u32 index; struct prop **propptr; @@ -628,8 +628,8 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo shotdata.gundir2d.y = gundir2d->y; shotdata.gundir2d.z = gundir2d->z; - gsetPopulateFromCurrentPlayer(handnum, &shotdata.gset); - func = gsetGetWeaponFunction(&shotdata.gset); + gset_populate_from_current_player(handnum, &shotdata.gset); + func = gset_get_weapon_function(&shotdata.gset); if (func) { if (isshooting && (func->flags & FUNCFLAG_EXPLOSIVESHELLS)) { @@ -647,7 +647,7 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo } if (isshooting) { - shotdata.penetration = gsetGetSinglePenetration(&shotdata.gset); + shotdata.penetration = gset_get_single_penetration(&shotdata.gset); } else { shotdata.penetration = 1; } @@ -690,10 +690,10 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo } // Note this is being appended to rooms - bgGetForceOnscreenRooms(roomsptr, 100); + bg_get_force_onscreen_rooms(roomsptr, 100); for (i = 0; rooms[i] != -1; i++) { - if (bgTestHitInRoom(&shotdata.gunpos3d, &hitpos, rooms[i], &sp664)) { + if (bg_test_hit_in_room(&shotdata.gunpos3d, &hitpos, rooms[i], &sp664)) { sp664.pos.x *= 1; sp664.pos.y *= 1; sp664.pos.z *= 1; @@ -719,7 +719,7 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo } if (hitbg && shotdata.gset.weaponnum != WEAPON_FARSIGHT) { - mtx4TransformVec(camGetWorldToScreenMtxf(), &sp694.pos, &sp658); + mtx4_transform_vec(cam_get_world_to_screen_mtxf(), &sp694.pos, &sp658); if (shotdata.distance > -sp658.z) { shotdata.distance = -sp658.z; @@ -733,12 +733,12 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo if (prop) { if (prop->type == PROPTYPE_CHR - || (prop->type == PROPTYPE_PLAYER && prop->chr && playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum)) { + || (prop->type == PROPTYPE_PLAYER && prop->chr && playermgr_get_player_num_by_prop(prop) != g_Vars.currentplayernum)) { if (!ismelee) { - chrTestHit(prop, &shotdata, isshooting, cheap); + chr_test_hit(prop, &shotdata, isshooting, cheap); } } else if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR) { - objTestHit(prop, &shotdata); + obj_test_hit(prop, &shotdata); } } @@ -776,9 +776,9 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo } if (root->type == PROPTYPE_CHR || root->type == PROPTYPE_PLAYER) { - chrHit(&shotdata, &shotdata.hits[i]); + chr_hit(&shotdata, &shotdata.hits[i]); } else if (hitprop->type == PROPTYPE_OBJ || hitprop->type == PROPTYPE_WEAPON || hitprop->type == PROPTYPE_DOOR) { - objHit(&shotdata, &shotdata.hits[i]); + obj_hit(&shotdata, &shotdata.hits[i]); } if (shotdata.hits[i].bulletproof) { @@ -806,7 +806,7 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo exppos.z = shotdata.hits[i].pos.z; func0f065e74(&root->pos, root->rooms, &exppos, exprooms); - explosionCreateSimple(0, &exppos, exprooms, EXPLOSIONTYPE_PHOENIX, g_Vars.currentplayernum); + explosion_create_simple(0, &exppos, exprooms, EXPLOSIONTYPE_PHOENIX, g_Vars.currentplayernum); } } } @@ -815,7 +815,7 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo rooms2[0] = room; rooms2[1] = -1; - texnum = lightsHandleHit(&shotdata.gunpos3d, &hitpos, room); + texnum = lights_handle_hit(&shotdata.gunpos3d, &hitpos, room); if (sp694.texturenum < 0 || sp694.texturenum >= NUM_TEXTURES) { surfacetype = g_SurfaceTypes[SURFACETYPE_DEFAULT]; @@ -829,7 +829,7 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo } } - bgunSetHitPos(&sp694.pos); + bgun_set_hit_pos(&sp694.pos); if (surfacetype->numwallhittexes > 0 && (!func || (func->type & 0xff) != INVENTORYFUNCTYPE_MELEE)) { if (shotdata.gset.weaponnum != WEAPON_UNARMED @@ -845,23 +845,23 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo } if (texnum) { - wallhitCreate(&sp694.pos, &sp694.unk0c, &shotdata.gunpos3d, 0, 0, texnum, room, 0, -1, 0, g_Vars.currentplayer->prop->chr, sp694.unk2c == 2); + wallhit_create(&sp694.pos, &sp694.unk0c, &shotdata.gunpos3d, 0, 0, texnum, room, 0, -1, 0, g_Vars.currentplayer->prop->chr, sp694.unk2c == 2); } } - bgunPlayBgHitSound(&shotdata.gset, &sp694.pos, sp694.texturenum, rooms2); + bgun_play_bg_hit_sound(&shotdata.gset, &sp694.pos, sp694.texturenum, rooms2); if (explosiveshells) { - explosionCreateSimple(NULL, &sp694.pos, rooms2, EXPLOSIONTYPE_PHOENIX, g_Vars.currentplayernum); + explosion_create_simple(NULL, &sp694.pos, rooms2, EXPLOSIONTYPE_PHOENIX, g_Vars.currentplayernum); } else { - if (!chrIsUsingPaintball(g_Vars.currentplayer->prop->chr)) { + if (!chr_is_using_paintball(g_Vars.currentplayer->prop->chr)) { if (PLAYERCOUNT() >= 2) { if ((random() % 8) == 0) { - smokeCreateSimple(&sp694.pos, rooms2, SMOKETYPE_BULLETIMPACT); + smoke_create_simple(&sp694.pos, rooms2, SMOKETYPE_BULLETIMPACT); } } else { if (texnum) { - explosionCreateSimple(NULL, &sp694.pos, rooms2, EXPLOSIONTYPE_BULLETHOLE, g_Vars.currentplayernum); + explosion_create_simple(NULL, &sp694.pos, rooms2, EXPLOSIONTYPE_BULLETHOLE, g_Vars.currentplayernum); } } } @@ -872,7 +872,7 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo && sp694.pos.z > -32000 && sp694.pos.z < 32000) { sparktype = SPARKTYPE_DEFAULT; - if (chrIsUsingPaintball(g_Vars.currentplayer->prop->chr)) { + if (chr_is_using_paintball(g_Vars.currentplayer->prop->chr)) { sparktype = SPARKTYPE_PAINT; } else { switch (shotdata.gset.weaponnum) { @@ -900,13 +900,13 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo } } - sparksCreate(room, NULL, &sp694.pos, &shotdata.gundir3d, &sp694.unk0c, sparktype); + sparks_create(room, NULL, &sp694.pos, &shotdata.gundir3d, &sp694.unk0c, sparktype); } } } } } else { - bgunSetHitPos(&hitpos); + bgun_set_hit_pos(&hitpos); } } else if (ismelee) { s32 hitindex; @@ -927,13 +927,13 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo if (shotdata.gset.weaponnum != WEAPON_UNARMED && shotdata.gset.weaponnum != WEAPON_TRANQUILIZER) { if (hitaprop) { - sparksCreate(shotdata.hits[hitindex].prop->rooms[0], NULL, &shotdata.hits[hitindex].pos, &shotdata.gundir3d, &shotdata.hits[hitindex].dir, SPARKTYPE_DEFAULT); + sparks_create(shotdata.hits[hitindex].prop->rooms[0], NULL, &shotdata.hits[hitindex].pos, &shotdata.gundir3d, &shotdata.hits[hitindex].dir, SPARKTYPE_DEFAULT); } else { - sparksCreate(room, NULL, &sp694.pos, &shotdata.gundir3d, &sp694.unk0c, SPARKTYPE_DEFAULT); + sparks_create(room, NULL, &sp694.pos, &shotdata.gundir3d, &sp694.unk0c, SPARKTYPE_DEFAULT); } } } else { - weaponPlayWhooshSound(shotdata.gset.weaponnum, g_Vars.currentplayer->prop); + weapon_play_whoosh_sound(shotdata.gset.weaponnum, g_Vars.currentplayer->prop); } } else { // The caller is querying which prop is being aimed at rather than taking a shot. @@ -973,42 +973,42 @@ struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpo return result; } -struct prop *propFindAimingAt(s32 handnum, bool isshooting, u32 context) +struct prop *prop_find_aiming_at(s32 handnum, bool isshooting, u32 context) { struct coord gundir2d; struct coord gunpos2d; struct coord gundir3d; struct coord gunpos3d; - bgunCalculatePlayerShotSpread(&gunpos2d, &gundir2d, handnum, context); + bgun_calculate_player_shot_spread(&gunpos2d, &gundir2d, handnum, context); - if (context == FINDPROPCONTEXT_SHOOT && bgunGetWeaponNum(HAND_RIGHT) == WEAPON_REAPER) { + if (context == FINDPROPCONTEXT_SHOOT && bgun_get_weapon_num(HAND_RIGHT) == WEAPON_REAPER) { gunpos2d.y -= 15 * RANDOMFRAC(); } - mtx4TransformVec(camGetProjectionMtxF(), &gunpos2d, &gunpos3d); - mtx4RotateVec(camGetProjectionMtxF(), &gundir2d, &gundir3d); + mtx4_transform_vec(cam_get_projection_mtxf(), &gunpos2d, &gunpos3d); + mtx4_rotate_vec(cam_get_projection_mtxf(), &gundir2d, &gundir3d); - return shotCalculateHits(handnum, isshooting, &gunpos2d, &gundir2d, &gunpos3d, &gundir3d, 0, 4294836224, PLAYERCOUNT() >= 2); + return shot_calculate_hits(handnum, isshooting, &gunpos2d, &gundir2d, &gunpos3d, &gundir3d, 0, 4294836224, PLAYERCOUNT() >= 2); } -void shotCreate(s32 handnum, bool isshooting, bool dorandom, s32 numshots, bool cheap) +void shot_create(s32 handnum, bool isshooting, bool dorandom, s32 numshots, bool cheap) { struct coord gundir3d; struct coord gunpos3d; struct coord gundir2d; struct coord gunpos2d; - bgunCalculatePlayerShotSpread(&gunpos2d, &gundir2d, handnum, dorandom); + bgun_calculate_player_shot_spread(&gunpos2d, &gundir2d, handnum, dorandom); if (numshots > 0) { - mtx4TransformVec(camGetProjectionMtxF(), &gunpos2d, &gunpos3d); - mtx4RotateVec(camGetProjectionMtxF(), &gundir2d, &gundir3d); + mtx4_transform_vec(cam_get_projection_mtxf(), &gunpos2d, &gunpos3d); + mtx4_rotate_vec(cam_get_projection_mtxf(), &gundir2d, &gundir3d); - shotCalculateHits(handnum, isshooting, &gunpos2d, &gundir2d, &gunpos3d, &gundir3d, 0, 4294836224, cheap); + shot_calculate_hits(handnum, isshooting, &gunpos2d, &gundir2d, &gunpos3d, &gundir3d, 0, 4294836224, cheap); if (numshots <= 1) { - bgunSetLastShootInfo(&gunpos3d, &gundir3d, handnum); + bgun_set_last_shoot_info(&gunpos3d, &gundir3d, handnum); } } } @@ -1021,7 +1021,7 @@ void shotCreate(s32 handnum, bool isshooting, bool dorandom, s32 numshots, bool * hits are added in the order of furtherest to closest. I'm unsure if this is * true though. */ -void hitCreate(struct shotdata *shotdata, struct prop *prop, f32 hitdistance, s32 hitpart, +void hit_create(struct shotdata *shotdata, struct prop *prop, f32 hitdistance, s32 hitpart, struct modelnode *bboxnode, struct hitthing *hitthing, s32 mtxindex, struct modelnode *dlnode, struct model *model, bool slowsbullet, bool bulletproof, struct coord *arg11, struct coord *arg12) { @@ -1124,7 +1124,7 @@ void hitCreate(struct shotdata *shotdata, struct prop *prop, f32 hitdistance, s3 } } -void handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2) +void hand_inflict_melee_damage(s32 handnum, struct gset *gset, bool arg2) { s32 cdtypes; struct prop **ptr; @@ -1178,7 +1178,7 @@ void handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2) } if (prop->type == PROPTYPE_CHR - || (prop->type == PROPTYPE_PLAYER && prop->chr && playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum) + || (prop->type == PROPTYPE_PLAYER && prop->chr && playermgr_get_player_num_by_prop(prop) != g_Vars.currentplayernum) || isglass) { f32 rangelimit = 60; f32 distance; @@ -1189,19 +1189,19 @@ void handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2) f32 spfc[2]; f32 spf4[2]; struct model *model; - struct weaponfunc *func = gsetGetWeaponFunction(gset); + struct weaponfunc *func = gset_get_weapon_function(gset); if ((func->type & 0xff) == INVENTORYFUNCTYPE_MELEE) { struct weaponfunc_melee *meleefunc = (struct weaponfunc_melee *)func; rangelimit = meleefunc->range; } - bgunGetCrossPos(&x, &y); + bgun_get_cross_pos(&x, &y); - spfc[0] = (x - camGetScreenLeft()) / (camGetScreenWidth() * 0.5f) - 1.0f; - spfc[1] = (y - camGetScreenTop()) / (camGetScreenHeight() * 0.5f) - 1.0f; - spf4[0] = camGetScreenHeight() * 0.16666667163372f; - spf4[1] = camGetScreenHeight() * 0.125f; + spfc[0] = (x - cam_get_screen_left()) / (cam_get_screen_width() * 0.5f) - 1.0f; + spfc[1] = (y - cam_get_screen_top()) / (cam_get_screen_height() * 0.5f) - 1.0f; + spf4[0] = cam_get_screen_height() * 0.16666667163372f; + spf4[1] = cam_get_screen_height() * 0.125f; if (isglass) { model = obj->model; @@ -1218,21 +1218,21 @@ void handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2) cdtypes = 0; } - if (cdTestLos04(&playerprop->pos, playerprop->rooms, &prop->pos, cdtypes)) { + if (cd_test_los04(&playerprop->pos, playerprop->rooms, &prop->pos, cdtypes)) { if (isglass) { struct model *model = obj->model; struct coord gunpos2d; struct coord gundir2d; struct modelnode *node = NULL; - bgunCalculatePlayerShotSpread(&gunpos2d, &gundir2d, handnum, true); + bgun_calculate_player_shot_spread(&gunpos2d, &gundir2d, handnum, true); - if (modelTestForHit(model, &gunpos2d, &gundir2d, &node) > 0) { - f32 damage = gsetGetDamage(gset) * 2.5f; + if (model_test_for_hit(model, &gunpos2d, &gundir2d, &node) > 0) { + f32 damage = gset_get_damage(gset) * 2.5f; skipthething = true; - bgunPlayGlassHitSound(&playerprop->pos, playerprop->rooms, -1); - objTakeGunfire(obj, damage, &prop->pos, gset->weaponnum, g_Vars.currentplayernum); - objDropRecursively(prop, false); + bgun_play_glass_hit_sound(&playerprop->pos, playerprop->rooms, -1); + obj_take_gunfire(obj, damage, &prop->pos, gset->weaponnum, g_Vars.currentplayernum); + obj_drop_recursively(prop, false); } } else if (arg2) { chr->chrflags |= CHRCFLAG_AVOIDING; @@ -1244,25 +1244,25 @@ void handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2) s32 side = -1; s32 hitpart = HITPART_TORSO; - if (!chrIsAvoiding(chr)) { - bgunCalculatePlayerShotSpread(&gunpos2d, &gundir2d, handnum, true); + if (!chr_is_avoiding(chr)) { + bgun_calculate_player_shot_spread(&gunpos2d, &gundir2d, handnum, true); skipthething = true; - mtx4RotateVecInPlace(camGetProjectionMtxF(), &gundir2d); - bgunPlayPropHitSound(gset, prop, -1); + mtx4_rotate_vec_in_place(cam_get_projection_mtxf(), &gundir2d); + bgun_play_prop_hit_sound(gset, prop, -1); - if (chr->model && chrGetShield(chr) > 0) { - chrCalculateShieldHit(chr, &playerprop->pos, &gundir2d, &node, &hitpart, &model, &side); + if (chr->model && chr_get_shield(chr) > 0) { + chr_calculate_shield_hit(chr, &playerprop->pos, &gundir2d, &node, &hitpart, &model, &side); } - if (bmoveGetCrouchPos() == CROUCHPOS_DUCK) { + if (bmove_get_crouch_pos() == CROUCHPOS_DUCK) { hitpart = HITPART_GENERAL; - } else if (bmoveGetCrouchPos() == CROUCHPOS_SQUAT) { + } else if (bmove_get_crouch_pos() == CROUCHPOS_SQUAT) { hitpart = HITPART_GENERALHALF; } else { hitpart = HITPART_TORSO; } - func0f0341dc(chr, gsetGetDamage(gset), &gundir2d, gset, + func0f0341dc(chr, gset_get_damage(gset), &gundir2d, gset, g_Vars.currentplayer->prop, hitpart, chr->prop, node, model, side, 0); } } @@ -1279,87 +1279,87 @@ void handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2) } } -void handTickAttack(s32 handnum) +void hand_tick_attack(s32 handnum) { if (g_Vars.currentplayer->hands[handnum].unk0d0f_02) { s32 doit = true; - if (bgunGetWeaponNum(handnum) == WEAPON_REAPER + if (bgun_get_weapon_num(handnum) == WEAPON_REAPER && (g_Vars.currentplayer->hands[handnum].burstbullets % 3) != 1) { doit = false; } if (doit) { - propFindAimingAt(handnum, true, FINDPROPCONTEXT_SHOOT); + prop_find_aiming_at(handnum, true, FINDPROPCONTEXT_SHOOT); } g_Vars.currentplayer->hands[handnum].unk0d0f_02 = false; } - if (bgunIsFiring(handnum)) { - s32 type = bgunGetAttackType(handnum); - s32 weaponnum = bgunGetWeaponNum(handnum); + if (bgun_is_firing(handnum)) { + s32 type = bgun_get_attack_type(handnum); + s32 weaponnum = bgun_get_weapon_num(handnum); struct gset gset; bool cloaked; g_Vars.currentplayer->hands[handnum].activatesecondary = false; - gsetPopulateFromCurrentPlayer(handnum, &gset); - frIncrementNumShots(); + gset_populate_from_current_player(handnum, &gset); + fr_increment_num_shots(); switch (type) { case HANDATTACKTYPE_SHOOT: // Always execute if right hand, but if left hand then execute if // right hand is not (ie. prevent firing both guns on the same tick) - if (handnum == HAND_RIGHT || !bgunIsFiring(HAND_RIGHT)) { - chrUncloakTemporarily(g_Vars.currentplayer->prop->chr); - mpstatsIncrementPlayerShotCount2(&gset, 0); + if (handnum == HAND_RIGHT || !bgun_is_firing(HAND_RIGHT)) { + chr_uncloak_temporarily(g_Vars.currentplayer->prop->chr); + mpstats_increment_player_shot_count2(&gset, 0); if (weaponnum == WEAPON_SHOTGUN) { - shotCreate(handnum, true, true, 1, true); - shotCreate(handnum, true, true, 1, true); - shotCreate(handnum, true, true, 1, true); - shotCreate(handnum, true, true, 1, true); - shotCreate(handnum, true, true, 1, true); - shotCreate(handnum, true, true, 1, true); + shot_create(handnum, true, true, 1, true); + shot_create(handnum, true, true, 1, true); + shot_create(handnum, true, true, 1, true); + shot_create(handnum, true, true, 1, true); + shot_create(handnum, true, true, 1, true); + shot_create(handnum, true, true, 1, true); } else { - shotCreate(handnum, true, true, bgunGetShotsToTake(handnum), g_Vars.mplayerisrunning); + shot_create(handnum, true, true, bgun_get_shots_to_take(handnum), g_Vars.mplayerisrunning); } mpstats0f0b0520(); } break; case HANDATTACKTYPE_MELEE: - chrUncloakTemporarily(g_Vars.currentplayer->prop->chr); - handInflictMeleeDamage(handnum, &gset, false); + chr_uncloak_temporarily(g_Vars.currentplayer->prop->chr); + hand_inflict_melee_damage(handnum, &gset, false); break; case HANDATTACKTYPE_MELEENOUNCLOAK: - handInflictMeleeDamage(handnum, &gset, true); + hand_inflict_melee_damage(handnum, &gset, true); break; case HANDATTACKTYPE_DETONATE: - playerActivateRemoteMineDetonator(g_Vars.currentplayernum); + player_activate_remote_mine_detonator(g_Vars.currentplayernum); break; case HANDATTACKTYPE_UPLINK: - propFindForUplink(); + prop_find_for_uplink(); break; case HANDATTACKTYPE_BOOST: - bgunApplyBoost(); + bgun_apply_boost(); break; case HANDATTACKTYPE_REVERTBOOST: - bgunRevertBoost(); + bgun_revert_boost(); break; case HANDATTACKTYPE_SHOOTPROJECTILE: - bgunCreateFiredProjectile(handnum); + bgun_create_fired_projectile(handnum); break; case HANDATTACKTYPE_CROUCH: if (g_Vars.currentplayer->crouchpos == CROUCHPOS_SQUAT) { - bwalkAdjustCrouchPos(2); + bwalk_adjust_crouch_pos(2); } else { - bwalkAdjustCrouchPos(-2); + bwalk_adjust_crouch_pos(-2); } break; case HANDATTACKTYPE_THROWPROJECTILE: - bgunCreateThrownProjectile(handnum, &gset); + bgun_create_thrown_projectile(handnum, &gset); break; case HANDATTACKTYPE_RCP120CLOAK: cloaked = (g_Vars.currentplayer->devicesactive & DEVICE_CLOAKRCP120) != 0; @@ -1376,15 +1376,15 @@ void handTickAttack(s32 handnum) } } -void handsTickAttack(void) +void hands_tick_attack(void) { if (g_Vars.lvupdate240 > 0) { - handTickAttack(HAND_RIGHT); - handTickAttack(HAND_LEFT); + hand_tick_attack(HAND_RIGHT); + hand_tick_attack(HAND_LEFT); } } -void propExecuteTickOperation(struct prop *prop, s32 op) +void prop_execute_tick_operation(struct prop *prop, s32 op) { if (op == TICKOP_FREE) { if ((prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_OBJ) @@ -1399,34 +1399,34 @@ void propExecuteTickOperation(struct prop *prop, s32 op) obj->hidden &= ~OBJHFLAG_DELETING; obj->hidden2 &= ~OBJH2FLAG_DESTROYED; - propDeregisterRooms(prop); - propDisable(prop); + prop_deregister_rooms(prop); + prop_disable(prop); if (!prop->active) { - propUnpause(prop); + prop_unpause(prop); } } else { // Prop doesn't regen, so free it - propDeregisterRooms(prop); - propDelist(prop); - propDisable(prop); - propFree(prop); + prop_deregister_rooms(prop); + prop_delist(prop); + prop_disable(prop); + prop_free(prop); } } else if (op == TICKOP_DISABLE) { - propDeregisterRooms(prop); - propDelist(prop); - propDisable(prop); + prop_deregister_rooms(prop); + prop_delist(prop); + prop_disable(prop); } else if (op == TICKOP_GIVETOPLAYER) { - propDeregisterRooms(prop); - propDelist(prop); - propDisable(prop); - objDetach(prop); - objFreeEmbedmentOrProjectile(prop); - propReparent(prop, g_Vars.currentplayer->prop); + prop_deregister_rooms(prop); + prop_delist(prop); + prop_disable(prop); + obj_detach(prop); + obj_free_embedment_or_projectile(prop); + prop_reparent(prop, g_Vars.currentplayer->prop); } } -struct prop *propFindForInteract(bool usingeyespy) +struct prop *prop_find_for_interact(bool usingeyespy) { struct prop **ptr; bool checkmore = true; @@ -1442,10 +1442,10 @@ struct prop *propFindForInteract(bool usingeyespy) // empty } else if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON) { if (!usingeyespy) { - checkmore = objTestForInteract(prop); + checkmore = obj_test_for_interact(prop); } } else if (prop->type == PROPTYPE_DOOR) { - checkmore = doorTestForInteract(prop); + checkmore = door_test_for_interact(prop); } else if (prop->type == PROPTYPE_EXPLOSION) { // empty } else if (prop->type == PROPTYPE_SMOKE) { @@ -1465,7 +1465,7 @@ struct prop *propFindForInteract(bool usingeyespy) * While this function is called, it doesn't return anything and doesn't appear * to be useful. Uplinking still works when this function is empty. */ -void propFindForUplink(void) +void prop_find_for_uplink(void) { struct prop **ptr = g_Vars.endonscreenprops - 1; bool checkmore = true; @@ -1476,7 +1476,7 @@ void propFindForUplink(void) if (prop) { if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON) { - checkmore = objTestForInteract(prop); + checkmore = obj_test_for_interact(prop); } if (!checkmore) { @@ -1488,21 +1488,21 @@ void propFindForUplink(void) } } -bool currentPlayerInteract(bool eyespy) +bool current_player_interact(bool eyespy) { struct prop *prop; bool op = TICKOP_NONE; - prop = propFindForInteract(eyespy); + prop = prop_find_for_interact(eyespy); if (prop) { switch (prop->type) { case PROPTYPE_OBJ: case PROPTYPE_WEAPON: - op = propobjInteract(prop); + op = propobj_interact(prop); break; case PROPTYPE_DOOR: - op = propdoorInteract(prop); + op = propdoor_interact(prop); break; case PROPTYPE_CHR: case PROPTYPE_EYESPY: @@ -1512,7 +1512,7 @@ bool currentPlayerInteract(bool eyespy) break; } - propExecuteTickOperation(prop, op); + prop_execute_tick_operation(prop, op); return false; } @@ -1527,10 +1527,10 @@ bool currentPlayerInteract(bool eyespy) * The prop is removed from its current list (activeprops or pausedprops) * if any, and is then inserted to the head of pausedprops. */ -void propPause(struct prop *prop) +void prop_pause(struct prop *prop) { if ((prop->flags & PROPFLAG_DONTPAUSE) == 0) { - propDelist(prop); + prop_delist(prop); if (g_Vars.pausedprops) { prop->prev = g_Vars.pausedprops->prev; @@ -1569,11 +1569,11 @@ void propPause(struct prop *prop) * The prop is removed from its current list (activeprops or pausedprops) * if any, and is then inserted to the head of activeprops. * - * If this function is being called from propsTickPlayer (which iterates active props) + * If this function is being called from props_tick_player (which iterates active props) * then the prop will do its next tick on the next frame, due to it being * inserted at the head. */ -void propUnpause(struct prop *prop) +void prop_unpause(struct prop *prop) { if (prop == g_Vars.pausedprops) { if (g_Vars.activeprops == g_Vars.pausedprops) { @@ -1594,7 +1594,7 @@ void propUnpause(struct prop *prop) prop->next = NULL; prop->prev = NULL; - propActivate(prop); + prop_activate(prop); } // 0 = will tick when backgrounded @@ -1695,7 +1695,7 @@ u8 g_PausableObjs[] = { * ensures that there aren't an uneven amount of props being updated on any * given frame, which helps give a consistent frame rate. */ -void propsTickPlayer(bool islastplayer) +void props_tick_player(bool islastplayer) { struct prop *prop; struct prop *end; @@ -1776,7 +1776,7 @@ void propsTickPlayer(bool islastplayer) // Update the onscreen flags for all props if (g_Vars.currentplayerindex == 0) { - // This is the first time propsTickPlayer has been called on this frame + // This is the first time props_tick_player has been called on this frame prop = g_Vars.props; end = &g_Vars.props[g_Vars.maxprops]; @@ -1799,7 +1799,7 @@ void propsTickPlayer(bool islastplayer) prop->flags = flags; } } else { - // This is a subsequent call of propsTickPlayer on this frame + // This is a subsequent call of props_tick_player on this frame prop = g_Vars.props; end = &g_Vars.props[g_Vars.maxprops]; @@ -1913,12 +1913,12 @@ void propsTickPlayer(bool islastplayer) if (prop->type == PROPTYPE_CHR) { chr1 = prop->chr; - splatTickChr(prop); + splat_tick_chr(prop); if (chr1 && chr1->aibot) { - op = botTick(prop); + op = bot_tick(prop); } else { - op = chrTick(prop); + op = chr_tick(prop); } g_Vars.propstates[prop->propstateindex].foregroundchrpropcount++; @@ -1926,14 +1926,14 @@ void propsTickPlayer(bool islastplayer) g_Vars.propstates[prop->propstateindex].foregroundpropcount++; if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR) { - op = objTickPlayer(prop); + op = obj_tick_player(prop); } else if (prop->type == PROPTYPE_EXPLOSION) { - op = explosionTickPlayer(prop); + op = explosion_tick_player(prop); } else if (prop->type == PROPTYPE_SMOKE) { - op = smokeTickPlayer(prop); + op = smoke_tick_player(prop); } else if (prop->type == PROPTYPE_PLAYER) { - splatTickChr(prop); - op = playerTickThirdPerson(prop); + splat_tick_chr(prop); + op = player_tick_third_person(prop); } } @@ -1975,18 +1975,18 @@ void propsTickPlayer(bool islastplayer) if (prop->type == PROPTYPE_CHR) { chr2 = prop->chr; - splatTickChr(prop); + splat_tick_chr(prop); if (chr2 && chr2->aibot) { - op = botTick(prop); + op = bot_tick(prop); } else { - op = chrTick(prop); + op = chr_tick(prop); } } else if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR) { obj = prop->obj; if (!g_PausableObjs[obj->type]) { - op = objTickPlayer(prop); + op = obj_tick_player(prop); } else if (prop->timetoregen <= 0) { // The prop does not regenerate. If we've done a full // cycle of propstates while backgrounded and the prop @@ -1994,17 +1994,17 @@ void propsTickPlayer(bool islastplayer) prop->backgroundedframes++; if (prop->backgroundedframes > g_Vars.numpropstates - 1) { - propPause(prop); + prop_pause(prop); op = TICKOP_CHANGEDLIST; } } } else if (prop->type == PROPTYPE_EXPLOSION) { - op = explosionTickPlayer(prop); + op = explosion_tick_player(prop); } else if (prop->type == PROPTYPE_SMOKE) { - op = smokeTickPlayer(prop); + op = smoke_tick_player(prop); } else if (prop->type == PROPTYPE_PLAYER) { - splatTickChr(prop); - op = playerTickThirdPerson(prop); + splat_tick_chr(prop); + op = player_tick_third_person(prop); } if (prop->lastupdateframe != g_Vars.propstates[runstateindex].lastupdateframe) { @@ -2041,22 +2041,22 @@ void propsTickPlayer(bool islastplayer) // Delisting and activating it again appends it to the active // props list, which means it'll get ticked again on this frame. - propDelist(prop); - propActivateThisFrame(prop); + prop_delist(prop); + prop_activate_this_frame(prop); if (done) { next = prop; done = false; } } else { - propExecuteTickOperation(prop, op); + prop_execute_tick_operation(prop, op); } } prop = next; } - // If this is the first time propsTickPlayer is being called on this frame, + // If this is the first time props_tick_player is being called on this frame, // and we've completed a full cycle of the propstates, redistribute them. // For each combination of background/foreground and chr/nonchr, take the // propstates with the highest quantity of these props and move some to the @@ -2220,15 +2220,15 @@ void propsTickPlayer(bool islastplayer) g_Vars.propstates[runstateindex].lastupdateframe = g_Vars.updateframe; if (islastplayer) { - alarmTick(); - psTick(); - propsDefragRoomProps(); + alarm_tick(); + ps_tick(); + props_defrag_room_props(); } chr0f02472c(); } -void propsTickPadEffects(void) +void props_tick_pad_effects(void) { s32 i; struct pad pad; @@ -2242,40 +2242,40 @@ void propsTickPadEffects(void) for (i = 0; i <= g_LastPadEffectIndex; i++) { struct padeffectobj *effect = &g_PadEffects[i]; - padUnpack(effect->pad, PADFIELD_ROOM, &pad); + pad_unpack(effect->pad, PADFIELD_ROOM, &pad); - if (bgRoomIsOnscreen(pad.room)) { + if (bg_room_is_onscreen(pad.room)) { switch (effect->effect) { case PADEFFECT_SPARKS: case PADEFFECT_SPARKS2: rooms[0] = pad.room; rooms[1] = -1; - padUnpack(effect->pad, PADFIELD_POS | PADFIELD_UP, &pad); + pad_unpack(effect->pad, PADFIELD_POS | PADFIELD_UP, &pad); up.x = -pad.up.x; up.y = -pad.up.y; up.z = -pad.up.z; if ((random() % 2048) <= 50) { - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); - psCreate(NULL, NULL, psGetRandomSparkSound(), -1, -1, 0, 0, PSTYPE_NONE, &pad.pos, -1, rooms, -1, -1, -1, -1); + sparks_create(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); + ps_create(NULL, NULL, ps_get_random_spark_sound(), -1, -1, 0, 0, PSTYPE_NONE, &pad.pos, -1, rooms, -1, -1, -1, -1); } if ((random() % 2048) <= 15) { - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL2); - psCreate(NULL, NULL, psGetRandomSparkSound(), -1, -1, 0, 0, PSTYPE_NONE, &pad.pos, -1, rooms, -1, -1, -1, -1); + sparks_create(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); + sparks_create(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL2); + ps_create(NULL, NULL, ps_get_random_spark_sound(), -1, -1, 0, 0, PSTYPE_NONE, &pad.pos, -1, rooms, -1, -1, -1, -1); } if ((random() % 2048) <= 5) { - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); - sparksCreate(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL3); - psCreate(NULL, NULL, psGetRandomSparkSound(), -1, -1, 0, 0, PSTYPE_NONE, &pad.pos, -1, rooms, -1, -1, -1, -1); + sparks_create(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL1); + sparks_create(rooms[0], NULL, &pad.pos, &up, &pad.up, SPARKTYPE_ENVIRONMENTAL3); + ps_create(NULL, NULL, ps_get_random_spark_sound(), -1, -1, 0, 0, PSTYPE_NONE, &pad.pos, -1, rooms, -1, -1, -1, -1); } break; case PADEFFECT_OUTROSMOKE: - if (g_Vars.tickmode != TICKMODE_CUTSCENE || !objectiveIsAllComplete()) { + if (g_Vars.tickmode != TICKMODE_CUTSCENE || !objective_is_all_complete()) { // @bug: This should be a break rather than a return. // Because of this, subsequent pad effects won't tick. return; @@ -2298,8 +2298,8 @@ void propsTickPadEffects(void) rooms2[0] = pad.room; rooms2[1] = -1; - padUnpack(effect->pad, PADFIELD_POS | PADFIELD_UP, &pad); - smokeCreateAtPadEffect(effect, &pad.pos, rooms2, type); + pad_unpack(effect->pad, PADFIELD_POS | PADFIELD_UP, &pad); + smoke_create_at_pad_effect(effect, &pad.pos, rooms2, type); break; case PADEFFECT_01: break; @@ -2309,18 +2309,18 @@ void propsTickPadEffects(void) } } -void propSetPerimEnabled(struct prop *prop, s32 enable) +void prop_set_perim_enabled(struct prop *prop, s32 enable) { if (prop->type == PROPTYPE_CHR) { - chrSetPerimEnabled(prop->chr, enable); + chr_set_perim_enabled(prop->chr, enable); } else if (prop->type == PROPTYPE_PLAYER) { - playerSetPerimEnabled(prop, enable); + player_set_perim_enabled(prop, enable); } else if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR || prop->type == PROPTYPE_WEAPON) { - objSetPerimEnabled(prop, enable); + obj_set_perim_enabled(prop, enable); } } -void propsTestForPickup(void) +void props_test_for_pickup(void) { s16 *propnumptr; s32 i; @@ -2331,14 +2331,14 @@ void propsTestForPickup(void) if (g_Vars.currentplayer->bondmovemode != MOVEMODE_CUTSCENE && !g_PlayerInvincible && g_Vars.currentplayer != g_Vars.anti) { - roomsCopy(g_Vars.currentplayer->prop->rooms, allrooms); + rooms_copy(g_Vars.currentplayer->prop->rooms, allrooms); for (i = 0; g_Vars.currentplayer->prop->rooms[i] != -1; i++) { - bgRoomGetNeighbours(g_Vars.currentplayer->prop->rooms[i], tmp, 10); - roomsAppend(tmp, allrooms, 20); + bg_room_get_neighbours(g_Vars.currentplayer->prop->rooms[i], tmp, 10); + rooms_append(tmp, allrooms, 20); } - roomGetProps(allrooms, propnums, 256); + room_get_props(allrooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { @@ -2353,10 +2353,10 @@ void propsTestForPickup(void) { switch (prop->type) { case PROPTYPE_OBJ: - op = objTestForPickup(prop); + op = obj_test_for_pickup(prop); break; case PROPTYPE_WEAPON: - op = weaponTestForPickup(prop); + op = weapon_test_for_pickup(prop); break; case PROPTYPE_DOOR: case PROPTYPE_CHR: @@ -2368,7 +2368,7 @@ void propsTestForPickup(void) } } - propExecuteTickOperation(prop, op); + prop_execute_tick_operation(prop, op); propnumptr++; } @@ -2390,7 +2390,7 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3 f32 left; f32 right; f32 result = -2; - struct weaponfunc *func = currentPlayerGetWeaponFunction(HAND_RIGHT); + struct weaponfunc *func = current_player_get_weapon_function(HAND_RIGHT); bool sp50 = arg7; bool sp4c; f32 sp48; @@ -2402,15 +2402,15 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3 } if (sp50) { - top = camGetScreenTop(); - bottom = camGetScreenTop() + camGetScreenHeight(); - left = camGetScreenLeft(); - right = camGetScreenLeft() + camGetScreenWidth(); + top = cam_get_screen_top(); + bottom = cam_get_screen_top() + cam_get_screen_height(); + left = cam_get_screen_left(); + right = cam_get_screen_left() + cam_get_screen_width(); } else { - top = camGetScreenTop() + camGetScreenHeight() * 0.175f; - bottom = camGetScreenTop() + camGetScreenHeight() * 0.825f; - left = camGetScreenLeft() + camGetScreenWidth() * 0.25f; - right = camGetScreenLeft() + camGetScreenWidth() * 0.75f; + top = cam_get_screen_top() + cam_get_screen_height() * 0.175f; + bottom = cam_get_screen_top() + cam_get_screen_height() * 0.825f; + left = cam_get_screen_left() + cam_get_screen_width() * 0.25f; + right = cam_get_screen_left() + cam_get_screen_width() * 0.75f; } if (arg1->z > -2.5f) { @@ -2437,11 +2437,11 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3 if (sp74[1] >= top && bottom >= sp7c[1]) { sp4c = false; - bgunGetCrossPos(&sp70, &sp6c); + bgun_get_cross_pos(&sp70, &sp6c); sp8c[0] = floorf(sp8c[0]); sp84[0] = ceilf(sp84[0]); - if (bmoveIsAutoAimXEnabledForCurrentWeapon() || cangangsta) { + if (bmove_is_auto_aim_x_enabled_for_current_weapon() || cangangsta) { if (sp8c[0] <= right && left <= sp84[0]) { sp48 = (sp84[0] - sp8c[0]) * 1.5f; @@ -2449,8 +2449,8 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3 sp48 = sp48 * g_AutoAimScale; } - sp4c = camGetScreenLeft() + 0.5f * camGetScreenWidth() >= (sp8c[0] + sp84[0]) * 0.5f - sp48 - && camGetScreenLeft() + 0.5f * camGetScreenWidth() <= (sp8c[0] + sp84[0]) * 0.5f + sp48 + sp4c = cam_get_screen_left() + 0.5f * cam_get_screen_width() >= (sp8c[0] + sp84[0]) * 0.5f - sp48 + && cam_get_screen_left() + 0.5f * cam_get_screen_width() <= (sp8c[0] + sp84[0]) * 0.5f + sp48 && left <= spa0[0] && right >= spa0[0]; } @@ -2461,14 +2461,14 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3 if (sp4c) { playerprop = g_Vars.currentplayer->prop; - playerSetPerimEnabled(playerprop, false); + player_set_perim_enabled(playerprop, false); if (throughobjects) { - ok = cdTestLos03(&playerprop->pos, playerprop->rooms, &prop->pos, + ok = cd_test_los03(&playerprop->pos, playerprop->rooms, &prop->pos, CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG, GEOFLAG_BLOCK_SHOOT); } else { - ok = cdTestLos03(&playerprop->pos, playerprop->rooms, &prop->pos, + ok = cd_test_los03(&playerprop->pos, playerprop->rooms, &prop->pos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG, GEOFLAG_BLOCK_SHOOT); } @@ -2484,7 +2484,7 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3 arg4[1] = value; - if (bmoveIsAutoAimXEnabledForCurrentWeapon() || cangangsta) { + if (bmove_is_auto_aim_x_enabled_for_current_weapon() || cangangsta) { f32 value = spa0[0]; if (value < left) { @@ -2496,50 +2496,50 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3 arg4[0] = value; } - if (camGetScreenLeft() + 0.5f * camGetScreenWidth() >= sp8c[0] - && camGetScreenLeft() + 0.5f * camGetScreenWidth() <= sp84[0]) { + if (cam_get_screen_left() + 0.5f * cam_get_screen_width() >= sp8c[0] + && cam_get_screen_left() + 0.5f * cam_get_screen_width() <= sp84[0]) { result = 1; - } else if (camGetScreenLeft() + 0.5f * camGetScreenWidth() >= sp8c[0]) { - result = 1 - ((camGetScreenLeft() + 0.5f * camGetScreenWidth()) - sp84[0]) / sp48; + } else if (cam_get_screen_left() + 0.5f * cam_get_screen_width() >= sp8c[0]) { + result = 1 - ((cam_get_screen_left() + 0.5f * cam_get_screen_width()) - sp84[0]) / sp48; } else { - result = 1 - (sp8c[0] - (camGetScreenLeft() + 0.5f * camGetScreenWidth())) / sp48; + result = 1 - (sp8c[0] - (cam_get_screen_left() + 0.5f * cam_get_screen_width())) / sp48; } } - playerSetPerimEnabled(playerprop, true); + player_set_perim_enabled(playerprop, true); } } return result; } -void farsightChooseTarget(void) +void farsight_choose_target(void) { struct prop *besttarget = NULL; f32 bestthing = 1; f32 bestdist = -1; - s32 weaponnum = bgunGetWeaponNum(HAND_RIGHT); + s32 weaponnum = bgun_get_weapon_num(HAND_RIGHT); s32 i; if (weaponnum == WEAPON_FARSIGHT) { - s32 numchrs = chrsGetNumSlots(); + s32 numchrs = chrs_get_num_slots(); for (i = numchrs - 1; i >= 0; i--) { struct prop *prop = g_ChrSlots[i].prop; if (prop && prop->chr) { if ((prop->type == PROPTYPE_CHR && (prop->flags & PROPFLAG_ENABLED)) - || (prop->type == PROPTYPE_PLAYER && playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum)) { + || (prop->type == PROPTYPE_PLAYER && playermgr_get_player_num_by_prop(prop) != g_Vars.currentplayernum)) { struct chrdata *chr = prop->chr; if ((chr->chrflags & CHRCFLAG_UNEXPLODABLE) == 0 - && !chrCompareTeams(g_Vars.currentplayer->prop->chr, chr, COMPARE_FRIENDS) + && !chr_compare_teams(g_Vars.currentplayer->prop->chr, chr, COMPARE_FRIENDS) && chr->actiontype != ACT_DIE && chr->actiontype != ACT_DRUGGEDDROP && chr->actiontype != ACT_DRUGGEDKO && chr->actiontype != ACT_DEAD && (chr->hidden & CHRHFLAG_CLOAKED) == 0 - && (prop->type != PROPTYPE_PLAYER || !g_Vars.players[playermgrGetPlayerNumByProp(prop)]->isdead)) { + && (prop->type != PROPTYPE_PLAYER || !g_Vars.players[playermgr_get_player_num_by_prop(prop)]->isdead)) { f32 xdist = g_Vars.currentplayer->bond2.unk10.x - prop->pos.x; f32 ydist = g_Vars.currentplayer->bond2.unk10.y - prop->pos.y; f32 zdist = g_Vars.currentplayer->bond2.unk10.z - prop->pos.z; @@ -2567,29 +2567,29 @@ void farsightChooseTarget(void) g_Vars.currentplayer->autoerasertarget = besttarget; } -void autoaimTick(void) +void autoaim_tick(void) { struct prop *bestprop = NULL; f32 aimpos[2] = {0, 0}; bool ismelee = false; - bool cangangsta = weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_GANGSTA); + bool cangangsta = weapon_has_flag(bgun_get_weapon_num(HAND_RIGHT), WEAPONFLAG_GANGSTA); bool iscmpsec = false; - struct weaponfunc *func = currentPlayerGetWeaponFunction(HAND_RIGHT); + struct weaponfunc *func = current_player_get_weapon_function(HAND_RIGHT); s32 i; if (func && (func->type & 0xff) == INVENTORYFUNCTYPE_MELEE) { ismelee = true; } - if (frIsInTraining()) { - if (!frChooseFarsightTarget()) { - farsightChooseTarget(); + if (fr_is_in_training()) { + if (!fr_choose_farsight_target()) { + farsight_choose_target(); } } else { - farsightChooseTarget(); + farsight_choose_target(); } - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150 + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_CMP150 && g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponfunc == FUNC_SECONDARY) { iscmpsec = true; } @@ -2603,10 +2603,10 @@ void autoaimTick(void) && (trackedprop->x1 >= 0 || trackedprop->x2 >= 0) && (trackedprop->y1 >= 0 || trackedprop->y2 >= 0)) { // Define the aim limits - f32 top = camGetScreenTop() + camGetScreenHeight() * 0.125f; - f32 bottom = camGetScreenTop() + camGetScreenHeight() * 0.875f; - f32 left = camGetScreenLeft() + camGetScreenWidth() * 0.125f; - f32 right = camGetScreenLeft() + camGetScreenWidth() * 0.875f; + f32 top = cam_get_screen_top() + cam_get_screen_height() * 0.125f; + f32 bottom = cam_get_screen_top() + cam_get_screen_height() * 0.875f; + f32 left = cam_get_screen_left() + cam_get_screen_width() * 0.125f; + f32 right = cam_get_screen_left() + cam_get_screen_width() * 0.875f; struct chrdata *chr = NULL; bestprop = trackedprop->prop; @@ -2620,7 +2620,7 @@ void autoaimTick(void) if (bestprop->flags & PROPFLAG_ONTHISSCREENTHISTICK) { struct defaultobj *obj = bestprop->obj; - Mtxf *mtx = modelGetRootMtx(obj->model); + Mtxf *mtx = model_get_root_mtx(obj->model); struct coord spac; spac.z = mtx->m[3][2]; @@ -2663,7 +2663,7 @@ void autoaimTick(void) // Don't use this prop if it's an undeployed eyespy, or if // the trackedprop is outside of the aim limits if (chr && chr->race == RACE_EYESPY) { - struct eyespy *eyespy = chrToEyespy(chr); + struct eyespy *eyespy = chr_to_eyespy(chr); if (eyespy == NULL || !eyespy->deployed) { bestprop = NULL; @@ -2682,8 +2682,8 @@ void autoaimTick(void) break; } } - } else if ((bmoveIsAutoAimYEnabledForCurrentWeapon() - || bmoveIsAutoAimXEnabledForCurrentWeapon() + } else if ((bmove_is_auto_aim_y_enabled_for_current_weapon() + || bmove_is_auto_aim_x_enabled_for_current_weapon() || cangangsta) && !ismelee) { // Standard auto aim f32 bestthing = -1; @@ -2701,15 +2701,15 @@ void autoaimTick(void) if (prop && prop->chr) { if (prop->type == PROPTYPE_CHR - || (prop->type == PROPTYPE_PLAYER && playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum)) { + || (prop->type == PROPTYPE_PLAYER && playermgr_get_player_num_by_prop(prop) != g_Vars.currentplayernum)) { chr = prop->chr; - if (!chrCompareTeams(g_Vars.currentplayer->prop->chr, chr, COMPARE_FRIENDS) - && (chrGetHeldProp(chr, HAND_RIGHT) - || chrGetHeldProp(chr, HAND_LEFT) + if (!chr_compare_teams(g_Vars.currentplayer->prop->chr, chr, COMPARE_FRIENDS) + && (chr_get_held_prop(chr, HAND_RIGHT) + || chr_get_held_prop(chr, HAND_LEFT) || (chr->chrflags & CHRCFLAG_FORCEAUTOAIM) || chr->gunprop) - && chrCalculateAutoAim(prop, &sp94, sp8c, sp84)) { + && chr_calculate_auto_aim(prop, &sp94, sp8c, sp84)) { f32 thing = func0f06438c(prop, &sp94, sp8c, sp84, sp78, false, cangangsta, 0); if (thing > bestthing) { @@ -2731,12 +2731,12 @@ void autoaimTick(void) } if (bestprop) { - if (bmoveIsAutoAimYEnabledForCurrentWeapon() || iscmpsec) { - bmoveUpdateAutoAimYProp(bestprop, (aimpos[1] - camGetScreenTop()) / (camGetScreenHeight() * 0.5f) - 1); + if (bmove_is_auto_aim_y_enabled_for_current_weapon() || iscmpsec) { + bmove_update_auto_aim_y_prop(bestprop, (aimpos[1] - cam_get_screen_top()) / (cam_get_screen_height() * 0.5f) - 1); } - if (bmoveIsAutoAimXEnabledForCurrentWeapon() || iscmpsec) { - bmoveUpdateAutoAimXProp(bestprop, (aimpos[0] - camGetScreenLeft()) / (camGetScreenWidth() * 0.5f) - 1); + if (bmove_is_auto_aim_x_enabled_for_current_weapon() || iscmpsec) { + bmove_update_auto_aim_x_prop(bestprop, (aimpos[0] - cam_get_screen_left()) / (cam_get_screen_width() * 0.5f) - 1); } if (cangangsta) { @@ -2755,14 +2755,14 @@ void autoaimTick(void) } } else { u32 stack; - bmoveUpdateAutoAimYProp(NULL, 0); - bmoveUpdateAutoAimXProp(NULL, 0); + bmove_update_auto_aim_y_prop(NULL, 0); + bmove_update_auto_aim_x_prop(NULL, 0); g_Vars.currentplayer->gunctrl.gangsta = false; } } -u32 propDoorGetCdTypes(struct prop *prop) +u32 prop_door_get_cd_types(struct prop *prop) { struct doorobj *door = prop->door; u32 types; @@ -2782,7 +2782,7 @@ u32 propDoorGetCdTypes(struct prop *prop) return types; } -bool propIsOfCdType(struct prop *prop, u32 types) +bool prop_is_of_cd_type(struct prop *prop, u32 types) { bool result = true; @@ -2804,7 +2804,7 @@ bool propIsOfCdType(struct prop *prop, u32 types) } if ((types & CDTYPE_DOORS) == 0) { - if ((propDoorGetCdTypes(prop) & types) == 0) { + if ((prop_door_get_cd_types(prop) & types) == 0) { result = false; } } @@ -2812,7 +2812,7 @@ bool propIsOfCdType(struct prop *prop, u32 types) if ((types & CDTYPE_PLAYERS) == 0) { result = false; } else { - struct player *player = g_Vars.players[playermgrGetPlayerNumByProp(prop)]; + struct player *player = g_Vars.players[playermgr_get_player_num_by_prop(prop)]; if (!player->bondperimenabled || (g_Vars.mplayerisrunning && player->isdead)) { result = false; @@ -2872,7 +2872,7 @@ bool propIsOfCdType(struct prop *prop, u32 types) return result; } -void roomsCopy(RoomNum *src, RoomNum *dst) +void rooms_copy(RoomNum *src, RoomNum *dst) { RoomNum *srcptr = src; RoomNum *dstptr = dst; @@ -2890,7 +2890,7 @@ void roomsCopy(RoomNum *src, RoomNum *dst) /** * Append newrooms to dstrooms without duplicates. */ -void roomsAppend(RoomNum *newrooms, RoomNum *dstrooms, s32 maxlen) +void rooms_append(RoomNum *newrooms, RoomNum *dstrooms, s32 maxlen) { s32 i; @@ -2906,7 +2906,7 @@ void roomsAppend(RoomNum *newrooms, RoomNum *dstrooms, s32 maxlen) } } -bool arrayIntersects(RoomNum *a, RoomNum *b) +bool array_intersects(RoomNum *a, RoomNum *b) { RoomNum *aptr = a; RoomNum aval = *aptr; @@ -2932,7 +2932,7 @@ bool arrayIntersects(RoomNum *a, RoomNum *b) return false; } -bool propTryAddToChunk(s16 propnum, s32 chunkindex) +bool prop_try_add_to_chunk(s16 propnum, s32 chunkindex) { s32 i; @@ -2946,7 +2946,7 @@ bool propTryAddToChunk(s16 propnum, s32 chunkindex) return false; } -s32 roomAllocatePropListChunk(s32 room, s32 prevchunkindex) +s32 room_allocate_prop_list_chunk(s32 room, s32 prevchunkindex) { s32 i; s32 j; @@ -2970,7 +2970,7 @@ s32 roomAllocatePropListChunk(s32 room, s32 prevchunkindex) return -1; } -void propRegisterRoom(struct prop *prop, RoomNum room) +void prop_register_room(struct prop *prop, RoomNum room) { s32 prev = -1; s32 i; @@ -2981,7 +2981,7 @@ void propRegisterRoom(struct prop *prop, RoomNum room) s16 propnum = prop - g_Vars.props; for (i = 0; chunkindex >= 0; i++) { - if (propTryAddToChunk(propnum, chunkindex)) { + if (prop_try_add_to_chunk(propnum, chunkindex)) { return; } @@ -2990,15 +2990,15 @@ void propRegisterRoom(struct prop *prop, RoomNum room) } // Allocate a new chunk - chunkindex = roomAllocatePropListChunk(room, prev); + chunkindex = room_allocate_prop_list_chunk(room, prev); if (chunkindex >= 0) { - propTryAddToChunk(propnum, chunkindex); + prop_try_add_to_chunk(propnum, chunkindex); } } } -void propDeregisterRoom(struct prop *prop, RoomNum room) +void prop_deregister_room(struct prop *prop, RoomNum room) { bool removed = false; s32 prev = -1; @@ -3050,13 +3050,13 @@ void propDeregisterRoom(struct prop *prop, RoomNum room) * * Room registration is used to look up props by room number. */ -void propDeregisterRooms(struct prop *prop) +void prop_deregister_rooms(struct prop *prop) { RoomNum *rooms = prop->rooms; RoomNum room = *rooms; while (room != -1) { - propDeregisterRoom(prop, room); + prop_deregister_room(prop, room); rooms++; room = *rooms; } @@ -3067,13 +3067,13 @@ void propDeregisterRooms(struct prop *prop) * * Room registration is used to look up props by room number. */ -void propRegisterRooms(struct prop *prop) +void prop_register_rooms(struct prop *prop) { RoomNum *rooms = prop->rooms; RoomNum room = *rooms; while (room != -1) { - propRegisterRoom(prop, room); + prop_register_room(prop, room); rooms++; room = *rooms; } @@ -3090,7 +3090,7 @@ void func0f065d1c(struct coord *pos, RoomNum *rooms, struct coord *newpos, RoomN index = 0; for (i = 0; stackrooms[i] != -1; i++) { - if (bgRoomContainsCoord(newpos, stackrooms[i])) { + if (bg_room_contains_coord(newpos, stackrooms[i])) { newrooms[index] = stackrooms[i]; index++; } @@ -3112,7 +3112,7 @@ void func0f065dfc(struct coord *pos, RoomNum *rooms, struct coord *newpos, RoomN func0f065e98(pos, rooms, newpos, newrooms); if (morerooms) { - roomsAppend(newrooms, morerooms, arg5); + rooms_append(newrooms, morerooms, arg5); } } } @@ -3129,7 +3129,7 @@ void func0f065e98(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum RoomNum *ptr = NULL; s32 i; - bgFindRoomsByPos(pos2, inrooms, aboverooms, 20, NULL); + bg_find_rooms_by_pos(pos2, inrooms, aboverooms, 20, NULL); if (inrooms[0] != -1) { ptr = inrooms; @@ -3138,7 +3138,7 @@ void func0f065e98(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum } if (ptr) { - s32 room = cdFindFloorRoomAtPos(pos2, ptr); + s32 room = cd_find_floor_room_at_pos(pos2, ptr); if (room > 0) { dstrooms[0] = room; @@ -3167,7 +3167,7 @@ void func0f065e98(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum * to get 256 props in a small space without exhausing the memory of the * console, you could potentially achieve arbitrary code execution. */ -void roomGetProps(RoomNum *rooms, s16 *propnums, s32 len) +void room_get_props(RoomNum *rooms, s16 *propnums, s32 len) { s16 *writeptr = propnums; RoomNum room; @@ -3217,7 +3217,7 @@ void roomGetProps(RoomNum *rooms, s16 *propnums, s32 len) *writeptr = -1; } -void propsDefragRoomProps(void) +void props_defrag_room_props(void) { s32 i; s32 j; @@ -3281,14 +3281,14 @@ void func0f0661fc(void) // empty } -void propGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) +void prop_get_bbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) { if (prop->type == PROPTYPE_CHR) { - chrGetBbox(prop, radius, ymax, ymin); + chr_get_bbox(prop, radius, ymax, ymin); } else if (prop->type == PROPTYPE_PLAYER) { - playerGetBbox(prop, radius, ymax, ymin); + player_get_bbox(prop, radius, ymax, ymin); } else if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR) { - objGetBbox(prop, radius, ymax, ymin); + obj_get_bbox(prop, radius, ymax, ymin); } else { *radius = 0; *ymin = 0; @@ -3296,16 +3296,16 @@ void propGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) } } -bool propUpdateGeometry(struct prop *prop, u8 **start, u8 **end) +bool prop_update_geometry(struct prop *prop, u8 **start, u8 **end) { bool result = false; if (prop->type == PROPTYPE_PLAYER) { - result = playerUpdateGeometry(prop, start, end); + result = player_update_geometry(prop, start, end); } else if (prop->type == PROPTYPE_CHR) { - result = chrUpdateGeometry(prop, start, end); + result = chr_update_geometry(prop, start, end); } else if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR) { - result = objUpdateGeometry(prop, start, end); + result = obj_update_geometry(prop, start, end); } return result; diff --git a/src/game/propobj.c b/src/game/propobj.c index 33cf9ac1f..cc81480dd 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -78,7 +78,7 @@ #include "types.h" #include "string.h" -void rng2SetSeed(u32 seed); +void rng2_set_seed(u32 seed); struct weaponobj *g_Proxies[30]; f32 g_GasReleaseTimerMax240; @@ -144,13 +144,13 @@ s32 g_MaxThrownLaptops = 0; * * The allowclose argument determines whether the door should be closed if the * lift is at the door. This is typically true when the player has activated the - * door, and false when NPCs have activated the door. If true, doorCallLift + * door, and false when NPCs have activated the door. If true, door_call_lift * doesn't handle the activation which allows the caller to close the door. * * Lifts will not be called if it's occupied by anyone. This prevents chrs from * from calling lifts back when players are in them. */ -bool doorCallLift(struct prop *doorprop, bool allowclose) +bool door_call_lift(struct prop *doorprop, bool allowclose) { struct doorobj *door = doorprop->door; bool handled = false; @@ -167,22 +167,22 @@ bool doorCallLift(struct prop *doorprop, bool allowclose) if (type == OBJTYPE_DOOR) { // This appears to be handling situations where the setup // file specifies a door as the lift object. It activates - // that door, which then calls doorCallLift. This allows + // that door, which then calls door_call_lift. This allows // setup files to chain lift doors to other lift doors // rather than directly to the lift, but this doesn't happen // in practice so this branch is unused. - doorsActivate(link->lift, allowclose); + doors_activate(link->lift, allowclose); } else if (type == OBJTYPE_LIFT) { if (allowclose #if VERSION < VERSION_NTSC_1_0 && g_Vars.currentplayer->lift == link->lift #endif && door->base.type == OBJTYPE_DOOR - && !doorIsClosed(door)) { + && !door_is_closed(door)) { handled = false; } else { bool vacant = true; - s32 numchrslots = chrsGetNumSlots(); + s32 numchrslots = chrs_get_num_slots(); s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { @@ -194,7 +194,7 @@ bool doorCallLift(struct prop *doorprop, bool allowclose) if (vacant) { for (i = 0; i < numchrslots; i++) { /** - * @bug: This is missing a chrIsDead check. + * @bug: This is missing a chr_is_dead check. * If a chr dies in a lift it can no longer be called. */ if (g_ChrSlots[i].prop && g_ChrSlots[i].lift == link->lift) { @@ -205,7 +205,7 @@ bool doorCallLift(struct prop *doorprop, bool allowclose) } if (vacant) { - liftGoToStop((struct liftobj *) link->lift->obj, link->stopnum); + lift_go_to_stop((struct liftobj *) link->lift->obj, link->stopnum); } } } @@ -218,7 +218,7 @@ bool doorCallLift(struct prop *doorprop, bool allowclose) return handled; } -bool doorIsPadlockFree(struct doorobj *door) +bool door_is_padlock_free(struct doorobj *door) { if (door->base.hidden & OBJHFLAG_PADLOCKEDDOOR) { struct padlockeddoorobj *padlockeddoor = g_PadlockedDoors; @@ -227,7 +227,7 @@ bool doorIsPadlockFree(struct doorobj *door) if (door == padlockeddoor->door && padlockeddoor->lock && padlockeddoor->lock->prop - && objIsHealthy(padlockeddoor->lock)) { + && obj_is_healthy(padlockeddoor->lock)) { return false; } @@ -238,7 +238,7 @@ bool doorIsPadlockFree(struct doorobj *door) return true; } -bool objCanPickupFromSafe(struct defaultobj *obj) +bool obj_can_pickup_from_safe(struct defaultobj *obj) { if (obj->flags2 & OBJFLAG2_LINKEDTOSAFE) { struct safeitemobj *link = g_SafeItems; @@ -259,14 +259,14 @@ bool objCanPickupFromSafe(struct defaultobj *obj) return true; } -void objUpdateLinkedScenery(struct defaultobj *obj, struct prop *prop) +void obj_update_linked_scenery(struct defaultobj *obj, struct prop *prop) { if ((obj->hidden & OBJHFLAG_CONDITIONALSCENERY) && (obj->flags & OBJFLAG_INVINCIBLE) == 0) { struct linksceneryobj *link = g_LinkedScenery; while (link) { if (link->trigger == obj) { - objCreateDebris(obj, prop); + obj_create_debris(obj, prop); link->trigger->flags2 |= OBJFLAG2_INVISIBLE; link->trigger->hidden |= OBJHFLAG_DELETING; @@ -279,7 +279,7 @@ void objUpdateLinkedScenery(struct defaultobj *obj, struct prop *prop) link->exp->flags2 &= ~OBJFLAG2_INVISIBLE; } - objSetBlockedPathUnblocked(obj, true); + obj_set_blocked_path_unblocked(obj, true); return; } @@ -288,97 +288,97 @@ void objUpdateLinkedScenery(struct defaultobj *obj, struct prop *prop) } } -f32 objGetLocalXMin(struct modelrodata_bbox *bbox) +f32 obj_get_local_x_min(struct modelrodata_bbox *bbox) { return bbox->xmin; } -f32 objGetLocalXMax(struct modelrodata_bbox *bbox) +f32 obj_get_local_x_max(struct modelrodata_bbox *bbox) { return bbox->xmax; } -f32 objGetLocalYMin(struct modelrodata_bbox *bbox) +f32 obj_get_local_y_min(struct modelrodata_bbox *bbox) { return bbox->ymin; } -f32 objGetLocalYMax(struct modelrodata_bbox *bbox) +f32 obj_get_local_y_max(struct modelrodata_bbox *bbox) { return bbox->ymax; } -f32 objGetLocalZMin(struct modelrodata_bbox *bbox) +f32 obj_get_local_z_min(struct modelrodata_bbox *bbox) { return bbox->zmin; } -f32 objGetLocalZMax(struct modelrodata_bbox *bbox) +f32 obj_get_local_z_max(struct modelrodata_bbox *bbox) { return bbox->zmax; } -f32 objGetRotatedLocalXMinByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) +f32 obj_get_rotated_local_x_min_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) { - return objGetRotatedLocalMin(bbox, mtx->m[0][0], mtx->m[1][0], mtx->m[2][0]); + return obj_get_rotated_local_min(bbox, mtx->m[0][0], mtx->m[1][0], mtx->m[2][0]); } -f32 objGetRotatedLocalXMaxByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) +f32 obj_get_rotated_local_x_max_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) { - return objGetRotatedLocalMax(bbox, mtx->m[0][0], mtx->m[1][0], mtx->m[2][0]); + return obj_get_rotated_local_max(bbox, mtx->m[0][0], mtx->m[1][0], mtx->m[2][0]); } -f32 objGetRotatedLocalYMinByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) +f32 obj_get_rotated_local_y_min_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) { - return objGetRotatedLocalMin(bbox, mtx->m[0][1], mtx->m[1][1], mtx->m[2][1]); + return obj_get_rotated_local_min(bbox, mtx->m[0][1], mtx->m[1][1], mtx->m[2][1]); } -f32 objGetRotatedLocalYMaxByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) +f32 obj_get_rotated_local_y_max_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) { - return objGetRotatedLocalMax(bbox, mtx->m[0][1], mtx->m[1][1], mtx->m[2][1]); + return obj_get_rotated_local_max(bbox, mtx->m[0][1], mtx->m[1][1], mtx->m[2][1]); } -f32 objGetRotatedLocalZMinByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) +f32 obj_get_rotated_local_z_min_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) { - return objGetRotatedLocalMin(bbox, mtx->m[0][2], mtx->m[1][2], mtx->m[2][2]); + return obj_get_rotated_local_min(bbox, mtx->m[0][2], mtx->m[1][2], mtx->m[2][2]); } -f32 objGetRotatedLocalZMaxByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) +f32 obj_get_rotated_local_z_max_by_mtx4(struct modelrodata_bbox *bbox, Mtxf *mtx) { - return objGetRotatedLocalMax(bbox, mtx->m[0][2], mtx->m[1][2], mtx->m[2][2]); + return obj_get_rotated_local_max(bbox, mtx->m[0][2], mtx->m[1][2], mtx->m[2][2]); } -f32 objGetRotatedLocalXMinByMtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]) +f32 obj_get_rotated_local_x_min_by_mtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]) { - return objGetRotatedLocalMin(bbox, realrot[0][0], realrot[1][0], realrot[2][0]); + return obj_get_rotated_local_min(bbox, realrot[0][0], realrot[1][0], realrot[2][0]); } -f32 objGetRotatedLocalXMaxByMtx3(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]) { - return objGetRotatedLocalMax(bbox, realrot[0][0], realrot[1][0], realrot[2][0]); + return obj_get_rotated_local_max(bbox, realrot[0][0], realrot[1][0], realrot[2][0]); } -f32 objGetRotatedLocalYMinByMtx3(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]) { - return objGetRotatedLocalMin(bbox, realrot[0][1], realrot[1][1], realrot[2][1]); + return obj_get_rotated_local_min(bbox, realrot[0][1], realrot[1][1], realrot[2][1]); } -f32 objGetRotatedLocalYMaxByMtx3(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]) { - return objGetRotatedLocalMax(bbox, realrot[0][1], realrot[1][1], realrot[2][1]); + return obj_get_rotated_local_max(bbox, realrot[0][1], realrot[1][1], realrot[2][1]); } -f32 objGetRotatedLocalZMinByMtx3(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]) { - return objGetRotatedLocalMin(bbox, realrot[0][2], realrot[1][2], realrot[2][2]); + return obj_get_rotated_local_min(bbox, realrot[0][2], realrot[1][2], realrot[2][2]); } -f32 objGetRotatedLocalZMaxByMtx3(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]) { - return objGetRotatedLocalMax(bbox, realrot[0][2], realrot[1][2], realrot[2][2]); + return obj_get_rotated_local_max(bbox, realrot[0][2], realrot[1][2], realrot[2][2]); } -f32 objGetRotatedLocalMin(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 arg3) +f32 obj_get_rotated_local_min(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 arg3) { f32 sum = 0; @@ -403,7 +403,7 @@ f32 objGetRotatedLocalMin(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 return sum; } -f32 objGetRotatedLocalMax(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) { f32 sum = 0; @@ -428,7 +428,7 @@ f32 objGetRotatedLocalMax(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 return sum; } -s32 objCalculateGeoBlockVertices(f32 xmin, f32 xmax, f32 ymin, f32 ymax, f32 zmin, f32 zmax, Mtxf *mtx, struct geoblock *block) +s32 obj_calculate_geo_block_vertices(f32 xmin, f32 xmax, f32 ymin, f32 ymax, f32 zmin, f32 zmax, Mtxf *mtx, struct geoblock *block) { s32 i; s32 j; @@ -617,16 +617,16 @@ s32 objCalculateGeoBlockVertices(f32 xmin, f32 xmax, f32 ymin, f32 ymax, f32 zmi return numverts; } -void objCalculateGeoBlockFromBboxAndMtx(struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block) +void obj_calculate_geo_block_from_bbox_and_mtx(struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block) { - block->header.numvertices = objCalculateGeoBlockVertices( + block->header.numvertices = obj_calculate_geo_block_vertices( bbox->xmin, bbox->xmax, bbox->ymin, bbox->ymax, bbox->zmin, bbox->zmax, mtx, block); block->header.type = GEOTYPE_BLOCK; - block->ymin = mtx->m[3][1] + objGetRotatedLocalYMinByMtx4(bbox, mtx); - block->ymax = mtx->m[3][1] + objGetRotatedLocalYMaxByMtx4(bbox, mtx); + block->ymin = mtx->m[3][1] + obj_get_rotated_local_y_min_by_mtx4(bbox, mtx); + block->ymax = mtx->m[3][1] + obj_get_rotated_local_y_max_by_mtx4(bbox, mtx); } -void objCalculateGeoBlockFromNode19Data(struct modelrodata_type19 *rodata19, struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block) +void obj_calculate_geo_block_from_node19_data(struct modelrodata_type19 *rodata19, struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block) { s32 i; @@ -637,8 +637,8 @@ void objCalculateGeoBlockFromNode19Data(struct modelrodata_type19 *rodata19, str block->header.numvertices = rodata19->numvertices; block->header.type = GEOTYPE_BLOCK; - block->ymin = mtx->m[3][1] + objGetRotatedLocalYMinByMtx4(bbox, mtx); - block->ymax = mtx->m[3][1] + objGetRotatedLocalYMaxByMtx4(bbox, mtx); + block->ymin = mtx->m[3][1] + obj_get_rotated_local_y_min_by_mtx4(bbox, mtx); + block->ymax = mtx->m[3][1] + obj_get_rotated_local_y_max_by_mtx4(bbox, mtx); } bool func0f0675c8(struct coord *pos, f32 arg1, struct modelrodata_bbox *bbox, Mtxf *mtx) @@ -656,8 +656,8 @@ bool func0f0675c8(struct coord *pos, f32 arg1, struct modelrodata_bbox *bbox, Mt sp4c.z = pos->z - mtx->m[3][2]; mtx000170e4(mtx->m, sp58.m); - mtx4RotateVec(&sp58, &sp4c, &sp40); - mtx4RotateVec(&sp58, &sp34, &sp28); + mtx4_rotate_vec(&sp58, &sp4c, &sp40); + mtx4_rotate_vec(&sp58, &sp34, &sp28); if (sp28.x < 0.0f) { sp28.x = -sp28.x; @@ -710,7 +710,7 @@ bool func0f0678f8(struct coord *coord, struct coord *arg1, s32 padnum) { struct pad pad; - padUnpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad); return func0f0677ac(coord, arg1, &pad.pos, &pad.normal, &pad.up, &pad.look, pad.bbox.xmin, pad.bbox.xmax, pad.bbox.ymin, pad.bbox.ymax, pad.bbox.zmin, pad.bbox.zmax); @@ -737,20 +737,20 @@ bool func0f0679ac(struct model *model, f32 *max, f32 *min, f32 arg3[2], f32 arg4 if (type == MODELNODETYPE_BBOX) { struct modelrodata_bbox *bbox = &node->rodata->bbox; - Mtxf *mtx = modelFindNodeMtx(model, node, 0); + Mtxf *mtx = model_find_node_mtx(model, node, 0); f32 dist1; f32 dist2; - dist1 = objGetRotatedLocalXMaxByMtx4(bbox, mtx) + mtx->m[3][0]; - dist2 = objGetRotatedLocalXMinByMtx4(bbox, mtx) + mtx->m[3][0]; + dist1 = obj_get_rotated_local_x_max_by_mtx4(bbox, mtx) + mtx->m[3][0]; + dist2 = obj_get_rotated_local_x_min_by_mtx4(bbox, mtx) + mtx->m[3][0]; if (arg3[0] - arg4[0] <= dist1 && arg3[0] + arg4[0] >= dist2) { - dist1 = objGetRotatedLocalYMaxByMtx4(bbox, mtx) + mtx->m[3][1]; - dist2 = objGetRotatedLocalYMinByMtx4(bbox, mtx) + mtx->m[3][1]; + dist1 = obj_get_rotated_local_y_max_by_mtx4(bbox, mtx) + mtx->m[3][1]; + dist2 = obj_get_rotated_local_y_min_by_mtx4(bbox, mtx) + mtx->m[3][1]; if (arg3[1] - arg4[1] <= dist1 && arg3[1] + arg4[1] >= dist2) { - dist1 = objGetRotatedLocalZMaxByMtx4(bbox, mtx) + mtx->m[3][2]; - dist2 = objGetRotatedLocalZMinByMtx4(bbox, mtx) + mtx->m[3][2]; + dist1 = obj_get_rotated_local_z_max_by_mtx4(bbox, mtx) + mtx->m[3][2]; + dist2 = obj_get_rotated_local_z_min_by_mtx4(bbox, mtx) + mtx->m[3][2]; if (first || dist1 > *max) { *max = dist1; @@ -794,19 +794,19 @@ void func0f067bc4(struct model *model, f32 *max, f32 *min, s32 axis) if (type == MODELNODETYPE_BBOX) { struct modelrodata_bbox *bbox = &node->rodata->bbox; - Mtxf *mtx = modelFindNodeMtx(model, node, 0); + Mtxf *mtx = model_find_node_mtx(model, node, 0); f32 dist1; f32 dist2; if (axis == 0) { - dist1 = objGetRotatedLocalXMaxByMtx4(bbox, mtx) + mtx->m[3][0]; - dist2 = objGetRotatedLocalXMinByMtx4(bbox, mtx) + mtx->m[3][0]; + dist1 = obj_get_rotated_local_x_max_by_mtx4(bbox, mtx) + mtx->m[3][0]; + dist2 = obj_get_rotated_local_x_min_by_mtx4(bbox, mtx) + mtx->m[3][0]; } else if (axis == 1) { - dist1 = objGetRotatedLocalYMaxByMtx4(bbox, mtx) + mtx->m[3][1]; - dist2 = objGetRotatedLocalYMinByMtx4(bbox, mtx) + mtx->m[3][1]; + dist1 = obj_get_rotated_local_y_max_by_mtx4(bbox, mtx) + mtx->m[3][1]; + dist2 = obj_get_rotated_local_y_min_by_mtx4(bbox, mtx) + mtx->m[3][1]; } else { - dist1 = objGetRotatedLocalZMaxByMtx4(bbox, mtx) + mtx->m[3][2]; - dist2 = objGetRotatedLocalZMinByMtx4(bbox, mtx) + mtx->m[3][2]; + dist1 = obj_get_rotated_local_z_max_by_mtx4(bbox, mtx) + mtx->m[3][2]; + dist2 = obj_get_rotated_local_z_min_by_mtx4(bbox, mtx) + mtx->m[3][2]; } if (first || dist1 > *max) { @@ -843,7 +843,7 @@ void func0f067d88(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg func0f067bc4(model, arg3, arg4, 1); } -bool modelGetScreenCoords2(struct model *model, f32 *x2, f32 *x1, f32 *y2, f32 *y1) +bool model_get_screen_coords2(struct model *model, f32 *x2, f32 *x1, f32 *y2, f32 *y1) { bool first = true; @@ -863,17 +863,17 @@ bool modelGetScreenCoords2(struct model *model, f32 *x2, f32 *x1, f32 *y2, f32 * f32 sp64[2]; f32 sp5c[2]; struct coord sp50; - Mtxf *mtx = modelFindNodeMtx(model, node, 0); + Mtxf *mtx = model_find_node_mtx(model, node, 0); if (mtx->m[3][2] < 0.0f) { sp50.x = mtx->m[3][0]; sp50.y = mtx->m[3][1]; sp50.z = mtx->m[3][2]; - sp64[0] = objGetRotatedLocalXMinByMtx4(bbox, mtx) + sp50.f[0]; - sp64[1] = objGetRotatedLocalXMaxByMtx4(bbox, mtx) + sp50.f[0]; - sp5c[0] = objGetRotatedLocalYMinByMtx4(bbox, mtx) + sp50.f[1]; - sp5c[1] = objGetRotatedLocalYMaxByMtx4(bbox, mtx) + sp50.f[1]; + sp64[0] = obj_get_rotated_local_x_min_by_mtx4(bbox, mtx) + sp50.f[0]; + sp64[1] = obj_get_rotated_local_x_max_by_mtx4(bbox, mtx) + sp50.f[0]; + sp5c[0] = obj_get_rotated_local_y_min_by_mtx4(bbox, mtx) + sp50.f[1]; + sp5c[1] = obj_get_rotated_local_y_max_by_mtx4(bbox, mtx) + sp50.f[1]; func0f06803c(&sp50, sp64, sp5c, sp74, sp6c); @@ -918,9 +918,9 @@ bool modelGetScreenCoords2(struct model *model, f32 *x2, f32 *x1, f32 *y2, f32 * return first ? false : true; } -bool modelGetScreenCoords(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) { - return modelGetScreenCoords2(model, x2, x1, y2, y1); + return model_get_screen_coords2(model, x2, x1, y2, y1); } void func0f06803c(struct coord *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4) @@ -928,8 +928,8 @@ void func0f06803c(struct coord *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4 struct coord sp4c; f32 sp44[2]; - f32 aspect = viGetAspect(); - f32 fovy = viGetFovY(); + f32 aspect = vi_get_aspect(); + f32 fovy = vi_get_fov_y(); if (g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit & DEVICE_EYESPY) { if (g_Vars.currentplayer->eyespy && g_Vars.currentplayer->eyespy->active) { @@ -970,7 +970,7 @@ void func0f06803c(struct coord *arg0, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4 arg4[1] = sp44[1]; } -struct defaultobj *objFindByPadNum(s32 padnum) +struct defaultobj *obj_find_by_pad_num(s32 padnum) { struct prop *prop = g_Vars.activeprops; @@ -989,7 +989,7 @@ struct defaultobj *objFindByPadNum(s32 padnum) return NULL; } -struct defaultobj *objFindByPos(struct coord *pos, RoomNum *rooms) +struct defaultobj *obj_find_by_pos(struct coord *pos, RoomNum *rooms) { struct prop *prop = g_Vars.activeprops; u8 *sp38; @@ -997,9 +997,9 @@ struct defaultobj *objFindByPos(struct coord *pos, RoomNum *rooms) while (prop) { if (prop->type == PROPTYPE_OBJ - && arrayIntersects(prop->rooms, rooms) - && propUpdateGeometry(prop, &sp38, &sp34) - && cd000266a4(pos->x, pos->z, (struct geo *)sp38)) { + && array_intersects(prop->rooms, rooms) + && prop_update_geometry(prop, &sp38, &sp34) + && cd_000266a4(pos->x, pos->z, (struct geo *)sp38)) { return prop->obj; } @@ -1009,14 +1009,14 @@ struct defaultobj *objFindByPos(struct coord *pos, RoomNum *rooms) return NULL; } -void projectileFree(struct projectile *projectile) +void projectile_free(struct projectile *projectile) { if (projectile) { projectile->flags |= PROJECTILEFLAG_FREE; } } -void projectilesUnrefOwner(struct prop *owner) +void projectiles_unref_owner(struct prop *owner) { s32 i; @@ -1028,7 +1028,7 @@ void projectilesUnrefOwner(struct prop *owner) } } -void projectileReset(struct projectile *projectile) +void projectile_reset(struct projectile *projectile) { projectile->flags = 0; projectile->speed.x = 0; @@ -1039,7 +1039,7 @@ void projectileReset(struct projectile *projectile) projectile->unk018 = 0; projectile->unk01c = 0; - mtx4LoadIdentity(&projectile->mtx); + mtx4_load_identity(&projectile->mtx); projectile->unk060 = 1; projectile->ownerprop = NULL; @@ -1069,7 +1069,7 @@ void projectileReset(struct projectile *projectile) projectile->unk0f0 = 0; } -struct projectile *projectileAllocate(void) +struct projectile *projectile_allocate(void) { s32 bestindex = -1; s32 i; @@ -1077,7 +1077,7 @@ struct projectile *projectileAllocate(void) // Happy path - find one that is already free for (i = 0; i < g_MaxProjectiles; i++) { if (g_Projectiles[i].flags & PROJECTILEFLAG_FREE) { - projectileReset(&g_Projectiles[i]); + projectile_reset(&g_Projectiles[i]); return &g_Projectiles[i]; } } @@ -1101,13 +1101,13 @@ struct projectile *projectileAllocate(void) // Reset and return it if (g_Projectiles[bestindex].obj) { if (g_Projectiles[bestindex].obj->prop) { - objFreeEmbedmentOrProjectile(g_Projectiles[bestindex].obj->prop); + obj_free_embedment_or_projectile(g_Projectiles[bestindex].obj->prop); } g_Projectiles[bestindex].obj->hidden |= OBJHFLAG_DELETING; } - projectileReset(&g_Projectiles[bestindex]); + projectile_reset(&g_Projectiles[bestindex]); return &g_Projectiles[bestindex]; } else { return NULL; @@ -1120,15 +1120,15 @@ void func0f0685e4(struct prop *prop) if (obj->hidden & OBJHFLAG_EMBEDDED) { if (obj->embedment->projectile) { - projectileReset(obj->embedment->projectile); + projectile_reset(obj->embedment->projectile); } else { - obj->embedment->projectile = projectileAllocate(); + obj->embedment->projectile = projectile_allocate(); } } else if ((obj->hidden & OBJHFLAG_PROJECTILE) == 0) { if (obj->projectile) { - projectileReset(obj->projectile); + projectile_reset(obj->projectile); } else { - obj->projectile = projectileAllocate(); + obj->projectile = projectile_allocate(); } if (obj->projectile) { @@ -1137,7 +1137,7 @@ void func0f0685e4(struct prop *prop) } } -void projectileSetSticky(struct prop *prop) +void projectile_set_sticky(struct prop *prop) { struct defaultobj *obj = prop->obj; struct projectile *projectile = NULL; @@ -1153,12 +1153,12 @@ void projectileSetSticky(struct prop *prop) } } -void embedmentFree(struct embedment *embedment) +void embedment_free(struct embedment *embedment) { embedment->flags |= EMBEDMENTFLAG_FREE; } -struct embedment *embedmentAllocate(void) +struct embedment *embedment_allocate(void) { s32 i; @@ -1184,7 +1184,7 @@ struct embedment *embedmentAllocate(void) * how close it is to being destroyed, where 4 is destroyed. After being * destroyed, the number increments at 1 per shot up to a max of 12. */ -s32 objGetShotsTaken(struct defaultobj *obj) +s32 obj_get_shots_taken(struct defaultobj *obj) { if ((obj->hidden2 & OBJH2FLAG_DESTROYED) == 0) { return obj->damage * 3.0f / obj->maxdamage; @@ -1209,7 +1209,7 @@ s32 objGetShotsTaken(struct defaultobj *obj) * When destroyed, damage is reset to 0 then incremented at one unit per shot, * so four shots causes it to enter a new destroyed level. */ -s32 objGetDestroyedLevel(struct defaultobj *obj) +s32 obj_get_destroyed_level(struct defaultobj *obj) { if ((obj->hidden2 & OBJH2FLAG_DESTROYED) == 0) { return 0; @@ -1230,13 +1230,13 @@ struct modelnode *func0f0687e4(struct model *model) case MODELNODETYPE_DL: return node; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, node); + model_apply_distance_relations(model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, node); + model_apply_toggle_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; } @@ -1257,7 +1257,7 @@ struct modelnode *func0f0687e4(struct model *model) return NULL; } -struct modelnode *modeldefFindBboxNode(struct modeldef *modeldef) +struct modelnode *modeldef_find_bbox_node(struct modeldef *modeldef) { struct modelnode *node = modeldef->rootnode; @@ -1283,9 +1283,9 @@ struct modelnode *modeldefFindBboxNode(struct modeldef *modeldef) return NULL; } -struct modelrodata_bbox *modeldefFindBboxRodata(struct modeldef *modeldef) +struct modelrodata_bbox *modeldef_find_bbox_rodata(struct modeldef *modeldef) { - struct modelnode *node = modeldefFindBboxNode(modeldef); + struct modelnode *node = modeldef_find_bbox_node(modeldef); if (node) { return &node->rodata->bbox; @@ -1294,7 +1294,7 @@ struct modelrodata_bbox *modeldefFindBboxRodata(struct modeldef *modeldef) return NULL; } -struct modelnode *modelFindBboxNode(struct model *model) +struct modelnode *model_find_bbox_node(struct model *model) { struct modelnode *node = model->definition->rootnode; @@ -1305,13 +1305,13 @@ struct modelnode *modelFindBboxNode(struct model *model) case MODELNODETYPE_BBOX: return node; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, node); + model_apply_distance_relations(model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, node); + model_apply_toggle_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; } @@ -1332,9 +1332,9 @@ struct modelnode *modelFindBboxNode(struct model *model) return NULL; } -struct modelrodata_bbox *modelFindBboxRodata(struct model *model) +struct modelrodata_bbox *model_find_bbox_rodata(struct model *model) { - struct modelnode *node = modelFindBboxNode(model); + struct modelnode *node = model_find_bbox_node(model); if (node) { return &node->rodata->bbox; @@ -1343,26 +1343,26 @@ struct modelrodata_bbox *modelFindBboxRodata(struct model *model) return NULL; } -struct modelnode *objFindBboxNode(struct defaultobj *obj) +struct modelnode *obj_find_bbox_node(struct defaultobj *obj) { - return modelFindBboxNode(obj->model); + return model_find_bbox_node(obj->model); } -struct modelrodata_bbox *objFindBboxRodata(struct defaultobj *obj) +struct modelrodata_bbox *obj_find_bbox_rodata(struct defaultobj *obj) { - return modelFindBboxRodata(obj->model); + return model_find_bbox_rodata(obj->model); } -s32 objGetAverageBrightnessInRooms(RoomNum *rooms, s32 brightnesstype) +s32 obj_get_average_brightness_in_rooms(RoomNum *rooms, s32 brightnesstype) { s32 brightness = 0; s32 i; for (i = 0; rooms[i] != -1; i++) { if (brightnesstype == 0) { - brightness += roomGetSettledRegionalBrightnessForPlayer(rooms[i]); + brightness += room_get_settled_regional_brightness_for_player(rooms[i]); } else if (brightnesstype == 1) { - brightness += roomGetFlashBrightness(rooms[i]); + brightness += room_get_flash_brightness(rooms[i]); } } @@ -1397,7 +1397,7 @@ s32 door0f068c04(struct prop *prop, s32 *arg1, s32 *arg2) #if VERSION < VERSION_PAL_BETA static u32 debugdoors = 0; - mainOverrideVariable("debugdoors", &debugdoors); + main_override_variable("debugdoors", &debugdoors); #endif sibling = door; @@ -1408,11 +1408,11 @@ s32 door0f068c04(struct prop *prop, s32 *arg1, s32 *arg2) struct coord *campos = &g_Vars.currentplayer->cam_pos; loopprop = sibling->base.prop; - padUnpack(sibling->base.pad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_ROOM, &pad); + pad_unpack(sibling->base.pad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_ROOM, &pad); if (door->base.flags3 & OBJFLAG3_04000000) { - total_br_settled += roomGetSettledRegionalBrightnessForPlayer(pad.room); - total_br_flash += roomGetFlashBrightness(pad.room); + total_br_settled += room_get_settled_regional_brightness_for_player(pad.room); + total_br_flash += room_get_flash_brightness(pad.room); s5++; s2 = total_br_settled + total_br_flash; @@ -1454,8 +1454,8 @@ s32 door0f068c04(struct prop *prop, s32 *arg1, s32 *arg2) // @bug? Duplicate sum1 < 0.0f check in the first part. // Perhaps one of them should be sum2 < 0.0f. if ((sum1 < 0.0f && sum1 < 0.0f) || (sum1 > 0.0f && sum2 > 0.0f)) { - s32 value1 = roomGetFlashBrightness(loopprop->rooms[i]); - s32 value2 = roomGetSettledRegionalBrightnessForPlayer(loopprop->rooms[i]); + s32 value1 = room_get_flash_brightness(loopprop->rooms[i]); + s32 value2 = room_get_settled_regional_brightness_for_player(loopprop->rooms[i]); s32 sum = value2 + value1; if (sum > 255) { @@ -1480,8 +1480,8 @@ s32 door0f068c04(struct prop *prop, s32 *arg1, s32 *arg2) } if (s5 == 0) { - br_settled_average = objGetAverageBrightnessInRooms(prop->rooms, 0); - br_flash_average = objGetAverageBrightnessInRooms(prop->rooms, 1); + br_settled_average = obj_get_average_brightness_in_rooms(prop->rooms, 0); + br_flash_average = obj_get_average_brightness_in_rooms(prop->rooms, 1); } else { br_settled_average = total_br_settled / s5; br_flash_average = total_br_flash / s5; @@ -1547,8 +1547,8 @@ s32 func0f068fc8(struct prop *prop, bool arg1) } } } else { - actual = objGetAverageBrightnessInRooms(prop->rooms, 0); - extra = objGetAverageBrightnessInRooms(prop->rooms, 1); + actual = obj_get_average_brightness_in_rooms(prop->rooms, 0); + extra = obj_get_average_brightness_in_rooms(prop->rooms, 1); } if (arg1 == 0) { @@ -1562,7 +1562,7 @@ s32 func0f068fc8(struct prop *prop, bool arg1) return 255; } -void propCalculateShadeColour(struct prop *prop, u8 *nextcol, u16 floorcol) +void prop_calculate_shade_colour(struct prop *prop, u8 *nextcol, u16 floorcol) { struct defaultobj *obj; s32 max; @@ -1577,8 +1577,8 @@ void propCalculateShadeColour(struct prop *prop, u8 *nextcol, u16 floorcol) static u32 scol = 0x00; static u32 salp = 0x00; - mainOverrideVariable("scol", &scol); - mainOverrideVariable("salp", &salp); + main_override_variable("scol", &scol); + main_override_variable("salp", &salp); if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR) { obj = prop->obj; @@ -1609,7 +1609,7 @@ void propCalculateShadeColour(struct prop *prop, u8 *nextcol, u16 floorcol) } #if VERSION >= VERSION_NTSC_1_0 - if (obj == NULL || (obj->flags & OBJFLAG_IGNOREROOMCOLOUR) == 0 || cheatIsActive(CHEAT_PERFECTDARKNESS)) + if (obj == NULL || (obj->flags & OBJFLAG_IGNOREROOMCOLOUR) == 0 || cheat_is_active(CHEAT_PERFECTDARKNESS)) #else if (obj == NULL || (obj->flags & OBJFLAG_IGNOREROOMCOLOUR) == 0) #endif @@ -1622,7 +1622,7 @@ void propCalculateShadeColour(struct prop *prop, u8 *nextcol, u16 floorcol) alphafrac = 1.0f - shade * (1.0f / 2550.0f); - scenarioHighlightRoom(prop->rooms[0], &roomr, &roomg, &roomb); + scenario_highlight_room(prop->rooms[0], &roomr, &roomg, &roomb); nextcol[0] = (nextcol[0] * roomr) >> 8; nextcol[1] = (nextcol[1] * roomg) >> 8; @@ -1683,9 +1683,9 @@ void propCalculateShadeColour(struct prop *prop, u8 *nextcol, u16 floorcol) } } -void propCalculateShadeInfo(struct prop *prop, u8 *nextcol, u16 floorcol) +void prop_calculate_shade_info(struct prop *prop, u8 *nextcol, u16 floorcol) { - propCalculateShadeColour(prop, nextcol, floorcol); + prop_calculate_shade_colour(prop, nextcol, floorcol); nextcol[0] >>= 1; nextcol[1] >>= 1; @@ -1713,7 +1713,7 @@ void propCalculateShadeInfo(struct prop *prop, u8 *nextcol, u16 floorcol) * * It works by moving halfway towards the nextcol colour each time it's called. */ -void colourTween(u8 *col, u8 *nextcol) +void colour_tween(u8 *col, u8 *nextcol) { s32 i; @@ -1724,7 +1724,7 @@ void colourTween(u8 *col, u8 *nextcol) } } -void objMergeColourFracs(s32 *colour, s32 shademode, f32 fracs[4]) +void obj_merge_colour_fracs(s32 *colour, s32 shademode, f32 fracs[4]) { if (shademode == SHADEMODE_FRAC) { f32 tmp; @@ -1752,19 +1752,19 @@ struct hovtype g_HovTypes[]; void func0f069850(struct defaultobj *obj, struct coord *pos, f32 rot[3][3], struct geocyl *cyl) { Mtxf mtx; - struct modelrodata_bbox *bbox = objFindBboxRodata(obj); + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(obj); struct modelrodata_type19 *rodata19 = NULL; struct hoverbikeobj *hoverbike; struct hoverpropobj *hoverprop; - mtx3ToMtx4(rot, &mtx); - mtx4SetTranslation(pos, &mtx); + mtx3_to_mtx4(rot, &mtx); + mtx4_set_translation(pos, &mtx); if (obj->model->definition->skel == &g_SkelHoverbike || obj->model->definition->skel == &g_SkelBasic || obj->model->definition->skel == &g_SkelMaianUfo || obj->model->definition->skel == &g_SkelDropship) { - rodata19 = modelGetPartRodata(obj->model->definition, MODELPART_HOVERBIKE_0064); + rodata19 = model_get_part_rodata(obj->model->definition, MODELPART_HOVERBIKE_0064); } if (obj->flags3 & OBJFLAG3_GEOCYL) { @@ -1773,15 +1773,15 @@ void func0f069850(struct defaultobj *obj, struct coord *pos, f32 rot[3][3], stru if (obj->type == OBJTYPE_HOVERBIKE) { hoverbike = (struct hoverbikeobj *)obj; - cyl->ymax = hoverbike->hov.ground + g_HovTypes[hoverbike->hov.type].bobymid + objGetLocalYMax(bbox) * obj->model->scale; + cyl->ymax = hoverbike->hov.ground + g_HovTypes[hoverbike->hov.type].bobymid + obj_get_local_y_max(bbox) * obj->model->scale; cyl->ymin = hoverbike->hov.ground + 20.0f; } else if (obj->type == OBJTYPE_HOVERPROP) { hoverprop = (struct hoverpropobj *)obj; - cyl->ymax = hoverprop->hov.ground + g_HovTypes[hoverprop->hov.type].bobymid + objGetLocalYMax(bbox) * obj->model->scale; + cyl->ymax = hoverprop->hov.ground + g_HovTypes[hoverprop->hov.type].bobymid + obj_get_local_y_max(bbox) * obj->model->scale; cyl->ymin = hoverprop->hov.ground + 20.0f; } else { - cyl->ymin = mtx.m[3][1] + objGetRotatedLocalYMinByMtx4(bbox, &mtx); - cyl->ymax = mtx.m[3][1] + objGetRotatedLocalYMaxByMtx4(bbox, &mtx); + cyl->ymin = mtx.m[3][1] + obj_get_rotated_local_y_min_by_mtx4(bbox, &mtx); + cyl->ymax = mtx.m[3][1] + obj_get_rotated_local_y_max_by_mtx4(bbox, &mtx); } cyl->x = pos->x; @@ -1789,18 +1789,18 @@ void func0f069850(struct defaultobj *obj, struct coord *pos, f32 rot[3][3], stru cyl->radius = 90.0f; } else { if (rodata19 != NULL) { - objCalculateGeoBlockFromNode19Data(rodata19, bbox, &mtx, (struct geoblock *)cyl); + obj_calculate_geo_block_from_node19_data(rodata19, bbox, &mtx, (struct geoblock *)cyl); } else { - objCalculateGeoBlockFromBboxAndMtx(bbox, &mtx, (struct geoblock *)cyl); + obj_calculate_geo_block_from_bbox_and_mtx(bbox, &mtx, (struct geoblock *)cyl); } if (obj->type == OBJTYPE_HOVERBIKE) { hoverbike = (struct hoverbikeobj *)obj; - cyl->ymax = hoverbike->hov.ground + g_HovTypes[hoverbike->hov.type].bobymid + objGetLocalYMax(bbox) * obj->model->scale; + cyl->ymax = hoverbike->hov.ground + g_HovTypes[hoverbike->hov.type].bobymid + obj_get_local_y_max(bbox) * obj->model->scale; cyl->ymin = hoverbike->hov.ground + 20.0f; } else if (obj->type == OBJTYPE_HOVERPROP) { hoverprop = (struct hoverpropobj *)obj; - cyl->ymax = hoverprop->hov.ground + g_HovTypes[hoverprop->hov.type].bobymid + objGetLocalYMax(bbox) * obj->model->scale; + cyl->ymax = hoverprop->hov.ground + g_HovTypes[hoverprop->hov.type].bobymid + obj_get_local_y_max(bbox) * obj->model->scale; cyl->ymin = hoverprop->hov.ground + 20.0f; } } @@ -1820,7 +1820,7 @@ void func0f069b4c(struct defaultobj *obj) } } - rodata = modelGetPartRodata(obj->model->definition, MODELPART_0065); + rodata = model_get_part_rodata(obj->model->definition, MODELPART_0065); if (rodata != NULL) { u32 flags = GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2; @@ -1834,7 +1834,7 @@ void func0f069b4c(struct defaultobj *obj) ptr += 0x40; } - rodata = modelGetPartRodata(obj->model->definition, MODELPART_0066); + rodata = model_get_part_rodata(obj->model->definition, MODELPART_0066); if (rodata != NULL) { func0f070ca0(obj, (struct geotilef *)ptr, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT, NULL, &rodata->type19); @@ -1866,8 +1866,8 @@ void func0f069c70(struct defaultobj *obj, bool arg1, bool arg2) } prop = obj->prop; - propCalculateShadeInfo(prop, obj->nextcol, obj->floorcol); - coordTriggerProxies(&obj->prop->pos, false); + prop_calculate_shade_info(prop, obj->nextcol, obj->floorcol); + coord_trigger_proxies(&obj->prop->pos, false); } /** @@ -1877,27 +1877,27 @@ void func0f069c70(struct defaultobj *obj, bool arg1, bool arg2) * This range of part numbers is a special range that is hidden when the object * is initialised. */ -void objInitToggleNodes(struct defaultobj *obj) +void obj_init_toggle_nodes(struct defaultobj *obj) { struct model *model = obj->model; union modelrwdata *rwdata; s32 i; for (i = 0; i < 20; i++) { - struct modelnode *node = modelGetPart(model->definition, 201 + i); + struct modelnode *node = model_get_part(model->definition, 201 + i); if (!node) { return; } - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->toggle.visible = false; } } -void objCreateOneDebris(struct defaultobj *obj, s32 partindex, struct prop *prop) +void obj_create_one_debris(struct defaultobj *obj, s32 partindex, struct prop *prop) { - struct defaultobj *debris = debrisAllocate(); + struct defaultobj *debris = debris_allocate(); if (debris) { struct defaultobj tmp = { @@ -1930,9 +1930,9 @@ void objCreateOneDebris(struct defaultobj *obj, s32 partindex, struct prop *prop *debris = tmp; debris->modelnum = obj->modelnum; - if (objInitWithModelDef(debris, g_ModelStates[debris->modelnum].modeldef)) { - propReparent(debris->prop, obj->prop); - objSetDropped(debris->prop, DROPTYPE_5); + if (obj_init_with_model_def(debris, g_ModelStates[debris->modelnum].modeldef)) { + prop_reparent(debris->prop, obj->prop); + obj_set_dropped(debris->prop, DROPTYPE_5); if (debris->hidden & OBJHFLAG_PROJECTILE) { f32 distance; @@ -1969,7 +1969,7 @@ void objCreateOneDebris(struct defaultobj *obj, s32 partindex, struct prop *prop rot.z = RANDOMFRAC() * 0.04907957f - 0.024539785f; #endif - mtx4LoadRotation(&rot, &projectile->mtx); + mtx4_load_rotation(&rot, &projectile->mtx); } debris->model->scale = obj->model->scale; @@ -1978,20 +1978,20 @@ void objCreateOneDebris(struct defaultobj *obj, s32 partindex, struct prop *prop debris->flags2 |= OBJFLAG2_IMMUNETOGUNFIRE | OBJFLAG2_IMMUNETOEXPLOSIONS; debris->flags3 |= OBJFLAG3_00000008; - node = modelGetPart(debris->model->definition, MODELPART_BASIC_00C8); + node = model_get_part(debris->model->definition, MODELPART_BASIC_00C8); { struct modelrwdata_toggle *rodata; if (node) { - rodata = modelGetNodeRwData(debris->model, node); + rodata = model_get_node_rw_data(debris->model, node); rodata->visible = false; } - node = modelGetPart(debris->model->definition, MODELPART_BASIC_00C9 + partindex); + node = model_get_part(debris->model->definition, MODELPART_BASIC_00C9 + partindex); if (node) { - rodata = modelGetNodeRwData(debris->model, node); + rodata = model_get_node_rw_data(debris->model, node); rodata->visible = true; } } @@ -1999,7 +1999,7 @@ void objCreateOneDebris(struct defaultobj *obj, s32 partindex, struct prop *prop } } -void objCreateDebris(struct defaultobj *obj, struct prop *prop) +void obj_create_debris(struct defaultobj *obj, struct prop *prop) { struct model *model = obj->model; s32 i; @@ -2007,22 +2007,22 @@ void objCreateDebris(struct defaultobj *obj, struct prop *prop) if (prop); for (i = 0; i < 20; i++) { - if (modelGetPart(model->definition, 201 + i) == NULL) { + if (model_get_part(model->definition, 201 + i) == NULL) { break; } - objCreateOneDebris(obj, i, prop); + obj_create_one_debris(obj, i, prop); } } -struct prop *objInit(struct defaultobj *obj, struct modeldef *modeldef, struct prop *prop, struct model *model) +struct prop *obj_init(struct defaultobj *obj, struct modeldef *modeldef, struct prop *prop, struct model *model) { if (prop == NULL) { - prop = propAllocate(); + prop = prop_allocate(); } if (model == NULL) { - model = modelmgrInstantiateModelWithoutAnim(modeldef); + model = modelmgr_instantiate_model_without_anim(modeldef); } if (prop && model) { @@ -2030,11 +2030,11 @@ struct prop *objInit(struct defaultobj *obj, struct modeldef *modeldef, struct p obj->model = model; - if (modelGetPartRodata(modeldef, MODELPART_BASIC_0065)) { + if (model_get_part_rodata(modeldef, MODELPART_BASIC_0065)) { obj->geocount++; } - if (modelGetPartRodata(modeldef, MODELPART_BASIC_0066)) { + if (model_get_part_rodata(modeldef, MODELPART_BASIC_0066)) { obj->geocount++; } @@ -2054,7 +2054,7 @@ struct prop *objInit(struct defaultobj *obj, struct modeldef *modeldef, struct p } if (obj->geocount > 0) { - obj->unkgeo = mempAlloc(ALIGN16(geosize), MEMPOOL_STAGE); + obj->unkgeo = memp_alloc(ALIGN16(geosize), MEMPOOL_STAGE); } else { obj->unkgeo = NULL; } @@ -2074,7 +2074,7 @@ struct prop *objInit(struct defaultobj *obj, struct modeldef *modeldef, struct p obj->model->obj = obj; obj->model->unk01 = 0; - modelSetScale(obj->model, g_ModelStates[obj->modelnum].scale * (1.0f / 4096.0f)); + model_set_scale(obj->model, g_ModelStates[obj->modelnum].scale * (1.0f / 4096.0f)); prop->type = PROPTYPE_OBJ; prop->obj = obj; @@ -2082,7 +2082,7 @@ struct prop *objInit(struct defaultobj *obj, struct modeldef *modeldef, struct p prop->pos.y = 0; prop->pos.z = 0; - objInitToggleNodes(obj); + obj_init_toggle_nodes(obj); if (obj->flags3 & OBJFLAG3_RENDERPOSTBG) { prop->flags |= PROPFLAG_RENDERPOSTBG; @@ -2093,11 +2093,11 @@ struct prop *objInit(struct defaultobj *obj, struct modeldef *modeldef, struct p } } else { if (model) { - modelmgrFreeModel(model); + modelmgr_free_model(model); } if (prop) { - propFree(prop); + prop_free(prop); prop = NULL; } @@ -2132,28 +2132,28 @@ struct prop *objInit(struct defaultobj *obj, struct modeldef *modeldef, struct p return prop; } -struct prop *objInitWithModelDef(struct defaultobj *obj, struct modeldef *modeldef) +struct prop *obj_init_with_model_def(struct defaultobj *obj, struct modeldef *modeldef) { - return objInit(obj, modeldef, NULL, NULL); + return obj_init(obj, modeldef, NULL, NULL); } -struct prop *objInitWithAutoModel(struct defaultobj *obj) +struct prop *obj_init_with_auto_model(struct defaultobj *obj) { - return objInitWithModelDef(obj, g_ModelStates[obj->modelnum].modeldef); + return obj_init_with_model_def(obj, g_ModelStates[obj->modelnum].modeldef); } void func0f06a580(struct defaultobj *obj, struct coord *pos, Mtxf *matrix, RoomNum *rooms) { struct prop *prop = obj->prop; - mtx4ToMtx3(matrix, obj->realrot); + mtx4_to_mtx3(matrix, obj->realrot); prop->pos.x = pos->x; prop->pos.y = pos->y; prop->pos.z = pos->z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); func0f069c70(obj, true, true); obj->shadecol[0] = obj->nextcol[0]; @@ -2179,17 +2179,17 @@ void func0f06a650(struct defaultobj *obj, struct coord *pos, Mtxf *arg2, RoomNum struct coord newpos; RoomNum newrooms[2]; - bbox = modelFindBboxRodata(obj->model); + bbox = model_find_bbox_rodata(obj->model); #if VERSION >= VERSION_NTSC_1_0 - room = cdFindFloorRoomYColourFlagsAtPos(pos, rooms, &sp3c, &obj->floorcol, NULL); + room = cd_find_floor_room_y_colour_flags_at_pos(pos, rooms, &sp3c, &obj->floorcol, NULL); #else - room = cdFindFloorRoomYColourFlagsAtPos(pos, rooms, &sp3c, &obj->floorcol); + room = cd_find_floor_room_y_colour_flags_at_pos(pos, rooms, &sp3c, &obj->floorcol); #endif if (room > 0) { newpos.x = pos->x; - newpos.y = (sp3c + func0f06a620(obj)) - objGetRotatedLocalYMinByMtx4(bbox, arg2); + newpos.y = (sp3c + func0f06a620(obj)) - obj_get_rotated_local_y_min_by_mtx4(bbox, arg2); newpos.z = pos->z; newrooms[0] = room; @@ -2203,9 +2203,9 @@ void func0f06a650(struct defaultobj *obj, struct coord *pos, Mtxf *arg2, RoomNum void func0f06a730(struct defaultobj *obj, struct coord *arg1, Mtxf *mtx, RoomNum *rooms, struct coord *centre) { - struct modelrodata_bbox *bbox = modelFindBboxRodata(obj->model); - f32 min = objGetLocalYMin(bbox); - f32 max = objGetLocalYMax(bbox); + struct modelrodata_bbox *bbox = model_find_bbox_rodata(obj->model); + f32 min = obj_get_local_y_min(bbox); + f32 max = obj_get_local_y_max(bbox); struct coord pos2; Mtxf sp70; RoomNum rooms2[8]; @@ -2216,20 +2216,20 @@ void func0f06a730(struct defaultobj *obj, struct coord *arg1, Mtxf *mtx, RoomNum bool isnegative; if (obj->flags & OBJFLAG_UPSIDEDOWN) { - mtx4LoadZRotation(M_BADPI, &sp70); - mtx4MultMtx4InPlace(mtx, &sp70); + mtx4_load_z_rotation(M_BADPI, &sp70); + mtx4_mult_mtx4_in_place(mtx, &sp70); pos2.x = centre->x - sp70.m[1][0] * max; pos2.y = centre->y - sp70.m[1][1] * max; pos2.z = centre->z - sp70.m[1][2] * max; } else if (obj->flags & OBJFLAG_00000008) { - mtx4Copy(mtx, &sp70); + mtx4_copy(mtx, &sp70); pos2.x = centre->x - sp70.m[1][0] * min; pos2.y = centre->y - sp70.m[1][1] * min; pos2.z = centre->z - sp70.m[1][2] * min; } else { - mtx4Copy(mtx, &sp70); + mtx4_copy(mtx, &sp70); row = 0; isnegative = false; @@ -2274,11 +2274,11 @@ void func0f06a730(struct defaultobj *obj, struct coord *arg1, Mtxf *mtx, RoomNum } if (row == 0) { - min = objGetLocalXMin(bbox); - max = objGetLocalXMax(bbox); + min = obj_get_local_x_min(bbox); + max = obj_get_local_x_max(bbox); } else if (row == 2) { - min = objGetLocalZMin(bbox); - max = objGetLocalZMax(bbox); + min = obj_get_local_z_min(bbox); + max = obj_get_local_z_max(bbox); } if (isnegative) { @@ -2294,19 +2294,19 @@ void func0f06a730(struct defaultobj *obj, struct coord *arg1, Mtxf *mtx, RoomNum func0f065e74(arg1, rooms, &pos2, rooms2); #if VERSION >= VERSION_NTSC_1_0 - if (cdFindFloorRoomYColourFlagsAtPos(&pos2, rooms2, &y, &obj->floorcol, NULL) > 0) + if (cd_find_floor_room_y_colour_flags_at_pos(&pos2, rooms2, &y, &obj->floorcol, NULL) > 0) #else - if (cdFindFloorRoomYColourFlagsAtPos(&pos2, rooms2, &y, &obj->floorcol) > 0) + if (cd_find_floor_room_y_colour_flags_at_pos(&pos2, rooms2, &y, &obj->floorcol) > 0) #endif { bool updated; - struct defaultobj *obj2 = objFindByPos(&pos2, rooms2); + struct defaultobj *obj2 = obj_find_by_pos(&pos2, rooms2); u8 *start; u8 *end; struct geoblock *block; if (obj2) { - updated = propUpdateGeometry(obj2->prop, &start, &end); + updated = prop_update_geometry(obj2->prop, &start, &end); if (updated && (block = (struct geoblock *) start, block->header.type == GEOTYPE_BLOCK) @@ -2336,13 +2336,13 @@ void func0f06ab60(struct defaultobj *obj, struct coord *arg1, Mtxf *arg2, RoomNu Mtxf sp5c; Mtxf sp1c; - bbox = modelFindBboxRodata(obj->model); - mult = objGetLocalZMin(bbox); + bbox = model_find_bbox_rodata(obj->model); + mult = obj_get_local_z_min(bbox); - mtx4LoadXRotation(RAD(270, 4.7116389274597f), &sp5c); - mtx4LoadYRotation(M_BADPI, &sp1c); - mtx4MultMtx4InPlace(&sp1c, &sp5c); - mtx4MultMtx4InPlace(arg2, &sp5c); + mtx4_load_x_rotation(RAD(270, 4.7116389274597f), &sp5c); + mtx4_load_y_rotation(M_BADPI, &sp1c); + mtx4_mult_mtx4_in_place(&sp1c, &sp5c); + mtx4_mult_mtx4_in_place(arg2, &sp5c); newpos.x = arg4->x - sp5c.m[2][0] * mult; newpos.y = arg4->y - sp5c.m[2][1] * mult; @@ -2352,17 +2352,17 @@ void func0f06ab60(struct defaultobj *obj, struct coord *arg1, Mtxf *arg2, RoomNu func0f06a580(obj, &newpos, &sp5c, newrooms); } -void objFreeProjectile(struct defaultobj *obj) +void obj_free_projectile(struct defaultobj *obj) { if (obj->hidden & OBJHFLAG_PROJECTILE) { - projectileFree(obj->projectile); + projectile_free(obj->projectile); obj->projectile = NULL; obj->hidden &= ~OBJHFLAG_PROJECTILE; } } -void objFreeEmbedmentOrProjectile(struct prop *prop) +void obj_free_embedment_or_projectile(struct prop *prop) { if (prop && prop->obj) { struct defaultobj *obj = prop->obj; @@ -2370,16 +2370,16 @@ void objFreeEmbedmentOrProjectile(struct prop *prop) if (obj->hidden & OBJHFLAG_EMBEDDED) { if (obj->embedment) { if (obj->embedment->projectile) { - projectileFree(obj->embedment->projectile); + projectile_free(obj->embedment->projectile); } - embedmentFree(obj->embedment); + embedment_free(obj->embedment); } obj->embedment = NULL; obj->hidden &= ~OBJHFLAG_EMBEDDED; } else if (obj->hidden & OBJHFLAG_PROJECTILE) { - objFreeProjectile(obj); + obj_free_projectile(obj); } } } @@ -2391,7 +2391,7 @@ void objFreeEmbedmentOrProjectile(struct prop *prop) * Child objects such as attached knives and mines will always have their props * freed. */ -void objFree(struct defaultobj *obj, bool freeprop, bool canregen) +void obj_free(struct defaultobj *obj, bool freeprop, bool canregen) { struct prop *child; @@ -2404,27 +2404,27 @@ void objFree(struct defaultobj *obj, bool freeprop, bool canregen) } if (weapon->weaponnum == WEAPON_PROXIMITYMINE) { - weaponUnregisterProxy(weapon); + weapon_unregister_proxy(weapon); } if (weapon->weaponnum == WEAPON_DRAGON && weapon->gunfunc == FUNC_SECONDARY) { - weaponUnregisterProxy(weapon); + weapon_unregister_proxy(weapon); } if (weapon->weaponnum == WEAPON_NBOMB && weapon->gunfunc == FUNC_SECONDARY) { - weaponUnregisterProxy(weapon); + weapon_unregister_proxy(weapon); } if (weapon->weaponnum == WEAPON_GRENADE && weapon->gunfunc == FUNC_SECONDARY) { - weaponUnregisterProxy(weapon); - smokeClearForProp(obj->prop); + weapon_unregister_proxy(weapon); + smoke_clear_for_prop(obj->prop); } if (weapon->weaponnum == WEAPON_BOLT) { - s32 beammnum = boltbeamFindByProp(obj->prop); + s32 beammnum = boltbeam_find_by_prop(obj->prop); if (beammnum != -1) { - boltbeamSetAutomatic(beammnum, 1400); + boltbeam_set_automatic(beammnum, 1400); } } @@ -2444,20 +2444,20 @@ void objFree(struct defaultobj *obj, bool freeprop, bool canregen) struct tintedglassobj *glass = (struct tintedglassobj *) obj; if (glass->portalnum >= 0) { - portalSetXluFrac(glass->portalnum, 1); - bgSetPortalOpenState(glass->portalnum, true); + portal_set_xlu_frac(glass->portalnum, 1); + bg_set_portal_open_state(glass->portalnum, true); g_BgPortals[glass->portalnum].flags |= PORTALFLAG_FORCEOPEN; } } else if (obj->type == OBJTYPE_GLASS) { struct glassobj *glass = (struct glassobj *) obj; if (glass->portalnum >= 0) { - portalSetXluFrac(glass->portalnum, 1); + portal_set_xlu_frac(glass->portalnum, 1); } } else if (obj->type == OBJTYPE_DOOR) { struct doorobj *door = (struct doorobj *) obj; - doorActivatePortal(door); + door_activate_portal(door); if (door->portalnum >= 0) { g_BgPortals[door->portalnum].flags |= PORTALFLAG_FORCEOPEN; @@ -2469,20 +2469,20 @@ void objFree(struct defaultobj *obj, bool freeprop, bool canregen) s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); + set_current_player_num(i); - if (obj->prop == bmoveGetGrabbedProp() || obj->prop == bmoveGetHoverbike()) { - bmoveSetMode(MOVEMODE_WALK); + if (obj->prop == bmove_get_grabbed_prop() || obj->prop == bmove_get_hoverbike()) { + bmove_set_mode(MOVEMODE_WALK); } - invRemoveProp(obj->prop); + inv_remove_prop(obj->prop); } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); // If obj is an occupied chair, remove the chr from it if (obj->hidden & OBJHFLAG_OCCUPIEDCHAIR) { - s32 numchrs = chrsGetNumSlots(); + s32 numchrs = chrs_get_num_slots(); s32 i; obj->hidden &= ~OBJHFLAG_OCCUPIEDCHAIR; @@ -2512,43 +2512,43 @@ void objFree(struct defaultobj *obj, bool freeprop, bool canregen) } } - psStopSound(obj->prop, PSTYPE_GENERAL, 0xffff); - shieldhitsRemoveByProp(obj->prop); + ps_stop_sound(obj->prop, PSTYPE_GENERAL, 0xffff); + shieldhits_remove_by_prop(obj->prop); - chrClearReferences(obj->prop - g_Vars.props); - projectilesUnrefOwner(obj->prop); + chr_clear_references(obj->prop - g_Vars.props); + projectiles_unref_owner(obj->prop); - wallhitsFreeByProp(obj->prop, 0); - wallhitsFreeByProp(obj->prop, 1); - objFreeEmbedmentOrProjectile(obj->prop); + wallhits_free_by_prop(obj->prop, 0); + wallhits_free_by_prop(obj->prop, 1); + obj_free_embedment_or_projectile(obj->prop); child = obj->prop->child; while (child) { struct prop *next = child->next; - objFreePermanently(child->obj, true); + obj_free_permanently(child->obj, true); child = next; } if (!canregen) { if (obj->prop->parent) { - objDetach(obj->prop); + obj_detach(obj->prop); } - propDeregisterRooms(obj->prop); + prop_deregister_rooms(obj->prop); if (obj->prop->type != PROPTYPE_DOOR) { - modelFreeVertices(1, obj->model); + model_free_vertices(1, obj->model); } - modelmgrFreeModel(obj->model); + modelmgr_free_model(obj->model); if (freeprop) { - propDelist(obj->prop); - propDisable(obj->prop); - propFree(obj->prop); + prop_delist(obj->prop); + prop_disable(obj->prop); + prop_free(obj->prop); } obj->prop->obj = NULL; @@ -2557,12 +2557,12 @@ void objFree(struct defaultobj *obj, bool freeprop, bool canregen) } } -void objFreePermanently(struct defaultobj *obj, bool freeprop) +void obj_free_permanently(struct defaultobj *obj, bool freeprop) { - objFree(obj, freeprop, false); + obj_free(obj, freeprop, false); } -f32 objGetRadius(struct defaultobj *obj) +f32 obj_get_radius(struct defaultobj *obj) { if (obj->type == OBJTYPE_KEY) { return 20; @@ -2601,19 +2601,19 @@ bool func0f06b488(struct prop *prop, struct coord *arg1, struct coord *arg2, str f32 f0; struct coord sp20; - if (!cd0002ded8(arg1, arg2, prop)) { + if (!cd_0002ded8(arg1, arg2, prop)) { #if VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp3c, &sp30, 2910, "prop/propobj.c"); - cdGetPos(&sp20, 2911, "prop/propobj.c"); + cd_get_edge(&sp3c, &sp30, 2910, "prop/propobj.c"); + cd_get_pos(&sp20, 2911, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&sp3c, &sp30, 2910, "propobj.c"); - cdGetPos(&sp20, 2911, "propobj.c"); + cd_get_edge(&sp3c, &sp30, 2910, "propobj.c"); + cd_get_pos(&sp20, 2911, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp3c, &sp30, 2909, "propobj.c"); - cdGetPos(&sp20, 2910, "propobj.c"); + cd_get_edge(&sp3c, &sp30, 2909, "propobj.c"); + cd_get_pos(&sp20, 2910, "propobj.c"); #else - cdGetEdge(&sp3c, &sp30, 2898, "propobj.c"); - cdGetPos(&sp20, 2899, "propobj.c"); + cd_get_edge(&sp3c, &sp30, 2898, "propobj.c"); + cd_get_pos(&sp20, 2899, "propobj.c"); #endif f0 = (sp20.f[0] - arg1->f[0]) * arg3->f[0] @@ -2652,7 +2652,7 @@ bool func0f06b488(struct prop *prop, struct coord *arg1, struct coord *arg2, str 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) { struct model *model = obj->model; - f32 f0 = modelGetEffectiveScale(model); + f32 f0 = model_get_effective_scale(model); f32 xdiff; f32 ydiff; f32 zdiff; @@ -2685,23 +2685,23 @@ bool func0f06b610(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 if (sum1 >= -f0 && sum1 <= arg4 + f0) { if (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) { if (var8005efc0 > 0.0f) { - hitpart = modelTestForHit(model, arg5, arg6, &spe4); + hitpart = model_test_for_hit(model, arg5, arg6, &spe4); while (hitpart > 0) { if (func0f084594(model, spe4, arg5, arg6, &thing1, &mtxindex1, &node1)) { - mtx4TransformVec(&model->matrices[mtxindex1], &thing1.pos, &spfc); + mtx4_transform_vec(&model->matrices[mtxindex1], &thing1.pos, &spfc); sum2 = (spfc.f[0] - arg5->f[0]) * arg6->f[0] + (spfc.f[1] - arg5->f[1]) * arg6->f[1] + (spfc.f[2] - arg5->f[2]) * arg6->f[2]; if (sum2 < *arg9) { - mtx4RotateVec(&model->matrices[mtxindex1], &thing1.unk0c, &spf0); + mtx4_rotate_vec(&model->matrices[mtxindex1], &thing1.unk0c, &spf0); *arg9 = sum2; - mtx4TransformVec(camGetProjectionMtxF(), &spfc, arg7); - mtx4RotateVec(camGetProjectionMtxF(), &spf0, arg8); + mtx4_transform_vec(cam_get_projection_mtxf(), &spfc, arg7); + mtx4_rotate_vec(cam_get_projection_mtxf(), &spf0, arg8); if (arg8->x != 0.0f || arg8->y != 0.0f || arg8->z != 0.0f) { guNormalize(&arg8->x, &arg8->y, &arg8->z); @@ -2723,11 +2723,11 @@ bool func0f06b610(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 } } - hitpart = modelTestForHit(model, arg5, arg6, &spe4); + hitpart = model_test_for_hit(model, arg5, arg6, &spe4); } } else { do { - hitpart = modelTestForHit(model, arg5, arg6, &spe4); + hitpart = model_test_for_hit(model, arg5, arg6, &spe4); if (hitpart > 0) { if (func0f0849dc(model, spe4, arg5, arg6, &thing1, &mtxindex1, &node1)) { @@ -2737,7 +2737,7 @@ bool func0f06b610(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 } while (hitpart > 0); if (obj->flags3 & OBJFLAG3_HOVERBEDSHIELD) { - node = modelGetPart(model->definition, MODELPART_BASIC_0067); + node = model_get_part(model->definition, MODELPART_BASIC_0067); if (node && func0f084594(model, node, arg5, arg6, &thing2, &mtxindex2, &node2)) { if (hitpart <= 0 || @@ -2760,18 +2760,18 @@ bool func0f06b610(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 } if (hitpart > 0) { - mtx4TransformVec(&model->matrices[mtxindex1], &thing1.pos, &spfc); + mtx4_transform_vec(&model->matrices[mtxindex1], &thing1.pos, &spfc); sum3 = (spfc.f[0] - arg5->f[0]) * arg6->f[0] + (spfc.f[1] - arg5->f[1]) * arg6->f[1] + (spfc.f[2] - arg5->f[2]) * arg6->f[2]; if (sum3 >= 0.0f && sum3 <= *arg9) { - mtx4RotateVec(&model->matrices[mtxindex1], &thing1.unk0c, &spf0); + mtx4_rotate_vec(&model->matrices[mtxindex1], &thing1.unk0c, &spf0); *arg9 = sum1; - mtx4TransformVec(camGetProjectionMtxF(), &spfc, arg7); + mtx4_transform_vec(cam_get_projection_mtxf(), &spfc, arg7); if (spf0.f[0] * arg6->f[0] + spf0.f[1] * arg6->f[1] + spf0.f[2] * arg6->f[2] > 0.0f) { spf0.f[0] = -spf0.f[0]; @@ -2779,7 +2779,7 @@ bool func0f06b610(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 spf0.f[2] = -spf0.f[2]; } - mtx4RotateVec(camGetProjectionMtxF(), &spf0, arg8); + mtx4_rotate_vec(cam_get_projection_mtxf(), &spf0, arg8); if (arg8->f[0] != 0.0f || arg8->f[1] != 0.0f || arg8->f[2] != 0.0f) { guNormalize(&arg8->x, &arg8->y, &arg8->z); @@ -2806,7 +2806,7 @@ bool func0f06b610(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 } } } else { - if (func0f06b39c(arg1, arg3, &prop->pos, modelGetEffectiveScale(model)) + if (func0f06b39c(arg1, arg3, &prop->pos, model_get_effective_scale(model)) && func0f06b488(prop, arg1, arg2, arg3, arg7, arg8, arg9)) { g_EmbedModel = model; g_EmbedNode = model->definition->rootnode; @@ -2885,7 +2885,7 @@ bool func0f06bea0(struct model *model, struct modelnode *endnode, struct modelno case MODELNODETYPE_BBOX: rodata = node->rodata; - if (modelTestBboxNodeForHit(&rodata->bbox, modelFindNodeMtx(model, node, 0), arg3, arg4)) { + if (model_test_bbox_node_for_hit(&rodata->bbox, model_find_node_mtx(model, node, 0), arg3, arg4)) { s7 = true; sp84 = node; @@ -2897,7 +2897,7 @@ bool func0f06bea0(struct model *model, struct modelnode *endnode, struct modelno s7 = false; var8005efc0 = 10.0f / model->scale; - if (modelTestBboxNodeForHit(&rodata->bbox, modelFindNodeMtx(model, node, 0), arg3, arg4)) { + if (model_test_bbox_node_for_hit(&rodata->bbox, model_find_node_mtx(model, node, 0), arg3, arg4)) { if (g_Vars.hitboundscount < ARRAYCOUNT(g_Vars.hitnodes)) { g_Vars.hitnodes[g_Vars.hitboundscount] = node; g_Vars.hitboundscount++; @@ -2910,7 +2910,7 @@ bool func0f06bea0(struct model *model, struct modelnode *endnode, struct modelno case MODELNODETYPE_DL: if (s7) { rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); if (rwdata->gdl != NULL) { if (rwdata->gdl == rodata->dl.opagdl) { @@ -2943,17 +2943,17 @@ bool func0f06bea0(struct model *model, struct modelnode *endnode, struct modelno } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, node); + model_apply_distance_relations(model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, node); + model_apply_toggle_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; } - if (s4 && bgTestHitOnChr(model, arg3, &sp74, arg4, s4, s6, vertices, &sp98, arg5)) { + if (s4 && bg_test_hit_on_chr(model, arg3, &sp74, arg4, s4, s6, vertices, &sp98, arg5)) { ok = true; sp88 = node; *arg7 = sp84; @@ -2982,7 +2982,7 @@ bool func0f06bea0(struct model *model, struct modelnode *endnode, struct modelno if (ok) { *arg6 = sqrtf(sp98); *arg10 = sp88; - *arg9 = modelFindNodeMtxIndex(sp88, 0); + *arg9 = model_find_node_mtx_index(sp88, 0); } var8005efc0 = 0.0f; @@ -2994,7 +2994,7 @@ bool func0f06c28c(struct chrdata *chr, struct coord *arg1, struct coord *arg2, s { f32 spec; struct prop *prop = chr->prop; - f32 spe4 = chrGetHitRadius(chr); + f32 spe4 = chr_get_hit_radius(chr); f32 x = (prop->pos.f[0] - arg1->f[0]); f32 y = (prop->pos.f[1] - arg1->f[1]); f32 z = (prop->pos.f[2] - arg1->f[2]); @@ -3010,30 +3010,30 @@ bool func0f06c28c(struct chrdata *chr, struct coord *arg1, struct coord *arg2, s struct modelnode *sp74 = NULL; struct model *model = chr->model; - if (chrGetShield(chr) > 0.0f) { + if (chr_get_shield(chr) > 0.0f) { var8005efc0 = 10.0f / chr->model->scale; } if (-spe4 <= spd4 && spd4 <= arg4 + spe4 && func0f06b39c(arg1, arg3, &prop->pos, spe4)) { if ((prop->flags & PROPFLAG_ONTHISSCREENTHISTICK)) { if (var8005efc0 > 0.0f) { - hitpart = modelTestForHit(model, arg5, arg6, &spcc); + hitpart = model_test_for_hit(model, arg5, arg6, &spcc); while (hitpart > 0) { if (func0f084594(model, spcc, arg5, arg6, &sp7c, &sp78, &sp74)) { - mtx4TransformVec(&model->matrices[sp78], &sp7c.pos, &spb8); + mtx4_transform_vec(&model->matrices[sp78], &sp7c.pos, &spb8); spec = (spb8.f[0] - arg5->f[0]) * arg6->f[0] + (spb8.f[1] - arg5->f[1]) * arg6->f[1] + (spb8.f[2] - arg5->f[2]) * arg6->f[2]; if (spec < *arg9) { - mtx4RotateVec(&model->matrices[sp78], &sp7c.unk0c, &spac); + mtx4_rotate_vec(&model->matrices[sp78], &sp7c.unk0c, &spac); *arg9 = spec; - mtx4TransformVec(camGetProjectionMtxF(), &spb8, arg7); - mtx4RotateVec(camGetProjectionMtxF(), &spac, arg8); + mtx4_transform_vec(cam_get_projection_mtxf(), &spb8, arg7); + mtx4_rotate_vec(cam_get_projection_mtxf(), &spac, arg8); if (arg8->x != 0.0f || arg8->y != 0.0f || arg8->z != 0.0f) { guNormalize(&arg8->x, &arg8->y, &arg8->z); @@ -3055,17 +3055,17 @@ bool func0f06c28c(struct chrdata *chr, struct coord *arg1, struct coord *arg2, s } } - hitpart = modelTestForHit(model, arg5, arg6, &spcc); + hitpart = model_test_for_hit(model, arg5, arg6, &spcc); } } else { - hitpart = modelTestForHit(model, arg5, arg6, &spcc); + hitpart = model_test_for_hit(model, arg5, arg6, &spcc); if (hitpart > 0 && func0f06bea0(model, model->definition->rootnode, model->definition->rootnode, arg5, arg6, &sp7c.pos, &spec, &spcc, &hitpart, &sp78, &sp74) && spec < *arg9) { *arg9 = spec; - mtx4TransformVec(camGetProjectionMtxF(), &sp7c.pos, arg7); - mtx4RotateVec(camGetProjectionMtxF(), &sp7c.unk0c, arg8); + mtx4_transform_vec(cam_get_projection_mtxf(), &sp7c.pos, arg7); + mtx4_rotate_vec(cam_get_projection_mtxf(), &sp7c.unk0c, arg8); if (arg8->x != 0.0f || arg8->y != 0.0f || arg8->z != 0.0f) { guNormalize(&arg8->x, &arg8->y, &arg8->z); @@ -3108,7 +3108,7 @@ bool func0f06c28c(struct chrdata *chr, struct coord *arg1, struct coord *arg2, s return result; } -bool projectileFindCollidingProp(struct prop *prop, struct coord *pos1, struct coord *pos2, u32 cdtypes, struct coord *arg4, struct coord *arg5, RoomNum *rooms) +bool projectile_find_colliding_prop(struct prop *prop, struct coord *pos1, struct coord *pos2, u32 cdtypes, struct coord *arg4, struct coord *arg5, RoomNum *rooms) { bool result = false; f32 dist; @@ -3142,18 +3142,18 @@ bool projectileFindCollidingProp(struct prop *prop, struct coord *pos1, struct c sp88.y = pos1->y; sp88.z = pos1->z; - mtx4TransformVecInPlace(camGetWorldToScreenMtxf(), &sp88); + mtx4_transform_vec_in_place(cam_get_world_to_screen_mtxf(), &sp88); sp7c.x = sp98.x; sp7c.y = sp98.y; sp7c.z = sp98.z; - mtx4RotateVecInPlace(camGetWorldToScreenMtxf(), &sp7c); + mtx4_rotate_vec_in_place(cam_get_world_to_screen_mtxf(), &sp7c); spa8 = dist; if (cdtypes != 0) { - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); for (propnumptr = propnums; *propnumptr >= 0; propnumptr++) { struct prop *iterprop = &g_Vars.props[*propnumptr]; @@ -3167,7 +3167,7 @@ bool projectileFindCollidingProp(struct prop *prop, struct coord *pos1, struct c if ((obj->hidden & OBJHFLAG_ISRETICK) == 0 && (obj->flags2 & OBJFLAG2_THROWTHROUGH) == 0) { if (iterprop->type == PROPTYPE_DOOR) { - if ((cdtypes & CDTYPE_DOORS) == 0 && (propDoorGetCdTypes(iterprop) & cdtypes) == 0) { + if ((cdtypes & CDTYPE_DOORS) == 0 && (prop_door_get_cd_types(iterprop) & cdtypes) == 0) { continue; } } else { @@ -3181,11 +3181,11 @@ bool projectileFindCollidingProp(struct prop *prop, struct coord *pos1, struct c } } } else if (iterprop->type == PROPTYPE_CHR - || (iterprop->type == PROPTYPE_PLAYER && g_Vars.players[playermgrGetPlayerNumByProp(iterprop)]->haschrbody)) { + || (iterprop->type == PROPTYPE_PLAYER && g_Vars.players[playermgr_get_player_num_by_prop(iterprop)]->haschrbody)) { struct chrdata *chr = iterprop->chr; if (iterprop->type == PROPTYPE_PLAYER) { - if (!g_Vars.players[playermgrGetPlayerNumByProp(iterprop)]->bondperimenabled || (cdtypes & CDTYPE_PLAYERS) == 0) { + if (!g_Vars.players[playermgr_get_player_num_by_prop(iterprop)]->bondperimenabled || (cdtypes & CDTYPE_PLAYERS) == 0) { continue; } } else if (iterprop->type == PROPTYPE_CHR) { @@ -3200,7 +3200,7 @@ bool projectileFindCollidingProp(struct prop *prop, struct coord *pos1, struct c spa4 = true; } } else if (iterprop->type == PROPTYPE_PLAYER - && g_Vars.players[playermgrGetPlayerNumByProp(iterprop)]->bondperimenabled) { + && g_Vars.players[playermgr_get_player_num_by_prop(iterprop)]->bondperimenabled) { if (func0f06b488(iterprop, pos1, pos2, &sp98, arg4, arg5, &spa8)) { spa4 = true; } @@ -3263,13 +3263,13 @@ s32 func0f06cd00(struct defaultobj *obj, struct coord *pos, struct coord *arg2, } // Note this being appended to spcc - bgGetForceOnscreenRooms(ptr, 100); + bg_get_force_onscreen_rooms(ptr, 100); for (i = 0; spcc[i] != -1; i++) { s0 = false; - if (bgRoomIsLoaded(spcc[i])) { - if (bgTestHitInRoom(&prop->pos, &sp1c4, spcc[i], &hitthing)) { + if (bg_room_is_loaded(spcc[i])) { + if (bg_test_hit_in_room(&prop->pos, &sp1c4, spcc[i], &hitthing)) { hitthing.pos.x *= scale; hitthing.pos.y *= scale; hitthing.pos.z *= scale; @@ -3281,8 +3281,8 @@ s32 func0f06cd00(struct defaultobj *obj, struct coord *pos, struct coord *arg2, if (g_Textures[hitthing.texturenum].surfacetype == SURFACETYPE_DEEPWATER) { struct coord spa4 = {0, 0, 0}; s0 = false; - sparksCreate(prop->rooms[0], prop, &hitthing.pos, &spa4, &hitthing.unk0c, SPARKTYPE_DEEPWATER); - psCreate(0, prop, SFX_HIT_WATER, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + sparks_create(prop->rooms[0], prop, &hitthing.pos, &spa4, &hitthing.unk0c, SPARKTYPE_DEEPWATER); + ps_create(0, prop, SFX_HIT_WATER, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); obj->hidden |= OBJHFLAG_DELETING; } } @@ -3291,18 +3291,18 @@ s32 func0f06cd00(struct defaultobj *obj, struct coord *pos, struct coord *arg2, spa0[0] = spcc[i]; spa0[1] = -1; - if (cdExamLos09(&prop->pos, spa0, &sp1c4, CDTYPE_BG) == CDRESULT_COLLISION) { + if (cd_exam_los09(&prop->pos, spa0, &sp1c4, CDTYPE_BG) == CDRESULT_COLLISION) { s0 = true; #if VERSION >= VERSION_PAL_FINAL - cdGetPos(&hitthing.pos, 4258, "prop/propobj.c"); + cd_get_pos(&hitthing.pos, 4258, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetPos(&hitthing.pos, 4258, "propobj.c"); + cd_get_pos(&hitthing.pos, 4258, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&hitthing.pos, 4257, "propobj.c"); + cd_get_pos(&hitthing.pos, 4257, "propobj.c"); #else - cdGetPos(&hitthing.pos, 4246, "propobj.c"); + cd_get_pos(&hitthing.pos, 4246, "propobj.c"); #endif - cdGetObstacleNormal(&hitthing.unk0c); + cd_get_obstacle_normal(&hitthing.unk0c); } } @@ -3323,7 +3323,7 @@ s32 func0f06cd00(struct defaultobj *obj, struct coord *pos, struct coord *arg2, } } - if (!projectileFindCollidingProp(prop, &prop->pos, &sp1c4, CDTYPE_ALL, arg2, arg3, spcc)) { + if (!projectile_find_colliding_prop(prop, &prop->pos, &sp1c4, CDTYPE_ALL, arg2, arg3, spcc)) { if (cdresult == CDRESULT_COLLISION) { arg2->x = sp1c4.x; arg2->y = sp1c4.y; @@ -3372,7 +3372,7 @@ s32 func0f06cd00(struct defaultobj *obj, struct coord *pos, struct coord *arg2, bool func0f06d37c(struct defaultobj *obj, struct coord *arg1, struct coord *arg2, struct coord *arg3) { struct prop *prop = obj->prop; - f32 radius = objGetRadius(obj); + f32 radius = obj_get_radius(obj); bool result = true; bool sp98 = false; struct coord sp8c; @@ -3392,16 +3392,16 @@ bool func0f06d37c(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 if (prop->pos.x != arg1->x || prop->pos.y != arg1->y || prop->pos.z != arg1->z) { if (obj->hidden & OBJHFLAG_PROJECTILE) { - if (cdExamCylMove08(&prop->pos, prop->rooms, &sp80, rooms, radius, CDTYPE_ALL, false, 0.0f, 0.0f) != CDRESULT_COLLISION) { + if (cd_exam_cyl_move08(&prop->pos, prop->rooms, &sp80, rooms, radius, CDTYPE_ALL, false, 0.0f, 0.0f) != CDRESULT_COLLISION) { setup0f09233c(obj, &sp80, obj->realrot, rooms); - if (cdExamCylMove02(&prop->pos, &sp80, radius, rooms, CDTYPE_ALL, false, 0.0f, 0.0f) != CDRESULT_COLLISION) { + if (cd_exam_cyl_move02(&prop->pos, &sp80, radius, rooms, CDTYPE_ALL, false, 0.0f, 0.0f) != CDRESULT_COLLISION) { prop->pos.x = sp80.x; prop->pos.y = sp80.y; prop->pos.z = sp80.z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); } else { result = false; } @@ -3411,13 +3411,13 @@ bool func0f06d37c(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 if (!result) { #if VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp64, &sp58, 4386, "prop/propobj.c"); + cd_get_edge(&sp64, &sp58, 4386, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&sp64, &sp58, 4386, "propobj.c"); + cd_get_edge(&sp64, &sp58, 4386, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp64, &sp58, 4385, "propobj.c"); + cd_get_edge(&sp64, &sp58, 4385, "propobj.c"); #else - cdGetEdge(&sp64, &sp58, 4374, "propobj.c"); + cd_get_edge(&sp64, &sp58, 4374, "propobj.c"); #endif arg3->x = sp58.z - sp64.z; @@ -3479,22 +3479,22 @@ bool func0f06d37c(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 } } - f2 = cd00024e98() * 0.99f; + f2 = cd_00024e98() * 0.99f; sp4c.x = sp8c.x * f2 + prop->pos.x; sp4c.y = sp80.y; sp4c.z = sp8c.z * f2 + prop->pos.z; - if (cdExamCylMove07(&prop->pos, prop->rooms, &sp4c, rooms, CDTYPE_ALL, false, 0.0f, 0.0f) != CDRESULT_COLLISION) { + if (cd_exam_cyl_move07(&prop->pos, prop->rooms, &sp4c, rooms, CDTYPE_ALL, false, 0.0f, 0.0f) != CDRESULT_COLLISION) { setup0f09233c(obj, &sp4c, obj->realrot, rooms); - if (cdTestVolume(&sp4c, radius, rooms, CDTYPE_ALL, CHECKVERTICAL_NO, 0.0f, 0.0f) != CDRESULT_COLLISION) { + if (cd_test_volume(&sp4c, radius, rooms, CDTYPE_ALL, CHECKVERTICAL_NO, 0.0f, 0.0f) != CDRESULT_COLLISION) { prop->pos.x = sp4c.x; prop->pos.y = sp4c.y; prop->pos.z = sp4c.z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); sp98 = true; } @@ -3514,8 +3514,8 @@ bool func0f06d37c(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 prop->pos.y = sp4c.y; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); } } } @@ -3530,7 +3530,7 @@ bool func0f06d37c(struct defaultobj *obj, struct coord *arg1, struct coord *arg2 * * The new speed and distance done are written back to those pointers. */ -void applySpeed(f32 *distdone, f32 maxdist, f32 *speedptr, f32 accel, f32 decel, f32 maxspeed) +void apply_speed(f32 *distdone, f32 maxdist, f32 *speedptr, f32 accel, f32 decel, f32 maxspeed) { f32 speed = *speedptr; s32 i; @@ -3597,7 +3597,7 @@ void applySpeed(f32 *distdone, f32 maxdist, f32 *speedptr, f32 accel, f32 decel, *speedptr = speed; } -void applyRotation(f32 *angle, f32 maxrot, f32 *speed, f32 accel, f32 decel, f32 maxspeed) +void apply_rotation(f32 *angle, f32 maxrot, f32 *speed, f32 accel, f32 decel, f32 maxspeed) { f32 tmp = maxrot - *angle; @@ -3607,7 +3607,7 @@ void applyRotation(f32 *angle, f32 maxrot, f32 *speed, f32 accel, f32 decel, f32 maxrot -= M_BADTAU; } - applySpeed(angle, maxrot, speed, accel, decel, maxspeed); + apply_speed(angle, maxrot, speed, accel, decel, maxspeed); if (*angle < 0) { *angle += M_BADTAU; @@ -3626,7 +3626,7 @@ void applyRotation(f32 *angle, f32 maxrot, f32 *speed, f32 accel, f32 decel, f32 * * The vast majority of this is calculating the rotation for the projectile. */ -void projectileFall(struct defaultobj *obj, f32 arg1[3][3]) +void projectile_fall(struct defaultobj *obj, f32 arg1[3][3]) { s32 t2; s32 t4; @@ -3654,7 +3654,7 @@ void projectileFall(struct defaultobj *obj, f32 arg1[3][3]) projectile = obj->projectile; if (obj->type == OBJTYPE_DOOR) { - objFreeProjectile(obj); + obj_free_projectile(obj); return; } @@ -3664,12 +3664,12 @@ void projectileFall(struct defaultobj *obj, f32 arg1[3][3]) projectile->flags |= PROJECTILEFLAG_FALLING; projectile->flags &= ~PROJECTILEFLAG_STICKY; - mtx3ToMtx4(obj->realrot, &sp148); - mtx4GetRotation(sp148.m, &sp188); - mtx4LoadRotation(&sp188, &sp108); + mtx3_to_mtx4(obj->realrot, &sp148); + mtx4_get_rotation(sp148.m, &sp188); + mtx4_load_rotation(&sp188, &sp108); quaternion0f096ca0(&sp188, projectile->unk068); - mtx4LoadRotationFrom(sp108.m, spc8.m); - mtx4MultMtx4(&spc8, &sp148, &sp88); + mtx4_load_rotation_from(sp108.m, spc8.m); + mtx4_mult_mtx4(&spc8, &sp148, &sp88); projectile->unk0b8[0] = sqrtf(sp88.m[0][0] * sp88.m[0][0] + sp88.m[0][1] * sp88.m[0][1] + sp88.m[0][2] * sp88.m[0][2]); projectile->unk0b8[1] = sqrtf(sp88.m[1][0] * sp88.m[1][0] + sp88.m[1][1] * sp88.m[1][1] + sp88.m[1][2] * sp88.m[1][2]); @@ -3679,7 +3679,7 @@ void projectileFall(struct defaultobj *obj, f32 arg1[3][3]) t4 = -1; t3 = -1; - bbox = objFindBboxRodata(obj); + bbox = obj_find_bbox_rodata(obj); sp4c[0] = bbox->xmax - bbox->xmin; sp4c[1] = bbox->ymax - bbox->ymin; @@ -3838,7 +3838,7 @@ void projectileFall(struct defaultobj *obj, f32 arg1[3][3]) spc8.m[3][2] = 0.0f; spc8.m[3][3] = 1.0f; - mtx4GetRotation(spc8.m, &sp188); + mtx4_get_rotation(spc8.m, &sp188); quaternion0f096ca0(&sp188, projectile->unk078); quaternion0f0976c0(projectile->unk068, projectile->unk078); @@ -3872,7 +3872,7 @@ void projectileFall(struct defaultobj *obj, f32 arg1[3][3]) } } -void knifePlayWooshSound(struct defaultobj *obj) +void knife_play_woosh_sound(struct defaultobj *obj) { if (obj->hidden & OBJHFLAG_PROJECTILE) { if ((obj->projectile->flags & PROJECTILEFLAG_AIRBORNE) @@ -3882,16 +3882,16 @@ void knifePlayWooshSound(struct defaultobj *obj) s32 index = random() % ARRAYCOUNT(soundnums); if (obj->projectile->lastwooshframe < g_Vars.lvframe60 - TICKS(6)) { - psStopSound(obj->prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(obj->prop, PSTYPE_GENERAL, 0xffff); - if (!lvIsPaused()) { - psCreate(0, obj->prop, soundnums[index], -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + if (!lv_is_paused()) { + ps_create(0, obj->prop, soundnums[index], -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); obj->projectile->lastwooshframe = g_Vars.lvframe60; } } } else { obj->hidden &= ~OBJHFLAG_THROWNKNIFE; - psStopSound(obj->prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(obj->prop, PSTYPE_GENERAL, 0xffff); } } } @@ -3943,28 +3943,28 @@ void func0f06e9cc(struct coord *arg0, Mtxf *arg1) spf4 = atan2f(sp118, sp114); - mtx4LoadYRotation(-spf4, &spb0); + mtx4_load_y_rotation(-spf4, &spb0); sp24.x = sp124; sp24.y = sp120; sp24.z = sp11c; - mtx4RotateVecInPlace(&spb0, &sp24); + mtx4_rotate_vec_in_place(&spb0, &sp24); spf0 = atan2f(sp24.x, sp24.y); - mtx4LoadYRotation(RAD(-90, -1.5705463f) + spf4, &sp70); - mtx4LoadXRotation(RAD(-90, -1.5705463f) - spf0, &sp30); + mtx4_load_y_rotation(RAD(-90, -1.5705463f) + spf4, &sp70); + mtx4_load_x_rotation(RAD(-90, -1.5705463f) - spf0, &sp30); - mtx4MultMtx4(&sp70, &sp30, arg1); + mtx4_mult_mtx4(&sp70, &sp30, arg1); } -void objLand2(struct defaultobj *obj, struct coord *arg1, struct coord *arg2) +void obj_land2(struct defaultobj *obj, struct coord *arg1, struct coord *arg2) { Mtxf sp40; struct coord newpos; - struct modelrodata_bbox *bbox = modelFindBboxRodata(obj->model); - f32 ymin = objGetLocalYMin(bbox); + struct modelrodata_bbox *bbox = model_find_bbox_rodata(obj->model); + f32 ymin = obj_get_local_y_min(bbox); struct prop *prop = obj->prop; RoomNum newrooms[8]; @@ -3979,7 +3979,7 @@ void objLand2(struct defaultobj *obj, struct coord *arg1, struct coord *arg2) func0f06a580(obj, &newpos, &sp40, newrooms); } -void boltLand(struct weaponobj *weapon, struct coord *arg1) +void bolt_land(struct weaponobj *weapon, struct coord *arg1) { Mtxf mtx; struct coord newpos; @@ -3989,15 +3989,15 @@ void boltLand(struct weaponobj *weapon, struct coord *arg1) struct prop *prop; RoomNum newrooms[8]; - bbox = modelFindBboxRodata(weapon->base.model); + bbox = model_find_bbox_rodata(weapon->base.model); prop = weapon->base.prop; weapon->timer240 = 13; - zmax = objGetLocalZMax(bbox); + zmax = obj_get_local_z_max(bbox); zmax -= 25.0f + 2.0f * RANDOMFRAC(); - mtx3ToMtx4(weapon->base.realrot, &mtx); + mtx3_to_mtx4(weapon->base.realrot, &mtx); newpos.x = arg1->x - mtx.m[2][0] * zmax; newpos.y = arg1->y - mtx.m[2][1] * zmax; @@ -4006,28 +4006,28 @@ void boltLand(struct weaponobj *weapon, struct coord *arg1) func0f065dd8(&prop->pos, prop->rooms, &newpos, newrooms); func0f06a580(&weapon->base, &newpos, &mtx, newrooms); - beamnum = boltbeamFindByProp(prop); + beamnum = boltbeam_find_by_prop(prop); if (beamnum != -1) { - boltbeamSetTailPos(beamnum, &prop->pos); - boltbeamSetAutomatic(beamnum, 2100); + boltbeam_set_tail_pos(beamnum, &prop->pos); + boltbeam_set_automatic(beamnum, 2100); } } -void knifeLand(struct defaultobj *obj, struct coord *arg1, struct coord *arg2) +void knife_land(struct defaultobj *obj, struct coord *arg1, struct coord *arg2) { Mtxf spd0; Mtxf sp90; Mtxf sp50; struct coord newpos; - struct modelrodata_bbox *bbox = modelFindBboxRodata(obj->model); + struct modelrodata_bbox *bbox = model_find_bbox_rodata(obj->model); f32 zero = 0.0f; struct prop *prop = obj->prop; RoomNum newrooms[8]; struct coord sp1c; // @bug? Should these be assigned to zero? - objGetLocalZMin(bbox); + obj_get_local_z_min(bbox); random(); sp1c.x = RANDOMFRAC() * 0.8f + arg2->x - 0.4f; @@ -4035,8 +4035,8 @@ void knifeLand(struct defaultobj *obj, struct coord *arg1, struct coord *arg2) sp1c.z = RANDOMFRAC() * 0.8f + arg2->z - 0.4f; func0f06e9cc(&sp1c, &sp90); - mtx4LoadXRotation(RAD(-90, -1.5705463f), &sp50); - mtx4MultMtx4(&sp90, &sp50, &spd0); + mtx4_load_x_rotation(RAD(-90, -1.5705463f), &sp50); + mtx4_mult_mtx4(&sp90, &sp50, &spd0); mtx00015f04(obj->model->scale, &spd0); newpos.x = arg1->x - zero; @@ -4047,7 +4047,7 @@ void knifeLand(struct defaultobj *obj, struct coord *arg1, struct coord *arg2) func0f06a580(obj, &newpos, &spd0, newrooms); } -bool objEmbed(struct prop *prop, struct prop *parent, struct model *model, struct modelnode *node) +bool obj_embed(struct prop *prop, struct prop *parent, struct model *model, struct modelnode *node) { if (parent->flags & PROPFLAG_ONTHISSCREENTHISTICK) { struct defaultobj *obj = prop->obj; @@ -4059,32 +4059,32 @@ bool objEmbed(struct prop *prop, struct prop *parent, struct model *model, struc struct coord sp28; Mtxf *sp24; - obj->embedment = embedmentAllocate(); + obj->embedment = embedment_allocate(); if (obj->embedment) { - sp24 = modelFindNodeMtx(model, node, 0); + sp24 = model_find_node_mtx(model, node, 0); obj->hidden |= OBJHFLAG_EMBEDDED; - propDeregisterRooms(prop); - propDelist(prop); - propDisable(prop); + prop_deregister_rooms(prop); + prop_delist(prop); + prop_disable(prop); obj->model->attachedtomodel = model; obj->model->attachedtonode = node; - propReparent(prop, parent); - modelGetRootPosition(obj->model, &sp28); + prop_reparent(prop, parent); + model_get_root_position(obj->model, &sp28); sp28.x = -sp28.x; sp28.y = -sp28.y; sp28.z = -sp28.z; - mtx4LoadTranslation(&sp28, &sp74); - mtx3ToMtx4(obj->realrot, &sp34); - mtx4SetTranslation(&prop->pos, &sp34); + mtx4_load_translation(&sp28, &sp74); + mtx3_to_mtx4(obj->realrot, &sp34); + mtx4_set_translation(&prop->pos, &sp34); mtx00015be4(&sp34, &sp74, &sp134); - mtx00015be4(camGetProjectionMtxF(), sp24, &spf4); + mtx00015be4(cam_get_projection_mtxf(), sp24, &spf4); mtx000172f0(spf4.m, spb4.m); mtx00015be4(&spb4, &sp134, &obj->embedment->matrix); @@ -4095,14 +4095,14 @@ bool objEmbed(struct prop *prop, struct prop *parent, struct model *model, struc return false; } -void objLand(struct prop *prop, struct coord *arg1, struct coord *arg2, bool *embedded) +void obj_land(struct prop *prop, struct coord *arg1, struct coord *arg2, bool *embedded) { struct defaultobj *obj = prop->obj; struct prop *ownerprop = NULL; if (obj->hidden & OBJHFLAG_PROJECTILE) { ownerprop = obj->projectile->ownerprop; - objFreeProjectile(obj); + obj_free_projectile(obj); } obj->hidden |= OBJHFLAG_00020000; @@ -4119,19 +4119,19 @@ void objLand(struct prop *prop, struct coord *arg1, struct coord *arg2, bool *em obj->flags2 |= OBJFLAG2_IMMUNETOGUNFIRE; } - objectiveCheckThrowInRoom(weapon->weaponnum, prop->rooms); + objective_check_throw_in_room(weapon->weaponnum, prop->rooms); if (weapon->weaponnum == WEAPON_BOLT) { - boltLand(weapon, arg1); + bolt_land(weapon, arg1); } else if (weapon->weaponnum == WEAPON_COMBATKNIFE) { - knifeLand(obj, arg1, arg2); + knife_land(obj, arg1, arg2); } else { - objLand2(obj, arg1, arg2); + obj_land2(obj, arg1, arg2); } } else if (obj->type == OBJTYPE_AUTOGUN) { struct autogunobj *autogun = (struct autogunobj *)obj; - objLand2(obj, arg1, arg2); + obj_land2(obj, arg1, arg2); autogun->yzero = atan2f(arg2->x, arg2->z); autogun->xzero = atan2f(arg2->y, sqrtf(arg2->f[0] * arg2->f[0] + arg2->f[2] * arg2->f[2])); @@ -4144,16 +4144,16 @@ void objLand(struct prop *prop, struct coord *arg1, struct coord *arg2, bool *em if (obj->type == OBJTYPE_WEAPON) { struct weaponobj *weapon = (struct weaponobj *)obj; - bgunPlayPropHitSound(&weapon->gset, g_EmbedProp, -1); + bgun_play_prop_hit_sound(&weapon->gset, g_EmbedProp, -1); if (weapon->weaponnum == WEAPON_COMBATKNIFE && (g_EmbedProp->type == PROPTYPE_CHR || g_EmbedProp->type == PROPTYPE_PLAYER)) { - chrSetPoisoned(g_EmbedProp->chr, ownerprop); + chr_set_poisoned(g_EmbedProp->chr, ownerprop); } } if (g_EmbedProp->flags & PROPFLAG_ONTHISSCREENTHISTICK) { - if (objEmbed(prop, g_EmbedProp, g_EmbedModel, g_EmbedNode)) { + if (obj_embed(prop, g_EmbedProp, g_EmbedModel, g_EmbedNode)) { *embedded = true; } } else { @@ -4162,11 +4162,11 @@ void objLand(struct prop *prop, struct coord *arg1, struct coord *arg2, bool *em } else if (obj->type == OBJTYPE_WEAPON) { struct weaponobj *weapon = (struct weaponobj *)obj; - bgunPlayBgHitSound(&weapon->gset, arg1, -1, prop->rooms); + bgun_play_bg_hit_sound(&weapon->gset, arg1, -1, prop->rooms); } } -bool propExplode(struct prop *prop, s32 exptype) +bool prop_explode(struct prop *prop, s32 exptype) { struct defaultobj *obj = prop->obj; s32 playernum = (obj->hidden & 0xf0000000) >> 28; @@ -4182,13 +4182,13 @@ bool propExplode(struct prop *prop, s32 exptype) } if (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) { - Mtxf *mtx = modelGetRootMtx(obj->model); + Mtxf *mtx = model_get_root_mtx(obj->model); pos.x = mtx->m[3][0]; pos.y = mtx->m[3][1]; pos.z = mtx->m[3][2]; - mtx4TransformVecInPlace(camGetProjectionMtxF(), &pos); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &pos); } else { pos.x = parent->pos.x; pos.y = parent->pos.y; @@ -4197,11 +4197,11 @@ bool propExplode(struct prop *prop, s32 exptype) func0f065e74(&parent->pos, parent->rooms, &pos, rooms); - result = explosionCreateComplex(NULL, &pos, rooms, exptype, playernum); + result = explosion_create_complex(NULL, &pos, rooms, exptype, playernum); } else if ((obj->hidden & (OBJHFLAG_EMBEDDED | OBJHFLAG_PROJECTILE | OBJHFLAG_00020000)) == OBJHFLAG_00020000) { struct coord sp5c; struct coord sp50; - f32 ymin = objGetLocalYMin(modelFindBboxRodata(obj->model)); + f32 ymin = obj_get_local_y_min(model_find_bbox_rodata(obj->model)); s32 room = prop->rooms[0]; sp50.x = obj->realrot[1][0]; @@ -4212,32 +4212,32 @@ bool propExplode(struct prop *prop, s32 exptype) sp5c.y = prop->pos.f[1] + obj->realrot[1][1] * ymin; sp5c.z = prop->pos.f[2] + obj->realrot[1][2] * ymin; - result = explosionCreate(NULL, &prop->pos, prop->rooms, exptype, + result = explosion_create(NULL, &prop->pos, prop->rooms, exptype, playernum, true, &sp5c, room, &sp50); } else { - result = explosionCreateComplex(NULL, &prop->pos, prop->rooms, exptype, playernum); + result = explosion_create_complex(NULL, &prop->pos, prop->rooms, exptype, playernum); } return result; } -void ammocrateTick(struct prop *prop) +void ammocrate_tick(struct prop *prop) { struct defaultobj *obj = prop->obj; if (obj->flags & OBJFLAG_AMMOCRATE_EXPLODENOW) { - propExplode(prop, EXPLOSIONTYPE_12); + prop_explode(prop, EXPLOSIONTYPE_12); obj->hidden |= OBJHFLAG_DELETING; } } /** - * weaponTick only matches if it passes a third argument to nbombCreateStorm, - * but nbombCreateStorm doesn't have a third argument. So we declare a new + * weapon_tick only matches if it passes a third argument to nbomb_create_storm, + * but nbomb_create_storm doesn't have a third argument. So we declare a new * function with the third argument and link it to the same address as - * nbombCreateStorm via the linker config. + * nbomb_create_storm via the linker config. */ -void nbombCreateStorm_hack(struct coord *pos, struct prop *ownerprop, struct prop *nbombprop); +void nbomb_create_storm_hack(struct coord *pos, struct prop *ownerprop, struct prop *nbombprop); /** * Handles the following: @@ -4251,7 +4251,7 @@ void nbombCreateStorm_hack(struct coord *pos, struct prop *ownerprop, struct pro * - Proximity items * - Removal of weapons when there are too many on-screen */ -void weaponTick(struct prop *prop) +void weapon_tick(struct prop *prop) { struct defaultobj *obj = prop->obj; struct weaponobj *weapon = prop->weapon; @@ -4298,13 +4298,13 @@ void weaponTick(struct prop *prop) weapon->timer240 = 1; - projectileSetSticky(prop); + projectile_set_sticky(prop); projectile->speed.x = direction.x; projectile->speed.y = direction.y; projectile->speed.z = direction.z; - mtx4LoadIdentity(&projectile->mtx); + mtx4_load_identity(&projectile->mtx); projectile->obj = (struct defaultobj *)weapon; projectile->unk0d8 = g_Vars.lvframenum; @@ -4321,12 +4321,12 @@ void weaponTick(struct prop *prop) weapon->timer240 -= g_Vars.lvupdate240; if (weapon->timer240 < 0) { - propUnsetDangerous(prop); + prop_unset_dangerous(prop); if (weapon->gunfunc == FUNC_2) { - propExplode(prop, EXPLOSIONTYPE_SDGRENADE); + prop_explode(prop, EXPLOSIONTYPE_SDGRENADE); } else { - propExplode(prop, (obj->flags2 & OBJFLAG2_WEAPON_HUGEEXP) ? EXPLOSIONTYPE_HUGE17 : EXPLOSIONTYPE_ROCKET); + prop_explode(prop, (obj->flags2 & OBJFLAG2_WEAPON_HUGEEXP) ? EXPLOSIONTYPE_HUGE17 : EXPLOSIONTYPE_ROCKET); } obj->hidden |= OBJHFLAG_DELETING; @@ -4361,15 +4361,15 @@ void weaponTick(struct prop *prop) s32 ownerplayernum = (obj->hidden & 0xf0000000) >> 28; if (g_Vars.normmplayerisrunning) { - struct chrdata *chr = mpGetChrFromPlayerIndex(ownerplayernum); + struct chrdata *chr = mp_get_chr_from_player_index(ownerplayernum); if (chr) { ownerprop = chr->prop; } } - nbombCreateStorm_hack(&prop->pos, ownerprop, prop); - propUnsetDangerous(prop); + nbomb_create_storm_hack(&prop->pos, ownerprop, prop); + prop_unset_dangerous(prop); obj->hidden |= OBJHFLAG_DELETING; @@ -4396,7 +4396,7 @@ void weaponTick(struct prop *prop) || weapon->weaponnum == WEAPON_SKROCKET) { // Handle rockets if (weapon->timer240 == 0) { - propExplode(prop, (obj->flags2 & OBJFLAG2_WEAPON_HUGEEXP) ? EXPLOSIONTYPE_HUGE17 : EXPLOSIONTYPE_ROCKET); + prop_explode(prop, (obj->flags2 & OBJFLAG2_WEAPON_HUGEEXP) ? EXPLOSIONTYPE_HUGE17 : EXPLOSIONTYPE_ROCKET); obj->hidden |= OBJHFLAG_DELETING; @@ -4423,7 +4423,7 @@ void weaponTick(struct prop *prop) weapon->timer240 -= g_Vars.lvupdate240; if (weapon->timer240 < 0) { - if (propExplode(prop, (obj->flags2 & OBJFLAG2_WEAPON_HUGEEXP) ? EXPLOSIONTYPE_HUGE17 : EXPLOSIONTYPE_ROCKET)) { + if (prop_explode(prop, (obj->flags2 & OBJFLAG2_WEAPON_HUGEEXP) ? EXPLOSIONTYPE_HUGE17 : EXPLOSIONTYPE_ROCKET)) { weapon->timer240 = -1; obj->hidden |= OBJHFLAG_DELETING; } @@ -4439,17 +4439,17 @@ void weaponTick(struct prop *prop) // If a player manages to throw a mine on themselves, it will not detonate. // You can't throw a mine on yourself anyway, so this check always passes - if (prop->parent == NULL || parentchr == NULL || mpPlayerGetIndex(parentchr) != ownerplayernum) { + if (prop->parent == NULL || parentchr == NULL || mp_player_get_index(parentchr) != ownerplayernum) { if (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) { if (ownerplayernum == 2) { u32 mask = 0; if (g_Vars.coop && g_Vars.coop->prop) { - mask |= 1 << playermgrGetPlayerNumByProp(g_Vars.coop->prop); + mask |= 1 << playermgr_get_player_num_by_prop(g_Vars.coop->prop); } if (g_Vars.bond && g_Vars.bond->prop) { - mask |= 1 << playermgrGetPlayerNumByProp(g_Vars.bond->prop); + mask |= 1 << playermgr_get_player_num_by_prop(g_Vars.bond->prop); } g_PlayersDetonatingMines &= mask; @@ -4481,7 +4481,7 @@ void weaponTick(struct prop *prop) exptype = EXPLOSIONTYPE_HUGE17; } - if (propExplode(prop, exptype)) { + if (prop_explode(prop, exptype)) { weapon->timer240 = -1; obj->hidden |= OBJHFLAG_DELETING; } @@ -4497,7 +4497,7 @@ void weaponTick(struct prop *prop) if (weapon->timer240 < 2) { weapon->timer240 = 1; - weaponRegisterProxy(weapon); + weapon_register_proxy(weapon); } } else if (weapon->timer240 == 1) { // Proxy is active @@ -4519,15 +4519,15 @@ void weaponTick(struct prop *prop) s32 ownerplayernum = (obj->hidden & 0xf0000000) >> 28; if (g_Vars.normmplayerisrunning) { - struct chrdata *chr = mpGetChrFromPlayerIndex(ownerplayernum); + struct chrdata *chr = mp_get_chr_from_player_index(ownerplayernum); if (chr) { ownerprop = chr->prop; } } - nbombCreateStorm_hack(&prop->pos, ownerprop, prop); - propUnsetDangerous(prop); + nbomb_create_storm_hack(&prop->pos, ownerprop, prop); + prop_unset_dangerous(prop); obj->hidden |= OBJHFLAG_DELETING; @@ -4561,7 +4561,7 @@ void weaponTick(struct prop *prop) exptype = EXPLOSIONTYPE_DRAGONBOMBSPY; } - if (propExplode(prop, exptype)) { + if (prop_explode(prop, exptype)) { weapon->timer240 = -1; obj->hidden |= OBJHFLAG_DELETING; } @@ -4572,7 +4572,7 @@ void weaponTick(struct prop *prop) // Note that the timer240 value doesn't act like a timer at all if (weapon->timer240 >= 2) { // Bolt is travelling - struct modelrodata_bbox *bbox = modelFindBboxRodata(obj->model); + struct modelrodata_bbox *bbox = model_find_bbox_rodata(obj->model); s32 ival = weapon->timer240 - 1; f32 radians = 0.026179939508438f * (ival / 12.0f); Mtxf spf8; @@ -4589,38 +4589,38 @@ void weaponTick(struct prop *prop) radians = -radians; } - mtx4LoadYRotation(radians, &spb8); + mtx4_load_y_rotation(radians, &spb8); if (obj->embedment) { if (prop->parent && prop->parent->type != PROPTYPE_CHR) { - mtx4Copy(&obj->embedment->matrix, &spf8); + mtx4_copy(&obj->embedment->matrix, &spf8); spf8.m[3][0] = spf8.m[3][1] = spf8.m[3][2] = 0.0f; spf8.m[0][3] = spf8.m[1][3] = spf8.m[2][3] = 0.0f; sp6c.f[0] = sp60.f[0] = sp6c.f[1] = sp60.f[1] = 0.0f; - sp6c.f[2] = sp60.f[2] = objGetLocalZMax(bbox); + sp6c.f[2] = sp60.f[2] = obj_get_local_z_max(bbox); - mtx4MultMtx4(&spf8, &spb8, &sp78); - mtx4RotateVecInPlace(&spf8, &sp6c); - mtx4RotateVecInPlace(&sp78, &sp60); + mtx4_mult_mtx4(&spf8, &spb8, &sp78); + mtx4_rotate_vec_in_place(&spf8, &sp6c); + mtx4_rotate_vec_in_place(&sp78, &sp60); sp78.m[3][0] = obj->embedment->matrix.m[3][0] - (sp60.f[0] - sp6c.f[0]); sp78.m[3][1] = obj->embedment->matrix.m[3][1] - (sp60.f[1] - sp6c.f[1]); sp78.m[3][2] = obj->embedment->matrix.m[3][2] - (sp60.f[2] - sp6c.f[2]); - mtx4Copy(&sp78, &obj->embedment->matrix); + mtx4_copy(&sp78, &obj->embedment->matrix); } } else { sp6c.f[0] = sp60.f[0] = sp6c.f[1] = sp60.f[1] = 0.0f; - sp6c.f[2] = sp60.f[2] = objGetLocalZMax(bbox); + sp6c.f[2] = sp60.f[2] = obj_get_local_z_max(bbox); - mtx3ToMtx4(obj->realrot, &spf8); - mtx4MultMtx4(&spf8, &spb8, &sp78); - mtx4ToMtx3(&sp78, obj->realrot); + mtx3_to_mtx4(obj->realrot, &spf8); + mtx4_mult_mtx4(&spf8, &spb8, &sp78); + mtx4_to_mtx3(&sp78, obj->realrot); - mtx4RotateVecInPlace(&spf8, &sp6c); - mtx4RotateVecInPlace(&sp78, &sp60); + mtx4_rotate_vec_in_place(&spf8, &sp6c); + mtx4_rotate_vec_in_place(&sp78, &sp60); prop->pos.f[0] -= sp60.f[0] - sp6c.f[0]; prop->pos.f[1] -= sp60.f[1] - sp6c.f[1]; @@ -4634,12 +4634,12 @@ void weaponTick(struct prop *prop) if (weapon->timer240 < 0) { struct projectile *projectile = obj->projectile; - s32 beamnum = boltbeamFindByProp(prop); + s32 beamnum = boltbeam_find_by_prop(prop); if (beamnum != -1) { - boltbeamSetTailPos(beamnum, &prop->pos); + boltbeam_set_tail_pos(beamnum, &prop->pos); - boltbeamIncrementHeadPos(beamnum, 3000, 0); + boltbeam_increment_head_pos(beamnum, 3000, 0); if (projectile && projectile->bouncecount > 0) { projectile = NULL; @@ -4647,7 +4647,7 @@ void weaponTick(struct prop *prop) if (projectile == NULL) { weapon->timer240 = 0; - boltbeamSetAutomatic(beamnum, 1400); + boltbeam_set_automatic(beamnum, 1400); } } } else { @@ -4704,21 +4704,21 @@ void func0f07063c(struct prop *prop, bool arg1) if (arg1) { if (obj->type == OBJTYPE_AMMOCRATE || obj->type == OBJTYPE_MULTIAMMOCRATE) { - ammocrateTick(prop); + ammocrate_tick(prop); } else if (obj->type == OBJTYPE_WEAPON) { - weaponTick(prop); + weapon_tick(prop); } } } -void objDropRecursively(struct prop *prop, bool arg1) +void obj_drop_recursively(struct prop *prop, bool arg1) { struct prop *child = prop->child; while (child) { struct prop *next = child->next; - objDropRecursively(child, arg1); - objDrop(child, arg1); + obj_drop_recursively(child, arg1); + obj_drop(child, arg1); child = next; } } @@ -4729,7 +4729,7 @@ void func0f0706f8(struct prop *prop, bool arg1) struct prop *child; if (obj->hidden & OBJHFLAG_DELETING) { - objFree(obj, true, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, true, obj->hidden2 & OBJH2FLAG_CANREGEN); } else { prop->flags &= ~PROPFLAG_ONTHISSCREENTHISTICK; func0f07063c(prop, arg1); @@ -4753,12 +4753,12 @@ void func0f07079c(struct prop *prop, bool fulltick) struct prop *next; if (obj->hidden & OBJHFLAG_DELETING) { - objFree(obj, true, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, true, obj->hidden2 & OBJH2FLAG_CANREGEN); return; } if (model->attachedtonode && (obj->hidden & OBJHFLAG_EMBEDDED)) { - Mtxf *mtx = modelFindNodeMtx(model->attachedtomodel, model->attachedtonode, 0); + Mtxf *mtx = model_find_node_mtx(model->attachedtomodel, model->attachedtonode, 0); struct modelrenderdata renderdata = {NULL, true, 3}; u32 stack; Mtxf sp30; @@ -4766,10 +4766,10 @@ void func0f07079c(struct prop *prop, bool fulltick) prop->flags |= PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK; mtx00015be4(mtx, &obj->embedment->matrix, &sp30); - renderdata.unk10 = gfxAllocate(model->definition->nummatrices * sizeof(Mtxf)); + renderdata.unk10 = gfx_allocate(model->definition->nummatrices * sizeof(Mtxf)); renderdata.unk00 = &sp30; - modelSetMatrices(&renderdata, model); + model_set_matrices(&renderdata, model); func0f07063c(prop, fulltick); child = prop->child; @@ -4794,7 +4794,7 @@ void func0f07079c(struct prop *prop, bool fulltick) } } -s32 glassCalculateOpacity(struct coord *pos, f32 xludist, f32 opadist, f32 arg3) +s32 glass_calculate_opacity(struct coord *pos, f32 xludist, f32 opadist, f32 arg3) { struct coord *campos = &g_Vars.currentplayer->cam_pos; s32 opacity; @@ -4922,17 +4922,17 @@ void func0f070ca0(struct defaultobj *obj, struct geotilef *tile, u32 flags, stru } } -void liftActivate(struct prop *prop, u8 liftnum) +void lift_activate(struct prop *prop, u8 liftnum) { if (liftnum > 0 && liftnum <= ARRAYCOUNT(g_Lifts)) { g_Lifts[liftnum - 1] = prop; } } -struct prop *liftFindByPad(s16 padnum) +struct prop *lift_find_by_pad(s16 padnum) { struct pad pad; - padUnpack(padnum, PADFIELD_LIFT, &pad); + pad_unpack(padnum, PADFIELD_LIFT, &pad); if (pad.liftnum <= 0 || pad.liftnum > ARRAYCOUNT(g_Lifts)) { return NULL; @@ -4941,7 +4941,7 @@ struct prop *liftFindByPad(s16 padnum) return g_Lifts[pad.liftnum - 1]; } -f32 liftGetY(struct liftobj *lift) +f32 lift_get_y(struct liftobj *lift) { f32 y = lift->base.prop->pos.y; @@ -4987,7 +4987,7 @@ f32 liftGetY(struct liftobj *lift) * Part 5 is the first half of the floor if non-rectangular (Deep Sea lift) * Part 6 is the second half of the floor if non-rectangular (Deep Sea lift) */ -void liftUpdateTiles(struct liftobj *lift, bool stationary) +void lift_update_tiles(struct liftobj *lift, bool stationary) { u8 *geo; union modelrodata *rodata; @@ -5013,26 +5013,26 @@ void liftUpdateTiles(struct liftobj *lift, bool stationary) #endif // Look for a non-rectangular floor with fallback to rectangular - rodata = modelGetPartRodata(lift->base.model->definition, MODELPART_LIFT_FLOORNONRECT1); + rodata = model_get_part_rodata(lift->base.model->definition, MODELPART_LIFT_FLOORNONRECT1); if (rodata == NULL) { union modelrodata *tmp; - tmp = modelGetPartRodata(lift->base.model->definition, MODELPART_LIFT_FLOORRECT); + tmp = model_get_part_rodata(lift->base.model->definition, MODELPART_LIFT_FLOORRECT); bbox = &tmp->bbox; if (bbox == NULL) { - bbox = objFindBboxRodata(&lift->base); + bbox = obj_find_bbox_rodata(&lift->base); } } } else if (i == 1) { flags = GEOFLAG_WALL; - rodata = modelGetPartRodata(lift->base.model->definition, MODELPART_LIFT_WALL1); + rodata = model_get_part_rodata(lift->base.model->definition, MODELPART_LIFT_WALL1); } else if (i == 2) { flags = GEOFLAG_WALL; - rodata = modelGetPartRodata(lift->base.model->definition, MODELPART_LIFT_WALL2); + rodata = model_get_part_rodata(lift->base.model->definition, MODELPART_LIFT_WALL2); } else if (i == 3) { flags = GEOFLAG_WALL; - rodata = modelGetPartRodata(lift->base.model->definition, MODELPART_LIFT_WALL3); + rodata = model_get_part_rodata(lift->base.model->definition, MODELPART_LIFT_WALL3); } else if (i == 4) { // The doorblock model part exists in the dataDyne tower lifts. // It's a tile across the door that only applies while the lift @@ -5040,7 +5040,7 @@ void liftUpdateTiles(struct liftobj *lift, bool stationary) // the doorway while it's moving. if (!stationary) { flags = GEOFLAG_WALL; - rodata = modelGetPartRodata(lift->base.model->definition, MODELPART_LIFT_DOORBLOCK); + rodata = model_get_part_rodata(lift->base.model->definition, MODELPART_LIFT_DOORBLOCK); } } else if (i == 5) { #if VERSION >= VERSION_NTSC_1_0 @@ -5048,7 +5048,7 @@ void liftUpdateTiles(struct liftobj *lift, bool stationary) #else flags = GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2 | GEOFLAG_LIFTFLOOR; #endif - rodata = modelGetPartRodata(lift->base.model->definition, MODELPART_LIFT_FLOORNONRECT2); + rodata = model_get_part_rodata(lift->base.model->definition, MODELPART_LIFT_FLOORNONRECT2); } else { break; } @@ -5063,7 +5063,7 @@ void liftUpdateTiles(struct liftobj *lift, bool stationary) } while (bbox || rodata); } -void liftGoToStop(struct liftobj *lift, s32 stopnum) +void lift_go_to_stop(struct liftobj *lift, s32 stopnum) { #if VERSION >= VERSION_NTSC_1_0 u32 stack; @@ -5077,7 +5077,7 @@ void liftGoToStop(struct liftobj *lift, s32 stopnum) // If lift is stopped (cur == aim) // or door is not fully closed yet if (lift->levelcur == lift->levelaim || - (lift->doors[lift->levelcur] && !doorIsClosed(lift->doors[lift->levelcur]))) { + (lift->doors[lift->levelcur] && !door_is_closed(lift->doors[lift->levelcur]))) { // Sanity check to make sure lift is actually not moving if (lift->dist == 0 && lift->speed == 0) { lift->levelaim = stopnum; @@ -5091,9 +5091,9 @@ void liftGoToStop(struct liftobj *lift, s32 stopnum) } #endif - padUnpack(lift->pads[lift->levelcur], PADFIELD_POS, &curpad); - padUnpack(lift->pads[lift->levelaim], PADFIELD_POS, &aimpad); - padUnpack(lift->pads[stopnum], PADFIELD_POS, &reqpad); + pad_unpack(lift->pads[lift->levelcur], PADFIELD_POS, &curpad); + pad_unpack(lift->pads[lift->levelaim], PADFIELD_POS, &aimpad); + pad_unpack(lift->pads[stopnum], PADFIELD_POS, &reqpad); // Figure out if the lift needs to reverse direction on any axis #if VERSION >= VERSION_NTSC_1_0 @@ -5136,7 +5136,7 @@ void liftGoToStop(struct liftobj *lift, s32 stopnum) * The value returned is the distance between the object's ground (when not falling) * and its Y value. For crates, the value returned is typically between 65 and 75 (cm). */ -f32 objGetHovBobOffsetY(struct defaultobj *obj) +f32 obj_get_hov_bob_offset_y(struct defaultobj *obj) { struct hov *hov = NULL; f32 result; @@ -5152,15 +5152,15 @@ f32 objGetHovBobOffsetY(struct defaultobj *obj) if (hov) { result = hov->bobycur; } else { - struct modelrodata_bbox *bbox = objFindBboxRodata(obj); - f32 value = objGetRotatedLocalYMinByMtx3(bbox, obj->realrot); + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(obj); + f32 value = obj_get_rotated_local_y_min_by_mtx3(bbox, obj->realrot); result = func0f06a620(obj) - value; } return result; } -void hovUpdateGround(struct defaultobj *obj, struct hov *hov, struct coord *pos, RoomNum *rooms, f32 matrix[3][3]) +void hov_update_ground(struct defaultobj *obj, struct hov *hov, struct coord *pos, RoomNum *rooms, f32 matrix[3][3]) { f32 ground; RoomNum testrooms[8]; @@ -5171,10 +5171,10 @@ void hovUpdateGround(struct defaultobj *obj, struct hov *hov, struct coord *pos, testpos.y = pos->y - 50; testpos.z = pos->z; - roomsCopy(rooms, testrooms); + rooms_copy(rooms, testrooms); setup0f09233c(obj, &testpos, matrix, testrooms); - ground = cdFindGroundAtCyl(pos, 5, testrooms, &obj->floorcol, NULL); + ground = cd_find_ground_at_cyl(pos, 5, testrooms, &obj->floorcol, NULL); if (ground < -30000) { ground = hov->ground; @@ -5185,7 +5185,7 @@ void hovUpdateGround(struct defaultobj *obj, struct hov *hov, struct coord *pos, } } -void hovTick(struct defaultobj *obj, struct hov *hov) +void hov_tick(struct defaultobj *obj, struct hov *hov) { struct prop *prop; f32 sp1d0; @@ -5216,12 +5216,12 @@ void hovTick(struct defaultobj *obj, struct hov *hov) if (g_Vars.lvframe60 > hov->prevframe60) { prop = obj->prop; - bbox = objFindBboxRodata(obj); + bbox = obj_find_bbox_rodata(obj); type = &g_HovTypes[hov->type]; moved = false; if (g_Vars.lvframe60 > hov->prevgroundframe60) { - hovUpdateGround(obj, hov, &prop->pos, prop->rooms, obj->realrot); + hov_update_ground(obj, hov, &prop->pos, prop->rooms, obj->realrot); } hov->prevframe60 = g_Vars.lvframe60; @@ -5231,7 +5231,7 @@ void hovTick(struct defaultobj *obj, struct hov *hov) groundangle = 0.0f; } else { if (obj->flags3 & OBJFLAG3_GEOCYL) { - objGetBbox(prop, &radius, &ymax, &ymin); + obj_get_bbox(prop, &radius, &ymax, &ymin); sp1cc = radius * 0.9f; sp1d0 = -sp1cc; } else { @@ -5254,17 +5254,17 @@ void hovTick(struct defaultobj *obj, struct hov *hov) sp90.y = prop->pos.y - 50.0f; sp90.z = prop->pos.z; - roomsCopy(prop->rooms, sp9c); + rooms_copy(prop->rooms, sp9c); setup0f09233c(obj, &sp90, obj->realrot, sp9c); func0f065e74(&prop->pos, prop->rooms, &sp1b4, sp198); - roomsAppend(sp9c, sp198, ARRAYCOUNT(sp198)); - ground1 = cdFindGroundAtCyl(&sp1b4, 5, sp198, &obj->floorcol, NULL); + rooms_append(sp9c, sp198, ARRAYCOUNT(sp198)); + ground1 = cd_find_ground_at_cyl(&sp1b4, 5, sp198, &obj->floorcol, NULL); func0f065e74(&prop->pos, prop->rooms, &sp1a8, sp188); - roomsAppend(sp9c, sp188, ARRAYCOUNT(sp188)); - ground2 = cdFindGroundAtCyl(&sp1a8, 5, sp188, NULL, NULL); + rooms_append(sp9c, sp188, ARRAYCOUNT(sp188)); + ground2 = cd_find_ground_at_cyl(&sp1a8, 5, sp188, NULL, NULL); if (ground1 >= -30000.0f && ground2 >= -30000.0f) { groundangle = atan2f(ground1 - ground2, sp1cc - sp1d0); @@ -5304,12 +5304,12 @@ void hovTick(struct defaultobj *obj, struct hov *hov) hov->flags &= ~HOVFLAG_FIRSTTICK; if (obj->type == OBJTYPE_HOVERBIKE) { - psCreate(NULL, obj->prop, SFX_BIKE_PULSE, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(NULL, obj->prop, SFX_BIKE_PULSE, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } } // Update Y bob - applySpeed(&hov->bobycur, hov->bobytarget, &hov->bobyspeed, type->bobyaccel, type->bobyaccel, type->bobymaxspeed); + apply_speed(&hov->bobycur, hov->bobytarget, &hov->bobyspeed, type->bobyaccel, type->bobyaccel, type->bobymaxspeed); if (hov->bobytarget >= type->bobymid && hov->bobycur >= hov->bobytarget) { hov->bobyspeed = 0.0f; @@ -5320,7 +5320,7 @@ void hovTick(struct defaultobj *obj, struct hov *hov) } // Update pitch bob - applyRotation(&hov->bobpitchcur, hov->bobpitchtarget, &hov->bobpitchspeed, type->bobpitchaccel, type->bobpitchaccel, type->bobpitchmaxspeed); + apply_rotation(&hov->bobpitchcur, hov->bobpitchtarget, &hov->bobpitchspeed, type->bobpitchaccel, type->bobpitchaccel, type->bobpitchmaxspeed); if (hov->bobpitchcur == hov->bobpitchtarget) { if (hov->bobpitchspeed <= 2.0f * type->bobpitchaccel && hov->bobpitchspeed >= 2.0f * -type->bobpitchaccel) { @@ -5335,7 +5335,7 @@ void hovTick(struct defaultobj *obj, struct hov *hov) } // Update roll bob - applyRotation(&hov->bobrollcur, hov->bobrolltarget, &hov->bobrollspeed, type->bobrollaccel, type->bobrollaccel, type->bobrollmaxspeed); + apply_rotation(&hov->bobrollcur, hov->bobrolltarget, &hov->bobrollspeed, type->bobrollaccel, type->bobrollaccel, type->bobrollmaxspeed); if (hov->bobrollcur == hov->bobrolltarget) { if (hov->bobrollspeed <= 2.0f * type->bobrollaccel && hov->bobrollspeed >= 2.0f * -type->bobrollaccel) { @@ -5410,9 +5410,9 @@ void hovTick(struct defaultobj *obj, struct hov *hov) obj->flags &= ~OBJFLAG_HOVERCAR_ISHOVERBOT; } - prop->pos.y = objGetHovBobOffsetY(obj) + hov->y; + prop->pos.y = obj_get_hov_bob_offset_y(obj) + hov->y; - mtx4LoadZRotation(hov->bobrollcur, &sp148); + mtx4_load_z_rotation(hov->bobrollcur, &sp148); xrot = hov->groundpitch + hov->bobpitchcur; @@ -5422,9 +5422,9 @@ void hovTick(struct defaultobj *obj, struct hov *hov) xrot += M_BADTAU; } - mtx4LoadXRotation(xrot, &sp108); + mtx4_load_x_rotation(xrot, &sp108); mtx00015be0(&sp108, &sp148); - mtx4LoadYRotation(hov->yrot, &sp108); + mtx4_load_y_rotation(hov->yrot, &sp108); mtx00015be0(&sp108, &sp148); mtx00015f04(obj->model->scale, &sp148); @@ -5433,28 +5433,28 @@ void hovTick(struct defaultobj *obj, struct hov *hov) f32 ezreal = bike->ezreal + bike->ezreal2; if (bike->exreal != 0.0f) { - mtx4LoadXRotation(bike->exreal, &sp108); + mtx4_load_x_rotation(bike->exreal, &sp108); mtx00015be4(&sp148, &sp108, &spc8); - mtx4Copy(&spc8, &sp148); + mtx4_copy(&spc8, &sp148); } if (ezreal != 0.0f) { - mtx4LoadZRotation(ezreal, &sp108); + mtx4_load_z_rotation(ezreal, &sp108); mtx00015be4(&sp148, &sp108, &spc8); - mtx4Copy(&spc8, &sp148); + mtx4_copy(&spc8, &sp148); } } - mtx4ToMtx3(&sp148, obj->realrot); + mtx4_to_mtx3(&sp148, obj->realrot); } } -s32 objIsHoverpropOrBike(struct defaultobj *obj) +s32 obj_is_hoverprop_or_bike(struct defaultobj *obj) { return obj->type == OBJTYPE_HOVERPROP || obj->type == OBJTYPE_HOVERBIKE; } -f32 hoverpropGetTurnAngle(struct defaultobj *obj) +f32 hoverprop_get_turn_angle(struct defaultobj *obj) { f32 angle = 0; @@ -5469,7 +5469,7 @@ f32 hoverpropGetTurnAngle(struct defaultobj *obj) return angle; } -void hoverpropSetTurnAngle(struct defaultobj *obj, f32 angle) +void hoverprop_set_turn_angle(struct defaultobj *obj, f32 angle) { if (obj->type == OBJTYPE_HOVERPROP) { struct hoverpropobj *hoverprop = (struct hoverpropobj *)obj; @@ -5496,9 +5496,9 @@ s32 func0f072144(struct defaultobj *obj, struct coord *arg1, f32 arg2, bool arg3 Mtxf sp64; f32 sp40[3][3]; - if (objIsHoverpropOrBike(obj)) { + if (obj_is_hoverprop_or_bike(obj)) { if (arg2 != 0.0f) { - yrot = arg2 + hoverpropGetTurnAngle(obj); + yrot = arg2 + hoverprop_get_turn_angle(obj); if (yrot >= M_BADTAU) { yrot -= M_BADTAU; @@ -5506,12 +5506,12 @@ s32 func0f072144(struct defaultobj *obj, struct coord *arg1, f32 arg2, bool arg3 yrot += M_BADTAU; } } else { - yrot = hoverpropGetTurnAngle(obj); + yrot = hoverprop_get_turn_angle(obj); } - mtx4LoadYRotation(yrot, &spa4); + mtx4_load_y_rotation(yrot, &spa4); mtx00015f04(obj->model->scale, &spa4); - mtx4ToMtx3(&spa4, sp460); + mtx4_to_mtx3(&spa4, sp460); } else { yrot = 0.0f; @@ -5522,11 +5522,11 @@ s32 func0f072144(struct defaultobj *obj, struct coord *arg1, f32 arg2, bool arg3 arg2 += M_BADTAU; } - mtx4LoadYRotation(arg2, &sp64); - mtx4ToMtx3(&sp64, sp40); + mtx4_load_y_rotation(arg2, &sp64); + mtx4_to_mtx3(&sp64, sp40); mtx00016140(sp40, obj->realrot, sp460); } else { - mtx3Copy(obj->realrot, sp460); + mtx3_copy(obj->realrot, sp460); } } @@ -5534,7 +5534,7 @@ s32 func0f072144(struct defaultobj *obj, struct coord *arg1, f32 arg2, bool arg3 pos.y = prop->pos.y; pos.z = prop->pos.z; - propSetPerimEnabled(prop, false); + prop_set_perim_enabled(prop, false); if (arg1->x != 0.0f || arg1->z != 0.0f) { pos.x += arg1->x; @@ -5553,20 +5553,20 @@ s32 func0f072144(struct defaultobj *obj, struct coord *arg1, f32 arg2, bool arg3 if (hov != NULL) { prevhov = *hov; - hovUpdateGround(obj, hov, &pos, rooms, sp460); + hov_update_ground(obj, hov, &pos, rooms, sp460); pos.y += hov->ground - prevhov.ground; } - cdresult = cdExamCylMove05(&prop->pos, prop->rooms, &pos, rooms, CDTYPE_ALL, true, 0.0f, 0.0f); + cdresult = cd_exam_cyl_move05(&prop->pos, prop->rooms, &pos, rooms, CDTYPE_ALL, true, 0.0f, 0.0f); if (cdresult == CDRESULT_ERROR) { // empty } else if (cdresult == CDRESULT_COLLISION) { - cdSetSavedPos(&prop->pos, &pos); + cd_set_saved_pos(&prop->pos, &pos); } } else { - roomsCopy(prop->rooms, rooms); + rooms_copy(prop->rooms, rooms); setup0f09233c(obj, &pos, sp460, rooms); } @@ -5574,24 +5574,24 @@ s32 func0f072144(struct defaultobj *obj, struct coord *arg1, f32 arg2, bool arg3 func0f069850(obj, &pos, sp460, &geounion.cyl); if (obj->flags3 & OBJFLAG3_GEOCYL) { - cdresult = cdExamCylMove01(&prop->pos, &pos, geounion.cyl.radius, rooms, CDTYPE_ALL, + cdresult = cd_exam_cyl_move01(&prop->pos, &pos, geounion.cyl.radius, rooms, CDTYPE_ALL, CHECKVERTICAL_YES, geounion.cyl.ymax - pos.y, geounion.cyl.ymin - pos.y); } else { - cdresult = cd0002f02c(&geounion.block, rooms, CDTYPE_ALL); + cdresult = cd_0002f02c(&geounion.block, rooms, CDTYPE_ALL); } } - propSetPerimEnabled(prop, true); + prop_set_perim_enabled(prop, true); if (cdresult == CDRESULT_NOCOLLISION && arg3) { - hoverpropSetTurnAngle(obj, yrot); - mtx3Copy(sp460, obj->realrot); + hoverprop_set_turn_angle(obj, yrot); + mtx3_copy(sp460, obj->realrot); prop->pos.x = pos.x; prop->pos.z = pos.z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); if (obj->geocyl && (obj->hidden2 & OBJH2FLAG_08)) { if (obj->flags3 & OBJFLAG3_GEOCYL) { @@ -5607,7 +5607,7 @@ s32 func0f072144(struct defaultobj *obj, struct coord *arg1, f32 arg2, bool arg3 return cdresult; } -void hovercarFindNextPath(struct hovercarobj *hovercar) +void hovercar_find_next_path(struct hovercarobj *hovercar) { s32 index = hovercar->path - g_StageSetup.paths + 1; @@ -5632,21 +5632,21 @@ void hovercarFindNextPath(struct hovercarobj *hovercar) } } -void hovercarStartNextPath(struct hovercarobj *hovercar) +void hovercar_start_next_path(struct hovercarobj *hovercar) { s32 *pads; struct pad pad; Mtxf matrix; RoomNum rooms[2]; - hovercarFindNextPath(hovercar); + hovercar_find_next_path(hovercar); pads = hovercar->path->pads; hovercar->nextstep = 0; - padUnpack(pads[0], PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(pads[0], PADFIELD_POS | PADFIELD_ROOM, &pad); - mtx3ToMtx4(hovercar->base.realrot, &matrix); + mtx3_to_mtx4(hovercar->base.realrot, &matrix); rooms[0] = pad.room; rooms[1] = -1; @@ -5656,7 +5656,7 @@ void hovercarStartNextPath(struct hovercarobj *hovercar) hovercar->base.flags |= OBJFLAG_HOVERCAR_INIT; } -void hovercarIncrementStep(struct hovercarobj *hovercar) +void hovercar_increment_step(struct hovercarobj *hovercar) { hovercar->nextstep++; @@ -5664,7 +5664,7 @@ void hovercarIncrementStep(struct hovercarobj *hovercar) if (hovercar->path->flags & PATHFLAG_CIRCULAR) { hovercar->nextstep = 0; } else { - hovercarStartNextPath(hovercar); + hovercar_start_next_path(hovercar); } } } @@ -5681,10 +5681,10 @@ void hovercarIncrementStep(struct hovercarobj *hovercar) * rebounds at full speed. For collisions with pushable objects, the force is * applied half to both objects. */ -f32 objCollide(struct defaultobj *movingobj, struct coord *movingvel, f32 rotation) +f32 obj_collide(struct defaultobj *movingobj, struct coord *movingvel, f32 rotation) { f32 force = 1.0f; - struct prop *obstacle = cdGetObstacleProp(); + struct prop *obstacle = cd_get_obstacle_prop(); if (obstacle && g_Vars.lvupdate240 > 0) { if (obstacle->type == PROPTYPE_CHR || obstacle->type == PROPTYPE_PLAYER) { @@ -5706,19 +5706,19 @@ f32 objCollide(struct defaultobj *movingobj, struct coord *movingvel, f32 rotati obstaclevel.y = 0.0f; obstaclevel.z = movingvel->z * 0.5f / g_Vars.lvupdate60freal; - objApplyMomentum(obstacleobj, &obstaclevel, 0.0f, true, true); + obj_apply_momentum(obstacleobj, &obstaclevel, 0.0f, true, true); #if VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp70, &sp64, 7356, "prop/propobj.c"); + cd_get_edge(&sp70, &sp64, 7356, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&sp70, &sp64, 7356, "propobj.c"); + cd_get_edge(&sp70, &sp64, 7356, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp70, &sp64, 7355, "propobj.c"); + cd_get_edge(&sp70, &sp64, 7355, "propobj.c"); #else - cdGetEdge(&sp70, &sp64, 7308, "propobj.c"); + cd_get_edge(&sp70, &sp64, 7308, "propobj.c"); #endif - if (cdGetSavedPos(&sp58, &sp4c)) { + if (cd_get_saved_pos(&sp58, &sp4c)) { sp4c.x -= sp58.x; sp4c.y -= sp58.y; sp4c.z -= sp58.z; @@ -5753,7 +5753,7 @@ f32 objCollide(struct defaultobj *movingobj, struct coord *movingvel, f32 rotati finalrotation += rotation * 0.1f; - objApplyMomentum(obstacleobj, &speed, finalrotation, true, true); + obj_apply_momentum(obstacleobj, &speed, finalrotation, true, true); } } } @@ -5762,7 +5762,7 @@ f32 objCollide(struct defaultobj *movingobj, struct coord *movingvel, f32 rotati return force; } -void hoverbikeUpdateMovement(struct hoverbikeobj *bike, f32 speedforwards, f32 speedsideways, f32 speedtheta) +void hoverbike_update_movement(struct hoverbikeobj *bike, f32 speedforwards, f32 speedsideways, f32 speedtheta) { f32 f12; f32 angle; @@ -5787,7 +5787,7 @@ void hoverbikeUpdateMovement(struct hoverbikeobj *bike, f32 speedforwards, f32 s } sp6c += bike->w * 12; - angle = hoverpropGetTurnAngle(&bike->base); + angle = hoverprop_get_turn_angle(&bike->base); sinangle = sinf(angle); cosangle = cosf(angle); @@ -5945,7 +5945,7 @@ void hoverbikeUpdateMovement(struct hoverbikeobj *bike, f32 speedforwards, f32 s } } -void platformDisplaceProps2(struct prop *platform, Mtxf *arg1) +void platform_displace_props2(struct prop *platform, Mtxf *arg1) { struct prop *prop; s16 *propnumptr; @@ -5954,8 +5954,8 @@ void platformDisplaceProps2(struct prop *platform, Mtxf *arg1) u8 *sp98; Mtxf sp58; - if (propUpdateGeometry(platform, &sp9c, &sp98)) { - roomGetProps(platform->rooms, propnums, 256); + if (prop_update_geometry(platform, &sp9c, &sp98)) { + room_get_props(platform->rooms, propnums, 256); propnumptr = propnums; @@ -5967,17 +5967,17 @@ void platformDisplaceProps2(struct prop *platform, Mtxf *arg1) if (prop->pos.y > platform->pos.y && (obj->hidden & OBJHFLAG_00008000) - && cd000266a4(prop->pos.x, prop->pos.z, (struct geo *)sp9c)) { - mtx3ToMtx4(obj->realrot, &sp58); - mtx4SetTranslation(&prop->pos, &sp58); - mtx4MultMtx4InPlace(arg1, &sp58); - mtx4ToMtx3(&sp58, obj->realrot); + && cd_000266a4(prop->pos.x, prop->pos.z, (struct geo *)sp9c)) { + mtx3_to_mtx4(obj->realrot, &sp58); + mtx4_set_translation(&prop->pos, &sp58); + mtx4_mult_mtx4_in_place(arg1, &sp58); + mtx4_to_mtx3(&sp58, obj->realrot); prop->pos.x = sp58.m[3][0]; prop->pos.y = sp58.m[3][1]; prop->pos.z = sp58.m[3][2]; - propDeregisterRooms(prop); + prop_deregister_rooms(prop); func0f065e74(&platform->pos, platform->rooms, &prop->pos, prop->rooms); func0f069c70(obj, true, true); } @@ -5991,7 +5991,7 @@ void platformDisplaceProps2(struct prop *platform, Mtxf *arg1) /** * Tick a Slayer fly-by-wire rocket that's being controlled by a bot. */ -bool rocketTickFbw(struct weaponobj *rocket) +bool rocket_tick_fbw(struct weaponobj *rocket) { bool cdresult; f32 speed; @@ -6031,13 +6031,13 @@ bool rocketTickFbw(struct weaponobj *rocket) projectile->step++; if (projectile->numwaypads <= 0 || projectile->step >= projectile->numwaypads) { - targetprop = chrGetTargetProp(ownerchr); + targetprop = chr_get_target_prop(ownerchr); - if (!botactFindRocketRoute(ownerchr, &rocketprop->pos, &targetprop->pos, rocketprop->rooms, targetprop->rooms, projectile)) { + if (!botact_find_rocket_route(ownerchr, &rocketprop->pos, &targetprop->pos, rocketprop->rooms, targetprop->rooms, projectile)) { rocket->timer240 = 0; } } else { - botactGetRocketNextStepPos(projectile->waypads[projectile->step], &projectile->nextsteppos); + botact_get_rocket_next_step_pos(projectile->waypads[projectile->step], &projectile->nextsteppos); } } @@ -6046,15 +6046,15 @@ bool rocketTickFbw(struct weaponobj *rocket) yrot = atan2f(ydist, sqrtf(xdist * xdist + zdist * zdist)); for (i = 0; i < g_Vars.lvupdate240; i++) { - projectile->unk018 = modelTweenRotAxis(projectile->unk018, xrot, PAL ? 0.02246f : 0.01875f); - projectile->unk014 = modelTweenRotAxis(projectile->unk014, yrot, PAL ? 0.02246f : 0.01875f); + projectile->unk018 = model_tween_rot_axis(projectile->unk018, xrot, PAL ? 0.02246f : 0.01875f); + projectile->unk014 = model_tween_rot_axis(projectile->unk014, yrot, PAL ? 0.02246f : 0.01875f); } - mtx4LoadXRotation(M_BADTAU - projectile->unk014, &sp118); - mtx4LoadYRotation(projectile->unk018, &spd8); - mtx4MultMtx4(&spd8, &sp118, &sp98); + mtx4_load_x_rotation(M_BADTAU - projectile->unk014, &sp118); + mtx4_load_y_rotation(projectile->unk018, &spd8); + mtx4_mult_mtx4(&spd8, &sp118, &sp98); mtx00015f04(rocket->base.model->scale, &sp98); - mtx4ToMtx3(&sp98, rocket->base.realrot); + mtx4_to_mtx3(&sp98, rocket->base.realrot); } // Calculate new pos @@ -6082,13 +6082,13 @@ bool rocketTickFbw(struct weaponobj *rocket) // Check if new pos would collide with anything if (projectile->ownerprop) { - propSetPerimEnabled(projectile->ownerprop, false); + prop_set_perim_enabled(projectile->ownerprop, false); } cdresult = func0f06cd00(&rocket->base, &newpos, &sp164, &sp158); if (projectile->ownerprop) { - propSetPerimEnabled(projectile->ownerprop, true); + prop_set_perim_enabled(projectile->ownerprop, true); } if (cdresult == CDRESULT_NOCOLLISION) { @@ -6098,8 +6098,8 @@ bool rocketTickFbw(struct weaponobj *rocket) rocketprop->pos.y = newpos.y; rocketprop->pos.z = newpos.z; - propDeregisterRooms(rocketprop); - roomsCopy(newrooms, rocketprop->rooms); + prop_deregister_rooms(rocketprop); + rooms_copy(newrooms, rocketprop->rooms); func0f069c70(&rocket->base, true, true); } else { // Boom @@ -6109,7 +6109,7 @@ bool rocketTickFbw(struct weaponobj *rocket) // Create smoke behind the rocket if (projectile->smoketimer240 <= 0) { projectile->smoketimer240 = TICKS(24); - smokeCreateSimple(&rocketprop->pos, rocketprop->rooms, SMOKETYPE_ROCKETTAIL); + smoke_create_simple(&rocketprop->pos, rocketprop->rooms, SMOKETYPE_ROCKETTAIL); } else { projectile->smoketimer240 -= g_Vars.lvupdate240; } @@ -6122,12 +6122,12 @@ bool rocketTickFbw(struct weaponobj *rocket) // Check if close to an enemy if (ownerchr && rocket->timer240) { for (i = 0; i < g_MpNumChrs; i++) { - struct chrdata *chr = mpGetChrFromPlayerIndex(i); + struct chrdata *chr = mp_get_chr_from_player_index(i); if (chr != ownerchr - && !chrIsDead(chr) - && chrCompareTeams(ownerchr, chr, COMPARE_ENEMIES) - && !botIsTargetInvisible(NULL, chr)) { + && !chr_is_dead(chr) + && chr_compare_teams(ownerchr, chr, COMPARE_ENEMIES) + && !bot_is_target_invisible(NULL, chr)) { // Explode if within 250 units xdist = rocketprop->pos.x - chr->prop->pos.x; ydist = rocketprop->pos.y - chr->prop->pos.y; @@ -6139,9 +6139,9 @@ bool rocketTickFbw(struct weaponobj *rocket) } // Check if rocket can fly directly to target - if (chrGetTargetProp(ownerchr) == chr->prop - && mpPlayerGetIndex(ownerchr) == g_Vars.lvframenum % g_MpNumChrs - && cdTestLos05(&rocketprop->pos, rocketprop->rooms, &chr->prop->pos, chr->prop->rooms, + if (chr_get_target_prop(ownerchr) == chr->prop + && mp_player_get_index(ownerchr) == g_Vars.lvframenum % g_MpNumChrs + && cd_test_los05(&rocketprop->pos, rocketprop->rooms, &chr->prop->pos, chr->prop->rooms, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_AIOPAQUE, GEOFLAG_BLOCK_SIGHT)) { projectile->nextsteppos.x = chr->prop->pos.x; @@ -6167,26 +6167,26 @@ bool rocketTickFbw(struct weaponobj *rocket) } // If bot is killed, rocket becomes uncontrolled - if (ownerchr && ((ownerchr->aibot && ownerchr->aibot->skrocket == NULL) || chrIsDead(ownerchr))) { + if (ownerchr && ((ownerchr->aibot && ownerchr->aibot->skrocket == NULL) || chr_is_dead(ownerchr))) { projectile->ownerprop = NULL; } return cdresult; } -s32 projectileLaunch(struct defaultobj *obj, struct projectile *projectile, struct coord *arg2, struct coord *arg3) +s32 projectile_launch(struct defaultobj *obj, struct projectile *projectile, struct coord *arg2, struct coord *arg3) { s32 cdresult; struct prop *prop = obj->prop; if (projectile->ownerprop) { - propSetPerimEnabled(projectile->ownerprop, false); + prop_set_perim_enabled(projectile->ownerprop, false); } cdresult = func0f06cd00(obj, &projectile->nextsteppos, arg2, arg3); if (projectile->ownerprop) { - propSetPerimEnabled(projectile->ownerprop, true); + prop_set_perim_enabled(projectile->ownerprop, true); } if (cdresult == CDRESULT_NOCOLLISION) { @@ -6198,8 +6198,8 @@ s32 projectileLaunch(struct defaultobj *obj, struct projectile *projectile, stru prop->pos.y = projectile->nextsteppos.y; prop->pos.z = projectile->nextsteppos.z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); } else if (cdresult != CDRESULT_NOCOLLISION && obj->type == OBJTYPE_WEAPON) { struct weaponobj *weapon = (struct weaponobj *)obj; RoomNum rooms[8]; @@ -6213,8 +6213,8 @@ s32 projectileLaunch(struct defaultobj *obj, struct projectile *projectile, stru prop->pos.y = arg2->y; prop->pos.z = arg2->z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); } } @@ -6223,7 +6223,7 @@ s32 projectileLaunch(struct defaultobj *obj, struct projectile *projectile, stru return cdresult; } -s32 projectileTick(struct defaultobj *obj, bool *embedded) +s32 projectile_tick(struct defaultobj *obj, bool *embedded) { struct projectile *projectile = obj->projectile; s32 cdresult; @@ -6252,7 +6252,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if (g_Vars.lvupdate240 > 0) { if (obj->type == OBJTYPE_WEAPON && ((struct weaponobj *)obj)->weaponnum == WEAPON_SKROCKET) { - result = rocketTickFbw((struct weaponobj *) obj); + result = rocket_tick_fbw((struct weaponobj *) obj); } else if (projectile->flags & PROJECTILEFLAG_00001000) { result = (projectile->flags & PROJECTILEFLAG_00002000) != 0; projectile->flags &= ~(PROJECTILEFLAG_00001000 | PROJECTILEFLAG_00002000); @@ -6260,7 +6260,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) obj->hidden &= ~OBJHFLAG_00020000; if (projectile->flags & PROJECTILEFLAG_LAUNCHING) { - projectileLaunch(obj, projectile, &sp5e8, &sp5f4); + projectile_launch(obj, projectile, &sp5e8, &sp5f4); } sp5dc.x = prop->pos.x; @@ -6277,8 +6277,8 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) f32 outerdist; f32 z; - mtx3ToMtx4(obj->realrot, &sp504); - mtx4SetTranslation(&prop->pos, &sp504); + mtx3_to_mtx4(obj->realrot, &sp504); + mtx4_set_translation(&prop->pos, &sp504); if (projectile->unk0dc > 0.0f) { projectile->unk0dc -= projectile->unk0e0 * g_Vars.lvupdate60freal; @@ -6342,7 +6342,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) } if (projectile->ownerprop) { - propSetPerimEnabled(projectile->ownerprop, false); + prop_set_perim_enabled(projectile->ownerprop, false); } // Objects become more difficult to push @@ -6350,7 +6350,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) haslimitedarea = obj->pad >= 0 && (obj->flags3 & (OBJFLAG3_GRABBABLE | OBJFLAG3_PUSHFREELY)) == 0; if (haslimitedarea) { - padUnpack(obj->pad, PADFIELD_POS, &pad); + pad_unpack(obj->pad, PADFIELD_POS, &pad); innerdist = 200.0f; outerdist = 300.0f; @@ -6392,7 +6392,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if (cdresult != CDRESULT_ERROR && cdresult == CDRESULT_COLLISION) { projectile->unk0dc = -projectile->unk0dc * projectile->unk08c; - objCollide(obj, &sp404, sp5a8); + obj_collide(obj, &sp404, sp5a8); } } @@ -6424,7 +6424,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) cdresult = func0f072144(obj, &sp59c, 0.0f, true); if (cdresult == CDRESULT_COLLISION) { - sp58c = objCollide(obj, &sp59c, 0.0f) * projectile->unk08c; + sp58c = obj_collide(obj, &sp59c, 0.0f) * projectile->unk08c; if (sp58c > 0.0f) { f32 f0; @@ -6437,19 +6437,19 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) struct coord sp3ac; f32 f0_2; - if (cdGetSavedPos(&sp3d0, &sp3c4)) { + if (cd_get_saved_pos(&sp3d0, &sp3c4)) { sp3c4.x -= sp3d0.x; sp3c4.y -= sp3d0.y; sp3c4.z -= sp3d0.z; } else { #if VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp3d0, &sp3c4, 8360, "prop/propobj.c"); + cd_get_edge(&sp3d0, &sp3c4, 8360, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&sp3d0, &sp3c4, 8360, "propobj.c"); + cd_get_edge(&sp3d0, &sp3c4, 8360, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp3d0, &sp3c4, 8339, "propobj.c"); + cd_get_edge(&sp3d0, &sp3c4, 8339, "propobj.c"); #else - cdGetEdge(&sp3d0, &sp3c4, 8289, "propobj.c"); + cd_get_edge(&sp3d0, &sp3c4, 8289, "propobj.c"); #endif sp3d0.x -= sp3c4.x; @@ -6485,13 +6485,13 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) projectile->unk0dc += f0; #if VERSION >= VERSION_PAL_FINAL - cdGetEdge(&sp3e8, &sp3dc, 8398, "prop/propobj.c"); + cd_get_edge(&sp3e8, &sp3dc, 8398, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetEdge(&sp3e8, &sp3dc, 8398, "propobj.c"); + cd_get_edge(&sp3e8, &sp3dc, 8398, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetEdge(&sp3e8, &sp3dc, 8377, "propobj.c"); + cd_get_edge(&sp3e8, &sp3dc, 8377, "propobj.c"); #else - cdGetEdge(&sp3e8, &sp3dc, 8327, "propobj.c"); + cd_get_edge(&sp3e8, &sp3dc, 8327, "propobj.c"); #endif sp3f4.x = sp3dc.z - sp3e8.z; @@ -6539,7 +6539,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) cdresult = func0f072144(obj, &sp59c, 0.0f, true); if (cdresult == CDRESULT_COLLISION) { - sp58c = objCollide(obj, &sp59c, 0.0f) * projectile->unk08c; + sp58c = obj_collide(obj, &sp59c, 0.0f) * projectile->unk08c; sp590.x = -projectile->speed.f[0] * sp58c; sp590.y = 0.0f; @@ -6573,7 +6573,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) cdresult = func0f072144(obj, &sp59c, 0.0f, true); if (cdresult == CDRESULT_COLLISION) { - objCollide(obj, &sp59c, 0.0f); + obj_collide(obj, &sp59c, 0.0f); if (sp3e8.f[0] != sp3dc.f[0] || sp3e8.f[2] != sp3dc.f[2]) { f32 f12; @@ -6622,7 +6622,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) cdresult = func0f072144(obj, &sp59c, 0.0f, true); if (cdresult == CDRESULT_COLLISION) { - objCollide(obj, &sp59c, 0.0f); + obj_collide(obj, &sp59c, 0.0f); } } } @@ -6643,27 +6643,27 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) } if (projectile->ownerprop) { - propSetPerimEnabled(projectile->ownerprop, true); + prop_set_perim_enabled(projectile->ownerprop, true); } if (projectile->speed.f[0] == 0.0f && projectile->speed.f[2] == 0.0f && projectile->unk0dc == 0.0f) { - objFreeProjectile(obj); + obj_free_projectile(obj); } if (cdresult == CDRESULT_NOCOLLISION) { - ground = cdFindGroundAtCyl(&prop->pos, 2, prop->rooms, &obj->floorcol, NULL); + ground = cd_find_ground_at_cyl(&prop->pos, 2, prop->rooms, &obj->floorcol, NULL); if (ground > -30000.0f) { - prop->pos.y = ground + objGetHovBobOffsetY(obj); + prop->pos.y = ground + obj_get_hov_bob_offset_y(obj); } } func0f069c70(obj, false, true); - mtx3ToMtx4(obj->realrot, &sp484); - mtx4SetTranslation(&prop->pos, &sp484); + mtx3_to_mtx4(obj->realrot, &sp484); + mtx4_set_translation(&prop->pos, &sp484); mtx000172f0(sp504.m, sp4c4.m); - mtx4MultMtx4(&sp484, &sp4c4, &sp544); - platformDisplaceProps2(prop, &sp544); + mtx4_mult_mtx4(&sp484, &sp4c4, &sp544); + platform_displace_props2(prop, &sp544); result = true; } else if (projectile->flags & PROJECTILEFLAG_AIRBORNE) { f32 sp390; @@ -6689,7 +6689,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) projectile->flighttime240 += g_Vars.lvupdate240; - mtx3Copy(obj->realrot, realrot); + mtx3_copy(obj->realrot, realrot); if (projectile->flags & PROJECTILEFLAG_00000020) { if (projectile->unk01c < (1.0f / 3.6f)) { @@ -6734,7 +6734,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) struct coord sp290; f32 sp28c; - mtx4LoadIdentity(&mtx); + mtx4_load_identity(&mtx); mtx.m[0][0] = obj->realrot[0][0] / sp29c; mtx.m[0][1] = obj->realrot[0][1] / sp29c; @@ -6779,9 +6779,9 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) static u32 kkd = 20; static u32 kkp = 120; - mainOverrideVariable("kkg", &kkg); - mainOverrideVariable("kkd", &kkd); - mainOverrideVariable("kkp", &kkp); + main_override_variable("kkg", &kkg); + main_override_variable("kkd", &kkd); + main_override_variable("kkp", &kkp); tmp = ((kkd / 100.0f * var80069bc4 / LVUPDATE60FREAL()) + (kkp / 100.00f * sp28c * LVUPDATE60FREAL())) * (kkg / 100.000f); @@ -6796,17 +6796,17 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) sp260[2] = sp280.f[1] * sinf(tmp * 0.5f); sp260[3] = sp280.f[2] * sinf(tmp * 0.5f); - quaternionToMtx(sp260, &sp20c); + quaternion_to_mtx(sp260, &sp20c); projectile->unk018 = 0.0f; projectile->unk014 = 0.0f; projectile->unk010 = 0.0f; - mtx4RotateVecInPlace(&sp20c, &projectile->speed); + mtx4_rotate_vec_in_place(&sp20c, &projectile->speed); quaternion0f097044(&mtx, sp270); - quaternionMultQuaternion(sp270, sp260, sp250); - quaternionToMtx(sp250, &sp20c); + quaternion_mult_quaternion(sp270, sp260, sp250); + quaternion_to_mtx(sp250, &sp20c); obj->realrot[0][0] = sp20c.m[0][0] * sp29c; obj->realrot[0][1] = sp20c.m[0][1] * sp29c; @@ -6847,18 +6847,18 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) sp5dc.x += projectile->speed.x * g_Vars.lvupdate60freal; sp5dc.z += projectile->speed.z * g_Vars.lvupdate60freal; - mtx3ToMtx4(obj->realrot, &sp30c); + mtx3_to_mtx4(obj->realrot, &sp30c); func0f096698(&sp30c, &projectile->mtx, g_Vars.lvupdate240); - mtx4ToMtx3(&sp30c, obj->realrot); + mtx4_to_mtx3(&sp30c, obj->realrot); sp5c8.x = prop->pos.x; sp5c8.y = prop->pos.y; sp5c8.z = prop->pos.z; - roomsCopy(prop->rooms, sp5b8); + rooms_copy(prop->rooms, sp5b8); if (projectile->ownerprop) { - propSetPerimEnabled(projectile->ownerprop, false); + prop_set_perim_enabled(projectile->ownerprop, false); } if (projectile->flags & PROJECTILEFLAG_STICKY) { @@ -6868,7 +6868,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) } if (projectile->ownerprop) { - propSetPerimEnabled(projectile->ownerprop, true); + prop_set_perim_enabled(projectile->ownerprop, true); } result = true; @@ -6905,7 +6905,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) || weapon2->weaponnum == WEAPON_BOLT || weapon2->weaponnum == WEAPON_COMBATKNIFE || weapon2->weaponnum == WEAPON_ECMMINE - || gsetHasFunctionFlags(&weapon2->gset, FUNCFLAG_STICKTOWALL)) { + || gset_has_function_flags(&weapon2->gset, FUNCFLAG_STICKTOWALL)) { stick = true; if (weapon2->weaponnum == WEAPON_GRENADEROUND && weapon2->gunfunc == FUNC_SECONDARY) { @@ -6958,18 +6958,18 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) } #endif if (hitobj->type == OBJTYPE_GLASS || hitobj->type == OBJTYPE_TINTEDGLASS) { - bgunPlayGlassHitSound(&prop->pos, prop->rooms, -1); + bgun_play_glass_hit_sound(&prop->pos, prop->rooms, -1); if ((hitobj->flags2 & OBJFLAG2_IMMUNETOGUNFIRE) == 0) { - objTakeGunfire(hitobj, 100, &prop->pos, weapon->weaponnum, g_Vars.currentplayernum); - objDropRecursively(hitprop, false); + obj_take_gunfire(hitobj, 100, &prop->pos, weapon->weaponnum, g_Vars.currentplayernum); + obj_drop_recursively(hitprop, false); stick = false; handled = true; } } } } else if ((hitprop->type == PROPTYPE_CHR || hitprop->type == PROPTYPE_PLAYER) - && chrGetShield(hitprop->chr) > 0.0f) { + && chr_get_shield(hitprop->chr) > 0.0f) { stick = false; } } @@ -6987,13 +6987,13 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) struct prop *ownerprop; ownerprop = obj->projectile->ownerprop; - ownershield = chrGetShield(hitchr); + ownershield = chr_get_shield(hitchr); - func0f0341dc(hitchr, gsetGetDamage(&weapon->gset), &var8009ce78, &weapon->gset, ownerprop, + func0f0341dc(hitchr, gset_get_damage(&weapon->gset), &var8009ce78, &weapon->gset, ownerprop, g_EmbedHitPart, g_EmbedProp, g_EmbedNode, g_EmbedModel, g_EmbedSide, var8006993c); if (ownershield <= 0.0f) { - chrEmitSparks(hitchr, g_EmbedProp, g_EmbedHitPart, &sp5e8, &sp5f4, ownerprop ? ownerprop->chr : NULL); + chr_emit_sparks(hitchr, g_EmbedProp, g_EmbedHitPart, &sp5e8, &sp5f4, ownerprop ? ownerprop->chr : NULL); if (g_EmbedProp->flags & PROPFLAG_ONTHISSCREENTHISTICK) { if (g_EmbedModel && g_EmbedHitPart != HITPART_GUN && g_EmbedHitPart != HITPART_HAT) { @@ -7001,10 +7001,10 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) Mtxf sp188; Mtxf *sp184; - sp184 = modelFindNodeMtx(g_EmbedModel, g_EmbedNode, 0); - mtx4TransformVec(camGetWorldToScreenMtxf(), &sp5e8, &sp1c8); + sp184 = model_find_node_mtx(g_EmbedModel, g_EmbedNode, 0); + mtx4_transform_vec(cam_get_world_to_screen_mtxf(), &sp5e8, &sp1c8); mtx0001719c(sp184->m, sp188.m); - mtx4TransformVecInPlace(&sp188, &sp1c8); + mtx4_transform_vec_in_place(&sp188, &sp1c8); chr0f0260c4(g_EmbedModel, g_EmbedHitPart, g_EmbedNode, &sp1c8); } @@ -7017,11 +7017,11 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if (var80069944 == 10000) { shield = (hitobj->flags3 & OBJFLAG3_SHOWSHIELD) ? 4 : 8; - shieldhitCreate(hitprop, shield, g_EmbedProp, g_EmbedNode, g_EmbedModel, g_EmbedSide, var8006993c); + shieldhit_create(hitprop, shield, g_EmbedProp, g_EmbedNode, g_EmbedModel, g_EmbedSide, var8006993c); } if (hitobj->modelnum == MODEL_TARGET && var80069944 == TEXTURE_0B9E) { - frCalculateHit(hitobj, &sp5e8, 0.0f); + fr_calculate_hit(hitobj, &sp5e8, 0.0f); } } } else if (weapon->weaponnum == WEAPON_ROCKET || weapon->weaponnum == WEAPON_HOMINGROCKET) { @@ -7034,7 +7034,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) struct prop *ownerprop2 = NULL; if (g_Vars.normmplayerisrunning) { - struct chrdata *ownerchr = mpGetChrFromPlayerIndex(ownerplayernum); + struct chrdata *ownerchr = mp_get_chr_from_player_index(ownerplayernum); if (ownerchr != NULL) { ownerprop2 = ownerchr->prop; @@ -7047,10 +7047,10 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if (var80069944 == 10000) { f32 shield = (g_EmbedProp->obj->flags3 & OBJFLAG3_SHOWSHIELD) ? 4 : 8; - shieldhitCreate(hitprop, shield, g_EmbedProp, g_EmbedNode, g_EmbedModel, g_EmbedSide, var8006993c); + shieldhit_create(hitprop, shield, g_EmbedProp, g_EmbedNode, g_EmbedModel, g_EmbedSide, var8006993c); } - objDamage(g_EmbedProp->obj, 100, &prop->pos, weapon->weaponnum, ownerplayernum); + obj_damage(g_EmbedProp->obj, 100, &prop->pos, weapon->weaponnum, ownerplayernum); } handled = true; @@ -7063,7 +7063,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) } else if ((hitprop->type == PROPTYPE_OBJ || hitprop->type == PROPTYPE_WEAPON) && var80069944 == 10000) { shield = (hitprop->obj->flags3 & OBJFLAG3_SHOWSHIELD) ? 4 : 8; - shieldhitCreate(hitprop, shield, g_EmbedProp, g_EmbedNode, g_EmbedModel, g_EmbedSide, var8006993c); + shieldhit_create(hitprop, shield, g_EmbedProp, g_EmbedNode, g_EmbedModel, g_EmbedSide, var8006993c); } } } @@ -7079,13 +7079,13 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if (weapon->weaponnum == WEAPON_BOLT || weapon->weaponnum == WEAPON_COMBATKNIFE) { if (obj->projectile->ownerprop && obj->projectile->ownerprop->type == PROPTYPE_PLAYER) { s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(obj->projectile->ownerprop)); - mpstatsIncrementPlayerShotCount(&weapon->gset, SHOTREGION_TOTAL); + set_current_player_num(playermgr_get_player_num_by_prop(obj->projectile->ownerprop)); + mpstats_increment_player_shot_count(&weapon->gset, SHOTREGION_TOTAL); if (g_EmbedProp != NULL) { if (g_EmbedProp->type == PROPTYPE_OBJ) { - if (objIsHealthy(g_EmbedProp->obj)) { - mpstatsIncrementPlayerShotCount(&weapon->gset, SHOTREGION_OBJECT); + if (obj_is_healthy(g_EmbedProp->obj)) { + mpstats_increment_player_shot_count(&weapon->gset, SHOTREGION_OBJECT); } } else if (g_EmbedProp->type == PROPTYPE_CHR || g_EmbedProp->type == PROPTYPE_PLAYER) { struct chrdata *embedchr = g_EmbedProp->chr; @@ -7095,7 +7095,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) dead = true; } - if (g_EmbedProp->type == PROPTYPE_PLAYER && g_Vars.players[playermgrGetPlayerNumByProp(g_EmbedProp)]->isdead) { + if (g_EmbedProp->type == PROPTYPE_PLAYER && g_Vars.players[playermgr_get_player_num_by_prop(g_EmbedProp)]->isdead) { dead = true; } @@ -7104,27 +7104,27 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) case 0: break; case HITPART_HEAD: - mpstatsIncrementPlayerShotCount(&weapon->gset, SHOTREGION_HEAD); + mpstats_increment_player_shot_count(&weapon->gset, SHOTREGION_HEAD); break; case HITPART_GUN: - mpstatsIncrementPlayerShotCount(&weapon->gset, SHOTREGION_GUN); + mpstats_increment_player_shot_count(&weapon->gset, SHOTREGION_GUN); break; case HITPART_HAT: - mpstatsIncrementPlayerShotCount(&weapon->gset, SHOTREGION_HAT); + mpstats_increment_player_shot_count(&weapon->gset, SHOTREGION_HAT); break; case HITPART_PELVIS: case HITPART_TORSO: - mpstatsIncrementPlayerShotCount(&weapon->gset, SHOTREGION_BODY); + mpstats_increment_player_shot_count(&weapon->gset, SHOTREGION_BODY); break; default: - mpstatsIncrementPlayerShotCount(&weapon->gset, SHOTREGION_LIMB); + mpstats_increment_player_shot_count(&weapon->gset, SHOTREGION_LIMB); break; } } } } - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); } if (hitprop == NULL || hitprop->type == PROPTYPE_OBJ || hitprop->type == PROPTYPE_WEAPON || hitprop->type == PROPTYPE_DOOR) { @@ -7137,16 +7137,16 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) guNormalize(&dir.x, &dir.y, &dir.z); - if (chrIsUsingPaintball(ownerprop ? ownerprop->chr : NULL)) { - sparksCreate(prop->rooms[0], prop, &sp5e8, &dir, &sp5f4, SPARKTYPE_PAINT); + if (chr_is_using_paintball(ownerprop ? ownerprop->chr : NULL)) { + sparks_create(prop->rooms[0], prop, &sp5e8, &dir, &sp5f4, SPARKTYPE_PAINT); } else { - sparksCreate(prop->rooms[0], prop, &sp5e8, &dir, &sp5f4, SPARKTYPE_PROJECTILE); + sparks_create(prop->rooms[0], prop, &sp5e8, &dir, &sp5f4, SPARKTYPE_PROJECTILE); } } } } - objLand(prop, &sp5e8, &sp5f4, embedded); + obj_land(prop, &sp5e8, &sp5f4, embedded); } } @@ -7160,8 +7160,8 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) prop->pos.y = sp5dc.y; prop->pos.z = sp5dc.z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); } else { RoomNum rooms[8]; @@ -7180,8 +7180,8 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) prop->pos.y = sp5dc.y; prop->pos.z = sp5dc.z; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); } } } @@ -7189,22 +7189,22 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if (!handled) { u16 geoflags; - sp37c = objGetRotatedLocalYMinByMtx3(objFindBboxRodata(obj), obj->realrot); + sp37c = obj_get_rotated_local_y_min_by_mtx3(obj_find_bbox_rodata(obj), obj->realrot); sp5ac.x = prop->pos.x; sp5ac.y = prop->pos.y + sp37c; sp5ac.z = prop->pos.z; - roomnum = cdFindCeilingRoomYColourFlagsNormalAtPos(&sp5ac, prop->rooms, &sp390, &obj->floorcol, &geoflags, &sp380); + roomnum = cd_find_ceiling_room_y_colour_flags_normal_at_pos(&sp5ac, prop->rooms, &sp390, &obj->floorcol, &geoflags, &sp380); #if VERSION >= VERSION_NTSC_1_0 if (roomnum > 0 && prop->pos.y + sp37c < sp390 - && !cdTestLos03(&sp5c8, sp5b8, &sp5ac, CDTYPE_OBJS | CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2)) + && !cd_test_los03(&sp5c8, sp5b8, &sp5ac, CDTYPE_OBJS | CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2)) #else if (roomnum > 0 && prop->pos.y + sp37c < sp390 - && !cdTestLos03(&sp5c8, sp5b8, &sp5ac, CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2)) + && !cd_test_los03(&sp5c8, sp5b8, &sp5ac, CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2)) #endif { sp354 = true; @@ -7224,14 +7224,14 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) obj->hidden |= OBJHFLAG_DELETING; } } else { - roomnum = cdFindFloorRoomYColourNormalPropAtPos(&prop->pos, prop->rooms, &sp390, &obj->floorcol, &sp380, NULL); + roomnum = cd_find_floor_room_y_colour_normal_prop_at_pos(&prop->pos, prop->rooms, &sp390, &obj->floorcol, &sp380, NULL); #if VERSION >= VERSION_NTSC_1_0 if (roomnum <= 0 && (projectile->flags & PROJECTILEFLAG_STICKY) == 0) { if ((projectile->flags & PROJECTILEFLAG_00010000) == 0) { projectile->flags |= PROJECTILEFLAG_00010000; - if (cdFindFloorRoomAtPos(&sp5c8, sp5b8) > 0) { + if (cd_find_floor_room_at_pos(&sp5c8, sp5b8) > 0) { projectile->flags |= PROJECTILEFLAG_INROOM; } } @@ -7241,10 +7241,10 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) prop->pos.y = sp5c8.y; prop->pos.z = sp5c8.z; - propDeregisterRooms(prop); - roomsCopy(sp5b8, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(sp5b8, prop->rooms); - roomnum = cdFindFloorRoomYColourFlagsAtPos(&prop->pos, prop->rooms, &sp390, &obj->floorcol, NULL); + roomnum = cd_find_floor_room_y_colour_flags_at_pos(&prop->pos, prop->rooms, &sp390, &obj->floorcol, NULL); projectile->speed.x = 0.0f; projectile->speed.z = 0.0f; @@ -7288,7 +7288,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) struct weaponobj *weapon = (struct weaponobj *) obj; if (weapon->weaponnum == WEAPON_GRENADE && weapon->gunfunc == FUNC_SECONDARY) { - smokeCreateAtProp(prop, SMOKETYPE_PINBALL); + smoke_create_at_prop(prop, SMOKETYPE_PINBALL); } } } @@ -7303,7 +7303,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if ((projectile->flags & PROJECTILEFLAG_00000100) == 0 && (projectile->bounceframe < 0 || projectile->bounceframe < g_Vars.lvframe60 - TICKS(60))) { - mtxLoadRandomRotation(&projectile->mtx); + mtx_load_random_rotation(&projectile->mtx); } projectile->bouncecount++; @@ -7316,7 +7316,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) if (sp350) { if ((projectile->flags & PROJECTILEFLAG_STICKY) == 0 && projectile->bouncecount >= 6) { if (sp354) { - projectileFall(obj, realrot); + projectile_fall(obj, realrot); } } else if (projectile->unk08c > 0.0f) { if (projectile->speed.y >= 0.0f && projectile->speed.y < 2.2222223f) { @@ -7324,13 +7324,13 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) projectile->speed.y = 2.2222223f; } else { if (sp354) { - projectileFall(obj, realrot); + projectile_fall(obj, realrot); } } } } else { if (sp354) { - projectileFall(obj, realrot); + projectile_fall(obj, realrot); } } } @@ -7340,7 +7340,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) struct weaponobj *weapon = (struct weaponobj *) obj; if (weapon->weaponnum == WEAPON_COMBATKNIFE && weapon->gunfunc == FUNC_SECONDARY) { - knifePlayWooshSound(obj); + knife_play_woosh_sound(obj); } else if (weapon->weaponnum == WEAPON_ROCKET) { if (cdresult == CDRESULT_COLLISION) { weapon->timer240 = 0; @@ -7371,14 +7371,14 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) smokepos.y = prop->pos.y - smokepos.y * 20.0f; smokepos.z = prop->pos.z - smokepos.z * 20.0f; - smokeCreateSimple(&smokepos, prop->rooms, SMOKETYPE_ROCKETTAIL); + smoke_create_simple(&smokepos, prop->rooms, SMOKETYPE_ROCKETTAIL); } } } else if (weapon->weaponnum == WEAPON_HOMINGROCKET) { if (cdresult == CDRESULT_COLLISION) { weapon->timer240 = 0; } else { - smokeCreateSimple(&prop->pos, prop->rooms, SMOKETYPE_HOMINGTAIL); + smoke_create_simple(&prop->pos, prop->rooms, SMOKETYPE_HOMINGTAIL); } } else if (weapon->weaponnum == WEAPON_GRENADEROUND || (weapon->weaponnum == WEAPON_NBOMB && weapon->gunfunc == FUNC_PRIMARY)) { @@ -7394,21 +7394,21 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) weapon->timer240 = 0; } } else if (weapon->weaponnum != WEAPON_NBOMB) { - smokeCreateSimple(&prop->pos, prop->rooms, SMOKETYPE_GRENADETAIL); + smoke_create_simple(&prop->pos, prop->rooms, SMOKETYPE_GRENADETAIL); } } if (cdresult == CDRESULT_COLLISION) { if (projectile->unk0a4 < g_Vars.lvframenum - 2) { if (weapon->weaponnum == WEAPON_COMBATKNIFE || weapon->weaponnum == WEAPON_COMBATKNIFE) { - psCreate(0, prop, SFX_808B, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(0, prop, SFX_808B, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } else if (weapon->weaponnum == WEAPON_GRENADE && weapon->gunfunc == FUNC_SECONDARY) { u16 sp100[] = {SFX_0027, SFX_0028, SFX_0029, SFX_002A}; - psCreate(0, prop, sp100[random() % 4], -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); - psCreate(0, prop, SFX_EYESPYHIT, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(0, prop, sp100[random() % 4], -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(0, prop, SFX_EYESPYHIT, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } else { - psCreate(0, prop, SFX_EYESPYHIT, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(0, prop, SFX_EYESPYHIT, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } } @@ -7437,12 +7437,12 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) projectile->unk060 = 1.0f; } - quaternionSlerp(projectile->unk068, projectile->unk078, projectile->unk060, quaternion); - quaternionToMtx(quaternion, &spac); + quaternion_slerp(projectile->unk068, projectile->unk078, projectile->unk060, quaternion); + quaternion_to_mtx(quaternion, &spac); mtx00015e24(projectile->unk0b8[0], &spac); mtx00015e80(projectile->unk0b8[1], &spac); mtx00015edc(projectile->unk0b8[2], &spac); - mtx4ToMtx3(&spac, obj->realrot); + mtx4_to_mtx3(&spac, obj->realrot); stop = false; } @@ -7451,7 +7451,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) f32 spa4; RoomNum roomnum; s32 i; - f32 sp98 = objGetRotatedLocalYMinByMtx3(objFindBboxRodata(obj), obj->realrot); + f32 sp98 = obj_get_rotated_local_y_min_by_mtx3(obj_find_bbox_rodata(obj), obj->realrot); #if VERSION >= VERSION_NTSC_1_0 u16 geoflags; #endif @@ -7491,7 +7491,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) sp5c8.y = prop->pos.y; sp5c8.z = prop->pos.z; - roomsCopy(prop->rooms, sp5b8); + rooms_copy(prop->rooms, sp5b8); func0f06d37c(obj, &sp5dc, &sp5e8, &sp5f4); result = true; @@ -7501,16 +7501,16 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) sp5ac.z = prop->pos.z; #if VERSION >= VERSION_NTSC_1_0 - roomnum = cdFindCeilingRoomYColourFlagsAtPos(&sp5ac, prop->rooms, &spa4, &obj->floorcol, &geoflags); + roomnum = cd_find_ceiling_room_y_colour_flags_at_pos(&sp5ac, prop->rooms, &spa4, &obj->floorcol, &geoflags); - if (roomnum <= 0 || cdTestLos03(&sp5c8, sp5b8, &sp5ac, CDTYPE_OBJS | CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2)) { - roomnum = cdFindFloorRoomYColourFlagsAtPos(&prop->pos, prop->rooms, &spa4, &obj->floorcol, &geoflags); + if (roomnum <= 0 || cd_test_los03(&sp5c8, sp5b8, &sp5ac, CDTYPE_OBJS | CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2)) { + roomnum = cd_find_floor_room_y_colour_flags_at_pos(&prop->pos, prop->rooms, &spa4, &obj->floorcol, &geoflags); } #else - roomnum = cdFindCeilingRoomYColourFlagsAtPos(&sp5ac, prop->rooms, &spa4, &obj->floorcol); + roomnum = cd_find_ceiling_room_y_colour_flags_at_pos(&sp5ac, prop->rooms, &spa4, &obj->floorcol); - if (roomnum <= 0 || cdTestLos03(&sp5c8, sp5b8, &sp5ac, CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2)) { - roomnum = cdFindFloorRoomYColourFlagsAtPos(&prop->pos, prop->rooms, &spa4, &obj->floorcol); + if (roomnum <= 0 || cd_test_los03(&sp5c8, sp5b8, &sp5ac, CDTYPE_BG, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2)) { + roomnum = cd_find_floor_room_y_colour_flags_at_pos(&prop->pos, prop->rooms, &spa4, &obj->floorcol); } #endif @@ -7518,13 +7518,13 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) prop->pos.x = sp5c8.x; prop->pos.z = sp5c8.z; - propDeregisterRooms(prop); - roomsCopy(sp5b8, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(sp5b8, prop->rooms); #if VERSION >= VERSION_NTSC_1_0 - roomnum = cdFindFloorRoomYColourFlagsAtPos(&prop->pos, prop->rooms, &spa4, &obj->floorcol, &geoflags); + roomnum = cd_find_floor_room_y_colour_flags_at_pos(&prop->pos, prop->rooms, &spa4, &obj->floorcol, &geoflags); #else - roomnum = cdFindFloorRoomYColourFlagsAtPos(&prop->pos, prop->rooms, &spa4, &obj->floorcol); + roomnum = cd_find_floor_room_y_colour_flags_at_pos(&prop->pos, prop->rooms, &spa4, &obj->floorcol); #endif projectile->speed.x = 0.0f; @@ -7551,11 +7551,11 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) } if (stop) { - objFreeProjectile(obj); + obj_free_projectile(obj); if (obj->type == OBJTYPE_WEAPON) { struct weaponobj *weapon = (struct weaponobj *) obj; - objectiveCheckThrowInRoom(weapon->weaponnum, prop->rooms); + objective_check_throw_in_room(weapon->weaponnum, prop->rooms); } } @@ -7569,7 +7569,7 @@ s32 projectileTick(struct defaultobj *obj, bool *embedded) return result; } -void doorTick(struct prop *doorprop) +void door_tick(struct prop *doorprop) { struct doorobj *door = (struct doorobj *)doorprop->obj; struct model *model = door->base.model; @@ -7579,7 +7579,7 @@ void doorTick(struct prop *doorprop) #if VERSION < VERSION_PAL_BETA static u32 debugdoor = 0; - mainOverrideVariable("debugdoor", &debugdoor); + main_override_variable("debugdoor", &debugdoor); // If debugdoor is set to 1 or to the address of this door, // print the distance to the door to console @@ -7611,14 +7611,14 @@ void doorTick(struct prop *doorprop) if (!pass) { // Not automatic - doorsRequestMode(door, DOORMODE_CLOSING); + doors_request_mode(door, DOORMODE_CLOSING); } else if (door->doorflags & DOORFLAG_AUTOMATIC) { // Check if any sibling has anything in range - pass = !doorIsRangeEmpty(door); + pass = !door_is_range_empty(door); loopdoor = door->sibling; while (loopdoor && loopdoor != door && !pass) { - pass = !doorIsRangeEmpty(loopdoor); + pass = !door_is_range_empty(loopdoor); loopdoor = loopdoor->sibling; } @@ -7632,7 +7632,7 @@ void doorTick(struct prop *doorprop) loopdoor = loopdoor->sibling; } } else { - doorsRequestMode(door, DOORMODE_CLOSING); + doors_request_mode(door, DOORMODE_CLOSING); } } } @@ -7651,18 +7651,18 @@ void doorTick(struct prop *doorprop) } if (shouldopen) { - doorSetMode(door, DOORMODE_OPENING); + door_set_mode(door, DOORMODE_OPENING); } } // Open fall-away doors if padlock free (GE only) - if (door->doortype == DOORTYPE_FALLAWAY && doorIsClosed(door) && doorIsPadlockFree(door)) { - doorsActivate(doorprop, false); + if (door->doortype == DOORTYPE_FALLAWAY && door_is_closed(door) && door_is_padlock_free(door)) { + doors_activate(doorprop, false); } // Update frac if (door->lastcalc60 < g_Vars.lvframe60 || g_Vars.lvupdate240 == 0) { - doorsCalcFrac(door); + doors_calc_frac(door); } // Consider playing a sound effect @@ -7672,13 +7672,13 @@ void doorTick(struct prop *doorprop) if (door->frac > soundpoint) { if (prevfrac <= soundpoint) { // frac increased past the soundpoint - psCreate(NULL, doorprop, SFX_DOOR_8014, -1, + ps_create(NULL, doorprop, SFX_DOOR_8014, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); } } else { if (prevfrac > soundpoint) { // frac decreased past the soundpoint - psCreate(NULL, doorprop, SFX_DOOR_8015, -1, + ps_create(NULL, doorprop, SFX_DOOR_8015, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); } } @@ -7707,7 +7707,7 @@ struct escastepkeyframe g_EscaStepKeyframesZ[] = { const char var7f1a9fe8[] = "************** RWI : Door Stuck Mate -> Sort it out\n"; -void doorUpdatePortalIfWindowed(struct prop *doorprop, s32 playercount) +void door_update_portal_if_windowed(struct prop *doorprop, s32 playercount) { struct doorobj *doorobj = doorprop->door; struct modelnode *node; @@ -7716,15 +7716,15 @@ void doorUpdatePortalIfWindowed(struct prop *doorprop, s32 playercount) union modelrwdata *rwdata; if (doorobj->doorflags & DOORFLAG_WINDOWED) { - doorobj->fadealpha = glassCalculateOpacity(&doorprop->pos, doorobj->xludist, doorobj->opadist, 0); + doorobj->fadealpha = glass_calculate_opacity(&doorprop->pos, doorobj->xludist, doorobj->opadist, 0); if (doorobj->fadealpha != 255 || doorobj->frac > 0) { canhide = false; } if (model->definition->skel == &g_SkelWindowedDoor) { - node = modelGetPart(model->definition, MODELPART_WINDOWEDDOOR_0001); - rwdata = modelGetNodeRwData(model, node); + node = model_get_part(model->definition, MODELPART_WINDOWEDDOOR_0001); + rwdata = model_get_node_rw_data(model, node); if (!rwdata->toggle.visible) { canhide = false; @@ -7736,37 +7736,37 @@ void doorUpdatePortalIfWindowed(struct prop *doorprop, s32 playercount) } if (canhide) { - doorDeactivatePortal(doorobj); + door_deactivate_portal(doorobj); } else { - doorActivatePortal(doorobj); + door_activate_portal(doorobj); } } } #define MTX(i) ((Mtxf *)((uintptr_t)matrices + i * sizeof(Mtxf))) -void doorInitMatrices(struct prop *prop) +void door_init_matrices(struct prop *prop) { struct doorobj *door = prop->door; struct model *model = door->base.model; Mtxf *matrices = model->matrices; func0f08c424(door, matrices); - mtx00015be0(camGetWorldToScreenMtxf(), matrices); + mtx00015be0(cam_get_world_to_screen_mtxf(), matrices); if (model->definition->skel == &g_Skel11) { union modelrodata *rodata; f32 xrot = M_BADTAU - door->frac * 0.017450513318181f; - rodata = modelGetPartRodata(model->definition, MODELPART_0001); - mtx4LoadXRotation(xrot, MTX(1)); - mtx4SetTranslation(&rodata->position.pos, MTX(1)); - mtx4MultMtx4InPlace(MTX(0), MTX(1)); + rodata = model_get_part_rodata(model->definition, MODELPART_0001); + mtx4_load_x_rotation(xrot, MTX(1)); + mtx4_set_translation(&rodata->position.pos, MTX(1)); + mtx4_mult_mtx4_in_place(MTX(0), MTX(1)); - rodata = modelGetPartRodata(model->definition, MODELPART_0002); - mtx4LoadXRotation(M_BADTAU - xrot, MTX(2)); - mtx4SetTranslation(&rodata->position.pos, MTX(2)); - mtx4MultMtx4InPlace(MTX(0), MTX(2)); + rodata = model_get_part_rodata(model->definition, MODELPART_0002); + mtx4_load_x_rotation(M_BADTAU - xrot, MTX(2)); + mtx4_set_translation(&rodata->position.pos, MTX(2)); + mtx4_mult_mtx4_in_place(MTX(0), MTX(2)); } else if (model->definition->skel == &g_Skel13) { union modelrodata *rodata; f32 zrot1 = 0; @@ -7782,20 +7782,20 @@ void doorInitMatrices(struct prop *prop) s32 index1 = (i << 1) + 1; s32 index2 = (i << 1) + 2; - rodata = modelGetPartRodata(model->definition, index1); - mtx4LoadZRotation(zrot1, MTX(index1)); - mtx4SetTranslation(&rodata->position.pos, MTX(index1)); - mtx4MultMtx4InPlace(MTX(0), MTX(index1)); + rodata = model_get_part_rodata(model->definition, index1); + mtx4_load_z_rotation(zrot1, MTX(index1)); + mtx4_set_translation(&rodata->position.pos, MTX(index1)); + mtx4_mult_mtx4_in_place(MTX(0), MTX(index1)); - rodata = modelGetPartRodata(model->definition, index2); - mtx4LoadZRotation(zrot2, MTX(index2)); - mtx4SetTranslation(&rodata->position.pos, MTX(index2)); - mtx4MultMtx4InPlace(MTX(index1), MTX(index2)); + rodata = model_get_part_rodata(model->definition, index2); + mtx4_load_z_rotation(zrot2, MTX(index2)); + mtx4_set_translation(&rodata->position.pos, MTX(index2)); + mtx4_mult_mtx4_in_place(MTX(index1), MTX(index2)); } } } -void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *prevpos, struct coord *newpos) +void platform_displace_props(struct prop *platform, s16 *propnums, struct coord *prevpos, struct coord *newpos) { struct prop *prop; s16 *propnumptr = propnums; @@ -7827,7 +7827,7 @@ void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *p prop->pos.y += newpos->y - prevpos->y; prop->pos.z += newpos->z - prevpos->z; - propDeregisterRooms(prop); + prop_deregister_rooms(prop); func0f065e74(&platform->pos, platform->rooms, &prop->pos, prop->rooms); func0f069c70(obj, true, true); @@ -7846,23 +7846,23 @@ void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *p prop->pos.y += newpos->y - prevpos->y; prop->pos.z += newpos->z - prevpos->z; - propDeregisterRooms(prop); + prop_deregister_rooms(prop); func0f065e74(&platform->pos, platform->rooms, &prop->pos, prop->rooms); chr0f0220ac(chr); - modelSetRootPosition(chr->model, &prop->pos); + model_set_root_position(chr->model, &prop->pos); nodetype = chr->model->definition->rootnode->type; if ((nodetype & 0xff) == MODELNODETYPE_CHRINFO) { - struct modelrwdata_chrinfo *rwdata = modelGetNodeRwData(chr->model, chr->model->definition->rootnode); + struct modelrwdata_chrinfo *rwdata = model_get_node_rw_data(chr->model, chr->model->definition->rootnode); rwdata->ground += newpos->y - prevpos->y; } } } else if (prop->type == PROPTYPE_PLAYER) { struct defaultobj *platformobj = platform->obj; struct coord sp8c; - s32 playernum = playermgrGetPlayerNumByProp(prop); + s32 playernum = playermgr_get_player_num_by_prop(prop); s32 prevplayernum; if (platformobj->type == OBJTYPE_LIFT) { @@ -7878,11 +7878,11 @@ void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *p prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); bwalk0f0c63bc(&sp8c, 1, CDTYPE_BG); - playerUpdatePerimInfo(); - bmoveUpdateRooms(g_Vars.players[playernum]); - setCurrentPlayerNum(prevplayernum); + player_update_perim_info(); + bmove_update_rooms(g_Vars.players[playernum]); + set_current_player_num(prevplayernum); } if (g_Vars.players[playernum]->inlift && !g_Vars.players[playernum]->onladder && !g_Vars.players[playernum]->isfalling) { @@ -7895,7 +7895,7 @@ void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *p prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); g_Vars.players[playernum]->vv_ground += ydist; @@ -7910,19 +7910,19 @@ void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *p prop->pos.y = sp78.y; prop->pos.z = sp78.z; - propDeregisterRooms(prop); - roomsCopy(sp68, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(sp68, prop->rooms); g_Vars.players[playernum]->vv_manground += ydist; g_Vars.players[playernum]->sumground = g_Vars.players[playernum]->vv_manground / (PAL ? 0.054400026798248f : 0.045499980449677f); - } else if (bwalkTryMoveUpwards(ydist) == CDRESULT_NOCOLLISION) { + } else if (bwalk_try_move_upwards(ydist) == CDRESULT_NOCOLLISION) { g_Vars.players[playernum]->vv_manground += ydist; g_Vars.players[playernum]->sumground = g_Vars.players[playernum]->vv_manground / (PAL ? 0.054400026798248f : 0.045499980449677f); } - playerUpdatePerimInfo(); - bmoveUpdateRooms(g_Vars.players[playernum]); - setCurrentPlayerNum(prevplayernum); + player_update_perim_info(); + bmove_update_rooms(g_Vars.players[playernum]); + set_current_player_num(prevplayernum); if (g_Vars.players[playernum]->walkinitmove) { g_Vars.players[playernum]->walkinitstart.y += ydist; @@ -7944,7 +7944,7 @@ void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *p sp8c.y = 0.0f; sp8c.z = newpos->z - prevpos->z; - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); bwalk0f0c63bc(&sp8c, 1, CDTYPE_BG); prop->pos.y += newpos->y - prevpos->y; @@ -7953,9 +7953,9 @@ void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *p g_Vars.players[playernum]->vv_manground += newpos->y - prevpos->y; g_Vars.players[playernum]->sumground = g_Vars.players[playernum]->vv_manground / (PAL ? 0.054400026798248f : 0.045499980449677f); - playerUpdatePerimInfo(); - bmoveUpdateRooms(g_Vars.players[playernum]); - setCurrentPlayerNum(prevplayernum); + player_update_perim_info(); + bmove_update_rooms(g_Vars.players[playernum]); + set_current_player_num(prevplayernum); } #endif } @@ -7965,7 +7965,7 @@ void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *p } } -void liftTick(struct prop *prop) +void lift_tick(struct prop *prop) { struct liftobj *lift = (struct liftobj *)prop->obj; struct defaultobj *obj = prop->obj; @@ -7999,8 +7999,8 @@ void liftTick(struct prop *prop) if (obj->flags & OBJFLAG_DEACTIVATED) { move = false; - } else if (lift->doors[lift->levelcur] && !doorIsClosed(lift->doors[lift->levelcur])) { - doorsRequestMode(lift->doors[lift->levelcur], DOORMODE_CLOSING); + } else if (lift->doors[lift->levelcur] && !door_is_closed(lift->doors[lift->levelcur])) { + doors_request_mode(lift->doors[lift->levelcur], DOORMODE_CLOSING); move = false; } @@ -8009,10 +8009,10 @@ void liftTick(struct prop *prop) prevpos.y = prop->pos.y; prevpos.z = prop->pos.z; - cdGetPropsOnPlatform(prop, propnums, ARRAYCOUNT(propnums)); + cd_get_props_on_platform(prop, propnums, ARRAYCOUNT(propnums)); if (lift->dist == 0 && lift->speed == 0) { - doorPlayOpeningSound(lift->soundtype, lift->base.prop); + door_play_opening_sound(lift->soundtype, lift->base.prop); if (obj->flags & OBJFLAG_LIFT_TRIGGERDISABLE) { obj->flags &= ~OBJFLAG_LIFT_TRIGGERDISABLE; @@ -8020,9 +8020,9 @@ void liftTick(struct prop *prop) } } - padGetCentre(lift->pads[lift->levelcur], &curcentre); - padUnpack(lift->pads[lift->levelcur], PADFIELD_POS, &padcur); - padUnpack(lift->pads[lift->levelaim], PADFIELD_POS, &padaim); + pad_get_centre(lift->pads[lift->levelcur], &curcentre); + pad_unpack(lift->pads[lift->levelcur], PADFIELD_POS, &padcur); + pad_unpack(lift->pads[lift->levelaim], PADFIELD_POS, &padaim); xdiff = padaim.pos.f[0] - padcur.pos.f[0]; ydiff = padaim.pos.f[1] - padcur.pos.f[1]; @@ -8034,7 +8034,7 @@ void liftTick(struct prop *prop) prevdist = lift->dist; #endif - applySpeed(&lift->dist, segdist, &lift->speed, lift->accel, lift->accel, lift->maxspeed); + apply_speed(&lift->dist, segdist, &lift->speed, lift->accel, lift->accel, lift->maxspeed); // If arriving at the destination, set the distance explicitly if (lift->speed < 1 && lift->speed > -1) { @@ -8064,7 +8064,7 @@ void liftTick(struct prop *prop) lift->speed = 0; lift->levelcur = lift->levelaim; - doorPlayOpenedSound(lift->soundtype, lift->base.prop); + door_play_opened_sound(lift->soundtype, lift->base.prop); if (obj->flags & OBJFLAG_LIFT_TRIGGERDISABLE) { obj->flags &= ~OBJFLAG_LIFT_TRIGGERDISABLE; @@ -8074,7 +8074,7 @@ void liftTick(struct prop *prop) door = lift->doors[lift->levelcur]; if (door && door->keyflags == 0) { - doorsRequestMode(door, DOORMODE_OPENING); + doors_request_mode(door, DOORMODE_OPENING); } } @@ -8084,17 +8084,17 @@ void liftTick(struct prop *prop) prop->pos.y = newpos.y; prop->pos.z = newpos.z; - propDeregisterRooms(prop); - roomsCopy(newrooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(newrooms, prop->rooms); func0f069c70(obj, true, true); - liftUpdateTiles(lift, lift->levelcur == lift->levelaim); - platformDisplaceProps(prop, propnums, &prevpos, &prop->pos); + lift_update_tiles(lift, lift->levelcur == lift->levelaim); + platform_displace_props(prop, propnums, &prevpos, &prop->pos); } } else { // Lift is at the aim stop door = lift->doors[lift->levelcur]; - if (!door || (doorIsClosed(door) && door->keyflags == 0)) { + if (!door || (door_is_closed(door) && door->keyflags == 0)) { // Find next stop stop = lift->levelaim; @@ -8102,12 +8102,12 @@ void liftTick(struct prop *prop) stop = (stop + 1) % 4; } while (lift->pads[stop] < 0); - liftGoToStop(lift, stop); + lift_go_to_stop(lift, stop); } } } -void escastepTick(struct prop *prop) +void escastep_tick(struct prop *prop) { struct escalatorobj *step = (struct escalatorobj *)prop->obj; struct defaultobj *obj = prop->obj; @@ -8147,7 +8147,7 @@ void escastepTick(struct prop *prop) oldpos.y = prop->pos.y; oldpos.z = prop->pos.z; - cdGetPropsOnPlatform(prop, propnums, ARRAYCOUNT(propnums)); + cd_get_props_on_platform(prop, propnums, ARRAYCOUNT(propnums)); step->prevpos.x = prop->pos.x; step->prevpos.y = prop->pos.y; @@ -8163,17 +8163,17 @@ void escastepTick(struct prop *prop) prop->pos.z = newpos.z; if ((obj->flags & OBJFLAG_IGNOREFLOORCOLOUR) == 0) { - cdFindFloorYColourTypeAtPos(&prop->pos, prop->rooms, &obj->floorcol, 0); + cd_find_floor_y_colour_type_at_pos(&prop->pos, prop->rooms, &obj->floorcol, 0); } func0f069c70(obj, true, true); if (!resetting) { - platformDisplaceProps(prop, propnums, &oldpos, &prop->pos); + platform_displace_props(prop, propnums, &oldpos, &prop->pos); } } -void cctvTick(struct prop *camprop) +void cctv_tick(struct prop *camprop) { struct cctvobj *camera = (struct cctvobj *)camprop->obj; struct defaultobj *obj = camprop->obj; @@ -8279,15 +8279,15 @@ void cctvTick(struct prop *camprop) // Check line of sight if (canseeplayer) { - playerSetPerimEnabled(playerprop, false); + player_set_perim_enabled(playerprop, false); - if (!cdTestLos05(&camprop->pos, camprop->rooms, &playerprop->pos, playerprop->rooms, + if (!cd_test_los05(&camprop->pos, camprop->rooms, &playerprop->pos, playerprop->rooms, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_CHRS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_AIOPAQUE, GEOFLAG_BLOCK_SIGHT)) { canseeplayer = false; } - playerSetPerimEnabled(playerprop, true); + player_set_perim_enabled(playerprop, true); } if (canseeplayer) { @@ -8299,7 +8299,7 @@ void cctvTick(struct prop *camprop) } if (camera->seebondtime60 >= (s32)(TICKS(300) * g_CctvWaitScale)) { - alarmActivate(); + alarm_activate(); camera->seebondtime60 = 0; } } else { @@ -8366,12 +8366,12 @@ void cctvTick(struct prop *camprop) } } -void cctvInitMatrices(struct prop *prop, Mtxf *mtx) +void cctv_init_matrices(struct prop *prop, Mtxf *mtx) { struct cctvobj *cctv = (struct cctvobj *)prop->obj; struct model *model = cctv->base.model; Mtxf *matrices = model->matrices; - union modelrodata *rodata = modelGetPartRodata(model->definition, MODELPART_CCTV_CASING); + union modelrodata *rodata = model_get_part_rodata(model->definition, MODELPART_CCTV_CASING); struct coord sp64; Mtxf sp24; f32 yrot = cctv->yrot; @@ -8382,19 +8382,19 @@ void cctvInitMatrices(struct prop *prop, Mtxf *mtx) yrot -= M_BADTAU; } - mtx4LoadYRotation(yrot, &sp24); - mtx4MultMtx4(&sp24, &cctv->camrotm, &matrices[1]); + mtx4_load_y_rotation(yrot, &sp24); + mtx4_mult_mtx4(&sp24, &cctv->camrotm, &matrices[1]); sp64.x = rodata->position.pos.x; sp64.y = rodata->position.pos.y; sp64.z = rodata->position.pos.z; - mtx4TransformVecInPlace(mtx, &sp64); - mtx4SetTranslation(&sp64, &matrices[1]); - mtx00015be0(camGetWorldToScreenMtxf(), &matrices[1]); + mtx4_transform_vec_in_place(mtx, &sp64); + mtx4_set_translation(&sp64, &matrices[1]); + mtx00015be0(cam_get_world_to_screen_mtxf(), &matrices[1]); } -void fanTick(struct prop *prop) +void fan_tick(struct prop *prop) { struct defaultobj *obj = (struct defaultobj *)prop->obj; struct fanobj *fan = (struct fanobj *)prop->obj; @@ -8443,7 +8443,7 @@ void fanTick(struct prop *prop) } } -void fanUpdateModel(struct prop *prop) +void fan_update_model(struct prop *prop) { struct fanobj *fan = (struct fanobj *) prop->obj; Mtxf sp6c; @@ -8455,13 +8455,13 @@ void fanUpdateModel(struct prop *prop) angle -= M_BADTAU; } - mtx4LoadYRotation(angle, &sp6c); - mtx4ToMtx3(&sp6c, sp48); + mtx4_load_y_rotation(angle, &sp6c); + mtx4_to_mtx3(&sp6c, sp48); mtx00016140(fan->base.realrot, sp48, sp24); - mtx3Copy(sp24, fan->base.realrot); + mtx3_copy(sp24, fan->base.realrot); } -void autogunTick(struct prop *prop) +void autogun_tick(struct prop *prop) { struct autogunobj *autogun; struct defaultobj *obj; @@ -8510,8 +8510,8 @@ void autogunTick(struct prop *prop) autogun->yzero = RANDOMFRAC() * M_BADTAU; } - applyRotation(&autogun->yrot, autogun->yzero, &autogun->yspeed, PALUPF(0.00001163367596746f), PALUPF(0.00001163367596746f), PALUPF(0.00069802056532353f)); - applyRotation(&autogun->xrot, autogun->xzero, &autogun->xspeed, PALUPF(0.0000058168379837298f), PALUPF(0.0000058168379837298f), PALUPF(0.00034901028266177f)); + apply_rotation(&autogun->yrot, autogun->yzero, &autogun->yspeed, PALUPF(0.00001163367596746f), PALUPF(0.00001163367596746f), PALUPF(0.00069802056532353f)); + apply_rotation(&autogun->xrot, autogun->xzero, &autogun->xspeed, PALUPF(0.0000058168379837298f), PALUPF(0.0000058168379837298f), PALUPF(0.00034901028266177f)); return; } @@ -8527,8 +8527,8 @@ void autogunTick(struct prop *prop) autogun->yzero = RANDOMFRAC() * M_BADTAU; } - applyRotation(&autogun->yrot, autogun->yzero, &autogun->yspeed, PALUPF(0.00001163367596746f), PALUPF(0.00001163367596746f), PALUPF(0.00069802056532353f)); - applyRotation(&autogun->xrot, autogun->xzero, &autogun->xspeed, PALUPF(0.0000058168379837298f), PALUPF(0.0000058168379837298f), PALUPF(0.00034901028266177f)); + apply_rotation(&autogun->yrot, autogun->yzero, &autogun->yspeed, PALUPF(0.00001163367596746f), PALUPF(0.00001163367596746f), PALUPF(0.00069802056532353f)); + apply_rotation(&autogun->xrot, autogun->xzero, &autogun->xspeed, PALUPF(0.0000058168379837298f), PALUPF(0.0000058168379837298f), PALUPF(0.00034901028266177f)); maxspeed = cosf(autogun->yrot); @@ -8576,16 +8576,16 @@ void autogunTick(struct prop *prop) target = autogun->target; } else { // Find new target - if (frIsInTraining()) { + if (fr_is_in_training()) { // Laptop gun in firing range - target = frChooseAutogunTarget(&prop->pos); + target = fr_choose_autogun_target(&prop->pos); if (1); } else if (autogun->targetteam != 0) { // Autogun (solo or MP) configured to attack specific teams if (g_Vars.normmplayerisrunning) { numchrs = g_MpNumChrs; } else { - numchrs = chrsGetNumSlots(); + numchrs = chrs_get_num_slots(); } while (true) { @@ -8634,7 +8634,7 @@ void autogunTick(struct prop *prop) if ((chr->chrflags & CHRCFLAG_HIDDEN) == 0 && (chr->hidden & CHRHFLAG_CLOAKED) == 0 - && !chrIsDead(chr)) { + && !chr_is_dead(chr)) { target = chr->prop; break; } @@ -8658,7 +8658,7 @@ void autogunTick(struct prop *prop) if (target) { if (target->chr == NULL) { target = NULL; - } else if (target->type != PROPTYPE_CHR && target->type != PROPTYPE_PLAYER && !frIsInTraining()) { + } else if (target->type != PROPTYPE_CHR && target->type != PROPTYPE_PLAYER && !fr_is_in_training()) { target = NULL; } } @@ -8686,7 +8686,7 @@ void autogunTick(struct prop *prop) dist = sqrtf(sqdist); } - limitangle = chrGetAimLimitAngle(sqdist); + limitangle = chr_get_aim_limit_angle(sqdist); if (obj->flags && obj->flags); @@ -8736,7 +8736,7 @@ void autogunTick(struct prop *prop) // Decide if target can be tracked if (target->type == PROPTYPE_PLAYER) { if (!g_Vars.bondvisible - || g_Vars.players[playermgrGetPlayerNumByProp(target)]->isdead + || g_Vars.players[playermgr_get_player_num_by_prop(target)]->isdead || (target->chr->chrflags & CHRCFLAG_HIDDEN) || (target->chr->hidden & CHRHFLAG_CLOAKED)) { track = false; @@ -8748,7 +8748,7 @@ void autogunTick(struct prop *prop) || (chr->chrflags & CHRCFLAG_HIDDEN) || (chr->hidden & CHRHFLAG_CLOAKED) || (chr->hidden & CHRHFLAG_ANTINONINTERACTABLE) - || chrIsDead(chr) + || chr_is_dead(chr) || chr->actiontype == ACT_DRUGGEDCOMINGUP || chr->actiontype == ACT_DRUGGEDDROP || chr->actiontype == ACT_DRUGGEDKO) { @@ -8758,7 +8758,7 @@ void autogunTick(struct prop *prop) struct defaultobj *obj = target->obj; if (obj && obj->modelnum == MODEL_TARGET) { - if (!frIsTargetFacingPos(target, &prop->pos)) { + if (!fr_is_target_facing_pos(target, &prop->pos)) { track = false; } } else { @@ -8766,13 +8766,13 @@ void autogunTick(struct prop *prop) } } - propSetPerimEnabled(prop, false); - propSetPerimEnabled(target, false); + prop_set_perim_enabled(prop, false); + prop_set_perim_enabled(target, false); if (relangleh <= autogun->ymaxleft && relangleh >= autogun->ymaxright && track - && cdTestLos05(&prop->pos, prop->rooms, &target->pos, target->rooms, CDTYPE_ALL, GEOFLAG_BLOCK_SIGHT)) { + && cd_test_los05(&prop->pos, prop->rooms, &target->pos, target->rooms, CDTYPE_ALL, GEOFLAG_BLOCK_SIGHT)) { // Target is in sight obj->flags |= OBJFLAG_AUTOGUN_SEENTARGET; insight = true; @@ -8790,8 +8790,8 @@ void autogunTick(struct prop *prop) awake = false; } - propSetPerimEnabled(prop, true); - propSetPerimEnabled(target, true); + prop_set_perim_enabled(prop, true); + prop_set_perim_enabled(target, true); } } } @@ -8835,8 +8835,8 @@ void autogunTick(struct prop *prop) goalyrot -= M_BADTAU; } - applyRotation(&autogun->yrot, goalyrot, &autogun->yspeed, PALUPF(0.00087252567755058f), PALUPF(0.00087252567755058f), autogun->maxspeed); - applyRotation(&autogun->xrot, goalxrot, &autogun->xspeed, PALUPF(0.00087252567755058f), PALUPF(0.00087252567755058f), autogun->maxspeed); + apply_rotation(&autogun->yrot, goalyrot, &autogun->yspeed, PALUPF(0.00087252567755058f), PALUPF(0.00087252567755058f), autogun->maxspeed); + apply_rotation(&autogun->xrot, goalxrot, &autogun->xspeed, PALUPF(0.00087252567755058f), PALUPF(0.00087252567755058f), autogun->maxspeed); f12 = goalyrot - autogun->yrot; @@ -8915,7 +8915,7 @@ void autogunTick(struct prop *prop) } } -void autogunInitMatrices(struct prop *prop, Mtxf *mtx) +void autogun_init_matrices(struct prop *prop, Mtxf *mtx) { struct autogunobj *autogun = (struct autogunobj *)prop->obj; struct model *model = autogun->base.model; @@ -8934,65 +8934,65 @@ void autogunInitMatrices(struct prop *prop, Mtxf *mtx) yrot -= M_BADTAU; } - rodata = modelGetPartRodata(model->definition, MODELPART_AUTOGUN_0001); + rodata = model_get_part_rodata(model->definition, MODELPART_AUTOGUN_0001); sp4c.x = rodata->position.pos.x; sp4c.y = rodata->position.pos.y; sp4c.z = rodata->position.pos.z; - mtx4TransformVecInPlace(mtx, &sp4c); - mtx4LoadYRotation(yrot, &matrices[1]); - mtx4SetTranslation(&sp4c, &matrices[1]); + mtx4_transform_vec_in_place(mtx, &sp4c); + mtx4_load_y_rotation(yrot, &matrices[1]); + mtx4_set_translation(&sp4c, &matrices[1]); mtx00015f04(autogun->base.model->scale, &matrices[1]); - mtx00015be0(camGetWorldToScreenMtxf(), &matrices[1]); + mtx00015be0(cam_get_world_to_screen_mtxf(), &matrices[1]); - node2 = modelGetPart(model->definition, MODELPART_AUTOGUN_0002); + node2 = model_get_part(model->definition, MODELPART_AUTOGUN_0002); rodata = node2->rodata; - mtx4LoadZRotation(xrot, &matrices[2]); - mtx4SetTranslation(&rodata->position.pos, &matrices[2]); + mtx4_load_z_rotation(xrot, &matrices[2]); + mtx4_set_translation(&rodata->position.pos, &matrices[2]); mtx00015be0(&matrices[1], &matrices[2]); - tmp = modelFindNodeMtx(model, node2, 256); + tmp = model_find_node_mtx(model, node2, 256); if (tmp != NULL) { - mtx4LoadZRotation(xrot * 0.5f, tmp); - mtx4SetTranslation(&rodata->position.pos, tmp); + mtx4_load_z_rotation(xrot * 0.5f, tmp); + mtx4_set_translation(&rodata->position.pos, tmp); mtx00015be0(&matrices[1], tmp); } - node3 = modelGetPart(model->definition, MODELPART_AUTOGUN_0003); + node3 = model_get_part(model->definition, MODELPART_AUTOGUN_0003); if (node3 != NULL) { - tmp = modelFindNodeMtx(model, node3, 0); + tmp = model_find_node_mtx(model, node3, 0); rodata = node3->rodata; - mtx4LoadXRotation(autogun->barrelrot, tmp); - mtx4SetTranslation(&rodata->position.pos, tmp); + mtx4_load_x_rotation(autogun->barrelrot, tmp); + mtx4_set_translation(&rodata->position.pos, tmp); mtx00015be0(&matrices[2], tmp); } - node4 = modelGetPart(model->definition, MODELPART_AUTOGUN_0004); + node4 = model_get_part(model->definition, MODELPART_AUTOGUN_0004); if (node4 != NULL) { - tmp = modelFindNodeMtx(model, node4, 0); + tmp = model_find_node_mtx(model, node4, 0); rodata = node4->rodata; - mtx4LoadTranslation(&rodata->position.pos, tmp); + mtx4_load_translation(&rodata->position.pos, tmp); mtx00015be0(&matrices[2], tmp); } - node6 = modelGetPart(model->definition, MODELPART_AUTOGUN_0006); + node6 = model_get_part(model->definition, MODELPART_AUTOGUN_0006); if (node6 != NULL) { - tmp = modelFindNodeMtx(model, node6, 0); + tmp = model_find_node_mtx(model, node6, 0); rodata = node6->rodata; - mtx4LoadXRotation(autogun->barrelrot, tmp); - mtx4SetTranslation(&rodata->position.pos, tmp); + mtx4_load_x_rotation(autogun->barrelrot, tmp); + mtx4_set_translation(&rodata->position.pos, tmp); mtx00015be0(&matrices[2], tmp); } } -void autogunTickShoot(struct prop *autogunprop) +void autogun_tick_shoot(struct prop *autogunprop) { - if (!lvIsPaused()) { + if (!lv_is_paused()) { struct autogunobj *autogun = (struct autogunobj *) autogunprop->obj; struct defaultobj *obj = autogunprop->obj; bool fireleft = false; @@ -9008,7 +9008,7 @@ void autogunTickShoot(struct prop *autogunprop) fireleft = (autogun->firecount % 2) == 0; - if (modelGetPart(model->definition, MODELPART_AUTOGUN_FLASHLEFT)) { + if (model_get_part(model->definition, MODELPART_AUTOGUN_FLASHLEFT)) { fireright = (autogun->firecount % 2) == 1; } @@ -9030,7 +9030,7 @@ void autogunTickShoot(struct prop *autogunprop) if (g_Vars.normmplayerisrunning) { // Multiplayer - it must be a laptop gun - ownerchr = mpGetChrFromPlayerIndex(ownerplayernum); + ownerchr = mp_get_chr_from_player_index(ownerplayernum); if (ownerchr) { ownerprop = ownerchr->prop; @@ -9038,15 +9038,15 @@ void autogunTickShoot(struct prop *autogunprop) } if ((autogun->firecount & 7) - || (flashnode = modelGetPart(model->definition, MODELPART_AUTOGUN_FLASHRIGHT)) == NULL) { - flashnode = modelGetPart(model->definition, MODELPART_AUTOGUN_FLASHLEFT); + || (flashnode = model_get_part(model->definition, MODELPART_AUTOGUN_FLASHRIGHT)) == NULL) { + flashnode = model_get_part(model->definition, MODELPART_AUTOGUN_FLASHLEFT); } if (flashnode == NULL) { - posnode = modelGetPart(model->definition, MODELPART_AUTOGUN_0003); + posnode = model_get_part(model->definition, MODELPART_AUTOGUN_0003); } - propSetPerimEnabled(autogunprop, false); + prop_set_perim_enabled(autogunprop, false); if ((autogunprop->flags & PROPFLAG_ONTHISSCREENTHISTICK) && (flashnode || posnode)) { Mtxf *sp108; @@ -9054,36 +9054,36 @@ void autogunTickShoot(struct prop *autogunprop) union modelrodata *rodata; if (flashnode) { - sp108 = modelFindNodeMtx(model, flashnode, 0); + sp108 = model_find_node_mtx(model, flashnode, 0); rodata = flashnode->rodata; gunpos.x = rodata->chrgunfire.pos.x; gunpos.y = rodata->chrgunfire.pos.y; gunpos.z = rodata->chrgunfire.pos.z; } else { - sp108 = modelFindNodeMtx(model, posnode, 0); + sp108 = model_find_node_mtx(model, posnode, 0); gunpos.x = 0.0f; gunpos.y = 0.0f; gunpos.z = 0.0f; } - mtx00015be4(camGetProjectionMtxF(), sp108, &spc8); - mtx4TransformVecInPlace(&spc8, &gunpos); + mtx00015be4(cam_get_projection_mtxf(), sp108, &spc8); + mtx4_transform_vec_in_place(&spc8, &gunpos); - if (cdTestLos10(&autogunprop->pos, autogunprop->rooms, &gunpos, gunrooms, CDTYPE_BG, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { + if (cd_test_los10(&autogunprop->pos, autogunprop->rooms, &gunpos, gunrooms, CDTYPE_BG, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { gunpos.x = autogunprop->pos.x; gunpos.y = autogunprop->pos.y; gunpos.z = autogunprop->pos.z; - roomsCopy(autogunprop->rooms, gunrooms); + rooms_copy(autogunprop->rooms, gunrooms); } } else { gunpos.x = autogunprop->pos.x; gunpos.y = autogunprop->pos.y; gunpos.z = autogunprop->pos.z; - roomsCopy(autogunprop->rooms, gunrooms); + rooms_copy(autogunprop->rooms, gunrooms); } dir.x = cosf(autogun->xrot) * sinf(autogun->yrot); @@ -9099,18 +9099,18 @@ void autogunTickShoot(struct prop *autogunprop) if (g_Vars.normmplayerisrunning || (targetprop && (targetprop->type == PROPTYPE_CHR)) || (g_Vars.antiplayernum >= 0 && targetprop && targetprop == g_Vars.anti->prop)) { - if (cdExamLos08(&gunpos, gunrooms, &hitpos, CDTYPE_ALL, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { + if (cd_exam_los08(&gunpos, gunrooms, &hitpos, CDTYPE_ALL, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { #if VERSION >= VERSION_PAL_FINAL - cdGetPos(&hitpos, 11480, "prop/propobj.c"); + cd_get_pos(&hitpos, 11480, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetPos(&hitpos, 11480, "propobj.c"); + cd_get_pos(&hitpos, 11480, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&hitpos, 11458, "propobj.c"); + cd_get_pos(&hitpos, 11458, "propobj.c"); #else - cdGetPos(&hitpos, 11296, "propobj.c"); + cd_get_pos(&hitpos, 11296, "propobj.c"); #endif - hitprop = cdGetObstacleProp(); + hitprop = cd_get_obstacle_prop(); // SP: If the hit prop is a chr and it's our target // MP: If the hit prop is a chr @@ -9121,14 +9121,14 @@ void autogunTickShoot(struct prop *autogunprop) struct model *hitmodel = NULL; s32 hitside = -1; s32 hitpart = HITPART_GENERAL; - f32 damage = gsetGetDamage(&gset); + f32 damage = gset_get_damage(&gset); struct chrdata *hitchr = hitprop->chr; if (g_Vars.normmplayerisrunning) { damage *= 0.5f; } - if (ownerprop == hitprop || (ownerchr && chrCompareTeams(hitprop->chr, ownerchr, COMPARE_FRIENDS))) { + if (ownerprop == hitprop || (ownerchr && chr_compare_teams(hitprop->chr, ownerchr, COMPARE_FRIENDS))) { // A teammate entered the line of fire makebeam = false; fireleft = false; @@ -9137,13 +9137,13 @@ void autogunTickShoot(struct prop *autogunprop) } if (fireleft || fireright) { - bgunPlayPropHitSound(&gset, hitprop, -1); + bgun_play_prop_hit_sound(&gset, hitprop, -1); - if (hitchr->model && chrGetShield(hitchr) > 0.0f) { - chrCalculateShieldHit(hitchr, &hitpos, &dir, &hitnode, &hitpart, &hitmodel, &hitside); + if (hitchr->model && chr_get_shield(hitchr) > 0.0f) { + chr_calculate_shield_hit(hitchr, &hitpos, &dir, &hitnode, &hitpart, &hitmodel, &hitside); } - chrEmitSparks(hitchr, hitprop, hitpart, &hitpos, &dir, ownerchr); + chr_emit_sparks(hitchr, hitprop, hitpart, &hitpos, &dir, ownerchr); func0f0341dc(hitchr, damage, &dir, &gset, ownerprop, HITPART_GENERAL, hitprop, hitnode, hitmodel, hitside, NULL); } } else { @@ -9154,20 +9154,20 @@ void autogunTickShoot(struct prop *autogunprop) // Laptop in firing range struct prop *hitprop = NULL; - if (cdExamLos08(&gunpos, gunrooms, &hitpos, + if (cd_exam_los08(&gunpos, gunrooms, &hitpos, CDTYPE_ALL & ~CDTYPE_PLAYERS, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { #if VERSION >= VERSION_PAL_FINAL - cdGetPos(&hitpos, 11535, "prop/propobj.c"); + cd_get_pos(&hitpos, 11535, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetPos(&hitpos, 11535, "propobj.c"); + cd_get_pos(&hitpos, 11535, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&hitpos, 11513, "propobj.c"); + cd_get_pos(&hitpos, 11513, "propobj.c"); #else - cdGetPos(&hitpos, 11351, "propobj.c"); + cd_get_pos(&hitpos, 11351, "propobj.c"); #endif - hitprop = cdGetObstacleProp(); + hitprop = cd_get_obstacle_prop(); missed = true; } @@ -9179,30 +9179,30 @@ void autogunTickShoot(struct prop *autogunprop) missed = false; - frCalculateHit(hitobj, &hitpos, 0); + fr_calculate_hit(hitobj, &hitpos, 0); - if (chrIsUsingPaintball(ownerchr)) { - sparksCreate(hitprop->rooms[0], hitprop, &hitpos, 0, 0, SPARKTYPE_PAINT); + if (chr_is_using_paintball(ownerchr)) { + sparks_create(hitprop->rooms[0], hitprop, &hitpos, 0, 0, SPARKTYPE_PAINT); } else { - sparksCreate(hitprop->rooms[0], hitprop, &hitpos, 0, 0, SPARKTYPE_DEFAULT); + sparks_create(hitprop->rooms[0], hitprop, &hitpos, 0, 0, SPARKTYPE_DEFAULT); } - bgunPlayPropHitSound(&gset, hitprop, TEXTURE_00F2); + bgun_play_prop_hit_sound(&gset, hitprop, TEXTURE_00F2); } } } else { // Enemy autogun in solo - if (cdExamLos08(&gunpos, gunrooms, &hitpos, + if (cd_exam_los08(&gunpos, gunrooms, &hitpos, CDTYPE_DOORS | CDTYPE_BG, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { #if VERSION >= VERSION_PAL_FINAL - cdGetPos(&hitpos, 11561, "prop/propobj.c"); + cd_get_pos(&hitpos, 11561, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetPos(&hitpos, 11561, "propobj.c"); + cd_get_pos(&hitpos, 11561, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&hitpos, 11539, "propobj.c"); + cd_get_pos(&hitpos, 11539, "propobj.c"); #else - cdGetPos(&hitpos, 11377, "propobj.c"); + cd_get_pos(&hitpos, 11377, "propobj.c"); #endif missed = true; @@ -9252,11 +9252,11 @@ void autogunTickShoot(struct prop *autogunprop) hitpos.y -= 2 + (random() % 10); } - bgunPlayPropHitSound(&gset, targetprop, -1); + bgun_play_prop_hit_sound(&gset, targetprop, -1); damage = 0.5f * g_AutogunDamageTxScale; - chrDamageByImpact(targetprop->chr, damage, &dir, &gset, 0, HITPART_GENERAL); + chr_damage_by_impact(targetprop->chr, damage, &dir, &gset, 0, HITPART_GENERAL); autogun->shotbondsum = 0.0f; } @@ -9264,7 +9264,7 @@ void autogunTickShoot(struct prop *autogunprop) } } - propSetPerimEnabled(autogunprop, true); + prop_set_perim_enabled(autogunprop, true); if (fireleft || fireright) { if (autogun->ammoquantity > 0 && autogun->ammoquantity != 255) { @@ -9275,13 +9275,13 @@ void autogunTickShoot(struct prop *autogunprop) if (missed) { portal00018148(&gunpos, &hitpos, gunrooms, hitrooms, NULL, 0); - if (chrIsUsingPaintball(ownerchr)) { - sparksCreate(hitrooms[0], NULL, &hitpos, 0, 0, SPARKTYPE_PAINT); + if (chr_is_using_paintball(ownerchr)) { + sparks_create(hitrooms[0], NULL, &hitpos, 0, 0, SPARKTYPE_PAINT); } else { - sparksCreate(hitrooms[0], NULL, &hitpos, 0, 0, autogun->base.modelnum == MODEL_CETROOFGUN ? SPARKTYPE_BGHIT_GREEN : SPARKTYPE_DEFAULT); + sparks_create(hitrooms[0], NULL, &hitpos, 0, 0, autogun->base.modelnum == MODEL_CETROOFGUN ? SPARKTYPE_BGHIT_GREEN : SPARKTYPE_DEFAULT); } - bgunPlayBgHitSound(&gset, &hitpos, -1, hitrooms); + bgun_play_bg_hit_sound(&gset, &hitpos, -1, hitrooms); } if (makebeam) { @@ -9350,7 +9350,7 @@ void autogunTickShoot(struct prop *autogunprop) if (autogun->allowsoundframe < g_Vars.lvframe60) { s32 soundgap = 2; - psStopSound(autogunprop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(autogunprop, PSTYPE_GENERAL, 0xffff); if (!friendly) { s32 soundnum = SFX_806F; @@ -9364,24 +9364,24 @@ void autogunTickShoot(struct prop *autogunprop) soundgap = 4; } - psCreate(NULL, autogunprop, soundnum, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(NULL, autogunprop, soundnum, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } autogun->allowsoundframe = soundgap + g_Vars.lvframe60; } } - node1 = modelGetPart(model->definition, MODELPART_AUTOGUN_FLASHLEFT); + node1 = model_get_part(model->definition, MODELPART_AUTOGUN_FLASHLEFT); if (node1) { - union modelrwdata *rwdata = modelGetNodeRwData(model, node1); + union modelrwdata *rwdata = model_get_node_rw_data(model, node1); rwdata->chrgunfire.visible = fireleft; } - node2 = modelGetPart(model->definition, MODELPART_AUTOGUN_FLASHRIGHT); + node2 = model_get_part(model->definition, MODELPART_AUTOGUN_FLASHRIGHT); if (node2) { - union modelrwdata *rwdata = modelGetNodeRwData(model, node2); + union modelrwdata *rwdata = model_get_node_rw_data(model, node2); rwdata->chrgunfire.visible = fireright; } } @@ -9389,7 +9389,7 @@ void autogunTickShoot(struct prop *autogunprop) u32 var80069cc0 = 0; -void chopperInitMatrices(struct prop *prop) +void chopper_init_matrices(struct prop *prop) { struct chopperobj *chopper = (struct chopperobj *)prop->obj; struct model *model = chopper->base.model; @@ -9399,21 +9399,21 @@ void chopperInitMatrices(struct prop *prop) Mtxf sp68; Mtxf sp28; - rodata = modelGetPartRodata(model->definition, MODELPART_CHOPPER_0001); - mtx4LoadZRotation(M_BADTAU - chopper->gunrotx, &sp68); - mtx4LoadYRotation(chopper->gunroty + RAD(90, 1.5707963705063f), &sp28); + rodata = model_get_part_rodata(model->definition, MODELPART_CHOPPER_0001); + mtx4_load_z_rotation(M_BADTAU - chopper->gunrotx, &sp68); + mtx4_load_y_rotation(chopper->gunroty + RAD(90, 1.5707963705063f), &sp28); mtx00015be4(&sp28, &sp68, &spa8); - mtx4SetTranslation(&rodata->position.pos, &spa8); + mtx4_set_translation(&rodata->position.pos, &spa8); mtx00015be4(matrices, &spa8, &matrices[1]); - rodata = modelGetPartRodata(model->definition, MODELPART_CHOPPER_0002); - mtx4LoadXRotation(chopper->barrelrot, &spa8); - mtx4SetTranslation(&rodata->position.pos, &spa8); + rodata = model_get_part_rodata(model->definition, MODELPART_CHOPPER_0002); + mtx4_load_x_rotation(chopper->barrelrot, &spa8); + mtx4_set_translation(&rodata->position.pos, &spa8); mtx00015be4(&matrices[1], &spa8, &matrices[2]); } -struct prop *chopperGetTargetProp(struct chopperobj *chopper) +struct prop *chopper_get_target_prop(struct chopperobj *chopper) { if (chopper->target == -1) { return g_Vars.currentplayer->prop; @@ -9422,7 +9422,7 @@ struct prop *chopperGetTargetProp(struct chopperobj *chopper) return g_Vars.props + chopper->target; } -struct chopperobj *chopperFromHovercar(struct chopperobj *chopper) +struct chopperobj *chopper_from_hovercar(struct chopperobj *chopper) { if (chopper->base.type == OBJTYPE_CHOPPER) { return chopper; @@ -9431,14 +9431,14 @@ struct chopperobj *chopperFromHovercar(struct chopperobj *chopper) return NULL; } -bool chopperCheckTargetInFov(struct chopperobj *hovercar, u8 fov) +bool chopper_check_target_in_fov(struct chopperobj *hovercar, u8 fov) { - struct chopperobj *chopper = chopperFromHovercar(hovercar); + struct chopperobj *chopper = chopper_from_hovercar(hovercar); u8 visible = false; if (chopper) { f32 roty = chopper->roty; - struct prop *target = chopperGetTargetProp(chopper); + struct prop *target = chopper_get_target_prop(chopper); struct prop *prop = chopper->base.prop; f32 angle = atan2f(prop->pos.x - target->pos.x, prop->pos.z - target->pos.z); f32 anglediff = angle - roty; @@ -9463,16 +9463,16 @@ bool chopperCheckTargetInFov(struct chopperobj *hovercar, u8 fov) return visible; } -bool chopperCheckTargetInSight(struct chopperobj *obj) +bool chopper_check_target_in_sight(struct chopperobj *obj) { - struct chopperobj *chopper = chopperFromHovercar(obj); + struct chopperobj *chopper = chopper_from_hovercar(obj); if (chopper) { bool visible = false; - struct prop *target = chopperGetTargetProp(chopper); + struct prop *target = chopper_get_target_prop(chopper); if (target->type != PROPTYPE_PLAYER || g_Vars.bondvisible) { - visible = cdTestLos05(&target->pos, target->rooms, &chopper->base.prop->pos, chopper->base.prop->rooms, + visible = cd_test_los05(&target->pos, target->rooms, &chopper->base.prop->pos, chopper->base.prop->rooms, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_AIOPAQUE, GEOFLAG_BLOCK_SHOOT); } @@ -9484,12 +9484,12 @@ bool chopperCheckTargetInSight(struct chopperobj *obj) return false; } -void chopperSetTarget(struct chopperobj *obj, u32 chrnum) +void chopper_set_target(struct chopperobj *obj, u32 chrnum) { - struct chopperobj *chopper = chopperFromHovercar(obj); + struct chopperobj *chopper = chopper_from_hovercar(obj); if (chopper) { - struct chrdata *chr = chrFindById(NULL, chrnum); + struct chrdata *chr = chr_find_by_id(NULL, chrnum); if (chr && chr->prop) { chopper->target = chr->prop - g_Vars.props; @@ -9497,9 +9497,9 @@ void chopperSetTarget(struct chopperobj *obj, u32 chrnum) } } -bool chopperAttack(struct chopperobj *obj) +bool chopper_attack(struct chopperobj *obj) { - struct chopperobj *chopper = chopperFromHovercar(obj); + struct chopperobj *chopper = chopper_from_hovercar(obj); if (chopper) { chopper->attackmode = CHOPPERMODE_COMBAT; @@ -9511,9 +9511,9 @@ bool chopperAttack(struct chopperobj *obj) return false; } -bool chopperStop(struct chopperobj *obj) +bool chopper_stop(struct chopperobj *obj) { - struct chopperobj *chopper = chopperFromHovercar(obj); + struct chopperobj *chopper = chopper_from_hovercar(obj); if (chopper) { chopper->attackmode = CHOPPERMODE_PATROL; @@ -9526,9 +9526,9 @@ bool chopperStop(struct chopperobj *obj) return false; } -bool chopperSetArmed(struct chopperobj *obj, bool armed) +bool chopper_set_armed(struct chopperobj *obj, bool armed) { - struct chopperobj *chopper = chopperFromHovercar(obj); + struct chopperobj *chopper = chopper_from_hovercar(obj); if (chopper) { chopper->weaponsarmed = armed; @@ -9538,23 +9538,23 @@ bool chopperSetArmed(struct chopperobj *obj, bool armed) return false; } -void chopperRestartTimer(struct chopperobj *obj) +void chopper_restart_timer(struct chopperobj *obj) { - struct chopperobj *chopper = chopperFromHovercar(obj); + struct chopperobj *chopper = chopper_from_hovercar(obj); if (chopper) { chopper->timer60 = 0; } } -f32 chopperGetTimer(struct chopperobj *obj) +f32 chopper_get_timer(struct chopperobj *obj) { - struct chopperobj *chopper = chopperFromHovercar(obj); + struct chopperobj *chopper = chopper_from_hovercar(obj); return chopper->timer60 * FRAMEDURATION; } -void chopperSetMaxDamage(struct chopperobj *chopper, u16 health) +void chopper_set_max_damage(struct chopperobj *chopper, u16 health) { chopper->base.maxdamage = health; } @@ -9584,12 +9584,12 @@ f32 func0f07b164(struct coord *pos1, struct coord *pos2, struct coord *pos3, str return sp28.f[0] * sp28.f[0] + sp28.f[1] * sp28.f[1] + sp28.f[2] * sp28.f[2] - tmp * tmp; } -void chopperFireRocket(struct chopperobj *chopper, bool side) +void chopper_fire_rocket(struct chopperobj *chopper, bool side) { if (chopper->ontarget) { struct coord direction; struct coord pos; - struct prop *targetprop = chopperGetTargetProp(chopper); + struct prop *targetprop = chopper_get_target_prop(chopper); struct prop *chopperprop = chopper->base.prop; u32 stack; Mtxf sp6c; @@ -9599,9 +9599,9 @@ void chopperFireRocket(struct chopperobj *chopper, bool side) pos.y = -400; pos.z = -400; - mtx3ToMtx4(chopper->base.realrot, &sp2c); - mtx4LoadTranslation(&pos, &sp6c); - mtx4MultMtx4InPlace(&sp2c, &sp6c); + mtx3_to_mtx4(chopper->base.realrot, &sp2c); + mtx4_load_translation(&pos, &sp6c); + mtx4_mult_mtx4_in_place(&sp2c, &sp6c); pos.x = sp6c.m[3][0] + chopperprop->pos.f[0]; pos.y = sp6c.m[3][1] + chopperprop->pos.f[1]; @@ -9613,13 +9613,13 @@ void chopperFireRocket(struct chopperobj *chopper, bool side) guNormalize(&direction.x, &direction.y, &direction.z); - smokeCreateSimple(&pos, chopperprop->rooms, SMOKETYPE_3); + smoke_create_simple(&pos, chopperprop->rooms, SMOKETYPE_3); - projectileCreate(chopperprop, 0, &pos, &direction, WEAPON_ROCKETLAUNCHER, targetprop); + projectile_create(chopperprop, 0, &pos, &direction, WEAPON_ROCKETLAUNCHER, targetprop); } } -void chopperIncrementBarrel(struct prop *chopperprop, bool firing) +void chopper_increment_barrel(struct prop *chopperprop, bool firing) { struct defaultobj *obj = chopperprop->obj; struct chopperobj *chopper = (struct chopperobj *)chopperprop->obj; @@ -9633,7 +9633,7 @@ void chopperIncrementBarrel(struct prop *chopperprop, bool firing) f32 gunrotx = chopper->gunrotx; f32 gunturnyspeed60 = chopper->gunturnyspeed60; f32 gunturnxspeed60 = chopper->gunturnxspeed60; - struct prop *targetprop = chopperGetTargetProp(chopper); + struct prop *targetprop = chopper_get_target_prop(chopper); struct modelnode *node; struct modelrwdata_chrgunfire *rwdata = NULL; struct modelrodata_position *rodata; @@ -9646,7 +9646,7 @@ void chopperIncrementBarrel(struct prop *chopperprop, bool firing) chopper->fireslotthing->unk01 = (chopper->fireslotthing->unk00 % 3) == 0; if (firing) { - rodata = modelGetPartRodata(model->definition, MODELPART_CHOPPER_0001); + rodata = model_get_part_rodata(model->definition, MODELPART_CHOPPER_0001); gunaimy = targetprop->pos.y - 20.0f; gunpos.x = random() * random() * 0 * 30.0f + rodata->pos.x; @@ -9660,9 +9660,9 @@ void chopperIncrementBarrel(struct prop *chopperprop, bool firing) gunpos.z *= scale; } - mtx3ToMtx4(obj->realrot, &sp50); - mtx4LoadTranslation(&gunpos, &sp90); - mtx4MultMtx4InPlace(&sp50, &sp90); + mtx3_to_mtx4(obj->realrot, &sp50); + mtx4_load_translation(&gunpos, &sp90); + mtx4_mult_mtx4_in_place(&sp50, &sp90); gunpos.x = sp90.m[3][0] + chopperprop->pos.f[0]; gunpos.y = sp90.m[3][1] + chopperprop->pos.f[1]; @@ -9712,25 +9712,25 @@ void chopperIncrementBarrel(struct prop *chopperprop, bool firing) chopper->barrelrot += chopper->barrelrotspeed * LVUPDATE60FREAL(); #if PAL - applySpeed(&gunroty, angleh, &gunturnyspeed60, 0.0027920822612941f * speedmult, 0.0055841645225883f * speedmult, 0.16752494871616f * speedmult); + apply_speed(&gunroty, angleh, &gunturnyspeed60, 0.0027920822612941f * speedmult, 0.0055841645225883f * speedmult, 0.16752494871616f * speedmult); if (gunroty == angleh && gunturnyspeed60 <= 0.0055841645225883f * speedmult && -0.0055841645225883f * speedmult <= gunturnyspeed60) { gunturnyspeed60 = 0.0f; } - applySpeed(&gunrotx, anglev, &gunturnxspeed60, 0.0027920822612941f * speedmult, 0.0055841645225883f * speedmult, 0.16752494871616f * speedmult); + apply_speed(&gunrotx, anglev, &gunturnxspeed60, 0.0027920822612941f * speedmult, 0.0055841645225883f * speedmult, 0.16752494871616f * speedmult); if (gunrotx == anglev && gunturnxspeed60 <= 0.0055841645225883f * speedmult && -0.0055841645225883f * speedmult <= gunturnxspeed60) { gunturnxspeed60 = 0.0f; } #else - applySpeed(&gunroty, angleh, &gunturnyspeed60, 0.0023267353f * speedmult, 0.0046534706f * speedmult, 0.1396041f * speedmult); + apply_speed(&gunroty, angleh, &gunturnyspeed60, 0.0023267353f * speedmult, 0.0046534706f * speedmult, 0.1396041f * speedmult); if (gunroty == angleh && gunturnyspeed60 <= 0.0046534706f * speedmult && -0.0046534706f * speedmult <= gunturnyspeed60) { gunturnyspeed60 = 0.0f; } - applySpeed(&gunrotx, anglev, &gunturnxspeed60, 0.0023267353f * speedmult, 0.0046534706f * speedmult, 0.1396041f * speedmult); + apply_speed(&gunrotx, anglev, &gunturnxspeed60, 0.0023267353f * speedmult, 0.0046534706f * speedmult, 0.1396041f * speedmult); if (gunrotx == anglev && gunturnxspeed60 <= 0.0046534706f * speedmult && -0.0046534706f * speedmult <= gunturnxspeed60) { gunturnxspeed60 = 0.0f; @@ -9746,10 +9746,10 @@ void chopperIncrementBarrel(struct prop *chopperprop, bool firing) firing = false; } - node = modelGetPart(model->definition, MODELPART_CHOPPER_GUNFLASH); + node = model_get_part(model->definition, MODELPART_CHOPPER_GUNFLASH); if (node) { - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); } if (firing) { @@ -9760,7 +9760,7 @@ void chopperIncrementBarrel(struct prop *chopperprop, bool firing) rot.y = sinf(totalrotx); rot.z = cosf(totalroty) * cosf(totalrotx); - projectileCreate(chopperprop, chopper->fireslotthing, &gunpos, &rot, WEAPON_CHOPPERGUN, targetprop); + projectile_create(chopperprop, chopper->fireslotthing, &gunpos, &rot, WEAPON_CHOPPERGUN, targetprop); if (rwdata != NULL) { rwdata->visible = true; @@ -9774,7 +9774,7 @@ void chopperIncrementBarrel(struct prop *chopperprop, bool firing) chopper->fireslotthing->unk00++; } -void chopperIncrementMovement(struct prop *prop, f32 goalroty, f32 goalrotx, struct coord *dir, bool firing) +void chopper_increment_movement(struct prop *prop, f32 goalroty, f32 goalrotx, struct coord *dir, bool firing) { struct defaultobj *obj = prop->obj; struct chopperobj *chopper = (struct chopperobj *)obj; @@ -9865,25 +9865,25 @@ void chopperIncrementMovement(struct prop *prop, f32 goalroty, f32 goalrotx, str } #if PAL - applyRotation(&curroty, goalroty, &turnyspeed, 0.00026175772654824f, 0.00052351545309648f, 0.015705462545156f); + apply_rotation(&curroty, goalroty, &turnyspeed, 0.00026175772654824f, 0.00052351545309648f, 0.015705462545156f); if (curroty == goalroty && turnyspeed <= 0.00052351545309648f && turnyspeed >= -0.00052351545309648f) { turnyspeed = 0.0f; } - applyRotation(&currotx, goalrotx, &turnxspeed, 0.00026175772654824, 0.00052351545309648f, 0.015705462545156f); + apply_rotation(&currotx, goalrotx, &turnxspeed, 0.00026175772654824, 0.00052351545309648f, 0.015705462545156f); if (currotx == goalrotx && turnxspeed <= 0.00052351545309648f && turnxspeed >= -0.00052351545309648f) { turnxspeed = 0.0f; } #else - applyRotation(&curroty, goalroty, &turnyspeed, 0.00021813141938765f, 0.00043626284f, 0.013087885f); + apply_rotation(&curroty, goalroty, &turnyspeed, 0.00021813141938765f, 0.00043626284f, 0.013087885f); if (curroty == goalroty && turnyspeed <= 0.00043626284f && turnyspeed >= -0.00043626284f) { turnyspeed = 0.0f; } - applyRotation(&currotx, goalrotx, &turnxspeed, 0.00021813141938765f, 0.00043626284f, 0.013087885f); + apply_rotation(&currotx, goalrotx, &turnxspeed, 0.00021813141938765f, 0.00043626284f, 0.013087885f); if (currotx == goalrotx && turnxspeed <= 0.00043626284f && turnxspeed >= -0.00043626284f) { turnxspeed = 0.0f; @@ -9897,23 +9897,23 @@ void chopperIncrementMovement(struct prop *prop, f32 goalroty, f32 goalrotx, str spfc.z = 0.0f; if (currotz >= 0) { - mtx4LoadZRotation(currotz, &sp3c); + mtx4_load_z_rotation(currotz, &sp3c); } else { - mtx4LoadZRotation(currotz + M_BADTAU, &sp3c); + mtx4_load_z_rotation(currotz + M_BADTAU, &sp3c); } - mtx4LoadRotation(&spfc, &sp7c); + mtx4_load_rotation(&spfc, &sp7c); mtx00015f04(chopper->base.model->scale, &sp7c); - mtx4MultMtx4(&sp7c, &sp3c, &spbc); - mtx4ToMtx3(&spbc, rotmtx3); - mtx3Copy(rotmtx3, chopper->base.realrot); + mtx4_mult_mtx4(&sp7c, &sp3c, &spbc); + mtx4_to_mtx3(&spbc, rotmtx3); + mtx3_copy(rotmtx3, chopper->base.realrot); - if (chopper->power > 0.45f && !firing && (chopper->base.flags2 & OBJFLAG2_INVISIBLE) == 0 && objIsHealthy(&chopper->base)) { + if (chopper->power > 0.45f && !firing && (chopper->base.flags2 & OBJFLAG2_INVISIBLE) == 0 && obj_is_healthy(&chopper->base)) { soundnum = g_Vars.stagenum == STAGE_EXTRACTION ? SFX_810D : SFX_8110; - psCreateIfNotDupe(prop, soundnum, PSTYPE_CHOPPERHUM2); + ps_create_if_not_dupe(prop, soundnum, PSTYPE_CHOPPERHUM2); } else { - psStopSound(prop, PSTYPE_CHOPPERHUM2, 0xffff); + ps_stop_sound(prop, PSTYPE_CHOPPERHUM2, 0xffff); } chopper->roty = curroty; @@ -9940,24 +9940,24 @@ void chopperIncrementMovement(struct prop *prop, f32 goalroty, f32 goalrotx, str prop->pos.y = newpos.y; prop->pos.z = newpos.z; - propDeregisterRooms(prop); - roomsCopy(newrooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(newrooms, prop->rooms); func0f069c70(&chopper->base, false, true); - chopperIncrementBarrel(prop, firing); + chopper_increment_barrel(prop, firing); - if ((chopper->base.flags2 & OBJFLAG2_INVISIBLE) == 0 && objIsHealthy(&chopper->base)) { + if ((chopper->base.flags2 & OBJFLAG2_INVISIBLE) == 0 && obj_is_healthy(&chopper->base)) { soundnum = g_Vars.stagenum == STAGE_EXTRACTION ? SFX_SHIP_HUM : SFX_810F; - psCreateIfNotDupe(prop, soundnum, PSTYPE_CHOPPERHUM1); + ps_create_if_not_dupe(prop, soundnum, PSTYPE_CHOPPERHUM1); } else { - psStopSound(prop, PSTYPE_CHOPPERHUM1, 0xffff); + ps_stop_sound(prop, PSTYPE_CHOPPERHUM1, 0xffff); } } #define NEXTSTEP() (chopper->cw ? i : (i + 1) % chopper->path->len) #define PREVSTEP() (chopper->cw ? (i + 1) % chopper->path->len : i) -void chopperTickFall(struct prop *chopperprop) +void chopper_tick_fall(struct prop *chopperprop) { struct defaultobj *obj = chopperprop->obj; struct chopperobj *chopper = (struct chopperobj *) obj; @@ -9990,8 +9990,8 @@ void chopperTickFall(struct prop *chopperprop) } } - padUnpack(chopper->path->pads[PREVSTEP()], PADFIELD_POS, &prevpad); - padUnpack(chopper->path->pads[NEXTSTEP()], PADFIELD_POS, &nextpad); + pad_unpack(chopper->path->pads[PREVSTEP()], PADFIELD_POS, &prevpad); + pad_unpack(chopper->path->pads[NEXTSTEP()], PADFIELD_POS, &nextpad); xdiff = prevpad.pos.f[0] - nextpad.pos.f[0]; zdiff = prevpad.pos.f[2] - nextpad.pos.f[2]; @@ -10027,14 +10027,14 @@ void chopperTickFall(struct prop *chopperprop) goalroty = chopper->roty + *x + *z; - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_EXTRACTION) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_EXTRACTION) { // The Extraction chopper falls without any collision checks and is // reaped once it reaches the lower barrier if (chopperprop->pos.y < -30000) { - psStopSound(chopperprop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(chopperprop, PSTYPE_GENERAL, 0xffff); obj->hidden |= OBJHFLAG_DELETING; } else { - chopperIncrementMovement(chopperprop, goalroty, chopper->rotx < 0 ? M_PI : -M_PI, &speed, false); + chopper_increment_movement(chopperprop, goalroty, chopper->rotx < 0 ? M_PI : -M_PI, &speed, false); } } else { // Area 51 interceptors do collision checks @@ -10069,7 +10069,7 @@ void chopperTickFall(struct prop *chopperprop) newpos.y = chopperprop->pos.y + newspeed.f[1] * g_Vars.lvupdate60freal; newpos.z = chopperprop->pos.z + newspeed.f[2] * g_Vars.lvupdate60freal; - if (cdExamLos09(&chopperprop->pos, chopperprop->rooms, &newpos, CDTYPE_BG) == CDRESULT_COLLISION) { + if (cd_exam_los09(&chopperprop->pos, chopperprop->rooms, &newpos, CDTYPE_BG) == CDRESULT_COLLISION) { struct coord sp74; RoomNum room; struct coord sp64; @@ -10077,17 +10077,17 @@ void chopperTickFall(struct prop *chopperprop) RoomNum newrooms[8]; chopperprop->pos.y += 100; - ground = cdFindGroundAtCyl(&chopperprop->pos, 5, chopperprop->rooms, NULL, NULL); + ground = cd_find_ground_at_cyl(&chopperprop->pos, 5, chopperprop->rooms, NULL, NULL); chopperprop->pos.y -= 100; #if VERSION >= VERSION_PAL_FINAL - cdGetPos(&sp64, 12476, "prop/propobj.c"); + cd_get_pos(&sp64, 12476, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetPos(&sp64, 12476, "propobj.c"); + cd_get_pos(&sp64, 12476, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&sp64, 12449, "propobj.c"); + cd_get_pos(&sp64, 12449, "propobj.c"); #else - cdGetPos(&sp64, 12286, "propobj.c"); + cd_get_pos(&sp64, 12286, "propobj.c"); #endif newpos.x = sp64.x; @@ -10100,14 +10100,14 @@ void chopperTickFall(struct prop *chopperprop) chopperprop->pos.y = newpos.y; chopperprop->pos.z = newpos.z; - propDeregisterRooms(chopperprop); - roomsCopy(newrooms, chopperprop->rooms); + prop_deregister_rooms(chopperprop); + rooms_copy(newrooms, chopperprop->rooms); func0f069c70(obj, false, true); // Move to CHOPPERMODE_DEAD chopper->attackmode++; - objDeform(&chopper->base, 8); + obj_deform(&chopper->base, 8); room = chopperprop->rooms[0]; @@ -10115,19 +10115,19 @@ void chopperTickFall(struct prop *chopperprop) sp74.y = 1; sp74.z = 0; - psStopSound(chopperprop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(chopperprop, PSTYPE_GENERAL, 0xffff); - explosionCreate(NULL, &chopperprop->pos, chopperprop->rooms, EXPLOSIONTYPE_ROCKET, 0, true, &newpos, room, &sp74); + explosion_create(NULL, &chopperprop->pos, chopperprop->rooms, EXPLOSIONTYPE_ROCKET, 0, true, &newpos, room, &sp74); chopper->dead = true; } else { - smokeCreateSimple(&chopperprop->pos, chopperprop->rooms, SMOKETYPE_3); - chopperIncrementMovement(chopperprop, goalroty, chopper->rotx < 0 ? M_PI : -M_PI, &speed, false); + smoke_create_simple(&chopperprop->pos, chopperprop->rooms, SMOKETYPE_3); + chopper_increment_movement(chopperprop, goalroty, chopper->rotx < 0 ? M_PI : -M_PI, &speed, false); } } } -void chopperTickIdle(struct prop *prop) +void chopper_tick_idle(struct prop *prop) { struct chopperobj *chopper = (struct chopperobj *)prop->obj; u32 stack; @@ -10135,7 +10135,7 @@ void chopperTickIdle(struct prop *prop) f32 rotx = chopper->rotx; struct coord coord; - chraiExecute(chopper, PROPTYPE_OBJ); + chrai_execute(chopper, PROPTYPE_OBJ); chopper->timer60 += g_Vars.lvupdate60; @@ -10143,10 +10143,10 @@ void chopperTickIdle(struct prop *prop) coord.y = 0; coord.z = 0; - chopperIncrementMovement(prop, roty, rotx, &coord, false); + chopper_increment_movement(prop, roty, rotx, &coord, false); } -void chopperTickPatrol(struct prop *chopperprop) +void chopper_tick_patrol(struct prop *chopperprop) { struct chopperobj *chopper = (struct chopperobj *)chopperprop->obj; f32 xdiff; @@ -10157,7 +10157,7 @@ void chopperTickPatrol(struct prop *chopperprop) f32 mult; f32 zdiff; - chraiExecute(chopper, PROPTYPE_OBJ); + chrai_execute(chopper, PROPTYPE_OBJ); chopper->timer60 += g_Vars.lvupdate60; @@ -10166,13 +10166,13 @@ void chopperTickPatrol(struct prop *chopperprop) } if (chopper->path) { - padUnpack(chopper->path->pads[chopper->nextstep], PADFIELD_POS, &pad); + pad_unpack(chopper->path->pads[chopper->nextstep], PADFIELD_POS, &pad); pad.pos.y += -250; - if (posIsArrivingLaterallyAtPos(&chopperprop->pos, &chopperprop->pos, &pad.pos, 350)) { + if (pos_is_arriving_laterally_at_pos(&chopperprop->pos, &chopperprop->pos, &pad.pos, 350)) { chopper->nextstep = ((chopper->cw ? -1 : 1) + chopper->nextstep + chopper->path->len) % chopper->path->len; - padUnpack(chopper->path->pads[chopper->nextstep], PADFIELD_POS, &pad); + pad_unpack(chopper->path->pads[chopper->nextstep], PADFIELD_POS, &pad); pad.pos.y += -250; } @@ -10203,7 +10203,7 @@ void chopperTickPatrol(struct prop *chopperprop) vector.z = cosf(chopper->roty) * mult; } - chopperIncrementMovement(chopperprop, roty, rotx, &vector, false); + chopper_increment_movement(chopperprop, roty, rotx, &vector, false); } /** @@ -10215,13 +10215,13 @@ void chopperTickPatrol(struct prop *chopperprop) * This function is only directly responsible for the chopper's movement during * combat. */ -void chopperTickCombat(struct prop *chopperprop) +void chopper_tick_combat(struct prop *chopperprop) { struct defaultobj *obj = chopperprop->obj; struct chopperobj *chopper = (struct chopperobj *)obj; s32 i; f32 f0; - struct prop *targetprop = chopperGetTargetProp(chopper); + struct prop *targetprop = chopper_get_target_prop(chopper); f32 dist; struct coord goalpos; struct coord dir; @@ -10236,9 +10236,9 @@ void chopperTickCombat(struct prop *chopperprop) struct coord sp78; struct coord sp6c; - dist = coordGetSquaredDistanceToCoord(&targetprop->pos, &chopperprop->pos); + dist = coord_get_squared_distance_to_coord(&targetprop->pos, &chopperprop->pos); - chraiExecute(chopper, PROPTYPE_OBJ); + chrai_execute(chopper, PROPTYPE_OBJ); chopper->timer60 += g_Vars.lvupdate60; @@ -10253,8 +10253,8 @@ void chopperTickCombat(struct prop *chopperprop) f20 = 2.6843546e8f; for (i = 0; i < chopper->path->len; i++) { - padUnpack(chopper->path->pads[i], PADFIELD_POS, &pad); - padUnpack(chopper->path->pads[(i + 1) % chopper->path->len], PADFIELD_POS, &nextpad); + pad_unpack(chopper->path->pads[i], PADFIELD_POS, &pad); + pad_unpack(chopper->path->pads[(i + 1) % chopper->path->len], PADFIELD_POS, &nextpad); pad.pos.y += -250.0f; nextpad.pos.y += -250.0f; @@ -10296,15 +10296,15 @@ void chopperTickCombat(struct prop *chopperprop) chopper->nextstep = chopper->cw ? sp8c : (sp8c + 1) % chopper->path->len; - padUnpack(chopper->path->pads[chopper->nextstep], PADFIELD_POS, &pad); + pad_unpack(chopper->path->pads[chopper->nextstep], PADFIELD_POS, &pad); pad.pos.y += -250.0f; - if (coordGetSquaredDistanceToCoord(&pad.pos, &chopperprop->pos) < 10000.0f) { + if (coord_get_squared_distance_to_coord(&pad.pos, &chopperprop->pos) < 10000.0f) { chopper->power = 0.0f; chopper->nextstep = (chopper->nextstep + (chopper->cw ? -1 : 1) + chopper->path->len) % chopper->path->len; - padUnpack(chopper->path->pads[chopper->nextstep], PADFIELD_POS, &pad); + pad_unpack(chopper->path->pads[chopper->nextstep], PADFIELD_POS, &pad); pad.pos.y += -250.0f; } @@ -10316,8 +10316,8 @@ void chopperTickCombat(struct prop *chopperprop) goalpos.y = sp6c.y; goalpos.z = sp6c.z; } - } else if (cdTestLos03(&targetprop->pos, targetprop->rooms, &goalpos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_AIOPAQUE, GEOFLAG_BLOCK_SHOOT) == 0) { - padUnpack(chopper->path->pads[chopper->cw ? (sp8c + 1) % chopper->path->len : sp8c], PADFIELD_POS, &pad); + } else if (cd_test_los03(&targetprop->pos, targetprop->rooms, &goalpos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_PATHBLOCKER | CDTYPE_BG | CDTYPE_AIOPAQUE, GEOFLAG_BLOCK_SHOOT) == 0) { + pad_unpack(chopper->path->pads[chopper->cw ? (sp8c + 1) % chopper->path->len : sp8c], PADFIELD_POS, &pad); pad.pos.y += -250.0f; @@ -10333,7 +10333,7 @@ void chopperTickCombat(struct prop *chopperprop) } } - if (coordGetSquaredDistanceToCoord(&goalpos, &chopperprop->pos) < 2500.0f) { + if (coord_get_squared_distance_to_coord(&goalpos, &chopperprop->pos) < 2500.0f) { // Close to the goal pos - power off chopper->power = 0.0f; @@ -10362,14 +10362,14 @@ void chopperTickCombat(struct prop *chopperprop) dist = sqrtf((targetprop->pos.x - chopperprop->pos.x) * (targetprop->pos.x - chopperprop->pos.x) + (targetprop->pos.z - chopperprop->pos.z) * (targetprop->pos.z - chopperprop->pos.z)); rotx = atan2f(targetprop->pos.y - chopperprop->pos.y, dist); - chopperIncrementMovement(chopperprop, roty, rotx, &dir, chopper->targetvisible && chopper->weaponsarmed); + chopper_increment_movement(chopperprop, roty, rotx, &dir, chopper->targetvisible && chopper->weaponsarmed); } } #define HOVVALUE1() ((ishoverbot ? 15.0f : 5.0f) * PALUPF(0.00021813141938765f)) #define HOVVALUE2() ((ishoverbot ? 15.0f : 5.0f) * PALUPF(0.013087885454297f)) -void hovercarTick(struct prop *prop) +void hovercar_tick(struct prop *prop) { bool stopping; struct pad pad; @@ -10414,8 +10414,8 @@ void hovercarTick(struct prop *prop) if (ishoverbot && hovercar->deadtimer60 < 0) { // Exploding - bbox = modelFindBboxRodata(hovercar->base.model); - ymin = objGetLocalYMin(bbox); + bbox = model_find_bbox_rodata(hovercar->base.model); + ymin = obj_get_local_y_min(bbox); sp1d6 = prop->rooms[0]; sp1d8.x = hovercar->base.realrot[1][0]; @@ -10426,8 +10426,8 @@ void hovercarTick(struct prop *prop) sp1e4.y = hovercar->base.realrot[1][1] * ymin + prop->pos.y; sp1e4.z = hovercar->base.realrot[1][2] * ymin + prop->pos.z; - psStopSound(prop, PSTYPE_GENERAL, 0xffff); - explosionCreate(NULL, &prop->pos, prop->rooms, EXPLOSIONTYPE_7, g_Vars.currentplayernum, true, &sp1e4, sp1d6, &sp1d8); + ps_stop_sound(prop, PSTYPE_GENERAL, 0xffff); + explosion_create(NULL, &prop->pos, prop->rooms, EXPLOSIONTYPE_7, g_Vars.currentplayernum, true, &sp1e4, sp1d6, &sp1d8); hovercar->base.hidden |= OBJHFLAG_DELETING; return; } @@ -10440,9 +10440,9 @@ void hovercarTick(struct prop *prop) if (hovercar->sparkstimer60 < 0) { hovercar->sparkstimer60 = TICKS(50); - psCreate(NULL, prop, SFX_SHIELD_DAMAGE, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); + ps_create(NULL, prop, SFX_SHIELD_DAMAGE, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); - sparksCreate(prop->rooms[0], prop, &prop->pos, NULL, 0, SPARKTYPE_DEFAULT); + sparks_create(prop->rooms[0], prop, &prop->pos, NULL, 0, SPARKTYPE_DEFAULT); } } else { if (hovercar->speedtime60 == 0) { @@ -10463,8 +10463,8 @@ void hovercarTick(struct prop *prop) prop->pos.y = sp1c0.y; prop->pos.z = sp1c0.z; - propDeregisterRooms(prop); - roomsCopy(sp1b0, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(sp1b0, prop->rooms); func0f069c70(&hovercar->base, false, true); } } @@ -10472,13 +10472,13 @@ void hovercarTick(struct prop *prop) return; } - chraiExecute(obj, PROPTYPE_OBJ); + chrai_execute(obj, PROPTYPE_OBJ); stopping = false; if (hovercar->path) { padnum = &hovercar->path->pads[hovercar->nextstep]; - padUnpack(*padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(*padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); sp214.x = pad.pos.x; @@ -10486,7 +10486,7 @@ void hovercarTick(struct prop *prop) sp210[0] = pad.room; sp210[1] = -1; - sp214.y = cdFindGroundAtCyl(&pad.pos, 5, sp210, NULL, NULL) + 35; + sp214.y = cd_find_ground_at_cyl(&pad.pos, 5, sp210, NULL, NULL) + 35; } else { sp214.y = pad.pos.y; } @@ -10494,10 +10494,10 @@ void hovercarTick(struct prop *prop) sp214.z = pad.pos.z; if ((hovercar->base.flags & OBJFLAG_HOVERCAR_INIT) - && posIsArrivingLaterallyAtPos(&prop->pos, &prop->pos, &sp214, (0, sp1f4))) { - hovercarIncrementStep(hovercar); + && pos_is_arriving_laterally_at_pos(&prop->pos, &prop->pos, &sp214, (0, sp1f4))) { + hovercar_increment_step(hovercar); padnum = &hovercar->path->pads[hovercar->nextstep]; - padUnpack(*padnum, PADFIELD_POS, &pad); + pad_unpack(*padnum, PADFIELD_POS, &pad); } sp200 = atan2f(sp214.x - prop->pos.x, sp214.z - prop->pos.z); @@ -10515,9 +10515,9 @@ void hovercarTick(struct prop *prop) } if (ishoverbot) { - if (cdExamCylMove03(&prop->pos, prop->rooms, &sp214, + if (cd_exam_cyl_move03(&prop->pos, prop->rooms, &sp214, CDTYPE_CLOSEDDOORS | CDTYPE_AJARDOORS, 0, 0, 0) == CDRESULT_COLLISION) { - doorprop = cdGetObstacleProp(); + doorprop = cd_get_obstacle_prop(); } if (doorprop) { @@ -10526,12 +10526,12 @@ void hovercarTick(struct prop *prop) z = doorprop->pos.z - prop->pos.z; if (x * x + z * z < 200 * 200) { - doorsChooseSwingDirection(prop, door); - doorsRequestMode(door, DOORMODE_OPENING); + doors_choose_swing_direction(prop, door); + doors_request_mode(door, DOORMODE_OPENING); } if (x * x + z * z < 195 * 195) { - stopping = !doorIsOpen(door); + stopping = !door_is_open(door); } } } @@ -10599,18 +10599,18 @@ void hovercarTick(struct prop *prop) sp194.y = sinf(hovercar->rotx); sp194.z = cosf(hovercar->roty) * cosf(hovercar->rotx); - if (posIsMovingTowardsPosOrStoppedInRange(&prop->pos, &sp194, &sp214, sp1f4)) { + if (pos_is_moving_towards_pos_or_stopped_in_range(&prop->pos, &sp194, &sp214, sp1f4)) { sp200 = hovercar->roty; sp1fc = hovercar->rotx; } - applyRotation(&sp190, sp200, &sp184, HOVVALUE1(), HOVVALUE1() * 2.0f, HOVVALUE2()); + apply_rotation(&sp190, sp200, &sp184, HOVVALUE1(), HOVVALUE1() * 2.0f, HOVVALUE2()); if (sp190 == sp200 && HOVVALUE1() * 2.0f >= sp184 && -HOVVALUE1() * 2.0f <= sp184) { sp184 = 0; } - applyRotation(&sp18c, sp1fc, &sp180, HOVVALUE1(), HOVVALUE1() * 2.0f, HOVVALUE2()); + apply_rotation(&sp18c, sp1fc, &sp180, HOVVALUE1(), HOVVALUE1() * 2.0f, HOVVALUE2()); if (sp18c == sp1fc && HOVVALUE1() * 2.0f >= sp180 && -HOVVALUE1() * 2.0f <= sp180) { sp180 = 0; @@ -10627,16 +10627,16 @@ void hovercarTick(struct prop *prop) sp12c.z = 0; if (sp188 >= 0) { - mtx4LoadZRotation(sp188, &sp6c); + mtx4_load_z_rotation(sp188, &sp6c); } else { - mtx4LoadZRotation(sp188 + M_BADTAU, &sp6c); + mtx4_load_z_rotation(sp188 + M_BADTAU, &sp6c); } - mtx4LoadRotation(&sp12c, &spac); + mtx4_load_rotation(&sp12c, &spac); mtx00015f04(hovercar->base.model->scale, &spac); - mtx4MultMtx4(&spac, &sp6c, &spec); - mtx4ToMtx3(&spec, sp15c); - mtx3Copy(sp15c, hovercar->base.realrot); + mtx4_mult_mtx4(&spac, &sp6c, &spec); + mtx4_to_mtx3(&spec, sp15c); + mtx3_copy(sp15c, hovercar->base.realrot); sp138 = cosf(sp18c); @@ -10651,7 +10651,7 @@ void hovercarTick(struct prop *prop) func0f065e74(&prop->pos, prop->rooms, &sp150, sp140); if (ishoverbot) { - sp150.y = cdFindGroundAtCyl(&sp150, 5, sp140, NULL, NULL) + 35; + sp150.y = cd_find_ground_at_cyl(&sp150, 5, sp140, NULL, NULL) + 35; #if VERSION >= VERSION_NTSC_1_0 if (sp150.y < -100000) { @@ -10664,8 +10664,8 @@ void hovercarTick(struct prop *prop) prop->pos.y = sp150.y; prop->pos.z = sp150.z; - propDeregisterRooms(prop); - roomsCopy(sp140, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(sp140, prop->rooms); hovercar->roty = sp190; hovercar->rotx = sp18c; @@ -10675,12 +10675,12 @@ void hovercarTick(struct prop *prop) if (hovercar->path) { if (hovercar->path->pads[hovercar->nextstep + 1] >= 0) { - if (posIsArrivingLaterallyAtPos(&prop->pos, &sp150, &sp214, hovercar->speed * sp1f4)) { - hovercarIncrementStep(hovercar); + if (pos_is_arriving_laterally_at_pos(&prop->pos, &sp150, &sp214, hovercar->speed * sp1f4)) { + hovercar_increment_step(hovercar); } } else { - if (posIsArrivingLaterallyAtPos(&prop->pos, &sp150, &sp214, hovercar->speed * sp1f4)) { - hovercarIncrementStep(hovercar); + if (pos_is_arriving_laterally_at_pos(&prop->pos, &sp150, &sp214, hovercar->speed * sp1f4)) { + hovercar_increment_step(hovercar); } } } @@ -10689,28 +10689,28 @@ void hovercarTick(struct prop *prop) } } -void hoverpropTick(struct prop *prop, bool arg1) +void hoverprop_tick(struct prop *prop, bool arg1) { struct hoverpropobj *obj = (struct hoverpropobj *)prop->obj; if ((obj->base.hidden & OBJHFLAG_GRABBED) == 0 && (arg1 || (prop->flags & PROPFLAG_ONANYSCREENPREVTICK) || (obj->base.flags & OBJFLAG_CHOPPER_INACTIVE))) { - hovTick(&obj->base, &obj->hov); + hov_tick(&obj->base, &obj->hov); } } -void hoverbikeTick(struct prop *prop, bool arg1) +void hoverbike_tick(struct prop *prop, bool arg1) { struct hoverbikeobj *obj = (struct hoverbikeobj *)prop->obj; if ((obj->base.hidden & OBJHFLAG_MOUNTED) == 0) { if ((obj->base.hidden & OBJHFLAG_GRABBED) == 0 && (arg1 || (prop->flags & PROPFLAG_ONANYSCREENPREVTICK))) { - hovTick(&obj->base, &obj->hov); + hov_tick(&obj->base, &obj->hov); } if (obj->base.flags & OBJFLAG_HOVERBIKE_MOVINGWHILEEMPTY) { - hoverbikeUpdateMovement(obj, 0, 0, 0); + hoverbike_update_movement(obj, 0, 0, 0); } } } @@ -10719,43 +10719,43 @@ void hoverbikeTick(struct prop *prop, bool arg1) * Show or hide the CI dropship's interior features depending on whether the * dropship object's deactivated flag is set. */ -void dropshipUpdateInterior(struct prop *prop) +void dropship_update_interior(struct prop *prop) { struct defaultobj *obj = prop->obj; struct model *model = obj->model; - struct modelnode *node = modelGetPart(model->definition, MODELPART_DROPSHIP_INTERIOR); + struct modelnode *node = model_get_part(model->definition, MODELPART_DROPSHIP_INTERIOR); if (node) { - union modelrwdata *data = modelGetNodeRwData(model, node); + union modelrwdata *data = model_get_node_rw_data(model, node); u32 flags = obj->flags; data->toggle.visible = (flags & OBJFLAG_DEACTIVATED) == 0; } } -void glassUpdatePortal(struct prop *prop, s32 playercount, bool *arg2) +void glass_update_portal(struct prop *prop, s32 playercount, bool *arg2) { struct tintedglassobj *glass = (struct tintedglassobj *) prop->obj; if (g_TintedGlassEnabled) { glass->opacity = 255; } else { - glass->opacity = glassCalculateOpacity(&prop->pos, glass->xludist, glass->opadist, glass->unk64); + glass->opacity = glass_calculate_opacity(&prop->pos, glass->xludist, glass->opadist, glass->unk64); } if (glass->portalnum >= 0 && playercount == 1) { if (glass->opacity == 255) { - bgSetPortalOpenState(glass->portalnum, false); + bg_set_portal_open_state(glass->portalnum, false); } else { - bgSetPortalOpenState(glass->portalnum, true); + bg_set_portal_open_state(glass->portalnum, true); } } *arg2 = false; } -void weaponInitMatrices(struct prop *prop) +void weapon_init_matrices(struct prop *prop) { struct weaponobj *weapon = prop->weapon; struct model *model = weapon->base.model; @@ -10764,7 +10764,7 @@ void weaponInitMatrices(struct prop *prop) Mtxf *ptr = &mtxes[i]; for (; i < model->definition->nummatrices; i++) { - mtx4LoadIdentity(ptr); + mtx4_load_identity(ptr); ptr++; } } @@ -10778,75 +10778,75 @@ void weaponInitMatrices(struct prop *prop) * * An assumption has been made these are position node types. */ -void hangingmonitorInitMatrices(struct prop *prop) +void hangingmonitor_init_matrices(struct prop *prop) { struct defaultobj *obj = prop->obj; struct model *model = obj->model; Mtxf *matrices = model->matrices; union modelrodata *rodata; - rodata = modelGetPartRodata(model->definition, MODELPART_0000); - mtx4LoadTranslation(&rodata->position.pos, &matrices[1]); + rodata = model_get_part_rodata(model->definition, MODELPART_0000); + mtx4_load_translation(&rodata->position.pos, &matrices[1]); mtx00015be0(matrices, &matrices[1]); - rodata = modelGetPartRodata(model->definition, MODELPART_0001); - mtx4LoadTranslation(&rodata->position.pos, &matrices[2]); + rodata = model_get_part_rodata(model->definition, MODELPART_0001); + mtx4_load_translation(&rodata->position.pos, &matrices[2]); mtx00015be0(matrices, &matrices[2]); - rodata = modelGetPartRodata(model->definition, MODELPART_0002); - mtx4LoadTranslation(&rodata->position.pos, &matrices[3]); + rodata = model_get_part_rodata(model->definition, MODELPART_0002); + mtx4_load_translation(&rodata->position.pos, &matrices[3]); mtx00015be0(matrices, &matrices[3]); - rodata = modelGetPartRodata(model->definition, MODELPART_0003); - mtx4LoadTranslation(&rodata->position.pos, &matrices[4]); + rodata = model_get_part_rodata(model->definition, MODELPART_0003); + mtx4_load_translation(&rodata->position.pos, &matrices[4]); mtx00015be0(matrices, &matrices[4]); } -void objInitMatrices(struct prop *prop) +void obj_init_matrices(struct prop *prop) { struct defaultobj *obj = prop->obj; Mtxf mtx; if (obj->type == OBJTYPE_DOOR) { - doorInitMatrices(prop); + door_init_matrices(prop); } else { - mtx3ToMtx4(obj->realrot, &mtx); - mtx4SetTranslation(&prop->pos, &mtx); - mtx00015be4(camGetWorldToScreenMtxf(), &mtx, obj->model->matrices); + mtx3_to_mtx4(obj->realrot, &mtx); + mtx4_set_translation(&prop->pos, &mtx); + mtx00015be4(cam_get_world_to_screen_mtxf(), &mtx, obj->model->matrices); if (obj->type == OBJTYPE_CCTV) { - cctvInitMatrices(prop, &mtx); + cctv_init_matrices(prop, &mtx); } else if (obj->type == OBJTYPE_AUTOGUN) { - autogunInitMatrices(prop, &mtx); + autogun_init_matrices(prop, &mtx); } else if (obj->type == OBJTYPE_CHOPPER) { - chopperInitMatrices(prop); + chopper_init_matrices(prop); } else if (obj->type == OBJTYPE_WEAPON) { - weaponInitMatrices(prop); + weapon_init_matrices(prop); } else if (obj->type == OBJTYPE_HANGINGMONITORS) { - hangingmonitorInitMatrices(prop); + hangingmonitor_init_matrices(prop); } else { if (obj->model->definition->nummatrices >= 2) { struct modelrenderdata thing = {NULL, 1, 3}; u32 stack; Mtxf sp28; - mtx4Copy(obj->model->matrices, &sp28); + mtx4_copy(obj->model->matrices, &sp28); thing.unk10 = obj->model->matrices; thing.unk00 = &sp28; - modelSetMatrices(&thing, obj->model); + model_set_matrices(&thing, obj->model); } } } } -bool propCanRegen(struct prop *prop) +bool prop_can_regen(struct prop *prop) { return true; } -u32 objTick(struct prop *prop) +u32 obj_tick(struct prop *prop) { struct defaultobj *obj = prop->obj; bool silent = false; @@ -10865,10 +10865,10 @@ u32 objTick(struct prop *prop) prop->timetoregen -= g_Vars.lvupdate60; - // If ready to start fading in but propCanRegen returns false, wait - // another second and try again. In practice propCanRegen will always + // If ready to start fading in but prop_can_regen returns false, wait + // another second and try again. In practice prop_can_regen will always // return true so this condition will never pass. - if (prop->timetoregen < TICKS(60) && !regenning && !propCanRegen(prop)) { + if (prop->timetoregen < TICKS(60) && !regenning && !prop_can_regen(prop)) { prop->timetoregen += TICKS(60); } @@ -10885,22 +10885,22 @@ u32 objTick(struct prop *prop) // 1 second left - time to start fading in if (obj->damage == 0 && (obj->hidden2 & OBJH2FLAG_DESTROYED) == 0) { if (obj->flags & OBJFLAG_INSIDEANOTHEROBJ) { - propDeregisterRooms(prop); - propDelist(prop); + prop_deregister_rooms(prop); + prop_delist(prop); obj->hidden &= ~OBJHFLAG_GONE; - cmdindex = setupGetCmdIndexByProp(prop); + cmdindex = setup_get_cmd_index_by_prop(prop); // Find the parent obj (pad is repurposed here) padnum = obj->pad; - newparent = setupGetObjByCmdIndex(cmdindex + padnum); + newparent = setup_get_obj_by_cmd_index(cmdindex + padnum); if (newparent && newparent->prop) { - modelSetScale(obj->model, obj->model->scale); - propReparent(obj->prop, newparent->prop); + model_set_scale(obj->model, obj->model->scale); + prop_reparent(obj->prop, newparent->prop); silent = true; } } else { - propEnable(prop); + prop_enable(prop); setup0f0923d4(obj); obj->hidden &= ~OBJHFLAG_GONE; } @@ -10914,7 +10914,7 @@ u32 objTick(struct prop *prop) obj->damage = 0; obj->hidden2 &= ~OBJH2FLAG_DESTROYED; - modelFreeVertices(1, obj->model); + model_free_vertices(1, obj->model); } if (obj->type == OBJTYPE_SHIELD) { @@ -10924,7 +10924,7 @@ u32 objTick(struct prop *prop) if (!silent) { // Play respawn sound - psCreate(NULL, prop, SFX_REGEN, -1, + ps_create(NULL, prop, SFX_REGEN, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } } @@ -10934,15 +10934,15 @@ u32 objTick(struct prop *prop) struct autogunobj *autogun = (struct autogunobj *)prop->obj; if (autogun->beam) { - beamTick(autogun->beam); + beam_tick(autogun->beam); } } else if (obj->type == OBJTYPE_CHOPPER) { struct chopperobj *chopper = (struct chopperobj *)prop->obj; - beamTick(chopper->fireslotthing->beam); + beam_tick(chopper->fireslotthing->beam); } else if (obj->type == OBJTYPE_LIFT) { - liftTick(prop); + lift_tick(prop); } else if (obj->type == OBJTYPE_ESCASTEP) { - escastepTick(prop); + escastep_tick(prop); } return TICKOP_NONE; @@ -10956,7 +10956,7 @@ u32 objTick(struct prop *prop) * much of the logic is skipped, and only the logic specific to the current * player is executed. */ -s32 objTickPlayer(struct prop *prop) +s32 obj_tick_player(struct prop *prop) { bool pass; struct defaultobj *obj = prop->obj; @@ -11001,8 +11001,8 @@ s32 objTickPlayer(struct prop *prop) } if (!pass) { - objDropRecursively(prop, true); - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_drop_recursively(prop, true); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); return TICKOP_FREE; } } @@ -11015,7 +11015,7 @@ s32 objTickPlayer(struct prop *prop) if (obj->hidden & OBJHFLAG_PROJECTILE) { struct projectile *projectile = obj->projectile; - if (projectile->ownerprop && playermgrGetPlayerNumByProp(projectile->ownerprop) >= 0) { + if (projectile->ownerprop && playermgr_get_player_num_by_prop(projectile->ownerprop) >= 0) { fulltick = (projectile->ownerprop == g_Vars.currentplayer->prop); } } @@ -11023,8 +11023,8 @@ s32 objTickPlayer(struct prop *prop) if (model->anim) { if (g_Anims[model->anim->animnum].flags & ANIMFLAG_ABSOLUTETRANSLATION) { if (g_Vars.tickmode != TICKMODE_CUTSCENE - && modelGetCurAnimFrame(model) >= modelGetNumAnimFrames(model) - 1) { - modelmgrFreeAnim(model->anim); + && model_get_cur_anim_frame(model) >= model_get_num_anim_frames(model) - 1) { + modelmgr_free_anim(model->anim); model->anim = NULL; } else { // In cutscene @@ -11041,27 +11041,27 @@ s32 objTickPlayer(struct prop *prop) lvupdate240 += g_Vars.cutsceneskip60ths * 4; } - modelTickAnimQuarterSpeed(model, lvupdate240, true); + model_tick_anim_quarter_speed(model, lvupdate240, true); } - animLoadHeader(model->anim->animnum); + anim_load_header(model->anim->animnum); if ((g_Anims[model->anim->animnum].flags & ANIMFLAG_HASREPEATFRAMES) - && animGetRemappedFrame(model->anim->animnum, model->anim->framea) < 0) { + && anim_get_remapped_frame(model->anim->animnum, model->anim->framea) < 0) { invalidframe = true; } else { if (fulltick) { - modelUpdateInfo(model); + model_update_info(model); } sp556 = true; - sp476.unk10 = gfxAllocate(model->definition->nummatrices * sizeof(Mtxf)); - sp476.unk00 = camGetWorldToScreenMtxf(); - modelSetMatricesWithAnim(&sp476, model); + sp476.unk10 = gfx_allocate(model->definition->nummatrices * sizeof(Mtxf)); + sp476.unk00 = cam_get_world_to_screen_mtxf(); + model_set_matrices_with_anim(&sp476, model); if (fulltick) { - mtx00015be4(camGetProjectionMtxF(), model->matrices, &sp412); - mtx4ToMtx3(&sp412, obj->realrot); + mtx00015be4(cam_get_projection_mtxf(), model->matrices, &sp412); + mtx4_to_mtx3(&sp412, obj->realrot); sp400.x = sp412.m[3][0]; sp400.y = sp412.m[3][1]; @@ -11077,8 +11077,8 @@ s32 objTickPlayer(struct prop *prop) prop->pos.y = sp400.y; prop->pos.z = sp400.z; - propDeregisterRooms(prop); - roomsCopy(sp384, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(sp384, prop->rooms); if (obj->type == OBJTYPE_HOVERPROP) { hov = &((struct hoverpropobj *)obj)->hov; @@ -11087,8 +11087,8 @@ s32 objTickPlayer(struct prop *prop) } if (hov) { - hovUpdateGround(obj, hov, &prop->pos, prop->rooms, obj->realrot); - hoverpropSetTurnAngle(obj, atan2f(sp412.m[2][0], sp412.m[2][2])); + hov_update_ground(obj, hov, &prop->pos, prop->rooms, obj->realrot); + hoverprop_set_turn_angle(obj, atan2f(sp412.m[2][0], sp412.m[2][2])); hov->bobpitchcur = 0; hov->bobpitchspeed = 0; @@ -11100,13 +11100,13 @@ s32 objTickPlayer(struct prop *prop) } if ((obj->flags & OBJFLAG_IGNOREFLOORCOLOUR) == 0) { - cdFindFloorYColourTypeAtPos(&prop->pos, prop->rooms, &obj->floorcol, 0); + cd_find_floor_y_colour_type_at_pos(&prop->pos, prop->rooms, &obj->floorcol, 0); } func0f069c70(obj, true, true); if (obj->type == OBJTYPE_LIFT) { - liftUpdateTiles((struct liftobj *)obj, false); + lift_update_tiles((struct liftobj *)obj, false); } sp592 = true; @@ -11134,11 +11134,11 @@ s32 objTickPlayer(struct prop *prop) if (fulltick) { sp148 = floorf(model->anim->frame); sp148++; - modelTickAnimQuarterSpeed(model, g_Vars.lvupdate240, true); + model_tick_anim_quarter_speed(model, g_Vars.lvupdate240, true); sp144 = floorf(model->anim->frame); for (i = sp148; i <= sp144; i++) { - animGetTranslateAngle(0, false, model->definition->skel, model->anim->animnum, i, &translate, false); + anim_get_translate_angle(0, false, model->definition->skel, model->anim->animnum, i, &translate, false); sp116.x += translate.x * 0.1f; sp112 = translate.y * 0.1f; @@ -11148,14 +11148,14 @@ s32 objTickPlayer(struct prop *prop) mtx00016208(obj->realrot, &sp116); } - mtx3ToMtx4(obj->realrot, &sp248); - mtx4SetTranslation(&prop->pos, &sp248); - mtx4MultMtx4(camGetWorldToScreenMtxf(), &sp248, &sp152); + mtx3_to_mtx4(obj->realrot, &sp248); + mtx4_set_translation(&prop->pos, &sp248); + mtx4_mult_mtx4(cam_get_world_to_screen_mtxf(), &sp248, &sp152); sp556 = true; - sp312.unk10 = gfxAllocate(model->definition->nummatrices * sizeof(Mtxf)); + sp312.unk10 = gfx_allocate(model->definition->nummatrices * sizeof(Mtxf)); sp312.unk00 = &sp152; - modelSetMatricesWithAnim(&sp312, model); + model_set_matrices_with_anim(&sp312, model); if (fulltick) { sp236.x = (f32)sp116.x + prop->pos.x; @@ -11168,15 +11168,15 @@ s32 objTickPlayer(struct prop *prop) func0f065e74(&prop->pos, prop->rooms, &sp236, sp220); } - if (modelGetCurAnimFrame(model) >= modelGetNumAnimFrames(model) - 1) { - modelmgrFreeAnim(model->anim); + if (model_get_cur_anim_frame(model) >= model_get_num_anim_frames(model) - 1) { + modelmgr_free_anim(model->anim); model->anim = NULL; - mtx00015be4(camGetProjectionMtxF(), model->matrices, &sp248); - mtx4ToMtx3(&sp248, obj->realrot); - tagnum = objGetTagNum(obj); + mtx00015be4(cam_get_projection_mtxf(), model->matrices, &sp248); + mtx4_to_mtx3(&sp248, obj->realrot); + tagnum = obj_get_tag_num(obj); if (tagnum >= 0) { - numchrs = chrsGetNumSlots(); + numchrs = chrs_get_num_slots(); for (i = 0; i < numchrs; i++) { if (g_ChrSlots[i].myspecial == tagnum) { @@ -11189,23 +11189,23 @@ s32 objTickPlayer(struct prop *prop) prop->pos.x = sp236.x; prop->pos.z = sp236.z; - propDeregisterRooms(prop); - roomsCopy(sp220, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(sp220, prop->rooms); if (sp148 <= sp144) { - prop->pos.y = cdFindGroundAtCyl(&prop->pos, 5, prop->rooms, &obj->floorcol, NULL) + prop->pos.y = cd_find_ground_at_cyl(&prop->pos, 5, prop->rooms, &obj->floorcol, NULL) + func0f06a620(obj) + sp112; } func0f069c70(obj, true, true); sp592 = true; - if (objUpdateGeometry(prop, (u8 **)geos, &end) + if (obj_update_geometry(prop, (u8 **)geos, &end) && geos[0]->type == GEOTYPE_BLOCK - && cdTestBlockOverlapsAnyProp((struct geoblock *) geos[0], prop->rooms, CDTYPE_PLAYERS) == CDRESULT_COLLISION) { + && cd_test_block_overlaps_any_prop((struct geoblock *) geos[0], prop->rooms, CDTYPE_PLAYERS) == CDRESULT_COLLISION) { damage = ((obj->maxdamage - obj->damage) + 1) / 250.0f; obj->flags &= ~OBJFLAG_INVINCIBLE; - objDamage(obj, damage, &prop->pos, WEAPON_REMOTEMINE, -1); + obj_damage(obj, damage, &prop->pos, WEAPON_REMOTEMINE, -1); } } } @@ -11213,7 +11213,7 @@ s32 objTickPlayer(struct prop *prop) if (fulltick) { if (model->anim == NULL && (obj->hidden & OBJHFLAG_PROJECTILE)) { - sp592 = projectileTick(obj, &embedded); + sp592 = projectile_tick(obj, &embedded); if (embedded) { result = TICKOP_CHANGEDLIST; @@ -11221,72 +11221,72 @@ s32 objTickPlayer(struct prop *prop) } if (obj->type == OBJTYPE_DOOR) { - doorTick(prop); + door_tick(prop); } else if (obj->type == OBJTYPE_CCTV && (obj->flags & OBJFLAG_DEACTIVATED) == 0) { - cctvTick(prop); + cctv_tick(prop); } else if (obj->type == OBJTYPE_FAN) { - fanTick(prop); + fan_tick(prop); } else if (obj->type == OBJTYPE_AUTOGUN && (obj->flags & OBJFLAG_DEACTIVATED) == 0) { - autogunTick(prop); + autogun_tick(prop); } else if (obj->type == OBJTYPE_HOVERCAR) { - hovercarTick(prop); + hovercar_tick(prop); } else if (obj->type == OBJTYPE_CHOPPER) { struct chopperobj *chopper = (struct chopperobj *)obj; if (!chopper->dead) { - if (!lvIsPaused()) { + if (!lv_is_paused()) { if (chopper->attackmode == CHOPPERMODE_DEAD) { // empty } else if (chopper->attackmode == CHOPPERMODE_FALL) { if (obj->flags & OBJFLAG_CHOPPER_INACTIVE) { chopper->dead = true; } else { - chopperTickFall(prop); + chopper_tick_fall(prop); } } else if (obj->flags & OBJFLAG_CHOPPER_INACTIVE) { - chopperTickIdle(prop); + chopper_tick_idle(prop); } else if (chopper->attackmode == CHOPPERMODE_PATROL) { - chopperTickPatrol(prop); + chopper_tick_patrol(prop); } else if (chopper->attackmode == CHOPPERMODE_COMBAT) { - chopperTickCombat(prop); + chopper_tick_combat(prop); } } } else { - psStopSound(prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(prop, PSTYPE_GENERAL, 0xffff); } } else if (obj->type == OBJTYPE_HOVERPROP) { - hoverpropTick(prop, sp592); + hoverprop_tick(prop, sp592); } else if (obj->type == OBJTYPE_HOVERBIKE) { - hoverbikeTick(prop, sp592); + hoverbike_tick(prop, sp592); } } if (obj->type == OBJTYPE_TINTEDGLASS) { - glassUpdatePortal(prop, playercount, &sp564); + glass_update_portal(prop, playercount, &sp564); } else if (obj->type == OBJTYPE_DOOR) { - doorUpdatePortalIfWindowed(prop, playercount); + door_update_portal_if_windowed(prop, playercount); } if (invalidframe) { pass2 = false; - } else if (prop == bmoveGetHoverbike() || prop == bmoveGetGrabbedProp()) { - pass2 = posIsInDrawDistance(&prop->pos); + } else if (prop == bmove_get_hoverbike() || prop == bmove_get_grabbed_prop()) { + pass2 = pos_is_in_draw_distance(&prop->pos); } else if (obj->flags2 & OBJFLAG2_CANFILLVIEWPORT) { - pass2 = posIsInDrawDistance(&prop->pos); + pass2 = pos_is_in_draw_distance(&prop->pos); } else if ((obj->hidden & OBJHFLAG_GONE) == 0 && (obj->flags2 & OBJFLAG2_INVISIBLE) == 0) { - pass2 = func0f08e8ac(prop, &prop->pos, modelGetEffectiveScale(model), sp564); + pass2 = func0f08e8ac(prop, &prop->pos, model_get_effective_scale(model), sp564); } else { pass2 = false; } if (pass2) { if (sp592 == false) { - propCalculateShadeInfo(prop, obj->nextcol, obj->floorcol); + prop_calculate_shade_info(prop, obj->nextcol, obj->floorcol); } if (fulltick) { if (prop->flags & PROPFLAG_ONANYSCREENPREVTICK) { - colourTween(obj->shadecol, obj->nextcol); + colour_tween(obj->shadecol, obj->nextcol); } else { obj->shadecol[0] = obj->nextcol[0]; obj->shadecol[1] = obj->nextcol[1]; @@ -11298,15 +11298,15 @@ s32 objTickPlayer(struct prop *prop) prop->flags |= PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONTHISSCREENTHISTICK; if (obj->type == OBJTYPE_FAN) { - fanUpdateModel(prop); + fan_update_model(prop); } else if (obj->model->definition->skel == &g_SkelDropship) { - dropshipUpdateInterior(prop); + dropship_update_interior(prop); } if (sp556 == false) { - model->matrices = gfxAllocate(model->definition->nummatrices * sizeof(Mtxf)); - objInitMatrices(prop); - modelUpdateRelationsQuick(model, model->definition->rootnode); + model->matrices = gfx_allocate(model->definition->nummatrices * sizeof(Mtxf)); + obj_init_matrices(prop); + model_update_relations_quick(model, model->definition->rootnode); } prop->z = -model->matrices[0].m[3][2]; @@ -11332,21 +11332,21 @@ s32 objTickPlayer(struct prop *prop) if (obj->hidden & OBJHFLAG_DAMAGEFORBOUNCE) { obj->hidden &= ~OBJHFLAG_DAMAGEFORBOUNCE; - objDamage(obj, RANDOMFRAC() * 4.0f + 2.0f, &prop->pos, WEAPON_NONE, (obj->hidden & 0xf0000000) >> 28); + obj_damage(obj, RANDOMFRAC() * 4.0f + 2.0f, &prop->pos, WEAPON_NONE, (obj->hidden & 0xf0000000) >> 28); } if (fulltick) { if (obj->type == OBJTYPE_AUTOGUN) { - autogunTickShoot(prop); + autogun_tick_shoot(prop); } - objDropRecursively(prop, false); + obj_drop_recursively(prop, false); } return result; } -Gfx *propsRenderBeams(Gfx *gdl) +Gfx *props_render_beams(Gfx *gdl) { struct prop *prop = g_Vars.activeprops; @@ -11355,15 +11355,15 @@ Gfx *propsRenderBeams(Gfx *gdl) struct chrdata *chr = prop->chr; if (CHRRACE(chr) == RACE_ROBOT) { - gdl = beamRender(gdl, chr->unk348[0]->beam, true, true); - gdl = beamRender(gdl, chr->unk348[1]->beam, true, true); + gdl = beam_render(gdl, chr->unk348[0]->beam, true, true); + gdl = beam_render(gdl, chr->unk348[1]->beam, true, true); } else { if (chr->fireslots[0] >= 0) { - gdl = beamRender(gdl, &g_Fireslots[chr->fireslots[0]].beam, true, false); + gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[0]].beam, true, false); } if (chr->fireslots[1] >= 0) { - gdl = beamRender(gdl, &g_Fireslots[chr->fireslots[1]].beam, true, false); + gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[1]].beam, true, false); } } } else if (prop->type == PROPTYPE_OBJ) { @@ -11371,21 +11371,21 @@ Gfx *propsRenderBeams(Gfx *gdl) if (obj->type == OBJTYPE_AUTOGUN) { struct autogunobj *autogun = (struct autogunobj *)prop->obj; - gdl = beamRender(gdl, autogun->beam, true, false); + gdl = beam_render(gdl, autogun->beam, true, false); } else if (obj->type == OBJTYPE_CHOPPER) { struct chopperobj *chopper = (struct chopperobj *)prop->obj; - gdl = beamRender(gdl, chopper->fireslotthing->beam, true, true); + gdl = beam_render(gdl, chopper->fireslotthing->beam, true, true); } } else if (prop->type == PROPTYPE_PLAYER) { - if (prop->chr && playermgrGetPlayerNumByProp(prop) != g_Vars.currentplayernum) { + if (prop->chr && playermgr_get_player_num_by_prop(prop) != g_Vars.currentplayernum) { struct chrdata *chr = prop->chr; if (chr->fireslots[0] >= 0) { - gdl = beamRender(gdl, &g_Fireslots[chr->fireslots[0]].beam, true, false); + gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[0]].beam, true, false); } if (chr->fireslots[1] >= 0) { - gdl = beamRender(gdl, &g_Fireslots[chr->fireslots[1]].beam, true, false); + gdl = beam_render(gdl, &g_Fireslots[chr->fireslots[1]].beam, true, false); } } } @@ -11396,7 +11396,7 @@ Gfx *propsRenderBeams(Gfx *gdl) return gdl; } -void tvscreenSetCmdlist(struct tvscreen *screen, u32 *cmdlist) +void tvscreen_set_cmdlist(struct tvscreen *screen, u32 *cmdlist) { screen->cmdlist = cmdlist; screen->offset = 0; @@ -11951,7 +11951,7 @@ u32 var8006aae4[] = { tvcmd_restart(), }; -void tvscreenSetImageByNum(struct tvscreen *screen, s32 imagenum) +void tvscreen_set_image_by_num(struct tvscreen *screen, s32 imagenum) { u32 *image = g_TvCmdlist00; @@ -12014,54 +12014,54 @@ void tvscreenSetImageByNum(struct tvscreen *screen, s32 imagenum) break; } - tvscreenSetCmdlist(screen, image); + tvscreen_set_cmdlist(screen, image); } -void tvscreenSetTexture(struct tvscreen *screen, s32 texturenum) +void tvscreen_set_texture(struct tvscreen *screen, s32 texturenum) { screen->tconfig = (struct textureconfig *)texturenum; } #if MATCHING GLOBAL_ASM( -glabel tvscreenRender +glabel tvscreen_render .late_rodata glabel var7f1aa7cc .word 0x40c907a9 glabel var7f1aa7d0 .word 0x38c907a9 glabel var7f1aa7d4 -.word tvscreenRender+0xec # f07fce4 +.word tvscreen_render+0xec # f07fce4 glabel var7f1aa7d8 -.word tvscreenRender+0x100 # f07fcf8 +.word tvscreen_render+0x100 # f07fcf8 glabel var7f1aa7dc -.word tvscreenRender+0x170 # f07fd68 +.word tvscreen_render+0x170 # f07fd68 glabel var7f1aa7e0 -.word tvscreenRender+0x1e0 # f07fdd8 +.word tvscreen_render+0x1e0 # f07fdd8 glabel var7f1aa7e4 -.word tvscreenRender+0x24c # f07fe44 +.word tvscreen_render+0x24c # f07fe44 glabel var7f1aa7e8 -.word tvscreenRender+0x2b8 # f07feb0 +.word tvscreen_render+0x2b8 # f07feb0 glabel var7f1aa7ec -.word tvscreenRender+0x324 # f07ff1c +.word tvscreen_render+0x324 # f07ff1c glabel var7f1aa7f0 -.word tvscreenRender+0x390 # f07ff88 +.word tvscreen_render+0x390 # f07ff88 glabel var7f1aa7f4 -.word tvscreenRender+0x3bc # f07ffb4 +.word tvscreen_render+0x3bc # f07ffb4 glabel var7f1aa7f8 -.word tvscreenRender+0x408 # f080000 +.word tvscreen_render+0x408 # f080000 glabel var7f1aa7fc -.word tvscreenRender+0x428 # f080020 +.word tvscreen_render+0x428 # f080020 glabel var7f1aa800 -.word tvscreenRender+0x47c # f080074 +.word tvscreen_render+0x47c # f080074 glabel var7f1aa804 -.word tvscreenRender+0x484 # f08007c +.word tvscreen_render+0x484 # f08007c glabel var7f1aa808 -.word tvscreenRender+0x48c # f080084 +.word tvscreen_render+0x48c # f080084 glabel var7f1aa80c -.word tvscreenRender+0x524 # f08011c +.word tvscreen_render+0x524 # f08011c glabel var7f1aa810 -.word tvscreenRender+0x548 # f080140 +.word tvscreen_render+0x548 # f080140 glabel var7f1aa814 .word 0x38c907a9 glabel var7f1aa818 @@ -12091,10 +12091,10 @@ glabel var7f1aa824 /* f07fc34: 31cf00ff */ andi $t7,$t6,0xff /* f07fc38: 55e10359 */ bnel $t7,$at,.L0f0809a0 /* f07fc3c: 8fbf004c */ lw $ra,0x4c($sp) -/* f07fc40: 0fc59e59 */ jal gfxAllocateVertices +/* f07fc40: 0fc59e59 */ jal gfx_allocate_vertices /* f07fc44: 24040004 */ addiu $a0,$zero,0x4 /* f07fc48: afa200b4 */ sw $v0,0xb4($sp) -/* f07fc4c: 0fc59e73 */ jal gfxAllocateColours +/* f07fc4c: 0fc59e73 */ jal gfx_allocate_colours /* f07fc50: 24040001 */ addiu $a0,$zero,0x1 /* f07fc54: 8fb800c4 */ lw $t8,0xc4($sp) /* f07fc58: afa200b0 */ sw $v0,0xb0($sp) @@ -12104,7 +12104,7 @@ glabel var7f1aa824 /* f07fc68: afb800ac */ sw $t8,0xac($sp) /* f07fc6c: 8e290004 */ lw $t1,0x4($s1) /* f07fc70: 02202825 */ or $a1,$s1,$zero -/* f07fc74: 0c006a87 */ jal modelGetNodeRwData +/* f07fc74: 0c006a87 */ jal model_get_node_rw_data /* f07fc78: afa900a8 */ sw $t1,0xa8($sp) /* f07fc7c: 3c017f1b */ lui $at,%hi(var7f1aa7cc) /* f07fc80: c43aa7cc */ lwc1 $f26,%lo(var7f1aa7cc)($at) @@ -12321,7 +12321,7 @@ glabel var7f1aa824 /* f07ff80: 1000008b */ b .L0f0801b0 /* f07ff84: e6120034 */ swc1 $f18,0x34($s0) /* f07ff88: 02002025 */ or $a0,$s0,$zero -/* f07ff8c: 0fc1fefc */ jal tvscreenSetTexture +/* f07ff8c: 0fc1fefc */ jal tvscreen_set_texture /* f07ff90: 8c650004 */ lw $a1,0x4($v1) /* f07ff94: 960e0004 */ lhu $t6,0x4($s0) /* f07ff98: 3c017f1b */ lui $at,%hi(var7f1aa814) @@ -12353,7 +12353,7 @@ glabel var7f1aa824 /* f07fff8: 1000006d */ b .L0f0801b0 /* f07fffc: a60c0006 */ sh $t4,0x6($s0) /* f080000: 02002025 */ or $a0,$s0,$zero -/* f080004: 0fc1fe46 */ jal tvscreenSetCmdlist +/* f080004: 0fc1fe46 */ jal tvscreen_set_cmdlist /* f080008: 8c650004 */ lw $a1,0x4($v1) /* f08000c: 3c017f1b */ lui $at,%hi(var7f1aa818) /* f080010: 3c06800a */ lui $a2,%hi(g_Vars) @@ -12369,7 +12369,7 @@ glabel var7f1aa824 /* f080038: 01ae082b */ sltu $at,$t5,$t6 /* f08003c: 50200006 */ beqzl $at,.L0f080058 /* f080040: 960f0004 */ lhu $t7,0x4($s0) -/* f080044: 0fc1fe46 */ jal tvscreenSetCmdlist +/* f080044: 0fc1fe46 */ jal tvscreen_set_cmdlist /* f080048: 8c650004 */ lw $a1,0x4($v1) /* f08004c: 10000004 */ b .L0f080060 /* f080050: 00000000 */ nop @@ -12944,7 +12944,7 @@ glabel var7f1aa824 /* f0808ac: afae0014 */ sw $t6,0x14($sp) /* f0808b0: afaf0010 */ sw $t7,0x10($sp) /* f0808b4: 8fa700c8 */ lw $a3,0xc8($sp) -/* f0808b8: 0fc2ce70 */ jal texSelect +/* f0808b8: 0fc2ce70 */ jal tex_select /* f0808bc: 8fa600cc */ lw $a2,0xcc($sp) /* f0808c0: 8fb000c4 */ lw $s0,0xc4($sp) /* f0808c4: 3c190102 */ lui $t9,0x102 @@ -13021,14 +13021,14 @@ struct tvcmd { u32 arg2; }; -Gfx *tvscreenRender(struct model *model, struct modelnode *node, struct tvscreen *screen, Gfx *gdl, s32 arg4, s32 arg5) +Gfx *tvscreen_render(struct model *model, struct modelnode *node, struct tvscreen *screen, Gfx *gdl, s32 arg4, s32 arg5) { if (node && (node->type & 0xff) == MODELNODETYPE_DL) { - Vtx *vertices = gfxAllocateVertices(4); // b4 - Col *colours = gfxAllocateColours(1); // b0 + Vtx *vertices = gfx_allocate_vertices(4); // b4 + Col *colours = gfx_allocate_colours(1); // b0 Gfx *savedgdl = gdl++; // ac union modelrodata *rodata = node->rodata; // a8 - union modelrwdata *rwdata = modelGetNodeRwData(model, node); // a4 + union modelrwdata *rwdata = model_get_node_rw_data(model, node); // a4 struct textureconfig *tconfig; bool yielding = false; @@ -13084,7 +13084,7 @@ Gfx *tvscreenRender(struct model *model, struct modelnode *node, struct tvscreen screen->offset += 3; break; case TVCMD_SETTEXTURE: - tvscreenSetTexture(screen, cmd->arg1); + tvscreen_set_texture(screen, cmd->arg1); screen->offset += 2; break; case TVCMD_PAUSE: @@ -13102,11 +13102,11 @@ Gfx *tvscreenRender(struct model *model, struct modelnode *node, struct tvscreen } break; case TVCMD_SETCMDLIST: - tvscreenSetCmdlist(screen, (u32 *) cmd->arg1); + tvscreen_set_cmdlist(screen, (u32 *) cmd->arg1); break; case TVCMD_RANDSETCMDLIST: if ((random() >> 16) < cmd->arg2) { - tvscreenSetCmdlist(screen, (u32 *) cmd->arg1); + tvscreen_set_cmdlist(screen, (u32 *) cmd->arg1); } else { screen->offset += 3; } @@ -13305,7 +13305,7 @@ Gfx *tvscreenRender(struct model *model, struct modelnode *node, struct tvscreen if (1); - texSelect(&gdl, tconfig, arg5, arg4, 2, 1, NULL); + tex_select(&gdl, tconfig, arg5, arg4, 2, 1, NULL); gSPMatrix(gdl++, osVirtualToPhysical(model->matrices), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(gdl++, SPSEGMENT_MODEL_VTX, osVirtualToPhysical(vertices)); @@ -13321,7 +13321,7 @@ Gfx *tvscreenRender(struct model *model, struct modelnode *node, struct tvscreen } #endif -void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool xlupass) +void obj_render_prop(struct prop *prop, struct modelrenderdata *renderdata, bool xlupass) { if (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) { struct defaultobj *obj = prop->obj; @@ -13332,7 +13332,7 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x s32 sp60; orthogonal = 0; - orthogonal += (obj->flags & OBJFLAG_ORTHOGONAL) && camGetOrthogonalMtxL(); + orthogonal += (obj->flags & OBJFLAG_ORTHOGONAL) && cam_get_orthogonal_mtxl(); gdl = renderdata->gdl; @@ -13348,7 +13348,7 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x sp60 = 1; } - gdl = tvscreenRender(model, modelGetPart(model->definition, MODELPART_0000), &monitor->screen, gdl, sp60, 1); + gdl = tvscreen_render(model, model_get_part(model->definition, MODELPART_0000), &monitor->screen, gdl, sp60, 1); } } else if (obj->type == OBJTYPE_MULTIMONITOR) { if (renderdata->flags & 1) { @@ -13362,7 +13362,7 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x sp60 = 1; } - gdl = tvscreenRender(model, modelGetPart(model->definition, MODELPART_0000), &monitor->screens[0], gdl, sp60, 1); + gdl = tvscreen_render(model, model_get_part(model->definition, MODELPART_0000), &monitor->screens[0], gdl, sp60, 1); if (obj->flags2 & OBJFLAG2_DRAWONTOP) { sp60 = 0; @@ -13372,9 +13372,9 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x sp60 = 1; } - gdl = tvscreenRender(model, modelGetPart(model->definition, MODELPART_0001), &monitor->screens[1], gdl, sp60, 1); - gdl = tvscreenRender(model, modelGetPart(model->definition, MODELPART_0002), &monitor->screens[2], gdl, sp60, 1); - gdl = tvscreenRender(model, modelGetPart(model->definition, MODELPART_0003), &monitor->screens[3], gdl, sp60, 1); + gdl = tvscreen_render(model, model_get_part(model->definition, MODELPART_0001), &monitor->screens[1], gdl, sp60, 1); + gdl = tvscreen_render(model, model_get_part(model->definition, MODELPART_0002), &monitor->screens[2], gdl, sp60, 1); + gdl = tvscreen_render(model, model_get_part(model->definition, MODELPART_0003), &monitor->screens[3], gdl, sp60, 1); } } @@ -13399,7 +13399,7 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x renderdata->envcolour &= 0xffffff00; } } else { - s32 level = objGetDestroyedLevel(obj); + s32 level = obj_get_destroyed_level(obj); renderdata->cullmode = CULLMODE_NONE; @@ -13418,11 +13418,11 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x } if (orthogonal) { - gSPMatrix(gdl++, camGetOrthogonalMtxL(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, cam_get_orthogonal_mtxl(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } renderdata->gdl = gdl; - modelRender(renderdata, model); + model_render(renderdata, model); gdl = renderdata->gdl; if (obj->type == OBJTYPE_DOOR) { @@ -13430,11 +13430,11 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x } if (obj->hidden2 & (OBJH2FLAG_HASOPA << xlupass)) { - gdl = wallhitRenderPropHits(gdl, prop, xlupass); + gdl = wallhit_render_prop_hits(gdl, prop, xlupass); } if (orthogonal) { - gSPMatrix(gdl++, camGetPerspectiveMtxL(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, cam_get_perspective_mtxl(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } renderdata->gdl = gdl; @@ -13442,7 +13442,7 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x child = prop->child; while (child) { - objRenderProp(child, renderdata, xlupass); + obj_render_prop(child, renderdata, xlupass); child = child->next; } @@ -13450,19 +13450,19 @@ void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool x if (orthogonal) { player0f0c3320(model->matrices, model->definition->nummatrices); } else { - mtxF2LBulk(model->matrices, model->definition->nummatrices); + mtx_f2l_bulk(model->matrices, model->definition->nummatrices); } - if ((obj->flags3 & (OBJFLAG3_SHOWSHIELD | OBJFLAG3_SHIELDHIT)) && objIsHealthy(obj)) { + if ((obj->flags3 & (OBJFLAG3_SHOWSHIELD | OBJFLAG3_SHIELDHIT)) && obj_is_healthy(obj)) { gSPSetGeometryMode(renderdata->gdl++, G_CULL_BACK); - renderdata->gdl = shieldhitRender(renderdata->gdl, prop, prop, 0xff, 0, 0, 1, 2, 3); + renderdata->gdl = shieldhit_render(renderdata->gdl, prop, prop, 0xff, 0, 0, 1, 2, 3); } } } } -Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, u32 colour) +Gfx *gfx_render_radial_shadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, u32 colour) { Mtxf spc0; Mtxf sp80; @@ -13479,8 +13479,8 @@ Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, if (radius); - vertices = gfxAllocateVertices(4); - colours = gfxAllocateColours(1); + vertices = gfx_allocate_vertices(4); + colours = gfx_allocate_colours(1); tconfig = &g_TexShadowConfigs[0]; @@ -13490,10 +13490,10 @@ Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, pos.y = y + 2.0f; pos.z = z; - mtx = gfxAllocateMatrix(); - mtx4LoadYRotationWithTranslation(&pos, angle, &spc0); - mtx4MultMtx4(camGetWorldToScreenMtxf(), &spc0, &sp80); - mtxF2L(&sp80, mtx); + mtx = gfx_allocate_matrix(); + mtx4_load_y_rotation_with_translation(&pos, angle, &spc0); + mtx4_mult_mtx4(cam_get_world_to_screen_mtxf(), &spc0, &sp80); + mtx_f2l(&sp80, mtx); for (i = 0; i < 4; i++) { vertices[i].y = 0; @@ -13519,9 +13519,9 @@ Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, vertices[3].s = 0; vertices[3].t = tconfig->height * 32 - 1; - texSelect(&gdl, tconfig, 4, 1, 2, 1, NULL); + tex_select(&gdl, tconfig, 4, 1, 2, 1, NULL); } else { - texSelect(&gdl, NULL, 1, 1, 2, 1, NULL); + tex_select(&gdl, NULL, 1, 1, 2, 1, NULL); } gSPSetGeometryMode(gdl++, G_CULL_BACK); @@ -13534,29 +13534,29 @@ Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, return gdl; } -Gfx *objRenderShadow(struct defaultobj *obj, Gfx *gdl) +Gfx *obj_render_shadow(struct defaultobj *obj, Gfx *gdl) { f32 angle; f32 y; #if VERSION >= VERSION_NTSC_1_0 - s32 room = cdFindFloorRoomYColourFlagsAtPos(&obj->prop->pos, obj->prop->rooms, &y, NULL, NULL); + s32 room = cd_find_floor_room_y_colour_flags_at_pos(&obj->prop->pos, obj->prop->rooms, &y, NULL, NULL); #else - s32 room = cdFindFloorRoomYColourFlagsAtPos(&obj->prop->pos, obj->prop->rooms, &y, NULL); + s32 room = cd_find_floor_room_y_colour_flags_at_pos(&obj->prop->pos, obj->prop->rooms, &y, NULL); #endif if (room > 0 && (obj->modelnum == MODEL_HOOVERBOT || obj->modelnum == MODEL_TESTERBOT)) { - angle = hoverpropGetTurnAngle(obj); - gdl = gfxRenderRadialShadow(gdl, obj->prop->pos.x, y, obj->prop->pos.z, angle, 20, 0xffffff78); + angle = hoverprop_get_turn_angle(obj); + gdl = gfx_render_radial_shadow(gdl, obj->prop->pos.x, y, obj->prop->pos.z, angle, 20, 0xffffff78); } else if (room > 0) { - angle = hoverpropGetTurnAngle(obj); - gdl = gfxRenderRadialShadow(gdl, obj->prop->pos.x, y, obj->prop->pos.z, angle, 30, 0xffffff78); + angle = hoverprop_get_turn_angle(obj); + gdl = gfx_render_radial_shadow(gdl, obj->prop->pos.x, y, obj->prop->pos.z, angle, 30, 0xffffff78); } return gdl; } -Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) +Gfx *obj_render(struct prop *prop, Gfx *gdl, bool xlupass) { f32 shadecolourfracs[4]; s32 shademode; @@ -13581,14 +13581,14 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) f32 objdist; s32 i; - shademode = envGetObjShadeMode(prop, shadecolourfracs); + shademode = env_get_obj_shade_mode(prop, shadecolourfracs); if (shademode == SHADEMODE_XLU) { return gdl; } if (obj->type != OBJTYPE_TINTEDGLASS) { - frac = objCalculateFadeDistOpacityFrac(prop, modelGetEffectiveScale(obj->model)); + frac = obj_calculate_fade_dist_opacity_frac(prop, model_get_effective_scale(obj->model)); if (prop->timetoregen > 0 && prop->timetoregen < TICKS(60)) { frac *= (TICKS(60.0f) - prop->timetoregen) * (PAL ? 0.019999999552965f : 0.016666667535901f); @@ -13664,9 +13664,9 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) if (door->doortype == DOORTYPE_LASER) { node = func0f0687e4(obj->model); dldata1 = &node->rodata->dl; - dldata2 = (struct modelrwdata_dl *) modelGetNodeRwData(obj->model, node); + dldata2 = (struct modelrwdata_dl *) model_get_node_rw_data(obj->model, node); oldcolours = (Col *) ((((uintptr_t) &dldata1->vertices[dldata1->numvertices] + 7) | 7) ^ 7); - newcolours = (Col *) gfxAllocateColours(dldata1->numcolours); + newcolours = (Col *) gfx_allocate_colours(dldata1->numcolours); for (i = 0; i < dldata1->numcolours; i++) { newcolours[i] = oldcolours[i]; @@ -13678,9 +13678,9 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) } if ((obj->flags2 & OBJFLAG2_CANFILLVIEWPORT) == 0 && func0f08e5a8(prop->rooms, &screenbox) > 0) { - gdl = bgScissorWithinViewport(gdl, screenbox.xmin, screenbox.ymin, screenbox.xmax, screenbox.ymax); + gdl = bg_scissor_within_viewport(gdl, screenbox.xmin, screenbox.ymin, screenbox.xmax, screenbox.ymax); } else { - gdl = bgScissorToViewport(gdl); + gdl = bg_scissor_to_viewport(gdl); } renderdata.flags = sp84; @@ -13728,7 +13728,7 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) } if (g_Vars.normmplayerisrunning) { - scenarioHighlightProp(prop, colour); + scenario_highlight_prop(prop, colour); } if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { @@ -13749,7 +13749,7 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) } } - healththing = objGetShotsTaken(obj); + healththing = obj_get_shots_taken(obj); mult = 0xff - (healththing * 21); if (mult < 0) { @@ -13765,7 +13765,7 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) colour[3] = 0xff; } - objMergeColourFracs(colour, shademode, shadecolourfracs); + obj_merge_colour_fracs(colour, shademode, shadecolourfracs); if (USINGDEVICE(DEVICE_NIGHTVISION)) { if ((obj->flags & OBJFLAG_PATHBLOCKER) == 0) { @@ -13784,7 +13784,7 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) } renderdata.fogcolour = colour[0] << 24 | colour[1] << 16 | colour[2] << 8 | colour[3]; - objRenderProp(prop, &renderdata, xlupass); + obj_render_prop(prop, &renderdata, xlupass); gdl = renderdata.gdl; @@ -13793,30 +13793,30 @@ Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass) || obj->type == OBJTYPE_HOVERBIKE || obj->modelnum == MODEL_HOOVERBOT || obj->modelnum == MODEL_TESTERBOT) { - gdl = objRenderShadow(obj, gdl); + gdl = obj_render_shadow(obj, gdl); } if (obj->modelnum == MODEL_A51INTERCEPTOR && (obj->flags & OBJFLAG_CHOPPER_INACTIVE)) { - gdl = objRenderShadow(obj, gdl); + gdl = obj_render_shadow(obj, gdl); } } return gdl; } -bool modelIsNodeNotTvscreen(struct modeldef *modeldef, struct modelnode *node) +bool model_is_node_not_tvscreen(struct modeldef *modeldef, struct modelnode *node) { if (modeldef->skel == &g_SkelTerminal) { - if (modelGetPart(modeldef, MODELPART_TERMINAL_0000) == node) { + if (model_get_part(modeldef, MODELPART_TERMINAL_0000) == node) { return false; } } if (modeldef->skel == &g_SkelCiHub) { - if (modelGetPart(modeldef, MODELPART_CIHUB_0000) == node - || modelGetPart(modeldef, MODELPART_CIHUB_0001) == node - || modelGetPart(modeldef, MODELPART_CIHUB_0002) == node - || modelGetPart(modeldef, MODELPART_CIHUB_0003) == node) { + if (model_get_part(modeldef, MODELPART_CIHUB_0000) == node + || model_get_part(modeldef, MODELPART_CIHUB_0001) == node + || model_get_part(modeldef, MODELPART_CIHUB_0002) == node + || model_get_part(modeldef, MODELPART_CIHUB_0003) == node) { return false; } } @@ -13827,7 +13827,7 @@ bool modelIsNodeNotTvscreen(struct modeldef *modeldef, struct modelnode *node) /** * Deform an object due to it being destroyed. */ -void objDeform(struct defaultobj *obj, s32 level) +void obj_deform(struct defaultobj *obj, s32 level) { f32 min; f32 max; @@ -13852,20 +13852,20 @@ void objDeform(struct defaultobj *obj, s32 level) s32 axis; s32 chance; - psStopSound(obj->prop, PSTYPE_COMMHUB, 0xffff); + ps_stop_sound(obj->prop, PSTYPE_COMMHUB, 0xffff); salt = 0; - if (debugIsObjDeformDebugEnabled()); - if (debugIsObjDeformDebugEnabled()); + if (debug_is_obj_deform_debug_enabled()); + if (debug_is_obj_deform_debug_enabled()); salt = random(); - if (debugIsObjDeformDebugEnabled()) { + if (debug_is_obj_deform_debug_enabled()) { salt &= 0xffff; } - wallhitsFreeByProp(obj->prop, 1); + wallhits_free_by_prop(obj->prop, 1); swap = false; axis = 1; @@ -13892,17 +13892,17 @@ void objDeform(struct defaultobj *obj, s32 level) min = 99999.0f; max = -99999.0f; - bbox = modelFindBboxRodata(model); + bbox = model_find_bbox_rodata(model); if (axis == 0) { - min = objGetLocalXMin(bbox); - max = objGetLocalXMax(bbox); + min = obj_get_local_x_min(bbox); + max = obj_get_local_x_max(bbox); } else if (axis == 1) { - min = objGetLocalYMin(bbox); - max = objGetLocalYMax(bbox); + min = obj_get_local_y_min(bbox); + max = obj_get_local_y_max(bbox); } else if (axis == 2) { - min = objGetLocalZMin(bbox); - max = objGetLocalZMax(bbox); + min = obj_get_local_z_min(bbox); + max = obj_get_local_z_max(bbox); } if (swap) { @@ -13958,10 +13958,10 @@ void objDeform(struct defaultobj *obj, s32 level) parent = parent->parent; } - if (modelIsNodeNotTvscreen(modeldef, node) && parentbbox == bbox) { + if (model_is_node_not_tvscreen(modeldef, node) && parentbbox == bbox) { struct modelrodata_dl *rodata = &node->rodata->dl; struct modelrwdata_dl *rwdata = (struct modelrwdata_dl *)&model->rwdatas[rodata->rwdataindex]; - Vtx *vertices = vtxstoreAllocate(rodata->numvertices, VTXSTORETYPE_OBJVTX, node, objGetDestroyedLevel(obj)); + Vtx *vertices = vtxstore_allocate(rodata->numvertices, VTXSTORETYPE_OBJVTX, node, obj_get_destroyed_level(obj)); if (vertices) { if (rwdata->vertices != rodata->vertices) { @@ -13970,7 +13970,7 @@ void objDeform(struct defaultobj *obj, s32 level) vertices[i] = rwdata->vertices[i]; } - vtxstoreFree(VTXSTORETYPE_OBJVTX, rwdata->vertices); + vtxstore_free(VTXSTORETYPE_OBJVTX, rwdata->vertices); } else { // Replacing original vertices with modified vertices for (i = 0; i < rodata->numvertices; i++) { @@ -13984,7 +13984,7 @@ void objDeform(struct defaultobj *obj, s32 level) } if ((uintptr_t)rwdata->colours == ALIGN8((uintptr_t)&rodata->vertices[rodata->numvertices])) { - Col *colours = vtxstoreAllocate(rodata->numcolours, VTXSTORETYPE_OBJCOL, NULL, 0); + Col *colours = vtxstore_allocate(rodata->numcolours, VTXSTORETYPE_OBJCOL, NULL, 0); if (colours) { for (i = 0; i < rodata->numcolours; i++) { @@ -14007,7 +14007,7 @@ void objDeform(struct defaultobj *obj, s32 level) for (i = 0; i < rodata->numvertices; i++) { s16 tmp = average; - rng2SetSeed(rodata->vertices[i].x + rodata->vertices[i].y + rodata->vertices[i].z + salt); + rng2_set_seed(rodata->vertices[i].x + rodata->vertices[i].y + rodata->vertices[i].z + salt); #if VERSION < VERSION_NTSC_1_0 if (uninitialisedvariable) @@ -14066,13 +14066,13 @@ void objDeform(struct defaultobj *obj, s32 level) } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(obj->model, node); + model_apply_distance_relations(obj->model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(obj->model, node); + model_apply_toggle_relations(obj->model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(obj->model, node); + model_apply_head_relations(obj->model, node); break; } @@ -14092,7 +14092,7 @@ void objDeform(struct defaultobj *obj, s32 level) if ((obj->hidden2 & OBJH2FLAG_80) == 0) { if (!ok) { - modelFreeVertices(VTXSTORETYPE_OBJVTX, model); + model_free_vertices(VTXSTORETYPE_OBJVTX, model); } else { obj->hidden2 |= OBJH2FLAG_80; } @@ -14102,7 +14102,7 @@ void objDeform(struct defaultobj *obj, s32 level) /** * Bounce an object, such as a hoverbot when it's destroyed. */ -void objBounce(struct defaultobj *obj, struct coord *gundir2d) +void obj_bounce(struct defaultobj *obj, struct coord *gundir2d) { struct coord dir; struct coord rot = {0, 0, 0}; @@ -14131,7 +14131,7 @@ void objBounce(struct defaultobj *obj, struct coord *gundir2d) rot.z = RANDOMFRAC() * 0.024539785f - 0.012269893f; #endif - mtx4LoadRotation(&rot, &projectile->mtx); + mtx4_load_rotation(&rot, &projectile->mtx); projectile->flags |= PROJECTILEFLAG_AIRBORNE; @@ -14139,7 +14139,7 @@ void objBounce(struct defaultobj *obj, struct coord *gundir2d) dir.y = gundir2d->y; dir.z = gundir2d->z; - mtx4RotateVecInPlace(camGetProjectionMtxF(), &dir); + mtx4_rotate_vec_in_place(cam_get_projection_mtxf(), &dir); projectile->speed.x += 3.3333333f * dir.x; projectile->speed.z += 3.3333333f * dir.z; @@ -14148,7 +14148,7 @@ void objBounce(struct defaultobj *obj, struct coord *gundir2d) } } -void objSetDropped(struct prop *prop, u32 droptype) +void obj_set_dropped(struct prop *prop, u32 droptype) { struct prop *parent = prop->parent; @@ -14172,7 +14172,7 @@ void objSetDropped(struct prop *prop, u32 droptype) } } -void objApplyMomentum(struct defaultobj *obj, struct coord *speed, f32 rotation, bool addspeed, bool addrotation) +void obj_apply_momentum(struct defaultobj *obj, struct coord *speed, f32 rotation, bool addspeed, bool addrotation) { struct projectile *projectile = NULL; struct modelrodata_bbox *bbox; @@ -14225,10 +14225,10 @@ void objApplyMomentum(struct defaultobj *obj, struct coord *speed, f32 rotation, return; } - bbox = objFindBboxRodata(obj); + bbox = obj_find_bbox_rodata(obj); - sp24 = objGetRotatedLocalXMaxByMtx3(bbox, obj->realrot) - objGetRotatedLocalXMinByMtx3(bbox, obj->realrot); - sp20 = objGetRotatedLocalZMaxByMtx3(bbox, obj->realrot) - objGetRotatedLocalZMinByMtx3(bbox, obj->realrot); + sp24 = obj_get_rotated_local_x_max_by_mtx3(bbox, obj->realrot) - obj_get_rotated_local_x_min_by_mtx3(bbox, obj->realrot); + sp20 = obj_get_rotated_local_z_max_by_mtx3(bbox, obj->realrot) - obj_get_rotated_local_z_min_by_mtx3(bbox, obj->realrot); if (sp24 > 150.0f || sp20 > 150.0f) { projectile->unk08c = 0.1f; @@ -14279,7 +14279,7 @@ extern u8 _blankSegmentRomStart; * a particular payload, the function must sum the lengths of the payloads * before it. */ -void piracyRestore(void) +void piracy_restore(void) { s32 i; u32 writeaddr; @@ -14299,7 +14299,7 @@ void piracyRestore(void) } // Copy the writeaddr/copylen pairs from ROM to the buffer - dmaExec(ptr, (romptr_t) &_blankSegmentRomStart, 0x40); + dma_exec(ptr, (romptr_t) &_blankSegmentRomStart, 0x40); // Calculate what needs to be copied and where i = 0; @@ -14317,7 +14317,7 @@ void piracyRestore(void) // Copy it if (copylen != 0) { - dmaExec((void *) writeaddr, (romptr_t) &_blankSegmentRomStart + readoffset, copylen); + dma_exec((void *) writeaddr, (romptr_t) &_blankSegmentRomStart + readoffset, copylen); } // Increment the index, so the next time the function is called @@ -14344,10 +14344,10 @@ void func0f082e84(struct defaultobj *obj, struct coord *pos, struct coord *dir, speed.f[0] += a * dir->f[0] * 0.2f; speed.f[2] += a * dir->f[2] * 0.2f; - objApplyMomentum(obj, &speed, a * d * 0.0001f, true, addrotation); + obj_apply_momentum(obj, &speed, a * d * 0.0001f, true, addrotation); } -void objDetach(struct prop *prop) +void obj_detach(struct prop *prop) { struct prop *parent = prop->parent; @@ -14355,7 +14355,7 @@ void objDetach(struct prop *prop) struct defaultobj *obj = prop->obj; struct model *model = obj->model; - propDetach(prop); + prop_detach(prop); model->attachedtomodel = NULL; model->attachedtonode = NULL; @@ -14371,12 +14371,12 @@ void objDetach(struct prop *prop) } if (prop == chr->weapons_held[HAND_RIGHT]) { - chrSetFiring(chr, HAND_RIGHT, false); + chr_set_firing(chr, HAND_RIGHT, false); chr->weapons_held[HAND_RIGHT] = NULL; } if (prop == chr->weapons_held[HAND_LEFT]) { - chrSetFiring(chr, HAND_LEFT, false); + chr_set_firing(chr, HAND_LEFT, false); chr->weapons_held[HAND_LEFT] = NULL; } } @@ -14384,7 +14384,7 @@ void objDetach(struct prop *prop) } } -bool objDrop(struct prop *prop, bool lazy) +bool obj_drop(struct prop *prop, bool lazy) { struct prop *parent = prop->parent; struct defaultobj *obj = prop->obj; @@ -14397,7 +14397,7 @@ bool objDrop(struct prop *prop, bool lazy) if ((obj->hidden & OBJHFLAG_EMBEDDED) && obj->embedment->projectile) { struct projectile *projectile2 = obj->embedment->projectile; - embedmentFree(obj->embedment); + embedment_free(obj->embedment); obj->projectile = projectile2; obj->hidden &= ~OBJHFLAG_EMBEDDED; @@ -14427,11 +14427,11 @@ bool objDrop(struct prop *prop, bool lazy) f32 spa4; f32 spa0; - node1 = objFindBboxNode(obj); - modelNodeGetPosition(obj->model, modelNodeFindMtxNode(node1), &spb8); + node1 = obj_find_bbox_node(obj); + model_node_get_position(obj->model, model_node_find_mtx_node(node1), &spb8); - node2 = objFindBboxNode(rootobj); - modelNodeGetPosition(rootobj->model, modelNodeFindMtxNode(node2), &spa8); + node2 = obj_find_bbox_node(rootobj); + model_node_get_position(rootobj->model, model_node_find_mtx_node(node2), &spa8); spe4.x = spb8.x - spa8.x; spe4.y = spb8.y - spa8.y; @@ -14452,19 +14452,19 @@ bool objDrop(struct prop *prop, bool lazy) projectile->speed.x += spa4 * sinf(spa0); projectile->speed.z += spa4 * cosf(spa0); - mtx3ToMtx4(rootobj->realrot, &spf0); + mtx3_to_mtx4(rootobj->realrot, &spf0); spe4.x += root->pos.x; spe4.y += root->pos.y; spe4.z += root->pos.z; - mtx4SetTranslation(&spe4, &spf0); + mtx4_set_translation(&spe4, &spf0); func0f065e74(&root->pos, root->rooms, &spe4, rooms); } else { if (projectile->droptype == DROPTYPE_SURRENDER && parent->type == PROPTYPE_CHR) { struct chrdata *chr = parent->chr; struct coord rot = {0, 0, 0}; - f32 angle = chrGetInverseTheta(chr); + f32 angle = chr_get_inverse_theta(chr); projectile->speed.x = sinf(angle) * 1.6666666269302f; projectile->speed.y = -RANDOMFRAC() * 0.83333331346512f; @@ -14474,17 +14474,17 @@ bool objDrop(struct prop *prop, bool lazy) rot.y = RANDOMFRAC() * PALUPF(0.012269892729819f) - PALUPF(0.0061349463649094f); rot.z = RANDOMFRAC() * PALUPF(0.012269892729819f) - PALUPF(0.0061349463649094f); - mtx4LoadRotation(&rot, (Mtxf *)&projectile->mtx); + mtx4_load_rotation(&rot, (Mtxf *)&projectile->mtx); } else if (projectile->droptype == DROPTYPE_THROWGRENADE && parent->type == PROPTYPE_CHR) { struct chrdata *chr = parent->chr; struct coord rot = {0, 0, 0}; - f32 angle = chrGetInverseTheta(chr); + f32 angle = chr_get_inverse_theta(chr); f32 dist; if (chr->aibot) { - dist = chrGetDistanceToTarget(chr); + dist = chr_get_distance_to_target(chr); } else { - dist = chrGetAttackEntityDistance(chr, chr->act_throwgrenade.flags, chr->act_throwgrenade.entityid); + dist = chr_get_attack_entity_distance(chr, chr->act_throwgrenade.flags, chr->act_throwgrenade.entityid); } if (chr->aibot == NULL && dist < 300) { @@ -14499,8 +14499,8 @@ bool objDrop(struct prop *prop, bool lazy) rot.y = RANDOMFRAC() * PALUPF(0.012269892729819f) - PALUPF(0.0061349463649094f); rot.z = RANDOMFRAC() * PALUPF(0.012269892729819f) - PALUPF(0.0061349463649094f); - mtx4LoadRotation(&rot, (Mtxf *)&projectile->mtx); - projectileSetSticky(prop); + mtx4_load_rotation(&rot, (Mtxf *)&projectile->mtx); + projectile_set_sticky(prop); } else if (projectile->droptype == DROPTYPE_HAT) { struct coord rot = {0, 0, 0}; struct prop *playerprop = g_Vars.currentplayer->prop; @@ -14516,7 +14516,7 @@ bool objDrop(struct prop *prop, bool lazy) rot.y = RANDOMFRAC() * PALUPF(0.049079570919275f) - PALUPF(0.024539785459638f); rot.z = RANDOMFRAC() * PALUPF(0.049079570919275f) - PALUPF(0.024539785459638f); - mtx4LoadRotation(&rot, (Mtxf *)&projectile->mtx); + mtx4_load_rotation(&rot, (Mtxf *)&projectile->mtx); } else if (projectile->droptype == DROPTYPE_OWNERREAP) { struct coord rot = {0, 0, 0}; @@ -14528,7 +14528,7 @@ bool objDrop(struct prop *prop, bool lazy) rot.y = RANDOMFRAC() * PALUPF(0.049079570919275f) - PALUPF(0.024539785459638f); rot.z = RANDOMFRAC() * PALUPF(0.049079570919275f) - PALUPF(0.024539785459638f); - mtx4LoadRotation(&rot, (Mtxf *)&projectile->mtx); + mtx4_load_rotation(&rot, (Mtxf *)&projectile->mtx); } else { // DROPTYPE_OWNERREAP func0f0964b4(&projectile->speed, (Mtxf *)&projectile->mtx); @@ -14536,50 +14536,50 @@ bool objDrop(struct prop *prop, bool lazy) if (!lazy && (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK)) { // Do collision checks - Mtxf *sp48 = modelGetRootMtx(model); - mtx00015be4(camGetProjectionMtxF(), sp48, &spf0); - propSetPerimEnabled(root, false); + Mtxf *sp48 = model_get_root_mtx(model); + mtx00015be4(cam_get_projection_mtxf(), sp48, &spf0); + prop_set_perim_enabled(root, false); spe4.x = spf0.m[3][0]; spe4.y = spf0.m[3][1]; spe4.z = spf0.m[3][2]; - if (cdTestLos10(&root->pos, root->rooms, &spe4, rooms, CDTYPE_ALL, + if (cd_test_los10(&root->pos, root->rooms, &spe4, rooms, CDTYPE_ALL, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2 | GEOFLAG_WALL) == CDRESULT_COLLISION || (projectile->flags & PROJECTILEFLAG_STICKY) == 0) { - if (cdTestVolume(&spe4, objGetRadius(obj), rooms, CDTYPE_ALL, CHECKVERTICAL_NO, 0.0f, 0) == CDRESULT_COLLISION) { + if (cd_test_volume(&spe4, obj_get_radius(obj), rooms, CDTYPE_ALL, CHECKVERTICAL_NO, 0.0f, 0) == CDRESULT_COLLISION) { spf0.m[3][0] = root->pos.x; spf0.m[3][2] = root->pos.z; } } - propSetPerimEnabled(root, true); + prop_set_perim_enabled(root, true); prop->z = -sp48->m[3][2]; } else { // No collision checks - mtx4LoadIdentity(&spf0); + mtx4_load_identity(&spf0); mtx00015f04(model->scale, &spf0); - mtx4SetTranslation(&root->pos, &spf0); - roomsCopy(root->rooms, rooms); + mtx4_set_translation(&root->pos, &spf0); + rooms_copy(root->rooms, rooms); } } - objDetach(prop); - propActivate(prop); - propEnable(prop); + obj_detach(prop); + prop_activate(prop); + prop_enable(prop); prop->pos.x = spf0.m[3][0]; prop->pos.y = spf0.m[3][1]; prop->pos.z = spf0.m[3][2]; - propDeregisterRooms(prop); - roomsCopy(rooms, prop->rooms); + prop_deregister_rooms(prop); + rooms_copy(rooms, prop->rooms); spf0.m[3][0] = 0; spf0.m[3][1] = 0; spf0.m[3][2] = 0; - mtx4ToMtx3(&spf0, obj->realrot); + mtx4_to_mtx3(&spf0, obj->realrot); func0f069c70(obj, true, true); obj->shadecol[0] = obj->nextcol[0]; @@ -14593,7 +14593,7 @@ bool objDrop(struct prop *prop, bool lazy) struct weaponobj *weapon = (struct weaponobj *)obj; if (weapon->weaponnum == WEAPON_GRENADE && weapon->timer240 >= 0) { - propSetDangerous(prop); + prop_set_dangerous(prop); } } @@ -14607,7 +14607,7 @@ bool objDrop(struct prop *prop, bool lazy) * Make an object fall. Eg. due to it sitting on a table which is now destroyed, * or because it was a chopper that is now destroyed. */ -void objFall(struct defaultobj *obj, s32 playernum) +void obj_fall(struct defaultobj *obj, s32 playernum) { #if VERSION >= VERSION_NTSC_1_0 if (obj->type == OBJTYPE_AUTOGUN && g_Vars.normmplayerisrunning) { @@ -14651,7 +14651,7 @@ void objFall(struct defaultobj *obj, s32 playernum) #endif } - mtx4LoadRotation(&rot, &projectile->mtx); + mtx4_load_rotation(&rot, &projectile->mtx); projectile->flags |= PROJECTILEFLAG_AIRBORNE; @@ -14667,7 +14667,7 @@ void objFall(struct defaultobj *obj, s32 playernum) * For example, destroying a table will also destroy all the props that are * sitting on that table. */ -void objDestroySupportedObjects(struct prop *tableprop, s32 playernum) +void obj_destroy_supported_objects(struct prop *tableprop, s32 playernum) { struct prop *prop; s16 *propnumptr; @@ -14675,8 +14675,8 @@ void objDestroySupportedObjects(struct prop *tableprop, s32 playernum) u8 *start; u8 *end; - if (propUpdateGeometry(tableprop, &start, &end)) { - roomGetProps(tableprop->rooms, propnums, 256); + if (prop_update_geometry(tableprop, &start, &end)) { + room_get_props(tableprop->rooms, propnums, 256); propnumptr = propnums; @@ -14692,8 +14692,8 @@ void objDestroySupportedObjects(struct prop *tableprop, s32 playernum) { if (prop->pos.y > tableprop->pos.y && (obj->hidden & OBJHFLAG_00008000) - && cd000266a4(prop->pos.x, prop->pos.z, (struct geo *)start)) { - objFall(obj, playernum); + && cd_000266a4(prop->pos.x, prop->pos.z, (struct geo *)start)) { + obj_fall(obj, playernum); } } } @@ -14703,9 +14703,9 @@ void objDestroySupportedObjects(struct prop *tableprop, s32 playernum) } } -void objCheckDestroyed(struct defaultobj *obj, struct coord *pos, s32 playernum) +void obj_check_destroyed(struct defaultobj *obj, struct coord *pos, s32 playernum) { - if (obj->damage > obj->maxdamage || objGetDestroyedLevel(obj)) { + if (obj->damage > obj->maxdamage || obj_get_destroyed_level(obj)) { struct prop *prop = obj->prop; struct prop *rootprop = prop; s16 exptype = g_PropExplosionTypes[8 + obj->modelnum]; @@ -14720,20 +14720,20 @@ void objCheckDestroyed(struct defaultobj *obj, struct coord *pos, s32 playernum) rootprop = rootprop->parent; } - if (objGetDestroyedLevel(obj) == 0) { + if (obj_get_destroyed_level(obj) == 0) { // Obj is now destroyed obj->damage = 0; obj->hidden2 |= OBJH2FLAG_DESTROYED; func0f065e74(&rootprop->pos, rootprop->rooms, pos, rooms); - explosionCreateComplex(prop, pos, rooms, exptype, playernum); + explosion_create_complex(prop, pos, rooms, exptype, playernum); if (obj->flags2 & OBJFLAG2_REMOVEWHENDESTROYED) { obj->hidden |= OBJHFLAG_DELETING; } else if (obj->type == OBJTYPE_CHOPPER) { struct chopperobj *chopper = (struct chopperobj *)obj; - objFall(obj, playernum); + obj_fall(obj, playernum); chopper->attackmode = CHOPPERMODE_FALL; chopper->timer60 = (obj->flags & OBJFLAG_CHOPPER_INACTIVE) ? 0 : 2; @@ -14749,11 +14749,11 @@ void objCheckDestroyed(struct defaultobj *obj, struct coord *pos, s32 playernum) hovercar->deadtimer60 = TICKS(250); hovercar->sparkstimer60 = TICKS(50); - bgunCalculatePlayerShotSpread(&gunpos2d, &gundir2d, HAND_RIGHT, false); - objBounce(obj, &gundir2d); + bgun_calculate_player_shot_spread(&gunpos2d, &gundir2d, HAND_RIGHT, false); + obj_bounce(obj, &gundir2d); } else if (obj->modelnum == MODEL_TAXICAB || obj->modelnum == MODEL_POLICECAR) { // Taxi and police car (limo) fall to the ground and retain collision - objDeform(obj, 10); + obj_deform(obj, 10); hovercar->dead = true; hovercar->speed = 0.0f; @@ -14761,38 +14761,38 @@ void objCheckDestroyed(struct defaultobj *obj, struct coord *pos, s32 playernum) hovercar->speedaim += 10.0f; } else { // Cars in Defection "explode" but actually warp to their next path - explosionCreateSimple(prop, &prop->pos, prop->rooms, exptype, playernum); - hovercarStartNextPath(hovercar); + explosion_create_simple(prop, &prop->pos, prop->rooms, exptype, playernum); + hovercar_start_next_path(hovercar); } } else { // Other objects - objDeform(obj, 1); + obj_deform(obj, 1); if (rootprop == prop) { - objDestroySupportedObjects(prop, playernum); + obj_destroy_supported_objects(prop, playernum); if ((obj->hidden & OBJHFLAG_00008000) == 0) { obj->hidden |= OBJHFLAG_00010000; - objFall(obj, playernum); + obj_fall(obj, playernum); } } } } else { - s32 shotstaken = objGetShotsTaken(obj); + s32 shotstaken = obj_get_shots_taken(obj); if ((shotstaken % 4) == 0) { if (obj->type != OBJTYPE_CHOPPER && obj->type != OBJTYPE_HOVERCAR) { - objDeform(obj, (shotstaken >> 2) + 1); + obj_deform(obj, (shotstaken >> 2) + 1); } func0f065e74(&rootprop->pos, rootprop->rooms, pos, rooms); if (exptype != EXPLOSIONTYPE_NONE) { - explosionCreateSimple(prop, pos, rooms, EXPLOSIONTYPE_6, playernum); + explosion_create_simple(prop, pos, rooms, EXPLOSIONTYPE_6, playernum); } } - if (objGetDestroyedLevel(obj) > 0) { + if (obj_get_destroyed_level(obj) > 0) { if (obj->hidden2 & OBJH2FLAG_CANREGEN) { if (obj->hidden & OBJHFLAG_00001000) { obj->hidden2 |= OBJH2FLAG_10; @@ -14834,20 +14834,20 @@ bool func0f084594(struct model *model, struct modelnode *node, struct coord *arg rodata = &node->rodata->bbox; - mtxindex = modelFindNodeMtxIndex(node, 0); + mtxindex = model_find_node_mtx_index(node, 0); mtx000172f0(model->matrices[mtxindex].m, mtx.m); spb8.x = arg2->x; spb8.y = arg2->y; spb8.z = arg2->z; - mtx4TransformVecInPlace(&mtx, &spb8); + mtx4_transform_vec_in_place(&mtx, &spb8); spac.x = arg3->x; spac.y = arg3->y; spac.z = arg3->z; - mtx4RotateVecInPlace(&mtx, &spac); + mtx4_rotate_vec_in_place(&mtx, &spac); if (var8005efc0 != 0.0f) { min.x = rodata->xmin - var8005efc0; @@ -14974,7 +14974,7 @@ bool func0f0849dc(struct model *model, struct modelnode *nodearg, struct coord * case MODELNODETYPE_DL: { struct modelrodata_dl *rodata = &node->rodata->dl; - struct modelrwdata_dl *rwdata = modelGetNodeRwData(model, node); + struct modelrwdata_dl *rwdata = model_get_node_rw_data(model, node); if (rwdata->gdl != NULL) { if (rwdata->gdl == rodata->opagdl) { @@ -15007,18 +15007,18 @@ bool func0f0849dc(struct model *model, struct modelnode *nodearg, struct coord * } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, node); + model_apply_distance_relations(model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, node); + model_apply_toggle_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; } if (s3 != NULL) { - s32 mtxindex = modelFindNodeMtxIndex(node, 0); + s32 mtxindex = model_find_node_mtx_index(node, 0); Mtxf *mtx = NULL; Mtxf sp64; @@ -15035,20 +15035,20 @@ bool func0f0849dc(struct model *model, struct modelnode *nodearg, struct coord * spec.y = arg2->y; spec.z = arg2->z; - mtx4TransformVecInPlace(&sp64, &spec); + mtx4_transform_vec_in_place(&sp64, &spec); spd4.x = arg3->x; spd4.y = arg3->y; spd4.z = arg3->z; - mtx4RotateVecInPlace(&sp64, &spd4); + mtx4_rotate_vec_in_place(&sp64, &spd4); spe0.x = spd4.x * 32767.0f + spec.x; spe0.y = spd4.y * 32767.0f + spec.y; spe0.z = spd4.z * 32767.0f + spec.z; } - if (bgTestHitOnObj(&spec, &spe0, &spd4, s3, s5, vertices, hitthing)) { + if (bg_test_hit_on_obj(&spec, &spe0, &spd4, s3, s5, vertices, hitthing)) { *dstmtxindex = mtxindex; *dstnode = node; done = true; @@ -15084,21 +15084,21 @@ u32 add43214321(u32 value) } #endif -void glassDestroy(struct defaultobj *obj) +void glass_destroy(struct defaultobj *obj) { struct prop *prop = obj->prop; - struct modelrodata_bbox *bbox = objFindBboxRodata(obj); + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(obj); - wallhitsFreeByProp(prop, 0); - wallhitsFreeByProp(prop, 1); + wallhits_free_by_prop(prop, 0); + wallhits_free_by_prop(prop, 1); if (obj->modelnum == MODEL_AIVILLABOT1 || obj->modelnum == MODEL_AIVILLABOT2 || obj->modelnum == MODEL_AIVILLABOT3) { - shardsCreate(&prop->pos, &obj->realrot[0][0], &obj->realrot[1][0], &obj->realrot[2][0], + shards_create(&prop->pos, &obj->realrot[0][0], &obj->realrot[1][0], &obj->realrot[2][0], bbox->xmin, bbox->xmax, bbox->ymin, bbox->ymax, SHARDTYPE_BOTTLE, prop); } else { - shardsCreate(&prop->pos, &obj->realrot[0][0], &obj->realrot[1][0], &obj->realrot[2][0], + shards_create(&prop->pos, &obj->realrot[0][0], &obj->realrot[1][0], &obj->realrot[2][0], bbox->xmin, bbox->xmax, bbox->ymin, bbox->ymax, SHARDTYPE_GLASS, prop); } @@ -15112,7 +15112,7 @@ void glassDestroy(struct defaultobj *obj) u32 *ptr; u32 romaddr = add43214321(0x00000dc0 - 0x43214321); ptr = (u32 *) ALIGN16((uintptr_t)buffer); - dmaExec(ptr, romaddr, 0x10); + dma_exec(ptr, romaddr, 0x10); if (ptr[1] + ptr[0] != add43214321(0x10a78f00e - 0x43214321)) { osAiSetFrequency(80000); @@ -15125,7 +15125,7 @@ void glassDestroy(struct defaultobj *obj) obj->hidden2 |= OBJH2FLAG_DESTROYED; } -void doorDestroyGlass(struct doorobj *door) +void door_destroy_glass(struct doorobj *door) { struct modelnode *node; bool closed; @@ -15135,7 +15135,7 @@ void doorDestroyGlass(struct doorobj *door) union modelrwdata *rwdata; Mtxf matrix; - rodata = modelGetPartRodata(model->definition, MODELPART_WINDOWEDDOOR_0002); + rodata = model_get_part_rodata(model->definition, MODELPART_WINDOWEDDOOR_0002); if (door->portalnum >= 0) { // @bug: Firing three shots at door glass is supposed to destroy it, @@ -15155,17 +15155,17 @@ void doorDestroyGlass(struct doorobj *door) } func0f08c424(door, &matrix); - shardsCreate((struct coord *) &matrix.m[3][0], &matrix.m[0][0], &matrix.m[1][0], &matrix.m[2][0], + shards_create((struct coord *) &matrix.m[3][0], &matrix.m[0][0], &matrix.m[1][0], &matrix.m[2][0], rodata->bbox.xmin, rodata->bbox.xmax, rodata->bbox.ymin, rodata->bbox.ymax, SHARDTYPE_GLASS, prop); - wallhitsFreeByProp(prop, 1); + wallhits_free_by_prop(prop, 1); - node = modelGetPart(model->definition, MODELPART_WINDOWEDDOOR_0001); - rwdata = modelGetNodeRwData(model, node); + node = model_get_part(model->definition, MODELPART_WINDOWEDDOOR_0001); + rwdata = model_get_node_rw_data(model, node); rwdata->toggle.visible = false; } -void cctvHandleLensShot(struct defaultobj *obj) +void cctv_handle_lens_shot(struct defaultobj *obj) { struct prop *prop = obj->prop; struct model *model = obj->model; @@ -15175,17 +15175,17 @@ void cctvHandleLensShot(struct defaultobj *obj) Mtxf matrix; if (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) { - rodata = modelGetPartRodata(model->definition, MODELPART_CCTV_0002); - sp7c = modelFindNodeMtx(model, modelGetPart(model->definition, MODELPART_CCTV_LENS), 0); - mtx00015be4(camGetProjectionMtxF(), sp7c, &matrix); + rodata = model_get_part_rodata(model->definition, MODELPART_CCTV_0002); + sp7c = model_find_node_mtx(model, model_get_part(model->definition, MODELPART_CCTV_LENS), 0); + mtx00015be4(cam_get_projection_mtxf(), sp7c, &matrix); - shardsCreate((struct coord *) matrix.m[3], matrix.m[0], matrix.m[1], matrix.m[2], + shards_create((struct coord *) matrix.m[3], matrix.m[0], matrix.m[1], matrix.m[2], rodata->bbox.xmin, rodata->bbox.xmax, rodata->bbox.ymin, rodata->bbox.ymax, SHARDTYPE_GLASS, prop); } - wallhitsFreeByProp(prop, 1); - rwdata = modelGetNodeRwData(model, modelGetPart(model->definition, MODELPART_CCTV_0003)); + wallhits_free_by_prop(prop, 1); + rwdata = model_get_node_rw_data(model, model_get_part(model->definition, MODELPART_CCTV_0003)); rwdata->toggle.visible = false; } @@ -15216,7 +15216,7 @@ void func0f085050(struct prop *prop, f32 damage, struct coord *pos, s32 arg3, s3 child = next; } - objDamage(prop->obj, damage, pos, arg3, playernum); + obj_damage(prop->obj, damage, pos, arg3, playernum); } } @@ -15265,7 +15265,7 @@ bool func0f085194(struct defaultobj *obj) return false; } -bool objIsMortal(struct defaultobj *obj) +bool obj_is_mortal(struct defaultobj *obj) { if (obj->type == OBJTYPE_DOOR) { return false; @@ -15282,14 +15282,14 @@ bool objIsMortal(struct defaultobj *obj) return true; } -void objTakeGunfire(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weaponnum, s32 playernum) +void obj_take_gunfire(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weaponnum, s32 playernum) { if ((obj->flags2 & OBJFLAG2_IMMUNETOGUNFIRE) == 0) { - objDamage(obj, damage, pos, weaponnum, playernum); + obj_damage(obj, damage, pos, weaponnum, playernum); } } -void objDamage(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) { // Store the attacker playernum into the object's "hidden" field #if VERSION >= VERSION_NTSC_1_0 @@ -15304,7 +15304,7 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon obj->hidden |= (playernum << 28) & 0xf0000000; #endif - if (obj->type == OBJTYPE_GASBOTTLE && objGetDestroyedLevel(obj) == 1) { + if (obj->type == OBJTYPE_GASBOTTLE && obj_get_destroyed_level(obj) == 1) { return; } @@ -15325,7 +15325,7 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon struct weaponobj *weapon; if (obj->flags2 & OBJFLAG2_AICANNOTUSE) { - propExplode(obj->prop, EXPLOSIONTYPE_12); + prop_explode(obj->prop, EXPLOSIONTYPE_12); obj->hidden |= OBJHFLAG_DELETING; } @@ -15370,7 +15370,7 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon return; } - if (!objIsMortal(obj)) { + if (!obj_is_mortal(obj)) { return; } } @@ -15380,7 +15380,7 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon damage *= 0.25f; } - if (objGetDestroyedLevel(obj) == 0) { + if (obj_get_destroyed_level(obj) == 0) { // Not destroyed damage *= 250; @@ -15389,7 +15389,7 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon } } else { // Figure out how much to go within this destroyed level and cap it there - f32 max = 4 - (objGetShotsTaken(obj) % 4); + f32 max = 4 - (obj_get_shots_taken(obj) % 4); if (damage > max) { damage = max; @@ -15412,17 +15412,17 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon } else { if (obj->type == OBJTYPE_GLASS || obj->type == OBJTYPE_TINTEDGLASS) { if (obj->damage >= obj->maxdamage) { - glassDestroy(obj); + glass_destroy(obj); } } else { - objSetDropped(obj->prop, DROPTYPE_DEFAULT); - objCheckDestroyed(obj, pos, playernum); + obj_set_dropped(obj->prop, DROPTYPE_DEFAULT); + obj_check_destroyed(obj, pos, playernum); } // This code appears to be unused... // It appears to handle spawning a weapon when the ammo crate is shot. if (obj->type == OBJTYPE_MULTIAMMOCRATE) { - if (objGetDestroyedLevel(obj) == 1) { + if (obj_get_destroyed_level(obj) == 1) { u32 stack; struct multiammocrateobj *crate = (struct multiammocrateobj *) obj; s32 startindex = random() % ARRAYCOUNT(crate->slots); @@ -15430,7 +15430,7 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon do { if (crate->slots[i].quantity > 0 && crate->slots[i].modelnum != 0xffff) { - struct ammocrateobj *newcrate = ammocrateAllocate(); + struct ammocrateobj *newcrate = ammocrate_allocate(); if (newcrate) { s32 modelnum = crate->slots[i].modelnum; @@ -15464,8 +15464,8 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon newcrate->base.modelnum = modelnum; newcrate->ammotype = i + 1; - if (objInitWithModelDef(&newcrate->base, g_ModelStates[modelnum].modeldef)) { - propReparent(newcrate->base.prop, obj->prop); + if (obj_init_with_model_def(&newcrate->base, g_ModelStates[modelnum].modeldef)) { + prop_reparent(newcrate->base.prop, obj->prop); } break; @@ -15484,48 +15484,48 @@ void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weapon } else if (obj->type == OBJTYPE_AUTOGUN) { obj->flags |= OBJFLAG_AUTOGUN_DAMAGED; - if (objGetDestroyedLevel(obj) == 1) { + if (obj_get_destroyed_level(obj) == 1) { obj->flags |= OBJFLAG_DEACTIVATED; } } else if (obj->type == OBJTYPE_CCTV) { - if (objGetDestroyedLevel(obj) == 1) { + if (obj_get_destroyed_level(obj) == 1) { obj->flags |= OBJFLAG_DEACTIVATED; } } else if (obj->type == OBJTYPE_SINGLEMONITOR) { struct singlemonitorobj *monitor = (struct singlemonitorobj *) obj; - if (objGetDestroyedLevel(obj) == 1) { - tvscreenSetCmdlist(&monitor->screen, g_TvCmdlist14); + if (obj_get_destroyed_level(obj) == 1) { + tvscreen_set_cmdlist(&monitor->screen, g_TvCmdlist14); } } else if (obj->type == OBJTYPE_MULTIMONITOR) { struct multimonitorobj *monitor = (struct multimonitorobj *) obj; - if (objGetDestroyedLevel(obj) == 1) { - tvscreenSetCmdlist(&monitor->screens[0], g_TvCmdlist14); - tvscreenSetCmdlist(&monitor->screens[1], g_TvCmdlist14); - tvscreenSetCmdlist(&monitor->screens[2], g_TvCmdlist14); - tvscreenSetCmdlist(&monitor->screens[3], g_TvCmdlist14); + if (obj_get_destroyed_level(obj) == 1) { + tvscreen_set_cmdlist(&monitor->screens[0], g_TvCmdlist14); + tvscreen_set_cmdlist(&monitor->screens[1], g_TvCmdlist14); + tvscreen_set_cmdlist(&monitor->screens[2], g_TvCmdlist14); + tvscreen_set_cmdlist(&monitor->screens[3], g_TvCmdlist14); } } else if (obj->type == OBJTYPE_GASBOTTLE) { - if (objGetDestroyedLevel(obj) == 1) { - gasReleaseFromPos(&obj->prop->pos); + if (obj_get_destroyed_level(obj) == 1) { + gas_release_from_pos(&obj->prop->pos); } } else if (obj->type == OBJTYPE_SHIELD) { struct shieldobj *shield = (struct shieldobj *) obj; - if (objGetDestroyedLevel(obj) == 0) { + if (obj_get_destroyed_level(obj) == 0) { shield->amount = shield->initialamount * (f32)(obj->maxdamage - obj->damage) / (f32)obj->maxdamage; } else { shield->amount = 0; } } - if (objGetDestroyedLevel(obj) == 1) { + if (obj_get_destroyed_level(obj) == 1) { struct prop *child = obj->prop->child; while (child) { struct prop *next = child->next; - objSetDropped(child, DROPTYPE_DEFAULT); + obj_set_dropped(child, DROPTYPE_DEFAULT); child = next; } } @@ -15570,18 +15570,18 @@ void func0f0859a0(struct prop *prop, struct shotdata *shotdata) } if (var8005efc0 > 0.0f) { - hitpart = modelTestForHit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node1); + hitpart = model_test_for_hit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node1); while (hitpart > 0) { if (func0f084594(model, node1, &shotdata->gunpos2d, &shotdata->gundir2d, &hitthing1, &spe4, &node2)) { break; } - hitpart = modelTestForHit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node1); + hitpart = model_test_for_hit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node1); } } else { do { - hitpart = modelTestForHit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node1); + hitpart = model_test_for_hit(model, &shotdata->gunpos2d, &shotdata->gundir2d, &node1); if (hitpart > 0 && func0f0849dc(model, node1, &shotdata->gunpos2d, &shotdata->gundir2d, &hitthing1, &spe4, &node2)) { break; @@ -15590,7 +15590,7 @@ void func0f0859a0(struct prop *prop, struct shotdata *shotdata) } if (obj->flags3 & OBJFLAG3_HOVERBEDSHIELD) { - node3 = modelGetPart(model->definition, MODELPART_0067); + node3 = model_get_part(model->definition, MODELPART_0067); if (node3 && func0f084594(model, node3, &shotdata->gunpos2d, &shotdata->gundir2d, &hitthing2, &sp90, &node4)) { if (hitpart <= 0 || @@ -15607,7 +15607,7 @@ void func0f0859a0(struct prop *prop, struct shotdata *shotdata) } if (hitpart > 0) { - mtx4TransformVec(&model->matrices[spe4], &hitthing1.pos, &spd8); + mtx4_transform_vec(&model->matrices[spe4], &hitthing1.pos, &spd8); spd4 = -spd8.f[2]; if (spd4 <= shotdata->distance) { @@ -15617,16 +15617,16 @@ void func0f0859a0(struct prop *prop, struct shotdata *shotdata) if (obj->type == OBJTYPE_GLASS || obj->type == OBJTYPE_TINTEDGLASS) { isnotglass = false; } else if (obj->model->definition->skel == &g_SkelWindowedDoor - && modelGetPart(obj->model->definition, MODELPART_WINDOWEDDOOR_0003) == node2) { + && model_get_part(obj->model->definition, MODELPART_WINDOWEDDOOR_0003) == node2) { isnotglass = false; } } - mtx4TransformVec(camGetProjectionMtxF(), &spd8, &sp7c); - mtx4RotateVec(&model->matrices[spe4], &hitthing1.unk0c, &sp70); - mtx4RotateVecInPlace(camGetProjectionMtxF(), &sp70); + mtx4_transform_vec(cam_get_projection_mtxf(), &spd8, &sp7c); + mtx4_rotate_vec(&model->matrices[spe4], &hitthing1.unk0c, &sp70); + mtx4_rotate_vec_in_place(cam_get_projection_mtxf(), &sp70); - hitCreate(shotdata, prop, spd4, hitpart, + hit_create(shotdata, prop, spd4, hitpart, node1, &hitthing1, spe4, node2, model, isnotglass && shotdata->gset.weaponnum != WEAPON_FARSIGHT, (obj->flags2 & OBJFLAG2_BULLETPROOF) @@ -15637,17 +15637,17 @@ void func0f0859a0(struct prop *prop, struct shotdata *shotdata) } } -void objTestHit(struct prop *prop, struct shotdata *shotdata) +void obj_test_hit(struct prop *prop, struct shotdata *shotdata) { f32 tmp; struct defaultobj *obj = prop->obj; struct model *model = obj->model; - struct modelrodata_bbox *bbox = objFindBboxRodata(obj); + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(obj); if ((prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) && (obj->hidden & OBJHFLAG_00001000) == 0 && (obj->flags2 & OBJFLAG2_SHOOTTHROUGH) == 0) { - tmp = -(model->matrices[0].m[3][2] + objGetRotatedLocalZMaxByMtx4(bbox, model->matrices)); + tmp = -(model->matrices[0].m[3][2] + obj_get_rotated_local_z_max_by_mtx4(bbox, model->matrices)); if (tmp <= shotdata->distance) { func0f0859a0(prop, shotdata); @@ -15655,7 +15655,7 @@ void objTestHit(struct prop *prop, struct shotdata *shotdata) } } -void objHit(struct shotdata *shotdata, struct hit *hit) +void obj_hit(struct shotdata *shotdata, struct hit *hit) { struct defaultobj *obj; struct coord sp110; @@ -15664,7 +15664,7 @@ void objHit(struct shotdata *shotdata, struct hit *hit) s32 i; bool explosiveshells = false; bool slowsbullet = hit->slowsbullet; - struct weaponfunc *func = gsetGetWeaponFunction(&shotdata->gset); + struct weaponfunc *func = gset_get_weapon_function(&shotdata->gset); struct coord spec; f32 tmp; struct prop *spe4; @@ -15693,19 +15693,19 @@ void objHit(struct shotdata *shotdata, struct hit *hit) sp110.y = shotdata->gunpos2d.y - hit->distance * shotdata->gundir2d.y / shotdata->gundir2d.z; sp110.z = shotdata->gunpos2d.z - hit->distance; - mtx4TransformVecInPlace(camGetProjectionMtxF(), &sp110); + mtx4_transform_vec_in_place(cam_get_projection_mtxf(), &sp110); - if (!slowsbullet && chrIsUsingPaintball(g_Vars.currentplayer->prop->chr)) { + if (!slowsbullet && chr_is_using_paintball(g_Vars.currentplayer->prop->chr)) { slowsbullet = true; } if (hit->slowsbullet) { - bgunSetHitPos(&sp110); + bgun_set_hit_pos(&sp110); } if (obj->modelnum == MODEL_TARGET) { if (hit->hitthing.texturenum == TEXTURE_0B9E) { - frCalculateHit(obj, &sp110, shotdata->gset.unk063a); + fr_calculate_hit(obj, &sp110, shotdata->gset.unk063a); } else if ((shotdata->gset.weaponnum != WEAPON_CALLISTO || shotdata->gset.weaponfunc != FUNC_SECONDARY) #if VERSION >= VERSION_NTSC_1_0 && shotdata->gset.weaponnum != WEAPON_FARSIGHT @@ -15713,7 +15713,7 @@ void objHit(struct shotdata *shotdata, struct hit *hit) ) { // For some penetrating weapons, unset hits beyond the shot distance spe4 = hit->prop; - mtx4TransformVec(obj->model->matrices, &sp110, &spec); + mtx4_transform_vec(obj->model->matrices, &sp110, &spec); tmp = -spec.z; for (i = 0; i < ARRAYCOUNT(shotdata->hits); i++) { @@ -15728,10 +15728,10 @@ void objHit(struct shotdata *shotdata, struct hit *hit) // Create sparks if (!ismeleefunc) { - if (chrIsUsingPaintball(g_Vars.currentplayer->prop->chr)) { - sparksCreate(prop->rooms[0], prop, &sp110, 0, 0, SPARKTYPE_PAINT); + if (chr_is_using_paintball(g_Vars.currentplayer->prop->chr)) { + sparks_create(prop->rooms[0], prop, &sp110, 0, 0, SPARKTYPE_PAINT); } else { - sparksCreate(prop->rooms[0], prop, &sp110, 0, 0, SPARKTYPE_DEFAULT); + sparks_create(prop->rooms[0], prop, &sp110, 0, 0, SPARKTYPE_DEFAULT); } } @@ -15741,19 +15741,19 @@ void objHit(struct shotdata *shotdata, struct hit *hit) spdc[1] = hit->hitthing.pos.y; spdc[2] = hit->hitthing.pos.z; - shieldhitCreate(prop, (obj->flags3 & OBJFLAG3_SHOWSHIELD) ? 4.0f : 8.0f, hit->prop, hit->bboxnode, hit->model, hit->hitthing.unk28 / 2, spdc); + shieldhit_create(prop, (obj->flags3 & OBJFLAG3_SHOWSHIELD) ? 4.0f : 8.0f, hit->prop, hit->bboxnode, hit->model, hit->hitthing.unk28 / 2, spdc); } // Increment object hit count - if (objIsHealthy(obj) && objIsMortal(obj) && hit->slowsbullet) { - mpstatsIncrementPlayerShotCount2(&shotdata->gset, SHOTREGION_OBJECT); + if (obj_is_healthy(obj) && obj_is_mortal(obj) && hit->slowsbullet) { + mpstats_increment_player_shot_count2(&shotdata->gset, SHOTREGION_OBJECT); } // Play hit sound if (!slowsbullet) { - bgunPlayGlassHitSound(&hit->prop->pos, hit->prop->rooms, hit->hitthing.texturenum); + bgun_play_glass_hit_sound(&hit->prop->pos, hit->prop->rooms, hit->hitthing.texturenum); } else if (!ismeleefunc) { - bgunPlayPropHitSound(&shotdata->gset, hit->prop, hit->hitthing.texturenum); + bgun_play_prop_hit_sound(&shotdata->gset, hit->prop, hit->hitthing.texturenum); } // Create wall hit (bullet hole) @@ -15776,7 +15776,7 @@ void objHit(struct shotdata *shotdata, struct hit *hit) textureindex += 10; } - wallhitCreate(&hit->hitthing.pos, &hit->hitthing.unk0c, &shotdata->gunpos3d, 0, + wallhit_create(&hit->hitthing.pos, &hit->hitthing.unk0c, &shotdata->gunpos3d, 0, 0, textureindex, 1, hitprop, hit->mtxindex, iswindoweddoor, g_Vars.currentplayer->prop->chr, true); } else { s16 textureindex; @@ -15797,8 +15797,8 @@ void objHit(struct shotdata *shotdata, struct hit *hit) spc4 = false; spcc = random() % surfacetype->numwallhittexes; - if ((obj->model->definition->skel == &g_SkelWindowedDoor && hit->dlnode == modelGetPart(obj->model->definition, MODELPART_WINDOWEDDOOR_0003)) - || (obj->model->definition->skel == &g_SkelCctv && hit->dlnode == modelGetPart(obj->model->definition, MODELPART_CCTV_LENS))) { + if ((obj->model->definition->skel == &g_SkelWindowedDoor && hit->dlnode == model_get_part(obj->model->definition, MODELPART_WINDOWEDDOOR_0003)) + || (obj->model->definition->skel == &g_SkelCctv && hit->dlnode == model_get_part(obj->model->definition, MODELPART_CCTV_LENS))) { spcb = true; } @@ -15815,7 +15815,7 @@ void objHit(struct shotdata *shotdata, struct hit *hit) spc4 = true; } - wallhitCreate(&hit->hitthing.pos, &hit->hitthing.unk0c, &shotdata->gunpos3d, 0, + wallhit_create(&hit->hitthing.pos, &hit->hitthing.unk0c, &shotdata->gunpos3d, 0, 0, textureindex, 1, hit->prop, hit->mtxindex, spcb, g_Vars.currentplayer->prop->chr, spc4); } } @@ -15823,16 +15823,16 @@ void objHit(struct shotdata *shotdata, struct hit *hit) if (g_Vars.antiplayernum < 0 || g_Vars.currentplayer != g_Vars.anti || (obj->flags2 & OBJFLAG2_IMMUNETOANTI) == 0) { if (hit->hitthing.texturenum != 10000) { - f32 damage = gsetGetDamage(&shotdata->gset); + f32 damage = gset_get_damage(&shotdata->gset); if (obj->type == OBJTYPE_AUTOGUN) { damage *= g_AutogunDamageRxScale; } else if (obj->type == OBJTYPE_CCTV) { // Leftover from GE: shots to a CCTV's lens is a one hit kill if (obj->model->definition->skel == &g_SkelCctv) { - if (modelGetPart(obj->model->definition, MODELPART_CCTV_LENS) == hit->dlnode) { + if (model_get_part(obj->model->definition, MODELPART_CCTV_LENS) == hit->dlnode) { damage *= 100.0f; - cctvHandleLensShot(obj); + cctv_handle_lens_shot(obj); } } @@ -15845,19 +15845,19 @@ void objHit(struct shotdata *shotdata, struct hit *hit) } } - objTakeGunfire(obj, damage, &sp110, shotdata->gset.weaponnum, g_Vars.currentplayernum); + obj_take_gunfire(obj, damage, &sp110, shotdata->gset.weaponnum, g_Vars.currentplayernum); if (obj->model->definition->skel == &g_SkelWindowedDoor && !hit->slowsbullet) { struct doorobj *door = (struct doorobj *)obj; door->glasshits++; if (door->glasshits >= 3) { - doorDestroyGlass(door); + door_destroy_glass(door); } } } - objDropRecursively(hit->prop, false); + obj_drop_recursively(hit->prop, false); // Handle pushing and bouncing if ((obj->hidden & OBJHFLAG_MOUNTED) == 0 && (obj->hidden & OBJHFLAG_GRABBED) == 0) { @@ -15871,8 +15871,8 @@ void objHit(struct shotdata *shotdata, struct hit *hit) spb0.y = shotdata->gundir3d.y * 3.0f; spb0.z = shotdata->gundir3d.z * 3.0f; - mtx4MultMtx4(camGetProjectionMtxF(), &obj->model->matrices[hit->mtxindex], &sp58); - mtx4TransformVec(&sp58, &hit->hitthing.pos, &spa4); + mtx4_mult_mtx4(cam_get_projection_mtxf(), &obj->model->matrices[hit->mtxindex], &sp58); + mtx4_transform_vec(&sp58, &hit->hitthing.pos, &spa4); pushdir.x = shotdata->gundir3d.x; pushdir.y = shotdata->gundir3d.y; @@ -15891,7 +15891,7 @@ void objHit(struct shotdata *shotdata, struct hit *hit) } if (obj->flags2 & OBJFLAG2_BOUNCEIFSHOTWHENDEAD) { - if (!objIsHealthy(obj)) { + if (!obj_is_healthy(obj)) { bounce = true; } } @@ -15901,14 +15901,14 @@ void objHit(struct shotdata *shotdata, struct hit *hit) } if (bounce) { - objBounce(obj, &shotdata->gundir2d); + obj_bounce(obj, &shotdata->gundir2d); } } } } } -u32 propobjGetCiTagId(struct prop *prop) +u32 propobj_get_ci_tag_id(struct prop *prop) { if (prop && g_Vars.stagenum == STAGE_CITRAINING) { u8 tags[8] = { 0x0e, 0x0f, 0x10, 0x47, 0x46, 0x45, 0x1b, 0x7f }; @@ -15916,7 +15916,7 @@ u32 propobjGetCiTagId(struct prop *prop) u32 i; for (i = 0; i != 8; i++) { - struct defaultobj *taggedobj = objFindByTagId(tags[i]); + struct defaultobj *taggedobj = obj_find_by_tag_id(tags[i]); if (obj == taggedobj) { return tags[i]; @@ -15927,18 +15927,18 @@ u32 propobjGetCiTagId(struct prop *prop) return 0; } -bool objIsHealthy(struct defaultobj *obj) +bool obj_is_healthy(struct defaultobj *obj) { - return objGetDestroyedLevel(obj) == 0; + return obj_get_destroyed_level(obj) == 0; } -bool objTestForInteract(struct prop *prop) +bool obj_test_for_interact(struct prop *prop) { u32 stack; struct defaultobj *obj = prop->obj; bool maybe = false; - if (propobjGetCiTagId(prop)) { + if (propobj_get_ci_tag_id(prop)) { maybe = true; } else if (obj->type == OBJTYPE_ALARM || (obj->flags & OBJFLAG_THROWNLAPTOP) @@ -15949,24 +15949,24 @@ bool objTestForInteract(struct prop *prop) if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) { maybe = true; } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK - && bmoveGetCrouchPos() == CROUCHPOS_STAND + && bmove_get_crouch_pos() == CROUCHPOS_STAND && g_Vars.currentplayer->crouchoffset == 0.0f) { maybe = true; } } else if ((obj->flags3 & OBJFLAG3_GRABBABLE) && g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK - && bmoveGetCrouchPos() == CROUCHPOS_STAND + && bmove_get_crouch_pos() == CROUCHPOS_STAND && g_Vars.currentplayer->crouchoffset == 0.0f) { maybe = true; } - if (maybe && (obj->hidden & OBJHFLAG_MOUNTED) && prop == bmoveGetHoverbike()) { + if (maybe && (obj->hidden & OBJHFLAG_MOUNTED) && prop == bmove_get_hoverbike()) { maybe = false; } if (maybe && (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) - && objIsHealthy(obj) + && obj_is_healthy(obj) && (obj->flags & OBJFLAG_CANNOT_ACTIVATE) == 0) { struct prop *playerprop = g_Vars.currentplayer->prop; f32 x = prop->pos.x - playerprop->pos.x; @@ -15999,7 +15999,7 @@ bool objTestForInteract(struct prop *prop) if (angle <= RAD(22.5f, 0.3926365673542f)) { if ((obj->flags2 & OBJFLAG2_INTERACTCHECKLOS) == 0 - || cdTestLos06(&playerprop->pos, playerprop->rooms, &prop->pos, prop->rooms, CDTYPE_BG)) { + || cd_test_los06(&playerprop->pos, playerprop->rooms, &prop->pos, prop->rooms, CDTYPE_BG)) { g_InteractProp = prop; } } @@ -16009,7 +16009,7 @@ bool objTestForInteract(struct prop *prop) return true; } -bool currentPlayerTryMountHoverbike(struct prop *prop) +bool current_player_try_mount_hoverbike(struct prop *prop) { struct defaultobj *obj = prop->obj; bool mount = false; @@ -16019,7 +16019,7 @@ bool currentPlayerTryMountHoverbike(struct prop *prop) && g_Vars.lvframe60 - g_Vars.currentplayer->activatetimelast < TICKS(30) && (obj->hidden & OBJHFLAG_MOUNTED) == 0) { if (obj->hidden & OBJHFLAG_GRABBED) { - if (bmoveGetGrabbedProp() == prop) { + if (bmove_get_grabbed_prop() == prop) { mount = true; } else { mount = false; @@ -16031,7 +16031,7 @@ bool currentPlayerTryMountHoverbike(struct prop *prop) if (mount && g_Vars.currentplayer->bondmovemode != MOVEMODE_GRAB) { if (g_Vars.currentplayer->bondmovemode != MOVEMODE_WALK - || bmoveGetCrouchPos() != CROUCHPOS_STAND + || bmove_get_crouch_pos() != CROUCHPOS_STAND || g_Vars.currentplayer->crouchoffset != 0) { mount = false; } @@ -16041,7 +16041,7 @@ bool currentPlayerTryMountHoverbike(struct prop *prop) f32 angle = atan2f( prop->pos.x - g_Vars.currentplayer->prop->pos.x, prop->pos.z - g_Vars.currentplayer->prop->pos.z); - angle -= hoverpropGetTurnAngle(obj); + angle -= hoverprop_get_turn_angle(obj); if (angle < 0) { angle += M_BADTAU; @@ -16050,7 +16050,7 @@ bool currentPlayerTryMountHoverbike(struct prop *prop) if ((angle > RAD(22, 0.3926365673542f) && angle < RAD(135, 2.3558194637299f)) || (angle < RAD(337, 5.8895483016968f) && angle > RAD(225, 3.9263656139374f))) { g_Vars.currentplayer->hoverbike = prop; - bmoveSetMode(MOVEMODE_BIKE); + bmove_set_mode(MOVEMODE_BIKE); return true; } } @@ -16058,19 +16058,19 @@ bool currentPlayerTryMountHoverbike(struct prop *prop) return false; } -bool propobjInteract(struct prop *prop) +bool propobj_interact(struct prop *prop) { struct defaultobj *obj = prop->obj; bool result = false; - u32 tag_id = propobjGetCiTagId(prop); + u32 tag_id = propobj_get_ci_tag_id(prop); if (tag_id) { // CI object - terminals etc u8 handled = false; - if (ciIsTourDone()) { + if (ci_is_tour_done()) { if (tag_id == 0x10) { - struct trainingdata *data = dtGetData(); + struct trainingdata *data = dt_get_data(); handled = true; if (data->intraining) { @@ -16079,7 +16079,7 @@ bool propobjInteract(struct prop *prop) func0f0f85e0(&g_DtListMenuDialog, MENUROOT_TRAINING); } } else if (tag_id == 0x45) { - struct trainingdata *data = getHoloTrainingData(); + struct trainingdata *data = get_holo_training_data(); handled = true; if (data->intraining) { @@ -16090,7 +16090,7 @@ bool propobjInteract(struct prop *prop) } else if (tag_id == 0x7f) { handled = true; - if (frIsInTraining()) { + if (fr_is_in_training()) { func0f0f85e0(&g_FrTrainingInfoInGameMenuDialog, MENUROOT_TRAINING); } else { func0f0f85e0(&g_FrWeaponListMenuDialog, MENUROOT_TRAINING); @@ -16119,18 +16119,18 @@ bool propobjInteract(struct prop *prop) if (handled) { // Typing sound - sndStart(var80095200, SFX_TYPING_8118, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_TYPING_8118, NULL, -1, -1, -1, -1, -1); } func0f0fd494(&prop->pos); } else if (obj->type == OBJTYPE_ALARM) { // Button press sound - sndStart(var80095200, SFX_PRESS_SWITCH, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PRESS_SWITCH, NULL, -1, -1, -1, -1, -1); - if (alarmIsActive()) { - alarmDeactivate(); + if (alarm_is_active()) { + alarm_deactivate(); } else { - alarmActivate(); + alarm_activate(); } } else if (obj->flags & OBJFLAG_THROWNLAPTOP) { // Thrown laptop @@ -16139,36 +16139,36 @@ bool propobjInteract(struct prop *prop) s32 playernum; if (g_Vars.normmplayerisrunning) { - playernum = mpPlayerGetIndex(g_Vars.currentplayer->prop->chr); + playernum = mp_player_get_index(g_Vars.currentplayer->prop->chr); } else { playernum = g_Vars.currentplayernum; } if (playernum >= 0 && laptop == &g_ThrownLaptops[playernum]) { obj->hidden |= OBJHFLAG_DELETING; - invGiveSingleWeapon(WEAPON_LAPTOPGUN); - currentPlayerQueuePickupWeaponHudmsg(WEAPON_LAPTOPGUN, false); - weaponPlayPickupSound(WEAPON_LAPTOPGUN); + inv_give_single_weapon(WEAPON_LAPTOPGUN); + current_player_queue_pickup_weapon_hudmsg(WEAPON_LAPTOPGUN, false); + weapon_play_pickup_sound(WEAPON_LAPTOPGUN); if (laptop->ammoquantity > 0 && laptop->ammoquantity != 255) { - s32 newqty = bgunGetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY) + laptop->ammoquantity; - bgunSetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, newqty); + s32 newqty = bgun_get_ammo_qty_for_weapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY) + laptop->ammoquantity; + bgun_set_ammo_qty_for_weapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, newqty); } } } else { - result = propPickupByPlayer(prop, 1); + result = prop_pickup_by_player(prop, 1); } - } else if (currentPlayerTryMountHoverbike(prop) == false + } else if (current_player_try_mount_hoverbike(prop) == false && (obj->flags3 & OBJFLAG3_GRABBABLE) && g_Vars.currentplayer->bondmovemode == MOVEMODE_WALK - && bmoveGetCrouchPos() == CROUCHPOS_STAND + && bmove_get_crouch_pos() == CROUCHPOS_STAND && g_Vars.currentplayer->crouchoffset == 0 && g_Vars.currentplayer->onladder == false) { - bmoveGrabProp(prop); + bmove_grab_prop(prop); } if (g_Vars.normmplayerisrunning) { - scenarioHandleActivatedProp(g_Vars.currentplayer->prop->chr, prop); + scenario_handle_activated_prop(g_Vars.currentplayer->prop->chr, prop); } else { if (g_Vars.currentplayernum == g_Vars.coopplayernum) { obj->hidden |= OBJHFLAG_ACTIVATED_BY_COOP; @@ -16177,12 +16177,12 @@ bool propobjInteract(struct prop *prop) } } - doorCallLift(prop, false); + door_call_lift(prop, false); return result; } -void objSetPerimEnabled(struct prop *prop, bool enable) +void obj_set_perim_enabled(struct prop *prop, bool enable) { struct defaultobj *obj = prop->obj; @@ -16193,7 +16193,7 @@ void objSetPerimEnabled(struct prop *prop, bool enable) } } -bool objUpdateGeometry(struct prop *prop, u8 **start, u8 **end) +bool obj_update_geometry(struct prop *prop, u8 **start, u8 **end) { struct defaultobj *obj = prop->obj; @@ -16236,7 +16236,7 @@ bool objUpdateGeometry(struct prop *prop, u8 **start, u8 **end) return false; } -void objGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) +void obj_get_bbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) { struct defaultobj *obj = prop->obj; @@ -16246,7 +16246,7 @@ void objGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) *ymin = obj->geocyl->ymin; *ymax = obj->geocyl->ymax; } else { - *radius = modelGetEffectiveScale(obj->model); + *radius = model_get_effective_scale(obj->model); *ymin = obj->geoblock->ymin; *ymax = obj->geoblock->ymax; } @@ -16258,9 +16258,9 @@ void objGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin) } #if VERSION < VERSION_PAL_BETA -void ammotypeGetPickedUpText(char *dst) +void ammotype_get_picked_up_text(char *dst) { - strcat(dst, langGet(L_PROPOBJ_000)); // "Picked up" + strcat(dst, lang_get(L_PROPOBJ_000)); // "Picked up" } #endif @@ -16549,9 +16549,9 @@ void func0f0878c8pf(char *dst, s32 id, bool plural, bool full, bool dual, struct } if (determinertextid) { - sprintf(buffer, "%s%s", langGet(determinertextid), langGet(nametextid)); + sprintf(buffer, "%s%s", lang_get(determinertextid), lang_get(nametextid)); } else { - sprintf(buffer, "%s", langGet(nametextid)); + sprintf(buffer, "%s", lang_get(nametextid)); } ptr = buffer; @@ -16567,17 +16567,17 @@ void func0f0878c8pf(char *dst, s32 id, bool plural, bool full, bool dual, struct #if VERSION == VERSION_JPN_FINAL // JPN removes the full stops from the format strings if (dual) { - sprintf(dst, "%s%s\n", langGet(L_PROPOBJ_008), buffer); // "Double" + sprintf(dst, "%s%s\n", lang_get(L_PROPOBJ_008), buffer); // "Double" } else if (!full) { - sprintf(dst, langGet(L_PROPOBJ_000 + index), buffer); // "Picked up %s.\n" + sprintf(dst, lang_get(L_PROPOBJ_000 + index), buffer); // "Picked up %s.\n" } else { sprintf(dst, "%s\n", buffer); } #else if (dual) { - sprintf(dst, "%s%s.\n", langGet(L_PROPOBJ_008), buffer); // "Double" + sprintf(dst, "%s%s.\n", lang_get(L_PROPOBJ_008), buffer); // "Double" } else if (!full) { - sprintf(dst, langGet(L_PROPOBJ_000 + index), buffer); // "Picked up %s.\n" + sprintf(dst, lang_get(L_PROPOBJ_000 + index), buffer); // "Picked up %s.\n" } else { sprintf(dst, "%s.\n", buffer); } @@ -16588,7 +16588,7 @@ void func0f0878c8pf(char *dst, s32 id, bool plural, bool full, bool dual, struct #endif #if VERSION < VERSION_PAL_BETA -void ammotypeGetDeterminer(char *dst, s32 ammotype, s32 qty) +void ammotype_get_determiner(char *dst, s32 ammotype, s32 qty) { bool determiner_a = false; bool determiner_an = false; @@ -16597,7 +16597,7 @@ void ammotypeGetDeterminer(char *dst, s32 ammotype, s32 qty) s32 playercount = PLAYERCOUNT(); s32 full = playercount <= 2 - && !(playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())); + && !(playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())); switch (ammotype) { case AMMOTYPE_CLOAK: @@ -16653,52 +16653,52 @@ void ammotypeGetDeterminer(char *dst, s32 ammotype, s32 qty) if (determiner_a) { if (full) { - strcat(dst, langGet(L_PROPOBJ_004)); // "a" + strcat(dst, lang_get(L_PROPOBJ_004)); // "a" } else { - strcat(dst, langGet(L_PROPOBJ_005)); // "A" + strcat(dst, lang_get(L_PROPOBJ_005)); // "A" } } if (determiner_an) { if (full) { - strcat(dst, langGet(L_PROPOBJ_006)); // "an" + strcat(dst, lang_get(L_PROPOBJ_006)); // "an" } else { - strcat(dst, langGet(L_PROPOBJ_007)); // "An" + strcat(dst, lang_get(L_PROPOBJ_007)); // "An" } } if (determiner_some) { if (full) { - strcat(dst, langGet(L_PROPOBJ_002)); // "some" + strcat(dst, lang_get(L_PROPOBJ_002)); // "some" } else { - strcat(dst, langGet(L_PROPOBJ_003)); // "Some" + strcat(dst, lang_get(L_PROPOBJ_003)); // "Some" } } if (determiner_the) { if (full) { - strcat(dst, langGet(L_PROPOBJ_008)); // "the" + strcat(dst, lang_get(L_PROPOBJ_008)); // "the" } else { - strcat(dst, langGet(L_PROPOBJ_009)); // "The" + strcat(dst, lang_get(L_PROPOBJ_009)); // "The" } } } #endif #if VERSION < VERSION_PAL_BETA -void ammotypeGetPickupName(char *dst, s32 ammotype2, s32 qty) +void ammotype_get_pickup_name(char *dst, s32 ammotype2, s32 qty) { s32 ammotype = ammotype2; if (ammotype == AMMOTYPE_PISTOL || ammotype == AMMOTYPE_SMG || ammotype == AMMOTYPE_RIFLE) { - strcat(dst, langGet(L_PROPOBJ_010)); // "ammo" + strcat(dst, lang_get(L_PROPOBJ_010)); // "ammo" } else if (ammotype == AMMOTYPE_KNIFE) { - strcat(dst, langGet(L_PROPOBJ_021)); // "combat" + strcat(dst, lang_get(L_PROPOBJ_021)); // "combat" if (qty == 1) { - strcat(dst, langGet(L_PROPOBJ_022)); // "knife" + strcat(dst, lang_get(L_PROPOBJ_022)); // "knife" } else { - strcat(dst, langGet(L_PROPOBJ_023)); // "knives" + strcat(dst, lang_get(L_PROPOBJ_023)); // "knives" } } else { s32 textnum = -1; @@ -16729,17 +16729,17 @@ void ammotypeGetPickupName(char *dst, s32 ammotype2, s32 qty) } if (textnum >= 0) { - strcat(dst, langGet(textnum)); + strcat(dst, lang_get(textnum)); } if (qty >= 2 && ammotype != AMMOTYPE_REAPER && ammotype != AMMOTYPE_SEDATIVE && ammotype != AMMOTYPE_CLOAK) { - strcat(dst, langGet(L_PROPOBJ_024)); // "s" + strcat(dst, lang_get(L_PROPOBJ_024)); // "s" } } } #endif -void ammotypePlayPickupSound(u32 ammotype) +void ammotype_play_pickup_sound(u32 ammotype) { switch (ammotype) { case AMMOTYPE_PISTOL: @@ -16758,7 +16758,7 @@ void ammotypePlayPickupSound(u32 ammotype) case AMMOTYPE_CLOAK: case AMMOTYPE_BOOST: case AMMOTYPE_TOKEN: - sndStart(var80095200, SFX_PICKUP_AMMO, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_AMMO, NULL, -1, -1, -1, -1, -1); break; case AMMOTYPE_REMOTE_MINE: case AMMOTYPE_PROXY_MINE: @@ -16767,15 +16767,15 @@ void ammotypePlayPickupSound(u32 ammotype) case AMMOTYPE_MICROCAMERA: case AMMOTYPE_PLASTIQUE: case AMMOTYPE_ECM_MINE: - sndStart(var80095200, SFX_PICKUP_MINE, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_MINE, NULL, -1, -1, -1, -1, -1); break; case AMMOTYPE_KNIFE: - sndStart(var80095200, SFX_PICKUP_KNIFE, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_KNIFE, NULL, -1, -1, -1, -1, -1); break; } } -s32 propPlayPickupSound(struct prop *prop, s32 weapon) +s32 prop_play_pickup_sound(struct prop *prop, s32 weapon) { s16 sound; @@ -16800,11 +16800,11 @@ s32 propPlayPickupSound(struct prop *prop, s32 weapon) sound = SFX_PICKUP_GUN; } - return psCreate(NULL, prop, sound, -1, + return ps_create(NULL, prop, sound, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } -void weaponPlayPickupSound(s32 weaponnum) +void weapon_play_pickup_sound(s32 weaponnum) { s32 sound; @@ -16835,14 +16835,14 @@ void weaponPlayPickupSound(s32 weaponnum) sound = SFX_PICKUP_GUN; } - sndStart(var80095200, sound, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, sound, NULL, -1, -1, -1, -1, -1); } -void ammotypeGetPickupMessage(char *dst, s32 ammotype, s32 qty) +void ammotype_get_pickup_message(char *dst, s32 ammotype, s32 qty) { s32 playercount = PLAYERCOUNT(); s32 full = playercount <= 2 - && !(playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())); + && !(playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())); *dst = '\0'; @@ -16864,48 +16864,48 @@ void ammotypeGetPickupMessage(char *dst, s32 ammotype, s32 qty) } #else if (g_Jpn) { - ammotypeGetPickupName(dst, ammotype, qty); + ammotype_get_pickup_name(dst, ammotype, qty); if (full) { - ammotypeGetPickedUpText(dst); + ammotype_get_picked_up_text(dst); } strcat(dst, "\n"); } else { if (full) { - ammotypeGetPickedUpText(dst); // "Picked up" + ammotype_get_picked_up_text(dst); // "Picked up" } - ammotypeGetDeterminer(dst, ammotype, qty); // "a", "an", "some" or "the" - ammotypeGetPickupName(dst, ammotype, qty); // name of ammo type + ammotype_get_determiner(dst, ammotype, qty); // "a", "an", "some" or "the" + ammotype_get_pickup_name(dst, ammotype, qty); // name of ammo type strcat(dst, ".\n"); } #endif } -void currentPlayerQueuePickupAmmoHudmsg(s32 ammotype, s32 pickupqty) +void current_player_queue_pickup_ammo_hudmsg(s32 ammotype, s32 pickupqty) { char buffer[100] = ""; - ammotypeGetPickupMessage(buffer, ammotype, pickupqty); - hudmsgCreateWithFlags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); + ammotype_get_pickup_message(buffer, ammotype, pickupqty); + hudmsg_create_with_flags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); } -void ammoHandlePickup(s32 ammotype, s32 quantity, bool withsound, bool withhudmsg) +void ammo_handle_pickup(s32 ammotype, s32 quantity, bool withsound, bool withhudmsg) { s32 weapon; if (quantity > 0) { - if (bgunGetReservedAmmoCount(ammotype) < bgunGetCapacityByAmmotype(ammotype)) { - bgunSetAmmoQuantity(ammotype, bgunGetReservedAmmoCount(ammotype) + quantity); + if (bgun_get_reserved_ammo_count(ammotype) < bgun_get_capacity_by_ammotype(ammotype)) { + bgun_set_ammo_quantity(ammotype, bgun_get_reserved_ammo_count(ammotype) + quantity); if (withhudmsg) { - currentPlayerQueuePickupAmmoHudmsg(ammotype, quantity); + current_player_queue_pickup_ammo_hudmsg(ammotype, quantity); } } if (withsound) { - ammotypePlayPickupSound(ammotype); + ammotype_play_pickup_sound(ammotype); } if (ammotype == AMMOTYPE_GRENADE) { @@ -16933,12 +16933,12 @@ void ammoHandlePickup(s32 ammotype, s32 quantity, bool withsound, bool withhudms } if (weapon >= 0) { - invGiveSingleWeapon(weapon); + inv_give_single_weapon(weapon); } } } -s32 ammocrateGetPickupAmmoQty(struct ammocrateobj *crate) +s32 ammocrate_get_pickup_ammo_qty(struct ammocrateobj *crate) { s32 qty = 1; @@ -16963,7 +16963,7 @@ s32 ammocrateGetPickupAmmoQty(struct ammocrateobj *crate) return qty; } -s32 weaponGetPickupAmmoQty(struct weaponobj *weapon) +s32 weapon_get_pickup_ammo_qty(struct weaponobj *weapon) { s32 ammotype; s32 qty = 1; @@ -16972,7 +16972,7 @@ s32 weaponGetPickupAmmoQty(struct weaponobj *weapon) return 20; } - ammotype = bgunGetAmmoTypeForWeapon(weapon->weaponnum, 0); + ammotype = bgun_get_ammo_type_for_weapon(weapon->weaponnum, 0); if (weapon->weaponnum == WEAPON_COMBATKNIFE || weapon->weaponnum == WEAPON_BOLT) { return 1; @@ -17023,20 +17023,20 @@ s32 weaponGetPickupAmmoQty(struct weaponobj *weapon) return qty; } -void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual) +void weapon_get_pickup_text(char *buffer, s32 weaponnum, bool dual) { #if VERSION >= VERSION_PAL_BETA // PAL changes the implementation of this function to use a lookup table, // with some fake weaponnums for the different eyespy types. s32 playercount = PLAYERCOUNT(); s32 full = playercount <= 2 - && !(playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())); + && !(playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())); if (weaponnum == WEAPON_EYESPY) { - if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { + if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_AIRBASE) { weaponnum = 998; - } else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR - || stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { + } else if (stage_get_index(g_Vars.stagenum) == STAGEINDEX_MBR + || stage_get_index(g_Vars.stagenum) == STAGEINDEX_CHICAGO) { weaponnum = 997; } } @@ -17045,54 +17045,54 @@ void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual) #else s32 playercount = PLAYERCOUNT(); s32 full = playercount <= 2 - && !(playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB())); + && !(playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB())); s32 textid; bool plural = false; if (dual) { - strcat(buffer, langGet(L_PROPOBJ_001)); // "Double" + strcat(buffer, lang_get(L_PROPOBJ_001)); // "Double" } else { if (!g_Jpn) { if (full) { - strcat(buffer, langGet(L_PROPOBJ_000)); // "Picked up" + strcat(buffer, lang_get(L_PROPOBJ_000)); // "Picked up" if (weaponnum == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) { textid = L_PROPOBJ_050; // "your" - } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_SOME)) { + } else if (weapon_has_flag(weaponnum, WEAPONFLAG_DETERMINER_F_SOME)) { textid = L_PROPOBJ_002; // "some" - } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_AN)) { + } else if (weapon_has_flag(weaponnum, WEAPONFLAG_DETERMINER_F_AN)) { textid = L_PROPOBJ_006; // "an" - } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_THE)) { + } else if (weapon_has_flag(weaponnum, WEAPONFLAG_DETERMINER_F_THE)) { textid = L_PROPOBJ_008; // "the" } else { textid = L_PROPOBJ_004; // "a" } - strcat(buffer, langGet(textid)); + strcat(buffer, lang_get(textid)); } else { if (weaponnum == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) { textid = L_PROPOBJ_051; // "Your" - } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_SOME)) { + } else if (weapon_has_flag(weaponnum, WEAPONFLAG_DETERMINER_S_SOME)) { textid = L_PROPOBJ_003; // "Some" - } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_AN)) { + } else if (weapon_has_flag(weaponnum, WEAPONFLAG_DETERMINER_S_AN)) { textid = L_PROPOBJ_007; // "An" - } else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_THE)) { + } else if (weapon_has_flag(weaponnum, WEAPONFLAG_DETERMINER_S_THE)) { textid = L_PROPOBJ_009; // "The" } else { textid = L_PROPOBJ_005; // "A" } - strcat(buffer, langGet(textid)); + strcat(buffer, lang_get(textid)); } } } if (full) { - strcat(buffer, bgunGetName(weaponnum)); - plural = weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_SOME); + strcat(buffer, bgun_get_name(weaponnum)); + plural = weapon_has_flag(weaponnum, WEAPONFLAG_DETERMINER_F_SOME); } else { - strcat(buffer, bgunGetShortName(weaponnum)); - plural = weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_SOME); + strcat(buffer, bgun_get_short_name(weaponnum)); + plural = weapon_has_flag(weaponnum, WEAPONFLAG_DETERMINER_S_SOME); } // Note that weapon names have a line break on the end which is undesirable @@ -17113,7 +17113,7 @@ void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual) buffer[strlen(buffer) - 1] = '\0'; } - strcat(buffer, langGet(L_PROPOBJ_000)); // "Picked up" + strcat(buffer, lang_get(L_PROPOBJ_000)); // "Picked up" strcat(buffer, "\n"); // This just gets removed immediately below } @@ -17125,17 +17125,17 @@ void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual) #endif } -void currentPlayerQueuePickupWeaponHudmsg(u32 weaponnum, bool dual) +void current_player_queue_pickup_weapon_hudmsg(u32 weaponnum, bool dual) { char buffer[100] = ""; - weaponGetPickupText(buffer, weaponnum, dual); - hudmsgCreateWithFlags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); + weapon_get_pickup_text(buffer, weaponnum, dual); + hudmsg_create_with_flags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); } const char var7f1aa140[] = "autodoorcanclose: blocking door\n\n"; -s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) +s32 prop_pickup_by_player(struct prop *prop, bool showhudmsg) { struct defaultobj *obj = prop->obj; s32 result; @@ -17148,17 +17148,17 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) switch (obj->type) { case OBJTYPE_KEY: if (g_Vars.in_cutscene == false) { - sndStart(var80095200, SFX_PICKUP_KEYCARD, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_KEYCARD, NULL, -1, -1, -1, -1, -1); } if (showhudmsg) { - char *text = invGetPickupTextByObj(obj); + char *text = inv_get_pickup_text_by_obj(obj); if (text == NULL) { - text = langGet(L_PROPOBJ_040); // "Picked up a key." + text = lang_get(L_PROPOBJ_040); // "Picked up a key." } - hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); + hudmsg_create_with_flags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); } result = TICKOP_GIVETOPLAYER; @@ -17166,8 +17166,8 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) case OBJTYPE_AMMOCRATE: { struct ammocrateobj *crate = (struct ammocrateobj *) prop->obj; - s32 quantity = ammocrateGetPickupAmmoQty(crate); - ammoHandlePickup(crate->ammotype, quantity, !g_Vars.in_cutscene, showhudmsg); + s32 quantity = ammocrate_get_pickup_ammo_qty(crate); + ammo_handle_pickup(crate->ammotype, quantity, !g_Vars.in_cutscene, showhudmsg); result = TICKOP_FREE; } break; @@ -17184,11 +17184,11 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) qty *= g_AmmoQuantityScale; } - ammoHandlePickup(i + 1, qty, false, showhudmsg); + ammo_handle_pickup(i + 1, qty, false, showhudmsg); } if (g_Vars.in_cutscene == false) { - sndStart(var80095200, SFX_PICKUP_AMMO, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_AMMO, NULL, -1, -1, -1, -1, -1); } result = TICKOP_FREE; @@ -17204,20 +17204,20 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) if (g_Vars.normmplayerisrunning) { if (weapon->weaponnum == WEAPON_BRIEFCASE2) { - sp64 = scenarioPickUpBriefcase(g_Vars.currentplayer->prop->chr, prop); + sp64 = scenario_pick_up_briefcase(g_Vars.currentplayer->prop->chr, prop); if (sp64) { - weaponPlayPickupSound(weapon->weaponnum); + weapon_play_pickup_sound(weapon->weaponnum); } return sp64; } if (weapon->weaponnum == WEAPON_DATAUPLINK) { - sp64 = scenarioPickUpUplink(g_Vars.currentplayer->prop->chr, prop); + sp64 = scenario_pick_up_uplink(g_Vars.currentplayer->prop->chr, prop); if (sp64) { - weaponPlayPickupSound(weapon->weaponnum); + weapon_play_pickup_sound(weapon->weaponnum); } return sp64; @@ -17225,22 +17225,22 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) } if (g_Vars.in_cutscene == false) { - weaponPlayPickupSound(weapon->weaponnum); + weapon_play_pickup_sound(weapon->weaponnum); } if (obj->hidden & OBJHFLAG_HASTEXTOVERRIDE) { if (weapon->weaponnum <= WEAPON_PSYCHOSISGUN) { - count = invGiveWeaponsByProp(prop); + count = inv_give_weapons_by_prop(prop); given = true; } if (showhudmsg) { - char *text = invGetPickupTextByObj(obj); + char *text = inv_get_pickup_text_by_obj(obj); if (text) { - hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); + hudmsg_create_with_flags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); } else { - currentPlayerQueuePickupWeaponHudmsg(weapon->weaponnum, count == 2); + current_player_queue_pickup_weapon_hudmsg(weapon->weaponnum, count == 2); } sp70 = true; @@ -17251,12 +17251,12 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) if (weapon->weaponnum == WEAPON_BOLT) { count = 1; given = true; - ammoHandlePickup(AMMOTYPE_CROSSBOW, 1, !g_Vars.in_cutscene, true); + ammo_handle_pickup(AMMOTYPE_CROSSBOW, 1, !g_Vars.in_cutscene, true); result = TICKOP_FREE; showhudmsg = false; sp70 = true; } else { - count = invGiveWeaponsByProp(prop); + count = inv_give_weapons_by_prop(prop); if (count) { sp70 = true; @@ -17265,14 +17265,14 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) given = true; if (showhudmsg) { - char *text = invGetPickupTextByWeaponNum(weapon->weaponnum); + char *text = inv_get_pickup_text_by_weapon_num(weapon->weaponnum); if (text) { sp70 = true; - hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); + hudmsg_create_with_flags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); } else { if (sp70) { - currentPlayerQueuePickupWeaponHudmsg(weapon->weaponnum, count == 2); + current_player_queue_pickup_weapon_hudmsg(weapon->weaponnum, count == 2); } } } @@ -17282,72 +17282,72 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) } if (count == 2 - && bgunGetWeaponNum(HAND_RIGHT) == weapon->weaponnum - && bgunGetWeaponNum(HAND_LEFT) != weapon->weaponnum) { - bgunEquipWeapon2(HAND_LEFT, weapon->weaponnum); + && bgun_get_weapon_num(HAND_RIGHT) == weapon->weaponnum + && bgun_get_weapon_num(HAND_LEFT) != weapon->weaponnum) { + bgun_equip_weapon2(HAND_LEFT, weapon->weaponnum); } - ammotype = bgunGetAmmoTypeForWeapon(weapon->weaponnum, FUNC_PRIMARY); + ammotype = bgun_get_ammo_type_for_weapon(weapon->weaponnum, FUNC_PRIMARY); if (ammotype) { - s32 pickupqty = weaponGetPickupAmmoQty(weapon); + s32 pickupqty = weapon_get_pickup_ammo_qty(weapon); if (pickupqty > 0) { - s32 heldqty = bgunGetReservedAmmoCount(ammotype); + s32 heldqty = bgun_get_reserved_ammo_count(ammotype); - if (bgunGetReservedAmmoCount(ammotype) < bgunGetCapacityByAmmotype(ammotype)) { + if (bgun_get_reserved_ammo_count(ammotype) < bgun_get_capacity_by_ammotype(ammotype)) { heldqty += pickupqty; - bgunSetAmmoQuantity(ammotype, heldqty); + bgun_set_ammo_quantity(ammotype, heldqty); if (!sp70 && showhudmsg) { - currentPlayerQueuePickupAmmoHudmsg(ammotype, pickupqty); + current_player_queue_pickup_ammo_hudmsg(ammotype, pickupqty); } } } } if (weapon->weaponnum == WEAPON_SUPERDRAGON) { - s32 pickupqty = weaponGetPickupAmmoQty(weapon); + s32 pickupqty = weapon_get_pickup_ammo_qty(weapon); - if (bgunGetReservedAmmoCount(AMMOTYPE_DEVASTATOR) < bgunGetCapacityByAmmotype(AMMOTYPE_DEVASTATOR)) { - s32 quantity = bgunGetReservedAmmoCount(AMMOTYPE_DEVASTATOR) + 5; + if (bgun_get_reserved_ammo_count(AMMOTYPE_DEVASTATOR) < bgun_get_capacity_by_ammotype(AMMOTYPE_DEVASTATOR)) { + s32 quantity = bgun_get_reserved_ammo_count(AMMOTYPE_DEVASTATOR) + 5; - bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, quantity); + bgun_set_ammo_quantity(AMMOTYPE_DEVASTATOR, quantity); if (!sp70 && showhudmsg) { - currentPlayerQueuePickupAmmoHudmsg(AMMOTYPE_DEVASTATOR, pickupqty); + current_player_queue_pickup_ammo_hudmsg(AMMOTYPE_DEVASTATOR, pickupqty); } } } if (weapon->weaponnum == WEAPON_EYESPY && g_Vars.currentplayer->eyespy == NULL) { - playerInitEyespy(); + player_init_eyespy(); } } break; case OBJTYPE_SHIELD: { - playerSetShieldFrac(((struct shieldobj *) prop->obj)->amount); + player_set_shield_frac(((struct shieldobj *) prop->obj)->amount); if (!g_Vars.in_cutscene) { - sndStart(var80095200, SFX_PICKUP_SHIELD, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_SHIELD, NULL, -1, -1, -1, -1, -1); } if (showhudmsg) { - char *text = invGetPickupTextByObj(obj); + char *text = inv_get_pickup_text_by_obj(obj); if (text == NULL) { s32 playercount = PLAYERCOUNT(); - if (playercount <= 2 && !(playercount == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || IS4MB()))) { - text = langGet(L_PROPOBJ_041); // "Picked up a shield." + if (playercount <= 2 && !(playercount == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || IS4MB()))) { + text = lang_get(L_PROPOBJ_041); // "Picked up a shield." } else { - text = langGet(L_PROPOBJ_042); // "A shield." + text = lang_get(L_PROPOBJ_042); // "A shield." } } - hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); } result = TICKOP_FREE; @@ -17368,17 +17368,17 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) case OBJTYPE_TINTEDGLASS: default: if (g_Vars.in_cutscene == false) { - sndStart(var80095200, SFX_PICKUP_KEYCARD, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_PICKUP_KEYCARD, NULL, -1, -1, -1, -1, -1); } if (showhudmsg) { - char *text = invGetPickupTextByObj(obj); + char *text = inv_get_pickup_text_by_obj(obj); if (text == NULL) { - text = langGet(L_PROPOBJ_043); // "Picked up something." + text = lang_get(L_PROPOBJ_043); // "Picked up something." } - hudmsgCreateWithFlags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); + hudmsg_create_with_flags(text, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); } result = TICKOP_GIVETOPLAYER; @@ -17386,13 +17386,13 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) } if (result == TICKOP_FREE && (obj->hidden & OBJHFLAG_TAGGED) == 0) { - objFree(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); + obj_free(obj, false, obj->hidden2 & OBJH2FLAG_CANREGEN); return TICKOP_FREE; } if (result != TICKOP_NONE) { if (!given) { - invGiveProp(prop); + inv_give_prop(prop); } return TICKOP_GIVETOPLAYER; @@ -17401,7 +17401,7 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg) return TICKOP_NONE; } -s32 objTestForPickup(struct prop *prop) +s32 obj_test_for_pickup(struct prop *prop) { struct defaultobj *obj = prop->obj; @@ -17441,7 +17441,7 @@ s32 objTestForPickup(struct prop *prop) } } - if (!objCanPickupFromSafe(obj)) { + if (!obj_can_pickup_from_safe(obj)) { return TICKOP_NONE; } @@ -17482,15 +17482,15 @@ s32 objTestForPickup(struct prop *prop) } } - if (invHasSingleWeaponExcAllGuns(weapon->weaponnum) && bgunGetAmmoTypeForWeapon(weapon->weaponnum, FUNC_PRIMARY)) { - if (cheatIsActive(CHEAT_UNLIMITEDAMMO) || cheatIsActive(CHEAT_UNLIMITEDAMMONORELOADS)) { + if (inv_has_single_weapon_exc_all_guns(weapon->weaponnum) && bgun_get_ammo_type_for_weapon(weapon->weaponnum, FUNC_PRIMARY)) { + if (cheat_is_active(CHEAT_UNLIMITEDAMMO) || cheat_is_active(CHEAT_UNLIMITEDAMMONORELOADS)) { maybe = false; } else { - maybe = bgunGetAmmoQtyForWeapon(weapon->weaponnum, FUNC_PRIMARY) >= bgunGetAmmoCapacityForWeapon(weapon->weaponnum, FUNC_PRIMARY); + maybe = bgun_get_ammo_qty_for_weapon(weapon->weaponnum, FUNC_PRIMARY) >= bgun_get_ammo_capacity_for_weapon(weapon->weaponnum, FUNC_PRIMARY); } if (weapon->weaponnum == WEAPON_SUPERDRAGON) { - if (bgunGetAmmoQtyForWeapon(weapon->weaponnum, FUNC_SECONDARY) < bgunGetAmmoCapacityForWeapon(weapon->weaponnum, FUNC_SECONDARY)) { + if (bgun_get_ammo_qty_for_weapon(weapon->weaponnum, FUNC_SECONDARY) < bgun_get_ammo_capacity_for_weapon(weapon->weaponnum, FUNC_SECONDARY)) { maybe = false; } } @@ -17509,14 +17509,14 @@ s32 objTestForPickup(struct prop *prop) leftweaponnum = weapon->weaponnum; } - if (invHasDoubleWeaponExcAllGuns(leftweaponnum, rightweaponnum)) { + if (inv_has_double_weapon_exc_all_guns(leftweaponnum, rightweaponnum)) { return TICKOP_NONE; } } else { if (g_Vars.normmplayerisrunning - && weaponHasFlag(weapon->weaponnum, WEAPONFLAG_DUALWIELD) - && !invHasDoubleWeaponExcAllGuns(weapon->weaponnum, weapon->weaponnum)) { - struct invitem *item = invFindSingleWeapon(weapon->weaponnum); + && weapon_has_flag(weapon->weaponnum, WEAPONFLAG_DUALWIELD) + && !inv_has_double_weapon_exc_all_guns(weapon->weaponnum, weapon->weaponnum)) { + struct invitem *item = inv_find_single_weapon(weapon->weaponnum); if ((item && item->type_weap.pickuppad == weapon->base.pad) || weapon->base.pad < 0) { return TICKOP_NONE; @@ -17530,15 +17530,15 @@ s32 objTestForPickup(struct prop *prop) } else if (obj->type == OBJTYPE_AMMOCRATE) { struct ammocrateobj *crate = (struct ammocrateobj *) prop->obj; - if (bgunGetReservedAmmoCount(crate->ammotype) >= bgunGetCapacityByAmmotype(crate->ammotype)) { - if ((crate->ammotype != AMMOTYPE_GRENADE || invHasSingleWeaponExcAllGuns(WEAPON_GRENADE)) - && (crate->ammotype != AMMOTYPE_CLOAK || invHasSingleWeaponExcAllGuns(WEAPON_CLOAKINGDEVICE)) - && (crate->ammotype != AMMOTYPE_BOOST || invHasSingleWeaponExcAllGuns(WEAPON_COMBATBOOST)) - && (crate->ammotype != AMMOTYPE_NBOMB || invHasSingleWeaponExcAllGuns(WEAPON_NBOMB)) - && (crate->ammotype != AMMOTYPE_REMOTE_MINE || invHasSingleWeaponExcAllGuns(WEAPON_REMOTEMINE)) - && (crate->ammotype != AMMOTYPE_PROXY_MINE || invHasSingleWeaponExcAllGuns(WEAPON_PROXIMITYMINE)) - && (crate->ammotype != AMMOTYPE_TIMED_MINE || invHasSingleWeaponExcAllGuns(WEAPON_TIMEDMINE)) - && (crate->ammotype != AMMOTYPE_KNIFE || invHasSingleWeaponExcAllGuns(WEAPON_COMBATKNIFE))) { + if (bgun_get_reserved_ammo_count(crate->ammotype) >= bgun_get_capacity_by_ammotype(crate->ammotype)) { + if ((crate->ammotype != AMMOTYPE_GRENADE || inv_has_single_weapon_exc_all_guns(WEAPON_GRENADE)) + && (crate->ammotype != AMMOTYPE_CLOAK || inv_has_single_weapon_exc_all_guns(WEAPON_CLOAKINGDEVICE)) + && (crate->ammotype != AMMOTYPE_BOOST || inv_has_single_weapon_exc_all_guns(WEAPON_COMBATBOOST)) + && (crate->ammotype != AMMOTYPE_NBOMB || inv_has_single_weapon_exc_all_guns(WEAPON_NBOMB)) + && (crate->ammotype != AMMOTYPE_REMOTE_MINE || inv_has_single_weapon_exc_all_guns(WEAPON_REMOTEMINE)) + && (crate->ammotype != AMMOTYPE_PROXY_MINE || inv_has_single_weapon_exc_all_guns(WEAPON_PROXIMITYMINE)) + && (crate->ammotype != AMMOTYPE_TIMED_MINE || inv_has_single_weapon_exc_all_guns(WEAPON_TIMEDMINE)) + && (crate->ammotype != AMMOTYPE_KNIFE || inv_has_single_weapon_exc_all_guns(WEAPON_COMBATKNIFE))) { return TICKOP_NONE; } } @@ -17547,7 +17547,7 @@ s32 objTestForPickup(struct prop *prop) bool ignore = true; s32 i; - if (objGetDestroyedLevel(obj)) { + if (obj_get_destroyed_level(obj)) { return TICKOP_NONE; } @@ -17555,19 +17555,19 @@ s32 objTestForPickup(struct prop *prop) s32 ammotype = i + 1; if (crate->slots[i].quantity > 0) { - if (bgunGetReservedAmmoCount(ammotype) < bgunGetCapacityByAmmotype(ammotype)) { + if (bgun_get_reserved_ammo_count(ammotype) < bgun_get_capacity_by_ammotype(ammotype)) { ignore = false; break; } - if ((ammotype == AMMOTYPE_GRENADE && !invHasSingleWeaponExcAllGuns(WEAPON_GRENADE)) - || (ammotype == AMMOTYPE_CLOAK && !invHasSingleWeaponExcAllGuns(WEAPON_CLOAKINGDEVICE)) - || (ammotype == AMMOTYPE_BOOST && !invHasSingleWeaponExcAllGuns(WEAPON_COMBATBOOST)) - || (ammotype == AMMOTYPE_NBOMB && !invHasSingleWeaponExcAllGuns(WEAPON_NBOMB)) - || (ammotype == AMMOTYPE_REMOTE_MINE && !invHasSingleWeaponExcAllGuns(WEAPON_REMOTEMINE)) - || (ammotype == AMMOTYPE_PROXY_MINE && !invHasSingleWeaponExcAllGuns(WEAPON_PROXIMITYMINE)) - || (ammotype == AMMOTYPE_TIMED_MINE && !invHasSingleWeaponExcAllGuns(WEAPON_TIMEDMINE)) - || (ammotype == AMMOTYPE_KNIFE && !invHasSingleWeaponExcAllGuns(WEAPON_COMBATKNIFE))) { + if ((ammotype == AMMOTYPE_GRENADE && !inv_has_single_weapon_exc_all_guns(WEAPON_GRENADE)) + || (ammotype == AMMOTYPE_CLOAK && !inv_has_single_weapon_exc_all_guns(WEAPON_CLOAKINGDEVICE)) + || (ammotype == AMMOTYPE_BOOST && !inv_has_single_weapon_exc_all_guns(WEAPON_COMBATBOOST)) + || (ammotype == AMMOTYPE_NBOMB && !inv_has_single_weapon_exc_all_guns(WEAPON_NBOMB)) + || (ammotype == AMMOTYPE_REMOTE_MINE && !inv_has_single_weapon_exc_all_guns(WEAPON_REMOTEMINE)) + || (ammotype == AMMOTYPE_PROXY_MINE && !inv_has_single_weapon_exc_all_guns(WEAPON_PROXIMITYMINE)) + || (ammotype == AMMOTYPE_TIMED_MINE && !inv_has_single_weapon_exc_all_guns(WEAPON_TIMEDMINE)) + || (ammotype == AMMOTYPE_KNIFE && !inv_has_single_weapon_exc_all_guns(WEAPON_COMBATKNIFE))) { ignore = false; break; } @@ -17581,11 +17581,11 @@ s32 objTestForPickup(struct prop *prop) struct shieldobj *shield = (struct shieldobj *) prop->obj; bool ignore = false; - if (shield->amount <= playerGetShieldFrac()) { + if (shield->amount <= player_get_shield_frac()) { ignore = true; } else if (g_Vars.normmplayerisrunning && g_MpSetup.scenario == MPSCENARIO_HOLDTHEBRIEFCASE - && invHasBriefcase()) { + && inv_has_briefcase()) { ignore = true; } @@ -17611,7 +17611,7 @@ s32 objTestForPickup(struct prop *prop) u32 stack; usebigrange = (obj->flags3 & OBJFLAG3_ONSHELF) - && (cheatIsActive(CHEAT_SMALLJO) || cheatIsActive(CHEAT_PLAYASELVIS)); + && (cheat_is_active(CHEAT_SMALLJO) || cheat_is_active(CHEAT_PLAYASELVIS)); if (g_Vars.currentplayer->magnetattracttime >= 60) { pickup = xdiff * xdiff + zdiff * zdiff <= 350 * 350 && ydiff >= -500 && ydiff <= 500; @@ -17628,14 +17628,14 @@ s32 objTestForPickup(struct prop *prop) if (pickup && (obj->flags2 & OBJFLAG2_PICKUPWITHOUTLOS) == 0 && !usebigrange - && cdTestLos05(&playerprop->pos, playerprop->rooms, &prop->pos, prop->rooms, + && cd_test_los05(&playerprop->pos, playerprop->rooms, &prop->pos, prop->rooms, CDTYPE_DOORS | CDTYPE_BG, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT) == false) { pickup = false; } if (pickup) { - return propPickupByPlayer(prop, true); + return prop_pickup_by_player(prop, true); } } @@ -17646,7 +17646,7 @@ bool func0f0899dc(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3) { if (prop->flags & PROPFLAG_ONTHISSCREENTHISTICK) { struct defaultobj *obj = prop->obj; - Mtxf *matrix = modelGetRootMtx(obj->model); + Mtxf *matrix = model_get_root_mtx(obj->model); arg1->z = matrix->m[3][2]; @@ -17669,7 +17669,7 @@ bool func0f0899dc(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3) return false; } -void modelFreeVertices(s32 vtxstoretype, struct model *model) +void model_free_vertices(s32 vtxstoretype, struct model *model) { struct modeldef *modeldef = model->definition; struct modelnode *node = modeldef->rootnode; @@ -17683,11 +17683,11 @@ void modelFreeVertices(s32 vtxstoretype, struct model *model) switch (type) { case MODELNODETYPE_DL: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); - if (modelIsNodeNotTvscreen(modeldef, node)) { + if (model_is_node_not_tvscreen(modeldef, node)) { if (rwdata->dl.vertices != rodata->dl.vertices) { - vtxstoreFree(vtxstoretype, rwdata->dl.vertices); + vtxstore_free(vtxstoretype, rwdata->dl.vertices); rwdata->dl.vertices = rodata->dl.vertices; } @@ -17698,20 +17698,20 @@ void modelFreeVertices(s32 vtxstoretype, struct model *model) newtype = VTXSTORETYPE_CHRCOL; } - vtxstoreFree(newtype, rwdata->dl.colours); + vtxstore_free(newtype, rwdata->dl.colours); rwdata->dl.colours = (Col *)ALIGN8((uintptr_t)rodata->dl.vertices + rodata->dl.numvertices * sizeof(Vtx)); } } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(model, node); + model_apply_distance_relations(model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, node); + model_apply_toggle_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; } @@ -17730,20 +17730,20 @@ void modelFreeVertices(s32 vtxstoretype, struct model *model) } } -struct prop *hatApplyToChr(struct hatobj *hat, struct chrdata *chr, struct modeldef *modeldef, struct prop *prop, struct model *model) +struct prop *hat_apply_to_chr(struct hatobj *hat, struct chrdata *chr, struct modeldef *modeldef, struct prop *prop, struct model *model) { if (chr->model->definition->skel == &g_SkelChr) { - prop = objInit(&hat->base, modeldef, prop, model); + prop = obj_init(&hat->base, modeldef, prop, model); if (prop && hat->base.model) { f32 scale = hat->base.extrascale * (1.0f / 256.0f); - modelSetScale(hat->base.model, scale * hat->base.model->scale); + model_set_scale(hat->base.model, scale * hat->base.model->scale); hat->base.model->attachedtomodel = chr->model; - hat->base.model->attachedtonode = modelGetPart(chr->model->definition, MODELPART_CHR_0006); + hat->base.model->attachedtonode = model_get_part(chr->model->definition, MODELPART_CHR_0006); - propReparent(prop, chr->prop); + prop_reparent(prop, chr->prop); chr->weapons_held[2] = prop; } @@ -17754,40 +17754,40 @@ struct prop *hatApplyToChr(struct hatobj *hat, struct chrdata *chr, struct model return prop; } -void hatLoadAndApplyToChr(struct hatobj *hat, struct chrdata *chr) +void hat_load_and_apply_to_chr(struct hatobj *hat, struct chrdata *chr) { u32 stack; s32 modelnum = hat->base.modelnum; - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); - hatApplyToChr(hat, chr, g_ModelStates[modelnum].modeldef, NULL, NULL); + hat_apply_to_chr(hat, chr, g_ModelStates[modelnum].modeldef, NULL, NULL); } -void hatAssignToChr(struct hatobj *hat, struct chrdata *chr) +void hat_assign_to_chr(struct hatobj *hat, struct chrdata *chr) { - hatLoadAndApplyToChr(hat, chr); + hat_load_and_apply_to_chr(hat, chr); } -struct prop *hatCreateForChr(struct chrdata *chr, s32 modelnum, u32 flags) +struct prop *hat_create_for_chr(struct chrdata *chr, s32 modelnum, u32 flags) { struct modeldef *modeldef; struct prop *prop; struct model *model; struct hatobj *obj; - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); modeldef = g_ModelStates[modelnum].modeldef; - prop = propAllocate(); - model = modelmgrInstantiateModelWithoutAnim(modeldef); - obj = hatCreate(prop == NULL, model == NULL, modeldef); + prop = prop_allocate(); + model = modelmgr_instantiate_model_without_anim(modeldef); + obj = hat_create(prop == NULL, model == NULL, modeldef); if (prop == NULL) { - prop = propAllocate(); + prop = prop_allocate(); } if (model == NULL) { - model = modelmgrInstantiateModelWithoutAnim(modeldef); + model = modelmgr_instantiate_model_without_anim(modeldef); } if (obj && prop && model) { @@ -17822,14 +17822,14 @@ struct prop *hatCreateForChr(struct chrdata *chr, s32 modelnum, u32 flags) obj->base.flags = flags | OBJFLAG_ASSIGNEDTOCHR; obj->base.pad = chr->chrnum; - prop = hatApplyToChr(obj, chr, modeldef, prop, model); + prop = hat_apply_to_chr(obj, chr, modeldef, prop, model); } else { if (model) { - modelmgrFreeModel(model); + modelmgr_free_model(model); } if (prop) { - propFree(prop); + prop_free(prop); prop = NULL; } @@ -17842,7 +17842,7 @@ struct prop *hatCreateForChr(struct chrdata *chr, s32 modelnum, u32 flags) return prop; } -struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef) +struct weaponobj *weapon_create(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef) { s32 i; struct weaponobj *tmp; @@ -17881,7 +17881,7 @@ struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct mod } if (usable) { - if (!musthavemodel || modelmgrCanSlotFitRwdata(g_WeaponSlots[i].base.model, modeldef)) { + if (!musthavemodel || modelmgr_can_slot_fit_rwdata(g_WeaponSlots[i].base.model, modeldef)) { if ((g_WeaponSlots[i].base.prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) == 0 && sp40 < 0) { sp40 = i; } @@ -17904,7 +17904,7 @@ struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct mod return &g_WeaponSlots[sp44]; } - tmp = (struct weaponobj *)setupFindObjForReuse(OBJTYPE_WEAPON, (struct defaultobj **)&sp4c, (struct defaultobj **)&sp48, musthaveprop, musthavemodel, modeldef); + tmp = (struct weaponobj *)setup_find_obj_for_reuse(OBJTYPE_WEAPON, (struct defaultobj **)&sp4c, (struct defaultobj **)&sp48, musthaveprop, musthavemodel, modeldef); if (tmp) { return tmp; @@ -17912,7 +17912,7 @@ struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct mod if (sp40 >= 0) { if (g_WeaponSlots[sp40].base.prop) { - objFreePermanently(&g_WeaponSlots[sp40].base, true); + obj_free_permanently(&g_WeaponSlots[sp40].base, true); } g_NextWeaponSlot = (sp40 + 1) % g_MaxWeaponSlots; @@ -17921,7 +17921,7 @@ struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct mod if (sp4c) { if (sp4c->base.prop) { - objFreePermanently(&sp4c->base, true); + obj_free_permanently(&sp4c->base, true); } return sp4c; @@ -17929,7 +17929,7 @@ struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct mod if (sp3c >= 0) { if (g_WeaponSlots[sp3c].base.prop) { - objFreePermanently(&g_WeaponSlots[sp3c].base, true); + obj_free_permanently(&g_WeaponSlots[sp3c].base, true); } g_NextWeaponSlot = (sp3c + 1) % g_MaxWeaponSlots; @@ -17938,7 +17938,7 @@ struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct mod if (sp48) { if (sp48->base.prop) { - objFreePermanently(&sp48->base, true); + obj_free_permanently(&sp48->base, true); } return sp48; @@ -17949,10 +17949,10 @@ struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct mod struct weaponobj *func0f08a364(void) { - return weaponCreate(false, false, NULL); + return weapon_create(false, false, NULL); } -struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef) +struct hatobj *hat_create(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef) { s32 i; struct hatobj *tmp; @@ -17970,7 +17970,7 @@ struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef } } else if ((g_HatSlots[i].base.hidden & OBJHFLAG_PROJECTILE) == 0 && g_HatSlots[i].base.prop->parent == NULL - && (!musthavemodel || modelmgrCanSlotFitRwdata(g_HatSlots[i].base.model, modeldef))) { + && (!musthavemodel || modelmgr_can_slot_fit_rwdata(g_HatSlots[i].base.model, modeldef))) { if ((g_HatSlots[i].base.prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) == 0 && sp40 < 0) { sp40 = i; } @@ -17992,7 +17992,7 @@ struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef return &g_HatSlots[sp44]; } - tmp = (struct hatobj *)setupFindObjForReuse(OBJTYPE_HAT, (struct defaultobj **)&sp4c, (struct defaultobj **)&sp48, musthaveprop, musthavemodel, modeldef); + tmp = (struct hatobj *)setup_find_obj_for_reuse(OBJTYPE_HAT, (struct defaultobj **)&sp4c, (struct defaultobj **)&sp48, musthaveprop, musthavemodel, modeldef); if (tmp) { return tmp; @@ -18000,7 +18000,7 @@ struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef if (sp40 >= 0) { if (g_HatSlots[sp40].base.prop) { - objFreePermanently(&g_HatSlots[sp40].base, true); + obj_free_permanently(&g_HatSlots[sp40].base, true); } g_NextHatSlot = (sp40 + 1) % g_MaxHatSlots; @@ -18009,7 +18009,7 @@ struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef if (sp4c) { if (sp4c->base.prop) { - objFreePermanently(&sp4c->base, true); + obj_free_permanently(&sp4c->base, true); } return sp4c; @@ -18017,7 +18017,7 @@ struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef if (sp3c >= 0) { if (g_HatSlots[sp3c].base.prop) { - objFreePermanently(&g_HatSlots[sp3c].base, true); + obj_free_permanently(&g_HatSlots[sp3c].base, true); } g_NextHatSlot = (sp3c + 1) % g_MaxHatSlots; @@ -18026,7 +18026,7 @@ struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef if (sp48) { if (sp48->base.prop) { - objFreePermanently(&sp48->base, true); + obj_free_permanently(&sp48->base, true); } return sp48; @@ -18037,10 +18037,10 @@ struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef struct hatobj *func0f08a6fc(void) { - return hatCreate(false, false, NULL); + return hat_create(false, false, NULL); } -struct ammocrateobj *ammocrateAllocate(void) +struct ammocrateobj *ammocrate_allocate(void) { s32 i; @@ -18057,7 +18057,7 @@ struct ammocrateobj *ammocrateAllocate(void) && (g_AmmoCrates[i].base.hidden2 & OBJH2FLAG_CANREGEN) == 0 && g_AmmoCrates[i].base.prop->parent == NULL && (g_AmmoCrates[i].base.prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) == 0) { - objFreePermanently(&g_AmmoCrates[i].base, true); + obj_free_permanently(&g_AmmoCrates[i].base, true); return &g_AmmoCrates[i]; } } @@ -18067,7 +18067,7 @@ struct ammocrateobj *ammocrateAllocate(void) if ((g_AmmoCrates[i].base.hidden & OBJHFLAG_PROJECTILE) == 0 && (g_AmmoCrates[i].base.hidden2 & OBJH2FLAG_CANREGEN) == 0 && g_AmmoCrates[i].base.prop->parent == NULL) { - objFreePermanently(&g_AmmoCrates[i].base, true); + obj_free_permanently(&g_AmmoCrates[i].base, true); return &g_AmmoCrates[i]; } } @@ -18075,7 +18075,7 @@ struct ammocrateobj *ammocrateAllocate(void) return NULL; } -struct defaultobj *debrisAllocate(void) +struct defaultobj *debris_allocate(void) { s32 i; @@ -18092,7 +18092,7 @@ struct defaultobj *debrisAllocate(void) && (g_DebrisSlots[i].hidden2 & OBJH2FLAG_CANREGEN) == 0 && g_DebrisSlots[i].prop->parent == NULL && (g_DebrisSlots[i].prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) == 0) { - objFreePermanently(&g_DebrisSlots[i], true); + obj_free_permanently(&g_DebrisSlots[i], true); return &g_DebrisSlots[i]; } } @@ -18102,7 +18102,7 @@ struct defaultobj *debrisAllocate(void) if ((g_DebrisSlots[i].hidden & OBJHFLAG_PROJECTILE) == 0 && (g_DebrisSlots[i].hidden2 & OBJH2FLAG_CANREGEN) == 0 && g_DebrisSlots[i].prop->parent == NULL) { - objFreePermanently(&g_DebrisSlots[i], true); + obj_free_permanently(&g_DebrisSlots[i], true); return &g_DebrisSlots[i]; } } @@ -18110,16 +18110,16 @@ struct defaultobj *debrisAllocate(void) return NULL; } -void playerActivateRemoteMineDetonator(s32 playernum) +void player_activate_remote_mine_detonator(s32 playernum) { g_PlayersDetonatingMines |= 1 << playernum; - sndStart(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1); - bgunStartDetonateAnimation(playernum); + bgun_start_detonate_animation(playernum); } -struct weaponobj *weaponFindChildByWeaponNum(s32 weaponnum, struct prop *prop) +struct weaponobj *weapon_find_child_by_weapon_num(s32 weaponnum, struct prop *prop) { struct weaponobj *weapon; struct prop *child; @@ -18131,7 +18131,7 @@ struct weaponobj *weaponFindChildByWeaponNum(s32 weaponnum, struct prop *prop) child = prop->child; while (child) { - weapon = weaponFindChildByWeaponNum(weaponnum, child); + weapon = weapon_find_child_by_weapon_num(weaponnum, child); if (weapon) { return weapon; @@ -18143,12 +18143,12 @@ struct weaponobj *weaponFindChildByWeaponNum(s32 weaponnum, struct prop *prop) return NULL; } -struct weaponobj *weaponFindLanded(s32 weaponnum) +struct weaponobj *weapon_find_landed(s32 weaponnum) { struct prop *prop = g_Vars.activeprops; while (prop) { - struct weaponobj *weapon = weaponFindChildByWeaponNum(weaponnum, prop); + struct weaponobj *weapon = weapon_find_child_by_weapon_num(weaponnum, prop); if (weapon && (weapon->base.hidden & OBJHFLAG_PROJECTILE) == 0) { return weapon; @@ -18160,7 +18160,7 @@ struct weaponobj *weaponFindLanded(s32 weaponnum) return NULL; } -void weaponRegisterProxy(struct weaponobj *weapon) +void weapon_register_proxy(struct weaponobj *weapon) { s32 i; @@ -18172,7 +18172,7 @@ void weaponRegisterProxy(struct weaponobj *weapon) } } -void weaponUnregisterProxy(struct weaponobj *weapon) +void weapon_unregister_proxy(struct weaponobj *weapon) { s32 i; @@ -18184,7 +18184,7 @@ void weaponUnregisterProxy(struct weaponobj *weapon) } } -void coordTriggerProxies(struct coord *pos, bool arg1) +void coord_trigger_proxies(struct coord *pos, bool arg1) { s32 i; @@ -18214,9 +18214,9 @@ void coordTriggerProxies(struct coord *pos, bool arg1) } } -void chrsTriggerProxies(void) +void chrs_trigger_proxies(void) { - s32 numchrs = chrsGetNumSlots(); + s32 numchrs = chrs_get_num_slots(); s32 i; for (i = 0; i < numchrs; i++) { @@ -18232,16 +18232,16 @@ void chrsTriggerProxies(void) #endif && chr->prop && (chr->prop->flags & PROPFLAG_ENABLED) - && !chrIsDead(chr)) { - chrCalculatePosition(chr, &pos); - coordTriggerProxies(&pos, true); + && !chr_is_dead(chr)) { + chr_calculate_position(chr, &pos); + coord_trigger_proxies(&pos, true); } if (chr); } } -void propweaponSetDual(struct weaponobj *weapon1, struct weaponobj *weapon2) +void propweapon_set_dual(struct weaponobj *weapon1, struct weaponobj *weapon2) { weapon1->dualweaponnum = weapon2->weaponnum; weapon1->dualweapon = weapon2; @@ -18251,11 +18251,11 @@ void propweaponSetDual(struct weaponobj *weapon1, struct weaponobj *weapon2) struct prop *func0f08adc8(struct weaponobj *weapon, struct modeldef *modeldef, struct prop *prop, struct model *model) { - prop = objInit(&weapon->base, modeldef, prop, model); + prop = obj_init(&weapon->base, modeldef, prop, model); if (prop) { prop->type = PROPTYPE_WEAPON; - weaponSetGunfireVisible(prop, false, -1); + weapon_set_gunfire_visible(prop, false, -1); } return prop; @@ -18263,17 +18263,17 @@ struct prop *func0f08adc8(struct weaponobj *weapon, struct modeldef *modeldef, s struct prop *func0f08ae0c(struct weaponobj *weapon, struct modeldef *modeldef) { - struct prop *prop = objInitWithModelDef(&weapon->base, modeldef); + struct prop *prop = obj_init_with_model_def(&weapon->base, modeldef); if (prop) { prop->type = PROPTYPE_WEAPON; - weaponSetGunfireVisible(prop, false, -1); + weapon_set_gunfire_visible(prop, false, -1); } return prop; } -bool chrEquipWeapon(struct weaponobj *weapon, struct chrdata *chr) +bool chr_equip_weapon(struct weaponobj *weapon, struct chrdata *chr) { u32 stack1; s32 handnum = (weapon->base.flags & OBJFLAG_WEAPON_LEFTHANDED) ? HAND_LEFT : HAND_RIGHT; @@ -18281,7 +18281,7 @@ bool chrEquipWeapon(struct weaponobj *weapon, struct chrdata *chr) if (weapon->base.prop && weapon->base.model) { if (g_Vars.mplayerisrunning) { - s32 playernum = mpPlayerGetIndex(chr); + s32 playernum = mp_player_get_index(chr); weapon->base.hidden &= 0x0fffffff; weapon->base.hidden |= (playernum << 28) & 0xf0000000; @@ -18302,29 +18302,29 @@ bool chrEquipWeapon(struct weaponobj *weapon, struct chrdata *chr) weapon->base.model->attachedtomodel = chr->model; if (handnum == HAND_RIGHT) { - weapon->base.model->attachedtonode = modelGetPart(chr->model->definition, MODELPART_CHR_RIGHTHAND); + weapon->base.model->attachedtonode = model_get_part(chr->model->definition, MODELPART_CHR_RIGHTHAND); } else { - weapon->base.model->attachedtonode = modelGetPart(chr->model->definition, MODELPART_CHR_LEFTHAND); + weapon->base.model->attachedtonode = model_get_part(chr->model->definition, MODELPART_CHR_LEFTHAND); } chr->weapons_held[handnum] = weapon->base.prop; if ((weapon->base.flags & OBJFLAG_WEAPON_CANMIXDUAL) && chr->weapons_held[1 - handnum]) { - propweaponSetDual(weapon, chr->weapons_held[1 - handnum]->weapon); + propweapon_set_dual(weapon, chr->weapons_held[1 - handnum]->weapon); } } else if (chr->model->definition->skel == &g_SkelSkedar) { weapon->base.model->attachedtomodel = chr->model; if (handnum == HAND_RIGHT) { - weapon->base.model->attachedtonode = modelGetPart(chr->model->definition, MODELPART_SKEDAR_RIGHTHAND); + weapon->base.model->attachedtonode = model_get_part(chr->model->definition, MODELPART_SKEDAR_RIGHTHAND); } else { - weapon->base.model->attachedtonode = modelGetPart(chr->model->definition, MODELPART_SKEDAR_LEFTHAND); + weapon->base.model->attachedtonode = model_get_part(chr->model->definition, MODELPART_SKEDAR_LEFTHAND); } chr->weapons_held[handnum] = weapon->base.prop; if ((weapon->base.flags & OBJFLAG_WEAPON_CANMIXDUAL) && chr->weapons_held[1 - handnum]) { - propweaponSetDual(weapon, chr->weapons_held[1 - handnum]->weapon); + propweapon_set_dual(weapon, chr->weapons_held[1 - handnum]->weapon); } } else { return false; @@ -18332,7 +18332,7 @@ bool chrEquipWeapon(struct weaponobj *weapon, struct chrdata *chr) } } - propReparent(weapon->base.prop, chr->prop); + prop_reparent(weapon->base.prop, chr->prop); } else { return false; } @@ -18347,25 +18347,25 @@ struct prop *func0f08b108(struct weaponobj *weapon, struct chrdata *chr, struct if (prop && weapon->base.model) { f32 scale = weapon->base.extrascale * (1.0f / 256.0f); - modelSetScale(weapon->base.model, weapon->base.model->scale * scale); + model_set_scale(weapon->base.model, weapon->base.model->scale * scale); - if (!chrEquipWeapon(weapon, chr)) { - propFree(prop); + if (!chr_equip_weapon(weapon, chr)) { + prop_free(prop); prop = NULL; weapon->base.prop = NULL; - modelmgrFreeModel(weapon->base.model); + modelmgr_free_model(weapon->base.model); weapon->base.model = NULL; } } else { if (prop) { - propFree(prop); + prop_free(prop); prop = NULL; weapon->base.prop = NULL; } if (weapon->base.model) { - modelmgrFreeModel(weapon->base.model); + modelmgr_free_model(weapon->base.model); weapon->base.model = NULL; } } @@ -18378,7 +18378,7 @@ void func0f08b208(struct weaponobj *weapon, struct chrdata *chr) u32 stack; s32 modelnum = weapon->base.modelnum; - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); func0f08b108(weapon, chr, g_ModelStates[modelnum].modeldef, 0, 0); } @@ -18387,7 +18387,7 @@ void func0f08b25c(struct weaponobj *weapon, struct chrdata *chr) func0f08b208(weapon, chr); } -struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata *chr) +struct autogunobj *laptop_deploy(s32 modelnum, struct gset *gset, struct chrdata *chr) { struct modeldef *modeldef; struct prop *prop; @@ -18396,34 +18396,34 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata s32 index; if (g_Vars.normmplayerisrunning) { - index = mpPlayerGetIndex(chr); + index = mp_player_get_index(chr); } else { - index = playermgrGetPlayerNumByProp(chr->prop); + index = playermgr_get_player_num_by_prop(chr->prop); } if (index >= 0 && index < g_MaxThrownLaptops) { - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); modeldef = g_ModelStates[modelnum].modeldef; laptop = &g_ThrownLaptops[index]; if (laptop->base.prop) { #if VERSION >= VERSION_NTSC_1_0 - explosionCreateSimple(NULL, &laptop->base.prop->pos, laptop->base.prop->rooms, EXPLOSIONTYPE_LAPTOP, index); + explosion_create_simple(NULL, &laptop->base.prop->pos, laptop->base.prop->rooms, EXPLOSIONTYPE_LAPTOP, index); #else - explosionCreateSimple(NULL, &laptop->base.prop->pos, laptop->base.prop->rooms, EXPLOSIONTYPE_LAPTOP, 0); + explosion_create_simple(NULL, &laptop->base.prop->pos, laptop->base.prop->rooms, EXPLOSIONTYPE_LAPTOP, 0); #endif - objFreePermanently(&laptop->base, true); + obj_free_permanently(&laptop->base, true); } - prop = propAllocate(); - model = modelmgrInstantiateModelWithoutAnim(modeldef); + prop = prop_allocate(); + model = modelmgr_instantiate_model_without_anim(modeldef); if (prop == NULL) { - prop = propAllocate(); + prop = prop_allocate(); } if (model == NULL) { - model = modelmgrInstantiateModelWithoutAnim(modeldef); + model = modelmgr_instantiate_model_without_anim(modeldef); } if (laptop && prop && model) { @@ -18455,7 +18455,7 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata laptop->base = tmp; laptop->base.modelnum = modelnum; - prop = objInit(&laptop->base, modeldef, prop, model); + prop = obj_init(&laptop->base, modeldef, prop, model); laptop->targetpad = -1; laptop->aimdist = 5000; @@ -18474,13 +18474,13 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata laptop->shotbondsum = 0; if (chr->aibot) { - laptop->ammoquantity = botactTryRemoveAmmoFromReserve(chr->aibot, WEAPON_LAPTOPGUN, FUNC_PRIMARY, 200); + laptop->ammoquantity = botact_try_remove_ammo_from_reserve(chr->aibot, WEAPON_LAPTOPGUN, FUNC_PRIMARY, 200); } else if (chr->prop->type == PROPTYPE_PLAYER) { s32 qty; s32 prevplayernum = g_Vars.currentplayernum; - setCurrentPlayerNum(playermgrGetPlayerNumByProp(chr->prop)); - qty = bgunGetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY); + set_current_player_num(playermgr_get_player_num_by_prop(chr->prop)); + qty = bgun_get_ammo_qty_for_weapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY); if (qty >= 200) { laptop->ammoquantity = 200; @@ -18488,14 +18488,14 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata laptop->ammoquantity = qty; } - if (cheatIsActive(CHEAT_UNLIMITEDAMMOLAPTOP)) { + if (cheat_is_active(CHEAT_UNLIMITEDAMMOLAPTOP)) { laptop->ammoquantity = 255; } else { qty -= laptop->ammoquantity; } - bgunSetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, qty); - setCurrentPlayerNum(prevplayernum); + bgun_set_ammo_qty_for_weapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, qty); + set_current_player_num(prevplayernum); } else { laptop->ammoquantity = 255; } @@ -18517,11 +18517,11 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata laptop->base.flags3 |= OBJFLAG3_INTERACTABLE | OBJFLAG3_08000000; } else { if (model) { - modelmgrFreeModel(model); + modelmgr_free_model(model); } if (prop) { - propFree(prop); + prop_free(prop); } laptop = NULL; @@ -18531,27 +18531,27 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata return laptop; } -struct weaponobj *weaponCreateProjectileFromGset(s32 modelnum, struct gset *gset, struct chrdata *chr) +struct weaponobj *weapon_create_projectile_from_gset(s32 modelnum, struct gset *gset, struct chrdata *chr) { struct modeldef *modeldef; struct prop *prop; struct model *model; struct weaponobj *weapon; - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); modeldef = g_ModelStates[modelnum].modeldef; - prop = propAllocate(); - model = modelmgrInstantiateModelWithoutAnim(modeldef); + prop = prop_allocate(); + model = modelmgr_instantiate_model_without_anim(modeldef); - weapon = weaponCreate(prop == NULL, model == NULL, modeldef); + weapon = weapon_create(prop == NULL, model == NULL, modeldef); if (prop == NULL) { - prop = propAllocate(); + prop = prop_allocate(); } if (model == NULL) { - model = modelmgrInstantiateModelWithoutAnim(modeldef); + model = modelmgr_instantiate_model_without_anim(modeldef); } if (weapon && prop && model) { @@ -18615,7 +18615,7 @@ struct weaponobj *weaponCreateProjectileFromGset(s32 modelnum, struct gset *gset prop = func0f08adc8(weapon, modeldef, prop, model); if (g_Vars.mplayerisrunning) { - s32 index = mpPlayerGetIndex(chr); + s32 index = mp_player_get_index(chr); weapon->base.hidden &= 0x0fffffff; weapon->base.hidden |= ((index << 28) & 0xf0000000); @@ -18635,26 +18635,26 @@ struct weaponobj *weaponCreateProjectileFromGset(s32 modelnum, struct gset *gset weapon = NULL; if (model) { - modelmgrFreeModel(model); + modelmgr_free_model(model); } if (prop) { - propFree(prop); + prop_free(prop); } } return weapon; } -struct weaponobj *weaponCreateProjectileFromWeaponNum(s32 modelnum, s32 weaponnum, struct chrdata *chr) +struct weaponobj *weapon_create_projectile_from_weapon_num(s32 modelnum, s32 weaponnum, struct chrdata *chr) { struct gset gset = {0}; gset.weaponnum = weaponnum; - return weaponCreateProjectileFromGset(modelnum, &gset, chr); + return weapon_create_projectile_from_gset(modelnum, &gset, chr); } -void weaponDeleteFromChr(struct chrdata *chr, s32 hand) +void weapon_delete_from_chr(struct chrdata *chr, s32 hand) { if (chr && chr->weapons_held[hand]) { struct defaultobj *obj = chr->weapons_held[hand]->obj; @@ -18662,29 +18662,29 @@ void weaponDeleteFromChr(struct chrdata *chr, s32 hand) } } -struct prop *weaponCreateForChr(struct chrdata *chr, s32 modelnum, s32 weaponnum, u32 flags, struct weaponobj *obj, struct modeldef *modeldef) +struct prop *weapon_create_for_chr(struct chrdata *chr, s32 modelnum, s32 weaponnum, u32 flags, struct weaponobj *obj, struct modeldef *modeldef) { struct prop *prop; struct model *model; if (modeldef == NULL) { - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); modeldef = g_ModelStates[modelnum].modeldef; } - prop = propAllocate(); - model = modelmgrInstantiateModelWithoutAnim(modeldef); + prop = prop_allocate(); + model = modelmgr_instantiate_model_without_anim(modeldef); if (obj == NULL) { - obj = weaponCreate(prop == NULL, model == NULL, modeldef); + obj = weapon_create(prop == NULL, model == NULL, modeldef); } if (prop == NULL) { - prop = propAllocate(); + prop = prop_allocate(); } if (model == NULL) { - model = modelmgrInstantiateModelWithoutAnim(modeldef); + model = modelmgr_instantiate_model_without_anim(modeldef); } if (obj && prop && model) { @@ -18734,11 +18734,11 @@ struct prop *weaponCreateForChr(struct chrdata *chr, s32 modelnum, s32 weaponnum prop = func0f08b108(obj, chr, modeldef, prop, model); } else { if (model) { - modelmgrFreeModel(model); + modelmgr_free_model(model); } if (prop) { - propFree(prop); + prop_free(prop); prop = NULL; } @@ -18751,22 +18751,22 @@ struct prop *weaponCreateForChr(struct chrdata *chr, s32 modelnum, s32 weaponnum return prop; } -struct prop *chrGiveWeapon(struct chrdata *chr, s32 model, s32 weaponnum, u32 flags) +struct prop *chr_give_weapon(struct chrdata *chr, s32 model, s32 weaponnum, u32 flags) { - return weaponCreateForChr(chr, model, weaponnum, flags, NULL, NULL); + return weapon_create_for_chr(chr, model, weaponnum, flags, NULL, NULL); } -struct prop *chrGiveWeaponWithAutoModel(struct chrdata *chr, s32 weaponnum, u32 flags) +struct prop *chr_give_weapon_with_auto_model(struct chrdata *chr, s32 weaponnum, u32 flags) { - return weaponCreateForChr(chr, playermgrGetModelOfWeapon(weaponnum), weaponnum, flags, NULL, NULL); + return weapon_create_for_chr(chr, playermgr_get_model_of_weapon(weaponnum), weaponnum, flags, NULL, NULL); } -s32 weaponTestForPickup(struct prop *prop) +s32 weapon_test_for_pickup(struct prop *prop) { - return objTestForPickup(prop); + return obj_test_for_pickup(prop); } -void weaponSetGunfireVisible(struct prop *prop, bool visible, RoomNum room) +void weapon_set_gunfire_visible(struct prop *prop, bool visible, RoomNum room) { u32 stack[4]; bool flash = false; @@ -18780,10 +18780,10 @@ void weaponSetGunfireVisible(struct prop *prop, bool visible, RoomNum room) struct model *model = obj->model; if (model && model->definition->skel == &g_SkelChrGun) { - node1 = modelGetPart(model->definition, MODELPART_CHRGUN_GUNFIRE); + node1 = model_get_part(model->definition, MODELPART_CHRGUN_GUNFIRE); if (node1) { - rwdata1 = modelGetNodeRwData(model, node1); + rwdata1 = model_get_node_rw_data(model, node1); rwdata1->chrgunfire.visible = visible; if (visible) { @@ -18791,10 +18791,10 @@ void weaponSetGunfireVisible(struct prop *prop, bool visible, RoomNum room) } } - node2 = modelGetPart(model->definition, MODELPART_CHRGUN_0002); + node2 = model_get_part(model->definition, MODELPART_CHRGUN_0002); if (node2) { - rwdata2 = modelGetNodeRwData(model, node2); + rwdata2 = model_get_node_rw_data(model, node2); rwdata2->toggle.visible = visible; if (visible) { @@ -18805,28 +18805,28 @@ void weaponSetGunfireVisible(struct prop *prop, bool visible, RoomNum room) } if (flash && room != -1) { - roomFlashLighting(room, 48, 128); + room_flash_lighting(room, 48, 128); } } -bool weaponIsGunfireVisible(struct prop *prop) +bool weapon_is_gunfire_visible(struct prop *prop) { struct defaultobj *obj = prop->obj; struct model *model = obj->model; struct modelnode *node; if (model && model->definition->skel == &g_SkelChrGun) { - node = modelGetPart(model->definition, MODELPART_CHRGUN_GUNFIRE); + node = model_get_part(model->definition, MODELPART_CHRGUN_GUNFIRE); if (node) { - struct modelrwdata_chrgunfire *rwdata = modelGetNodeRwData(model, node); + struct modelrwdata_chrgunfire *rwdata = model_get_node_rw_data(model, node); return rwdata->visible; } - node = modelGetPart(model->definition, MODELPART_CHRGUN_0002); + node = model_get_part(model->definition, MODELPART_CHRGUN_0002); if (node) { - struct modelrwdata_toggle *rwdata = modelGetNodeRwData(model, node); + struct modelrwdata_toggle *rwdata = model_get_node_rw_data(model, node); return rwdata->visible; } } @@ -18834,22 +18834,22 @@ bool weaponIsGunfireVisible(struct prop *prop) return false; } -s32 hatGetType(struct prop *prop) +s32 hat_get_type(struct prop *prop) { return -1; } -bool doorIsUnlocked(struct prop *playerprop, struct prop *doorprop) +bool door_is_unlocked(struct prop *playerprop, struct prop *doorprop) { struct doorobj *door = doorprop->door; bool canopen = false; if (door->keyflags == 0) { canopen = true; - } else if (invHasKeyFlags(door->keyflags)) { + } else if (inv_has_key_flags(door->keyflags)) { canopen = true; } else { - if (posIsInFrontOfDoor(&playerprop->pos, door)) { + if (pos_is_in_front_of_door(&playerprop->pos, door)) { if ((door->base.flags2 & OBJFLAG2_LOCKEDBACK) && (door->base.flags2 & OBJFLAG2_LOCKEDFRONT) == 0) { canopen = true; @@ -18862,14 +18862,14 @@ bool doorIsUnlocked(struct prop *playerprop, struct prop *doorprop) } } - if (!doorIsPadlockFree(door)) { + if (!door_is_padlock_free(door)) { canopen = false; } return canopen; } -bool doorIsPosInRange(struct doorobj *door, struct coord *pos, f32 distance, bool isbike) +bool door_is_pos_in_range(struct doorobj *door, struct coord *pos, f32 distance, bool isbike) { struct coord range; @@ -18894,9 +18894,9 @@ bool doorIsPosInRange(struct doorobj *door, struct coord *pos, f32 distance, boo return false; } -bool doorIsObjInRange(struct doorobj *door, struct defaultobj *obj, bool isbike) +bool door_is_obj_in_range(struct doorobj *door, struct defaultobj *obj, bool isbike) { - struct modelrodata_bbox *bbox = objFindBboxRodata(obj); + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(obj); f32 scale = 0; if (scale < bbox->xmin) { @@ -18925,19 +18925,19 @@ bool doorIsObjInRange(struct doorobj *door, struct defaultobj *obj, bool isbike) scale *= obj->model->scale; - return doorIsPosInRange(door, &obj->prop->pos, scale, isbike); + return door_is_pos_in_range(door, &obj->prop->pos, scale, isbike); } /** * @bug: result should be an integer. Its value can only be 0.0f or 1.0f. * Nothing bad comes from this, but it uses unnecessary float conversions. */ -bool vectorIsInFrontOfDoor(struct doorobj *door, struct coord *vector) +bool vector_is_in_front_of_door(struct doorobj *door, struct coord *vector) { f32 result; struct pad pad; - padUnpack(door->base.pad, PADFIELD_NORMAL, &pad); + pad_unpack(door->base.pad, PADFIELD_NORMAL, &pad); result = vector->f[0] * pad.normal.f[0] + vector->f[1] * pad.normal.f[1] + vector->f[2] * pad.normal.f[2] >= 0.0f; @@ -18952,25 +18952,25 @@ bool vectorIsInFrontOfDoor(struct doorobj *door, struct coord *vector) * Return true if there are no chrs or grabbed/mounted objects within opening * range of the door (for automatic doors). */ -bool doorIsRangeEmpty(struct doorobj *door) +bool door_is_range_empty(struct doorobj *door) { u32 stack; s16 *propnumptr; s16 propnums[256]; - roomGetProps(door->base.prop->rooms, propnums, 256); + room_get_props(door->base.prop->rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { struct prop *prop = &g_Vars.props[*propnumptr]; if (prop->type == PROPTYPE_CHR || prop->type == PROPTYPE_PLAYER) { - if (doorIsPosInRange(door, &prop->pos, 0, false)) { + if (door_is_pos_in_range(door, &prop->pos, 0, false)) { return false; } } else if (prop->type == PROPTYPE_OBJ) { if (prop->obj->hidden & (OBJHFLAG_MOUNTED | OBJHFLAG_GRABBED) - && doorIsObjInRange(door, prop->obj, (prop->obj->hidden & OBJHFLAG_MOUNTED) != 0)) { + && door_is_obj_in_range(door, prop->obj, (prop->obj->hidden & OBJHFLAG_MOUNTED) != 0)) { return false; } } @@ -18984,13 +18984,13 @@ bool doorIsRangeEmpty(struct doorobj *door) /** * Find automatic doors and open them if the player is close to them. */ -void doorsCheckAutomatic(void) +void doors_check_automatic(void) { struct prop *doorprop; s16 *propnumptr; s16 propnums[256]; - roomGetProps(g_Vars.currentplayer->prop->rooms, propnums, 256); + room_get_props(g_Vars.currentplayer->prop->rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { @@ -19000,7 +19000,7 @@ void doorsCheckAutomatic(void) struct doorobj *door = doorprop->door; if ((door->doorflags & DOORFLAG_AUTOMATIC) - && doorIsUnlocked(g_Vars.currentplayer->prop, doorprop) + && door_is_unlocked(g_Vars.currentplayer->prop, doorprop) && (door->mode == DOORMODE_CLOSING || (door->mode == DOORMODE_IDLE && door->frac <= 0))) { bool canopen = false; struct defaultobj *obj = NULL; @@ -19008,28 +19008,28 @@ void doorsCheckAutomatic(void) struct doorobj *sibling; if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRAB) { - obj = bmoveGetGrabbedProp()->obj; + obj = bmove_get_grabbed_prop()->obj; } else if (g_Vars.currentplayer->bondmovemode == MOVEMODE_BIKE) { - obj = bmoveGetHoverbike()->obj; + obj = bmove_get_hoverbike()->obj; isbike = true; } - if ((posIsInFrontOfDoor(&g_Vars.currentplayer->prop->pos, door) != vectorIsInFrontOfDoor(door, &g_Vars.currentplayer->bond2.unk00)) != 0) { - canopen = doorIsPosInRange(door, &g_Vars.currentplayer->prop->pos, 0, isbike); + if ((pos_is_in_front_of_door(&g_Vars.currentplayer->prop->pos, door) != vector_is_in_front_of_door(door, &g_Vars.currentplayer->bond2.unk00)) != 0) { + canopen = door_is_pos_in_range(door, &g_Vars.currentplayer->prop->pos, 0, isbike); if (!canopen && obj) { - canopen = doorIsObjInRange(door, obj, isbike); + canopen = door_is_obj_in_range(door, obj, isbike); } } sibling = door->sibling; while (sibling && sibling != door && !canopen) { - if ((posIsInFrontOfDoor(&g_Vars.currentplayer->prop->pos, sibling) != vectorIsInFrontOfDoor(sibling, &g_Vars.currentplayer->bond2.unk00)) != 0) { - canopen = doorIsPosInRange(sibling, &g_Vars.currentplayer->prop->pos, 0, isbike); + if ((pos_is_in_front_of_door(&g_Vars.currentplayer->prop->pos, sibling) != vector_is_in_front_of_door(sibling, &g_Vars.currentplayer->bond2.unk00)) != 0) { + canopen = door_is_pos_in_range(sibling, &g_Vars.currentplayer->prop->pos, 0, isbike); if (!canopen && obj) { - canopen = doorIsObjInRange(door, obj, isbike); + canopen = door_is_obj_in_range(door, obj, isbike); } } @@ -19037,7 +19037,7 @@ void doorsCheckAutomatic(void) } if (canopen) { - doorsRequestMode(door, DOORMODE_OPENING); + doors_request_mode(door, DOORMODE_OPENING); } } } @@ -19048,17 +19048,17 @@ void doorsCheckAutomatic(void) void func0f08c424(struct doorobj *door, Mtxf *matrix) { - mtx3ToMtx4(door->base.realrot, matrix); - mtx4SetTranslation(&door->base.prop->pos, matrix); + mtx3_to_mtx4(door->base.realrot, matrix); + mtx4_set_translation(&door->base.prop->pos, matrix); if (door->doorflags & DOORFLAG_FLIP) { mtx00015edc(-1, matrix); } } -void doorGetBbox(struct doorobj *door, struct modelrodata_bbox *dst) +void door_get_bbox(struct doorobj *door, struct modelrodata_bbox *dst) { - struct modelrodata_bbox *bbox = modelFindBboxRodata(door->base.model); + struct modelrodata_bbox *bbox = model_find_bbox_rodata(door->base.model); *dst = *bbox; @@ -19071,7 +19071,7 @@ void doorGetBbox(struct doorobj *door, struct modelrodata_bbox *dst) } } -void doorUpdateTiles(struct doorobj *door) +void door_update_tiles(struct doorobj *door) { struct modelrodata_bbox bbox; Mtxf spdc; @@ -19090,7 +19090,7 @@ void doorUpdateTiles(struct doorobj *door) || door->doortype == DOORTYPE_HULL) { // @bug: LOOK is not loaded but is used below // It doesn't appear to make any difference though - padUnpack(door->base.pad, PADFIELD_POS | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad); + pad_unpack(door->base.pad, PADFIELD_POS | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad); sp8c.x = pad.pos.x + pad.up.x * pad.bbox.ymin; sp8c.y = pad.pos.y + pad.up.y * pad.bbox.ymin; @@ -19120,15 +19120,15 @@ void doorUpdateTiles(struct doorobj *door) sp80.y = door->startpos.y - sp8c.y; sp80.z = door->startpos.z - sp8c.z; - mtx3ToMtx4(door->mtx98, &spdc); - mtx4LoadTranslation(&sp80, &sp98); - mtx4MultMtx4InPlace(&sp98, &spdc); + mtx3_to_mtx4(door->mtx98, &spdc); + mtx4_load_translation(&sp80, &sp98); + mtx4_mult_mtx4_in_place(&sp98, &spdc); if (door->doortype == DOORTYPE_AZTECCHAIR) { if (door->base.flags & OBJFLAG_DOOR_OPENTOFRONT) { - mtx4LoadZRotation(M_BADTAU - door->frac * 0.017450513318181f, &sp98); + mtx4_load_z_rotation(M_BADTAU - door->frac * 0.017450513318181f, &sp98); } else { - mtx4LoadZRotation(door->frac * 0.017450513318181f, &sp98); + mtx4_load_z_rotation(door->frac * 0.017450513318181f, &sp98); } } else if (door->doortype == DOORTYPE_HULL) { if (door->base.flags & OBJFLAG_DOOR_OPENTOFRONT) { @@ -19138,23 +19138,23 @@ void doorUpdateTiles(struct doorobj *door) } } else { if (door->base.flags & OBJFLAG_DOOR_OPENTOFRONT) { - mtx4LoadYRotation(M_BADTAU - door->frac * 0.017450513318181f, &sp98); + mtx4_load_y_rotation(M_BADTAU - door->frac * 0.017450513318181f, &sp98); } else { - mtx4LoadYRotation(door->frac * 0.017450513318181f, &sp98); + mtx4_load_y_rotation(door->frac * 0.017450513318181f, &sp98); } } - mtx4MultMtx4InPlace(&sp98, &spdc); - mtx4LoadTranslation(&sp8c, &sp98); - mtx4MultMtx4InPlace(&sp98, &spdc); - mtx4ToMtx3(&spdc, door->base.realrot); + mtx4_mult_mtx4_in_place(&sp98, &spdc); + mtx4_load_translation(&sp8c, &sp98); + mtx4_mult_mtx4_in_place(&sp98, &spdc); + mtx4_to_mtx3(&spdc, door->base.realrot); door->base.prop->pos.x = spdc.m[3][0]; door->base.prop->pos.y = spdc.m[3][1]; door->base.prop->pos.z = spdc.m[3][2]; } - doorGetBbox(door, &bbox); + door_get_bbox(door, &bbox); if (door->frac >= door->perimfrac) { door->base.hidden |= OBJHFLAG_DOORPERIMDISABLED; @@ -19166,7 +19166,7 @@ void doorUpdateTiles(struct doorobj *door) if ((door->doorflags & DOORFLAG_0020) == 0) { func0f08c424(door, &spdc); - objCalculateGeoBlockFromBboxAndMtx(&bbox, &spdc, geo); + obj_calculate_geo_block_from_bbox_and_mtx(&bbox, &spdc, geo); if (door->doortype == DOORTYPE_VERTICAL) { door->doorflags |= DOORFLAG_0020; @@ -19174,7 +19174,7 @@ void doorUpdateTiles(struct doorobj *door) } if (door->doortype == DOORTYPE_VERTICAL) { - geo->ymin = door->startpos.y + objGetRotatedLocalYMinByMtx3(&bbox, door->base.realrot); + geo->ymin = door->startpos.y + obj_get_rotated_local_y_min_by_mtx3(&bbox, door->base.realrot); } else if (door->doortype == DOORTYPE_FALLAWAY) { geo->ymin = door->base.prop->pos.y - 10000; } else if (door->doorflags & DOORFLAG_0001) { @@ -19203,7 +19203,7 @@ void door0f08cb20(struct doorobj *door, Vtx *src, Vtx *dst, s32 numvertices) struct modelrodata_bbox bbox; s32 stack[5]; - doorGetBbox(door, &bbox); + door_get_bbox(door, &bbox); if (door->doortype == DOORTYPE_VERTICAL) { ref = ceilf(bbox.ymax); @@ -19266,9 +19266,9 @@ void func0f08d3dc(struct doorobj *door) if (door->doorflags & DOORFLAG_0004) { struct modelnode *node = func0f0687e4(door->base.model); union modelrodata *rodata = node->rodata; - union modelrwdata *rwdata = modelGetNodeRwData(door->base.model, node); + union modelrwdata *rwdata = model_get_node_rw_data(door->base.model, node); - rwdata->dl.vertices = gfxAllocateVertices(rodata->dl.numvertices); + rwdata->dl.vertices = gfx_allocate_vertices(rodata->dl.numvertices); door0f08cb20(door, rodata->dl.vertices, rwdata->dl.vertices, rodata->dl.numvertices); } } @@ -19278,7 +19278,7 @@ void func0f08d460(struct doorobj *door) if ((door->doorflags & (DOORFLAG_0004 | DOORFLAG_0080)) == (DOORFLAG_0004 | DOORFLAG_0080)) { struct modelnode *node = func0f0687e4(door->base.model); union modelrodata *rodata = node->rodata; - union modelrwdata *rwdata = modelGetNodeRwData(door->base.model, node); + union modelrwdata *rwdata = model_get_node_rw_data(door->base.model, node); if (rwdata->dl.vertices != door->unka4) { door0f08cb20(door, rodata->dl.vertices, door->unka4, rodata->dl.numvertices); @@ -19288,21 +19288,21 @@ void func0f08d460(struct doorobj *door) } } -void doorActivatePortal(struct doorobj *door) +void door_activate_portal(struct doorobj *door) { if (door->portalnum >= 0) { - bgSetPortalOpenState(door->portalnum, true); + bg_set_portal_open_state(door->portalnum, true); } } -void doorDeactivatePortal(struct doorobj *door) +void door_deactivate_portal(struct doorobj *door) { if (door->portalnum >= 0) { - bgSetPortalOpenState(door->portalnum, false); + bg_set_portal_open_state(door->portalnum, false); } } -struct prop *doorInit(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNum *rooms, struct coord *coord, struct coord *centre) +struct prop *door_init(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNum *rooms, struct coord *coord, struct coord *centre) { struct prop *prop; union modelrodata *rodata; @@ -19310,7 +19310,7 @@ struct prop *doorInit(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNu RoomNum sp28[8]; door->base.flags |= OBJFLAG_00000100; - prop = objInitWithAutoModel(&door->base); + prop = obj_init_with_auto_model(&door->base); if (prop != NULL) { switch (door->doortype) { @@ -19325,9 +19325,9 @@ struct prop *doorInit(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNu break; } - mtx4Copy(mtx, &sp38); + mtx4_copy(mtx, &sp38); mtx00015f04(g_ModelStates[door->base.modelnum].scale * (1.0f / 4096.0f), &sp38); - mtx4ToMtx3(&sp38, door->base.realrot); + mtx4_to_mtx3(&sp38, door->base.realrot); door->frac = (door->base.flags & OBJFLAG_DOOR_KEEPOPEN) ? door->maxfrac : 0; door->fracspeed = 0; @@ -19346,12 +19346,12 @@ struct prop *doorInit(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNu if (door->doorflags & DOORFLAG_0004) { struct modelnode *node = func0f0687e4(door->base.model); rodata = node->rodata; - door->unka4 = mempAlloc(ALIGN16(rodata->dl.numvertices * sizeof(Vtx)), MEMPOOL_STAGE); + door->unka4 = memp_alloc(ALIGN16(rodata->dl.numvertices * sizeof(Vtx)), MEMPOOL_STAGE); } else { door->unka4 = NULL; } } else { - mtx4ToMtx3(&sp38, door->mtx98); + mtx4_to_mtx3(&sp38, door->mtx98); } func0f065e74(pos, rooms, centre, sp28); @@ -19362,9 +19362,9 @@ struct prop *doorInit(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNu prop->pos.y = centre->y; prop->pos.z = centre->z; - propDeregisterRooms(prop); - roomsCopy(sp28, prop->rooms); - doorUpdateTiles(door); + prop_deregister_rooms(prop); + rooms_copy(sp28, prop->rooms); + door_update_tiles(door); func0f069c70(&door->base, false, true); func0f08d3dc(door); @@ -19380,13 +19380,13 @@ struct prop *doorInit(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNu return prop; } -void doorPlayOpeningSound(s32 soundtype, struct prop *prop) +void door_play_opening_sound(s32 soundtype, struct prop *prop) { s32 sound1 = 0; s32 sound2 = 0; s32 sound3 = 0; - psStopSound(prop, PSTYPE_DOOR, 0xffff); + ps_stop_sound(prop, PSTYPE_DOOR, 0xffff); if (g_Vars.in_cutscene && (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR) @@ -19435,21 +19435,21 @@ void doorPlayOpeningSound(s32 soundtype, struct prop *prop) if (sound1) { #if VERSION >= VERSION_NTSC_1_0 - psCreate(NULL, prop, sound1, -1, + ps_create(NULL, prop, sound1, -1, -1, PSFLAG_0400, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); #else - psCreate(NULL, prop, sound1, -1, + ps_create(NULL, prop, sound1, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); #endif } if (sound2) { - psCreate(NULL, prop, sound2, -1, + ps_create(NULL, prop, sound2, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); } if (sound3) { - psCreate(NULL, prop, sound3, -1, + ps_create(NULL, prop, sound3, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); } } @@ -19457,13 +19457,13 @@ void doorPlayOpeningSound(s32 soundtype, struct prop *prop) /** * This is identical to the function above but with less cases. */ -void doorPlayClosingSound(s32 soundtype, struct prop *prop) +void door_play_closing_sound(s32 soundtype, struct prop *prop) { s32 sound1 = 0; s32 sound2 = 0; s32 sound3 = 0; - psStopSound(prop, PSTYPE_DOOR, 0xffff); + ps_stop_sound(prop, PSTYPE_DOOR, 0xffff); if (g_Vars.in_cutscene && (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR) @@ -19499,30 +19499,30 @@ void doorPlayClosingSound(s32 soundtype, struct prop *prop) if (sound1) { #if VERSION >= VERSION_NTSC_1_0 - psCreate(NULL, prop, sound1, -1, + ps_create(NULL, prop, sound1, -1, -1, PSFLAG_0400, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); #else - psCreate(NULL, prop, sound1, -1, + ps_create(NULL, prop, sound1, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); #endif } if (sound2) { - psCreate(NULL, prop, sound2, -1, + ps_create(NULL, prop, sound2, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); } if (sound3) { - psCreate(NULL, prop, sound3, -1, + ps_create(NULL, prop, sound3, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); } } -void doorPlayOpenedSound(s32 soundtype, struct prop *prop) +void door_play_opened_sound(s32 soundtype, struct prop *prop) { s32 sound = 0; - psStopSound(prop, PSTYPE_DOOR, 0xffff); + ps_stop_sound(prop, PSTYPE_DOOR, 0xffff); if (g_Vars.in_cutscene && (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR) @@ -19562,20 +19562,20 @@ void doorPlayOpenedSound(s32 soundtype, struct prop *prop) if (sound) { #if VERSION >= VERSION_NTSC_1_0 - psCreate(NULL, prop, sound, -1, + ps_create(NULL, prop, sound, -1, -1, PSFLAG_0400, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); #else - psCreate(NULL, prop, sound, -1, + ps_create(NULL, prop, sound, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); #endif } } -void doorPlayClosedSound(s32 soundtype, struct prop *prop) +void door_play_closed_sound(s32 soundtype, struct prop *prop) { s32 sound = 0; - psStopSound(prop, PSTYPE_DOOR, 0xffff); + ps_stop_sound(prop, PSTYPE_DOOR, 0xffff); if (g_Vars.in_cutscene && (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR) @@ -19612,10 +19612,10 @@ void doorPlayClosedSound(s32 soundtype, struct prop *prop) if (sound) { #if VERSION >= VERSION_NTSC_1_0 - psCreate(NULL, prop, sound, -1, + ps_create(NULL, prop, sound, -1, -1, PSFLAG_0400, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); #else - psCreate(NULL, prop, sound, -1, + ps_create(NULL, prop, sound, -1, -1, 0, 0, PSTYPE_DOOR, 0, -1, 0, -1, -1, -1, -1); #endif } @@ -19625,13 +19625,13 @@ void doorPlayClosedSound(s32 soundtype, struct prop *prop) * Play the door open sound, activate the door's portal, * and configure the laser fade properties if it's a laser. */ -void doorStartOpen(struct doorobj *door) +void door_start_open(struct doorobj *door) { door->base.flags &= ~OBJFLAG_DOOR_KEEPOPEN; door->base.hidden |= OBJHFLAG_DOOREVEROPENED; - doorPlayOpeningSound(door->soundtype, door->base.prop); - doorActivatePortal(door); + door_play_opening_sound(door->soundtype, door->base.prop); + door_activate_portal(door); if (door->doortype == DOORTYPE_FALLAWAY) { struct geocyl *cyl = door->base.geocyl; @@ -19655,11 +19655,11 @@ void doorStartOpen(struct doorobj *door) * Play the door close sound and configure the * laser fade properties if it's a laser. */ -void doorStartClose(struct doorobj *door) +void door_start_close(struct doorobj *door) { door->base.flags &= ~OBJFLAG_DOOR_KEEPOPEN; - doorPlayClosingSound(door->soundtype, door->base.prop); + door_play_closing_sound(door->soundtype, door->base.prop); door->fadetime60 = door->doortype == DOORTYPE_LASER ? TICKS(60) : 0; @@ -19669,22 +19669,22 @@ void doorStartClose(struct doorobj *door) } #if PIRACYCHECKS -u32 decodeXorAaaaaaaa(u32 value) +u32 decode_xor_aaaaaaaa(u32 value) { return value ^ (PAL ? 0x18743082 : 0xaaaaaaaa); } #endif -void doorFinishOpen(struct doorobj *door) +void door_finish_open(struct doorobj *door) { - doorPlayOpenedSound(door->soundtype, door->base.prop); + door_play_opened_sound(door->soundtype, door->base.prop); if (door->doortype == DOORTYPE_FALLAWAY) { func0f0685e4(door->base.prop); if (door->base.hidden & OBJHFLAG_PROJECTILE) { door->base.projectile->flags |= PROJECTILEFLAG_AIRBORNE; - mtx4LoadIdentity((Mtxf *)&door->base.projectile->mtx); + mtx4_load_identity((Mtxf *)&door->base.projectile->mtx); } } @@ -19695,12 +19695,12 @@ void doorFinishOpen(struct doorobj *door) extern s32 osCicId; -void doorFinishClose(struct doorobj *door) +void door_finish_close(struct doorobj *door) { bool pass = true; struct doorobj *loopdoor; - doorPlayClosedSound(door->soundtype, door->base.prop); + door_play_closed_sound(door->soundtype, door->base.prop); loopdoor = door; @@ -19717,7 +19717,7 @@ void doorFinishClose(struct doorobj *door) } if (pass) { - doorDeactivatePortal(door); + door_deactivate_portal(door); } #if VERSION >= VERSION_NTSC_1_0 @@ -19731,7 +19731,7 @@ void doorFinishClose(struct doorobj *door) #endif #if PIRACYCHECKS - if (osCicId != decodeXorAaaaaaaa(PAL ? (6105 ^ 0x18743082) : (6105 ^ 0xaaaaaaaa))) { + if (osCicId != decode_xor_aaaaaaaa(PAL ? (6105 ^ 0x18743082) : (6105 ^ 0xaaaaaaaa))) { u32 *ptr = (u32 *)func0f08f968; ptr[0] = 0x00001025; // li v0, 0 ptr[1] = 0x03e00008; // jr ra @@ -19745,17 +19745,17 @@ void doorFinishClose(struct doorobj *door) * * Handles playing door open/close sounds and activating the portal if opening. */ -void doorSetMode(struct doorobj *door, s32 newmode) +void door_set_mode(struct doorobj *door, s32 newmode) { if (newmode == DOORMODE_OPENING) { if (door->mode == DOORMODE_IDLE || door->mode == DOORMODE_WAITING) { - doorStartOpen(door); + door_start_open(door); } door->mode = newmode; } else if (newmode == DOORMODE_CLOSING) { if (door->mode == DOORMODE_IDLE && door->frac > 0) { - doorStartClose(door); + door_start_close(door); } if ((door->mode != DOORMODE_IDLE && door->mode != DOORMODE_WAITING) || door->frac > 0) { @@ -19776,7 +19776,7 @@ void doorSetMode(struct doorobj *door, s32 newmode) * modified so that the sibling begins closing instead, and the main door waits * for the sibling before it opens. */ -void doorsRequestMode(struct doorobj *door, s32 newmode) +void doors_request_mode(struct doorobj *door, s32 newmode) { struct doorobj *sibling; @@ -19790,22 +19790,22 @@ void doorsRequestMode(struct doorobj *door, s32 newmode) } } - doorSetMode(door, newmode); + door_set_mode(door, newmode); sibling = door->sibling; while (sibling && sibling != door) { - doorSetMode(sibling, siblingmode); + door_set_mode(sibling, siblingmode); sibling = sibling->sibling; } } -s32 doorIsClosed(struct doorobj *door) +s32 door_is_closed(struct doorobj *door) { return (door->mode == DOORMODE_IDLE || door->mode == DOORMODE_WAITING) && door->frac <= 0; } -s32 doorIsOpen(struct doorobj *door) +s32 door_is_open(struct doorobj *door) { return (door->mode == DOORMODE_IDLE || door->mode == DOORMODE_WAITING) && door->frac >= door->maxfrac; } @@ -19817,7 +19817,7 @@ s32 func0f08e5a8(RoomNum *rooms2, struct screenbox *box) s32 roomnum = *rooms; while (roomnum != -1) { - struct drawslot *drawslot = bgGetRoomDrawSlot(roomnum); + struct drawslot *drawslot = bg_get_room_draw_slot(roomnum); if (drawslot != g_BgSpecialDrawSlot) { if (result) { @@ -19867,13 +19867,13 @@ s32 func0f08e5a8(RoomNum *rooms2, struct screenbox *box) * * This feature is only used on Pelagic II. */ -f32 objCalculateFadeDistOpacityFrac(struct prop *prop, f32 modelscale) +f32 obj_calculate_fade_dist_opacity_frac(struct prop *prop, f32 modelscale) { f32 result = 1; - struct distfadesettings *settings = envGetDistFadeSettings(); + struct distfadesettings *settings = env_get_dist_fade_settings(); if (settings != NULL && prop->z > settings->refdist) { - f32 scalez = camGetLodScaleZ(); + f32 scalez = cam_get_lod_scale_z(); f32 distperc = ((prop->z - settings->refdist) * 100.0f / modelscale + settings->refdist) * scalez; if (distperc >= settings->xluperc) { @@ -19886,16 +19886,16 @@ f32 objCalculateFadeDistOpacityFrac(struct prop *prop, f32 modelscale) return result; } -bool posIsInObjFadeDistance(struct coord *pos, f32 modelscale) +bool pos_is_in_obj_fade_distance(struct coord *pos, f32 modelscale) { bool result = true; - struct distfadesettings *settings = envGetDistFadeSettings(); + struct distfadesettings *settings = env_get_dist_fade_settings(); struct coord tmp; f32 sp20; if (settings != NULL) { struct coord *campos = &g_Vars.currentplayer->cam_pos; - Mtxf *mtx = camGetWorldToScreenMtxf(); + Mtxf *mtx = cam_get_world_to_screen_mtxf(); tmp.x = pos->x - campos->x; tmp.y = pos->y - campos->y; @@ -19904,7 +19904,7 @@ bool posIsInObjFadeDistance(struct coord *pos, f32 modelscale) sp20 = tmp.f[0] * mtx->m[0][0] + tmp.f[1] * mtx->m[0][1] + tmp.f[2] * mtx->m[0][2]; if (sp20 > settings->refdist) { - f32 scalez = camGetLodScaleZ(); + f32 scalez = cam_get_lod_scale_z(); sp20 = ((sp20 - settings->refdist) * 100 / modelscale + settings->refdist) * scalez; if (sp20 >= settings->xluperc) { @@ -19928,8 +19928,8 @@ bool func0f08e8ac(struct prop *prop, struct coord *pos, f32 arg2, bool arg3) while (roomnum != -1) { if (g_Rooms[roomnum].flags & ROOMFLAG_ONSCREEN) { - if (envIsPosInFogMaxDistance(pos, arg2) && (!arg3 || posIsInObjFadeDistance(pos, arg2))) { - result = camIsPosInFovAndVisibleRoom(prop->rooms, pos, arg2); + if (env_is_pos_in_fog_max_distance(pos, arg2) && (!arg3 || pos_is_in_obj_fade_distance(pos, arg2))) { + result = cam_is_pos_in_fov_and_visible_room(prop->rooms, pos, arg2); if (result) { struct coord *campos = &g_Vars.currentplayer->cam_pos; @@ -19954,7 +19954,7 @@ bool func0f08e8ac(struct prop *prop, struct coord *pos, f32 arg2, bool arg3) return result; } -bool posIsInDrawDistance(struct coord *pos) +bool pos_is_in_draw_distance(struct coord *pos) { struct coord *campos = &g_Vars.currentplayer->cam_pos; f32 x = pos->x - campos->x; @@ -19970,7 +19970,7 @@ bool posIsInDrawDistance(struct coord *pos) return result; } -void doorCreateSparks(struct doorobj *door) +void door_create_sparks(struct doorobj *door) { struct pad pad; struct coord sp88; @@ -19978,7 +19978,7 @@ void doorCreateSparks(struct doorobj *door) struct coord sp70; s32 i; - padUnpack(door->base.pad, PADFIELD_POS | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad); + pad_unpack(door->base.pad, PADFIELD_POS | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX, &pad); sp88.x = sp7c.f[0] = pad.pos.f[0] + pad.up.f[0] * (pad.bbox.ymin + (1 - door->frac) * (pad.bbox.ymax - pad.bbox.ymin)); sp88.y = sp7c.f[1] = pad.pos.f[1] + pad.up.f[1] * (pad.bbox.ymin + (1 - door->frac) * (pad.bbox.ymax - pad.bbox.ymin)); @@ -19996,24 +19996,24 @@ void doorCreateSparks(struct doorobj *door) sp70.y = -pad.up.y; sp70.z = -pad.up.z; - sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL1); + sparks_create(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL1); - sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp7c, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL1); + sparks_create(door->base.prop->rooms[0], door->base.prop, &sp7c, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL1); if (random() % 2) { - sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL4); + sparks_create(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL4); } else { - sparksCreate(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL5); + sparks_create(door->base.prop->rooms[0], door->base.prop, &sp88, &sp70, &pad.up, SPARKTYPE_ENVIRONMENTAL5); } - psCreate(NULL, door->base.prop, psGetRandomSparkSound(), -1, + ps_create(NULL, door->base.prop, ps_get_random_spark_sound(), -1, -1, 0, 0, PSTYPE_NONE, &sp88, -1, door->base.prop->rooms, -1, -1, -1, -1); - psCreate(NULL, door->base.prop, psGetRandomSparkSound(), -1, + ps_create(NULL, door->base.prop, ps_get_random_spark_sound(), -1, -1, 0, 0, PSTYPE_NONE, &sp7c, -1, door->base.prop->rooms, -1, -1, -1, -1); for (i = 0; door->base.prop->rooms[i] != -1; i++) { - roomFlashLighting(door->base.prop->rooms[i], 128, 200); + room_flash_lighting(door->base.prop->rooms[i], 128, 200); } } @@ -20026,7 +20026,7 @@ void doorCreateSparks(struct doorobj *door) * * Also handles sticky doors such as the ones in Skedar Ruins. */ -bool doorCalcIntendedFrac(struct doorobj *door) +bool door_calc_intended_frac(struct doorobj *door) { bool checkcollision = false; @@ -20057,11 +20057,11 @@ bool doorCalcIntendedFrac(struct doorobj *door) struct doorobj *loopdoor; door->fracspeed = 0.0f; - doorCreateSparks(door); + door_create_sparks(door); if (random() % 2) { dothething = true; - psStopSound(door->base.prop, PSTYPE_DOOR, 0xffff); + ps_stop_sound(door->base.prop, PSTYPE_DOOR, 0xffff); door->mode = DOORMODE_IDLE; door->lastopen60 = g_Vars.lvframe60; } @@ -20071,10 +20071,10 @@ bool doorCalcIntendedFrac(struct doorobj *door) while (loopdoor) { if (random() % 2 && loopdoor->mode != DOORMODE_IDLE) { loopdoor->fracspeed = 0.0f; - doorCreateSparks(loopdoor); + door_create_sparks(loopdoor); if (dothething) { - psStopSound(loopdoor->base.prop, PSTYPE_DOOR, 0xffff); + ps_stop_sound(loopdoor->base.prop, PSTYPE_DOOR, 0xffff); loopdoor->mode = DOORMODE_IDLE; loopdoor->lastopen60 = g_Vars.lvframe60; } @@ -20087,11 +20087,11 @@ bool doorCalcIntendedFrac(struct doorobj *door) } } - doorPlayClosedSound(door->soundtype, door->base.prop); + door_play_closed_sound(door->soundtype, door->base.prop); } } - applySpeed(&door->frac, end, &door->fracspeed, door->accel, door->decel, door->maxspeed); + apply_speed(&door->frac, end, &door->fracspeed, door->accel, door->decel, door->maxspeed); if (door->frac >= door->maxfrac) { door->frac = door->maxfrac; @@ -20116,7 +20116,7 @@ bool doorCalcIntendedFrac(struct doorobj *door) * * Chrs who are blocking a lift door may be warped out of the way. */ -void doorsCalcFrac(struct doorobj *door) +void doors_calc_frac(struct doorobj *door) { bool checkcollision = false; s32 cdresult = CDRESULT_NOCOLLISION; @@ -20132,7 +20132,7 @@ void doorsCalcFrac(struct doorobj *door) while (loopdoor) { *(f32 *)&loopdoor->lastcalc60 = loopdoor->frac; - if (doorCalcIntendedFrac(loopdoor)) { + if (door_calc_intended_frac(loopdoor)) { checkcollision = true; } @@ -20150,7 +20150,7 @@ void doorsCalcFrac(struct doorobj *door) while (loopdoor) { struct prop *loopprop; - doorUpdateTiles(loopdoor); + door_update_tiles(loopdoor); setup0f0923d4(&loopdoor->base); loopprop = loopdoor->base.prop; @@ -20161,15 +20161,15 @@ void doorsCalcFrac(struct doorobj *door) if ((door->doorflags & DOORFLAG_UNBLOCKABLEOPEN) == 0) #endif { - propSetPerimEnabled(loopprop, false); + prop_set_perim_enabled(loopprop, false); - cdresult = cdTestBlockOverlapsAnyProp(loopdoor->base.geoblock, loopprop->rooms, + cdresult = cd_test_block_overlaps_any_prop(loopdoor->base.geoblock, loopprop->rooms, CDTYPE_OBJS | CDTYPE_PLAYERS | CDTYPE_CHRS | CDTYPE_PATHBLOCKER | CDTYPE_OBJSNOTSAFEORHELI); - propSetPerimEnabled(loopprop, true); + prop_set_perim_enabled(loopprop, true); if (cdresult == CDRESULT_COLLISION) { - struct prop *blockerprop = cdGetObstacleProp(); + struct prop *blockerprop = cd_get_obstacle_prop(); if (blockerprop && blockerprop->type == PROPTYPE_CHR) { struct chrdata *chr = blockerprop->chr; @@ -20198,10 +20198,10 @@ void doorsCalcFrac(struct doorobj *door) if (isliftdoor) { if (chr->actiontype == ACT_STAND || (chr->actiontype == ACT_ATTACK && (chr->act_attack.flags & ATTACKFLAG_DONTTURN)) - || (chr->actiontype == ACT_GOPOS && chrGoPosIsWaiting(chr))) { - struct prop *target = chrGetTargetProp(chr); + || (chr->actiontype == ACT_GOPOS && chr_go_pos_is_waiting(chr))) { + struct prop *target = chr_get_target_prop(chr); - if (chrGoToRoomPos(chr, &target->pos, target->rooms, 0)) { + if (chr_go_to_room_pos(chr, &target->pos, target->rooms, 0)) { chr->goposforce = TICKS(600); } } else if (chr->actiontype == ACT_GOPOS) { @@ -20239,7 +20239,7 @@ void doorsCalcFrac(struct doorobj *door) loopdoor->fracspeed = 0; loopdoor->lastopen60 = g_Vars.lvframe60; - doorFinishOpen(loopdoor); + door_finish_open(loopdoor); } } else { if (loopdoor->mode == DOORMODE_CLOSING && loopdoor->frac <= 0) { @@ -20247,7 +20247,7 @@ void doorsCalcFrac(struct doorobj *door) loopdoor->fracspeed = 0; loopdoor->lastopen60 = 0; - doorFinishClose(loopdoor); + door_finish_close(loopdoor); } } @@ -20258,7 +20258,7 @@ void doorsCalcFrac(struct doorobj *door) loopdoor->fracspeed = 0; loopdoor->frac = *(f32 *)&loopdoor->lastcalc60; - doorUpdateTiles(loopdoor); + door_update_tiles(loopdoor); setup0f0923d4(&loopdoor->base); func0f08d460(loopdoor); } @@ -20299,8 +20299,8 @@ void doorsCalcFrac(struct doorobj *door) } } - portalSetXluFrac(door->portalnum, frac / numsameportal); - portalSetXluFrac2(door->portalnum, frac / numsameportal); + portal_set_xlu_frac(door->portalnum, frac / numsameportal); + portal_set_xlu_frac2(door->portalnum, frac / numsameportal); } } @@ -20312,7 +20312,7 @@ f32 func0f08f538(f32 x, f32 y) && g_Vars.currentplayer->eyespy->active && g_Vars.currentplayer->eyespy->prop && g_Vars.currentplayer->eyespy->prop->chr) { - angle -= chrGetInverseTheta(g_Vars.currentplayer->eyespy->prop->chr); + angle -= chr_get_inverse_theta(g_Vars.currentplayer->eyespy->prop->chr); } else { angle -= (360.0f - g_Vars.currentplayer->vv_theta) * M_BADTAU / 360.0f; } @@ -20361,7 +20361,7 @@ void door0f08f604(struct doorobj *door, f32 *arg1, f32 *arg2, f32 *arg3, f32 *ar playerprop = g_Vars.currentplayer->prop; } - padUnpack(door->base.pad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_BBOX, &pad); + pad_unpack(door->base.pad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_BBOX, &pad); playerpos.f[0] = playerprop->pos.x; playerpos.f[1] = playerprop->pos.y; @@ -20514,7 +20514,7 @@ bool func0f08f968(struct doorobj *door, bool altcoordsystem) * This function should return true if more doors and objects should be tested, * or false if the prop at g_InteractProp is certain to be final. */ -bool doorTestForInteract(struct prop *prop) +bool door_test_for_interact(struct prop *prop) { bool checkmore = true; struct doorobj *door = prop->door; @@ -20532,7 +20532,7 @@ bool doorTestForInteract(struct prop *prop) if (xdiff * xdiff + zdiff * zdiff < 40000 && ydiff < 200 && ydiff > -200) { maybe = true; - } else if (arrayIntersects(prop->rooms, playerprop->rooms)) { + } else if (array_intersects(prop->rooms, playerprop->rooms)) { if (func0f06797c(&playerprop->pos, 150, door->base.pad)) { maybe = true; } else if ((door->doorflags & (DOORFLAG_0080 | DOORFLAG_0100)) != DOORFLAG_0080) { @@ -20540,7 +20540,7 @@ bool doorTestForInteract(struct prop *prop) struct modelrodata_bbox bbox; Mtxf matrix; - doorGetBbox(door, &bbox); + door_get_bbox(door, &bbox); func0f08c424(door, &matrix); if (func0f0675c8(&playerprop->pos, 150, &bbox, &matrix)) { @@ -20551,7 +20551,7 @@ bool doorTestForInteract(struct prop *prop) if (maybe) { if ((door->base.flags2 & OBJFLAG2_INTERACTCHECKLOS) == 0 - || cdTestLos06(&playerprop->pos, playerprop->rooms, &prop->pos, prop->rooms, CDTYPE_BG)) { + || cd_test_los06(&playerprop->pos, playerprop->rooms, &prop->pos, prop->rooms, CDTYPE_BG)) { checkmore = func0f08f968(door, false); if (checkmore && (door->base.flags2 & OBJFLAG2_DOOR_ALTCOORDSYSTEM)) { @@ -20574,20 +20574,20 @@ bool doorTestForInteract(struct prop *prop) * it's a lift door and the lift is at the door. This is typically true when the * player has activated the door, and false when NPCs have activated the door. */ -void doorsActivate(struct prop *doorprop, bool allowliftclose) +void doors_activate(struct prop *doorprop, bool allowliftclose) { struct doorobj *door = doorprop->door; - if (!doorCallLift(doorprop, allowliftclose)) { + if (!door_call_lift(doorprop, allowliftclose)) { if (door->mode == DOORMODE_OPENING || door->mode == DOORMODE_WAITING) { - doorsRequestMode(door, DOORMODE_CLOSING); + doors_request_mode(door, DOORMODE_CLOSING); } else if (door->mode == DOORMODE_CLOSING) { - doorsRequestMode(door, DOORMODE_OPENING); + doors_request_mode(door, DOORMODE_OPENING); } else if (door->mode == DOORMODE_IDLE) { if (door->frac > 0.5f * door->maxfrac) { - doorsRequestMode(door, DOORMODE_CLOSING); + doors_request_mode(door, DOORMODE_CLOSING); } else { - doorsRequestMode(door, DOORMODE_OPENING); + doors_request_mode(door, DOORMODE_OPENING); } } } @@ -20601,7 +20601,7 @@ void doorsActivate(struct prop *doorprop, bool allowliftclose) door->base.flags2 &= ~OBJFLAG2_DOOR_PENDINGACTIVATION; } -bool posIsInFrontOfDoor(struct coord *pos, struct doorobj *door) +bool pos_is_in_front_of_door(struct coord *pos, struct doorobj *door) { f32 x; f32 y; @@ -20609,7 +20609,7 @@ bool posIsInFrontOfDoor(struct coord *pos, struct doorobj *door) f32 value; struct pad pad; - padUnpack(door->base.pad, PADFIELD_POS | PADFIELD_NORMAL, &pad); + pad_unpack(door->base.pad, PADFIELD_POS | PADFIELD_NORMAL, &pad); x = pos->x - pad.pos.x; y = pos->y - pad.pos.y; @@ -20632,10 +20632,10 @@ bool posIsInFrontOfDoor(struct coord *pos, struct doorobj *door) return true; } -void doorsChooseSwingDirection(struct prop *chrprop, struct doorobj *door) +void doors_choose_swing_direction(struct prop *chrprop, struct doorobj *door) { if ((door->base.flags & OBJFLAG_DOOR_TWOWAY) && door->mode == DOORMODE_IDLE && door->frac == 0) { - bool infront = posIsInFrontOfDoor(&chrprop->pos, door); + bool infront = pos_is_in_front_of_door(&chrprop->pos, door); u32 wantflag = 0; if ((door->doorflags & DOORFLAG_FLIP) == 0) { @@ -20661,23 +20661,23 @@ void doorsChooseSwingDirection(struct prop *chrprop, struct doorobj *door) } } -bool propdoorInteract(struct prop *doorprop) +bool propdoor_interact(struct prop *doorprop) { struct doorobj *door = doorprop->door; bool usingeyespy = g_Vars.currentplayer->eyespy && g_Vars.currentplayer->eyespy->active; struct prop *playerprop = usingeyespy ? g_Vars.currentplayer->eyespy->prop : g_Vars.currentplayer->prop; - if (doorIsUnlocked(playerprop, doorprop)) { - doorsChooseSwingDirection(playerprop, door); - doorsActivate(doorprop, true); + if (door_is_unlocked(playerprop, doorprop)) { + doors_choose_swing_direction(playerprop, door); + doors_activate(doorprop, true); } else if (door->mode == DOORMODE_IDLE && door->frac < 0.5f * door->maxfrac) { if ((door->base.flags2 & OBJFLAG2_SKIPDOORLOCKEDMSG) == 0) { - struct textoverride *override = invGetTextOverrideForObj(&door->base); + struct textoverride *override = inv_get_text_override_for_obj(&door->base); u8 intraining = false; if (g_Vars.stagenum == STAGE_CITRAINING) { - struct trainingdata *devdata = dtGetData(); - struct trainingdata *holodata = getHoloTrainingData(); + struct trainingdata *devdata = dt_get_data(); + struct trainingdata *holodata = get_holo_training_data(); intraining = (devdata && devdata->intraining) || (holodata && holodata->intraining) @@ -20685,11 +20685,11 @@ bool propdoorInteract(struct prop *doorprop) } if (override && override->pickuptext) { - hudmsgCreateWithFlags(langGet(override->pickuptext), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); + hudmsg_create_with_flags(lang_get(override->pickuptext), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); } else if (intraining) { - hudmsgCreateWithFlags(langGet(L_DISH_080), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); // "Cannot exit while training is in progress." + hudmsg_create_with_flags(lang_get(L_DISH_080), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); // "Cannot exit while training is in progress." } else { - hudmsgCreateWithFlags(langGet(L_PROPOBJ_044), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); // "This door is locked." + hudmsg_create_with_flags(lang_get(L_PROPOBJ_044), HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE); // "This door is locked." } } @@ -20705,32 +20705,32 @@ bool propdoorInteract(struct prop *doorprop) return TICKOP_NONE; } -void alarmActivate(void) +void alarm_activate(void) { if (g_AlarmTimer < 1) { g_AlarmTimer = 1; } } -void alarmStopAudio(void) +void alarm_stop_audio(void) { if (g_AlarmAudioHandle && sndGetState(g_AlarmAudioHandle) != AL_STOPPED) { audioStop(g_AlarmAudioHandle); } } -void alarmDeactivate(void) +void alarm_deactivate(void) { g_AlarmTimer = 0; - alarmStopAudio(); + alarm_stop_audio(); } -bool alarmIsActive(void) +bool alarm_is_active(void) { return g_AlarmTimer > 0; } -void gasReleaseFromPos(struct coord *pos) +void gas_release_from_pos(struct coord *pos) { g_GasReleasing = true; g_GasSoundTimer240 = 0; @@ -20742,7 +20742,7 @@ void gasReleaseFromPos(struct coord *pos) // Gas objects don't exist in PD, so this stage number was likely carried // over from GoldenEye. It maps to GE's Egypt stage, which uses gas for a // visual effect only. - if (mainGetStageNum() == STAGE_MP_G5BUILDING) { + if (main_get_stage_num() == STAGE_MP_G5BUILDING) { g_GasReleaseTimerMax240 = 120; g_GasEnableDamage = false; } else { @@ -20751,19 +20751,19 @@ void gasReleaseFromPos(struct coord *pos) } } -void gasStopAudio(void) +void gas_stop_audio(void) { if (g_GasAudioHandle && sndGetState(g_GasAudioHandle)) { audioStop(g_GasAudioHandle); } } -bool gasIsActive(void) +bool gas_is_active(void) { return g_GasReleaseTimer240 > 0; } -void gasTick(void) +void gas_tick(void) { u32 stack; @@ -20777,20 +20777,20 @@ void gasTick(void) } if (g_GasReleaseTimer240 > 0 && !g_PlayerInvincible) { - envApplyTransitionFrac(g_GasReleaseTimer240 / g_GasReleaseTimerMax240); + env_apply_transition_frac(g_GasReleaseTimer240 / g_GasReleaseTimerMax240); if (g_GasEnableDamage) { if (g_GasLastCough60 < g_Vars.lvframe60 - TICKS(225)) { g_GasLastCough60 = g_Vars.lvframe60; if (g_GasReleaseTimer240 >= 600) { - sndStart(var80095200, SFX_0037, 0, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_0037, 0, -1, -1, -1, -1, -1); } if (g_GasReleaseTimer240 >= 1800) { struct coord dir = {0, 0, 0}; - chrDamageByMisc(g_Vars.currentplayer->prop->chr, 0.125f, &dir, NULL, NULL); + chr_damage_by_misc(g_Vars.currentplayer->prop->chr, 0.125f, &dir, NULL, NULL); } } @@ -20799,13 +20799,13 @@ void gasTick(void) g_GasSoundTimer240 += g_Vars.lvupdate60freal; - if (!g_GasAudioHandle && !lvIsPaused()) { + if (!g_GasAudioHandle && !lv_is_paused()) { soundnum = SFX_0037; - sndStart(var80095200, soundnum, &g_GasAudioHandle, -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, &g_GasAudioHandle, -1, -1, -1, -1, -1); } if (g_GasAudioHandle) { - psApplyVolPan(g_GasAudioHandle, &g_GasPos, 400, 2500, 3000, g_Vars.currentplayer->prop->rooms, soundnum, AL_VOL_FULL, 0); + ps_apply_vol_pan(g_GasAudioHandle, &g_GasPos, 400, 2500, 3000, g_Vars.currentplayer->prop->rooms, soundnum, AL_VOL_FULL, 0); } } else if (g_GasAudioHandle && sndGetState(g_GasAudioHandle)) { audioStop(g_GasAudioHandle); @@ -20814,7 +20814,7 @@ void gasTick(void) } } -void countdownTimerSetVisible(u32 reason, bool visible) +void countdown_timer_set_visible(u32 reason, bool visible) { if (visible) { g_CountdownTimerOff &= ~reason; @@ -20823,39 +20823,39 @@ void countdownTimerSetVisible(u32 reason, bool visible) } } -bool countdownTimerIsVisible(void) +bool countdown_timer_is_visible(void) { return !g_CountdownTimerOff; } -void countdownTimerSetValue60(f32 value) +void countdown_timer_set_value60(f32 value) { g_CountdownTimerValue60 = value; } -f32 countdownTimerGetValue60(void) +f32 countdown_timer_get_value60(void) { return g_CountdownTimerValue60; } -void countdownTimerSetRunning(bool running) +void countdown_timer_set_running(bool running) { g_CountdownTimerRunning = running; } -bool countdownTimerIsRunning(void) +bool countdown_timer_is_running(void) { return g_CountdownTimerRunning; } -void countdownTimerTick(void) +void countdown_timer_tick(void) { if (g_CountdownTimerRunning) { g_CountdownTimerValue60 -= g_Vars.lvupdate60freal; } } -Gfx *countdownTimerRender(Gfx *gdl) +Gfx *countdown_timer_render(Gfx *gdl) { s32 mins; s32 secs; @@ -20865,13 +20865,13 @@ Gfx *countdownTimerRender(Gfx *gdl) if (!g_CountdownTimerOff) { f32 value60 = g_CountdownTimerValue60; u32 stack; - s32 viewright = viGetViewLeft() + (viGetViewWidth() >> 1); - s32 y = viGetViewTop() + viGetViewHeight() - 18; + s32 viewright = vi_get_view_left() + (vi_get_view_width() >> 1); + s32 y = vi_get_view_top() + vi_get_view_height() - 18; s32 playercount = PLAYERCOUNT(); char *fmt = ":\n"; if (playercount == 2) { - if (IS4MB() || (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && g_Vars.currentplayernum == 0)) { + if (IS4MB() || (options_get_screen_split() != SCREENSPLIT_VERTICAL && g_Vars.currentplayernum == 0)) { y += 10; } else { y += 2; @@ -20883,7 +20883,7 @@ Gfx *countdownTimerRender(Gfx *gdl) y += 2; } } else { - if (optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { + if (options_get_effective_screen_size() != SCREENSIZE_FULL) { y += 8; } } @@ -20903,14 +20903,14 @@ Gfx *countdownTimerRender(Gfx *gdl) ms = (s32)floorf(value60 * 1.6666666269302f) - mins * 6000 - secs * 100; gdl = text0f153628(gdl); - gdl = bgunDrawHudInteger(gdl, (mins % 100) / 10, viewright - 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); - gdl = bgunDrawHudInteger(gdl, mins % 10, viewright - 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); - gdl = bgunDrawHudString(gdl, fmt, viewright - 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); - gdl = bgunDrawHudInteger(gdl, (secs % 60) / 10, viewright - 2, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); - gdl = bgunDrawHudInteger(gdl, secs % 10, viewright + 2, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); - gdl = bgunDrawHudString(gdl, fmt, viewright + 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); - gdl = bgunDrawHudInteger(gdl, (ms % 100) / 10, viewright + 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); - gdl = bgunDrawHudInteger(gdl, ms % 10, viewright + 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); + gdl = bgun_draw_hud_integer(gdl, (mins % 100) / 10, viewright - 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); + gdl = bgun_draw_hud_integer(gdl, mins % 10, viewright - 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); + gdl = bgun_draw_hud_string(gdl, fmt, viewright - 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); + gdl = bgun_draw_hud_integer(gdl, (secs % 60) / 10, viewright - 2, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); + gdl = bgun_draw_hud_integer(gdl, secs % 10, viewright + 2, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); + gdl = bgun_draw_hud_string(gdl, fmt, viewright + 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); + gdl = bgun_draw_hud_integer(gdl, (ms % 100) / 10, viewright + 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); + gdl = bgun_draw_hud_integer(gdl, ms % 10, viewright + 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0); gdl = text0f153780(gdl); } @@ -20918,7 +20918,7 @@ Gfx *countdownTimerRender(Gfx *gdl) } #if VERSION >= VERSION_NTSC_1_0 -void projectilesDebug(void) +void projectiles_debug(void) { s32 i; @@ -20942,9 +20942,9 @@ const char var7f1aa18c[] = "ALARM : DIR 1 = %d"; const char var7f1aa1a0[] = "ALARM : ADD 1 = %d (%s%f)"; const char var7f1aa1bc[] = ""; -void alarmTick(void) +void alarm_tick(void) { - if (alarmIsActive()) { + if (alarm_is_active()) { s16 sound; // These sounds are alarm sounds. @@ -20959,7 +20959,7 @@ void alarmTick(void) default: sound = SFX_ALARM_DEFAULT; break; } - if (!lvIsPaused()) { + if (!lv_is_paused()) { if (g_AlarmAudioHandle) { // The sound is currently playing. Cycle between the left/right // speaker for stereo or headphone mode. @@ -20979,11 +20979,11 @@ void alarmTick(void) g_AlarmSpeakerDirection *= -1; } - sndAdjust(&g_AlarmAudioHandle, 0, AL_VOL_FULL, g_AlarmSpeakerWeight, -1, -1, 0, -1, true); + snd_adjust(&g_AlarmAudioHandle, 0, AL_VOL_FULL, g_AlarmSpeakerWeight, -1, -1, 0, -1, true); } else { // The alarm finished, or this is the first one. // Start the sound again. - sndStart(var80095200, sound, &g_AlarmAudioHandle, -1, -1, -1, -1, -1); + snd_start(var80095200, sound, &g_AlarmAudioHandle, -1, -1, -1, -1, -1); } } @@ -20992,14 +20992,14 @@ void alarmTick(void) // For G5, stop alarm after 55 seconds. // For all other levels, stop alarm after 30 seconds. - if ((g_AlarmTimer > TICKS(1800) && mainGetStageNum() != STAGE_G5BUILDING) - || (g_AlarmTimer > TICKS(3300) && mainGetStageNum() == STAGE_G5BUILDING)) { - alarmDeactivate(); + if ((g_AlarmTimer > TICKS(1800) && main_get_stage_num() != STAGE_G5BUILDING) + || (g_AlarmTimer > TICKS(3300) && main_get_stage_num() == STAGE_G5BUILDING)) { + alarm_deactivate(); } - gasTick(); - countdownTimerTick(); - chrsTriggerProxies(); + gas_tick(); + countdown_timer_tick(); + chrs_trigger_proxies(); g_PlayersDetonatingMines = 0; } @@ -21013,7 +21013,7 @@ void func0f091030(void) && (prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) == 0 && (prop->obj->hidden2 & OBJH2FLAG_DESTROYED) && (prop->obj->hidden2 & OBJH2FLAG_80)) { - objFreePermanently(prop->obj, true); + obj_free_permanently(prop->obj, true); return; } @@ -21021,17 +21021,17 @@ void func0f091030(void) } } -void currentPlayerDropAllItems(void) +void current_player_drop_all_items(void) { struct chrdata *chr = g_Vars.currentplayer->prop->chr; s32 i; - weaponDeleteFromChr(chr, HAND_RIGHT); - weaponDeleteFromChr(chr, HAND_LEFT); + weapon_delete_from_chr(chr, HAND_RIGHT); + weapon_delete_from_chr(chr, HAND_LEFT); for (i = WEAPON_UNARMED; i <= WEAPON_SUICIDEPILL; i++) { - if (playermgrGetModelOfWeapon(i) >= 0 && invHasSingleWeaponExcAllGuns(i)) { - if (!weaponHasFlag(i, WEAPONFLAG_UNDROPPABLE) + if (playermgr_get_model_of_weapon(i) >= 0 && inv_has_single_weapon_exc_all_guns(i)) { + if (!weapon_has_flag(i, WEAPONFLAG_UNDROPPABLE) || (g_Vars.normmplayerisrunning && g_MpSetup.scenario == MPSCENARIO_HACKERCENTRAL && i == WEAPON_DATAUPLINK)) { @@ -21056,14 +21056,14 @@ void currentPlayerDropAllItems(void) } if (canremove) { - invRemoveItemByNum(i); + inv_remove_item_by_num(i); } - if (!bgunIsMissionCritical(i)) { - weaponCreateForPlayerDrop(i); + if (!bgun_is_mission_critical(i)) { + weapon_create_for_player_drop(i); } } else { - weaponCreateForPlayerDrop(i); + weapon_create_for_player_drop(i); } #else if (g_Vars.coopplayernum >= 0) { @@ -21086,18 +21086,18 @@ void currentPlayerDropAllItems(void) } if (canremove) { - invRemoveItemByNum(i); + inv_remove_item_by_num(i); } } - weaponCreateForPlayerDrop(i); + weapon_create_for_player_drop(i); #endif } } } } -void weaponCreateForPlayerDrop(s32 weaponnum) +void weapon_create_for_player_drop(s32 weaponnum) { u32 stack; struct prop *prop; @@ -21105,21 +21105,21 @@ void weaponCreateForPlayerDrop(s32 weaponnum) u32 stack2; chr = g_Vars.currentplayer->prop->chr; - prop = weaponCreateForChr(chr, playermgrGetModelOfWeapon(weaponnum), weaponnum, OBJFLAG_WEAPON_AICANNOTUSE, NULL, NULL); + prop = weapon_create_for_chr(chr, playermgr_get_model_of_weapon(weaponnum), weaponnum, OBJFLAG_WEAPON_AICANNOTUSE, NULL, NULL); if (prop) { - objSetDropped(prop, DROPTYPE_DEFAULT); - objDrop(prop, true); + obj_set_dropped(prop, DROPTYPE_DEFAULT); + obj_drop(prop, true); if (weaponnum == WEAPON_BRIEFCASE2) { - scenarioHandleDroppedToken(chr, prop); + scenario_handle_dropped_token(chr, prop); } } } -void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct coord *pos, struct coord *dir, u8 weaponnum, struct prop *targetprop) +void projectile_create(struct prop *fromprop, struct fireslotthing *arg1, struct coord *pos, struct coord *dir, u8 weaponnum, struct prop *targetprop) { - if (!lvIsPaused()) { + if (!lv_is_paused()) { bool blocked = false; struct coord endpos; u32 stack; @@ -21150,23 +21150,23 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct if (arg1 && arg1->unk08 < g_Vars.lvframe60) { switch (weaponnum) { case WEAPON_CHOPPERGUN: - psStopSound(fromprop, PSTYPE_CHOPPERGUN, 0xffff); - psCreate(0, fromprop, SFX_810E, -1, -1, 0, 0, PSTYPE_CHOPPERGUN, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_stop_sound(fromprop, PSTYPE_CHOPPERGUN, 0xffff); + ps_create(0, fromprop, SFX_810E, -1, -1, 0, 0, PSTYPE_CHOPPERGUN, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); arg1->unk08 = g_Vars.lvframe60 + 4; break; case WEAPON_RCP45: - psStopSound(fromprop, PSTYPE_GENERAL, 0xffff); - psCreate(0, fromprop, SFX_805A, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_stop_sound(fromprop, PSTYPE_GENERAL, 0xffff); + ps_create(0, fromprop, SFX_805A, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); arg1->unk08 = g_Vars.lvframe60 + 2; break; case WEAPON_WATCHLASER: - psStopSound(fromprop, PSTYPE_GENERAL, 0xffff); - psCreate(0, fromprop, SFX_8043, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_stop_sound(fromprop, PSTYPE_GENERAL, 0xffff); + ps_create(0, fromprop, SFX_8043, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); arg1->unk08 = g_Vars.lvframe60 + 8; break; default: - psStopSound(fromprop, PSTYPE_GENERAL, 0xffff); - psCreate(0, fromprop, SFX_8045, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_stop_sound(fromprop, PSTYPE_GENERAL, 0xffff); + ps_create(0, fromprop, SFX_8045, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); arg1->unk08 = g_Vars.lvframe60 + 2; break; } @@ -21186,7 +21186,7 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct struct weaponobj *rocket; Mtxf sp13c; struct coord sp130; - struct chopperobj *chopper = chopperFromHovercar((struct chopperobj *)fromprop->obj); + struct chopperobj *chopper = chopper_from_hovercar((struct chopperobj *)fromprop->obj); if (chopper && sqdist > 400.0f * 400.0f) { struct coord sp120; @@ -21195,12 +21195,12 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct f32 rotx = chopper->rotx; f32 roty = chopper->roty; - rocket = weaponCreateProjectileFromWeaponNum(MODEL_CHRDYROCKETMIS, WEAPON_ROCKET, NULL); + rocket = weapon_create_projectile_from_weapon_num(MODEL_CHRDYROCKETMIS, WEAPON_ROCKET, NULL); if (rocket) { - mtx4LoadIdentity(&sp13c); - mtx4LoadXRotation(rotx, &spe0); - mtx4LoadYRotation(roty, &spa0); + mtx4_load_identity(&sp13c); + mtx4_load_x_rotation(rotx, &spe0); + mtx4_load_y_rotation(roty, &spa0); mtx00015be0(&spa0, &spe0); sp120.x = dir->x * 0.27777776f; @@ -21220,7 +21220,7 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct rocket->base.projectile->unk014 = sp120.y; rocket->base.projectile->unk018 = sp120.z; - psCreate(NULL, rocket->base.prop, SFX_LAUNCH_ROCKET_8053, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(NULL, rocket->base.prop, SFX_LAUNCH_ROCKET_8053, -1, -1, 0, 0, PSTYPE_NONE, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } } } @@ -21233,27 +21233,27 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct endpos.y = pos->y + dir->f[1] * 65536.0f; endpos.z = pos->z + dir->f[2] * 65536.0f; - propSetPerimEnabled(fromprop, false); + prop_set_perim_enabled(fromprop, false); - if (cdExamLos08(pos, fromprop->rooms, &endpos, + if (cd_exam_los08(pos, fromprop->rooms, &endpos, CDTYPE_OBJS | CDTYPE_DOORS | CDTYPE_CHRS | CDTYPE_PATHBLOCKER| CDTYPE_BG, GEOFLAG_BLOCK_SHOOT) == CDRESULT_COLLISION) { blocked = true; #if VERSION >= VERSION_JPN_FINAL - cdGetPos(&endpos, 24883, "prop/propobj.c"); + cd_get_pos(&endpos, 24883, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_FINAL - cdGetPos(&endpos, 24873, "prop/propobj.c"); + cd_get_pos(&endpos, 24873, "prop/propobj.c"); #elif VERSION >= VERSION_PAL_BETA - cdGetPos(&endpos, 24873, "propobj.c"); + cd_get_pos(&endpos, 24873, "propobj.c"); #elif VERSION >= VERSION_NTSC_1_0 - cdGetPos(&endpos, 24482, "propobj.c"); + cd_get_pos(&endpos, 24482, "propobj.c"); #else - cdGetPos(&endpos, 24137, "propobj.c"); + cd_get_pos(&endpos, 24137, "propobj.c"); #endif - obstacle = cdGetObstacleProp(); + obstacle = cd_get_obstacle_prop(); } - propSetPerimEnabled(fromprop, true); + prop_set_perim_enabled(fromprop, true); x = endpos.x - pos->x; y = endpos.y - pos->y; @@ -21289,8 +21289,8 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct endpos.y -= (random() % 10) + 2; } - bgunPlayPropHitSound(&gset, targetprop, -1); - chrDamageByImpact(targetprop->chr, gsetGetDamage(&gset) * arg1->unk10, dir, &gset, 0, 200); + bgun_play_prop_hit_sound(&gset, targetprop, -1); + chr_damage_by_impact(targetprop->chr, gset_get_damage(&gset) * arg1->unk10, dir, &gset, 0, 200); arg1->unk14 = 0.0f; } } @@ -21306,30 +21306,30 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct struct chrdata *chr = obstacle->chr; if (weaponnum != WEAPON_CHOPPERGUN) { - bgunPlayPropHitSound(&gset, obstacle, -1); + bgun_play_prop_hit_sound(&gset, obstacle, -1); } if (chr->model) { - chrCalculateShieldHit(chr, &endpos, dir, &node, &hitpart, &model, &side); + chr_calculate_shield_hit(chr, &endpos, dir, &node, &hitpart, &model, &side); } - chrEmitSparks(chr, obstacle, hitpart, &endpos, dir, NULL); + chr_emit_sparks(chr, obstacle, hitpart, &endpos, dir, NULL); if (drug) { chr->blurdrugamount = TICKS(5000); } - func0f0341dc(chr, gsetGetDamage(&gset), dir, &gset, 0, hitpart, obstacle, node, model, side, NULL); + func0f0341dc(chr, gset_get_damage(&gset), dir, &gset, 0, hitpart, obstacle, node, model, side, NULL); } else if (obstacle->type == PROPTYPE_OBJ || obstacle->type == PROPTYPE_WEAPON || obstacle->type == PROPTYPE_DOOR) { struct defaultobj *obj = obstacle->obj; if (weaponnum != WEAPON_CHOPPERGUN) { - bgunPlayPropHitSound(&gset, obstacle, -1); + bgun_play_prop_hit_sound(&gset, obstacle, -1); } func0f065e74(pos, fromprop->rooms, &endpos, sp1c8); - sparksCreate(sp1c8[0], obstacle, &endpos, NULL, NULL, SPARKTYPE_DEFAULT); - objTakeGunfire(obstacle->obj, gsetGetDamage(&gset), &endpos, weaponnum, -1); + sparks_create(sp1c8[0], obstacle, &endpos, NULL, NULL, SPARKTYPE_DEFAULT); + obj_take_gunfire(obstacle->obj, gset_get_damage(&gset), &endpos, weaponnum, -1); if (obj->type == OBJTYPE_WEAPON) { struct weaponobj *weapon = (struct weaponobj *)obj; @@ -21343,10 +21343,10 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct func0f065e74(pos, fromprop->rooms, &endpos, sp1c8); if (weaponnum != WEAPON_CHOPPERGUN) { - bgunPlayBgHitSound(&gset, &endpos, -1, sp1c8); + bgun_play_bg_hit_sound(&gset, &endpos, -1, sp1c8); } - sparksCreate(sp1c8[0], NULL, &endpos, NULL, NULL, SPARKTYPE_DEFAULT); + sparks_create(sp1c8[0], NULL, &endpos, NULL, NULL, SPARKTYPE_DEFAULT); } } @@ -21359,19 +21359,19 @@ void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct beamptr = arg1->beam; } - beamCreate(beamptr, forcebeam ? WEAPON_FALCON2 : weaponnum, &frompos, &endpos); + beam_create(beamptr, forcebeam ? WEAPON_FALCON2 : weaponnum, &frompos, &endpos); } } } } -void objSetModelPartVisible(struct defaultobj *obj, s32 partnum, bool visible) +void obj_set_model_part_visible(struct defaultobj *obj, s32 partnum, bool visible) { if (obj && obj->model && obj->model->definition) { - struct modelnode *node = modelGetPart(obj->model->definition, partnum); + struct modelnode *node = model_get_part(obj->model->definition, partnum); if (node) { - union modelrwdata *rwdata = modelGetNodeRwData(obj->model, node); + union modelrwdata *rwdata = model_get_node_rw_data(obj->model, node); if (rwdata) { if (visible) { diff --git a/src/game/propobjstop.c b/src/game/propobjstop.c index 74b9bc5e1..91b583eba 100644 --- a/src/game/propobjstop.c +++ b/src/game/propobjstop.c @@ -6,7 +6,7 @@ #include "data.h" #include "types.h" -void objsStop(void) +void objs_stop(void) { u32 *ptr = g_StageSetup.props; @@ -42,7 +42,7 @@ void objsStop(void) case OBJTYPE_HOVERCAR: case OBJTYPE_CHOPPER: case OBJTYPE_ESCASTEP: - objFreePermanently((struct defaultobj *) ptr, true); + obj_free_permanently((struct defaultobj *) ptr, true); break; case OBJTYPE_DOORSCALE: case OBJTYPE_CHR: @@ -77,7 +77,7 @@ void objsStop(void) break; } - ptr = ptr + setupGetCmdLength(ptr); + ptr = ptr + setup_get_cmd_length(ptr); } } } diff --git a/src/game/propsnd.c b/src/game/propsnd.c index 6cd41bd3c..dfb246420 100644 --- a/src/game/propsnd.c +++ b/src/game/propsnd.c @@ -45,7 +45,7 @@ u32 var8006ae54 = 999; #define CHANNEL_IS_AI(channel) (channel >= 0 && channel <= 7) #define CHANNEL_HEAP_FIRST CHANNEL_8 -bool psPropHasSoundWithContext(struct prop *prop, s32 type) +bool ps_prop_has_sound_with_context(struct prop *prop, s32 type) { s32 i; @@ -60,7 +60,7 @@ bool psPropHasSoundWithContext(struct prop *prop, s32 type) return false; } -void psStopSound(struct prop *prop, s32 type, u16 flags) +void ps_stop_sound(struct prop *prop, s32 type, u16 flags) { s32 i; @@ -70,14 +70,14 @@ void psStopSound(struct prop *prop, s32 type, u16 flags) if ((channel->flags & PSFLAG_FREE) == 0 && channel->prop == prop) { if (!channel->flags || !flags || (flags & channel->flags)) { if (channel->type == type || type == PSTYPE_GENERAL) { - psStopChannel(i); + ps_stop_channel(i); } } } } } -s32 psCalculateVolumeFromDistance(f32 playerdist, f32 dist1, f32 dist2, f32 dist3, s32 fullvolume) +s32 ps_calculate_volume_from_distance(f32 playerdist, f32 dist1, f32 dist2, f32 dist3, s32 fullvolume) { s32 result = 0; @@ -119,7 +119,7 @@ s32 psCalculateVolumeFromDistance(f32 playerdist, f32 dist1, f32 dist2, f32 dist return result; } -s32 psGetVolume(s32 channelnum) +s32 ps_get_volume(s32 channelnum) { return CHANNEL_IS_AI(channelnum) ? g_PsChannels[channelnum].currentvol : 0; } @@ -128,11 +128,11 @@ s32 psGetVolume(s32 channelnum) * Play the given soundnum for the prop, provided the prop doesn't already have * a sound playing with this type. */ -void psCreateIfNotDupe(struct prop *prop, s16 soundnum, s32 type) +void ps_create_if_not_dupe(struct prop *prop, s16 soundnum, s32 type) { s32 i; - if (psCalculateVol(&prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0) != 0) { + if (ps_calculate_vol(&prop->pos, 400, 2500, 3000, prop->rooms, soundnum, AL_VOL_FULL, 0) != 0) { for (i = CHANNEL_HEAP_FIRST; i < CHANNELCOUNT(); i++) { if ((g_PsChannels[i].flags & PSFLAG_FREE) == 0 && g_PsChannels[i].prop == prop @@ -141,7 +141,7 @@ void psCreateIfNotDupe(struct prop *prop, s16 soundnum, s32 type) } } - psCreate(NULL, prop, soundnum, -1, -1, PSFLAG_REPEATING, 0, type, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); + ps_create(NULL, prop, soundnum, -1, -1, PSFLAG_REPEATING, 0, type, 0, -1.0f, 0, -1, -1.0f, -1.0f, -1.0f); } } @@ -149,7 +149,7 @@ void psCreateIfNotDupe(struct prop *prop, s16 soundnum, s32 type) * Stop the sound that's playing in the given channel. * The channel remains allocated and configured. */ -void psStopChannel(s32 channelnum) +void ps_stop_channel(s32 channelnum) { struct pschannel *channel = &g_PsChannels[channelnum]; @@ -162,15 +162,15 @@ void psStopChannel(s32 channelnum) #endif if (channel->flags & PSFLAG_FORHUDMSG) { - hudmsgsHideByChannel(channelnum); + hudmsgs_hide_by_channel(channelnum); } if (channel->flags & PSFLAG_FORPROP) { - propDecrementSoundCount(channel->prop); + prop_decrement_sound_count(channel->prop); } if (channel->flags & PSFLAG_ISMP3) { - sndStopMp3(channel->soundnum26); + snd_stop_mp3(channel->soundnum26); } else if (channel->audiohandle && sndGetState(channel->audiohandle) != AL_STOPPED) { audioStop(channel->audiohandle); } @@ -180,7 +180,7 @@ void psStopChannel(s32 channelnum) #endif } -void psPrintChannel(struct pschannel *channel) +void ps_print_channel(struct pschannel *channel) { s32 i; @@ -189,7 +189,7 @@ void psPrintChannel(struct pschannel *channel) } } -s32 psGetSubtitleOpacity(s32 channelnum) +s32 ps_get_subtitle_opacity(s32 channelnum) { if (channelnum == -1) { return 1; @@ -213,7 +213,7 @@ s32 psGetSubtitleOpacity(s32 channelnum) return 0; } -void psTickChannel(s32 channelnum) +void ps_tick_channel(s32 channelnum) { struct pschannel *channel = &g_PsChannels[channelnum]; @@ -223,12 +223,12 @@ void psTickChannel(s32 channelnum) && ((channel->audiohandle != NULL && sndGetState(channel->audiohandle) != AL_STOPPED) || (channel->flags & PSFLAG_REPEATING) || (channel->flags & PSFLAG_FIRSTTICK) - || ((channel->flags & PSFLAG_ISMP3) && sndIsPlayingMp3()))) + || ((channel->flags & PSFLAG_ISMP3) && snd_is_playing_mp3()))) #else if ((channel->audiohandle != NULL && sndGetState(channel->audiohandle) != AL_STOPPED) || (channel->flags & PSFLAG_REPEATING) || (channel->flags & PSFLAG_FIRSTTICK) - || ((channel->flags & PSFLAG_ISMP3) && sndIsPlayingMp3())) + || ((channel->flags & PSFLAG_ISMP3) && snd_is_playing_mp3())) #endif { struct coord *pos = NULL; @@ -271,12 +271,12 @@ void psTickChannel(s32 channelnum) var8006ae50 = channel->soundnum2c; - channel->targetvol = psCalculateVol(pos, channel->dist1, channel->dist2, channel->dist3, + channel->targetvol = ps_calculate_vol(pos, channel->dist1, channel->dist2, channel->dist3, tmprooms, channel->soundnum26, channel->vol10, &channel->distance); } if ((channel->flags & PSFLAG_HASCONFIGPAN) == 0) { - channel->targetpan = psCalculatePan(pos, channel->dist1, channel->dist2, channel->dist3, + channel->targetpan = ps_calculate_pan(pos, channel->dist1, channel->dist2, channel->dist3, channel->distance, channel->flags & PSFLAG_0800, channel); } } @@ -336,9 +336,9 @@ void psTickChannel(s32 channelnum) newvol = channel->targetvol; } - if (lvIsPaused() - || (mpIsPaused() && (channel->flags2 & PSFLAG2_MPPAUSABLE)) - || (mpIsPaused() && PLAYERCOUNT() == 1)) { + if (lv_is_paused() + || (mp_is_paused() && (channel->flags2 & PSFLAG2_MPPAUSABLE)) + || (mp_is_paused() && PLAYERCOUNT() == 1)) { channel->currentvol = -1; newvol = 0; } @@ -433,7 +433,7 @@ void psTickChannel(s32 channelnum) if (channel->flags & PSFLAG_ISMP3) { - sndStartMp3(channel->soundnum26, newvol, newpan, (channel->flags2 & PSFLAG2_RESPONDHELLO) ? 1 : 0); + snd_start_mp3(channel->soundnum26, newvol, newpan, (channel->flags2 & PSFLAG2_RESPONDHELLO) ? 1 : 0); } else { #if VERSION >= VERSION_NTSC_1_0 if (channel->flags & PSFLAG_0400) { @@ -455,7 +455,7 @@ void psTickChannel(s32 channelnum) channel->flags &= ~PSFLAG_FIRSTTICK; } else { - sndAdjust(&channel->audiohandle, channel->flags & PSFLAG_ISMP3, newvol, newpan, + snd_adjust(&channel->audiohandle, channel->flags & PSFLAG_ISMP3, newvol, newpan, channel->soundnum26, newpitch, channel->fxbus, newfx, channel->flags & PSFLAG_CHANGINGPAN); } } @@ -467,20 +467,20 @@ void psTickChannel(s32 channelnum) #if VERSION >= VERSION_NTSC_1_0 if (channel->type != PSTYPE_MARKER) { if (channel->flags & PSFLAG_ISMP3) { - if (!sndIsPlayingMp3()) { + if (!snd_is_playing_mp3()) { if (channel->flags & PSFLAG_FORPROP) { - propDecrementSoundCount(channel->prop); + prop_decrement_sound_count(channel->prop); } if (channel->flags & PSFLAG_FORHUDMSG) { - hudmsgsHideByChannel(channelnum); + hudmsgs_hide_by_channel(channelnum); } } channel->flags = PSFLAG_FREE; } else if (channel->audiohandle == NULL) { if (channel->flags & PSFLAG_FORPROP) { - propDecrementSoundCount(channel->prop); + prop_decrement_sound_count(channel->prop); } channel->flags = PSFLAG_FREE; @@ -488,18 +488,18 @@ void psTickChannel(s32 channelnum) } #else if (channel->flags & PSFLAG_ISMP3) { - if (!sndIsPlayingMp3()) { + if (!snd_is_playing_mp3()) { if (channel->flags & PSFLAG_FORPROP) { - propDecrementSoundCount(channel->prop); + prop_decrement_sound_count(channel->prop); } if (channel->flags & PSFLAG_FORHUDMSG) { - hudmsgsHideByChannel(channelnum); + hudmsgs_hide_by_channel(channelnum); } } } else if (channel->audiohandle == NULL) { if (channel->flags & PSFLAG_FORPROP) { - propDecrementSoundCount(channel->prop); + prop_decrement_sound_count(channel->prop); } } @@ -508,7 +508,7 @@ void psTickChannel(s32 channelnum) } if (g_PsPrintFlagged && (channel->flags2 & PSFLAG2_PRINTABLE)) { - psPrintChannel(channel); + ps_print_channel(channel); } #if VERSION >= VERSION_NTSC_1_0 @@ -518,7 +518,7 @@ void psTickChannel(s32 channelnum) channel->flags &= ~PSFLAG_CHANGINGPAN; } -void psTick(void) +void ps_tick(void) { static s32 peakcount = 0; s32 count = 0; @@ -533,12 +533,12 @@ void psTick(void) #endif if ((channel->flags & PSFLAG_FREE) == 0) { - psTickChannel(i); + ps_tick_channel(i); count++; #if VERSION >= VERSION_NTSC_1_0 if (g_PsPrintAll) { - psPrintChannel(&g_PsChannels[i]); + ps_print_channel(&g_PsChannels[i]); } #endif } @@ -557,7 +557,7 @@ void psTick(void) osSyncPrintf("Propsnd : Using %d of %d (Peek = %d of %d)", count, CHANNELCOUNT(), peakcount, CHANNELCOUNT()); } -void psSetPitch(struct prop *prop, f32 targetpitch, s32 changespeed) +void ps_set_pitch(struct prop *prop, f32 targetpitch, s32 changespeed) { OSPri prevpri; s32 i; @@ -575,16 +575,16 @@ void psSetPitch(struct prop *prop, f32 targetpitch, s32 changespeed) #if VERSION >= VERSION_NTSC_1_0 prevpri = osGetThreadPri(0); osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); - psTickChannel(i); + ps_tick_channel(i); osSetThreadPri(0, prevpri); #else - psTickChannel(i); + ps_tick_channel(i); #endif } } } -void psSetVolume(struct prop *prop, s32 volpercentage) +void ps_set_volume(struct prop *prop, s32 volpercentage) { OSPri prevpri; s32 i; @@ -600,19 +600,19 @@ void psSetVolume(struct prop *prop, s32 volpercentage) osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); g_PsChannels[i].vol10 = volpercentage * AL_VOL_FULL / 100; - psTickChannel(i); + ps_tick_channel(i); osSetThreadPri(0, prevpri); #else g_PsChannels[i].vol10 = volpercentage * AL_VOL_FULL / 100; - psTickChannel(i); + ps_tick_channel(i); #endif } } } #if VERSION >= VERSION_NTSC_1_0 -void psStopOneShootChannel(struct prop *prop) +void ps_stop_one_shoot_channel(struct prop *prop) { s32 lowestuuid = -1; s32 count = 0; @@ -638,12 +638,12 @@ void psStopOneShootChannel(struct prop *prop) if (1); if (count >= 2 && bestindex != -1) { - psStopChannel(bestindex); + ps_stop_channel(bestindex); } } #endif -s16 psCreate(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 padnum, +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) @@ -661,7 +661,7 @@ s16 psCreate(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 pad osSyncPrintf("AISOUND: aisoundnewtypeflags - Channel %d -> Playing sound number id=%d(%x)\n", channel, soundnum, soundnum); if (type == PSTYPE_CHRSHOOT) { - psStopOneShootChannel(prop); + ps_stop_one_shoot_channel(prop); } spac.packed = soundnum; @@ -723,7 +723,7 @@ s16 psCreate(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 pad #endif if (padnum >= 0) { - padUnpack(padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_ROOM, &pad); pos = &pad.pos; room = pad.room; prop = NULL; @@ -841,7 +841,7 @@ s16 psCreate(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 pad channel->soundnum2c = spac.id; #if VERSION >= VERSION_NTSC_1_0 - if (sndIsFiltered(channel->soundnum2c)) { + if (snd_is_filtered(channel->soundnum2c)) { channel->flags2 |= PSFLAG2_OFFENSIVE; } #endif @@ -893,21 +893,21 @@ s16 psCreate(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 pad channel->flags |= PSFLAG_FIRSTTICK; - if (sndIsMp3(soundnum)) { + if (snd_is_mp3(soundnum)) { channel->flags |= PSFLAG_ISMP3; #if VERSION >= VERSION_NTSC_1_0 prevpri = osGetThreadPri(0); osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); - psTickChannel(channel->channelnum); + ps_tick_channel(channel->channelnum); osSetThreadPri(0, prevpri); #else - psTickChannel(channel->channelnum); + ps_tick_channel(channel->channelnum); #endif } else { prevpri = osGetThreadPri(0); osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); - psTickChannel(channel->channelnum); + ps_tick_channel(channel->channelnum); osSetThreadPri(0, prevpri); } @@ -929,7 +929,7 @@ s16 psCreate(struct pschannel *channel, struct prop *prop, s16 soundnum, s16 pad return channel->channelnum; } -s32 psPlayFromProp(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 type, u16 flags) +s32 ps_play_from_prop(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 type, u16 flags) { s32 retchannelnum = -1; @@ -967,7 +967,7 @@ s32 psPlayFromProp(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 /** * An AI script has requested the AI multi channel. * The multi channel is an abstraction for more channels. - * Let psCreate choose the real channel number from the heap area. + * Let ps_create choose the real channel number from the heap area. * The real channel number is returned but AI will ignore it. * * Flag PSFLAG_CUTSCENE is set so propsnd knows the channel @@ -975,7 +975,7 @@ s32 psPlayFromProp(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 */ osSyncPrintf("AISOUND: CUTSCENE -> Playing sound number id=%d(%x))\n", soundnum, soundnum); - retchannelnum = psCreate(NULL, prop, soundnum, -1, + retchannelnum = ps_create(NULL, prop, soundnum, -1, (vol ? 0 : -1), flags | PSFLAG_CUTSCENE, 0, type, 0, -1, 0, -1, -1, -1, -1); } #if VERSION >= VERSION_NTSC_1_0 @@ -989,16 +989,16 @@ s32 psPlayFromProp(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 osSyncPrintf("AISOUND: Channel %d -> Playing sound number id=%d(%x), Prop=%x, Flags=%x, Type=%d\n", channelnum, soundnum, soundnum, prop, flags, type); - retchannelnum = psCreate(NULL, prop, soundnum, -1, + retchannelnum = ps_create(NULL, prop, soundnum, -1, (vol ? 0 : -1), flags, 0, type, 0, -1, 0, -1, -1, -1, -1); } #else else if (channelnum == 9) { osSyncPrintf("AISOUND: DONTCARE -> Playing sound number id=%d(%x))\n", soundnum, soundnum); - retchannelnum = psCreate(NULL, prop, soundnum, -1, (vol ? 0 : -1), flags, 0, type, 0, -1, 0, -1, -1, -1, -1); + retchannelnum = ps_create(NULL, prop, soundnum, -1, (vol ? 0 : -1), flags, 0, type, 0, -1, 0, -1, -1, -1, -1); } else if (channelnum < 0 || channelnum >= 8) { osSyncPrintf("AISOUND: Channel %d -> Playing sound number id=%d(%x), Prop=%x\n", channelnum, soundnum, soundnum, prop); - retchannelnum = psCreate(NULL, prop, soundnum, -1, (vol ? 0 : -1), flags, 0, type, 0, -1, 0, -1, -1, -1, -1); + retchannelnum = ps_create(NULL, prop, soundnum, -1, (vol ? 0 : -1), flags, 0, type, 0, -1, 0, -1, -1, -1, -1); } #endif else { @@ -1012,12 +1012,12 @@ s32 psPlayFromProp(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 channelnum, g_PsChannels[channelnum].soundnum26, g_PsChannels[channelnum].soundnum26); #endif - psStopChannel(channelnum); + ps_stop_channel(channelnum); } g_PsChannels[channelnum].channelnum = channelnum; - psCreate(&g_PsChannels[channelnum], prop, soundnum, -1, + ps_create(&g_PsChannels[channelnum], prop, soundnum, -1, (vol ? 0 : -1), flags, 0, type, 0, -1, 0, -1, -1, -1, -1); retchannelnum = channelnum; @@ -1026,7 +1026,7 @@ s32 psPlayFromProp(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 return retchannelnum; } -void psMuteChannel(s32 channelnum) +void ps_mute_channel(s32 channelnum) { if (channelnum == CHANNEL_CUTSCENE) { s32 i; @@ -1036,16 +1036,16 @@ void psMuteChannel(s32 channelnum) for (i = CHANNEL_HEAP_FIRST; i < CHANNELCOUNT(); i++) { if ((g_PsChannels[i].flags & PSFLAG_FREE) == 0 && (g_PsChannels[i].flags & PSFLAG_CUTSCENE)) { - psStopChannel(i); + ps_stop_channel(i); } } } else if (CHANNEL_IS_AI(channelnum)) { osSyncPrintf("AISOUND: Stop sound channel %d\n", channelnum); - psStopChannel(channelnum); + ps_stop_channel(channelnum); } } -bool psIsChannelFree(s32 channelnum) +bool ps_is_channel_free(s32 channelnum) { if (CHANNEL_IS_AI(channelnum)) { return (g_PsChannels[channelnum].flags & PSFLAG_FREE) ? true : false; @@ -1064,7 +1064,7 @@ bool psIsChannelFree(s32 channelnum) return true; } -void psModify(s32 channelnum, s32 volume, s16 padnum, struct prop *prop, s32 volchangetimer60, s32 dist2, s32 dist3, u16 flags) +void ps_modify(s32 channelnum, s32 volume, s16 padnum, struct prop *prop, s32 volchangetimer60, s32 dist2, s32 dist3, u16 flags) { struct pschannel *channel = &g_PsChannels[channelnum]; bool hastimer = (volchangetimer60 >= 6) ? true : false; @@ -1079,7 +1079,7 @@ void psModify(s32 channelnum, s32 volume, s16 padnum, struct prop *prop, s32 vol g_PsChannels[channelnum].channelnum = (u16)channelnum; - psCreate(&g_PsChannels[channelnum], prop, channel->soundnum26, -1, + ps_create(&g_PsChannels[channelnum], prop, channel->soundnum26, -1, -1, flags, 0, PSTYPE_NONE, 0, -1, 0, -1, 400, dist2, dist3); } else { if ((channel->flags & PSFLAG_OUTOFRANGE) == 0 && volume >= 0) { @@ -1113,17 +1113,17 @@ void psModify(s32 channelnum, s32 volume, s16 padnum, struct prop *prop, s32 vol #if VERSION >= VERSION_NTSC_1_0 OSPri prevpri = osGetThreadPri(0); osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); - psTickChannel(channelnum); + ps_tick_channel(channelnum); osSetThreadPri(0, prevpri); #else - psTickChannel(channelnum); + ps_tick_channel(channelnum); #endif } } } } -s32 psCalculateVol(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, RoomNum *rooms, s16 soundnum, s32 arg6, f32 *playerdistptr) +s32 ps_calculate_vol(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, RoomNum *rooms, s16 soundnum, s32 arg6, f32 *playerdistptr) { union soundnumhack sp6c; union soundnumhack sp68; @@ -1188,10 +1188,10 @@ s32 psCalculateVol(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, RoomNum * *playerdistptr = playerdist; } - return psCalculateVolumeFromDistance(playerdist, dist1, dist2, dist3, arg6); + return ps_calculate_volume_from_distance(playerdist, dist1, dist2, dist3, arg6); } -s32 psCalculatePan3(s32 degrees, f32 arg1, struct pschannel *channel) +s32 ps_calculate_pan3(s32 degrees, f32 arg1, struct pschannel *channel) { s32 result; @@ -1276,7 +1276,7 @@ s32 psCalculatePan3(s32 degrees, f32 arg1, struct pschannel *channel) return result; } -s32 psCalculatePan2(struct coord *pos, s32 arg1, f32 arg2, struct pschannel *channel) +s32 ps_calculate_pan2(struct coord *pos, s32 arg1, f32 arg2, struct pschannel *channel) { s32 result = AL_PAN_CENTER; u32 stack[4]; @@ -1318,13 +1318,13 @@ s32 psCalculatePan2(struct coord *pos, s32 arg1, f32 arg2, struct pschannel *cha channel->unk16 = 100.0f * arg2; } - result = psCalculatePan3(degrees, arg2, channel); + result = ps_calculate_pan3(degrees, arg2, channel); } return result; } -s32 psCalculatePan(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, f32 playerdist, bool arg5, struct pschannel *channel) +s32 ps_calculate_pan(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, f32 playerdist, bool arg5, struct pschannel *channel) { s32 result = AL_PAN_CENTER; @@ -1364,12 +1364,12 @@ s32 psCalculatePan(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, f32 playe frac = 1; } - result = psCalculatePan2(pos, 0, frac, channel); + result = ps_calculate_pan2(pos, 0, frac, channel); } else { - result = psCalculatePan2(pos, 0, -1, NULL); + result = ps_calculate_pan2(pos, 0, -1, NULL); } } else { - result = psCalculatePan2(pos, 0, -1, channel); + result = ps_calculate_pan2(pos, 0, -1, channel); } } } @@ -1382,7 +1382,7 @@ s32 psCalculatePan(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, f32 playe * If the given soundnum were to play at the given world position, calculate the * final volume and pan and write them to the vol and pan pointers. */ -void psGetTheoreticalVolPan(struct coord *pos, RoomNum *rooms, s16 soundnum, s32 *vol, s32 *pan) +void ps_get_theoretical_vol_pan(struct coord *pos, RoomNum *rooms, s16 soundnum, s32 *vol, s32 *pan) { f32 dist1; f32 dist2; @@ -1429,12 +1429,12 @@ void psGetTheoreticalVolPan(struct coord *pos, RoomNum *rooms, s16 soundnum, s32 soundnum = sp48.packed; } - *vol = psCalculateVol(pos, dist1, dist2, dist3, rooms, soundnum, AL_VOL_FULL, distanceptr); - *pan = psCalculatePan(pos, dist1, dist2, dist3, *distanceptr, sp3c, 0); + *vol = ps_calculate_vol(pos, dist1, dist2, dist3, rooms, soundnum, AL_VOL_FULL, distanceptr); + *pan = ps_calculate_pan(pos, dist1, dist2, dist3, *distanceptr, sp3c, 0); } #endif -void psApplyVolPan(struct sndstate *handle, struct coord *pos, f32 dist1, f32 dist2, f32 dist3, RoomNum *rooms, s16 soundnum, s32 arg7, f32 *distanceptr) +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) { union soundnumhack sp5c; union soundnumhack sp58; @@ -1473,13 +1473,13 @@ void psApplyVolPan(struct sndstate *handle, struct coord *pos, f32 dist1, f32 di soundnum = sp5c.packed; } - vol = psCalculateVol(pos, dist1, dist2, dist3, rooms, soundnum, arg7, distanceptr); - pan = psCalculatePan(pos, dist1, dist2, dist3, *distanceptr, sp50, 0); + vol = ps_calculate_vol(pos, dist1, dist2, dist3, rooms, soundnum, arg7, distanceptr); + pan = ps_calculate_pan(pos, dist1, dist2, dist3, *distanceptr, sp50, 0); - sndAdjust(&handle, sndIsMp3(soundnum), vol, pan, soundnum, 1.0f, 1, -1, 1); + snd_adjust(&handle, snd_is_mp3(soundnum), vol, pan, soundnum, 1.0f, 1, -1, 1); } -s32 psGetRandomSparkSound(void) +s32 ps_get_random_spark_sound(void) { s32 index = random() % 6; @@ -1516,7 +1516,7 @@ void ps0f095270(void) * All MP3 files are 24 kilobits per second * so this is just math based on the filesize. */ -s32 psGetDuration60(s32 channelnum) +s32 ps_get_duration60(s32 channelnum) { struct pschannel *channel = &g_PsChannels[channelnum]; @@ -1526,7 +1526,7 @@ s32 psGetDuration60(s32 channelnum) union soundnumhack soundnum; soundnum.packed = channel->soundnum26; - return fileGetRomSize(soundnum.id) * 60 / (1024 * 24 / 8); + return file_get_rom_size(soundnum.id) * 60 / (1024 * 24 / 8); } return -1; diff --git a/src/game/propsndreset.c b/src/game/propsndreset.c index 5049e8d40..2197bb55b 100644 --- a/src/game/propsndreset.c +++ b/src/game/propsndreset.c @@ -5,11 +5,11 @@ #include "data.h" #include "types.h" -void psReset(void) +void ps_reset(void) { s32 i; - g_PsChannels = mempAlloc(ALIGN16((IS4MB() ? 30 : 40) * sizeof(struct pschannel)), MEMPOOL_STAGE); + g_PsChannels = memp_alloc(ALIGN16((IS4MB() ? 30 : 40) * sizeof(struct pschannel)), MEMPOOL_STAGE); for (i = 0; i < (IS4MB() ? 30 : 40); i++) { g_PsChannels[i].flags = PSFLAG_FREE; diff --git a/src/game/propsndstop.c b/src/game/propsndstop.c index 93f2df6a1..c1c1c4578 100644 --- a/src/game/propsndstop.c +++ b/src/game/propsndstop.c @@ -6,13 +6,13 @@ #include "data.h" #include "types.h" -void psStop(void) +void ps_stop(void) { s32 i; for (i = 0; i < (IS4MB() ? 30 : 40); i++) { if (g_PsChannels[i].flags & PSFLAG_ISMP3) { - sndStopMp3(g_PsChannels[i].soundnum26); + snd_stop_mp3(g_PsChannels[i].soundnum26); g_PsChannels[i].flags &= ~PSFLAG_ISMP3; g_PsChannels[i].flags &= ~PSFLAG_REPEATING; } else if (g_PsChannels[i].audiohandle && sndGetState(g_PsChannels[i].audiohandle) != AL_STOPPED) { diff --git a/src/game/propsstop.c b/src/game/propsstop.c index 42f89492a..04601d155 100644 --- a/src/game/propsstop.c +++ b/src/game/propsstop.c @@ -7,8 +7,8 @@ #include "data.h" #include "types.h" -void propsStop(void) +void props_stop(void) { - alarmDeactivate(); - gasStopAudio(); + alarm_deactivate(); + gas_stop_audio(); } diff --git a/src/game/proptick.c b/src/game/proptick.c index 90d20c913..a5aafcaef 100644 --- a/src/game/proptick.c +++ b/src/game/proptick.c @@ -44,7 +44,7 @@ #include "data.h" #include "types.h" -void propsTick(void) +void props_tick(void) { s32 i; struct prop *prop; @@ -59,8 +59,8 @@ void propsTick(void) g_Vars.players[i]->bondextrapos.z = 0; } - shieldhitsTick(); - chraTickBg(); + shieldhits_tick(); + chra_tick_bg(); prop = g_Vars.activeprops; @@ -70,15 +70,15 @@ void propsTick(void) tickop = TICKOP_NONE; if (prop->type == PROPTYPE_CHR) { - tickop = chrTickBeams(prop); + tickop = chr_tick_beams(prop); } else if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_WEAPON || prop->type == PROPTYPE_DOOR) { - tickop = objTick(prop); + tickop = obj_tick(prop); } else if (prop->type == PROPTYPE_EXPLOSION) { - tickop = explosionTick(prop); + tickop = explosion_tick(prop); } else if (prop->type == PROPTYPE_SMOKE) { - tickop = smokeTick(prop); + tickop = smoke_tick(prop); } else if (prop->type == PROPTYPE_PLAYER) { - tickop = playerTickBeams(prop); + tickop = player_tick_beams(prop); } if (tickop == TICKOP_CHANGEDLIST) { @@ -88,15 +88,15 @@ void propsTick(void) done = next2 == g_Vars.pausedprops; if (tickop == TICKOP_RETICK) { - propDelist(prop); - propActivateThisFrame(prop); + prop_delist(prop); + prop_activate_this_frame(prop); if (done) { next2 = prop; done = false; } } else { - propExecuteTickOperation(prop, tickop); + prop_execute_tick_operation(prop, tickop); } } diff --git a/src/game/quaternion.c b/src/game/quaternion.c index e21ddf900..7fd17d8e6 100644 --- a/src/game/quaternion.c +++ b/src/game/quaternion.c @@ -27,7 +27,7 @@ void quaternion0f096ca0(struct coord *angle, f32 quat[4]) quat[3] = cosx_cosy * sinz - sinx_siny * cosz; } -void quaternionSetRotationAroundX(f32 angle, f32 quat[4]) +void quaternion_set_rotation_around_x(f32 angle, f32 quat[4]) { quat[0] = cosf(angle * 0.5f); quat[1] = sinf(angle * 0.5f); @@ -35,7 +35,7 @@ void quaternionSetRotationAroundX(f32 angle, f32 quat[4]) quat[3] = 0.0f; } -void quaternionSetRotationAroundY(f32 angle, f32 quat[4]) +void quaternion_set_rotation_around_y(f32 angle, f32 quat[4]) { quat[0] = cosf(angle * 0.5f); quat[1] = 0.0f; @@ -43,7 +43,7 @@ void quaternionSetRotationAroundY(f32 angle, f32 quat[4]) quat[3] = 0.0f; } -void quaternionSetRotationAroundZ(f32 angle, f32 quat[4]) +void quaternion_set_rotation_around_z(f32 angle, f32 quat[4]) { quat[0] = cosf(angle * 0.5f); quat[1] = 0.0f; @@ -51,7 +51,7 @@ void quaternionSetRotationAroundZ(f32 angle, f32 quat[4]) quat[3] = sinf(angle * 0.5f); } -void quaternionToMtx(f32 quat[4], Mtxf *mtx) +void quaternion_to_mtx(f32 quat[4], Mtxf *mtx) { f32 mult = 2.0f / (quat[0] * quat[0] + quat[1] * quat[1] + quat[2] * quat[2] + quat[3] * quat[3]); f32 a = quat[1] * mult; @@ -133,9 +133,9 @@ void quaternion0f097044(Mtxf *mtx, f32 arg1[4]) } } -void quaternionToTransformMtx(struct coord *pos, f32 rot[4], Mtxf *mtx) +void quaternion_to_transform_mtx(struct coord *pos, f32 rot[4], Mtxf *mtx) { - quaternionToMtx(rot, mtx); + quaternion_to_mtx(rot, mtx); mtx->m[3][0] = pos->x; mtx->m[3][1] = pos->y; @@ -144,7 +144,7 @@ void quaternionToTransformMtx(struct coord *pos, f32 rot[4], Mtxf *mtx) #define EPSILON 0.00001001f -void quaternionSlerp(f32 q1[4], f32 q2[4], f32 t, f32 result[4]) +void quaternion_slerp(f32 q1[4], f32 q2[4], f32 t, f32 result[4]) { f32 dot = q1[0] * q2[0] + q1[1] * q2[1] + q1[2] * q2[2] + q1[3] * q2[3]; f32 theta; @@ -231,7 +231,7 @@ void quaternion0f0976c0(f32 q1[4], f32 q2[4]) } } -void quaternionMultQuaternion(f32 a[4], f32 b[4], f32 result[4]) +void quaternion_mult_quaternion(f32 a[4], f32 b[4], f32 result[4]) { result[0] = a[0] * b[0] - a[1] * b[1] - a[2] * b[2] - a[3] * b[3]; result[1] = a[0] * b[1] + b[0] * a[1] + a[2] * b[3] - a[3] * b[2]; @@ -239,11 +239,11 @@ void quaternionMultQuaternion(f32 a[4], f32 b[4], f32 result[4]) result[3] = a[0] * b[3] + b[0] * a[3] + a[1] * b[2] - a[2] * b[1]; } -void quaternionMultQuaternionInPlace(f32 a[4], f32 dst[4]) +void quaternion_mult_quaternion_in_place(f32 a[4], f32 dst[4]) { f32 tmp[4]; - quaternionMultQuaternion(a, dst, tmp); + quaternion_mult_quaternion(a, dst, tmp); dst[0] = tmp[0]; dst[1] = tmp[1]; diff --git a/src/game/race.c b/src/game/race.c index 2f3b2d2c2..ddf839b4b 100644 --- a/src/game/race.c +++ b/src/game/race.c @@ -7,26 +7,26 @@ #include "data.h" #include "types.h" -u16 raceGetAnimSumAngleAsInt(s16 animnum, s32 frame, s32 endframe) +u16 race_get_anim_sum_angle_as_int(s16 animnum, s32 frame, s32 endframe) { s16 inttranslate[3]; u16 sumangle = 0; while (frame < endframe) { - sumangle += animGetPosAngleAsInt(0, false, &g_SkelChr, animnum, frame, inttranslate, false); + sumangle += anim_get_pos_angle_as_int(0, false, &g_SkelChr, animnum, frame, inttranslate, false); frame++; } return sumangle; } -s32 raceGetAnimSumForwardAsInt(s16 animnum, s32 frame, s32 endframe) +s32 race_get_anim_sum_forward_as_int(s16 animnum, s32 frame, s32 endframe) { s32 sumforward = 0; s16 inttranslate[3]; while (frame < endframe) { - animGetPosAngleAsInt(0, false, &g_SkelChr, animnum, frame, inttranslate, false); + anim_get_pos_angle_as_int(0, false, &g_SkelChr, animnum, frame, inttranslate, false); sumforward += inttranslate[2]; frame++; } @@ -34,13 +34,13 @@ s32 raceGetAnimSumForwardAsInt(s16 animnum, s32 frame, s32 endframe) return sumforward; } -s32 raceInitAnimGroup(struct attackanimconfig *configs) +s32 race_init_anim_group(struct attackanimconfig *configs) { s32 count = 0; struct attackanimconfig *config = configs; while (config->animnum != 0) { - u16 angle = raceGetAnimSumAngleAsInt(config->animnum, 0, floor(config->unk04)); + u16 angle = race_get_anim_sum_angle_as_int(config->animnum, 0, floor(config->unk04)); if (config->unk04 > 0) { if (angle < 0x8000) { @@ -59,18 +59,18 @@ s32 raceInitAnimGroup(struct attackanimconfig *configs) return count; } -void raceInitAnimGroups(struct attackanimgroup **groups) +void race_init_anim_groups(struct attackanimgroup **groups) { s32 i; for (i = 0; i < 32; i++) { if (groups[i]->len < 0) { - groups[i]->len = raceInitAnimGroup(groups[i]->animcfg); + groups[i]->len = race_init_anim_group(groups[i]->animcfg); } } } -s32 raceCountAnims(struct animtablerow *rows) +s32 race_count_anims(struct animtablerow *rows) { s32 i; @@ -81,14 +81,14 @@ s32 raceCountAnims(struct animtablerow *rows) f32 race0f0005c0(s16 animnum) { - f32 avgforward = raceGetAnimSumForwardAsInt(animnum, 0, animGetNumFrames(animnum) - 1) / (f32) animGetNumFrames(animnum); + f32 avgforward = race_get_anim_sum_forward_as_int(animnum, 0, anim_get_num_frames(animnum) - 1) / (f32) anim_get_num_frames(animnum); var8005f014[animnum] = avgforward; return avgforward * 0.1000000089407f; } -void raceInitAnims(void) +void race_init_anims(void) { s32 race; s32 i; @@ -96,13 +96,13 @@ void raceInitAnims(void) for (race = 0; race < ARRAYCOUNT(g_AnimTablesByRace); race++) { for (i = 0; g_AnimTablesByRace[race][i].hitpart != -1; i++) { if (g_AnimTablesByRace[race][i].deathanims) { - g_AnimTablesByRace[race][i].deathanimcount = raceCountAnims(g_AnimTablesByRace[race][i].deathanims); + g_AnimTablesByRace[race][i].deathanimcount = race_count_anims(g_AnimTablesByRace[race][i].deathanims); } else { g_AnimTablesByRace[race][i].deathanimcount = 0; } if (g_AnimTablesByRace[race][i].injuryanims) { - g_AnimTablesByRace[race][i].injuryanimcount = raceCountAnims(g_AnimTablesByRace[race][i].injuryanims); + g_AnimTablesByRace[race][i].injuryanimcount = race_count_anims(g_AnimTablesByRace[race][i].injuryanims); } else { g_AnimTablesByRace[race][i].injuryanimcount = 0; } @@ -113,17 +113,17 @@ void raceInitAnims(void) } } - raceCountAnims(g_AnimTableHumanSlumped); + race_count_anims(g_AnimTableHumanSlumped); for (race = 0; race < 2; race++) { - raceInitAnimGroups(g_StandHeavyAttackAnims[race]); - raceInitAnimGroups(g_StandLightAttackAnims[race]); - raceInitAnimGroups(g_StandDualAttackAnims[race]); - raceInitAnimGroups(g_KneelHeavyAttackAnims[race]); - raceInitAnimGroups(g_KneelLightAttackAnims[race]); - raceInitAnimGroups(g_KneelDualAttackAnims[race]); + race_init_anim_groups(g_StandHeavyAttackAnims[race]); + race_init_anim_groups(g_StandLightAttackAnims[race]); + race_init_anim_groups(g_StandDualAttackAnims[race]); + race_init_anim_groups(g_KneelHeavyAttackAnims[race]); + race_init_anim_groups(g_KneelLightAttackAnims[race]); + race_init_anim_groups(g_KneelDualAttackAnims[race]); } - raceInitAnimGroup(g_RollAttackAnims); - raceInitAnimGroup(g_WalkAttackAnims); + race_init_anim_group(g_RollAttackAnims); + race_init_anim_group(g_WalkAttackAnims); } diff --git a/src/game/raceinit.c b/src/game/raceinit.c index 7222370b2..a8f3f35f2 100644 --- a/src/game/raceinit.c +++ b/src/game/raceinit.c @@ -7,8 +7,8 @@ #include "data.h" #include "types.h" -void racesInit(void) +void races_init(void) { - modelSetVtxAllocatorFunc(&chrAllocateVertices); - raceInitAnims(); + model_set_vtx_allocator_func(&chr_allocate_vertices); + race_init_anims(); } diff --git a/src/game/radar.c b/src/game/radar.c index 0d184bc57..171fd2f7a 100644 --- a/src/game/radar.c +++ b/src/game/radar.c @@ -44,12 +44,12 @@ u32 var80087ce4[] = { 0x8a158a15, }; -void radarSetYIndicatorsEnabled(bool enable) +void radar_set_y_indicators_enabled(bool enable) { g_RadarYIndicatorsEnabled = enable; } -Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4) +Gfx *radar_render_background(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4) { f32 spb0[2]; f32 spa8[2]; @@ -78,7 +78,7 @@ Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s3 spa8[0] = arg4 * g_ScaleX; spa8[1] = arg4; - texSelect(&gdl, tconfig, 2, 0, 0, 1, NULL); + tex_select(&gdl, tconfig, 2, 0, 0, 1, NULL); func0f0b278c(&gdl, spb0, spa8, tconfig->width, tconfig->height, 0, 0, 1, 0, 0xff, 0, 40, tconfig->level > 0, 0); @@ -94,7 +94,7 @@ Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s3 return gdl; } -s32 radarGetTeamIndex(s32 team) +s32 radar_get_team_index(s32 team) { s32 index = 0; @@ -119,7 +119,7 @@ s32 radarGetTeamIndex(s32 team) return index; } -Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1, u32 colour2, bool swapcolours) +Gfx *radar_draw_dot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1, u32 colour2, bool swapcolours) { s32 x; s32 y; @@ -145,92 +145,92 @@ Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1, if (swapcolours) { if (prop == g_Vars.currentplayer->prop) { // Box - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour1); gDPFillRectangleScaled(gdl++, x - 2, y + 2, x + 1, y + 3); gDPFillRectangleScaled(gdl++, x - 3, y - 1, x + 2, y + 2); gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 1, y - 1); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour2); gDPFillRectangleScaled(gdl++, x - 1, y + 1, x + 0, y + 2); gDPFillRectangleScaled(gdl++, x - 2, y + 0, x + 1, y + 1); gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 0, y + 0); gdl = text0f153838(gdl); } else if (g_RadarYIndicatorsEnabled && dist->y > 250) { // Up triangle - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour1); gDPFillRectangleScaled(gdl++, x - 3, y - 1, x + 2, y + 2); gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 1, y - 1); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour2); gDPFillRectangleScaled(gdl++, x - 2, y + 0, x + 1, y + 1); gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 0, y + 0); gdl = text0f153838(gdl); } else if (g_RadarYIndicatorsEnabled && dist->y < -250) { // Down triangle - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour1); gDPFillRectangleScaled(gdl++, x - 3, y - 2, x + 2, y + 1); gDPFillRectangleScaled(gdl++, x - 2, y + 1, x + 1, y + 2); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour2); gDPFillRectangleScaled(gdl++, x - 2, y - 1, x + 1, y + 0); gDPFillRectangleScaled(gdl++, x - 1, y + 0, x + 0, y + 1); gdl = text0f153838(gdl); } else { // Dot - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour1); gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 2, y + 2); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour2); gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 1, y + 1); gdl = text0f153838(gdl); } } else { if (prop == g_Vars.currentplayer->prop) { // Box - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour2); gDPFillRectangleScaled(gdl++, x - 2, y + 2, x + 1, y + 3); gDPFillRectangleScaled(gdl++, x - 3, y - 1, x + 2, y + 2); gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 1, y - 1); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour1); gDPFillRectangleScaled(gdl++, x - 1, y + 1, x + 0, y + 2); gDPFillRectangleScaled(gdl++, x - 2, y + 0, x + 1, y + 1); gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 0, y + 0); gdl = text0f153838(gdl); } else if (g_RadarYIndicatorsEnabled && dist->y > 250) { // Up triangle - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour2); gDPFillRectangleScaled(gdl++, x - 3, y - 1, x + 2, y + 2); gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 1, y - 1); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour1); gDPFillRectangleScaled(gdl++, x - 2, y + 0, x + 1, y + 1); gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 0, y + 0); gdl = text0f153838(gdl); } else if (g_RadarYIndicatorsEnabled && dist->y < -250) { // Down triangle - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour2); gDPFillRectangleScaled(gdl++, x - 3, y - 2, x + 2, y + 1); gDPFillRectangleScaled(gdl++, x - 2, y + 1, x + 1, y + 2); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour1); gDPFillRectangleScaled(gdl++, x - 2, y - 1, x + 1, y + 0); gDPFillRectangleScaled(gdl++, x - 1, y + 0, x + 0, y + 1); gdl = text0f153838(gdl); } else { // Dot - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour2); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour2); gDPFillRectangleScaled(gdl++, x - 2, y - 2, x + 2, y + 2); gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, (0xff >> shiftamount) + colour1); + gdl = text_set_prim_colour(gdl, (0xff >> shiftamount) + colour1); gDPFillRectangleScaled(gdl++, x - 1, y - 1, x + 1, y + 1); gdl = text0f153838(gdl); } @@ -239,7 +239,7 @@ Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1, return gdl; } -Gfx *radarRender(Gfx *gdl) +Gfx *radar_render(Gfx *gdl) { s32 stack; s32 stack2; @@ -282,10 +282,10 @@ Gfx *radarRender(Gfx *gdl) } #endif - g_RadarX = (viGetViewLeft() + viGetViewWidth()) / g_ScaleX - 41; + g_RadarX = (vi_get_view_left() + vi_get_view_width()) / g_ScaleX - 41; if (playercount == 2) { - if (IS4MB() || optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { + if (IS4MB() || options_get_screen_split() == SCREENSPLIT_VERTICAL) { if (playernum == 0) { g_RadarX += 16; } @@ -304,12 +304,12 @@ Gfx *radarRender(Gfx *gdl) } } - g_RadarY = viGetViewTop() + (PAL ? 29 : 26); + g_RadarY = vi_get_view_top() + (PAL ? 29 : 26); if (playercount == 2) { if (IS4MB()) { g_RadarY -= 6; - } else if (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && playernum == 1) { + } else if (options_get_screen_split() != SCREENSPLIT_VERTICAL && playernum == 1) { g_RadarY -= 8; } } else if (playercount >= 3) { @@ -319,12 +319,12 @@ Gfx *radarRender(Gfx *gdl) g_RadarY -= 2; } } else { - if (optionsGetEffectiveScreenSize() != SCREENSIZE_FULL) { + if (options_get_effective_screen_size() != SCREENSIZE_FULL) { g_RadarY -= 6; } } - gdl = radarRenderBackground(gdl, tconfig, g_RadarX, g_RadarY, 0x10); + gdl = radar_render_background(gdl, tconfig, g_RadarX, g_RadarY, 0x10); gdl = func0f153134(gdl); // Draw dots for human players @@ -332,7 +332,7 @@ Gfx *radarRender(Gfx *gdl) if (i != playernum) { if (g_Vars.players[i]->isdead == false && (g_Vars.players[i]->prop->chr->hidden & CHRHFLAG_CLOAKED) == 0 - && scenarioRadarChr(&gdl, g_Vars.players[i]->prop) == false) { + && scenario_radar_chr(&gdl, g_Vars.players[i]->prop) == false) { pos.x = g_Vars.players[i]->prop->pos.x - g_Vars.currentplayer->prop->pos.x; pos.y = g_Vars.players[i]->prop->pos.y - g_Vars.currentplayer->prop->pos.y; pos.z = g_Vars.players[i]->prop->pos.z - g_Vars.currentplayer->prop->pos.z; @@ -344,7 +344,7 @@ Gfx *radarRender(Gfx *gdl) colour = 0x00ff0000; } - gdl = radarDrawDot(gdl, g_Vars.players[i]->prop, &pos, colour, 0, 0); + gdl = radar_draw_dot(gdl, g_Vars.players[i]->prop, &pos, colour, 0, 0); } } } @@ -363,7 +363,7 @@ Gfx *radarRender(Gfx *gdl) pos.y = prop->pos.y - g_Vars.currentplayer->prop->pos.y; pos.z = prop->pos.z - g_Vars.currentplayer->prop->pos.z; - gdl = radarDrawDot(gdl, prop, &pos, 0x00ff0000, 0, 0); + gdl = radar_draw_dot(gdl, prop, &pos, 0x00ff0000, 0, 0); } } } @@ -371,33 +371,33 @@ Gfx *radarRender(Gfx *gdl) // Draw dots for MP simulants if (g_Vars.normmplayerisrunning) { for (i = 0; i < g_BotCount; i++) { - if (!chrIsDead(g_MpBotChrPtrs[i]) + if (!chr_is_dead(g_MpBotChrPtrs[i]) && (g_MpBotChrPtrs[i]->hidden & CHRHFLAG_CLOAKED) == 0 - && scenarioRadarChr(&gdl, g_MpBotChrPtrs[i]->prop) == false) { + && scenario_radar_chr(&gdl, g_MpBotChrPtrs[i]->prop) == false) { pos.x = g_MpBotChrPtrs[i]->prop->pos.x - g_Vars.currentplayer->prop->pos.x; pos.y = g_MpBotChrPtrs[i]->prop->pos.y - g_Vars.currentplayer->prop->pos.y; pos.z = g_MpBotChrPtrs[i]->prop->pos.z - g_Vars.currentplayer->prop->pos.z; if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_TEAMSENABLED)) { - colour = g_TeamColours[radarGetTeamIndex(g_MpBotChrPtrs[i]->team)]; + colour = g_TeamColours[radar_get_team_index(g_MpBotChrPtrs[i]->team)]; } else { colour = 0x00ff0000; } - gdl = radarDrawDot(gdl, g_MpBotChrPtrs[i]->prop, &pos, colour, 0, 0); + gdl = radar_draw_dot(gdl, g_MpBotChrPtrs[i]->prop, &pos, colour, 0, 0); } } } - gdl = scenarioRadarExtra(gdl); + gdl = scenario_radar_extra(gdl); // Draw dots for r-tracked props if (g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit & DEVICE_RTRACKER) { - gdl = radarRenderRTrackedProps(gdl); + gdl = radar_render_r_tracked_props(gdl); } // Draw dot for the current player - if (scenarioRadarChr(&gdl, g_Vars.currentplayer->prop) == false) { + if (scenario_radar_chr(&gdl, g_Vars.currentplayer->prop) == false) { pos.x = 0; pos.y = 0; pos.z = 0; @@ -409,7 +409,7 @@ Gfx *radarRender(Gfx *gdl) colour = 0x00ff0000; } - gdl = radarDrawDot(gdl, g_Vars.currentplayer->prop, &pos, colour, 0, 0); + gdl = radar_draw_dot(gdl, g_Vars.currentplayer->prop, &pos, colour, 0, 0); } g_ScaleX = 1; @@ -417,7 +417,7 @@ Gfx *radarRender(Gfx *gdl) return gdl; } -Gfx *radarRenderRTrackedProps(Gfx *gdl) +Gfx *radar_render_r_tracked_props(Gfx *gdl) { struct prop *prop = g_Vars.activeprops; struct coord *playerpos = &g_Vars.currentplayer->prop->pos; @@ -436,12 +436,12 @@ Gfx *radarRenderRTrackedProps(Gfx *gdl) obj = prop->obj; if ((obj->flags3 & OBJFLAG3_RTRACKED_YELLOW) || - (cheatIsActive(CHEAT_RTRACKER) && (obj->flags3 & OBJFLAG3_RTRACKED_BLUE))) { + (cheat_is_active(CHEAT_RTRACKER) && (obj->flags3 & OBJFLAG3_RTRACKED_BLUE))) { dist1.x = prop->pos.x - playerpos->x; dist1.y = prop->pos.y - playerpos->y; dist1.z = prop->pos.z - playerpos->z; - gdl = radarDrawDot(gdl, prop, &dist1, + gdl = radar_draw_dot(gdl, prop, &dist1, (obj->flags3 & OBJFLAG3_RTRACKED_YELLOW) ? 0xffff0000 : 0x0000ff00, 0, 0); } @@ -456,7 +456,7 @@ Gfx *radarRenderRTrackedProps(Gfx *gdl) dist2.x = prop->pos.x - playerpos->x; dist2.y = prop->pos.y - playerpos->y; dist2.z = prop->pos.z - playerpos->z; - gdl = radarDrawDot(gdl, prop, &dist2, 0xff000000, 0, 0); + gdl = radar_draw_dot(gdl, prop, &dist2, 0xff000000, 0, 0); } break; } diff --git a/src/game/rng2.s b/src/game/rng2.s index d1507193d..736b082d8 100644 --- a/src/game/rng2.s +++ b/src/game/rng2.s @@ -36,11 +36,11 @@ glabel random2 dsra32 $v0, $v0, 0 /** - * void rng2SetSeed(u64 seed) + * void rng2_set_seed(u64 seed) * * Set the given seed as the RNG seed. Add 1 to make sure it isn't 0. */ -glabel rng2SetSeed +glabel rng2_set_seed daddiu $a0, $a0, 1 lui $at, %hi(g_Rng2Seed) sd $a0, %lo(g_Rng2Seed)($at) diff --git a/src/game/rng2_c.c b/src/game/rng2_c.c index d14a68c90..5d5cf15f4 100644 --- a/src/game/rng2_c.c +++ b/src/game/rng2_c.c @@ -21,7 +21,7 @@ u32 random2(void) /** * Set the given seed as the RNG seed. Add 1 to make sure it isn't 0. */ -void rng2SetSeed(u64 seed) +void rng2_set_seed(u64 seed) { g_Rng2Seed = seed + 1; } diff --git a/src/game/room.c b/src/game/room.c index 8ee216e86..4f5401095 100644 --- a/src/game/room.c +++ b/src/game/room.c @@ -54,27 +54,27 @@ Mtxf *g_RoomMtxMatrices; s32 g_RoomMtxNumSlots = 0; -void roomSetLastForOffset(s32 room) +void room_set_last_for_offset(s32 room) { g_Vars.currentplayer->lastroomforoffset = room; } -void roomLinkMtx(s32 index, s32 roomnum) +void room_link_mtx(s32 index, s32 roomnum) { g_Rooms[roomnum].roommtxindex = index; g_RoomMtxLinkedRooms[index] = roomnum; } -void roomUnlinkMtx(s32 index, s32 roomnum) +void room_unlink_mtx(s32 index, s32 roomnum) { g_Rooms[roomnum].roommtxindex = -1; g_RoomMtxLinkedRooms[index] = -1; } -void roomFreeMtx(s32 index) +void room_free_mtx(s32 index) { if (g_RoomMtxLinkedRooms[index] != -1) { - roomUnlinkMtx(index, g_RoomMtxLinkedRooms[index]); + room_unlink_mtx(index, g_RoomMtxLinkedRooms[index]); } g_RoomMtxAges[index] = NUM_GFXTASKS; @@ -82,7 +82,7 @@ void roomFreeMtx(s32 index) g_RoomMtxScales[index] = 1; } -s32 roomAllocateMtx(void) +s32 room_allocate_mtx(void) { s32 i; @@ -95,11 +95,11 @@ s32 roomAllocateMtx(void) return 0; } -void roomPopulateMtx(Mtxf *mtx, s32 roomnum) +void room_populate_mtx(Mtxf *mtx, s32 roomnum) { s32 stagenum = g_Vars.stagenum; - mtx4LoadIdentity(mtx); + mtx4_load_identity(mtx); mtx->m[0][0] = 1; mtx->m[1][1] = 1; @@ -135,7 +135,7 @@ void roomPopulateMtx(Mtxf *mtx, s32 roomnum) * missing and updates the modification time. The function creates the cache * entry if missing and resets the cache entry's age to 0. */ -s32 roomTouchMtx(s32 roomnum) +s32 room_touch_mtx(s32 roomnum) { s32 index = g_Rooms[roomnum].roommtxindex; Mtxf mtx; @@ -146,12 +146,12 @@ s32 roomTouchMtx(s32 roomnum) // There's no cache for this room or it's invalid. // Unlink the old cache item if any and create a new one. if (index != -1) { - roomUnlinkMtx(index, roomnum); + room_unlink_mtx(index, roomnum); } - index = roomAllocateMtx(); + index = room_allocate_mtx(); - roomLinkMtx(index, roomnum); + room_link_mtx(index, roomnum); g_RoomMtxAges[index] = 0; } else { // The room has an existing, valid cache entry. @@ -162,8 +162,8 @@ s32 roomTouchMtx(s32 roomnum) g_RoomMtxBaseRooms[index] = g_Vars.currentplayer->lastroomforoffset; g_RoomMtxScales[index] = var8005ef10[0]; - roomPopulateMtx(&mtx, roomnum); - mtxF2L(&mtx, &g_RoomMtxMatrices[index]); + room_populate_mtx(&mtx, roomnum); + mtx_f2l(&mtx, &g_RoomMtxMatrices[index]); return index; } @@ -172,21 +172,21 @@ s32 roomTouchMtx(s32 roomnum) * Retrieve a room's modelview matrix from cache, or create a new one and cache * it, and apply it to the displaylist. */ -Gfx *roomApplyMtx(Gfx *gdl, s32 roomnum) +Gfx *room_apply_mtx(Gfx *gdl, s32 roomnum) { - s32 index = roomTouchMtx(roomnum); + s32 index = room_touch_mtx(roomnum); gSPMatrix(gdl++, &g_RoomMtxMatrices[index], G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); return gdl; } -struct coord *roomGetPosPtr(s32 room) +struct coord *room_get_pos_ptr(s32 room) { return &g_BgRooms[room].pos; } -void roomGetPos(s32 room, struct coord *pos) +void room_get_pos(s32 room, struct coord *pos) { pos->x = g_BgRooms[room].pos.x; pos->y = g_BgRooms[room].pos.y; diff --git a/src/game/roomreset.c b/src/game/roomreset.c index d02e12820..c62a8dcad 100644 --- a/src/game/roomreset.c +++ b/src/game/roomreset.c @@ -8,17 +8,17 @@ #include "data.h" #include "types.h" -void roomsReset(void) +void rooms_reset(void) { s32 i; g_RoomMtxNumSlots = PLAYERCOUNT() >= 2 ? 200 : 120; - g_RoomMtxAges = mempAlloc(ALIGN16(g_RoomMtxNumSlots), MEMPOOL_STAGE); - g_RoomMtxLinkedRooms = mempAlloc(ALIGN16(g_RoomMtxNumSlots * sizeof(*g_RoomMtxLinkedRooms)), MEMPOOL_STAGE); - g_RoomMtxBaseRooms = mempAlloc(ALIGN16(g_RoomMtxNumSlots * sizeof(*g_RoomMtxBaseRooms)), MEMPOOL_STAGE); - g_RoomMtxScales = mempAlloc(ALIGN16(g_RoomMtxNumSlots * sizeof(*g_RoomMtxScales)), MEMPOOL_STAGE); - g_RoomMtxMatrices = mempAlloc(ALIGN16(g_RoomMtxNumSlots * sizeof(*g_RoomMtxMatrices)), MEMPOOL_STAGE); + g_RoomMtxAges = memp_alloc(ALIGN16(g_RoomMtxNumSlots), MEMPOOL_STAGE); + g_RoomMtxLinkedRooms = memp_alloc(ALIGN16(g_RoomMtxNumSlots * sizeof(*g_RoomMtxLinkedRooms)), MEMPOOL_STAGE); + g_RoomMtxBaseRooms = memp_alloc(ALIGN16(g_RoomMtxNumSlots * sizeof(*g_RoomMtxBaseRooms)), MEMPOOL_STAGE); + g_RoomMtxScales = memp_alloc(ALIGN16(g_RoomMtxNumSlots * sizeof(*g_RoomMtxScales)), MEMPOOL_STAGE); + g_RoomMtxMatrices = memp_alloc(ALIGN16(g_RoomMtxNumSlots * sizeof(*g_RoomMtxMatrices)), MEMPOOL_STAGE); for (i = 0; i < PLAYERCOUNT(); i++) { g_Vars.players[i]->lastroomforoffset = -1; diff --git a/src/game/roomtick.c b/src/game/roomtick.c index 50b63c118..f98a4f3d7 100644 --- a/src/game/roomtick.c +++ b/src/game/roomtick.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void roomsTick(void) +void rooms_tick(void) { s32 i; @@ -14,7 +14,7 @@ void roomsTick(void) g_RoomMtxAges[i]++; if (g_RoomMtxAges[i] >= NUM_GFXTASKS) { - roomFreeMtx(i); + room_free_mtx(i); } } } diff --git a/src/game/savebuffer.c b/src/game/savebuffer.c index b7fb2aef3..eda776feb 100644 --- a/src/game/savebuffer.c +++ b/src/game/savebuffer.c @@ -28,17 +28,17 @@ void func0f0d4690(Mtxf *mtx) { struct coord pos; - mtx4LoadIdentity(mtx); + mtx4_load_identity(mtx); pos.x = -159.75f; pos.y = PAL ? 136.25f : 120.25f; pos.z = 0; - pos.x = (.5f - viGetWidth()) * 0.5f; - pos.y = (.5f + viGetHeight()) * 0.5f; + pos.x = (.5f - vi_get_width()) * 0.5f; + pos.y = (.5f + vi_get_height()) * 0.5f; pos.z = 0; - mtx4SetTranslation(&pos, mtx); + mtx4_set_translation(&pos, mtx); mtx00015e4c(-1, mtx); if (g_ScaleX == 2) { @@ -59,20 +59,20 @@ Gfx *func0f0d479c(Gfx *gdl) Mtxf *mtx1; Mtxf *mtx2; - mtx1 = gfxAllocateMatrix(); - mtx2 = gfxAllocateMatrix(); + mtx1 = gfx_allocate_matrix(); + mtx2 = gfx_allocate_matrix(); mtx00016760(); func0f0d475c(&mtx); - mtxF2L(&mtx, mtx2); - mtx4LoadIdentity(&mtx); + mtx_f2l(&mtx, mtx2); + mtx4_load_identity(&mtx); guFrustumF(mtx.m, - -(f32) viGetWidth() * 0.5f, viGetWidth() * 0.5f, - -(f32) viGetHeight() * 0.5f, viGetHeight() * 0.5f, + -(f32) vi_get_width() * 0.5f, vi_get_width() * 0.5f, + -(f32) vi_get_height() * 0.5f, vi_get_height() * 0.5f, 10, 10000, 1); - mtxF2L(&mtx, mtx1); + mtx_f2l(&mtx, mtx1); mtx00016784(); gSPMatrix(gdl++, osVirtualToPhysical(mtx2), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -81,16 +81,16 @@ Gfx *func0f0d479c(Gfx *gdl) #if VERSION >= VERSION_NTSC_1_0 if (var80070f10 == NULL) { u32 size = align16(sizeof(Vp)); - var80070f10 = gfxAllocate(size); + var80070f10 = gfx_allocate(size); if (var80070f10 != NULL) { - var80070f10->vp.vscale[0] = viGetWidth() << 1; - var80070f10->vp.vscale[1] = viGetHeight() << 1; + var80070f10->vp.vscale[0] = vi_get_width() << 1; + var80070f10->vp.vscale[1] = vi_get_height() << 1; var80070f10->vp.vscale[2] = 1; var80070f10->vp.vscale[3] = 0; - var80070f10->vp.vtrans[0] = viGetWidth() << 1; - var80070f10->vp.vtrans[1] = viGetHeight() << 1; + var80070f10->vp.vtrans[0] = vi_get_width() << 1; + var80070f10->vp.vtrans[1] = vi_get_height() << 1; var80070f10->vp.vtrans[2] = 0x1ff; var80070f10->vp.vtrans[3] = 0; } @@ -108,13 +108,13 @@ Gfx *func0f0d479c(Gfx *gdl) var80070f10.vp.vtrans[2] = 0x1ff; var80070f10.vp.vtrans[3] = 0; - var80070f10.vp.vscale[0] = viGetWidth() << 1; - var80070f10.vp.vscale[1] = viGetHeight() << 1; + var80070f10.vp.vscale[0] = vi_get_width() << 1; + var80070f10.vp.vscale[1] = vi_get_height() << 1; var80070f10.vp.vscale[2] = 1; var80070f10.vp.vscale[3] = 0; - var80070f10.vp.vtrans[0] = viGetWidth() << 1; - var80070f10.vp.vtrans[1] = viGetHeight() << 1; + var80070f10.vp.vtrans[0] = vi_get_width() << 1; + var80070f10.vp.vtrans[1] = vi_get_height() << 1; var80070f10.vp.vtrans[2] = 0x1ff; var80070f10.vp.vtrans[3] = 0; @@ -128,8 +128,8 @@ Gfx *func0f0d479c(Gfx *gdl) Gfx *func0f0d49c8(Gfx *gdl) { - gSPViewport(gdl++, OS_K0_TO_PHYSICAL(viGetCurrentPlayerViewport())); - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPViewport(gdl++, OS_K0_TO_PHYSICAL(vi_get_current_player_viewport())); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); return gdl; } @@ -137,14 +137,14 @@ Gfx *func0f0d49c8(Gfx *gdl) Gfx *func0f0d4a3c(Gfx *gdl, s32 arg1) { Mtxf mtx; - Mtxf *mtxptr = gfxAllocateMatrix(); + Mtxf *mtxptr = gfx_allocate_matrix(); gDPPipeSync(gdl++); if (arg1 == 0) { - texSelect(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL); } else if (arg1 == 1) { - texSelect(&gdl, &g_TexGeneralConfigs[11], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[11], 2, 0, 2, 1, NULL); } gDPPipeSync(gdl++); @@ -160,7 +160,7 @@ Gfx *func0f0d4a3c(Gfx *gdl, s32 arg1) gDPSetTexturePersp(gdl++, G_TP_PERSP); func0f0d4690(&mtx); - mtxF2L(&mtx, mtxptr); + mtx_f2l(&mtx, mtxptr); gSPMatrix(gdl++, osVirtualToPhysical(mtxptr), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -170,19 +170,19 @@ Gfx *func0f0d4a3c(Gfx *gdl, s32 arg1) Gfx *func0f0d4c80(Gfx *gdl) { Mtxf mtx; - Mtxf *mtxptr = gfxAllocateMatrix(); + Mtxf *mtxptr = gfx_allocate_matrix(); func0f0d4690(&mtx); mtx00015df0(0.1f, &mtx); mtx00015e4c(0.1f, &mtx); - mtxF2L(&mtx, mtxptr); + mtx_f2l(&mtx, mtxptr); gSPMatrix(gdl++, osVirtualToPhysical(mtxptr), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); return gdl; } -Gfx *menugfxDrawPlane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, s32 type) +Gfx *menugfx_draw_plane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, s32 type) { Col *colours; Vtx *vertices; @@ -203,13 +203,13 @@ Gfx *menugfxDrawPlane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 static u32 txmul = 20; static u32 rsub = 5; - colours = gfxAllocateColours(2); - vertices = gfxAllocateVertices(4); + colours = gfx_allocate_colours(2); + vertices = gfx_allocate_vertices(4); sp34 = 1.0f; sp30 = 1.0f; - mainOverrideVariable("txmul", &txmul); + main_override_variable("txmul", &txmul); if (y1 < var8009de90 && y2 < var8009de90) { return gdl; @@ -244,7 +244,7 @@ Gfx *menugfxDrawPlane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 sp30 = 2.0f; } - mainOverrideVariable("depthsub", &depthsub); + main_override_variable("depthsub", &depthsub); a1 = 200; @@ -300,7 +300,7 @@ Gfx *menugfxDrawPlane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 } if (type == MENUPLANE_07) { - mainOverrideVariable("rsub", &rsub); + main_override_variable("rsub", &rsub); a1 = -rsub; @@ -378,7 +378,7 @@ Gfx *menugfxDrawPlane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 * * This function only sets bits to on and does not unset them. */ -void savebufferOr(struct savebuffer *buffer, u32 value, s32 numbits) +void savebuffer_or(struct savebuffer *buffer, u32 value, s32 numbits) { u32 bit = 1 << (numbits - 1); @@ -401,7 +401,7 @@ void savebufferOr(struct savebuffer *buffer, u32 value, s32 numbits) * * numbits is expected to be 32 or less. */ -void savebufferWriteBits(struct savebuffer *buffer, u32 value, s32 numbits, u8 *dst) +void savebuffer_write_bits(struct savebuffer *buffer, u32 value, s32 numbits, u8 *dst) { u32 bit = 1 << (numbits - 1); @@ -427,7 +427,7 @@ void savebufferWriteBits(struct savebuffer *buffer, u32 value, s32 numbits, u8 * * * numbits is expected to be 32 or less. */ -u32 savebufferReadBits(struct savebuffer *buffer, s32 numbits) +u32 savebuffer_read_bits(struct savebuffer *buffer, s32 numbits) { u32 bit = 1 << (numbits - 1); u32 value = 0; @@ -447,7 +447,7 @@ u32 savebufferReadBits(struct savebuffer *buffer, s32 numbits) return value; } -void savebufferClear(struct savebuffer *buffer) +void savebuffer_clear(struct savebuffer *buffer) { s32 i; @@ -481,14 +481,14 @@ void func0f0d54c4(struct savebuffer *buffer) * Read a zero-terminated string from the buffer and move the buffer's internal * pointer past the end of the string. */ -void savebufferReadString(struct savebuffer *buffer, char *dst, bool addlinebreak) +void savebuffer_read_string(struct savebuffer *buffer, char *dst, bool addlinebreak) { bool foundnull = false; s32 index = 0; s32 i; for (i = 0; i < 10; i++) { - s32 byte = savebufferReadBits(buffer, 8); + s32 byte = savebuffer_read_bits(buffer, 8); if (!foundnull) { if (byte == '\0') { @@ -522,12 +522,12 @@ void func0f0d55a4(struct savebuffer *buffer, char *src) done = true; } else { u32 c = src[i]; - savebufferOr(buffer, c, 8); + savebuffer_or(buffer, c, 8); } } if (done) { - savebufferOr(buffer, '\0', 8); + savebuffer_or(buffer, '\0', 8); } } } @@ -537,7 +537,7 @@ void func0f0d564c(u8 *data, char *dst, bool addlinebreak) struct savebuffer buffer; func0f0d5484(&buffer, data, 10); - savebufferReadString(&buffer, dst, addlinebreak); + savebuffer_read_string(&buffer, dst, addlinebreak); } #if VERSION >= VERSION_NTSC_1_0 @@ -557,30 +557,30 @@ void func0f0d5690(u8 *dst, char *src) done = true; } else { u32 c = src[i]; - savebufferWriteBits(&buffer, c, 8, dst); + savebuffer_write_bits(&buffer, c, 8, dst); } } if (done) { - savebufferWriteBits(&buffer, '\0', 8, dst); + savebuffer_write_bits(&buffer, '\0', 8, dst); } } } #endif -void savebufferWriteGuid(struct savebuffer *buffer, struct fileguid *guid) +void savebuffer_write_guid(struct savebuffer *buffer, struct fileguid *guid) { - savebufferOr(buffer, guid->fileid, 7); - savebufferOr(buffer, guid->deviceserial, 13); + savebuffer_or(buffer, guid->fileid, 7); + savebuffer_or(buffer, guid->deviceserial, 13); } -void savebufferReadGuid(struct savebuffer *buffer, struct fileguid *guid) +void savebuffer_read_guid(struct savebuffer *buffer, struct fileguid *guid) { - guid->fileid = savebufferReadBits(buffer, 7); - guid->deviceserial = savebufferReadBits(buffer, 13); + guid->fileid = savebuffer_read_bits(buffer, 7); + guid->deviceserial = savebuffer_read_bits(buffer, 13); } -void formatTime(char *dst, s32 time60, s32 precision) +void format_time(char *dst, s32 time60, s32 precision) { s32 parts[5]; bool donefirst = false; diff --git a/src/game/setup.c b/src/game/setup.c index d20458f66..f3ab34322 100644 --- a/src/game/setup.c +++ b/src/game/setup.c @@ -171,7 +171,7 @@ u32 var80061be4 = 0x00000000; u32 var80061be8 = 0x00000000; u32 var80061bec = 0x00000000; -void propsReset(void) +void props_reset(void) { s32 i; @@ -195,8 +195,8 @@ void propsReset(void) g_MaxEmbedments = 0; } - setupReset0f00cc8c(); - setupResetProxyMines(); + setup_reset_0f00cc8c(); + setup_reset_proxy_mines(); g_AlarmTimer = 0; g_AlarmAudioHandle = NULL; @@ -221,7 +221,7 @@ void propsReset(void) if (g_MaxWeaponSlots == 0) { g_WeaponSlots = NULL; } else { - g_WeaponSlots = mempAlloc(ALIGN16(g_MaxWeaponSlots * sizeof(struct weaponobj)), MEMPOOL_STAGE); + g_WeaponSlots = memp_alloc(ALIGN16(g_MaxWeaponSlots * sizeof(struct weaponobj)), MEMPOOL_STAGE); for (i = 0; i < g_MaxWeaponSlots; i++) { g_WeaponSlots[i].base.prop = NULL; @@ -233,7 +233,7 @@ void propsReset(void) if (g_MaxHatSlots == 0) { g_HatSlots = NULL; } else { - g_HatSlots = mempAlloc(ALIGN16(g_MaxHatSlots * sizeof(struct hatobj)), MEMPOOL_STAGE); + g_HatSlots = memp_alloc(ALIGN16(g_MaxHatSlots * sizeof(struct hatobj)), MEMPOOL_STAGE); for (i = 0; i < g_MaxHatSlots; i++) { g_HatSlots[i].base.prop = NULL; @@ -245,7 +245,7 @@ void propsReset(void) if (g_MaxAmmoCrates == 0) { g_AmmoCrates = NULL; } else { - g_AmmoCrates = mempAlloc(ALIGN16(g_MaxAmmoCrates * sizeof(struct ammocrateobj)), MEMPOOL_STAGE); + g_AmmoCrates = memp_alloc(ALIGN16(g_MaxAmmoCrates * sizeof(struct ammocrateobj)), MEMPOOL_STAGE); for (i = 0; i < g_MaxAmmoCrates; i++) { g_AmmoCrates[i].base.prop = NULL; @@ -255,7 +255,7 @@ void propsReset(void) if (g_MaxDebrisSlots == 0) { g_DebrisSlots = NULL; } else { - g_DebrisSlots = mempAlloc(ALIGN16(g_MaxDebrisSlots * sizeof(struct defaultobj)), MEMPOOL_STAGE); + g_DebrisSlots = memp_alloc(ALIGN16(g_MaxDebrisSlots * sizeof(struct defaultobj)), MEMPOOL_STAGE); for (i = 0; i < g_MaxDebrisSlots; i++) { g_DebrisSlots[i].prop = NULL; @@ -265,7 +265,7 @@ void propsReset(void) if (g_MaxProjectiles == 0) { g_Projectiles = NULL; } else { - g_Projectiles = mempAlloc(ALIGN16(g_MaxProjectiles * sizeof(struct projectile)), MEMPOOL_STAGE); + g_Projectiles = memp_alloc(ALIGN16(g_MaxProjectiles * sizeof(struct projectile)), MEMPOOL_STAGE); for (i = 0; i < g_MaxProjectiles; i++) { g_Projectiles[i].flags = PROJECTILEFLAG_FREE; @@ -275,7 +275,7 @@ void propsReset(void) if (g_MaxEmbedments == 0) { g_Embedments = NULL; } else { - g_Embedments = mempAlloc(ALIGN16(g_MaxEmbedments * sizeof(struct embedment)), MEMPOOL_STAGE); + g_Embedments = memp_alloc(ALIGN16(g_MaxEmbedments * sizeof(struct embedment)), MEMPOOL_STAGE); for (i = 0; i < g_MaxEmbedments; i++) { g_Embedments[i].flags = EMBEDMENTFLAG_FREE; @@ -299,45 +299,45 @@ void propsReset(void) g_MaxThrownLaptops = g_Vars.normmplayerisrunning ? 12 : PLAYERCOUNT(); - g_ThrownLaptops = mempAlloc(ALIGN16(g_MaxThrownLaptops * sizeof(struct autogunobj)), MEMPOOL_STAGE); - g_ThrownLaptopBeams = mempAlloc(ALIGN16(g_MaxThrownLaptops * sizeof(struct beam)), MEMPOOL_STAGE); + g_ThrownLaptops = memp_alloc(ALIGN16(g_MaxThrownLaptops * sizeof(struct autogunobj)), MEMPOOL_STAGE); + g_ThrownLaptopBeams = memp_alloc(ALIGN16(g_MaxThrownLaptops * sizeof(struct beam)), MEMPOOL_STAGE); for (i = 0; i < g_MaxThrownLaptops; i++) { g_ThrownLaptops[i].base.prop = NULL; } } -void setupCreateLiftDoor(struct linkliftdoorobj *link) +void setup_create_lift_door(struct linkliftdoorobj *link) { link->next = g_LiftDoors; g_LiftDoors = link; } -void setupCreatePadlockedDoor(struct padlockeddoorobj *link) +void setup_create_padlocked_door(struct padlockeddoorobj *link) { link->next = g_PadlockedDoors; g_PadlockedDoors = link; } -void setupCreateSafeItem(struct safeitemobj *link) +void setup_create_safe_item(struct safeitemobj *link) { link->next = g_SafeItems; g_SafeItems = link; } -void setupCreateConditionalScenery(struct linksceneryobj *link) +void setup_create_conditional_scenery(struct linksceneryobj *link) { link->next = g_LinkedScenery; g_LinkedScenery = link; } -void setupCreateBlockedPath(struct blockedpathobj *blockedpath) +void setup_create_blocked_path(struct blockedpathobj *blockedpath) { blockedpath->next = g_BlockedPaths; g_BlockedPaths = blockedpath; } -void setupReset0f00cc8c(void) +void setup_reset_0f00cc8c(void) { struct tvscreen tmp1; struct tvscreen tmp2; @@ -353,7 +353,7 @@ void setupReset0f00cc8c(void) var8009cf88 = tmp3; } -void setupResetProxyMines(void) +void setup_reset_proxy_mines(void) { s32 i; @@ -362,7 +362,7 @@ void setupResetProxyMines(void) } } -s32 setupCountCommandType(u32 type) +s32 setup_count_command_type(u32 type) { struct defaultobj *obj = (struct defaultobj *)g_StageSetup.props; s32 count = 0; @@ -373,14 +373,14 @@ s32 setupCountCommandType(u32 type) count++; } - obj = (struct defaultobj *)((u32 *)obj + setupGetCmdLength((u32 *)obj)); + obj = (struct defaultobj *)((u32 *)obj + setup_get_cmd_length((u32 *)obj)); } } return count; } -void setupCreateObject(struct defaultobj *obj, s32 cmdindex) +void setup_create_object(struct defaultobj *obj, s32 cmdindex) { f32 f0; s32 modelnum; @@ -397,7 +397,7 @@ void setupCreateObject(struct defaultobj *obj, s32 cmdindex) struct prop *prop; modelnum = obj->modelnum; - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); scale = obj->extrascale * (1.0f / 256.0f); if (g_Vars.normmplayerisrunning || g_Vars.lvmpbotlevel) { @@ -408,39 +408,39 @@ void setupCreateObject(struct defaultobj *obj, s32 cmdindex) if (obj->type == OBJTYPE_WEAPON) { func0f08ae0c((struct weaponobj *)obj, g_ModelStates[modelnum].modeldef); } else { - objInitWithModelDef(obj, g_ModelStates[modelnum].modeldef); + obj_init_with_model_def(obj, g_ModelStates[modelnum].modeldef); } - modelSetScale(obj->model, obj->model->scale * scale); + model_set_scale(obj->model, obj->model->scale * scale); return; } if (obj->flags & OBJFLAG_ASSIGNEDTOCHR) { - chr = chrFindByLiteralId(obj->pad); + chr = chr_find_by_literal_id(obj->pad); if (chr && chr->prop && chr->model) { if (obj->type == OBJTYPE_WEAPON) { prop = func0f08ae0c((struct weaponobj *)obj, g_ModelStates[modelnum].modeldef); } else { - prop = objInitWithModelDef(obj, g_ModelStates[modelnum].modeldef); + prop = obj_init_with_model_def(obj, g_ModelStates[modelnum].modeldef); } - modelSetScale(obj->model, obj->model->scale * scale); - propReparent(prop, chr->prop); + model_set_scale(obj->model, obj->model->scale * scale); + prop_reparent(prop, chr->prop); } } else { if (obj->pad < 0) { if (obj->type == OBJTYPE_WEAPON) { func0f08ae0c((struct weaponobj *)obj, g_ModelStates[modelnum].modeldef); } else { - objInitWithModelDef(obj, g_ModelStates[modelnum].modeldef); + obj_init_with_model_def(obj, g_ModelStates[modelnum].modeldef); } - modelSetScale(obj->model, obj->model->scale * scale); + model_set_scale(obj->model, obj->model->scale * scale); return; } - padUnpack(obj->pad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_BBOX | PADFIELD_ROOM, &pad); + pad_unpack(obj->pad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_BBOX | PADFIELD_ROOM, &pad); if (pad.room > 0) { mtx00016d58(&mtx, 0, 0, 0, -pad.look.x, -pad.look.y, -pad.look.z, pad.up.x, pad.up.y, pad.up.z); @@ -452,7 +452,7 @@ void setupCreateObject(struct defaultobj *obj, s32 cmdindex) rooms[0] = pad.room; rooms[1] = -1; - if (!padHasBboxData(obj->pad)) { + if (!pad_has_bbox_data(obj->pad)) { if (obj->flags & OBJFLAG_00000002) { centre.x = pad.pos.x; centre.y = pad.pos.y; @@ -463,7 +463,7 @@ void setupCreateObject(struct defaultobj *obj, s32 cmdindex) centre.z = pad.pos.z; } } else { - padGetCentre(obj->pad, ¢re); + pad_get_centre(obj->pad, ¢re); centre.x += (pad.bbox.ymin - pad.bbox.ymax) * 0.5f * pad.up.x; centre.y += (pad.bbox.ymin - pad.bbox.ymax) * 0.5f * pad.up.y; centre.z += (pad.bbox.ymin - pad.bbox.ymax) * 0.5f * pad.up.z; @@ -472,11 +472,11 @@ void setupCreateObject(struct defaultobj *obj, s32 cmdindex) if (obj->type == OBJTYPE_WEAPON) { prop2 = func0f08ae0c((struct weaponobj *)obj, g_ModelStates[modelnum].modeldef); } else { - prop2 = objInitWithAutoModel(obj); + prop2 = obj_init_with_auto_model(obj); } - if (padHasBboxData(obj->pad)) { - struct modelrodata_bbox *bbox = objFindBboxRodata(obj); + if (pad_has_bbox_data(obj->pad)) { + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(obj); if (bbox != NULL) { f32 xscale = 1.0f; @@ -579,11 +579,11 @@ void setupCreateObject(struct defaultobj *obj, s32 cmdindex) mtx00015e80(yscale, &mtx); mtx00015edc(zscale, &mtx); - modelSetScale(obj->model, obj->model->scale * maxscale); + model_set_scale(obj->model, obj->model->scale * maxscale); } } - modelSetScale(obj->model, obj->model->scale * scale); + model_set_scale(obj->model, obj->model->scale * scale); mtx00015f04(obj->model->scale, &mtx); if (obj->flags2 & OBJFLAG2_DONTPAUSE) { @@ -597,12 +597,12 @@ void setupCreateObject(struct defaultobj *obj, s32 cmdindex) } if (obj->hidden & OBJHFLAG_00008000) { - propActivateThisFrame(prop2); + prop_activate_this_frame(prop2); } else { - propActivate(prop2); + prop_activate(prop2); } - propEnable(prop2); + prop_enable(prop2); } } } @@ -615,37 +615,37 @@ void setupCreateObject(struct defaultobj *obj, s32 cmdindex) * The Marquis of Queensbury Rules (everyone unarmed) and Enemy Rockets cheats * are implemented here. */ -void setupPlaceWeapon(struct weaponobj *weapon, s32 cmdindex) +void setup_place_weapon(struct weaponobj *weapon, s32 cmdindex) { if (weapon->base.flags & OBJFLAG_ASSIGNEDTOCHR) { u32 stack[2]; - struct chrdata *chr = chrFindByLiteralId(weapon->base.pad); + struct chrdata *chr = chr_find_by_literal_id(weapon->base.pad); if (chr && chr->prop && chr->model) { - if (cheatIsActive(CHEAT_MARQUIS)) { + if (cheat_is_active(CHEAT_MARQUIS)) { // NTSC 1.0 and newer simplifies the Marquis logic #if VERSION >= VERSION_NTSC_1_0 weapon->base.flags &= ~OBJFLAG_DEACTIVATED; weapon->base.flags |= OBJFLAG_WEAPON_AICANNOTUSE; - modelmgrLoadProjectileModeldefs(weapon->weaponnum); + modelmgr_load_projectile_modeldefs(weapon->weaponnum); func0f08b25c(weapon, chr); #else if (g_Vars.stagenum == STAGE_INVESTIGATION - && lvGetDifficulty() == DIFF_PA + && lv_get_difficulty() == DIFF_PA && weapon->weaponnum == WEAPON_K7AVENGER) { - modelmgrLoadProjectileModeldefs(weapon->weaponnum); + modelmgr_load_projectile_modeldefs(weapon->weaponnum); func0f08b25c(weapon, chr); } else if (g_Vars.stagenum == STAGE_ATTACKSHIP) { weapon->base.flags &= ~OBJFLAG_DEACTIVATED; weapon->base.flags |= OBJFLAG_WEAPON_AICANNOTUSE; - modelmgrLoadProjectileModeldefs(weapon->weaponnum); + modelmgr_load_projectile_modeldefs(weapon->weaponnum); func0f08b25c(weapon, chr); } else { weapon->weaponnum = WEAPON_NONE; } #endif } else { - if (cheatIsActive(CHEAT_ENEMYROCKETS)) { + if (cheat_is_active(CHEAT_ENEMYROCKETS)) { switch (weapon->weaponnum) { case WEAPON_FALCON2: case WEAPON_FALCON2_SILENCER: @@ -686,7 +686,7 @@ void setupPlaceWeapon(struct weaponobj *weapon, s32 cmdindex) // Don't replace the K7 guard's weapon in Investigation // because it would make an objective impossible. // @bug: It's still replaced on PD mode difficulty. - if (g_Vars.stagenum != STAGE_INVESTIGATION || lvGetDifficulty() != DIFF_PA) { + if (g_Vars.stagenum != STAGE_INVESTIGATION || lv_get_difficulty() != DIFF_PA) { weapon->weaponnum = WEAPON_ROCKETLAUNCHER; weapon->base.modelnum = MODEL_CHRDYROCKET; weapon->base.extrascale = 256; @@ -695,7 +695,7 @@ void setupPlaceWeapon(struct weaponobj *weapon, s32 cmdindex) } } - modelmgrLoadProjectileModeldefs(weapon->weaponnum); + modelmgr_load_projectile_modeldefs(weapon->weaponnum); func0f08b25c(weapon, chr); } } @@ -726,7 +726,7 @@ void setupPlaceWeapon(struct weaponobj *weapon, s32 cmdindex) case WEAPON_MPLOCATION14: case WEAPON_MPLOCATION15: locationindex = weapon->weaponnum - WEAPON_MPLOCATION00; - mpweapon = mpGetMpWeaponByLocation(locationindex); + mpweapon = mp_get_mp_weapon_by_location(locationindex); g_SetupCurMpLocation = locationindex; weapon->weaponnum = mpweapon->weaponnum; weapon->base.modelnum = mpweapon->model; @@ -741,7 +741,7 @@ void setupPlaceWeapon(struct weaponobj *weapon, s32 cmdindex) shield->base.flags2 |= OBJFLAG2_IMMUNETOEXPLOSIONS | OBJFLAG2_IMMUNETOGUNFIRE; shield->initialamount = 1; shield->amount = 1; - setupCreateObject(&shield->base, cmdindex); + setup_create_object(&shield->base, cmdindex); createweapon = false; } break; @@ -749,35 +749,35 @@ void setupPlaceWeapon(struct weaponobj *weapon, s32 cmdindex) } if (weapon->weaponnum != WEAPON_NONE && createweapon) { - modelmgrLoadProjectileModeldefs(weapon->weaponnum); - setupCreateObject(&weapon->base, cmdindex); + modelmgr_load_projectile_modeldefs(weapon->weaponnum); + setup_create_object(&weapon->base, cmdindex); } } } -void setupCreateHat(struct hatobj *hat, s32 cmdindex) +void setup_create_hat(struct hatobj *hat, s32 cmdindex) { if (hat->base.flags & OBJFLAG_ASSIGNEDTOCHR) { - struct chrdata *chr = chrFindByLiteralId(hat->base.pad); + struct chrdata *chr = chr_find_by_literal_id(hat->base.pad); if (chr && chr->prop && chr->model) { - hatAssignToChr(hat, chr); + hat_assign_to_chr(hat, chr); } } else { - setupCreateObject(&hat->base, cmdindex); + setup_create_object(&hat->base, cmdindex); } } -void setupCreateKey(struct keyobj *key, s32 cmdindex) +void setup_create_key(struct keyobj *key, s32 cmdindex) { - setupCreateObject(&key->base, cmdindex); + setup_create_object(&key->base, cmdindex); } -void setupCreateMine(struct mineobj *mine, s32 cmdindex) +void setup_create_mine(struct mineobj *mine, s32 cmdindex) { mine->base.type = OBJTYPE_WEAPON; - setupCreateObject(&mine->base, cmdindex); + setup_create_object(&mine->base, cmdindex); if (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) { mine->base.hidden = (mine->base.hidden & 0x0fffffff) | (2 << 28); @@ -786,21 +786,21 @@ void setupCreateMine(struct mineobj *mine, s32 cmdindex) mine->base.prop->forcetick = true; } -void setupCreateCctv(struct cctvobj *cctv, s32 cmdindex) +void setup_create_cctv(struct cctvobj *cctv, s32 cmdindex) { struct defaultobj *obj = &cctv->base; - setupCreateObject(obj, cmdindex); + setup_create_object(obj, cmdindex); if (cctv->lookatpadnum >= 0) { struct coord lenspos; - union modelrodata *lens = modelGetPartRodata(obj->model->definition, MODELPART_CCTV_CASING); + union modelrodata *lens = model_get_part_rodata(obj->model->definition, MODELPART_CCTV_CASING); struct pad pad; f32 xdiff; f32 ydiff; f32 zdiff; - padUnpack(cctv->lookatpadnum, PADFIELD_POS, &pad); + pad_unpack(cctv->lookatpadnum, PADFIELD_POS, &pad); lenspos.x = lens->position.pos.x; lenspos.y = lens->position.pos.y; @@ -842,9 +842,9 @@ void setupCreateCctv(struct cctvobj *cctv, s32 cmdindex) } } -void setupCreateAutogun(struct autogunobj *autogun, s32 cmdindex) +void setup_create_autogun(struct autogunobj *autogun, s32 cmdindex) { - setupCreateObject(&autogun->base, cmdindex); + setup_create_object(&autogun->base, cmdindex); autogun->maxspeed = *(s32 *)&autogun->maxspeed * PALUPF(M_BADTAU) / 65536.0f; autogun->aimdist = *(s32 *)&autogun->aimdist * 100.0f / 65536.0f; @@ -863,7 +863,7 @@ void setupCreateAutogun(struct autogunobj *autogun, s32 cmdindex) autogun->xzero = 0; autogun->barrelspeed = 0; autogun->barrelrot = 0; - autogun->beam = mempAlloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE); + autogun->beam = memp_alloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE); autogun->beam->age = -1; autogun->firing = false; autogun->ammoquantity = 255; @@ -877,7 +877,7 @@ void setupCreateAutogun(struct autogunobj *autogun, s32 cmdindex) u32 stack2; struct pad pad; - padUnpack(autogun->targetpad, PADFIELD_POS, &pad); + pad_unpack(autogun->targetpad, PADFIELD_POS, &pad); xdiff = pad.pos.x - autogun->base.prop->pos.x; ydiff = pad.pos.y - autogun->base.prop->pos.y; @@ -891,31 +891,31 @@ void setupCreateAutogun(struct autogunobj *autogun, s32 cmdindex) } } -void setupCreateHangingMonitors(struct hangingmonitorsobj *monitors, s32 cmdindex) +void setup_create_hanging_monitors(struct hangingmonitorsobj *monitors, s32 cmdindex) { - setupCreateObject(&monitors->base, cmdindex); + setup_create_object(&monitors->base, cmdindex); } -void setupCreateSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex) +void setup_create_single_monitor(struct singlemonitorobj *monitor, s32 cmdindex) { u32 stack[2]; monitor->screen = var8009ce98; - tvscreenSetImageByNum(&monitor->screen, monitor->imagenum); + tvscreen_set_image_by_num(&monitor->screen, monitor->imagenum); // In GE, monitors with a negative pad are hanging TVs which attach to a // hangingmonitors object, which is actually just the mount. In PD, hanging // monitors do not exist in the setup files so this code is unused. if (monitor->base.pad < 0 && (monitor->base.flags & OBJFLAG_INSIDEANOTHEROBJ) == 0) { s32 modelnum = monitor->base.modelnum; - struct defaultobj *owner = (struct defaultobj *)setupGetCmdByIndex(cmdindex + monitor->owneroffset); + struct defaultobj *owner = (struct defaultobj *)setup_get_cmd_by_index(cmdindex + monitor->owneroffset); struct prop *prop; f32 scale; struct coord spa4; Mtxf sp64; Mtxf sp24; - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); scale = monitor->base.extrascale * (1.0f / 256.0f); @@ -923,38 +923,38 @@ void setupCreateSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex) monitor->base.hidden2 |= OBJH2FLAG_CANREGEN; } - prop = objInitWithAutoModel(&monitor->base); - monitor->base.embedment = embedmentAllocate(); + prop = obj_init_with_auto_model(&monitor->base); + monitor->base.embedment = embedment_allocate(); if (prop && monitor->base.embedment) { monitor->base.hidden |= OBJHFLAG_EMBEDDED; - modelSetScale(monitor->base.model, monitor->base.model->scale * scale); + model_set_scale(monitor->base.model, monitor->base.model->scale * scale); monitor->base.model->attachedtomodel = owner->model; if (monitor->ownerpart == MODELPART_0000) { - monitor->base.model->attachedtonode = modelGetPart(owner->model->definition, MODELPART_0000); + monitor->base.model->attachedtonode = model_get_part(owner->model->definition, MODELPART_0000); } else if (monitor->ownerpart == MODELPART_0001) { - monitor->base.model->attachedtonode = modelGetPart(owner->model->definition, MODELPART_0001); + monitor->base.model->attachedtonode = model_get_part(owner->model->definition, MODELPART_0001); } else if (monitor->ownerpart == MODELPART_0002) { - monitor->base.model->attachedtonode = modelGetPart(owner->model->definition, MODELPART_0002); + monitor->base.model->attachedtonode = model_get_part(owner->model->definition, MODELPART_0002); } else { - monitor->base.model->attachedtonode = modelGetPart(owner->model->definition, MODELPART_0003); + monitor->base.model->attachedtonode = model_get_part(owner->model->definition, MODELPART_0003); } - propReparent(prop, owner->prop); - mtx4LoadXRotation(0.3664608001709f, &sp64); + prop_reparent(prop, owner->prop); + mtx4_load_x_rotation(0.3664608001709f, &sp64); mtx00015f04(monitor->base.model->scale / owner->model->scale, &sp64); - modelGetRootPosition(monitor->base.model, &spa4); + model_get_root_position(monitor->base.model, &spa4); spa4.x = -spa4.x; spa4.y = -spa4.y; spa4.z = -spa4.z; - mtx4LoadTranslation(&spa4, &sp24); + mtx4_load_translation(&spa4, &sp24); mtx00015be4(&sp64, &sp24, &monitor->base.embedment->matrix); } } else { - setupCreateObject(&monitor->base, cmdindex); + setup_create_object(&monitor->base, cmdindex); } if (monitor->base.prop && (monitor->base.flags & OBJFLAG_MONITOR_RENDERPOSTBG)) { @@ -962,24 +962,24 @@ void setupCreateSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex) } } -void setupCreateMultiMonitor(struct multimonitorobj *monitor, s32 cmdindex) +void setup_create_multi_monitor(struct multimonitorobj *monitor, s32 cmdindex) { monitor->screens[0] = var8009ce98; - tvscreenSetImageByNum(&monitor->screens[0], monitor->imagenums[0]); + tvscreen_set_image_by_num(&monitor->screens[0], monitor->imagenums[0]); monitor->screens[1] = var8009ce98; - tvscreenSetImageByNum(&monitor->screens[1], monitor->imagenums[1]); + tvscreen_set_image_by_num(&monitor->screens[1], monitor->imagenums[1]); monitor->screens[2] = var8009ce98; - tvscreenSetImageByNum(&monitor->screens[2], monitor->imagenums[2]); + tvscreen_set_image_by_num(&monitor->screens[2], monitor->imagenums[2]); monitor->screens[3] = var8009ce98; - tvscreenSetImageByNum(&monitor->screens[3], monitor->imagenums[3]); + tvscreen_set_image_by_num(&monitor->screens[3], monitor->imagenums[3]); - setupCreateObject(&monitor->base, cmdindex); + setup_create_object(&monitor->base, cmdindex); } -s32 setupGetPortalByPad(s32 padnum) +s32 setup_get_portal_by_pad(s32 padnum) { f32 mult; struct coord centre; @@ -987,8 +987,8 @@ s32 setupGetPortalByPad(s32 padnum) u32 stack; struct pad pad; - padGetCentre(padnum, ¢re); - padUnpack(padnum, PADFIELD_BBOX | PADFIELD_UP, &pad); + pad_get_centre(padnum, ¢re); + pad_unpack(padnum, PADFIELD_BBOX | PADFIELD_UP, &pad); mult = (pad.bbox.ymax - pad.bbox.ymin) * 0.5f + 10; @@ -1000,10 +1000,10 @@ s32 setupGetPortalByPad(s32 padnum) centre.y = centre.y - pad.up.y * mult; centre.z = centre.z - pad.up.z * mult; - return bgFindPortalBetweenPositions(¢re, &coord); + return bg_find_portal_between_positions(¢re, &coord); } -s32 setupGetPortalByDoorPad(s32 padnum) +s32 setup_get_portal_by_door_pad(s32 padnum) { f32 mult; struct coord centre; @@ -1011,8 +1011,8 @@ s32 setupGetPortalByDoorPad(s32 padnum) u32 stack; struct pad pad; - padGetCentre(padnum, ¢re); - padUnpack(padnum, PADFIELD_BBOX | PADFIELD_NORMAL, &pad); + pad_get_centre(padnum, ¢re); + pad_unpack(padnum, PADFIELD_BBOX | PADFIELD_NORMAL, &pad); mult = (pad.bbox.xmax - pad.bbox.xmin) * 0.5f + 10; @@ -1024,27 +1024,27 @@ s32 setupGetPortalByDoorPad(s32 padnum) centre.y = centre.y - pad.normal.y * mult; centre.z = centre.z - pad.normal.z * mult; - return bgFindPortalBetweenPositions(¢re, &coord); + return bg_find_portal_between_positions(¢re, &coord); } -void setupCreateDoor(struct doorobj *door, s32 cmdindex) +void setup_create_door(struct doorobj *door, s32 cmdindex) { f32 scale; s32 modelnum = door->base.modelnum; s32 portalnum = -1; struct pad pad; - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); if (door->doorflags & DOORFLAG_ROTATEDPAD) { - padRotateForDoor(door->base.pad); + pad_rotate_for_door(door->base.pad); } if (door->base.flags & OBJFLAG_DOOR_HASPORTAL) { - portalnum = setupGetPortalByDoorPad(door->base.pad); + portalnum = setup_get_portal_by_door_pad(door->base.pad); } - padUnpack(door->base.pad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX | PADFIELD_ROOM, &pad); + pad_unpack(door->base.pad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP | PADFIELD_NORMAL | PADFIELD_BBOX | PADFIELD_ROOM, &pad); if (g_DoorScale != 1) { pad.bbox.xmin *= g_DoorScale; @@ -1076,7 +1076,7 @@ void setupCreateDoor(struct doorobj *door, s32 cmdindex) } // Write the modified bbox into the pad file data - padCopyBboxFromPad(door->base.pad, &pad); + pad_copy_bbox_from_pad(door->base.pad, &pad); } if (pad.room > 0) { @@ -1094,17 +1094,17 @@ void setupCreateDoor(struct doorobj *door, s32 cmdindex) f32 zscale; struct modelrodata_bbox *bbox; - bbox = modeldefFindBboxRodata(g_ModelStates[modelnum].modeldef); + bbox = modeldef_find_bbox_rodata(g_ModelStates[modelnum].modeldef); mtx00016d58(&sp110, 0, 0, 0, -pad.look.x, -pad.look.y, -pad.look.z, pad.up.x, pad.up.y, pad.up.z); - mtx4LoadXRotation(RAD(90, 1.5705462694168f), &finalmtx); - mtx4LoadZRotation(RAD(90, 1.5705462694168f), &zrotmtx); - mtx4MultMtx4InPlace(&zrotmtx, &finalmtx); - mtx4MultMtx4InPlace(&sp110, &finalmtx); + mtx4_load_x_rotation(RAD(90, 1.5705462694168f), &finalmtx); + mtx4_load_z_rotation(RAD(90, 1.5705462694168f), &zrotmtx); + mtx4_mult_mtx4_in_place(&zrotmtx, &finalmtx); + mtx4_mult_mtx4_in_place(&sp110, &finalmtx); - padGetCentre(door->base.pad, ¢re); + pad_get_centre(door->base.pad, ¢re); xscale = (pad.bbox.ymax - pad.bbox.ymin) / (bbox->xmax - bbox->xmin); yscale = (pad.bbox.zmax - pad.bbox.zmin) / (bbox->ymax - bbox->ymin); @@ -1148,16 +1148,16 @@ void setupCreateDoor(struct doorobj *door, s32 cmdindex) // but at runtime it's a pointer. if (door->sibling) { siblingcmdindex = *(s32 *) &door->sibling + cmdindex; - door->sibling = (struct doorobj *) setupGetCmdByIndex(siblingcmdindex); + door->sibling = (struct doorobj *) setup_get_cmd_by_index(siblingcmdindex); } - prop = doorInit(door, &pos, &finalmtx, rooms, &sp54, ¢re); + prop = door_init(door, &pos, &finalmtx, rooms, &sp54, ¢re); if (door->base.flags & OBJFLAG_DOOR_HASPORTAL) { door->portalnum = portalnum; if (door->portalnum >= 0 && door->frac == 0) { - doorDeactivatePortal(door); + door_deactivate_portal(door); } } @@ -1172,17 +1172,17 @@ void setupCreateDoor(struct doorobj *door, s32 cmdindex) scale = zscale; } - modelSetScale(door->base.model, door->base.model->scale * scale); + model_set_scale(door->base.model, door->base.model->scale * scale); } - propActivate(prop); - propEnable(prop); + prop_activate(prop); + prop_enable(prop); } else { door->base.prop = NULL; } } -void setupCreateHov(struct defaultobj *obj, struct hov *hov) +void setup_create_hov(struct defaultobj *obj, struct hov *hov) { hov->bobycur = 0; hov->bobytarget = 0; @@ -1201,10 +1201,10 @@ void setupCreateHov(struct defaultobj *obj, struct hov *hov) hov->prevgroundframe60 = -1; } -void setupLoadBriefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing *briefing) +void setup_load_briefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing *briefing) { if (stagenum < STAGE_TITLE) { - s32 stageindex = stageGetIndex(stagenum); + s32 stageindex = stage_get_index(stagenum); struct defaultobj *start; u16 setupfilenum; s32 setupfilesize; @@ -1222,16 +1222,16 @@ void setupLoadBriefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing setupfilenum = g_Stages[stageindex].setupfileid; g_LoadType = LOADTYPE_LANG; - fileLoadToAddr(setupfilenum, FILELOADMETHOD_DEFAULT, buffer, bufferlen); + file_load_to_addr(setupfilenum, FILELOADMETHOD_DEFAULT, buffer, bufferlen); setup = (struct stagesetup *)buffer; - setupfilesize = fileGetLoadedSize(setupfilenum); + setupfilesize = file_get_loaded_size(setupfilenum); langbuffer = &buffer[setupfilesize]; langbufferlen = bufferlen - setupfilesize; - briefing->langbank = langGetLangBankIndexFromStagenum(stagenum); + briefing->langbank = lang_get_lang_bank_index_from_stagenum(stagenum); - langLoadToAddr(briefing->langbank, langbuffer, langbufferlen); + lang_load_to_addr(briefing->langbank, langbuffer, langbufferlen); start = (struct defaultobj *)((uintptr_t)setup + (u32)setup->props); @@ -1239,11 +1239,11 @@ void setupLoadBriefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing struct defaultobj *obj; s32 wanttype = BRIEFINGTYPE_TEXT_PA; - if (lvGetDifficulty() == DIFF_A) { + if (lv_get_difficulty() == DIFF_A) { wanttype = BRIEFINGTYPE_TEXT_A; } - if (lvGetDifficulty() == DIFF_SA) { + if (lv_get_difficulty() == DIFF_SA) { wanttype = BRIEFINGTYPE_TEXT_SA; } @@ -1279,13 +1279,13 @@ void setupLoadBriefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing break; } - obj = (struct defaultobj *)((u32 *)obj + setupGetCmdLength((u32 *)obj)); + obj = (struct defaultobj *)((u32 *)obj + setup_get_cmd_length((u32 *)obj)); } } } } -void setupLoadFiles(s32 stagenum) +void setup_load_files(s32 stagenum) { s32 i; s32 j; @@ -1315,9 +1315,9 @@ void setupLoadFiles(s32 stagenum) g_LoadType = LOADTYPE_SETUP; - g_GeCreditsData = (u8 *)fileLoadToNew(filenum, FILELOADMETHOD_DEFAULT); + g_GeCreditsData = (u8 *)file_load_to_new(filenum, FILELOADMETHOD_DEFAULT); setup = (struct stagesetup *)g_GeCreditsData; - langLoad(langGetLangBankIndexFromStagenum(stagenum)); + lang_load(lang_get_lang_bank_index_from_stagenum(stagenum)); g_StageSetup.intro = (s32 *)((uintptr_t)setup + (u32)setup->intro); g_StageSetup.props = (u32 *)((uintptr_t)setup + (u32)setup->props); @@ -1326,7 +1326,7 @@ void setupLoadFiles(s32 stagenum) g_LoadType = LOADTYPE_PADS; - g_StageSetup.padfiledata = fileLoadToNew(g_Stages[g_StageIndex].padsfileid, FILELOADMETHOD_DEFAULT); + g_StageSetup.padfiledata = file_load_to_new(g_Stages[g_StageIndex].padsfileid, FILELOADMETHOD_DEFAULT); g_StageSetup.waypoints = NULL; g_StageSetup.waygroups = NULL; @@ -1388,7 +1388,7 @@ void setupLoadFiles(s32 stagenum) } // Count the number of chrs and objects so enough model slots can be allocated - numchrs += setupCountCommandType(OBJTYPE_CHR); + numchrs += setup_count_command_type(OBJTYPE_CHR); if (!g_Vars.normmplayerisrunning && g_MissionConfig.iscoop && g_Vars.numaibuddies > 0) { // @bug? The Hotshot buddy has two guns, but only one is counted here. @@ -1396,42 +1396,42 @@ void setupLoadFiles(s32 stagenum) numobjs += g_Vars.numaibuddies; // the buddy's weapon } - numobjs += setupCountCommandType(OBJTYPE_WEAPON); - numobjs += setupCountCommandType(OBJTYPE_KEY); - numobjs += setupCountCommandType(OBJTYPE_HAT); - numobjs += setupCountCommandType(OBJTYPE_DOOR); - numobjs += setupCountCommandType(OBJTYPE_CCTV); - numobjs += setupCountCommandType(OBJTYPE_AUTOGUN); - numobjs += setupCountCommandType(OBJTYPE_HANGINGMONITORS); - numobjs += setupCountCommandType(OBJTYPE_SINGLEMONITOR); - numobjs += setupCountCommandType(OBJTYPE_MULTIMONITOR); - numobjs += setupCountCommandType(OBJTYPE_SHIELD); - numobjs += setupCountCommandType(OBJTYPE_BASIC); - numobjs += setupCountCommandType(OBJTYPE_DEBRIS); - numobjs += setupCountCommandType(OBJTYPE_GLASS); - numobjs += setupCountCommandType(OBJTYPE_TINTEDGLASS); - numobjs += setupCountCommandType(OBJTYPE_SAFE); - numobjs += setupCountCommandType(OBJTYPE_29); - numobjs += setupCountCommandType(OBJTYPE_GASBOTTLE); - numobjs += setupCountCommandType(OBJTYPE_ALARM); - numobjs += setupCountCommandType(OBJTYPE_AMMOCRATE); - numobjs += setupCountCommandType(OBJTYPE_MULTIAMMOCRATE); - numobjs += setupCountCommandType(OBJTYPE_TRUCK); - numobjs += setupCountCommandType(OBJTYPE_TANK); - numobjs += setupCountCommandType(OBJTYPE_LIFT); - numobjs += setupCountCommandType(OBJTYPE_HOVERBIKE); - numobjs += setupCountCommandType(OBJTYPE_HOVERPROP); - numobjs += setupCountCommandType(OBJTYPE_FAN); - numobjs += setupCountCommandType(OBJTYPE_HOVERCAR); - numobjs += setupCountCommandType(OBJTYPE_CHOPPER); - numobjs += setupCountCommandType(OBJTYPE_HELI); - numobjs += setupCountCommandType(OBJTYPE_ESCASTEP); + numobjs += setup_count_command_type(OBJTYPE_WEAPON); + numobjs += setup_count_command_type(OBJTYPE_KEY); + numobjs += setup_count_command_type(OBJTYPE_HAT); + numobjs += setup_count_command_type(OBJTYPE_DOOR); + numobjs += setup_count_command_type(OBJTYPE_CCTV); + numobjs += setup_count_command_type(OBJTYPE_AUTOGUN); + numobjs += setup_count_command_type(OBJTYPE_HANGINGMONITORS); + numobjs += setup_count_command_type(OBJTYPE_SINGLEMONITOR); + numobjs += setup_count_command_type(OBJTYPE_MULTIMONITOR); + numobjs += setup_count_command_type(OBJTYPE_SHIELD); + numobjs += setup_count_command_type(OBJTYPE_BASIC); + numobjs += setup_count_command_type(OBJTYPE_DEBRIS); + numobjs += setup_count_command_type(OBJTYPE_GLASS); + numobjs += setup_count_command_type(OBJTYPE_TINTEDGLASS); + numobjs += setup_count_command_type(OBJTYPE_SAFE); + numobjs += setup_count_command_type(OBJTYPE_29); + numobjs += setup_count_command_type(OBJTYPE_GASBOTTLE); + numobjs += setup_count_command_type(OBJTYPE_ALARM); + numobjs += setup_count_command_type(OBJTYPE_AMMOCRATE); + numobjs += setup_count_command_type(OBJTYPE_MULTIAMMOCRATE); + numobjs += setup_count_command_type(OBJTYPE_TRUCK); + numobjs += setup_count_command_type(OBJTYPE_TANK); + numobjs += setup_count_command_type(OBJTYPE_LIFT); + numobjs += setup_count_command_type(OBJTYPE_HOVERBIKE); + numobjs += setup_count_command_type(OBJTYPE_HOVERPROP); + numobjs += setup_count_command_type(OBJTYPE_FAN); + numobjs += setup_count_command_type(OBJTYPE_HOVERCAR); + numobjs += setup_count_command_type(OBJTYPE_CHOPPER); + numobjs += setup_count_command_type(OBJTYPE_HELI); + numobjs += setup_count_command_type(OBJTYPE_ESCASTEP); if (g_Vars.normmplayerisrunning) { - numobjs += scenarioNumProps(); + numobjs += scenario_num_props(); } - modelmgrAllocateSlots(numobjs, numchrs); + modelmgr_allocate_slots(numobjs, numchrs); } else { // cover isn't set to NULL here... I guess it's not important g_StageSetup.waypoints = NULL; @@ -1442,7 +1442,7 @@ void setupLoadFiles(s32 stagenum) g_StageSetup.ailists = NULL; g_StageSetup.padfiledata = NULL; - modelmgrAllocateSlots(0, 0); + modelmgr_allocate_slots(0, 0); } if (IS4MB()) { @@ -1456,10 +1456,10 @@ void setupLoadFiles(s32 stagenum) g_Vars.maxprops = numobjs + numchrs + extra + 40; } -void setupCreateProps(s32 stagenum) +void setup_create_props(s32 stagenum) { - s32 withchrs = !argFindByPrefix(1, "-nochr") && !argFindByPrefix(1, "-noprop"); - s32 withobjs = !argFindByPrefix(1, "-noobj") && !argFindByPrefix(1, "-noprop"); + s32 withchrs = !arg_find_by_prefix(1, "-nochr") && !arg_find_by_prefix(1, "-noprop"); + s32 withobjs = !arg_find_by_prefix(1, "-noobj") && !arg_find_by_prefix(1, "-noprop"); s32 withhovercars; s32 escstepx; s32 escstepy; @@ -1483,15 +1483,15 @@ void setupCreateProps(s32 stagenum) if (stagenum < STAGE_TITLE) { if (g_StageSetup.padfiledata) { - setupPreparePads(); + setup_prepare_pads(); } - setupLoadWaypoints(); + setup_load_waypoints(); if (withchrs) { s32 numchrs = 0; - numchrs += setupCountCommandType(OBJTYPE_CHR); + numchrs += setup_count_command_type(OBJTYPE_CHR); if (g_Vars.normmplayerisrunning == false && g_MissionConfig.iscoop @@ -1499,21 +1499,21 @@ void setupCreateProps(s32 stagenum) numchrs += g_Vars.numaibuddies; } - chrmgrConfigure(numchrs); + chrmgr_configure(numchrs); } else { - chrmgrConfigure(0); + chrmgr_configure(0); } for (j = 0; j < PLAYERCOUNT(); j++) { - setCurrentPlayerNum(j); - invInit(setupCountCommandType(OBJTYPE_LINKGUNS)); + set_current_player_num(j); + inv_init(setup_count_command_type(OBJTYPE_LINKGUNS)); } if (g_StageSetup.props) { u32 diffflag = 0; s32 index; - diffflag |= 1 << (lvGetDifficulty() + 4); + diffflag |= 1 << (lv_get_difficulty() + 4); if (g_Vars.mplayerisrunning) { if (PLAYERCOUNT() == 2) { @@ -1525,7 +1525,7 @@ void setupCreateProps(s32 stagenum) } } - botmgrRemoveAll(); + botmgr_remove_all(); index = 0; obj = (struct defaultobj *)g_StageSetup.props; @@ -1536,7 +1536,7 @@ void setupCreateProps(s32 stagenum) { struct grenadeprobobj *grenadeprob = (struct grenadeprobobj *)obj; u8 probability = grenadeprob->probability; - struct chrdata *chr = chrFindByLiteralId(grenadeprob->chrnum); + struct chrdata *chr = chr_find_by_literal_id(grenadeprob->chrnum); if (chr && chr->prop && chr->model) { chr->grenadeprob = probability; @@ -1545,12 +1545,12 @@ void setupCreateProps(s32 stagenum) break; case OBJTYPE_CHR: if (withchrs) { - bodyAllocateChr(stagenum, (struct packedchr *) obj, index); + body_allocate_chr(stagenum, (struct packedchr *) obj, index); } break; case OBJTYPE_DOOR: if (withobjs && (obj->flags2 & diffflag) == 0) { - setupCreateDoor((struct doorobj *)obj, index); + setup_create_door((struct doorobj *)obj, index); } break; case OBJTYPE_DOORSCALE: @@ -1561,42 +1561,42 @@ void setupCreateProps(s32 stagenum) break; case OBJTYPE_WEAPON: if (withchrs && (obj->flags2 & diffflag) == 0) { - setupPlaceWeapon((struct weaponobj *)obj, index); + setup_place_weapon((struct weaponobj *)obj, index); } break; case OBJTYPE_KEY: if (withchrs && (obj->flags2 & diffflag) == 0) { - setupCreateKey((struct keyobj *)obj, index); + setup_create_key((struct keyobj *)obj, index); } break; case OBJTYPE_HAT: if (withchrs && (obj->flags2 & diffflag) == 0) { - setupCreateHat((struct hatobj *)obj, index); + setup_create_hat((struct hatobj *)obj, index); } break; case OBJTYPE_CCTV: if (withobjs && (obj->flags2 & diffflag) == 0) { - setupCreateCctv((struct cctvobj *)obj, index); + setup_create_cctv((struct cctvobj *)obj, index); } break; case OBJTYPE_AUTOGUN: if (withobjs && (obj->flags2 & diffflag) == 0) { - setupCreateAutogun((struct autogunobj *)obj, index); + setup_create_autogun((struct autogunobj *)obj, index); } break; case OBJTYPE_HANGINGMONITORS: if (withobjs && (obj->flags2 & diffflag) == 0) { - setupCreateHangingMonitors((struct hangingmonitorsobj *)obj, index); + setup_create_hanging_monitors((struct hangingmonitorsobj *)obj, index); } break; case OBJTYPE_SINGLEMONITOR: if (withobjs && (obj->flags2 & diffflag) == 0) { - setupCreateSingleMonitor((struct singlemonitorobj *)obj, index); + setup_create_single_monitor((struct singlemonitorobj *)obj, index); } break; case OBJTYPE_MULTIMONITOR: if (withobjs && (obj->flags2 & diffflag) == 0) { - setupCreateMultiMonitor((struct multimonitorobj *)obj, index); + setup_create_multi_monitor((struct multimonitorobj *)obj, index); } break; case OBJTYPE_SHIELD: @@ -1610,7 +1610,7 @@ void setupCreateProps(s32 stagenum) struct shieldobj *shield = (struct shieldobj *)obj; shield->initialamount = *(s32 *)&shield->initialamount / 65536.0f; shield->amount = shield->initialamount; - setupCreateObject(obj, index); + setup_create_object(obj, index); } } break; @@ -1618,11 +1618,11 @@ void setupCreateProps(s32 stagenum) if (withobjs && (obj->flags2 & diffflag) == 0) { if (obj->flags & OBJFLAG_GLASS_HASPORTAL) { struct tintedglassobj *glass = (struct tintedglassobj *)obj; - glass->portalnum = setupGetPortalByPad(obj->pad); + glass->portalnum = setup_get_portal_by_pad(obj->pad); glass->unk64 = *(s32 *)&glass->unk64 / 65536.0f; } - setupCreateObject(obj, index); + setup_create_object(obj, index); } break; case OBJTYPE_LIFT: @@ -1642,35 +1642,35 @@ void setupCreateProps(s32 stagenum) for (i = 0; i < ARRAYCOUNT(lift->doors); i++) { if (lift->doors[i]) { - lift->doors[i] = (struct doorobj *)setupGetCmdByIndex(index + *(s32*)&lift->doors[i]); + lift->doors[i] = (struct doorobj *)setup_get_cmd_by_index(index + *(s32*)&lift->doors[i]); } } obj->geocount = 1; - setupLoadModeldef(modelnum); + setup_load_modeldef(modelnum); modelstate = &g_ModelStates[modelnum]; if (modelstate->modeldef) { - if (modelGetPartRodata(modelstate->modeldef, MODELPART_LIFT_WALL1)) { + if (model_get_part_rodata(modelstate->modeldef, MODELPART_LIFT_WALL1)) { obj->geocount++; } - if (modelGetPartRodata(modelstate->modeldef, MODELPART_LIFT_WALL2)) { + if (model_get_part_rodata(modelstate->modeldef, MODELPART_LIFT_WALL2)) { obj->geocount++; } - if (modelGetPartRodata(modelstate->modeldef, MODELPART_LIFT_WALL3)) { + if (model_get_part_rodata(modelstate->modeldef, MODELPART_LIFT_WALL3)) { obj->geocount++; } - if (modelGetPartRodata(modelstate->modeldef, MODELPART_LIFT_DOORBLOCK)) { + if (model_get_part_rodata(modelstate->modeldef, MODELPART_LIFT_DOORBLOCK)) { obj->geocount++; } - if (modelGetPartRodata(modelstate->modeldef, MODELPART_LIFT_FLOORNONRECT2)) { + if (model_get_part_rodata(modelstate->modeldef, MODELPART_LIFT_FLOORNONRECT2)) { obj->geocount++; } } obj->flags &= ~OBJFLAG_00000100; - setupCreateObject(obj, index); + setup_create_object(obj, index); prop = obj->prop; @@ -1679,7 +1679,7 @@ void setupCreateProps(s32 stagenum) lift->prevpos.y = prop->pos.y; lift->prevpos.z = prop->pos.z; - liftUpdateTiles(lift, true); + lift_update_tiles(lift, true); } } break; @@ -1687,16 +1687,16 @@ void setupCreateProps(s32 stagenum) if (withobjs && (obj->flags2 & diffflag) == 0) { struct hoverpropobj *hoverprop = (struct hoverpropobj *)obj; - setupCreateObject(obj, index); - setupCreateHov(obj, &hoverprop->hov); + setup_create_object(obj, index); + setup_create_hov(obj, &hoverprop->hov); } break; case OBJTYPE_HOVERBIKE: if (withobjs && (obj->flags2 & diffflag) == 0) { struct hoverbikeobj *bike = (struct hoverbikeobj *)obj; - setupCreateObject(obj, index); - setupCreateHov(obj, &bike->hov); + setup_create_object(obj, index); + setup_create_hov(obj, &bike->hov); bike->speed[0] = 0; bike->speed[1] = 0; @@ -1723,17 +1723,17 @@ void setupCreateProps(s32 stagenum) fan->ymaxspeed = PALUPF(*(s32 *)&fan->ymaxspeed) / 65536.0f; fan->yaccel = PALUPF(*(s32 *)&fan->yaccel) / 65536.0f; - setupCreateObject(obj, index); + setup_create_object(obj, index); } break; case OBJTYPE_GLASS: if (withobjs && (obj->flags2 & diffflag) == 0) { if (obj->flags & OBJFLAG_GLASS_HASPORTAL) { struct glassobj *glass = (struct glassobj *)obj; - glass->portalnum = setupGetPortalByPad(obj->pad); + glass->portalnum = setup_get_portal_by_pad(obj->pad); } - setupCreateObject(obj, index); + setup_create_object(obj, index); } break; case OBJTYPE_ESCASTEP: @@ -1751,7 +1751,7 @@ void setupCreateProps(s32 stagenum) #endif f32 sp184[3][3]; - setupCreateObject(obj, index); + setup_create_object(obj, index); prop = obj->prop; @@ -1764,14 +1764,14 @@ void setupCreateProps(s32 stagenum) if (obj->flags & OBJFLAG_ESCSTEP_ZALIGNED) { step->frame = escstepy; escstepy += 40; - mtx4LoadYRotation(RAD(270, 4.7116389274597f), (Mtxf *) &sp1a8); - mtx4ToMtx3((Mtxf *) &sp1a8, sp184); + mtx4_load_y_rotation(RAD(270, 4.7116389274597f), (Mtxf *) &sp1a8); + mtx4_to_mtx3((Mtxf *) &sp1a8, sp184); mtx00016110(sp184, obj->realrot); } else { step->frame = escstepx; escstepx += 40; - mtx4LoadYRotation(M_BADPI, (Mtxf *) &sp1a8); - mtx4ToMtx3((Mtxf *) &sp1a8, sp184); + mtx4_load_y_rotation(M_BADPI, (Mtxf *) &sp1a8); + mtx4_to_mtx3((Mtxf *) &sp1a8, sp184); mtx00016110(sp184, obj->realrot); } } @@ -1784,7 +1784,7 @@ void setupCreateProps(s32 stagenum) case OBJTYPE_29: case OBJTYPE_SAFE: if (withobjs && (obj->flags2 & diffflag) == 0) { - setupCreateObject(obj, index); + setup_create_object(obj, index); } break; case OBJTYPE_MULTIAMMOCRATE: @@ -1794,7 +1794,7 @@ void setupCreateProps(s32 stagenum) s32 i; if (g_Vars.normmplayerisrunning && g_SetupCurMpLocation >= 0) { - struct mpweapon *mpweapon = mpGetMpWeaponByLocation(g_SetupCurMpLocation); + struct mpweapon *mpweapon = mp_get_mp_weapon_by_location(g_SetupCurMpLocation); ammoqty = mpweapon->priammoqty; if (mpweapon->priammotype > 0 && mpweapon->priammotype < 20) { @@ -1809,11 +1809,11 @@ void setupCreateProps(s32 stagenum) if (ammoqty > 0 && withobjs && (obj->flags2 & diffflag) == 0) { for (i = 0; i < ARRAYCOUNT(crate->slots); i++) { if (crate->slots[i].quantity > 0 && crate->slots[i].modelnum != 0xffff) { - setupLoadModeldef(crate->slots[i].modelnum); + setup_load_modeldef(crate->slots[i].modelnum); } } - setupCreateObject(obj, index); + setup_create_object(obj, index); } } break; @@ -1821,14 +1821,14 @@ void setupCreateProps(s32 stagenum) if (withobjs && (obj->flags2 & diffflag) == 0) { struct truckobj *truck = (struct truckobj *)obj; - setupCreateObject(obj, index); + setup_create_object(obj, index); if (obj->model) { - struct modelnode *node = modelGetPart(obj->model->definition, MODELPART_TRUCK_0005); + struct modelnode *node = model_get_part(obj->model->definition, MODELPART_TRUCK_0005); if (node) { // The truck model doesn't exist in PD, so I'm assuming this is a toggle node - union modelrwdata *rwdata = modelGetNodeRwData(obj->model, node); + union modelrwdata *rwdata = model_get_node_rw_data(obj->model, node); rwdata->toggle.visible = ((obj->flags & OBJFLAG_DEACTIVATED) == 0); } } @@ -1840,7 +1840,7 @@ void setupCreateProps(s32 stagenum) truck->speedtime60 = -1; truck->turnrot60 = 0; truck->roty = 0; - truck->ailist = ailistFindById((u32)truck->ailist); + truck->ailist = ailist_find_by_id((u32)truck->ailist); truck->aioffset = 0; truck->aireturnlist = -1; truck->path = NULL; @@ -1852,7 +1852,7 @@ void setupCreateProps(s32 stagenum) struct hovercarobj *car = (struct hovercarobj *)obj; struct prop *prop; - setupCreateObject(obj, index); + setup_create_object(obj, index); prop = obj->prop; @@ -1862,14 +1862,14 @@ void setupCreateProps(s32 stagenum) car->roty = 0; car->rotx = 0; car->speedtime60 = -1; - car->ailist = ailistFindById((s32)car->ailist); + car->ailist = ailist_find_by_id((s32)car->ailist); car->aioffset = 0; car->aireturnlist = -1; car->path = NULL; car->nextstep = 0; if (obj->flags & OBJFLAG_CHOPPER_INACTIVE) { - prop->pos.y = cdFindFloorYColourTypeAtPos(&prop->pos, prop->rooms, NULL, 0) + 30; + prop->pos.y = cd_find_floor_y_colour_type_at_pos(&prop->pos, prop->rooms, NULL, 0) + 30; } prop->forcetick = true; @@ -1879,7 +1879,7 @@ void setupCreateProps(s32 stagenum) if (withobjs && (obj->flags2 & diffflag) == 0) { struct chopperobj *chopper = (struct chopperobj *)obj; - setupCreateObject(obj, index); + setup_create_object(obj, index); obj->flags |= OBJFLAG_CHOPPER_INIT; obj->prop->forcetick = true; @@ -1891,7 +1891,7 @@ void setupCreateProps(s32 stagenum) chopper->gunrotx = 0; chopper->barrelrot = 0; chopper->barrelrotspeed = 0; - chopper->ailist = ailistFindById((u32)chopper->ailist); + chopper->ailist = ailist_find_by_id((u32)chopper->ailist); chopper->aioffset = 0; chopper->aireturnlist = -1; chopper->path = NULL; @@ -1912,8 +1912,8 @@ void setupCreateProps(s32 stagenum) chopper->patroltimer60 = 0; chopper->cw = 0; chopper->weaponsarmed = true; - chopper->fireslotthing = mempAlloc(sizeof(struct fireslotthing), MEMPOOL_STAGE); - chopper->fireslotthing->beam = mempAlloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE); + chopper->fireslotthing = memp_alloc(sizeof(struct fireslotthing), MEMPOOL_STAGE); + chopper->fireslotthing->beam = memp_alloc(ALIGN16(sizeof(struct beam)), MEMPOOL_STAGE); chopper->fireslotthing->beam->age = -1; chopper->fireslotthing->unk08 = -1; chopper->fireslotthing->unk00 = 0; @@ -1928,7 +1928,7 @@ void setupCreateProps(s32 stagenum) if (withobjs && (obj->flags2 & diffflag) == 0) { struct heliobj *heli = (struct heliobj *)obj; - setupCreateObject(obj, index); + setup_create_object(obj, index); heli->speed = 0; heli->speedaim = 0; @@ -1938,7 +1938,7 @@ void setupCreateProps(s32 stagenum) heli->yrot = 0; heli->speedtime60 = -1; heli->rotoryspeedtime = -1; - heli->ailist = ailistFindById((u32)heli->ailist); + heli->ailist = ailist_find_by_id((u32)heli->ailist); heli->aioffset = 0; heli->aireturnlist = -1; heli->path = NULL; @@ -1948,27 +1948,27 @@ void setupCreateProps(s32 stagenum) case OBJTYPE_TAG: { struct tag *tag = (struct tag *)obj; - struct defaultobj *taggedobj = setupGetObjByCmdIndex(index + tag->cmdoffset); + struct defaultobj *taggedobj = setup_get_obj_by_cmd_index(index + tag->cmdoffset); tag->obj = taggedobj; if (taggedobj) { taggedobj->hidden |= OBJHFLAG_TAGGED; } - tagInsert(tag); + tag_insert(tag); } break; case OBJTYPE_RENAMEOBJ: { struct textoverride *override = (struct textoverride *)obj; - struct defaultobj *targetobj = setupGetObjByCmdIndex(override->objoffset + index); + struct defaultobj *targetobj = setup_get_obj_by_cmd_index(override->objoffset + index); override->obj = targetobj; if (targetobj) { targetobj->hidden |= OBJHFLAG_HASTEXTOVERRIDE; } - invInsertTextOverride(override); + inv_insert_text_override(override); } break; case OBJTYPE_BRIEFING: @@ -1976,13 +1976,13 @@ void setupCreateProps(s32 stagenum) struct briefingobj *briefing = (struct briefingobj *)obj; s32 wanttype = BRIEFINGTYPE_TEXT_PA; - briefingInsert(briefing); + briefing_insert(briefing); - if (lvGetDifficulty() == DIFF_A) { + if (lv_get_difficulty() == DIFF_A) { wanttype = BRIEFINGTYPE_TEXT_A; } - if (lvGetDifficulty() == DIFF_SA) { + if (lv_get_difficulty() == DIFF_SA) { wanttype = BRIEFINGTYPE_TEXT_SA; } @@ -2005,7 +2005,7 @@ void setupCreateProps(s32 stagenum) { struct objective *objective = (struct objective *)obj; - objectiveInsert(objective); + objective_insert(objective); if ((u32)objective->index < 7) { g_Briefing.objectivenames[objective->index] = objective->text; @@ -2014,13 +2014,13 @@ void setupCreateProps(s32 stagenum) } break; case OBJECTIVETYPE_ENTERROOM: - objectiveAddRoomEnteredCriteria((struct criteria_roomentered *)obj); + objective_add_room_entered_criteria((struct criteria_roomentered *)obj); break; case OBJECTIVETYPE_THROWINROOM: - objectiveAddThrowInRoomCriteria((struct criteria_throwinroom *)obj); + objective_add_throw_in_room_criteria((struct criteria_throwinroom *)obj); break; case OBJECTIVETYPE_HOLOGRAPH: - objectiveAddHolographCriteria((struct criteria_holograph *)obj); + objective_add_holograph_criteria((struct criteria_holograph *)obj); break; case OBJTYPE_PADEFFECT: { @@ -2033,18 +2033,18 @@ void setupCreateProps(s32 stagenum) break; case OBJTYPE_MINE: if (withobjs && (obj->flags2 & diffflag) == 0) { - setupCreateMine((struct mineobj *)obj, index); + setup_create_mine((struct mineobj *)obj, index); } break; } - obj = (struct defaultobj *)((u32 *)obj + setupGetCmdLength((u32 *)obj)); + obj = (struct defaultobj *)((u32 *)obj + setup_get_cmd_length((u32 *)obj)); index++; } index = 0; - if (g_Vars.normmplayerisrunning && mpHasSimulants()) { + if (g_Vars.normmplayerisrunning && mp_has_simulants()) { u32 stack[4]; s32 i; s32 slotsdone[MAX_BOTS]; @@ -2052,7 +2052,7 @@ void setupCreateProps(s32 stagenum) s32 maxsimulants; s32 slotnum; - if (challengeIsFeatureUnlocked(MPFEATURE_8BOTS)) { + if (challenge_is_feature_unlocked(MPFEATURE_8BOTS)) { maxsimulants = MAX_BOTS; } else { maxsimulants = 4; @@ -2070,8 +2070,8 @@ void setupCreateProps(s32 stagenum) } if ((g_MpSetup.chrslots & (1 << (slotnum + 4))) - && mpIsSimSlotEnabled(slotnum)) { - botmgrAllocateBot(chrnum, slotnum); + && mp_is_sim_slot_enabled(slotnum)) { + botmgr_allocate_bot(chrnum, slotnum); chrnum++; } @@ -2080,7 +2080,7 @@ void setupCreateProps(s32 stagenum) } if (g_Vars.normmplayerisrunning) { - scenarioInitProps(); + scenario_init_props(); } obj = (struct defaultobj *)g_StageSetup.props; @@ -2102,25 +2102,25 @@ void setupCreateProps(s32 stagenum) case OBJTYPE_TINTEDGLASS: if (obj->prop && (obj->flags & OBJFLAG_INSIDEANOTHEROBJ)) { s32 offset = obj->pad; - struct defaultobj *owner = setupGetObjByCmdIndex(index + offset); + struct defaultobj *owner = setup_get_obj_by_cmd_index(index + offset); if (owner && owner->prop) { obj->hidden |= OBJHFLAG_HASOWNER; - modelSetScale(obj->model, obj->model->scale); - propReparent(obj->prop, owner->prop); + model_set_scale(obj->model, obj->model->scale); + prop_reparent(obj->prop, owner->prop); } } break; case OBJTYPE_LINKGUNS: { struct linkgunsobj *link = (struct linkgunsobj *)obj; - struct weaponobj *gun1 = (struct weaponobj *)setupGetCmdByIndex(link->offset1 + index); - struct weaponobj *gun2 = (struct weaponobj *)setupGetCmdByIndex(link->offset2 + index); + struct weaponobj *gun1 = (struct weaponobj *)setup_get_cmd_by_index(link->offset1 + index); + struct weaponobj *gun2 = (struct weaponobj *)setup_get_cmd_by_index(link->offset2 + index); if (gun1 && gun2 && gun1->base.type == OBJTYPE_WEAPON && gun2->base.type == OBJTYPE_WEAPON) { - propweaponSetDual(gun1, gun2); + propweapon_set_dual(gun1, gun2); } } break; @@ -2129,14 +2129,14 @@ void setupCreateProps(s32 stagenum) struct linkliftdoorobj *link = (struct linkliftdoorobj *)obj; s32 dooroffset = (s32)link->door; s32 liftoffset = (s32)link->lift; - struct defaultobj *door = setupGetObjByCmdIndex(index + dooroffset); - struct defaultobj *lift = setupGetObjByCmdIndex(index + liftoffset); + struct defaultobj *door = setup_get_obj_by_cmd_index(index + dooroffset); + struct defaultobj *lift = setup_get_obj_by_cmd_index(index + liftoffset); if (door && door->prop && lift && lift->prop) { link->door = door->prop; link->lift = lift->prop; - setupCreateLiftDoor(link); + setup_create_lift_door(link); door->hidden |= OBJHFLAG_LIFTDOOR; } @@ -2148,9 +2148,9 @@ void setupCreateProps(s32 stagenum) s32 itemoffset = (s32)link->item; s32 safeoffset = (s32)link->safe; s32 dooroffset = (s32)link->door; - struct defaultobj *item = setupGetObjByCmdIndex(index + itemoffset); - struct defaultobj *safe = setupGetObjByCmdIndex(index + safeoffset); - struct defaultobj *door = setupGetObjByCmdIndex(index + dooroffset); + struct defaultobj *item = setup_get_obj_by_cmd_index(index + itemoffset); + struct defaultobj *safe = setup_get_obj_by_cmd_index(index + safeoffset); + struct defaultobj *door = setup_get_obj_by_cmd_index(index + dooroffset); if (item && item->prop && safe && safe->prop && safe->type == OBJTYPE_SAFE @@ -2159,7 +2159,7 @@ void setupCreateProps(s32 stagenum) link->safe = (struct safeobj *)safe; link->door = (struct doorobj *)door; - setupCreateSafeItem(link); + setup_create_safe_item(link); item->flags2 |= OBJFLAG2_LINKEDTOSAFE; door->flags2 |= OBJFLAG2_LINKEDTOSAFE; @@ -2171,15 +2171,15 @@ void setupCreateProps(s32 stagenum) struct padlockeddoorobj *link = (struct padlockeddoorobj *)obj; s32 dooroffset = (s32)link->door; s32 lockoffset = (s32)link->lock; - struct defaultobj *door = setupGetObjByCmdIndex(index + dooroffset); - struct defaultobj *lock = setupGetObjByCmdIndex(index + lockoffset); + struct defaultobj *door = setup_get_obj_by_cmd_index(index + dooroffset); + struct defaultobj *lock = setup_get_obj_by_cmd_index(index + lockoffset); if (door && door->prop && lock && lock->prop && door->type == OBJTYPE_DOOR) { link->door = (struct doorobj *)door; link->lock = lock; - setupCreatePadlockedDoor(link); + setup_create_padlocked_door(link); door->hidden |= OBJHFLAG_PADLOCKEDDOOR; } @@ -2191,17 +2191,17 @@ void setupCreateProps(s32 stagenum) s32 triggeroffset = (s32)link->trigger; s32 unexpoffset = (s32)link->unexp; s32 expoffset = (s32)link->exp; - struct defaultobj *trigger = setupGetObjByCmdIndex(index + triggeroffset); + struct defaultobj *trigger = setup_get_obj_by_cmd_index(index + triggeroffset); struct defaultobj *unexp = NULL; struct defaultobj *exp = NULL; s32 alwayszero = 0; if (unexpoffset) { - unexp = setupGetObjByCmdIndex(index + unexpoffset); + unexp = setup_get_obj_by_cmd_index(index + unexpoffset); } if (expoffset) { - exp = setupGetObjByCmdIndex(index + expoffset); + exp = setup_get_obj_by_cmd_index(index + expoffset); } if (trigger && trigger->prop @@ -2211,7 +2211,7 @@ void setupCreateProps(s32 stagenum) link->unexp = unexp; link->exp = exp; - setupCreateConditionalScenery(link); + setup_create_conditional_scenery(link); trigger->hidden |= OBJHFLAG_CONDITIONALSCENERY; @@ -2232,7 +2232,7 @@ void setupCreateProps(s32 stagenum) } if (trigger->hidden & OBJHFLAG_BLOCKEDPATH) { - objSetBlockedPathUnblocked(trigger, false); + obj_set_blocked_path_unblocked(trigger, false); } } } @@ -2241,30 +2241,30 @@ void setupCreateProps(s32 stagenum) { struct blockedpathobj *blockedpath = (struct blockedpathobj *)obj; s32 objoffset = (s32)blockedpath->blocker; - struct defaultobj *blocker = setupGetObjByCmdIndex(index + objoffset); + struct defaultobj *blocker = setup_get_obj_by_cmd_index(index + objoffset); if (blocker && blocker->prop) { blockedpath->blocker = blocker; - setupCreateBlockedPath(blockedpath); + setup_create_blocked_path(blockedpath); blocker->hidden |= OBJHFLAG_BLOCKEDPATH; if (blocker->hidden & OBJHFLAG_CONDITIONALSCENERY) { - objSetBlockedPathUnblocked(blocker, false); + obj_set_blocked_path_unblocked(blocker, false); } } } break; } - obj = (struct defaultobj *)((u32 *)obj + setupGetCmdLength((u32 *)obj)); + obj = (struct defaultobj *)((u32 *)obj + setup_get_cmd_length((u32 *)obj)); index++; } } } else { - chrmgrConfigure(0); + chrmgr_configure(0); } - stageAllocateBgChrs(); + stage_allocate_bg_chrs(); } diff --git a/src/game/setupcover.c b/src/game/setupcover.c index 5b446c12a..a4b4aa821 100644 --- a/src/game/setupcover.c +++ b/src/game/setupcover.c @@ -9,11 +9,11 @@ #include "data.h" #include "types.h" -void coverAllocateSpecial(u16 *specialcovernums) +void cover_allocate_special(u16 *specialcovernums) { s32 i; - g_SpecialCoverNums = mempAlloc(ALIGN16(g_NumSpecialCovers * sizeof(g_SpecialCoverNums[0])), MEMPOOL_STAGE); + g_SpecialCoverNums = memp_alloc(ALIGN16(g_NumSpecialCovers * sizeof(g_SpecialCoverNums[0])), MEMPOOL_STAGE); if (g_SpecialCoverNums != NULL) { for (i = 0; i < g_NumSpecialCovers; i++) { @@ -22,7 +22,7 @@ void coverAllocateSpecial(u16 *specialcovernums) } } -void setupPrepareCover(void) +void setup_prepare_cover(void) { s32 i; s32 numcovers = g_PadsFile->numcovers; @@ -34,9 +34,9 @@ void setupPrepareCover(void) RoomNum inrooms[21]; RoomNum aboverooms[21]; - g_CoverFlags = mempAlloc(ALIGN16(numcovers * sizeof(g_CoverFlags[0])), MEMPOOL_STAGE); - g_CoverRooms = mempAlloc(ALIGN16(numcovers * sizeof(g_CoverRooms[0])), MEMPOOL_STAGE); - g_CoverCandidates = mempAlloc(ALIGN16(numcovers * sizeof(g_CoverCandidates[0])), MEMPOOL_STAGE); + g_CoverFlags = memp_alloc(ALIGN16(numcovers * sizeof(g_CoverFlags[0])), MEMPOOL_STAGE); + g_CoverRooms = memp_alloc(ALIGN16(numcovers * sizeof(g_CoverRooms[0])), MEMPOOL_STAGE); + g_CoverCandidates = memp_alloc(ALIGN16(numcovers * sizeof(g_CoverCandidates[0])), MEMPOOL_STAGE); g_NumSpecialCovers = 0; g_SpecialCoverNums = NULL; @@ -46,9 +46,9 @@ void setupPrepareCover(void) roomsptr = NULL; g_CoverFlags[i] = 0; - if (coverUnpack(i, &cover) + if (cover_unpack(i, &cover) && (cover.look->x != 0.0f || cover.look->y != 0.0f || cover.look->z != 0.0f)) { - if (coverIsSpecial(&cover)) { + if (cover_is_special(&cover)) { specialcovernums[g_NumSpecialCovers] = i; g_NumSpecialCovers++; } @@ -59,14 +59,14 @@ void setupPrepareCover(void) if (cover.look->x == 1.0f && cover.look->y == 1.0f && cover.look->z == 1.0f) { g_CoverFlags[i] |= COVERFLAG_OMNIDIRECTIONAL; - } else if (!coverIsSpecial(&cover)) { + } else if (!cover_is_special(&cover)) { struct coord *look = cover.look; look->y = 0; guNormalize(&look->x, &look->y, &look->z); } // Find room - bgFindRoomsByPos(cover.pos, inrooms, aboverooms, 20, NULL); + bg_find_rooms_by_pos(cover.pos, inrooms, aboverooms, 20, NULL); if (inrooms[0] != -1) { roomsptr = inrooms; @@ -77,7 +77,7 @@ void setupPrepareCover(void) g_CoverRooms[i] = -1; if (roomsptr != NULL) { - s32 room = cdFindFloorRoomAtPos(cover.pos, roomsptr); + s32 room = cd_find_floor_room_at_pos(cover.pos, roomsptr); if (room > 0) { g_CoverRooms[i] = (RoomNum)room; @@ -94,7 +94,7 @@ void setupPrepareCover(void) aimpos.y = cover.pos->y; aimpos.z = cover.pos->z + cover.look->f[2] * 600; - bgFindRoomsByPos(&aimpos, inrooms, aboverooms, 20, NULL); + bg_find_rooms_by_pos(&aimpos, inrooms, aboverooms, 20, NULL); if (inrooms[0] != -1) { roomsptr = inrooms; @@ -103,7 +103,7 @@ void setupPrepareCover(void) } if (roomsptr) { - s32 aimroom = cdFindFloorRoomAtPos(&aimpos, roomsptr); + s32 aimroom = cd_find_floor_room_at_pos(&aimpos, roomsptr); if (aimroom > 0) { g_CoverFlags[i] |= (g_CoverRooms[i] == (RoomNum)aimroom) ? COVERFLAG_AIMSAMEROOM : COVERFLAG_AIMDIFFROOM; @@ -117,6 +117,6 @@ void setupPrepareCover(void) } } - coverAllocateSpecial(specialcovernums); + cover_allocate_special(specialcovernums); } } diff --git a/src/game/setuppads.c b/src/game/setuppads.c index 9e629fdad..0bdfddea1 100644 --- a/src/game/setuppads.c +++ b/src/game/setuppads.c @@ -15,17 +15,17 @@ /** * The function assumes that a pad file's data has been loaded from the ROM * and is pointed to by g_StageSetup.padfiledata. These pads are in a packed - * format. During gameplay, the game uses padUnpack as needed to temporarily + * format. During gameplay, the game uses pad_unpack as needed to temporarily * populate pad structs from this data. * - * setupPreparePads prepares the packed data by doing the following: + * setup_prepare_pads prepares the packed data by doing the following: * - populates the room field (if -1) * - multiplies each pad's bounding box by 1 (this is effectively a no op) * - sets the g_StageSetup pad/waygroup/waypoint/cover pointers * - promotes file offsets to RAM pointers - * - does similar things for cover by calling setupPrepareCover() + * - does similar things for cover by calling setup_prepare_cover() */ -void setupPreparePads(void) +void setup_prepare_pads(void) { struct packedpad *packedpad; RoomNum *roomsptr; @@ -47,12 +47,12 @@ void setupPreparePads(void) for (; padnum < numpads; padnum++) { offset = g_PadOffsets[padnum]; packedpad = (struct packedpad *) &g_StageSetup.padfiledata[offset]; - padUnpack(padnum, PADFIELD_POS | PADFIELD_BBOX, &pad); + pad_unpack(padnum, PADFIELD_POS | PADFIELD_BBOX, &pad); // If room is negative (ie. not specified) if (packedpad->room < 0) { roomsptr = NULL; - bgFindRoomsByPos(&pad.pos, inrooms, aboverooms, 20, NULL); + bg_find_rooms_by_pos(&pad.pos, inrooms, aboverooms, 20, NULL); if (inrooms[0] != -1) { roomsptr = inrooms; @@ -61,7 +61,7 @@ void setupPreparePads(void) } if (roomsptr != NULL) { - roomnum = cdFindFloorRoomAtPos(&pad.pos, roomsptr); + roomnum = cd_find_floor_room_at_pos(&pad.pos, roomsptr); if (roomnum > 0) { packedpad->room = roomnum; @@ -83,7 +83,7 @@ void setupPreparePads(void) pad.bbox.zmin *= scale; pad.bbox.zmax *= scale; - padCopyBboxFromPad(padnum, &pad); + pad_copy_bbox_from_pad(padnum, &pad); } } @@ -92,7 +92,7 @@ void setupPreparePads(void) g_StageSetup.cover = (void *) ((intptr_t)g_StageSetup.padfiledata + g_PadsFile->coversoffset); if (g_StageSetup.cover != NULL) { - setupPrepareCover(); + setup_prepare_cover(); } // Promote offsets to pointers in waypoints diff --git a/src/game/setuputils.c b/src/game/setuputils.c index bf0d9d1db..b07d7e13d 100644 --- a/src/game/setuputils.c +++ b/src/game/setuputils.c @@ -15,12 +15,12 @@ struct stagesetup g_StageSetup; u8 *g_GeCreditsData; -u32 setupGetCmdLength(u32 *cmd) +u32 setup_get_cmd_length(u32 *cmd) { #if VERSION < VERSION_NTSC_1_0 static u32 crash1 = 0; - mainOverrideVariable("crash1", &crash1); + main_override_variable("crash1", &crash1); #endif switch ((u8)cmd[0]) { @@ -91,7 +91,7 @@ u32 setupGetCmdLength(u32 *cmd) return 1; } -u32 *setupGetCmdByIndex(s32 wantindex) +u32 *setup_get_cmd_by_index(s32 wantindex) { u32 *cmd = g_StageSetup.props; @@ -103,7 +103,7 @@ u32 *setupGetCmdByIndex(s32 wantindex) return cmd; } - cmd = cmd + setupGetCmdLength(cmd); + cmd = cmd + setup_get_cmd_length(cmd); cmdindex++; } } @@ -111,7 +111,7 @@ u32 *setupGetCmdByIndex(s32 wantindex) return NULL; } -s32 setupGetCmdIndexByTag(struct tag *tag) +s32 setup_get_cmd_index_by_tag(struct tag *tag) { u32 *cmd = g_StageSetup.props; @@ -123,7 +123,7 @@ s32 setupGetCmdIndexByTag(struct tag *tag) return cmdindex; } - cmd = cmd + setupGetCmdLength(cmd); + cmd = cmd + setup_get_cmd_length(cmd); cmdindex++; } } @@ -131,7 +131,7 @@ s32 setupGetCmdIndexByTag(struct tag *tag) return -1; } -u32 setupGetCmdIndexByProp(struct prop *prop) +u32 setup_get_cmd_index_by_prop(struct prop *prop) { u32 *cmd = g_StageSetup.props; @@ -143,7 +143,7 @@ u32 setupGetCmdIndexByProp(struct prop *prop) return cmdindex; } - cmd = cmd + setupGetCmdLength(cmd); + cmd = cmd + setup_get_cmd_length(cmd); cmdindex++; } } @@ -151,29 +151,29 @@ u32 setupGetCmdIndexByProp(struct prop *prop) return -1; } -bool setupLoadModeldef(s32 modelnum) +bool setup_load_modeldef(s32 modelnum) { if (g_ModelStates[modelnum].modeldef == NULL) { - g_ModelStates[modelnum].modeldef = modeldefLoadToNew(g_ModelStates[modelnum].fileid); - modelAllocateRwData(g_ModelStates[modelnum].modeldef); + g_ModelStates[modelnum].modeldef = modeldef_load_to_new(g_ModelStates[modelnum].fileid); + model_allocate_rw_data(g_ModelStates[modelnum].modeldef); return true; } return false; } -bool setupGetObjBbox(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], struct coord *arg3, struct coord *arg4) +bool setup_get_obj_bbox(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], struct coord *arg3, struct coord *arg4) { - struct modelrodata_bbox *bbox = objFindBboxRodata(obj); + struct modelrodata_bbox *bbox = obj_find_bbox_rodata(obj); if (bbox != NULL) { - arg3->x = pos->x + objGetRotatedLocalXMinByMtx3(bbox, realrot); - arg3->y = pos->y + objGetRotatedLocalYMinByMtx3(bbox, realrot); - arg3->z = pos->z + objGetRotatedLocalZMinByMtx3(bbox, realrot); + arg3->x = pos->x + obj_get_rotated_local_x_min_by_mtx3(bbox, realrot); + arg3->y = pos->y + obj_get_rotated_local_y_min_by_mtx3(bbox, realrot); + arg3->z = pos->z + obj_get_rotated_local_z_min_by_mtx3(bbox, realrot); - arg4->x = pos->x + objGetRotatedLocalXMaxByMtx3(bbox, realrot); - arg4->y = pos->y + objGetRotatedLocalYMaxByMtx3(bbox, realrot); - arg4->z = pos->z + objGetRotatedLocalZMaxByMtx3(bbox, realrot); + arg4->x = pos->x + obj_get_rotated_local_x_max_by_mtx3(bbox, realrot); + arg4->y = pos->y + obj_get_rotated_local_y_max_by_mtx3(bbox, realrot); + arg4->z = pos->z + obj_get_rotated_local_z_max_by_mtx3(bbox, realrot); return true; } @@ -183,7 +183,7 @@ bool setupGetObjBbox(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3 bool setup0f092304(struct defaultobj *obj, struct coord *arg1, struct coord *arg2) { - return setupGetObjBbox(obj, &obj->prop->pos, obj->realrot, arg1, arg2); + return setup_get_obj_bbox(obj, &obj->prop->pos, obj->realrot, arg1, arg2); } void setup0f09233c(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], RoomNum *rooms) @@ -192,7 +192,7 @@ void setup0f09233c(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], struct coord b; u32 stack; - if (setupGetObjBbox(obj, pos, realrot, &a, &b)) { + if (setup_get_obj_bbox(obj, pos, realrot, &a, &b)) { a.x -= 1; a.y -= 1; a.z -= 1; @@ -200,20 +200,20 @@ void setup0f09233c(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], b.y += 1; b.z += 1; - bgFindEnteredRooms(&a, &b, rooms, 7, false); + bg_find_entered_rooms(&a, &b, rooms, 7, false); } } void setup0f0923d4(struct defaultobj *obj) { - propDeregisterRooms(obj->prop); + prop_deregister_rooms(obj->prop); setup0f09233c(obj, &obj->prop->pos, obj->realrot, obj->prop->rooms); - propRegisterRooms(obj->prop); + prop_register_rooms(obj->prop); } -struct defaultobj *setupGetObjByCmdIndex(u32 cmdindex) +struct defaultobj *setup_get_obj_by_cmd_index(u32 cmdindex) { - u32 *cmd = setupGetCmdByIndex(cmdindex); + u32 *cmd = setup_get_cmd_by_index(cmdindex); if (cmd) { switch ((u8)cmd[0]) { @@ -301,7 +301,7 @@ struct defaultobj *setupGetObjByCmdIndex(u32 cmdindex) * hat caller is unreachable because hats don't exist in PD. So it's only used * for weapons which means the candidate logic isn't used. */ -struct defaultobj *setupFindObjForReuse(s32 wanttype, struct defaultobj **offscreenobjptr, struct defaultobj **anyobjptr, bool musthaveprop, bool musthavemodel, struct modeldef *modeldef) +struct defaultobj *setup_find_obj_for_reuse(s32 wanttype, struct defaultobj **offscreenobjptr, struct defaultobj **anyobjptr, bool musthaveprop, bool musthavemodel, struct modeldef *modeldef) { struct defaultobj *offscreenobj = NULL; struct defaultobj *anyobj = NULL; @@ -324,7 +324,7 @@ struct defaultobj *setupFindObjForReuse(s32 wanttype, struct defaultobj **offscr && (obj->flags & OBJFLAG_HELDROCKET) == 0 #endif && obj->prop->parent == NULL - && (!musthavemodel || modelmgrCanSlotFitRwdata(obj->model, modeldef))) { + && (!musthavemodel || modelmgr_can_slot_fit_rwdata(obj->model, modeldef))) { if (offscreenobj == NULL && (obj->prop->flags & (PROPFLAG_ONTHISSCREENTHISTICK | PROPFLAG_ONANYSCREENTHISTICK | PROPFLAG_ONANYSCREENPREVTICK)) == 0) { offscreenobj = obj; } @@ -335,7 +335,7 @@ struct defaultobj *setupFindObjForReuse(s32 wanttype, struct defaultobj **offscr } } - cmd = cmd + setupGetCmdLength(cmd); + cmd = cmd + setup_get_cmd_length(cmd); } } diff --git a/src/game/setupwaypoints.c b/src/game/setupwaypoints.c index 0eb9490a4..4d0b73237 100644 --- a/src/game/setupwaypoints.c +++ b/src/game/setupwaypoints.c @@ -6,7 +6,7 @@ #include "data.h" #include "types.h" -void setupLoadWaypoints(void) +void setup_load_waypoints(void) { struct waypoint *waypoints; s32 numwaypoints; @@ -32,20 +32,20 @@ void setupLoadWaypoints(void) waypoints = g_StageSetup.waypoints; // Allocate memory for the waypoint numbers array - g_Vars.waypointnums = mempAlloc(ALIGN16(numwaypoints * sizeof(s16)), MEMPOOL_STAGE); + g_Vars.waypointnums = memp_alloc(ALIGN16(numwaypoints * sizeof(s16)), MEMPOOL_STAGE); numinserted = 0; // Populate g_Vars.waypointnums, ordering them by roomnum asc, padnum asc for (i = 0; i < numwaypoints; i++) { waypoint = &waypoints[i]; - padUnpack(waypoint->padnum, PADFIELD_ROOM | PADFIELD_FLAGS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_ROOM | PADFIELD_FLAGS, &pad); // Iterate previously processed waypoints and bail if the outer loop's // waypoint should be inserted prior to this one for (j = 0; j < numinserted; j++) { waypoint2 = &waypoints[g_Vars.waypointnums[j]]; - padUnpack(waypoint2->padnum, PADFIELD_ROOM | PADFIELD_FLAGS, &pad2); + pad_unpack(waypoint2->padnum, PADFIELD_ROOM | PADFIELD_FLAGS, &pad2); if (pad.room < pad2.room) { break; @@ -78,7 +78,7 @@ void setupLoadWaypoints(void) for (i = 0; i < numwaypoints; i++) { waypoint = &g_StageSetup.waypoints[g_Vars.waypointnums[i]]; - padUnpack(waypoint->padnum, PADFIELD_ROOM | PADFIELD_FLAGS, &pad); + pad_unpack(waypoint->padnum, PADFIELD_ROOM | PADFIELD_FLAGS, &pad); if (pad.room != currentroom) { currentroom = pad.room; diff --git a/src/game/shards.c b/src/game/shards.c index 8291ac7a4..3d280b77c 100644 --- a/src/game/shards.c +++ b/src/game/shards.c @@ -19,9 +19,9 @@ struct shard *g_Shards; s32 g_NextShardNum = 0; bool g_ShardsActive = false; -void shardCreate(RoomNum room, struct coord *pos, f32 rotx, f32 size, s32 type); +void shard_create(RoomNum room, struct coord *pos, f32 rotx, f32 size, s32 type); -void shardsCreate(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 relxmin, f32 relxmax, f32 relymin, f32 relymax, s32 type, struct prop *prop) +void shards_create(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 relxmin, f32 relxmax, f32 relymin, f32 relymax, s32 type, struct prop *prop) { s32 y; s32 x; @@ -79,7 +79,7 @@ void shardsCreate(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 relxmi basepos.z = (pos->f[2] + (relxmin + (speci >> 1)) * spcc[2]) + spc0[2] * (relymin + (speci >> 1)); if (type == SHARDTYPE_GLASS) { - psCreate(NULL, NULL, SFX_GLASS_SHATTER, -1, + ps_create(NULL, NULL, SFX_GLASS_SHATTER, -1, -1, 0, 0, PSTYPE_NONE, &prop->pos, -1.0f, prop->rooms, -1, -1.0f, -1.0f, -1.0f); } else if (type == SHARDTYPE_BOTTLE) { /** @@ -88,10 +88,10 @@ void shardsCreate(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 relxmi * when you shoot the bottles, half of them don't play any breaking * sound effect. */ - psCreate(NULL, NULL, SFX_BOTTLE_BREAK + (random() % 2) * 2, -1, + ps_create(NULL, NULL, SFX_BOTTLE_BREAK + (random() % 2) * 2, -1, -1, 0, 0, PSTYPE_NONE, &prop->pos, -1.0f, prop->rooms, -1, -1.0f, -1.0f, -1.0f); } else if (type == SHARDTYPE_WOOD) { - psCreate(NULL, NULL, SFX_WOOD_BREAK, -1, + ps_create(NULL, NULL, SFX_WOOD_BREAK, -1, -1, 0, 0, PSTYPE_NONE, &prop->pos, -1.0f, prop->rooms, -1, -1.0f, -1.0f, -1.0f); } @@ -106,12 +106,12 @@ void shardsCreate(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 relxmi thispos.y = basepos.f[1] + x * (f32) speci * spcc[1] + spc0[1] * f20; thispos.z = basepos.f[2] + x * (f32) speci * spcc[2] + spc0[2] * f20; - shardCreate(prop->rooms[0], &thispos, f30, (RANDOMFRAC() * 0.7f + 0.1f) * spec, type); + shard_create(prop->rooms[0], &thispos, f30, (RANDOMFRAC() * 0.7f + 0.1f) * spec, type); } } } -void shardCreate(RoomNum room, struct coord *pos, f32 rotx, f32 size, s32 type) +void shard_create(RoomNum room, struct coord *pos, f32 rotx, f32 size, s32 type) { f32 velx = RANDOMFRAC() * 2.0f - 1.0f; f32 vely = RANDOMFRAC() * 1.12f - 0.12f; @@ -208,7 +208,7 @@ void shardCreate(RoomNum room, struct coord *pos, f32 rotx, f32 size, s32 type) } } -Gfx *shardsRenderWood(Gfx *gdl) +Gfx *shards_render_wood(Gfx *gdl) { if (g_ShardsActive) { RoomNum prevroom = 0; @@ -224,14 +224,14 @@ Gfx *shardsRenderWood(Gfx *gdl) gDPSetTextureFilter(gdl++, G_TF_BILERP); gDPSetCycleType(gdl++, G_CYC_2CYCLE); gDPSetTextureLOD(gdl++, G_TL_LOD); - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); for (i = 0; i < g_MaxShards; i++) { if (g_Shards[i].age60 > 0 && g_Shards[i].type == SHARDTYPE_WOOD) { bool render = true; f32 alphamult = 1.0f; f32 xraydist; - Mtxf *mtx = gfxAllocateMatrix(); + Mtxf *mtx = gfx_allocate_matrix(); u32 stack; if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { @@ -255,7 +255,7 @@ Gfx *shardsRenderWood(Gfx *gdl) if (render) { struct shard *shard = (struct shard *) ((u8 *)g_Shards + i * sizeof(struct shard)); - mtx4LoadRotationAndTranslation(&shard->pos, &shard->rot, &shardmtx); + mtx4_load_rotation_and_translation(&shard->pos, &shard->rot, &shardmtx); shardmtx.m[3][0] -= g_Vars.currentplayer->globaldrawworldoffset.x; shardmtx.m[3][1] -= g_Vars.currentplayer->globaldrawworldoffset.y; @@ -267,12 +267,12 @@ Gfx *shardsRenderWood(Gfx *gdl) && shardmtx.m[3][2] < 10000 && shardmtx.m[3][2] > -10000) #endif { - mtxF2L(&shardmtx, mtx); + mtx_f2l(&shardmtx, mtx); gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { - Col *colours = gfxAllocateColours(3); + Col *colours = gfx_allocate_colours(3); if (g_Shards[i].age60 >= TICKS(100)) { f32 frac = g_Shards[i].age60 / (PAL ? 41.666664123535f : 50.0f); @@ -296,7 +296,7 @@ Gfx *shardsRenderWood(Gfx *gdl) gSPColor(gdl++, osVirtualToPhysical(colours), 3); } else { if (g_Shards[i].room != prevroom) { - gdl = lightsSetForRoom(gdl, g_Shards[i].room); + gdl = lights_set_for_room(gdl, g_Shards[i].room); prevroom = g_Shards[i].room; } @@ -311,18 +311,18 @@ Gfx *shardsRenderWood(Gfx *gdl) } if (prevroom == 0) { - gdl = lightsSetDefault(gdl); + gdl = lights_set_default(gdl); } gSPClearGeometryMode(gdl++, G_LIGHTING | G_TEXTURE_GEN); - gSPMatrix(gdl++, camGetPerspectiveMtxL(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPMatrix(gdl++, camGetMtxL173c(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gdl++, cam_get_perspective_mtxl(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, cam_get_mtxl173c(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } return gdl; } -Gfx *shardsRenderGlass(Gfx *gdl) +Gfx *shards_render_glass(Gfx *gdl) { if (g_ShardsActive) { RoomNum prevroom = 0; @@ -331,9 +331,9 @@ Gfx *shardsRenderGlass(Gfx *gdl) s32 j; if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { - texSelect(&gdl, NULL, 2, 1, 2, 1, NULL); + tex_select(&gdl, NULL, 2, 1, 2, 1, NULL); } else { - texSelect(&gdl, &g_TexShardConfigs[1], 2, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexShardConfigs[1], 2, 1, 2, 1, NULL); } gSPTexture(gdl++, 0x0d80, 0x0d80, 2, G_TX_RENDERTILE, G_ON); @@ -346,14 +346,14 @@ Gfx *shardsRenderGlass(Gfx *gdl) gSPSetGeometryMode(gdl++, G_LIGHTING | G_TEXTURE_GEN); } - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); for (i = 0; i < g_MaxShards; i++) { if (g_Shards[i].age60 > 0 && g_Shards[i].type != SHARDTYPE_WOOD) { bool render = true; f32 alphamult = 1.0f; f32 xraydist; - Mtxf *mtx = gfxAllocateMatrix(); + Mtxf *mtx = gfx_allocate_matrix(); u32 stack; if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { @@ -377,7 +377,7 @@ Gfx *shardsRenderGlass(Gfx *gdl) if (render) { struct shard *shard = (struct shard *) ((u8 *)g_Shards + i * sizeof(struct shard)); - mtx4LoadRotationAndTranslation(&shard->pos, &shard->rot, &shardmtx); + mtx4_load_rotation_and_translation(&shard->pos, &shard->rot, &shardmtx); shardmtx.m[3][0] -= g_Vars.currentplayer->globaldrawworldoffset.x; shardmtx.m[3][1] -= g_Vars.currentplayer->globaldrawworldoffset.y; @@ -389,12 +389,12 @@ Gfx *shardsRenderGlass(Gfx *gdl) && shardmtx.m[3][2] < 10000 && shardmtx.m[3][2] > -10000) #endif { - mtxF2L(&shardmtx, mtx); + mtx_f2l(&shardmtx, mtx); gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { - Col *colours = gfxAllocateColours(3); + Col *colours = gfx_allocate_colours(3); if (g_Shards[i].age60 >= TICKS(100)) { f32 frac = g_Shards[i].age60 / (PAL ? 41.666664123535f : 50.0f); @@ -418,7 +418,7 @@ Gfx *shardsRenderGlass(Gfx *gdl) gSPColor(gdl++, osVirtualToPhysical(colours), 3); } else { if (g_Shards[i].room != prevroom) { - gdl = lightsSetForRoom(gdl, g_Shards[i].room); + gdl = lights_set_for_room(gdl, g_Shards[i].room); prevroom = g_Shards[i].room; } @@ -433,21 +433,21 @@ Gfx *shardsRenderGlass(Gfx *gdl) } if (prevroom == 0) { - gdl = lightsSetDefault(gdl); + gdl = lights_set_default(gdl); } gSPClearGeometryMode(gdl++, G_LIGHTING | G_TEXTURE_GEN); - gSPMatrix(gdl++, camGetPerspectiveMtxL(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPMatrix(gdl++, camGetMtxL173c(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPMatrix(gdl++, cam_get_perspective_mtxl(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, cam_get_mtxl173c(), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); } return gdl; } -Gfx *shardsRender(Gfx *gdl) +Gfx *shards_render(Gfx *gdl) { - gdl = shardsRenderWood(gdl); - gdl = shardsRenderGlass(gdl); + gdl = shards_render_wood(gdl); + gdl = shards_render_glass(gdl); return gdl; } diff --git a/src/game/shardsreset.c b/src/game/shardsreset.c index bd90c8b63..da1cef954 100644 --- a/src/game/shardsreset.c +++ b/src/game/shardsreset.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void shardsReset(void) +void shards_reset(void) { s32 i; @@ -22,7 +22,7 @@ void shardsReset(void) if (g_MaxShards == 0) { g_Shards = NULL; } else { - g_Shards = mempAlloc((g_MaxShards * sizeof(struct shard) + 0xf) & ~0xf, MEMPOOL_STAGE); + g_Shards = memp_alloc((g_MaxShards * sizeof(struct shard) + 0xf) & ~0xf, MEMPOOL_STAGE); for (i = 0; i < g_MaxShards; i++) { g_Shards[i].age60 = 0; diff --git a/src/game/shardsstop.c b/src/game/shardsstop.c index f865de31b..4b70000cc 100644 --- a/src/game/shardsstop.c +++ b/src/game/shardsstop.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void shardsStop(void) +void shards_stop(void) { s32 i; diff --git a/src/game/shardstick.c b/src/game/shardstick.c index 001c5cedf..f03f4cb9c 100644 --- a/src/game/shardstick.c +++ b/src/game/shardstick.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void shardsTick(void) +void shards_tick(void) { f32 lvupdate; s32 i; diff --git a/src/game/sight.c b/src/game/sight.c index 2785ab160..d2b5d2605 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -23,7 +23,7 @@ /** * Return true if the prop is considered friendly (blue sight). */ -bool sightIsPropFriendly(struct prop *prop) +bool sight_is_prop_friendly(struct prop *prop) { if (prop == NULL) { prop = g_Vars.currentplayer->lookingatprop.prop; @@ -51,7 +51,7 @@ bool sightIsPropFriendly(struct prop *prop) return true; } - return chrCompareTeams(g_Vars.currentplayer->prop->chr, prop->chr, COMPARE_FRIENDS); + return chr_compare_teams(g_Vars.currentplayer->prop->chr, prop->chr, COMPARE_FRIENDS); } void sight0f0d715c(void) @@ -67,7 +67,7 @@ Gfx *sight0f0d7164(Gfx *gdl) /** * Return true if the given prop can be added to the target list. */ -bool sightCanTargetProp(struct prop *prop, s32 max) +bool sight_can_target_prop(struct prop *prop, s32 max) { s32 i; @@ -90,7 +90,7 @@ bool sightCanTargetProp(struct prop *prop, s32 max) return true; } - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_ROCKETLAUNCHER) { + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_ROCKETLAUNCHER) { return true; } @@ -100,7 +100,7 @@ bool sightCanTargetProp(struct prop *prop, s32 max) /** * Return true if the sight should change colour when aiming at the given prop. */ -bool sightIsReactiveToProp(struct prop *prop) +bool sight_is_reactive_to_prop(struct prop *prop) { if (prop->obj == NULL) { return false; @@ -114,14 +114,14 @@ bool sightIsReactiveToProp(struct prop *prop) return true; } - if (objGetDestroyedLevel(obj) > 0) { + if (obj_get_destroyed_level(obj) > 0) { return false; } } else if (prop->type == PROPTYPE_CHR) { struct chrdata *chr = prop->chr; if (chr && chr->race == RACE_EYESPY) { - struct eyespy *eyespy = chrToEyespy(chr); + struct eyespy *eyespy = chr_to_eyespy(chr); if (!eyespy || !eyespy->deployed) { return false; @@ -132,7 +132,7 @@ bool sightIsReactiveToProp(struct prop *prop) return true; } -s32 sightFindFreeTargetIndex(s32 max) +s32 sight_find_free_target_index(s32 max) { s32 i; @@ -154,14 +154,14 @@ void func0f0d7364(void) } } -void sightTick(bool sighton) +void sight_tick(bool sighton) { struct trackedprop *trackedprop; u8 newtracktype; s32 i; s32 index; - struct invaimsettings *gunsettings = gsetGetAimSettings(&g_Vars.currentplayer->hands[0].gset); - struct weaponfunc *func = weaponGetFunctionById(g_Vars.currentplayer->hands[0].gset.weaponnum, + struct invaimsettings *gunsettings = gset_get_aim_settings(&g_Vars.currentplayer->hands[0].gset); + struct weaponfunc *func = weapon_get_function_by_id(g_Vars.currentplayer->hands[0].gset.weaponnum, g_Vars.currentplayer->hands[0].gset.weaponfunc); g_Vars.currentplayer->sighttimer240 += g_Vars.lvupdate240; @@ -184,7 +184,7 @@ void sightTick(bool sighton) newtracktype = gunsettings->tracktype; - if (gsetHasFunctionFlags(&g_Vars.currentplayer->hands[0].gset, FUNCFLAG_THREATDETECTOR)) { + if (gset_has_function_flags(&g_Vars.currentplayer->hands[0].gset, FUNCFLAG_THREATDETECTOR)) { newtracktype = SIGHTTRACKTYPE_THREATDETECTOR; } @@ -220,14 +220,14 @@ void sightTick(bool sighton) for (i = 0; i < ARRAYCOUNT(g_Vars.currentplayer->trackedprops); i++) { trackedprop = &g_Vars.currentplayer->trackedprops[i]; - if (trackedprop->prop && !sightIsReactiveToProp(trackedprop->prop)) { + if (trackedprop->prop && !sight_is_reactive_to_prop(trackedprop->prop)) { trackedprop->prop = NULL; } } trackedprop = &g_Vars.currentplayer->lookingatprop; - if (trackedprop->prop && !sightIsReactiveToProp(trackedprop->prop)) { + if (trackedprop->prop && !sight_is_reactive_to_prop(trackedprop->prop)) { trackedprop->prop = NULL; } @@ -260,8 +260,8 @@ void sightTick(bool sighton) case SIGHTTRACKTYPE_ROCKETLAUNCHER: // Conditionally copy lookingatprop to trackedprops[0], but only if that slot is empty if (sighton && g_Vars.currentplayer->lookingatprop.prop - && sightCanTargetProp(g_Vars.currentplayer->lookingatprop.prop, 1)) { - index = sightFindFreeTargetIndex(1); + && sight_can_target_prop(g_Vars.currentplayer->lookingatprop.prop, 1)) { + index = sight_find_free_target_index(1); if (index >= 0) { struct sndstate *handle; @@ -283,8 +283,8 @@ void sightTick(bool sighton) case SIGHTTRACKTYPE_FOLLOWLOCKON: // Conditionally copy lookingatprop to any trackedprops slot, but only if the slot is empty if (sighton && g_Vars.currentplayer->lookingatprop.prop - && sightCanTargetProp(g_Vars.currentplayer->lookingatprop.prop, 4)) { - index = sightFindFreeTargetIndex(4); + && sight_can_target_prop(g_Vars.currentplayer->lookingatprop.prop, 4)) { + index = sight_find_free_target_index(4); if (index >= 0) { struct sndstate *handle; @@ -317,7 +317,7 @@ void sightTick(bool sighton) * The arguments here are named for a left border, * but can be called for any of the four edges. */ -s32 sightCalculateBoxBound(s32 targetx, s32 viewleft, s32 timeelapsed, s32 timeend) +s32 sight_calculate_box_bound(s32 targetx, s32 viewleft, s32 timeelapsed, s32 timeend) { s32 value; @@ -341,12 +341,12 @@ s32 sightCalculateBoxBound(s32 targetx, s32 viewleft, s32 timeelapsed, s32 timee * 6 to label it as "5" * 7 or above to treat textid as a proper language text ID. */ -Gfx *sightDrawTargetBox(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s32 time) +Gfx *sight_draw_target_box(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s32 time) { - s32 viewleft = viGetViewLeft() / g_ScaleX; - s32 viewtop = viGetViewTop(); - s32 viewwidth = viGetViewWidth() / g_ScaleX; - s32 viewheight = viGetViewHeight(); + s32 viewleft = vi_get_view_left() / g_ScaleX; + s32 viewtop = vi_get_view_top(); + s32 viewwidth = vi_get_view_width() / g_ScaleX; + s32 viewheight = vi_get_view_height(); s32 viewright = viewleft + viewwidth - 1; s32 viewbottom = viewtop + viewheight - 1; u32 colour; @@ -360,15 +360,15 @@ Gfx *sightDrawTargetBox(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s time = TICKS(512); } - boxleft = sightCalculateBoxBound(trackedprop->x1 / g_ScaleX, viewleft, time, TICKS(80)); - boxtop = sightCalculateBoxBound(trackedprop->y1, viewtop, time, TICKS(80)); - boxright = sightCalculateBoxBound(trackedprop->x2 / g_ScaleX, viewright, time, TICKS(80)); - boxbottom = sightCalculateBoxBound(trackedprop->y2, viewbottom, time, TICKS(80)); + boxleft = sight_calculate_box_bound(trackedprop->x1 / g_ScaleX, viewleft, time, TICKS(80)); + boxtop = sight_calculate_box_bound(trackedprop->y1, viewtop, time, TICKS(80)); + boxright = sight_calculate_box_bound(trackedprop->x2 / g_ScaleX, viewright, time, TICKS(80)); + boxbottom = sight_calculate_box_bound(trackedprop->y2, viewbottom, time, TICKS(80)); if (trackedprop->prop) { - colour = sightIsPropFriendly(trackedprop->prop) ? 0x000ff60 : 0xff000060; + colour = sight_is_prop_friendly(trackedprop->prop) ? 0x000ff60 : 0xff000060; - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); // Left if (boxleft >= viewleft && boxleft <= viewright && boxtop <= viewbottom && boxbottom >= viewtop) { @@ -414,13 +414,13 @@ Gfx *sightDrawTargetBox(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s // textid 1 writes '0' label[0] = textid + 0x2f; - gdl = textRender(gdl, &x, &y, label, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, label, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x000000a0, vi_get_width(), vi_get_height(), 0, 0); } else { - char *text = langGet(textid); + char *text = lang_get(textid); #if VERSION >= VERSION_JPN_FINAL - gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); + gdl = func0f1574d0jf(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, vi_get_width(), vi_get_height(), 0, 0); #endif } } @@ -429,16 +429,16 @@ Gfx *sightDrawTargetBox(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s return gdl; } -Gfx *sightDrawAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colour) +Gfx *sight_draw_aimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colour) { - s32 viewleft = viGetViewLeft() / g_ScaleX; - s32 viewtop = viGetViewTop(); - s32 viewwidth = viGetViewWidth() / g_ScaleX; - s32 viewheight = viGetViewHeight(); + s32 viewleft = vi_get_view_left() / g_ScaleX; + s32 viewtop = vi_get_view_top(); + s32 viewwidth = vi_get_view_width() / g_ScaleX; + s32 viewheight = vi_get_view_height(); s32 viewright = viewleft + viewwidth - 1; s32 viewbottom = viewtop + viewheight - 1; - gdl = textSetPrimColour(gdl, 0x00ff0028); + gdl = text_set_prim_colour(gdl, 0x00ff0028); // Draw the lines that span most of the viewport if (PLAYERCOUNT() == 1) { @@ -454,7 +454,7 @@ Gfx *sightDrawAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colou } gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); // Draw the box gDPHudRectangle(gdl++, x - radius, y - radius, x - radius, y + radius); @@ -492,7 +492,7 @@ Gfx *sightDrawAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colou * checks. It's likely that this feature was just a concept and was dropped * pretty early. */ -Gfx *sightDrawDelayedAimer(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) { s32 boxx; s32 boxy; @@ -584,7 +584,7 @@ Gfx *sightDrawDelayedAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u3 boxx = xpos; boxy = ypos; - gdl = textSetPrimColour(gdl, 0x00ff0028); + gdl = text_set_prim_colour(gdl, 0x00ff0028); // Fill a 3x3 box at the live crosshair gDPHudRectangle(gdl++, x - 1, y - 1, x + 1, y - 1); @@ -593,7 +593,7 @@ Gfx *sightDrawDelayedAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u3 gdl = text0f153838(gdl); - gdl = textSetPrimColour(gdl, colour); + gdl = text_set_prim_colour(gdl, colour); // Draw the box gDPHudRectangle(gdl++, boxx - radius, boxy - radius, boxx - radius, boxy + radius); @@ -616,7 +616,7 @@ Gfx *sightDrawDelayedAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u3 return gdl; } -Gfx *sightDrawDefault(Gfx *gdl, bool sighton) +Gfx *sight_draw_default(Gfx *gdl, bool sighton) { s32 radius; s32 cornergap; @@ -641,7 +641,7 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) colour = 0x00ff0028; radius = 8; cornergap = 5; - gdl = sightDrawAimer(gdl, x, y, radius, cornergap, colour); + gdl = sight_draw_aimer(gdl, x, y, radius, cornergap, colour); } break; case SIGHTTRACKTYPE_DEFAULT: @@ -652,19 +652,19 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) radius = 8; cornergap = 5; } else { - colour = sightIsPropFriendly(NULL) ? 0x0000ff60 : 0xff000060; + colour = sight_is_prop_friendly(NULL) ? 0x0000ff60 : 0xff000060; radius = 6; cornergap = 3; } - mainOverrideVariable("sight", &sight); + main_override_variable("sight", &sight); switch (sight) { case 0: - gdl = sightDrawAimer(gdl, x, y, radius, cornergap, colour); + gdl = sight_draw_aimer(gdl, x, y, radius, cornergap, colour); break; case 1: - gdl = sightDrawDelayedAimer(gdl, x, y, radius * 2, cornergap * 2, colour); + gdl = sight_draw_delayed_aimer(gdl, x, y, radius * 2, cornergap * 2, colour); break; } } @@ -681,7 +681,7 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) radius = 8; cornergap = 5; } else { - colour = sightIsPropFriendly(NULL) ? 0x0000ff60 : 0xff000060; + colour = sight_is_prop_friendly(NULL) ? 0x0000ff60 : 0xff000060; radius = 6; cornergap = 3; } @@ -694,20 +694,20 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) if (identifytimer & 0x80) { // "Identify" #if VERSION == VERSION_JPN_FINAL - gdl = func0f1574d0jf(gdl, &textx, &texty, langGet(L_MISC_439), + gdl = func0f1574d0jf(gdl, &textx, &texty, lang_get(L_MISC_439), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, - viGetWidth(), viGetHeight(), 0, 0); + vi_get_width(), vi_get_height(), 0, 0); #else - gdl = textRender(gdl, &textx, &texty, langGet(L_MISC_439), + gdl = text_render(gdl, &textx, &texty, lang_get(L_MISC_439), g_CharsHandelGothicXs, g_FontHandelGothicXs, 0x00ff00a0, 0x000000a0, - viGetWidth(), viGetHeight(), 0, 0); + vi_get_width(), vi_get_height(), 0, 0); #endif } - gdl = sightDrawAimer(gdl, x, y, radius, cornergap, colour); + gdl = sight_draw_aimer(gdl, x, y, radius, cornergap, colour); if (g_Vars.currentplayer->lookingatprop.prop) { - gdl = sightDrawTargetBox(gdl, &g_Vars.currentplayer->lookingatprop, 1, g_Vars.currentplayer->targetset[0]); + gdl = sight_draw_target_box(gdl, &g_Vars.currentplayer->lookingatprop, 1, g_Vars.currentplayer->targetset[0]); } } break; @@ -716,7 +716,7 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) trackedprop = &g_Vars.currentplayer->trackedprops[i]; if (trackedprop->prop) { - gdl = sightDrawTargetBox(gdl, trackedprop, 0, g_Vars.currentplayer->targetset[i]); + gdl = sight_draw_target_box(gdl, trackedprop, 0, g_Vars.currentplayer->targetset[i]); } } @@ -726,12 +726,12 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) radius = 8; cornergap = 5; } else { - colour = sightIsPropFriendly(NULL) ? 0x0000ff60 : 0xff000060; + colour = sight_is_prop_friendly(NULL) ? 0x0000ff60 : 0xff000060; radius = 6; cornergap = 3; } - gdl = sightDrawAimer(gdl, x, y, radius, cornergap, colour); + gdl = sight_draw_aimer(gdl, x, y, radius, cornergap, colour); } break; case SIGHTTRACKTYPE_FOLLOWLOCKON: @@ -783,10 +783,10 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) } } - gdl = sightDrawTargetBox(gdl, trackedprop, textid, g_Vars.currentplayer->targetset[i]); + gdl = sight_draw_target_box(gdl, trackedprop, textid, g_Vars.currentplayer->targetset[i]); } else { // CMP150-tracked prop - gdl = sightDrawTargetBox(gdl, trackedprop, i + 2, g_Vars.currentplayer->targetset[i]); + gdl = sight_draw_target_box(gdl, trackedprop, i + 2, g_Vars.currentplayer->targetset[i]); } } } @@ -797,12 +797,12 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) radius = 8; cornergap = 5; } else { - colour = sightIsPropFriendly(NULL) ? 0x0000ff60 : 0xff000060; + colour = sight_is_prop_friendly(NULL) ? 0x0000ff60 : 0xff000060; radius = 6; cornergap = 3; } - gdl = sightDrawAimer(gdl, x, y, radius, cornergap, colour); + gdl = sight_draw_aimer(gdl, x, y, radius, cornergap, colour); } break; } @@ -812,7 +812,7 @@ Gfx *sightDrawDefault(Gfx *gdl, bool sighton) return gdl; } -Gfx *sightDrawClassic(Gfx *gdl, bool sighton) +Gfx *sight_draw_classic(Gfx *gdl, bool sighton) { struct textureconfig *tconfig = &g_TexGeCrosshairConfigs[0]; f32 spc4[2]; @@ -854,7 +854,7 @@ Gfx *sightDrawClassic(Gfx *gdl, bool sighton) spbc[0] = (tconfig->width >> 1) * (f32)g_ScaleX; spbc[1] = tconfig->height >> 1; - texSelect(&gdl, tconfig, 2, 0, 0, 1, NULL); + tex_select(&gdl, tconfig, 2, 0, 0, 1, NULL); func0f0b278c(&gdl, spc4, spbc, tconfig->width, tconfig->height, 0, 0, 1, 0xff, 0xff, 0xff, 0x7f, tconfig->level > 0, 0); @@ -871,9 +871,9 @@ Gfx *sightDrawClassic(Gfx *gdl, bool sighton) return gdl; } -Gfx *sightDrawType2(Gfx *gdl, bool sighton) +Gfx *sight_draw_type2(Gfx *gdl, bool sighton) { - return sightDrawClassic(gdl, sighton); + return sight_draw_classic(gdl, sighton); } #define COLOUR_LIGHTRED 0xff555564 @@ -886,11 +886,11 @@ Gfx *sightDrawType2(Gfx *gdl, bool sighton) #define DIR_LEFT 2 #define DIR_RIGHT 3 -Gfx *sightDrawSkedarTriangle(Gfx *gdl, s32 x, s32 y, s32 dir, u32 colour) +Gfx *sight_draw_skedar_triangle(Gfx *gdl, s32 x, s32 y, s32 dir, u32 colour) { s32 points[6]; - Vtx *vertices = gfxAllocateVertices(3); - Col *colours = gfxAllocateColours(2); + Vtx *vertices = gfx_allocate_vertices(3); + Col *colours = gfx_allocate_colours(2); switch (dir) { case DIR_UP: @@ -943,7 +943,7 @@ Gfx *sightDrawSkedarTriangle(Gfx *gdl, s32 x, s32 y, s32 dir, u32 colour) // use two shades of red. The second colour is used when zeroing the sight // in on a new target. Because of this bug, targeting an ally with the // Mauler or Reaper will show a red crosshair while it's still zeroing. - if (colour == COLOUR_DARKRED && sightIsPropFriendly(NULL)) { + if (colour == COLOUR_DARKRED && sight_is_prop_friendly(NULL)) { colour = COLOUR_DARKBLUE; } @@ -963,12 +963,12 @@ Gfx *sightDrawSkedarTriangle(Gfx *gdl, s32 x, s32 y, s32 dir, u32 colour) return gdl; } -Gfx *sightDrawSkedar(Gfx *gdl, bool sighton) +Gfx *sight_draw_skedar(Gfx *gdl, bool sighton) { - s32 viewleft = viGetViewLeft() / g_ScaleX; - s32 viewtop = viGetViewTop(); - s32 viewwidth = viGetViewWidth() / g_ScaleX; - s32 viewheight = viGetViewHeight(); + s32 viewleft = vi_get_view_left() / g_ScaleX; + s32 viewtop = vi_get_view_top(); + s32 viewwidth = vi_get_view_width() / g_ScaleX; + s32 viewheight = vi_get_view_height(); s32 viewright = viewleft + viewwidth - 1; s32 viewbottom = viewtop + viewheight - 1; s32 paddingy = viewheight / 4; @@ -1043,7 +1043,7 @@ Gfx *sightDrawSkedar(Gfx *gdl, bool sighton) } } - gdl = sightDrawSkedarTriangle(gdl, trix1, triy1, dir, colour); + gdl = sight_draw_skedar_triangle(gdl, trix1, triy1, dir, colour); // Outer bottom triangle if (!hasprop) { @@ -1069,7 +1069,7 @@ Gfx *sightDrawSkedar(Gfx *gdl, bool sighton) } } - gdl = sightDrawSkedarTriangle(gdl, trix1, triy1, dir, colour); + gdl = sight_draw_skedar_triangle(gdl, trix1, triy1, dir, colour); // Outer right triangle if (!hasprop) { @@ -1104,7 +1104,7 @@ Gfx *sightDrawSkedar(Gfx *gdl, bool sighton) } } - gdl = sightDrawSkedarTriangle(gdl, trix2, triy2, dir, colour); + gdl = sight_draw_skedar_triangle(gdl, trix2, triy2, dir, colour); // Outer left triangle if (!hasprop) { @@ -1130,16 +1130,16 @@ Gfx *sightDrawSkedar(Gfx *gdl, bool sighton) } } - gdl = sightDrawSkedarTriangle(gdl, trix2, triy2, dir, colour); + gdl = sight_draw_skedar_triangle(gdl, trix2, triy2, dir, colour); // Inner triangles if (!hasprop || g_Vars.currentplayer->sighttimer240 < TICKS(48)) { colour = hasprop ? COLOUR_LIGHTRED : COLOUR_GREEN; - gdl = sightDrawSkedarTriangle(gdl, x + 0, y - 2, DIR_DOWN, colour); - gdl = sightDrawSkedarTriangle(gdl, x + 0, y + 2, DIR_UP, colour); - gdl = sightDrawSkedarTriangle(gdl, x - 2, y + 0, DIR_RIGHT, colour); - gdl = sightDrawSkedarTriangle(gdl, x + 2, y + 0, DIR_LEFT, colour); + gdl = sight_draw_skedar_triangle(gdl, x + 0, y - 2, DIR_DOWN, colour); + gdl = sight_draw_skedar_triangle(gdl, x + 0, y + 2, DIR_UP, colour); + gdl = sight_draw_skedar_triangle(gdl, x - 2, y + 0, DIR_RIGHT, colour); + gdl = sight_draw_skedar_triangle(gdl, x + 2, y + 0, DIR_LEFT, colour); } gdl = func0f0d49c8(gdl); @@ -1147,12 +1147,12 @@ Gfx *sightDrawSkedar(Gfx *gdl, bool sighton) return gdl; } -Gfx *sightDrawZoom(Gfx *gdl, bool sighton) +Gfx *sight_draw_zoom(Gfx *gdl, bool sighton) { - s32 viewleft = viGetViewLeft() / g_ScaleX; - s32 viewtop = viGetViewTop(); - s32 viewhalfwidth = (viGetViewWidth() / g_ScaleX) >> 1; - s32 viewhalfheight = viGetViewHeight() >> 1; + s32 viewleft = vi_get_view_left() / g_ScaleX; + s32 viewtop = vi_get_view_top(); + s32 viewhalfwidth = (vi_get_view_width() / g_ScaleX) >> 1; + s32 viewhalfheight = vi_get_view_height() >> 1; s32 viewright = viewleft + viewhalfwidth * 2 - 1; s32 viewbottom = viewtop + viewhalfheight * 2 - 1; f32 maxfovy; @@ -1183,10 +1183,10 @@ Gfx *sightDrawZoom(Gfx *gdl, bool sighton) cornerwidth = (viewhalfwidth >> 1) - 60; cornerheight = (viewhalfheight >> 1) - 22; - showzoomrange = optionsGetShowZoomRange(g_Vars.currentplayerstats->mpindex) - && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex); + showzoomrange = options_get_show_zoom_range(g_Vars.currentplayerstats->mpindex) + && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex); - maxfovy = currentPlayerGetGunZoomFov(); + maxfovy = current_player_get_gun_zoom_fov(); zoominfovy = g_Vars.currentplayer->zoominfovy; if (maxfovy == 0.0f || maxfovy == 60.0f) { @@ -1199,7 +1199,7 @@ Gfx *sightDrawZoom(Gfx *gdl, bool sighton) if (showzoomrange) { gdl = text0f153628(gdl); - gdl = textSetPrimColour(gdl, 0x00ff0028); + gdl = text_set_prim_colour(gdl, 0x00ff0028); if (frac < 0.2f) { cornerwidth *= 0.2f; @@ -1280,17 +1280,17 @@ Gfx *sightDrawZoom(Gfx *gdl, bool sighton) gdl = text0f153780(gdl); } - gdl = sightDrawDefault(gdl, sighton); + gdl = sight_draw_default(gdl, sighton); return gdl; } -Gfx *sightDrawMaian(Gfx *gdl, bool sighton) +Gfx *sight_draw_maian(Gfx *gdl, bool sighton) { - s32 viewleft = viGetViewLeft() / g_ScaleX; - s32 viewtop = viGetViewTop(); - s32 viewwidth = viGetViewWidth() / g_ScaleX; - s32 viewheight = viGetViewHeight(); + s32 viewleft = vi_get_view_left() / g_ScaleX; + s32 viewtop = vi_get_view_top(); + s32 viewwidth = vi_get_view_width() / g_ScaleX; + s32 viewheight = vi_get_view_height(); s32 viewright = viewleft + viewwidth - 1; s32 viewbottom = viewtop + viewheight - 1; s32 x = (s32)g_Vars.currentplayer->crosspos[0] / g_ScaleX; @@ -1305,12 +1305,12 @@ Gfx *sightDrawMaian(Gfx *gdl, bool sighton) return gdl; } - if (sightIsPropFriendly(NULL)) { + if (sight_is_prop_friendly(NULL)) { colour = 0x0000ff60; } - vertices = gfxAllocateVertices(8); - colours = gfxAllocateColours(2); + vertices = gfx_allocate_vertices(8); + colours = gfx_allocate_colours(2); gdl = func0f0d479c(gdl); gSPClearGeometryMode(gdl++, G_CULL_BOTH); @@ -1369,7 +1369,7 @@ Gfx *sightDrawMaian(Gfx *gdl, bool sighton) gSPTri4(gdl++, 0, 4, 5, 5, 3, 6, 7, 6, 1, 4, 7, 2); gdl = func0f0d49c8(gdl); - gdl = textSetPrimColour(gdl, 0x00ff0028); + gdl = text_set_prim_colour(gdl, 0x00ff0028); // Draw border over inner points gDPHudRectangle(gdl++, x - 4, y - 4, x - 4, y + 4); // left @@ -1382,7 +1382,7 @@ Gfx *sightDrawMaian(Gfx *gdl, bool sighton) return gdl; } -Gfx *sightDrawTarget(Gfx *gdl) +Gfx *sight_draw_target(Gfx *gdl) { s32 x = (s32)g_Vars.currentplayer->crosspos[0] / g_ScaleX; s32 y = g_Vars.currentplayer->crosspos[1]; @@ -1390,10 +1390,10 @@ Gfx *sightDrawTarget(Gfx *gdl) static u32 var80070f9c = 0x00ff00ff; static u32 var80070fa0 = 0x00ff0011; - mainOverrideVariable("sout", &var80070f9c); - mainOverrideVariable("sin", &var80070fa0); + main_override_variable("sout", &var80070f9c); + main_override_variable("sin", &var80070fa0); - gdl = textSetPrimColour(gdl, 0x00ff0028); + gdl = text_set_prim_colour(gdl, 0x00ff0028); gDPHudRectangle(gdl++, x + 2, y + 0, x + 6, y + 0); gDPHudRectangle(gdl++, x + 2, y + 0, x + 4, y + 0); @@ -1409,7 +1409,7 @@ Gfx *sightDrawTarget(Gfx *gdl) return gdl; } -bool sightHasTargetWhileAiming(s32 sight) +bool sight_has_target_while_aiming(s32 sight) { if (sight == SIGHT_DEFAULT || sight == SIGHT_ZOOM) { return true; @@ -1421,7 +1421,7 @@ bool sightHasTargetWhileAiming(s32 sight) /** * sighton is true if the player is using the aimer (ie. holding R). */ -Gfx *sightDraw(Gfx *gdl, bool sighton, s32 sight) +Gfx *sight_draw(Gfx *gdl, bool sighton, s32 sight) { if (sight); @@ -1447,41 +1447,41 @@ Gfx *sightDraw(Gfx *gdl, bool sighton, s32 sight) sight = SIGHT_DEFAULT; } - sightTick(sighton); + sight_tick(sighton); switch (sight) { case SIGHT_DEFAULT: - gdl = sightDrawDefault(gdl, sighton && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)); + gdl = sight_draw_default(gdl, sighton && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)); break; case SIGHT_CLASSIC: - gdl = sightDrawClassic(gdl, sighton && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)); + gdl = sight_draw_classic(gdl, sighton && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)); break; case SIGHT_2: - gdl = sightDrawType2(gdl, sighton && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)); + gdl = sight_draw_type2(gdl, sighton && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)); break; case SIGHT_3: - gdl = sightDrawDefault(gdl, sighton && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)); + gdl = sight_draw_default(gdl, sighton && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)); break; case SIGHT_SKEDAR: - gdl = sightDrawSkedar(gdl, sighton && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)); + gdl = sight_draw_skedar(gdl, sighton && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)); break; case SIGHT_ZOOM: - gdl = sightDrawZoom(gdl, sighton && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)); + gdl = sight_draw_zoom(gdl, sighton && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)); break; case SIGHT_MAIAN: - gdl = sightDrawMaian(gdl, sighton && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)); + gdl = sight_draw_maian(gdl, sighton && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)); break; default: - gdl = sightDrawDefault(gdl, sighton && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)); + gdl = sight_draw_default(gdl, sighton && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)); break; case SIGHT_NONE: break; } - if (sight != SIGHT_NONE && optionsGetSightOnScreen(g_Vars.currentplayerstats->mpindex)) { - if ((optionsGetAlwaysShowTarget(g_Vars.currentplayerstats->mpindex) && !sighton) - || (sighton && sightHasTargetWhileAiming(sight))) { - gdl = sightDrawTarget(gdl); + if (sight != SIGHT_NONE && options_get_sight_on_screen(g_Vars.currentplayerstats->mpindex)) { + if ((options_get_always_show_target(g_Vars.currentplayerstats->mpindex) && !sighton) + || (sighton && sight_has_target_while_aiming(sight))) { + gdl = sight_draw_target(gdl); } } diff --git a/src/game/sky.c b/src/game/sky.c index e28832fe5..d31f58ad5 100644 --- a/src/game/sky.c +++ b/src/game/sky.c @@ -45,19 +45,19 @@ f32 g_SkyWindSpeed = 1; f32 g_SunAlphaFracs[3] = {0}; s32 g_SunFlareTimers240[3] = {0}; -void skyGetWorldPosFromScreenPos(f32 left, f32 top, struct coord *dst) +void sky_get_world_pos_from_screen_pos(f32 left, f32 top, struct coord *dst) { - Mtxf *mtx = camGetProjectionMtxF(); + Mtxf *mtx = cam_get_projection_mtxf(); f32 pos[2]; - pos[0] = left + camGetScreenLeft(); - pos[1] = top + camGetScreenTop() + envGetCurrent()->clouds_height; + pos[0] = left + cam_get_screen_left(); + pos[1] = top + cam_get_screen_top() + env_get_current()->clouds_height; cam0f0b4c3c(pos, dst, 100); - mtx4RotateVecInPlace(mtx, dst); + mtx4_rotate_vec_in_place(mtx, dst); } -bool skyIsScreenCornerInSky(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac) +bool sky_is_screen_corner_in_sky(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac) { struct coord *campos = &g_Vars.currentplayer->cam_pos; f32 f12 = 2.0f * corner3dpos->y / sqrtf(corner3dpos->f[0] * corner3dpos->f[0] + corner3dpos->f[2] * corner3dpos->f[2] + 0.0001f); @@ -79,7 +79,7 @@ bool skyIsScreenCornerInSky(struct coord *corner3dpos, struct coord *dstpos, f32 } if (sp24 > 0.0f) { - sp2c = (envGetCurrent()->clouds_scale - campos->y) / sp24; + sp2c = (env_get_current()->clouds_scale - campos->y) / sp24; f12_2 = sqrtf(corner3dpos->f[0] * corner3dpos->f[0] + corner3dpos->f[2] * corner3dpos->f[2]) * sp2c; if (f12_2 > 300000) { @@ -96,7 +96,7 @@ bool skyIsScreenCornerInSky(struct coord *corner3dpos, struct coord *dstpos, f32 return false; } -bool skyIsCornerInWater(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac) +bool sky_is_corner_in_water(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac) { struct coord *campos = &g_Vars.currentplayer->cam_pos; f32 f12 = -2.0f * corner3dpos->y / sqrtf(corner3dpos->f[0] * corner3dpos->f[0] + corner3dpos->f[2] * corner3dpos->f[2] + 0.0001f); @@ -118,7 +118,7 @@ bool skyIsCornerInWater(struct coord *corner3dpos, struct coord *dstpos, f32 *ds } if (sp24 < 0.0f) { - sp2c = (envGetCurrent()->water_scale - campos->y) / sp24; + sp2c = (env_get_current()->water_scale - campos->y) / sp24; f12_2 = sqrtf(corner3dpos->f[0] * corner3dpos->f[0] + corner3dpos->f[2] * corner3dpos->f[2]) * sp2c; if (f12_2 > 300000) { @@ -139,7 +139,7 @@ bool skyIsCornerInWater(struct coord *corner3dpos, struct coord *dstpos, f32 *ds * Scale base based on the height percentage between base and ref... * except the new y is zero. */ -void skyCalculateEdgeVertex(struct coord *base, struct coord *ref, struct coord *out) +void sky_calculate_edge_vertex(struct coord *base, struct coord *ref, struct coord *out) { f32 mult = base->y / (base->y - ref->y); @@ -148,7 +148,7 @@ void skyCalculateEdgeVertex(struct coord *base, struct coord *ref, struct coord out->z = (ref->z - base->z) * mult + base->z; } -f32 skyClamp(f32 value, f32 min, f32 max) +f32 sky_clamp(f32 value, f32 min, f32 max) { if (value < min) { return min; @@ -161,14 +161,14 @@ f32 skyClamp(f32 value, f32 min, f32 max) return value; } -f32 skyRound(f32 value) +f32 sky_round(f32 value) { return (s32)(value + 0.5f); } -void skyChooseCloudVtxColour(struct skyvtx3d *arg0, f32 arg1) +void sky_choose_cloud_vtx_colour(struct skyvtx3d *arg0, f32 arg1) { - struct environment *env = envGetCurrent(); + struct environment *env = env_get_current(); f32 scale = 1.0f - arg1; f32 r = env->sky_r; f32 g = env->sky_g; @@ -185,9 +185,9 @@ void skyChooseCloudVtxColour(struct skyvtx3d *arg0, f32 arg1) arg0->a = 0xff; } -void skyChooseWaterVtxColour(struct skyvtx3d *arg0, f32 arg1) +void sky_choose_water_vtx_colour(struct skyvtx3d *arg0, f32 arg1) { - struct environment *env = envGetCurrent(); + struct environment *env = env_get_current(); f32 scale = 1.0f - arg1; f32 r = env->sky_r; f32 g = env->sky_g; @@ -199,7 +199,7 @@ void skyChooseWaterVtxColour(struct skyvtx3d *arg0, f32 arg1) arg0->a = 0xff; } -Gfx *skyRender(Gfx *gdl) +Gfx *sky_render(Gfx *gdl) { struct coord tl3dpos; struct coord tr3dpos; @@ -258,21 +258,21 @@ Gfx *skyRender(Gfx *gdl) struct environment *env; sp430 = false; - env = envGetCurrent(); + env = env_get_current(); if (!env->clouds_enabled || g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { if (PLAYERCOUNT() == 1) { gDPSetCycleType(gdl++, G_CYC_FILL); if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { - gdl = viSetFillColour(gdl, 0, 0, 0); + gdl = vi_set_fill_colour(gdl, 0, 0, 0); } else { - gdl = viSetFillColour(gdl, env->sky_r, env->sky_g, env->sky_b); + gdl = vi_set_fill_colour(gdl, env->sky_r, env->sky_g, env->sky_b); } - gDPFillRectangle(gdl++, viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth() - 1, - viGetViewTop() + viGetViewHeight() - 1); + gDPFillRectangle(gdl++, vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width() - 1, + vi_get_view_top() + vi_get_view_height() - 1); gDPPipeSync(gdl++); return gdl; @@ -282,9 +282,9 @@ Gfx *skyRender(Gfx *gdl) gDPSetCycleType(gdl++, G_CYC_FILL); if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { - gdl = viSetFillColour(gdl, 0, 0, 0); + gdl = vi_set_fill_colour(gdl, 0, 0, 0); } else { - gdl = viSetFillColour(gdl, env->sky_r, env->sky_g, env->sky_b); + gdl = vi_set_fill_colour(gdl, env->sky_r, env->sky_g, env->sky_b); } gDPSetRenderMode(gdl++, G_RM_NOOP, G_RM_NOOP2); @@ -298,63 +298,63 @@ Gfx *skyRender(Gfx *gdl) return gdl; } - gdl = viSetFillColour(gdl, env->sky_r, env->sky_g, env->sky_b); + gdl = vi_set_fill_colour(gdl, env->sky_r, env->sky_g, env->sky_b); if (&tl3dpos); - skyGetWorldPosFromScreenPos(0.0f, 0.0f, &tl3dpos); - skyGetWorldPosFromScreenPos(camGetScreenWidth() - 0.1f, 0.0f, &tr3dpos); - skyGetWorldPosFromScreenPos(0.0f, camGetScreenHeight() - 0.1f, &bl3dpos); - skyGetWorldPosFromScreenPos(camGetScreenWidth() - 0.1f, camGetScreenHeight() - 0.1f, &br3dpos); + sky_get_world_pos_from_screen_pos(0.0f, 0.0f, &tl3dpos); + sky_get_world_pos_from_screen_pos(cam_get_screen_width() - 0.1f, 0.0f, &tr3dpos); + sky_get_world_pos_from_screen_pos(0.0f, cam_get_screen_height() - 0.1f, &bl3dpos); + sky_get_world_pos_from_screen_pos(cam_get_screen_width() - 0.1f, cam_get_screen_height() - 0.1f, &br3dpos); - tlcornerissky = skyIsScreenCornerInSky(&tl3dpos, &sp644, &sp58c); - trcornerissky = skyIsScreenCornerInSky(&tr3dpos, &sp638, &sp588); - blcornerissky = skyIsScreenCornerInSky(&bl3dpos, &sp62c, &sp584); - brcornerissky = skyIsScreenCornerInSky(&br3dpos, &sp620, &sp580); + tlcornerissky = sky_is_screen_corner_in_sky(&tl3dpos, &sp644, &sp58c); + trcornerissky = sky_is_screen_corner_in_sky(&tr3dpos, &sp638, &sp588); + blcornerissky = sky_is_screen_corner_in_sky(&bl3dpos, &sp62c, &sp584); + brcornerissky = sky_is_screen_corner_in_sky(&br3dpos, &sp620, &sp580); - skyIsCornerInWater(&tl3dpos, &sp5e4, &sp56c); - skyIsCornerInWater(&tr3dpos, &sp5d8, &sp568); - skyIsCornerInWater(&bl3dpos, &sp5cc, &sp564); - skyIsCornerInWater(&br3dpos, &sp5c0, &sp560); + sky_is_corner_in_water(&tl3dpos, &sp5e4, &sp56c); + sky_is_corner_in_water(&tr3dpos, &sp5d8, &sp568); + sky_is_corner_in_water(&bl3dpos, &sp5cc, &sp564); + sky_is_corner_in_water(&br3dpos, &sp5c0, &sp560); // For each screen edge, check if one vertex is off-sky and the other is on-sky. // If so, calculate where along the the edge the sky starts/ends. if (tlcornerissky != blcornerissky) { - sp54c = camGetScreenTop() + camGetScreenHeight() * (tl3dpos.f[1] / (tl3dpos.f[1] - bl3dpos.f[1])); + sp54c = cam_get_screen_top() + cam_get_screen_height() * (tl3dpos.f[1] / (tl3dpos.f[1] - bl3dpos.f[1])); - skyGetWorldPosFromScreenPos(0.0f, sp54c, &sp65c); - skyCalculateEdgeVertex(&tl3dpos, &bl3dpos, &sp65c); - skyIsScreenCornerInSky(&sp65c, &sp5fc, &sp574); - skyIsCornerInWater(&sp65c, &sp59c, &sp554); + sky_get_world_pos_from_screen_pos(0.0f, sp54c, &sp65c); + sky_calculate_edge_vertex(&tl3dpos, &bl3dpos, &sp65c); + sky_is_screen_corner_in_sky(&sp65c, &sp5fc, &sp574); + sky_is_corner_in_water(&sp65c, &sp59c, &sp554); } else { sp54c = 0.0f; } if (trcornerissky != brcornerissky) { - sp548 = camGetScreenTop() + camGetScreenHeight() * (tr3dpos.f[1] / (tr3dpos.f[1] - br3dpos.f[1])); + sp548 = cam_get_screen_top() + cam_get_screen_height() * (tr3dpos.f[1] / (tr3dpos.f[1] - br3dpos.f[1])); - skyGetWorldPosFromScreenPos(camGetScreenWidth() - 0.1f, sp548, &sp650); - skyCalculateEdgeVertex(&tr3dpos, &br3dpos, &sp650); - skyIsScreenCornerInSky(&sp650, &sp5f0, &sp570); - skyIsCornerInWater(&sp650, &sp590, &sp550); + sky_get_world_pos_from_screen_pos(cam_get_screen_width() - 0.1f, sp548, &sp650); + sky_calculate_edge_vertex(&tr3dpos, &br3dpos, &sp650); + sky_is_screen_corner_in_sky(&sp650, &sp5f0, &sp570); + sky_is_corner_in_water(&sp650, &sp590, &sp550); } else { sp548 = 0.0f; } if (tlcornerissky != trcornerissky) { - skyGetWorldPosFromScreenPos(camGetScreenLeft() + camGetScreenWidth() * (tl3dpos.f[1] / (tl3dpos.f[1] - tr3dpos.f[1])), 0.0f, &sp674); - skyCalculateEdgeVertex(&tl3dpos, &tr3dpos, &sp674); - skyIsScreenCornerInSky(&sp674, &sp614, &sp57c); - skyIsCornerInWater(&sp674, &sp5b4, &sp55c); + sky_get_world_pos_from_screen_pos(cam_get_screen_left() + cam_get_screen_width() * (tl3dpos.f[1] / (tl3dpos.f[1] - tr3dpos.f[1])), 0.0f, &sp674); + sky_calculate_edge_vertex(&tl3dpos, &tr3dpos, &sp674); + sky_is_screen_corner_in_sky(&sp674, &sp614, &sp57c); + sky_is_corner_in_water(&sp674, &sp5b4, &sp55c); } if (blcornerissky != brcornerissky) { - tmp = camGetScreenLeft() + camGetScreenWidth() * (bl3dpos.f[1] / (bl3dpos.f[1] - br3dpos.f[1])); + tmp = cam_get_screen_left() + cam_get_screen_width() * (bl3dpos.f[1] / (bl3dpos.f[1] - br3dpos.f[1])); - skyGetWorldPosFromScreenPos(tmp, camGetScreenHeight() - 0.1f, &sp668); - skyCalculateEdgeVertex(&bl3dpos, &br3dpos, &sp668); - skyIsScreenCornerInSky(&sp668, &sp608, &sp578); - skyIsCornerInWater(&sp668, &sp5a8, &sp558); + sky_get_world_pos_from_screen_pos(tmp, cam_get_screen_height() - 0.1f, &sp668); + sky_calculate_edge_vertex(&bl3dpos, &br3dpos, &sp668); + sky_is_screen_corner_in_sky(&sp668, &sp608, &sp578); + sky_is_corner_in_water(&sp668, &sp5a8, &sp558); } cornerstate = (tlcornerissky << 3) | (trcornerissky << 2) | (blcornerissky << 1) | brcornerissky; @@ -396,10 +396,10 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[3].s = sp5c0.f[0]; watervertices3d[3].t = sp5c0.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp56c); - skyChooseWaterVtxColour(&watervertices3d[1], sp568); - skyChooseWaterVtxColour(&watervertices3d[2], sp564); - skyChooseWaterVtxColour(&watervertices3d[3], sp560); + sky_choose_water_vtx_colour(&watervertices3d[0], sp56c); + sky_choose_water_vtx_colour(&watervertices3d[1], sp568); + sky_choose_water_vtx_colour(&watervertices3d[2], sp564); + sky_choose_water_vtx_colour(&watervertices3d[3], sp560); break; case CORNERSTATE_BOTTOM: // The bottom corners are in the sky. @@ -427,10 +427,10 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[3].s = sp590.f[0]; watervertices3d[3].t = sp590.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp56c); - skyChooseWaterVtxColour(&watervertices3d[1], sp568); - skyChooseWaterVtxColour(&watervertices3d[2], sp554); - skyChooseWaterVtxColour(&watervertices3d[3], sp550); + sky_choose_water_vtx_colour(&watervertices3d[0], sp56c); + sky_choose_water_vtx_colour(&watervertices3d[1], sp568); + sky_choose_water_vtx_colour(&watervertices3d[2], sp554); + sky_choose_water_vtx_colour(&watervertices3d[3], sp550); break; case CORNERSTATE_TOP: // The top corners are in the sky. A common occurrence. @@ -458,10 +458,10 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[3].s = sp59c.f[0]; watervertices3d[3].t = sp59c.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp560); - skyChooseWaterVtxColour(&watervertices3d[1], sp564); - skyChooseWaterVtxColour(&watervertices3d[2], sp550); - skyChooseWaterVtxColour(&watervertices3d[3], sp554); + sky_choose_water_vtx_colour(&watervertices3d[0], sp560); + sky_choose_water_vtx_colour(&watervertices3d[1], sp564); + sky_choose_water_vtx_colour(&watervertices3d[2], sp550); + sky_choose_water_vtx_colour(&watervertices3d[3], sp554); break; case CORNERSTATE_LEFT: // The left side corners are in the sky. @@ -489,10 +489,10 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[3].s = sp5a8.f[0]; watervertices3d[3].t = sp5a8.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp568); - skyChooseWaterVtxColour(&watervertices3d[1], sp560); - skyChooseWaterVtxColour(&watervertices3d[2], sp55c); - skyChooseWaterVtxColour(&watervertices3d[3], sp558); + sky_choose_water_vtx_colour(&watervertices3d[0], sp568); + sky_choose_water_vtx_colour(&watervertices3d[1], sp560); + sky_choose_water_vtx_colour(&watervertices3d[2], sp55c); + sky_choose_water_vtx_colour(&watervertices3d[3], sp558); break; case CORNERSTATE_RIGHT: // The right side corners are in the sky. @@ -520,10 +520,10 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[3].s = sp5b4.f[0]; watervertices3d[3].t = sp5b4.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp564); - skyChooseWaterVtxColour(&watervertices3d[1], sp56c); - skyChooseWaterVtxColour(&watervertices3d[2], sp558); - skyChooseWaterVtxColour(&watervertices3d[3], sp55c); + sky_choose_water_vtx_colour(&watervertices3d[0], sp564); + sky_choose_water_vtx_colour(&watervertices3d[1], sp56c); + sky_choose_water_vtx_colour(&watervertices3d[2], sp558); + sky_choose_water_vtx_colour(&watervertices3d[3], sp55c); break; case CORNERSTATE_TL_TR_BL: numvertices = 3; @@ -544,9 +544,9 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[2].s = sp590.f[0]; watervertices3d[2].t = sp590.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp560); - skyChooseWaterVtxColour(&watervertices3d[1], sp558); - skyChooseWaterVtxColour(&watervertices3d[2], sp550); + sky_choose_water_vtx_colour(&watervertices3d[0], sp560); + sky_choose_water_vtx_colour(&watervertices3d[1], sp558); + sky_choose_water_vtx_colour(&watervertices3d[2], sp550); break; case CORNERSTATE_TL_TR_BR: numvertices = 3; @@ -567,9 +567,9 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[2].s = sp5a8.f[0]; watervertices3d[2].t = sp5a8.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp564); - skyChooseWaterVtxColour(&watervertices3d[1], sp554); - skyChooseWaterVtxColour(&watervertices3d[2], sp558); + sky_choose_water_vtx_colour(&watervertices3d[0], sp564); + sky_choose_water_vtx_colour(&watervertices3d[1], sp554); + sky_choose_water_vtx_colour(&watervertices3d[2], sp558); break; case CORNERSTATE_TL_BL_BR: numvertices = 3; @@ -590,9 +590,9 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[2].s = sp5b4.f[0]; watervertices3d[2].t = sp5b4.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp568); - skyChooseWaterVtxColour(&watervertices3d[1], sp550); - skyChooseWaterVtxColour(&watervertices3d[2], sp55c); + sky_choose_water_vtx_colour(&watervertices3d[0], sp568); + sky_choose_water_vtx_colour(&watervertices3d[1], sp550); + sky_choose_water_vtx_colour(&watervertices3d[2], sp55c); break; case CORNERSTATE_TR_BL_BR: numvertices = 3; @@ -613,9 +613,9 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[2].s = sp59c.f[0]; watervertices3d[2].t = sp59c.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp56c); - skyChooseWaterVtxColour(&watervertices3d[1], sp55c); - skyChooseWaterVtxColour(&watervertices3d[2], sp554); + sky_choose_water_vtx_colour(&watervertices3d[0], sp56c); + sky_choose_water_vtx_colour(&watervertices3d[1], sp55c); + sky_choose_water_vtx_colour(&watervertices3d[2], sp554); break; case CORNERSTATE_BR: numvertices = 5; @@ -646,11 +646,11 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[4].s = sp5a8.f[0]; watervertices3d[4].t = sp5a8.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp564); - skyChooseWaterVtxColour(&watervertices3d[1], sp56c); - skyChooseWaterVtxColour(&watervertices3d[2], sp568); - skyChooseWaterVtxColour(&watervertices3d[3], sp550); - skyChooseWaterVtxColour(&watervertices3d[4], sp558); + sky_choose_water_vtx_colour(&watervertices3d[0], sp564); + sky_choose_water_vtx_colour(&watervertices3d[1], sp56c); + sky_choose_water_vtx_colour(&watervertices3d[2], sp568); + sky_choose_water_vtx_colour(&watervertices3d[3], sp550); + sky_choose_water_vtx_colour(&watervertices3d[4], sp558); break; case CORNERSTATE_BL: numvertices = 5; @@ -681,11 +681,11 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[4].s = sp59c.f[0]; watervertices3d[4].t = sp59c.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp56c); - skyChooseWaterVtxColour(&watervertices3d[1], sp568); - skyChooseWaterVtxColour(&watervertices3d[2], sp560); - skyChooseWaterVtxColour(&watervertices3d[3], sp558); - skyChooseWaterVtxColour(&watervertices3d[4], sp554); + sky_choose_water_vtx_colour(&watervertices3d[0], sp56c); + sky_choose_water_vtx_colour(&watervertices3d[1], sp568); + sky_choose_water_vtx_colour(&watervertices3d[2], sp560); + sky_choose_water_vtx_colour(&watervertices3d[3], sp558); + sky_choose_water_vtx_colour(&watervertices3d[4], sp554); break; case CORNERSTATE_TR: numvertices = 5; @@ -716,11 +716,11 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[4].s = sp590.f[0]; watervertices3d[4].t = sp590.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp560); - skyChooseWaterVtxColour(&watervertices3d[1], sp564); - skyChooseWaterVtxColour(&watervertices3d[2], sp56c); - skyChooseWaterVtxColour(&watervertices3d[3], sp55c); - skyChooseWaterVtxColour(&watervertices3d[4], sp550); + sky_choose_water_vtx_colour(&watervertices3d[0], sp560); + sky_choose_water_vtx_colour(&watervertices3d[1], sp564); + sky_choose_water_vtx_colour(&watervertices3d[2], sp56c); + sky_choose_water_vtx_colour(&watervertices3d[3], sp55c); + sky_choose_water_vtx_colour(&watervertices3d[4], sp550); break; case CORNERSTATE_TL: numvertices = 5; @@ -751,11 +751,11 @@ Gfx *skyRender(Gfx *gdl) watervertices3d[4].s = sp5b4.f[0]; watervertices3d[4].t = sp5b4.f[2] + g_SkyCloudOffset; - skyChooseWaterVtxColour(&watervertices3d[0], sp568); - skyChooseWaterVtxColour(&watervertices3d[1], sp560); - skyChooseWaterVtxColour(&watervertices3d[2], sp564); - skyChooseWaterVtxColour(&watervertices3d[3], sp554); - skyChooseWaterVtxColour(&watervertices3d[4], sp55c); + sky_choose_water_vtx_colour(&watervertices3d[0], sp568); + sky_choose_water_vtx_colour(&watervertices3d[1], sp560); + sky_choose_water_vtx_colour(&watervertices3d[2], sp564); + sky_choose_water_vtx_colour(&watervertices3d[3], sp554); + sky_choose_water_vtx_colour(&watervertices3d[4], sp55c); break; default: return gdl; @@ -768,18 +768,18 @@ Gfx *skyRender(Gfx *gdl) struct skyvtx2d watervertices2d[5]; s32 i; - mtx4MultMtx4(camGetMtxF1754(), camGetWorldToScreenMtxf(), &sp3cc); + mtx4_mult_mtx4(cam_get_mtxf1754(), cam_get_world_to_screen_mtxf(), &sp3cc); guScaleF(g_SkyMtx.m, 1.0f / scale, 1.0f / scale, 1.0f / scale); - mtx4MultMtx4(&sp3cc, &g_SkyMtx, &sp38c); + mtx4_mult_mtx4(&sp3cc, &g_SkyMtx, &sp38c); for (i = 0; i < numvertices; i++) { - skyConvertVertex(&watervertices3d[i], &sp38c, 130, 65535.0f, 65535.0f, &watervertices2d[i]); + sky_convert_vertex(&watervertices3d[i], &sp38c, 130, 65535.0f, 65535.0f, &watervertices2d[i]); - watervertices2d[i].x = skyClamp(watervertices2d[i].x, camGetScreenLeft() * 4.0f, (camGetScreenLeft() + camGetScreenWidth()) * 4.0f - 1.0f); - watervertices2d[i].y = skyClamp(watervertices2d[i].y, camGetScreenTop() * 4.0f, (camGetScreenTop() + camGetScreenHeight()) * 4.0f - 1.0f); + watervertices2d[i].x = sky_clamp(watervertices2d[i].x, cam_get_screen_left() * 4.0f, (cam_get_screen_left() + cam_get_screen_width()) * 4.0f - 1.0f); + watervertices2d[i].y = sky_clamp(watervertices2d[i].y, cam_get_screen_top() * 4.0f, (cam_get_screen_top() + cam_get_screen_height()) * 4.0f - 1.0f); - if (watervertices2d[i].y > camGetScreenTop() * 4.0f + 4.0f - && watervertices2d[i].y < (camGetScreenTop() + camGetScreenHeight()) * 4.0f - 4.0f) { + if (watervertices2d[i].y > cam_get_screen_top() * 4.0f + 4.0f + && watervertices2d[i].y < (cam_get_screen_top() + cam_get_screen_height()) * 4.0f - 4.0f) { watervertices2d[i].y -= 4.0f; } } @@ -818,12 +818,12 @@ Gfx *skyRender(Gfx *gdl) } else { gDPPipeSync(gdl++); - texSelect(&gdl, &g_TexSkyWaterConfigs[env->water_type], 1, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexSkyWaterConfigs[env->water_type], 1, 0, 2, 1, NULL); gDPSetRenderMode(gdl++, G_RM_OPA_SURF, G_RM_OPA_SURF2); if (numvertices == 4) { - gdl = skyRenderTri(gdl, &watervertices2d[0], &watervertices2d[1], &watervertices2d[3], 130.0f, true); + gdl = sky_render_tri(gdl, &watervertices2d[0], &watervertices2d[1], &watervertices2d[3], 130.0f, true); if (sp430) { watervertices2d[0].y++; @@ -832,15 +832,15 @@ Gfx *skyRender(Gfx *gdl) watervertices2d[3].y++; } - gdl = skyRenderTri(gdl, &watervertices2d[3], &watervertices2d[2], &watervertices2d[0], 130.0f, true); + gdl = sky_render_tri(gdl, &watervertices2d[3], &watervertices2d[2], &watervertices2d[0], 130.0f, true); } else if (numvertices == 5) { // 3 corners are on the ground - gdl = skyRenderTri(gdl, &watervertices2d[0], &watervertices2d[1], &watervertices2d[2], 130.0f, true); - gdl = skyRenderTri(gdl, &watervertices2d[0], &watervertices2d[2], &watervertices2d[3], 130.0f, true); - gdl = skyRenderTri(gdl, &watervertices2d[0], &watervertices2d[3], &watervertices2d[4], 130.0f, true); + gdl = sky_render_tri(gdl, &watervertices2d[0], &watervertices2d[1], &watervertices2d[2], 130.0f, true); + gdl = sky_render_tri(gdl, &watervertices2d[0], &watervertices2d[2], &watervertices2d[3], 130.0f, true); + gdl = sky_render_tri(gdl, &watervertices2d[0], &watervertices2d[3], &watervertices2d[4], 130.0f, true); } else if (numvertices == 3) { // 1 corner is on the ground - gdl = skyRenderTri(gdl, &watervertices2d[0], &watervertices2d[1], &watervertices2d[2], 130.0f, true); + gdl = sky_render_tri(gdl, &watervertices2d[0], &watervertices2d[1], &watervertices2d[2], 130.0f, true); } } } @@ -876,10 +876,10 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[3].s = sp620.f[0] * 0.1f; skyvertices3d[3].t = sp620.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp58c); - skyChooseCloudVtxColour(&skyvertices3d[1], sp588); - skyChooseCloudVtxColour(&skyvertices3d[2], sp584); - skyChooseCloudVtxColour(&skyvertices3d[3], sp580); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp58c); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp588); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp584); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp580); break; case CORNERSTATE_TOP: numvertices = 4; @@ -904,10 +904,10 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[3].s = sp5f0.f[0] * 0.1f; skyvertices3d[3].t = sp5f0.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp58c); - skyChooseCloudVtxColour(&skyvertices3d[1], sp588); - skyChooseCloudVtxColour(&skyvertices3d[2], sp574); - skyChooseCloudVtxColour(&skyvertices3d[3], sp570); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp58c); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp588); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp574); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp570); break; case CORNERSTATE_BOTTOM: numvertices = 4; @@ -932,10 +932,10 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[3].s = sp5fc.f[0] * 0.1f; skyvertices3d[3].t = sp5fc.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp580); - skyChooseCloudVtxColour(&skyvertices3d[1], sp584); - skyChooseCloudVtxColour(&skyvertices3d[2], sp570); - skyChooseCloudVtxColour(&skyvertices3d[3], sp574); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp580); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp584); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp570); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp574); break; case CORNERSTATE_RIGHT: numvertices = 4; @@ -960,10 +960,10 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[3].s = sp608.f[0] * 0.1f; skyvertices3d[3].t = sp608.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp588); - skyChooseCloudVtxColour(&skyvertices3d[1], sp580); - skyChooseCloudVtxColour(&skyvertices3d[2], sp57c); - skyChooseCloudVtxColour(&skyvertices3d[3], sp578); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp588); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp580); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp57c); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp578); break; case CORNERSTATE_LEFT: numvertices = 4; @@ -988,10 +988,10 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[3].s = sp614.f[0] * 0.1f; skyvertices3d[3].t = sp614.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp584); - skyChooseCloudVtxColour(&skyvertices3d[1], sp58c); - skyChooseCloudVtxColour(&skyvertices3d[2], sp578); - skyChooseCloudVtxColour(&skyvertices3d[3], sp57c); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp584); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp58c); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp578); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp57c); break; case CORNERSTATE_BR: numvertices = 3; @@ -1011,9 +1011,9 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[2].s = sp5f0.f[0] * 0.1f; skyvertices3d[2].t = sp5f0.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp580); - skyChooseCloudVtxColour(&skyvertices3d[1], sp578); - skyChooseCloudVtxColour(&skyvertices3d[2], sp570); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp580); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp578); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp570); break; case CORNERSTATE_BL: numvertices = 3; @@ -1033,9 +1033,9 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[2].s = sp608.f[0] * 0.1f; skyvertices3d[2].t = sp608.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp584); - skyChooseCloudVtxColour(&skyvertices3d[1], sp574); - skyChooseCloudVtxColour(&skyvertices3d[2], sp578); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp584); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp574); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp578); break; case CORNERSTATE_TR: numvertices = 3; @@ -1055,9 +1055,9 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[2].s = sp614.f[0] * 0.1f; skyvertices3d[2].t = sp614.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp588); - skyChooseCloudVtxColour(&skyvertices3d[1], sp570); - skyChooseCloudVtxColour(&skyvertices3d[2], sp57c); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp588); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp570); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp57c); break; case CORNERSTATE_TL: numvertices = 3; @@ -1077,9 +1077,9 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[2].s = sp5fc.f[0] * 0.1f; skyvertices3d[2].t = sp5fc.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp58c); - skyChooseCloudVtxColour(&skyvertices3d[1], sp57c); - skyChooseCloudVtxColour(&skyvertices3d[2], sp574); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp58c); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp57c); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp574); break; case CORNERSTATE_TL_TR_BL: numvertices = 5; @@ -1109,11 +1109,11 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[4].s = sp608.f[0] * 0.1f; skyvertices3d[4].t = sp608.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp584); - skyChooseCloudVtxColour(&skyvertices3d[1], sp58c); - skyChooseCloudVtxColour(&skyvertices3d[2], sp588); - skyChooseCloudVtxColour(&skyvertices3d[3], sp570); - skyChooseCloudVtxColour(&skyvertices3d[4], sp578); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp584); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp58c); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp588); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp570); + sky_choose_cloud_vtx_colour(&skyvertices3d[4], sp578); break; case CORNERSTATE_TL_TR_BR: numvertices = 5; @@ -1143,11 +1143,11 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[4].s = sp5fc.f[0] * 0.1f; skyvertices3d[4].t = sp5fc.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp58c); - skyChooseCloudVtxColour(&skyvertices3d[1], sp588); - skyChooseCloudVtxColour(&skyvertices3d[2], sp580); - skyChooseCloudVtxColour(&skyvertices3d[3], sp578); - skyChooseCloudVtxColour(&skyvertices3d[4], sp574); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp58c); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp588); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp580); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp578); + sky_choose_cloud_vtx_colour(&skyvertices3d[4], sp574); break; case CORNERSTATE_TL_BL_BR: numvertices = 5; @@ -1177,11 +1177,11 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[4].s = sp5f0.f[0] * 0.1f; skyvertices3d[4].t = sp5f0.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp580); - skyChooseCloudVtxColour(&skyvertices3d[1], sp584); - skyChooseCloudVtxColour(&skyvertices3d[2], sp58c); - skyChooseCloudVtxColour(&skyvertices3d[3], sp57c); - skyChooseCloudVtxColour(&skyvertices3d[4], sp570); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp580); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp584); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp58c); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp57c); + sky_choose_cloud_vtx_colour(&skyvertices3d[4], sp570); break; case CORNERSTATE_TR_BL_BR: numvertices = 5; @@ -1211,11 +1211,11 @@ Gfx *skyRender(Gfx *gdl) skyvertices3d[4].s = sp614.f[0] * 0.1f; skyvertices3d[4].t = sp614.f[2] * 0.1f + g_SkyCloudOffset; - skyChooseCloudVtxColour(&skyvertices3d[0], sp588); - skyChooseCloudVtxColour(&skyvertices3d[1], sp580); - skyChooseCloudVtxColour(&skyvertices3d[2], sp584); - skyChooseCloudVtxColour(&skyvertices3d[3], sp574); - skyChooseCloudVtxColour(&skyvertices3d[4], sp57c); + sky_choose_cloud_vtx_colour(&skyvertices3d[0], sp588); + sky_choose_cloud_vtx_colour(&skyvertices3d[1], sp580); + sky_choose_cloud_vtx_colour(&skyvertices3d[2], sp584); + sky_choose_cloud_vtx_colour(&skyvertices3d[3], sp574); + sky_choose_cloud_vtx_colour(&skyvertices3d[4], sp57c); break; default: return gdl; @@ -1223,7 +1223,7 @@ Gfx *skyRender(Gfx *gdl) gDPPipeSync(gdl++); - texSelect(&gdl, &g_TexSkyWaterConfigs[env->clouds_type], 1, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexSkyWaterConfigs[env->clouds_type], 1, 0, 2, 1, NULL); gDPSetEnvColor(gdl++, env->sky_r, env->sky_g, env->sky_b, 0xff); gDPSetCombineLERP(gdl++, @@ -1237,56 +1237,56 @@ Gfx *skyRender(Gfx *gdl) struct skyvtx2d skyvertices2d[5]; s32 i; - mtx4MultMtx4(camGetMtxF1754(), camGetWorldToScreenMtxf(), &sp1ec); + mtx4_mult_mtx4(cam_get_mtxf1754(), cam_get_world_to_screen_mtxf(), &sp1ec); guScaleF(g_SkyMtx.m, 1.0f / scale, 1.0f / scale, 1.0f / scale); - mtx4MultMtx4(&sp1ec, &g_SkyMtx, &sp1ac); + mtx4_mult_mtx4(&sp1ec, &g_SkyMtx, &sp1ac); for (i = 0; i < numvertices; i++) { - skyConvertVertex(&skyvertices3d[i], &sp1ac, 130, 65535.0f, 65535.0f, &skyvertices2d[i]); + sky_convert_vertex(&skyvertices3d[i], &sp1ac, 130, 65535.0f, 65535.0f, &skyvertices2d[i]); - skyvertices2d[i].x = skyClamp(skyvertices2d[i].x, camGetScreenLeft() * 4.0f, (camGetScreenLeft() + camGetScreenWidth()) * 4.0f - 1.0f); - skyvertices2d[i].y = skyClamp(skyvertices2d[i].y, camGetScreenTop() * 4.0f, (camGetScreenTop() + camGetScreenHeight()) * 4.0f - 1.0f); + skyvertices2d[i].x = sky_clamp(skyvertices2d[i].x, cam_get_screen_left() * 4.0f, (cam_get_screen_left() + cam_get_screen_width()) * 4.0f - 1.0f); + skyvertices2d[i].y = sky_clamp(skyvertices2d[i].y, cam_get_screen_top() * 4.0f, (cam_get_screen_top() + cam_get_screen_height()) * 4.0f - 1.0f); } if (numvertices == 4) { if (cornerstate == CORNERSTATE_TOP) { if (sp548 < sp54c) { if (skyvertices2d[3].y >= skyvertices2d[1].y + 4.0f) { - skyvertices2d[0].x = camGetScreenLeft() * 4.0f; - skyvertices2d[0].y = camGetScreenTop() * 4.0f; - skyvertices2d[1].x = (camGetScreenLeft() + camGetScreenWidth()) * 4.0f - 1.0f; - skyvertices2d[1].y = camGetScreenTop() * 4.0f; - skyvertices2d[2].x = camGetScreenLeft() * 4.0f; - skyvertices2d[3].x = (camGetScreenLeft() + camGetScreenWidth()) * 4.0f - 1.0f; + skyvertices2d[0].x = cam_get_screen_left() * 4.0f; + skyvertices2d[0].y = cam_get_screen_top() * 4.0f; + skyvertices2d[1].x = (cam_get_screen_left() + cam_get_screen_width()) * 4.0f - 1.0f; + skyvertices2d[1].y = cam_get_screen_top() * 4.0f; + skyvertices2d[2].x = cam_get_screen_left() * 4.0f; + skyvertices2d[3].x = (cam_get_screen_left() + cam_get_screen_width()) * 4.0f - 1.0f; - gdl = skyRenderFull(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[2], &skyvertices2d[3], 130.0f); + gdl = sky_render_full(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[2], &skyvertices2d[3], 130.0f); } else { - gdl = skyRenderTri(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[2], 130.0f, true); + gdl = sky_render_tri(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[2], 130.0f, true); } } else if (skyvertices2d[2].y >= skyvertices2d[0].y + 4.0f) { - skyvertices2d[0].x = camGetScreenLeft() * 4.0f; - skyvertices2d[0].y = camGetScreenTop() * 4.0f; - skyvertices2d[1].x = (camGetScreenLeft() + camGetScreenWidth()) * 4.0f - 1.0f; - skyvertices2d[1].y = camGetScreenTop() * 4.0f; - skyvertices2d[2].x = camGetScreenLeft() * 4.0f; - skyvertices2d[3].x = (camGetScreenLeft() + camGetScreenWidth()) * 4.0f - 1.0f; + skyvertices2d[0].x = cam_get_screen_left() * 4.0f; + skyvertices2d[0].y = cam_get_screen_top() * 4.0f; + skyvertices2d[1].x = (cam_get_screen_left() + cam_get_screen_width()) * 4.0f - 1.0f; + skyvertices2d[1].y = cam_get_screen_top() * 4.0f; + skyvertices2d[2].x = cam_get_screen_left() * 4.0f; + skyvertices2d[3].x = (cam_get_screen_left() + cam_get_screen_width()) * 4.0f - 1.0f; - gdl = skyRenderFull(gdl, &skyvertices2d[1], &skyvertices2d[0], &skyvertices2d[3], &skyvertices2d[2], 130.0f); + gdl = sky_render_full(gdl, &skyvertices2d[1], &skyvertices2d[0], &skyvertices2d[3], &skyvertices2d[2], 130.0f); } else { - gdl = skyRenderTri(gdl, &skyvertices2d[1], &skyvertices2d[0], &skyvertices2d[3], 130.0f, true); + gdl = sky_render_tri(gdl, &skyvertices2d[1], &skyvertices2d[0], &skyvertices2d[3], 130.0f, true); } } else { - gdl = skyRenderTri(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[3], 130.0f, true); - gdl = skyRenderTri(gdl, &skyvertices2d[3], &skyvertices2d[2], &skyvertices2d[0], 130.0f, true); + gdl = sky_render_tri(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[3], 130.0f, true); + gdl = sky_render_tri(gdl, &skyvertices2d[3], &skyvertices2d[2], &skyvertices2d[0], 130.0f, true); } } else if (numvertices == 5) { // Three corners are in the sky - gdl = skyRenderTri(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[2], 130.0f, true); - gdl = skyRenderTri(gdl, &skyvertices2d[0], &skyvertices2d[2], &skyvertices2d[3], 130.0f, true); - gdl = skyRenderTri(gdl, &skyvertices2d[0], &skyvertices2d[3], &skyvertices2d[4], 130.0f, true); + gdl = sky_render_tri(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[2], 130.0f, true); + gdl = sky_render_tri(gdl, &skyvertices2d[0], &skyvertices2d[2], &skyvertices2d[3], 130.0f, true); + gdl = sky_render_tri(gdl, &skyvertices2d[0], &skyvertices2d[3], &skyvertices2d[4], 130.0f, true); } else if (numvertices == 3) { // One corner is in the sky - gdl = skyRenderTri(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[2], 130.0f, true); + gdl = sky_render_tri(gdl, &skyvertices2d[0], &skyvertices2d[1], &skyvertices2d[2], 130.0f, true); } } @@ -1296,7 +1296,7 @@ Gfx *skyRender(Gfx *gdl) /** * Convert a 3D vertex to 2D. */ -void skyConvertVertex(struct skyvtx3d *srcvtx, Mtxf *mtx, u16 arg2, f32 arg3, f32 arg4, struct skyvtx2d *dstvtx) +void sky_convert_vertex(struct skyvtx3d *srcvtx, Mtxf *mtx, u16 arg2, f32 arg3, f32 arg4, struct skyvtx2d *dstvtx) { f32 sp68[4]; f32 t; @@ -1336,13 +1336,13 @@ void skyConvertVertex(struct skyvtx3d *srcvtx, Mtxf *mtx, u16 arg2, f32 arg3, f3 sp48[2] = sp68[2] * f0 * mult; sp48[3] = sp68[3] * f0 * mult; - sp34 = camGetScreenWidth(); - sp30 = camGetScreenWidth(); - sp38[0] = sp48[0] * (sp34 + sp34) + (sp30 + sp30 + camGetScreenLeft() * 4); + sp34 = cam_get_screen_width(); + sp30 = cam_get_screen_width(); + sp38[0] = sp48[0] * (sp34 + sp34) + (sp30 + sp30 + cam_get_screen_left() * 4); - sp34 = camGetScreenHeight(); - sp30 = camGetScreenHeight(); - sp38[1] = -sp48[1] * (sp34 + sp34) + (sp30 + sp30 + camGetScreenTop() * 4); + sp34 = cam_get_screen_height(); + sp30 = cam_get_screen_height(); + sp38[1] = -sp48[1] * (sp34 + sp34) + (sp30 + sp30 + cam_get_screen_top() * 4); sp34 = 511.0f; sp30 = 511.0f; @@ -1352,10 +1352,10 @@ void skyConvertVertex(struct skyvtx3d *srcvtx, Mtxf *mtx, u16 arg2, f32 arg3, f3 sp30 = 0; sp38[3] = sp48[3] * sp34 + sp30; - sp38[0] = skyClamp(sp38[0], -4090.0f, 4090.0f); - sp38[1] = skyClamp(sp38[1], -4090.0f, 4090.0f); - sp38[2] = skyClamp(sp38[2], 0.0f, 32767.0f); - sp38[3] = skyClamp(sp38[3], 0.0f, 32767.0f); + sp38[0] = sky_clamp(sp38[0], -4090.0f, 4090.0f); + sp38[1] = sky_clamp(sp38[1], -4090.0f, 4090.0f); + sp38[2] = sky_clamp(sp38[2], 0.0f, 32767.0f); + sp38[3] = sky_clamp(sp38[3], 0.0f, 32767.0f); dstvtx->unk00 = sp68[0]; dstvtx->unk04 = sp68[1]; @@ -1364,7 +1364,7 @@ void skyConvertVertex(struct skyvtx3d *srcvtx, Mtxf *mtx, u16 arg2, f32 arg3, f3 dstvtx->s = s; dstvtx->t = t; dstvtx->x = sp38[0]; - dstvtx->y = sp38[1] - envGetCurrent()->clouds_height * 4.0f; + dstvtx->y = sp38[1] - env_get_current()->clouds_height * 4.0f; dstvtx->unk30 = sp38[2]; dstvtx->unk34 = f22; @@ -1374,7 +1374,7 @@ void skyConvertVertex(struct skyvtx3d *srcvtx, Mtxf *mtx, u16 arg2, f32 arg3, f3 dstvtx->a = srcvtx->a; } -bool skyVerticesAreSame(struct skyvtx2d *vtx0, struct skyvtx2d *vtx1) +bool sky_vertices_are_same(struct skyvtx2d *vtx0, struct skyvtx2d *vtx1) { f32 xdiff = vtx0->x - vtx1->x; f32 ydiff = vtx0->y - vtx1->y; @@ -1382,7 +1382,7 @@ bool skyVerticesAreSame(struct skyvtx2d *vtx0, struct skyvtx2d *vtx1) return sqrtf(xdiff * xdiff + ydiff * ydiff) < 1.0f ? true : false; } -Gfx *skyRenderTri(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct skyvtx2d *vtx2, f32 arg4, bool textured) +Gfx *sky_render_tri(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct skyvtx2d *vtx2, f32 arg4, bool textured) { struct skyvtx2d *svtx0; struct skyvtx2d *svtx1; @@ -1503,7 +1503,7 @@ Gfx *skyRenderTri(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct f32 sp190[1]; u32 stack3; - if (skyVerticesAreSame(vtx0, vtx1) || skyVerticesAreSame(vtx1, vtx2) || skyVerticesAreSame(vtx2, vtx0)) { + if (sky_vertices_are_same(vtx0, vtx1) || sky_vertices_are_same(vtx1, vtx2) || sky_vertices_are_same(vtx2, vtx0)) { return gdl; } @@ -1614,14 +1614,14 @@ Gfx *skyRenderTri(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct sp38c[0] = xdiff1 / ydiff1; sp394[0] = xdiff2 / ydiff2; - sp384[0] = skyClamp(sp384[0], -1878.0f, 1877.0f); - sp38c[0] = skyClamp(sp38c[0], -1878.0f, 1877.0f); - sp394[0] = skyClamp(sp394[0], -1878.0f, 1877.0f); + sp384[0] = sky_clamp(sp384[0], -1878.0f, 1877.0f); + sp38c[0] = sky_clamp(sp38c[0], -1878.0f, 1877.0f); + sp394[0] = sky_clamp(sp394[0], -1878.0f, 1877.0f); f2 = (svtx0->y * 0.25f); sp37c = f2 - (s32) f2; - sp408 = sp428[0] - skyRound(sp38c[0] * 8192.0f) * (1.0f / 8192.0f) * sp37c; - sp410 = sp430[0] - skyRound(sp394[0] * 8192.0f) * (1.0f / 8192.0f) * sp37c; + sp408 = sp428[0] - sky_round(sp38c[0] * 8192.0f) * (1.0f / 8192.0f) * sp37c; + sp410 = sp430[0] - sky_round(sp394[0] * 8192.0f) * (1.0f / 8192.0f) * sp37c; gImmp1(gdl++, G_RDPHALF_1, (textured ? (G_TRI_SHADE_TXTR << 24) : (G_TRI_FILL << 24)) | (sp444 < 0.0f ? 0x00800000 : 0) @@ -1889,7 +1889,7 @@ Gfx *skyRenderTri(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct * Render the sky when all four corners of the viewport are above the horizon. * ie. The sky takes up the full screen. */ -Gfx *skyRenderFull(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct skyvtx2d *vtx2, struct skyvtx2d *vtx3, f32 arg5) +Gfx *sky_render_full(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struct skyvtx2d *vtx2, struct skyvtx2d *vtx3, f32 arg5) { struct skyvtx2d *sp4cc; struct skyvtx2d *sp4c8; @@ -2015,12 +2015,12 @@ Gfx *skyRenderFull(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struc f32 sp1c4[1]; u32 stack16; - if (skyVerticesAreSame(vtx0, vtx1) - || skyVerticesAreSame(vtx1, vtx2) - || skyVerticesAreSame(vtx2, vtx0) - || skyVerticesAreSame(vtx3, vtx0) - || skyVerticesAreSame(vtx3, vtx1) - || skyVerticesAreSame(vtx3, vtx2)) { + if (sky_vertices_are_same(vtx0, vtx1) + || sky_vertices_are_same(vtx1, vtx2) + || sky_vertices_are_same(vtx2, vtx0) + || sky_vertices_are_same(vtx3, vtx0) + || sky_vertices_are_same(vtx3, vtx1) + || sky_vertices_are_same(vtx3, vtx2)) { return gdl; } @@ -2126,9 +2126,9 @@ Gfx *skyRenderFull(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struc sp3d0[0] = sp4b8 / sp4b4; sp3d8[0] = sp4b0 / sp4ac; - sp3c8[0] = skyClamp(sp3c8[0], -1878.0f, 1877.0f); - sp3d0[0] = skyClamp(sp3d0[0], -1878.0f, 1877.0f); - sp3d8[0] = skyClamp(sp3d8[0], -1878.0f, 1877.0f); + sp3c8[0] = sky_clamp(sp3c8[0], -1878.0f, 1877.0f); + sp3d0[0] = sky_clamp(sp3d0[0], -1878.0f, 1877.0f); + sp3d8[0] = sky_clamp(sp3d8[0], -1878.0f, 1877.0f); svtx2y[0] = sp46c[0]; sp454[0] = sp474[0]; @@ -2139,19 +2139,19 @@ Gfx *skyRenderFull(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struc if (vtx2->y - vtx3->y < 1.0f) { sp1bc = -1878.0f; } else { - sp1bc = -(camGetScreenWidth() - 0.25f) / ((vtx2->y - vtx3->y) / 4.0f); + sp1bc = -(cam_get_screen_width() - 0.25f) / ((vtx2->y - vtx3->y) / 4.0f); } gImmp1(gdl++, G_RDPHALF_1, (G_TRI_SHADE_TXTR << 24) | 0x00800000 | (u32) vtx2->y); gImmp1(gdl++, G_RDPHALF_CONT, (s32) vtx3->y << 16 | (s32) vtx0->y); - gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(camGetScreenLeft() + camGetScreenWidth() - 0.25f)); + gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(cam_get_screen_left() + cam_get_screen_width() - 0.25f)); gImmp1(gdl++, G_RDPHALF_CONT, func0f152fa0(sp1bc)); - gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(camGetScreenLeft())); + gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(cam_get_screen_left())); gImmp1(gdl++, G_RDPHALF_CONT, func0f152fa0(0.0f)); - gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(camGetScreenLeft() + camGetScreenWidth() - 0.25f)); + gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(cam_get_screen_left() + cam_get_screen_width() - 0.25f)); gImmp1(gdl++, G_RDPHALF_CONT, func0f152fa0(0.0f)); } else { f32 sp198; @@ -2159,19 +2159,19 @@ Gfx *skyRenderFull(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struc if (vtx2->y - vtx3->y < 1.0f) { sp198 = 1877.0f; } else { - sp198 = (camGetScreenWidth() - 0.25f) / ((vtx2->y - vtx3->y) / 4.0f); + sp198 = (cam_get_screen_width() - 0.25f) / ((vtx2->y - vtx3->y) / 4.0f); } gImmp1(gdl++, G_RDPHALF_1, 0xce000000 | (u32) vtx2->y); gImmp1(gdl++, G_RDPHALF_CONT, (s32) vtx3->y << 16 | (s32) vtx0->y); - gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(camGetScreenLeft())); + gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(cam_get_screen_left())); gImmp1(gdl++, G_RDPHALF_CONT, func0f152fa0(sp198)); - gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(camGetScreenLeft() + camGetScreenWidth() - 0.25f)); + gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(cam_get_screen_left() + cam_get_screen_width() - 0.25f)); gImmp1(gdl++, G_RDPHALF_CONT, func0f152fa0(0.0f)); - gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(camGetScreenLeft())); + gImmp1(gdl++, G_RDPHALF_1, func0f152fa0(cam_get_screen_left())); gImmp1(gdl++, G_RDPHALF_CONT, func0f152fa0(0.0f)); } @@ -2415,22 +2415,22 @@ Gfx *skyRenderFull(Gfx *gdl, struct skyvtx2d *vtx0, struct skyvtx2d *vtx1, struc return gdl; } -void skyCreateSunArtifact(struct artifact *artifact, s32 x, s32 y) +void sky_create_sun_artifact(struct artifact *artifact, s32 x, s32 y) { - s32 viewleft = viGetViewLeft(); - s32 viewtop = viGetViewTop(); - s32 viewwidth = viGetViewWidth(); - s32 viewheight = viGetViewHeight(); + s32 viewleft = vi_get_view_left(); + s32 viewtop = vi_get_view_top(); + s32 viewwidth = vi_get_view_width(); + s32 viewheight = vi_get_view_height(); if (x >= viewleft && x < viewleft + viewwidth && y >= viewtop && y < viewtop + viewheight) { - artifact->unk08 = &g_ZbufPtr1[(s32)camGetScreenWidth() * y + x]; + artifact->unk08 = &g_ZbufPtr1[(s32)cam_get_screen_width() * y + x]; artifact->unk0c.u16_2 = x; artifact->unk0c.u16_1 = y; artifact->type = ARTIFACTTYPE_CIRCLE; } } -f32 skyGetArtifactGroupIntensityFrac(struct artifact *artifacts) +f32 sky_get_artifact_group_intensity_frac(struct artifact *artifacts) { f32 sum = 0; s32 i; @@ -2444,7 +2444,7 @@ f32 skyGetArtifactGroupIntensityFrac(struct artifact *artifacts) return sum; } -Gfx *skyRenderSuns(Gfx *gdl, bool xray) +Gfx *sky_render_suns(Gfx *gdl, bool xray) { Mtxf *sp16c; Mtxf *sp168; @@ -2468,9 +2468,9 @@ Gfx *skyRenderSuns(Gfx *gdl, bool xray) bool onscreen; f32 radius; - sp16c = camGetWorldToScreenMtxf(); - sp168 = camGetMtxF1754(); - env = envGetCurrent(); + sp16c = cam_get_world_to_screen_mtxf(); + sp168 = cam_get_mtxf1754(); + env = env_get_current(); xscale = 1; @@ -2484,10 +2484,10 @@ Gfx *skyRenderSuns(Gfx *gdl, bool xray) } #endif - viewleft = viGetViewLeft(); - viewtop = viGetViewTop(); - viewwidth = viGetViewWidth(); - viewheight = viGetViewHeight(); + viewleft = vi_get_view_left(); + viewtop = vi_get_view_top(); + viewwidth = vi_get_view_width(); + viewheight = vi_get_view_height(); viewleftf = viewleft; viewtopf = viewtop; @@ -2506,13 +2506,13 @@ Gfx *skyRenderSuns(Gfx *gdl, bool xray) colour[2] = sun->blue; if (!xray) { - mtx4TransformVecInPlace(sp16c, &g_SunPositions[i]); - mtx4TransformVecInPlace(sp168, &g_SunPositions[i]); + mtx4_transform_vec_in_place(sp16c, &g_SunPositions[i]); + mtx4_transform_vec_in_place(sp168, &g_SunPositions[i]); if (g_SunPositions[i].f[2] > 1.0f) { g_SunScreenXPositions[i] = (g_SunPositions[i].f[0] / g_SunPositions[i].f[2] + 1.0f) * 0.5f * viewwidthf + viewleftf; g_SunScreenYPositions[i] = (-g_SunPositions[i].f[1] / g_SunPositions[i].f[2] + 1.0f) * 0.5f * viewheightf + viewtopf; - radius = 60.0f / viGetFovY() * sun->texture_size; + radius = 60.0f / vi_get_fov_y() * sun->texture_size; onscreen = false; if (g_SunScreenXPositions[i] >= viewleftf - radius @@ -2527,7 +2527,7 @@ Gfx *skyRenderSuns(Gfx *gdl, bool xray) // Sun's centre point is on-screen f32 distfromedge; f32 mindistfromedge; - artifacts = schedGetWriteArtifacts(); + artifacts = sched_get_write_artifacts(); onscreen = true; mindistfromedge = 1000; @@ -2577,21 +2577,21 @@ Gfx *skyRenderSuns(Gfx *gdl, bool xray) g_SunAlphaFracs[i] = 1.0f; } - skyCreateSunArtifact(&artifacts[i * 8 + 0], (s32)g_SunScreenXPositions[i] - 7, (s32)g_SunScreenYPositions[i] + 1); - skyCreateSunArtifact(&artifacts[i * 8 + 1], (s32)g_SunScreenXPositions[i] - 5, (s32)g_SunScreenYPositions[i] - 3); - skyCreateSunArtifact(&artifacts[i * 8 + 2], (s32)g_SunScreenXPositions[i] - 3, (s32)g_SunScreenYPositions[i] + 5); - skyCreateSunArtifact(&artifacts[i * 8 + 3], (s32)g_SunScreenXPositions[i] - 1, (s32)g_SunScreenYPositions[i] - 7); - skyCreateSunArtifact(&artifacts[i * 8 + 4], (s32)g_SunScreenXPositions[i] + 1, (s32)g_SunScreenYPositions[i] + 7); - skyCreateSunArtifact(&artifacts[i * 8 + 5], (s32)g_SunScreenXPositions[i] + 3, (s32)g_SunScreenYPositions[i] - 5); - skyCreateSunArtifact(&artifacts[i * 8 + 6], (s32)g_SunScreenXPositions[i] + 5, (s32)g_SunScreenYPositions[i] + 3); - skyCreateSunArtifact(&artifacts[i * 8 + 7], (s32)g_SunScreenXPositions[i] + 7, (s32)g_SunScreenYPositions[i] - 1); + sky_create_sun_artifact(&artifacts[i * 8 + 0], (s32)g_SunScreenXPositions[i] - 7, (s32)g_SunScreenYPositions[i] + 1); + sky_create_sun_artifact(&artifacts[i * 8 + 1], (s32)g_SunScreenXPositions[i] - 5, (s32)g_SunScreenYPositions[i] - 3); + sky_create_sun_artifact(&artifacts[i * 8 + 2], (s32)g_SunScreenXPositions[i] - 3, (s32)g_SunScreenYPositions[i] + 5); + sky_create_sun_artifact(&artifacts[i * 8 + 3], (s32)g_SunScreenXPositions[i] - 1, (s32)g_SunScreenYPositions[i] - 7); + sky_create_sun_artifact(&artifacts[i * 8 + 4], (s32)g_SunScreenXPositions[i] + 1, (s32)g_SunScreenYPositions[i] + 7); + sky_create_sun_artifact(&artifacts[i * 8 + 5], (s32)g_SunScreenXPositions[i] + 3, (s32)g_SunScreenYPositions[i] - 5); + sky_create_sun_artifact(&artifacts[i * 8 + 6], (s32)g_SunScreenXPositions[i] + 5, (s32)g_SunScreenYPositions[i] + 3); + sky_create_sun_artifact(&artifacts[i * 8 + 7], (s32)g_SunScreenXPositions[i] + 7, (s32)g_SunScreenYPositions[i] - 1); } if (1); g_SunFlareTimers240[i] += g_Vars.lvupdate240; - texSelect(&gdl, &g_TexLightGlareConfigs[5], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexLightGlareConfigs[5], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); @@ -2619,7 +2619,7 @@ Gfx *skyRenderSuns(Gfx *gdl, bool xray) gDPSetTexturePersp(gdl++, G_TP_PERSP); gDPSetTextureLOD(gdl++, G_TL_LOD); - sp124 = skyGetArtifactGroupIntensityFrac(&schedGetFrontArtifacts()[i * 8]); + sp124 = sky_get_artifact_group_intensity_frac(&sched_get_front_artifacts()[i * 8]); } if (onscreen && sp124 > 0.0f) { @@ -2641,7 +2641,7 @@ Gfx *skyRenderSuns(Gfx *gdl, bool xray) * * Used for the sun and the Deep Sea teleports. */ -Gfx *skyRenderFlare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 flaretimer240, f32 alphafrac) +Gfx *sky_render_flare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 flaretimer240, f32 alphafrac) { s32 i; f32 f2; @@ -2673,11 +2673,11 @@ Gfx *skyRenderFlare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 fla } #endif - xdist = (x - viGetViewWidth() / 2.0f) * 0.01f; - ydist = (y - viGetViewHeight() / 2.0f) * 0.01f; + xdist = (x - vi_get_view_width() / 2.0f) * 0.01f; + ydist = (y - vi_get_view_height() / 2.0f) * 0.01f; // Render the source artifact (eg. the artifact that is on top of the sun) - texSelect(&gdl, &g_TexLightGlareConfigs[6], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexLightGlareConfigs[6], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_BAYER); @@ -2693,7 +2693,7 @@ Gfx *skyRenderFlare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 fla 0, 0, 0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, ENVIRONMENT, TEXEL0, 0, ENVIRONMENT, 0); - fovy = viGetFovY(); + fovy = vi_get_fov_y(); gDPSetEnvColor(gdl++, 0xff, 0xff, 0xff, (s32) (alphafrac * intensityfrac * 255.0f)); f2 = ((s32) ((60.0f / fovy) * (size * (0.5f + (0.5f * intensityfrac))))); @@ -2706,7 +2706,7 @@ Gfx *skyRenderFlare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 fla func0f0b2150(&gdl, sp17c, sp174, g_TexLightGlareConfigs[6].width, g_TexLightGlareConfigs[6].height, 0, 1, 1, 1, 0, 1); // Render the other artifacts - texSelect(&gdl, &g_TexLightGlareConfigs[1], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexLightGlareConfigs[1], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_BAYER); @@ -2764,8 +2764,8 @@ Gfx *skyRenderFlare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 fla } // Check if the source is close to the center of the screen and create the bloom effect if so - xdist = viGetViewWidth() / 2.0f - x; - ydist = viGetViewHeight() / 2.0f - y; + xdist = vi_get_view_width() / 2.0f - x; + ydist = vi_get_view_height() / 2.0f - y; f12 = (40.0f - sqrtf(xdist * xdist + ydist * ydist)) * 0.0125f; @@ -2780,7 +2780,7 @@ Gfx *skyRenderFlare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 fla } if (f12 > 0.0f) { - skySetOverexposure(alphafrac * f12 * 255.0f, alphafrac * f12 * 255.0f, alphafrac * f12 * 255.0f); + sky_set_overexposure(alphafrac * f12 * 255.0f, alphafrac * f12 * 255.0f, alphafrac * f12 * 255.0f); } gDPSetColorDither(gdl++, G_CD_BAYER); @@ -2795,7 +2795,7 @@ struct coord g_TeleportToPos = {0, 0, 0}; struct coord g_TeleportToUp = {0, 0, 1}; struct coord g_TeleportToLook = {0, 1, 0}; -Gfx *skyRenderTeleportFlare(Gfx *gdl, f32 x, f32 y, f32 z, f32 size, f32 intensityfrac) +Gfx *sky_render_teleport_flare(Gfx *gdl, f32 x, f32 y, f32 z, f32 size, f32 intensityfrac) { struct coord sp64; @@ -2803,16 +2803,16 @@ Gfx *skyRenderTeleportFlare(Gfx *gdl, f32 x, f32 y, f32 z, f32 size, f32 intensi sp64.y = y; sp64.z = z; - mtx4TransformVecInPlace(camGetWorldToScreenMtxf(), &sp64); - mtx4TransformVecInPlace(camGetMtxF1754(), &sp64); + mtx4_transform_vec_in_place(cam_get_world_to_screen_mtxf(), &sp64); + mtx4_transform_vec_in_place(cam_get_mtxf1754(), &sp64); if (sp64.z > 1.0f) { f32 xpos; f32 ypos; - s16 viewlefti = viGetViewLeft(); - s16 viewtopi = viGetViewTop(); - s16 viewwidthi = viGetViewWidth(); - s16 viewheighti = viGetViewHeight(); + s16 viewlefti = vi_get_view_left(); + s16 viewtopi = vi_get_view_top(); + s16 viewwidthi = vi_get_view_width(); + s16 viewheighti = vi_get_view_height(); f32 viewleft = viewlefti; f32 viewwidth = viewwidthi; f32 viewtop = viewtopi; @@ -2823,7 +2823,7 @@ Gfx *skyRenderTeleportFlare(Gfx *gdl, f32 x, f32 y, f32 z, f32 size, f32 intensi if (xpos >= viewleft && xpos < viewleft + viewwidth && ypos >= viewtop && ypos < viewtop + viewheight) { - gdl = skyRenderFlare(gdl, xpos, ypos, intensityfrac, size, TICKS(90), 1.0f); + gdl = sky_render_flare(gdl, xpos, ypos, intensityfrac, size, TICKS(90), 1.0f); } } @@ -2833,7 +2833,7 @@ Gfx *skyRenderTeleportFlare(Gfx *gdl, f32 x, f32 y, f32 z, f32 size, f32 intensi /** * Render lens flares during teleport. */ -Gfx *skyRenderTeleportFlares(Gfx *gdl) +Gfx *sky_render_teleport_flares(Gfx *gdl) { f32 sp154 = g_20SecIntervalFrac * M_BADTAU; s32 i; @@ -2871,7 +2871,7 @@ Gfx *skyRenderTeleportFlares(Gfx *gdl) sizefrac = 1.0f; } - padUnpack(g_Vars.currentplayer->teleportpad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP, &pad); + pad_unpack(g_Vars.currentplayer->teleportpad, PADFIELD_POS | PADFIELD_LOOK | PADFIELD_UP, &pad); g_TeleportToPos.x = pad.pos.x; g_TeleportToPos.y = pad.pos.y; @@ -2899,14 +2899,14 @@ Gfx *skyRenderTeleportFlares(Gfx *gdl) spd0[2] = g_TeleportToUp.f[1] * f20_2; spd0[3] = g_TeleportToUp.f[2] * f20_2; - quaternionToMtx(spd0, &mtx); - mtx4RotateVecInPlace(&mtx, &spe0); + quaternion_to_mtx(spd0, &mtx); + mtx4_rotate_vec_in_place(&mtx, &spe0); spe0.x += g_TeleportToPos.x; spe0.y += g_TeleportToPos.y; spe0.z += g_TeleportToPos.z; - gdl = skyRenderTeleportFlare(gdl, spe0.x, spe0.y, spe0.z, sizefrac * 200, intensityfrac); + gdl = sky_render_teleport_flare(gdl, spe0.x, spe0.y, spe0.z, sizefrac * 200, intensityfrac); } return gdl; @@ -2915,15 +2915,15 @@ Gfx *skyRenderTeleportFlares(Gfx *gdl) /** * Render teleport artifacts, and all suns and their artifacts. */ -Gfx *skyRenderArtifacts(Gfx *gdl) +Gfx *sky_render_artifacts(Gfx *gdl) { - struct environment *env = envGetCurrent(); + struct environment *env = env_get_current(); struct sun *sun; s32 i; if (g_Vars.currentplayer->teleportstate == TELEPORTSTATE_PREENTER || g_Vars.currentplayer->teleportstate == TELEPORTSTATE_ENTERING) { - gdl = skyRenderTeleportFlares(gdl); + gdl = sky_render_teleport_flares(gdl); } if (env->numsuns <= 0 || !g_ZbufPtr1 || g_Vars.mplayerisrunning) { @@ -2934,11 +2934,11 @@ Gfx *skyRenderArtifacts(Gfx *gdl) for (i = 0; i < env->numsuns; i++) { if (sun->lens_flare && g_SunPositions[i].z > 1) { - struct artifact *artifacts = schedGetFrontArtifacts() + i * 8; - f32 intensityfrac = skyGetArtifactGroupIntensityFrac(artifacts); + struct artifact *artifacts = sched_get_front_artifacts() + i * 8; + f32 intensityfrac = sky_get_artifact_group_intensity_frac(artifacts); if (intensityfrac > 0.0f) { - gdl = skyRenderFlare(gdl, g_SunScreenXPositions[i], g_SunScreenYPositions[i], intensityfrac, sun->orb_size, g_SunFlareTimers240[i], g_SunAlphaFracs[i]); + gdl = sky_render_flare(gdl, g_SunScreenXPositions[i], g_SunScreenYPositions[i], intensityfrac, sun->orb_size, g_SunFlareTimers240[i], g_SunAlphaFracs[i]); } } @@ -2948,7 +2948,7 @@ Gfx *skyRenderArtifacts(Gfx *gdl) return gdl; } -void skySetOverexposure(s32 r, s32 g, s32 b) +void sky_set_overexposure(s32 r, s32 g, s32 b) { g_Vars.currentplayer->overexposurered = sqrtf(g_Vars.currentplayer->overexposurered * g_Vars.currentplayer->overexposurered + r * r); g_Vars.currentplayer->overexposuregreen = sqrtf(g_Vars.currentplayer->overexposuregreen * g_Vars.currentplayer->overexposuregreen + g * g); @@ -2967,7 +2967,7 @@ void skySetOverexposure(s32 r, s32 g, s32 b) } } -s32 skyCalculateOverexposureComponent(s32 old, s32 new) +s32 sky_calculate_overexposure_component(s32 old, s32 new) { if (new >= old) { if (new - old > 8) { @@ -2988,14 +2988,14 @@ s32 skyCalculateOverexposureComponent(s32 old, s32 new) * Overexposure is used when the player looks at the sun, and when night vision * is overloaded. An almost-transparent rectangle is drawn across the viewport. */ -Gfx *skyRenderOverexposure(Gfx *gdl) +Gfx *sky_render_overexposure(Gfx *gdl) { s32 value; u32 stack; - g_Vars.currentplayer->overexposurered = skyCalculateOverexposureComponent(g_Vars.currentplayer->prevoverexposurered, g_Vars.currentplayer->overexposurered); - g_Vars.currentplayer->overexposuregreen = skyCalculateOverexposureComponent(g_Vars.currentplayer->prevoverexposuregreen, g_Vars.currentplayer->overexposuregreen); - g_Vars.currentplayer->overexposureblue = skyCalculateOverexposureComponent(g_Vars.currentplayer->prevoverexposureblue, g_Vars.currentplayer->overexposureblue); + g_Vars.currentplayer->overexposurered = sky_calculate_overexposure_component(g_Vars.currentplayer->prevoverexposurered, g_Vars.currentplayer->overexposurered); + g_Vars.currentplayer->overexposuregreen = sky_calculate_overexposure_component(g_Vars.currentplayer->prevoverexposuregreen, g_Vars.currentplayer->overexposuregreen); + g_Vars.currentplayer->overexposureblue = sky_calculate_overexposure_component(g_Vars.currentplayer->prevoverexposureblue, g_Vars.currentplayer->overexposureblue); value = (g_Vars.currentplayer->overexposurered > g_Vars.currentplayer->overexposuregreen && g_Vars.currentplayer->overexposurered > g_Vars.currentplayer->overexposureblue) ? g_Vars.currentplayer->overexposurered @@ -3030,10 +3030,10 @@ Gfx *skyRenderOverexposure(Gfx *gdl) gDPSetPrimColor(gdl++, 0, 0, (s32)r, (s32)g, (s32)b, (s32)a); gDPFillRectangle(gdl++, - viGetViewLeft(), - viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), - viGetViewTop() + viGetViewHeight()); + vi_get_view_left(), + vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), + vi_get_view_top() + vi_get_view_height()); gDPPipeSync(gdl++); } diff --git a/src/game/skyreset.c b/src/game/skyreset.c index d1b057279..27fb70b56 100644 --- a/src/game/skyreset.c +++ b/src/game/skyreset.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void skyReset(u32 stagenum) +void sky_reset(u32 stagenum) { g_SkyStageNum = stagenum; g_SkyLightningActive = false; diff --git a/src/game/skytick.c b/src/game/skytick.c index 910123ae7..1284799e7 100644 --- a/src/game/skytick.c +++ b/src/game/skytick.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void skyTick(void) +void sky_tick(void) { g_SkyCloudOffset += g_Vars.lvupdate60freal * g_SkyWindSpeed; diff --git a/src/game/smoke.c b/src/game/smoke.c index edc7d5e37..b53e29100 100644 --- a/src/game/smoke.c +++ b/src/game/smoke.c @@ -84,11 +84,11 @@ struct smoketype g_SmokeTypes[] = { #endif }; -Gfx *smokeRenderPart(struct smoke *smoke, struct smokepart *part, Gfx *gdl, struct coord *coord, f32 size) +Gfx *smoke_render_part(struct smoke *smoke, struct smokepart *part, Gfx *gdl, struct coord *coord, f32 size) { - Vtx *vertices = gfxAllocateVertices(4); - Col *colours = (Col *)gfxAllocateColours(1); - Mtxf *mtx = camGetProjectionMtxF(); + Vtx *vertices = gfx_allocate_vertices(4); + Col *colours = (Col *)gfx_allocate_colours(1); + Mtxf *mtx = cam_get_projection_mtxf(); struct coord spa0; struct coord sp94; struct coord sp88; @@ -207,7 +207,7 @@ Gfx *smokeRenderPart(struct smoke *smoke, struct smokepart *part, Gfx *gdl, stru colours[0].a = alpha * alphamult; } else { if (smoke->type != SMOKETYPE_PINBALL) { - frac = roomGetFinalBrightnessForPlayer(smoke->prop->rooms[0]) * (1.0f / 255.0f); + frac = room_get_final_brightness_for_player(smoke->prop->rooms[0]) * (1.0f / 255.0f); if (frac > 1) { frac = 1; @@ -261,7 +261,7 @@ Gfx *smokeRenderPart(struct smoke *smoke, struct smokepart *part, Gfx *gdl, stru return gdl; } -struct smoke *smokeCreate(struct coord *pos, RoomNum *rooms, s16 type) +struct smoke *smoke_create(struct coord *pos, RoomNum *rooms, s16 type) { struct smoke *smoke = NULL; s32 playercount = PLAYERCOUNT(); @@ -299,7 +299,7 @@ struct smoke *smokeCreate(struct coord *pos, RoomNum *rooms, s16 type) } if (smoke) { - struct prop *prop = propAllocate(); + struct prop *prop = prop_allocate(); if (prop) { prop->type = PROPTYPE_SMOKE; @@ -313,8 +313,8 @@ struct smoke *smokeCreate(struct coord *pos, RoomNum *rooms, s16 type) } prop->rooms[i] = -1; - propActivateThisFrame(prop); - propEnable(prop); + prop_activate_this_frame(prop); + prop_enable(prop); smoke->prop = prop; smoke->age = 0; @@ -326,7 +326,7 @@ struct smoke *smokeCreate(struct coord *pos, RoomNum *rooms, s16 type) return smoke; } -bool smokeCreateForHand(struct coord *pos, RoomNum *rooms, s16 type, s32 handnum) +bool smoke_create_for_hand(struct coord *pos, RoomNum *rooms, s16 type, s32 handnum) { struct smoke *smoke; s32 i; @@ -353,7 +353,7 @@ bool smokeCreateForHand(struct coord *pos, RoomNum *rooms, s16 type, s32 handnum } } - smoke = smokeCreate(pos, rooms, type); + smoke = smoke_create(pos, rooms, type); if (smoke) { smoke->option = handnum; @@ -368,7 +368,7 @@ bool smokeCreateForHand(struct coord *pos, RoomNum *rooms, s16 type, s32 handnum * smoke parts have a size of zero. Perhaps the caller is supposed to check if * this function returns false and reuse the zero-sized smoke parts if so? */ -bool smokeCreateWithSource(void *source, struct coord *pos, RoomNum *rooms, s16 type, bool srcispadeffect) +bool smoke_create_with_source(void *source, struct coord *pos, RoomNum *rooms, s16 type, bool srcispadeffect) { struct smoke *smoke; s32 i; @@ -399,7 +399,7 @@ bool smokeCreateWithSource(void *source, struct coord *pos, RoomNum *rooms, s16 } } - smoke = smokeCreate(pos, rooms, type); + smoke = smoke_create(pos, rooms, type); if (smoke) { smoke->source = source; @@ -410,17 +410,17 @@ bool smokeCreateWithSource(void *source, struct coord *pos, RoomNum *rooms, s16 return false; } -void smokeCreateAtProp(struct prop *prop, s16 type) +void smoke_create_at_prop(struct prop *prop, s16 type) { - smokeCreateWithSource(prop, &prop->pos, prop->rooms, type, false); + smoke_create_with_source(prop, &prop->pos, prop->rooms, type, false); } -void smokeCreateAtPadEffect(struct padeffectobj *effect, struct coord *pos, RoomNum *rooms, s16 type) +void smoke_create_at_pad_effect(struct padeffectobj *effect, struct coord *pos, RoomNum *rooms, s16 type) { - smokeCreateWithSource(effect, pos, rooms, type, true); + smoke_create_with_source(effect, pos, rooms, type, true); } -void smokeClearForProp(struct prop *prop) +void smoke_clear_for_prop(struct prop *prop) { s32 i; @@ -432,12 +432,12 @@ void smokeClearForProp(struct prop *prop) } } -struct smoke *smokeCreateSimple(struct coord *pos, RoomNum *rooms, s16 type) +struct smoke *smoke_create_simple(struct coord *pos, RoomNum *rooms, s16 type) { - return smokeCreate(pos, rooms, type); + return smoke_create(pos, rooms, type); } -u32 smokeTick(struct prop *prop) +u32 smoke_tick(struct prop *prop) { s32 i; s32 j; @@ -563,7 +563,7 @@ u32 smokeTick(struct prop *prop) } } - bgFindEnteredRooms(&bbmin, &bbmax, prop->rooms, 7, false); + bg_find_entered_rooms(&bbmin, &bbmax, prop->rooms, 7, false); if (smoke->age > g_SmokeTypes[smoke->type].spreadspeed) { free = true; @@ -586,9 +586,9 @@ u32 smokeTick(struct prop *prop) return TICKOP_NONE; } -u32 smokeTickPlayer(struct prop *prop) +u32 smoke_tick_player(struct prop *prop) { - Mtxf *matrix = camGetWorldToScreenMtxf(); + Mtxf *matrix = cam_get_world_to_screen_mtxf(); prop->z = -(matrix->m[0][2] * prop->pos.x + matrix->m[1][2] * prop->pos.y + matrix->m[2][2] * prop->pos.z + matrix->m[3][2]); @@ -603,7 +603,7 @@ u32 smokeTickPlayer(struct prop *prop) return TICKOP_NONE; } -Gfx *smokeRender(struct prop *prop, Gfx *gdl, bool xlupass) +Gfx *smoke_render(struct prop *prop, Gfx *gdl, bool xlupass) { struct smoke *smoke = prop->smoke; s32 roomnum; @@ -632,9 +632,9 @@ Gfx *smokeRender(struct prop *prop, Gfx *gdl, bool xlupass) } if (roomnum != -1) { - coord = roomGetPosPtr(roomnum); + coord = room_get_pos_ptr(roomnum); - roomGetPos(roomnum, &worldoffset); + room_get_pos(roomnum, &worldoffset); if (smoke->parts[0].size > 0) { f32 x = smoke->parts[0].pos.x - worldoffset.x; @@ -647,15 +647,15 @@ Gfx *smokeRender(struct prop *prop, Gfx *gdl, bool xlupass) } if (func0f08e5a8(prop->rooms, &screenbox) > 0) { - gdl = bgScissorWithinViewport(gdl, screenbox.xmin, screenbox.ymin, screenbox.xmax, screenbox.ymax); + gdl = bg_scissor_within_viewport(gdl, screenbox.xmin, screenbox.ymin, screenbox.xmax, screenbox.ymax); } else { - gdl = bgScissorToViewport(gdl); + gdl = bg_scissor_to_viewport(gdl); } gSPClearGeometryMode(gdl++, G_CULL_BOTH | G_FOG); - gSPMatrix(gdl++, osVirtualToPhysical(camGetOrthogonalMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_orthogonal_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gdl = roomApplyMtx(gdl, roomnum); + gdl = room_apply_mtx(gdl, roomnum); if (near) { gSPMatrix(gdl++, osVirtualToPhysical(&var800a3448), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); @@ -680,20 +680,20 @@ Gfx *smokeRender(struct prop *prop, Gfx *gdl, bool xlupass) for (i = 0; i < ARRAYCOUNT(smoke->parts); i++) { if (smoke->parts[i].size > 0) { - gdl = smokeRenderPart(smoke, &smoke->parts[i], gdl, &sp8c, sp88); + gdl = smoke_render_part(smoke, &smoke->parts[i], gdl, &sp8c, sp88); } else { smoke->parts[i].size = 0; } } gDPSetColorDither(gdl++, G_CD_BAYER); - gSPMatrix(gdl++, osVirtualToPhysical(camGetPerspectiveMtxL()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gdl++, osVirtualToPhysical(cam_get_perspective_mtxl()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } return gdl; } -void smokeClearSomeTypes(void) +void smoke_clear_some_types(void) { s32 i; diff --git a/src/game/smokeinit.c b/src/game/smokeinit.c index 66dddada1..68ebf18fa 100644 --- a/src/game/smokeinit.c +++ b/src/game/smokeinit.c @@ -41,7 +41,7 @@ Gfx var800613a0[] = { gsSPEndDisplayList(), }; -void smokesInit(void) +void smokes_init(void) { guScale(&var800a3448, 0.1, 0.1, 0.1); guScale(&var800a3488, 0.2, 0.2, 0.2); diff --git a/src/game/smokereset.c b/src/game/smokereset.c index 8008ccbbe..40c25b3d3 100644 --- a/src/game/smokereset.c +++ b/src/game/smokereset.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void smokeReset(void) +void smoke_reset(void) { s32 i; s32 j; @@ -19,7 +19,7 @@ void smokeReset(void) if (g_MaxSmokes == 0) { g_Smokes = NULL; } else { - g_Smokes = mempAlloc(g_MaxSmokes * sizeof(struct smoke), MEMPOOL_STAGE); + g_Smokes = memp_alloc(g_MaxSmokes * sizeof(struct smoke), MEMPOOL_STAGE); for (i = 0; i < g_MaxSmokes; i++) { g_Smokes[i].prop = NULL; diff --git a/src/game/smokestop.c b/src/game/smokestop.c index adee8834a..aef78452f 100644 --- a/src/game/smokestop.c +++ b/src/game/smokestop.c @@ -5,16 +5,16 @@ #include "data.h" #include "types.h" -void smokeStop(void) +void smoke_stop(void) { s32 i; if (g_Smokes) { for (i = 0; i < g_MaxSmokes; i++) { if (g_Smokes[i].prop) { - propDelist(g_Smokes[i].prop); - propDisable(g_Smokes[i].prop); - propFree(g_Smokes[i].prop); + prop_delist(g_Smokes[i].prop); + prop_disable(g_Smokes[i].prop); + prop_free(g_Smokes[i].prop); g_Smokes[i].prop = NULL; } diff --git a/src/game/sparks.c b/src/game/sparks.c index 3d77e5b3e..db7b22f0c 100644 --- a/src/game/sparks.c +++ b/src/game/sparks.c @@ -64,7 +64,7 @@ struct sparktype g_SparkTypes[] = { bool g_SparksAreActive = false; -void sparkCreate(struct coord *pos, struct sparktype *type) +void spark_create(struct coord *pos, struct sparktype *type) { f32 tmp; f32 maxspeed = 0.0f; @@ -129,7 +129,7 @@ void sparkCreate(struct coord *pos, struct sparktype *type) * This function handles an out-of-memory situation when creating a spark, by * shrinking whichever spark group was about to be overwritten. */ -void sparkgroupEnsureFreeSparkSlot(struct sparkgroup *group) +void sparkgroup_ensure_free_spark_slot(struct sparkgroup *group) { s32 i; @@ -145,7 +145,7 @@ void sparkgroupEnsureFreeSparkSlot(struct sparkgroup *group) } } -void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, struct coord *arg4, s32 typenum) +void sparks_create(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, struct coord *arg4, s32 typenum) { struct sparkgroup *group = &g_SparkGroups[g_NextSparkGroupIndex]; struct sparktype *type = &g_SparkTypes[typenum]; @@ -157,7 +157,7 @@ void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord * u32 colours[3]; u32 stack; - chrGetBloodColour(chr->bodynum, NULL, colours); + chr_get_blood_colour(chr->bodynum, NULL, colours); if (typenum == SPARKTYPE_BLOOD) { type->unk1c = colours[0]; @@ -242,27 +242,27 @@ void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord * group->prop = prop; for (i = 0; i < type->numsparks; i++) { - sparkgroupEnsureFreeSparkSlot(group); - sparkCreate(&grouppos, type); + sparkgroup_ensure_free_spark_slot(group); + spark_create(&grouppos, type); } switch (typenum) { case SPARKTYPE_DEFAULT: - roomFlashLighting(group->room, 24, 32); + room_flash_lighting(group->room, 24, 32); break; case SPARKTYPE_ENVIRONMENTAL1: if (g_Vars.stagenum != STAGE_CRASHSITE) { - roomFlashLighting(group->room, 32, 128); + room_flash_lighting(group->room, 32, 128); } break; case SPARKTYPE_ENVIRONMENTAL2: if (g_Vars.stagenum != STAGE_CRASHSITE) { - roomFlashLighting(group->room, 64, 128); + room_flash_lighting(group->room, 64, 128); } break; case SPARKTYPE_ENVIRONMENTAL3: if (g_Vars.stagenum != STAGE_CRASHSITE) { - roomFlashLighting(group->room, 200, 255); + room_flash_lighting(group->room, 200, 255); } break; } @@ -270,7 +270,7 @@ void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord * g_SparksAreActive = true; } -Gfx *sparksRender(Gfx *gdl) +Gfx *sparks_render(Gfx *gdl) { struct sparkgroup *group; s32 axis; @@ -302,7 +302,7 @@ Gfx *sparksRender(Gfx *gdl) axis = ABS(g_Vars.currentplayer->cam_look.z) > ABS(g_Vars.currentplayer->cam_look.x) ? 2 : 0; } - texSelect(&gdl, &g_TexSparkConfigs[0], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexSparkConfigs[0], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); @@ -367,7 +367,7 @@ Gfx *sparksRender(Gfx *gdl) if (render) { type = &g_SparkTypes[group->type]; - colours = gfxAllocateColours(2); + colours = gfx_allocate_colours(2); if (USINGDEVICE(DEVICE_NIGHTVISION) || USINGDEVICE(DEVICE_IRSCANNER)) { colours[0].word = type->unk1c; @@ -395,20 +395,20 @@ Gfx *sparksRender(Gfx *gdl) gSPColor(gdl++, osVirtualToPhysical(colours), 2); sp120 *= 0.2f; - sp120 *= viGetFovY() / 60.0f; + sp120 *= vi_get_fov_y() / 60.0f; - mtx4LoadIdentity(&spd4); + mtx4_load_identity(&spd4); spd4.m[0][0] = 0.05f; spd4.m[1][1] = 0.05f; spd4.m[2][2] = 0.05f; spd4.m[3][3] = 0.05f; - mtx4SetTranslation(&group->pos, &spd4); - mtx00015be0(camGetWorldToScreenMtxf(), &spd4); + mtx4_set_translation(&group->pos, &spd4); + mtx00015be0(cam_get_world_to_screen_mtxf(), &spd4); - mtx = gfxAllocateMatrix(); - mtxF2L(&spd4, mtx); + mtx = gfx_allocate_matrix(); + mtx_f2l(&spd4, mtx); gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -418,7 +418,7 @@ Gfx *sparksRender(Gfx *gdl) struct spark *spark = &g_Sparks[index]; if (spark->ttl != 0) { - Vtx *vertices = gfxAllocateVertices(3); + Vtx *vertices = gfx_allocate_vertices(3); f32 f2; for (k = 0; k < 3; k++) { diff --git a/src/game/sparksreset.c b/src/game/sparksreset.c index e0ca39701..355f8198b 100644 --- a/src/game/sparksreset.c +++ b/src/game/sparksreset.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void sparksReset(void) +void sparks_reset(void) { s32 i; g_NextSparkIndex = 0; diff --git a/src/game/sparkstick.c b/src/game/sparkstick.c index a75d347b1..3b7f6c8b1 100644 --- a/src/game/sparkstick.c +++ b/src/game/sparkstick.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void sparksTick(void) +void sparks_tick(void) { struct sparkgroup *group; struct sparktype *type; diff --git a/src/game/splat.c b/src/game/splat.c index ce9c6bb96..94d6b86cd 100644 --- a/src/game/splat.c +++ b/src/game/splat.c @@ -53,7 +53,7 @@ bool splat0f149274(f32 arg0, struct prop *prop, struct shotdata *shotdata, f32 a void splat0f14986c(struct splatdata *splatdata); #endif -void splatTickChr(struct prop *prop) +void splat_tick_chr(struct prop *prop) { struct chrdata *chr = prop->chr; struct chrdata *attacker = chr->lastattacker; @@ -86,17 +86,17 @@ void splatTickChr(struct prop *prop) } } - if (thudframe != -1.0f && modelGetCurAnimFrame(chr->model) < thudframe) { - osSyncPrintf("SPLAT : Not Dead Enough %s%s%f", "", "", modelGetCurAnimFrame(chr->model)); + if (thudframe != -1.0f && model_get_cur_anim_frame(chr->model) < thudframe) { + osSyncPrintf("SPLAT : Not Dead Enough %s%s%f", "", "", model_get_cur_anim_frame(chr->model)); } else if (chr->tickssincesplat > TICKS(30) && chr->deaddropsplatsadded < 6) { - chr->deaddropsplatsadded += splatsCreate(1, 1.1f, prop, NULL, 0, 0, isskedar, SPLATTYPE_PUDDLE, TICKS(150), attacker, random() & 8); + chr->deaddropsplatsadded += splats_create(1, 1.1f, prop, NULL, 0, 0, isskedar, SPLATTYPE_PUDDLE, TICKS(150), attacker, random() & 8); } } else { // Consider creating a wounded drop u32 value = chr->bulletstaken * chr->tickssincesplat; if (value > TICKS(240)) { - f32 dist = coordsGetDistance(&chr->lastdroppos, &prop->pos); + f32 dist = coords_get_distance(&chr->lastdroppos, &prop->pos); s32 addmore = false; if (dist > 40) { @@ -108,12 +108,12 @@ void splatTickChr(struct prop *prop) } if (addmore) { - chr->woundedsplatsadded += splatsCreate(1, 0.3f, prop, NULL, 0, 0, isskedar, SPLATTYPE_DROP, TICKS(80), attacker, 0); + chr->woundedsplatsadded += splats_create(1, 0.3f, prop, NULL, 0, 0, isskedar, SPLATTYPE_DROP, TICKS(80), attacker, 0); } } if (chr->woundedsplatsadded >= 40) { - wallhitRemoveOldestWoundedSplatByChr(prop); + wallhit_remove_oldest_wounded_splat_by_chr(prop); chr->woundedsplatsadded--; } @@ -124,7 +124,7 @@ void splatTickChr(struct prop *prop) chr->tickssincesplat += g_Vars.lvupdate60; } -void splatsCreateForChrHit(struct prop *prop, struct shotdata *shotdata, struct coord *arg2, struct coord *arg3, bool isskedar, s32 splattype, struct chrdata *chr2) +void splats_create_for_chr_hit(struct prop *prop, struct shotdata *shotdata, struct coord *arg2, struct coord *arg3, bool isskedar, s32 splattype, struct chrdata *chr2) { #if VERSION != VERSION_JPN_FINAL struct chrdata *chr = prop->chr; @@ -137,13 +137,13 @@ void splatsCreateForChrHit(struct prop *prop, struct shotdata *shotdata, struct u32 qty = random() % 3; if (qty) { - chr->stdsplatsadded += splatsCreate(qty, 0.8f, prop, shotdata, arg2, arg3, isskedar, splattype, TICKS(50), chr2, 0); + chr->stdsplatsadded += splats_create(qty, 0.8f, prop, shotdata, arg2, arg3, isskedar, splattype, TICKS(50), chr2, 0); } } #endif } -s32 splatsCreate(s32 qty, f32 arg1, struct prop *prop, struct shotdata *shotdataarg, +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) { @@ -162,7 +162,7 @@ s32 splatsCreate(s32 qty, f32 arg1, struct prop *prop, struct shotdata *shotdata s32 j; if (splattype == 0) { - dist = coordsGetDistance(&shotdata->gunpos3d, arg5); + dist = coords_get_distance(&shotdata->gunpos3d, arg5); for (i = 0; i < 3; i++) { spfc.f[i] = shotdata->gundir3d.f[i]; @@ -203,9 +203,9 @@ s32 splatsCreate(s32 qty, f32 arg1, struct prop *prop, struct shotdata *shotdata spe4.f[j] = (RANDOMFRAC() * var8007f8a8 * 2.0f - var8007f8a8) * 0.017453292384744f; } - mtx4LoadRotation(&spe4, &spa4); - mtx4RotateVec(&spa4, &spfc, &shotdata->gundir3d); - mtx4RotateVec(&spa4, &spf0, &shotdata->gundir2d); + mtx4_load_rotation(&spe4, &spa4); + mtx4_rotate_vec(&spa4, &spfc, &shotdata->gundir3d); + mtx4_rotate_vec(&spa4, &spf0, &shotdata->gundir2d); #if VERSION >= VERSION_NTSC_1_0 func0f177164(&shotdata->gundir3d, &shotdata->gundir3d, 403, "splat.c"); @@ -278,7 +278,7 @@ bool splat0f149274(f32 arg0, struct prop *chrprop, struct shotdata *shotdata, f3 portal00018148(&stackshotdata.gunpos3d, &endpos, gunrooms, endrooms, rooms, ARRAYCOUNT(rooms) - 1); for (i = 0; rooms[i] != -1; i++) { - if (bgTestHitInRoom(&stackshotdata.gunpos3d, &endpos, rooms[i], &hitthing) + if (bg_test_hit_in_room(&stackshotdata.gunpos3d, &endpos, rooms[i], &hitthing) && ((stackshotdata.gunpos3d.x <= endpos.x && hitthing.pos.x <= endpos.x && stackshotdata.gunpos3d.x <= hitthing.pos.x) || (endpos.x <= stackshotdata.gunpos3d.x && endpos.x <= hitthing.pos.x && hitthing.pos.x <= stackshotdata.gunpos3d.x)) && ((stackshotdata.gunpos3d.y <= endpos.y && hitthing.pos.y <= endpos.y && stackshotdata.gunpos3d.y <= hitthing.pos.y) || (endpos.y <= stackshotdata.gunpos3d.y && endpos.y <= hitthing.pos.y && hitthing.pos.y <= stackshotdata.gunpos3d.y)) && ((stackshotdata.gunpos3d.z <= endpos.z && hitthing.pos.z <= endpos.z && stackshotdata.gunpos3d.z <= hitthing.pos.z) || (endpos.z <= stackshotdata.gunpos3d.z && endpos.z <= hitthing.pos.z && hitthing.pos.z <= stackshotdata.gunpos3d.z))) { @@ -297,7 +297,7 @@ bool splat0f149274(f32 arg0, struct prop *chrprop, struct shotdata *shotdata, f3 } if (hasresult) { - spraydistance = coordsGetDistance(&stackshotdata.gunpos3d, &besthitthing.pos); + spraydistance = coords_get_distance(&stackshotdata.gunpos3d, &besthitthing.pos); if (spraydistance < g_SplatMaxDistance) { sp50c = &hitthing.pos; @@ -332,7 +332,7 @@ bool splat0f149274(f32 arg0, struct prop *chrprop, struct shotdata *shotdata, f3 if (prop) { if (prop->type == PROPTYPE_OBJ || prop->type == PROPTYPE_DOOR || prop->type == PROPTYPE_WEAPON) { - objTestHit(prop, &stackshotdata); + obj_test_hit(prop, &stackshotdata); if (1); } } @@ -395,7 +395,7 @@ bool splat0f149274(f32 arg0, struct prop *chrprop, struct shotdata *shotdata, f3 } #endif -void splatsTick(void) +void splats_tick(void) { // empty } @@ -459,7 +459,7 @@ void splat0f14986c(struct splatdata *splat) break; } - distance = coordsGetDistance(&splat->gunpos, &splat->unk0c); + distance = coords_get_distance(&splat->gunpos, &splat->unk0c); spa0 = var8007f8a0 * distance * sp9c; if (var8007f8b8 < spa0) { @@ -495,9 +495,9 @@ void splat0f14986c(struct splatdata *splat) width *= splat->unk50; height *= splat->unk50; - wallhitChooseBloodColour(splat->chrprop); + wallhit_choose_blood_colour(splat->chrprop); - wallhitCreateWith20Args(&splat->relpos, &splat->unk18, splat->chr ? &splat->chr->prop->pos : NULL, NULL, + wallhit_create_with_20_args(&splat->relpos, &splat->unk18, splat->chr ? &splat->chr->prop->pos : NULL, NULL, NULL, texnum, splat->room, splat->objprop, splat->chrprop, splat->mtxindex, 0, splat->chr, width, height, minalpha, maxalpha, @@ -507,12 +507,12 @@ void splat0f14986c(struct splatdata *splat) smokerooms[0] = splat->room; smokerooms[1] = -1; - smokeCreateSimple(&splat->unk0c, smokerooms, sp88 ? SMOKETYPE_SKCORPSE : SMOKETYPE_14); + smoke_create_simple(&splat->unk0c, smokerooms, sp88 ? SMOKETYPE_SKCORPSE : SMOKETYPE_14); } } #endif -void splatResetChr(struct chrdata *chr) +void splat_reset_chr(struct chrdata *chr) { osSyncPrintf("Splat_ResetChr : Reset One Char : chrdata = %x\n", (uintptr_t) chr); diff --git a/src/game/stagemusic.c b/src/game/stagemusic.c index 9129a96e2..f9d654f11 100644 --- a/src/game/stagemusic.c +++ b/src/game/stagemusic.c @@ -39,12 +39,12 @@ struct stagemusic g_StageTracks[] = { { 0, 0, 0, 0 }, }; -s32 stageGetPrimaryTrack(s32 stagenum) +s32 stage_get_primary_track(s32 stagenum) { s32 i; if (g_Vars.normmplayerisrunning) { - return mpChooseTrack(); + return mp_choose_track(); } i = 0; @@ -52,7 +52,7 @@ s32 stageGetPrimaryTrack(s32 stagenum) while (g_StageTracks[i].stagenum) { if (g_StageTracks[i].stagenum == stagenum) { if (g_StageTracks[i].primarytrack == -1) { - return mpChooseTrack(); + return mp_choose_track(); } return g_StageTracks[i].primarytrack; @@ -61,10 +61,10 @@ s32 stageGetPrimaryTrack(s32 stagenum) i++; } - return mpChooseTrack(); + return mp_choose_track(); } -s32 stageGetAmbientTrack(s32 stagenum) +s32 stage_get_ambient_track(s32 stagenum) { s32 i = 0; @@ -79,7 +79,7 @@ s32 stageGetAmbientTrack(s32 stagenum) return -1; } -s32 stageGetNrgTrack(s32 stagenum) +s32 stage_get_nrg_track(s32 stagenum) { s32 i = 0; diff --git a/src/game/stagetable.c b/src/game/stagetable.c index 92e947802..a5967421d 100644 --- a/src/game/stagetable.c +++ b/src/game/stagetable.c @@ -71,7 +71,7 @@ struct stagetableentry g_Stages[61] = { /*0x3c*/ STAGE_TEST_MP20, 2, 255, 100, 100, 0, FILE_BG_MP20_SEG, FILE_BG_MP20_TILES, FILE_BG_MP20_PADS, FILE_USETUPMP20, FILE_UMP_SETUPMP20, 1, 0.5, 100, 0, 0, -1, 255, 0x3e19999a, -1, 400, 0, 1, }; -struct stagetableentry *stageGetCurrent(void) +struct stagetableentry *stage_get_current(void) { struct stagetableentry *stage = g_Stages; struct stagetableentry *end = (struct stagetableentry *)(uintptr_t)stage + ARRAYCOUNT(g_Stages); @@ -88,7 +88,7 @@ struct stagetableentry *stageGetCurrent(void) return NULL; } -s32 stageGetIndex(s32 stagenum) +s32 stage_get_index(s32 stagenum) { struct stagetableentry *stage = g_Stages; struct stagetableentry *end = (struct stagetableentry *)(uintptr_t)stage + ARRAYCOUNT(g_Stages); diff --git a/src/game/stars.c b/src/game/stars.c index 3f15c28a5..42e8dfb19 100644 --- a/src/game/stars.c +++ b/src/game/stars.c @@ -70,7 +70,7 @@ void stars0f135c70(void) /** * Insert a star position *after* the given index. */ -void starInsert(s32 index, struct coord *arg1) +void star_insert(s32 index, struct coord *arg1) { s32 i; @@ -94,7 +94,7 @@ void starInsert(s32 index, struct coord *arg1) #define ABS2(value) ((value) < 0 ? -(value) : (value)) -void starsReset(void) +void stars_reset(void) { s32 v0; s32 v1; @@ -132,7 +132,7 @@ void starsReset(void) } tmp = g_StarGridSize + 1; - g_StarPositions = mempAlloc(ALIGN64(g_StarCount * 3U + tmp * 72 * tmp + 6 * g_StarGridSize * g_StarGridSize * 4U + 4), MEMPOOL_STAGE); + g_StarPositions = memp_alloc(ALIGN64(g_StarCount * 3U + tmp * 72 * tmp + 6 * g_StarGridSize * g_StarGridSize * 4U + 4), MEMPOOL_STAGE); if (g_StarPositions != NULL) { g_StarPosIndexes = (s32 *)(g_StarPositions + g_StarCount * 3); @@ -190,20 +190,20 @@ void starsReset(void) tmp2 = v0 + g_StarGridSize * v1; - starInsert(spb0 * tmp1 + tmp2, &spd4); + star_insert(spb0 * tmp1 + tmp2, &spd4); } } } } -Gfx *starsRender(Gfx *gdl) +Gfx *stars_render(Gfx *gdl) { bool isddtower = false; Mtxf mtx; - f32 viewleft = viGetViewLeft(); - f32 viewright = viewleft + viGetViewWidth(); - f32 viewtop = viGetViewTop(); - f32 viewbottom = viewtop + viGetViewHeight(); + f32 viewleft = vi_get_view_left(); + f32 viewright = viewleft + vi_get_view_width(); + f32 viewtop = vi_get_view_top(); + f32 viewbottom = viewtop + vi_get_view_height(); s32 i; f32 sp154; struct coord sp148; @@ -224,25 +224,25 @@ Gfx *starsRender(Gfx *gdl) isddtower = true; } - colours[0] = colourBlend(0xffffff7f, 0x7777777f, menuGetSinOscFrac(2) * 255); - colours[1] = colourBlend(0x0000aa7f, 0x2222ff7f, menuGetSinOscFrac(4) * 255); - colours[2] = colourBlend(0x0000ff7f, 0x5555ff7f, menuGetCosOscFrac(2) * 255); - colours[3] = colourBlend(0xaaaaff7f, 0x7777ff7f, menuGetCosOscFrac(4) * 255); + colours[0] = colour_blend(0xffffff7f, 0x7777777f, menu_get_sin_osc_frac(2) * 255); + colours[1] = colour_blend(0x0000aa7f, 0x2222ff7f, menu_get_sin_osc_frac(4) * 255); + colours[2] = colour_blend(0x0000ff7f, 0x5555ff7f, menu_get_cos_osc_frac(2) * 255); + colours[3] = colour_blend(0xaaaaff7f, 0x7777ff7f, menu_get_cos_osc_frac(4) * 255); if (isddtower) { for (i = 0; i < 3; i++) { // Nothing is done with the return value here, so this has no // effect. Maybe the original code incorrectly did a comparison - // instead of an assign? eg. colours[i] == colourBlend(...) + // instead of an assign? eg. colours[i] == colour_blend(...) // Doing this would make the stars more transparent. - colourBlend(colours[i], colours[i] & 0xff, 0x5f); + colour_blend(colours[i], colours[i] & 0xff, 0x5f); } } - sp154 = cosf(0.017453199252486f * (90.0f - viGetFovY() / viGetAspect() * 0.5f)); + sp154 = cosf(0.017453199252486f * (90.0f - vi_get_fov_y() / vi_get_aspect() * 0.5f)); - mtx4LoadIdentity(&mtx); - mtx00015be0(camGetWorldToScreenMtxf(), &mtx); + mtx4_load_identity(&mtx); + mtx00015be0(cam_get_world_to_screen_mtxf(), &mtx); mtx.m[3][0] = 0.0f; mtx.m[3][1] = 0.0f; @@ -262,7 +262,7 @@ Gfx *starsRender(Gfx *gdl) sp148.f[1] = g_Vars.currentplayer->cam_look.f[1]; sp148.f[2] = g_Vars.currentplayer->cam_look.f[2]; - gdl = textSetPrimColour(gdl, 0xffffffff); + gdl = text_set_prim_colour(gdl, 0xffffffff); gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2); diff --git a/src/game/surfacereset.c b/src/game/surfacereset.c index 4acfa08dc..8650ce459 100644 --- a/src/game/surfacereset.c +++ b/src/game/surfacereset.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void surfaceReset(void) +void surface_reset(void) { g_TexCacheCount = 0; diff --git a/src/game/tex.c b/src/game/tex.c index 49fd3782b..3a2136922 100644 --- a/src/game/tex.c +++ b/src/game/tex.c @@ -211,7 +211,7 @@ void tex0f173a00(void) // empty } -void texResetTiles(void) +void tex_reset_tiles(void) { s32 i; @@ -223,7 +223,7 @@ void texResetTiles(void) g_TexLutMode = -1; } -bool texTrySetLutMode(u32 lutmode) +bool tex_try_set_lut_mode(u32 lutmode) { if (g_TexLutMode == lutmode) { return false; @@ -233,7 +233,7 @@ bool texTrySetLutMode(u32 lutmode) return true; } -bool texTrySetTileState(s32 tile, s32 format, s32 depth, s32 line, s32 tmem, s32 smode, s32 tmode, s32 masks, s32 maskt, s32 shifts, s32 shiftt) +bool tex_try_set_tile_state(s32 tile, s32 format, s32 depth, s32 line, s32 tmem, s32 smode, s32 tmode, s32 masks, s32 maskt, s32 shifts, s32 shiftt) { bool changed = false; @@ -265,7 +265,7 @@ bool texTrySetTileState(s32 tile, s32 format, s32 depth, s32 line, s32 tmem, s32 return changed; } -bool texTrySetTileSize(s32 tile, s32 uls, s32 ult, s32 lrs, s32 lrt) +bool tex_try_set_tile_size(s32 tile, s32 uls, s32 ult, s32 lrs, s32 lrt) { bool changed = false; @@ -285,7 +285,7 @@ bool texTrySetTileSize(s32 tile, s32 uls, s32 ult, s32 lrs, s32 lrt) return changed; } -s32 texGetWidthAtLod(struct tex *tex, s32 lod) +s32 tex_get_width_at_lod(struct tex *tex, s32 lod) { s32 i; s32 width = tex->width; @@ -311,7 +311,7 @@ s32 texGetWidthAtLod(struct tex *tex, s32 lod) return width; } -s32 texGetHeightAtLod(struct tex *tex, s32 lod) +s32 tex_get_height_at_lod(struct tex *tex, s32 lod) { s32 i; s32 height = tex->height; @@ -337,10 +337,10 @@ s32 texGetHeightAtLod(struct tex *tex, s32 lod) return height; } -s32 texGetLineSizeInBytes(struct tex *tex, s32 lod) +s32 tex_get_line_size_in_bytes(struct tex *tex, s32 lod) { s32 depth = tex->depth; - s32 width = texGetWidthAtLod(tex, lod); + s32 width = tex_get_width_at_lod(tex, lod); if (depth == G_IM_SIZ_32b) { return (width + 3) / 4; @@ -357,12 +357,12 @@ s32 texGetLineSizeInBytes(struct tex *tex, s32 lod) return (width + 15) / 16; } -s32 texGetSizeInBytes(struct tex *tex, s32 lod) +s32 tex_get_size_in_bytes(struct tex *tex, s32 lod) { - return texGetHeightAtLod(tex, lod) * texGetLineSizeInBytes(tex, lod); + return tex_get_height_at_lod(tex, lod) * tex_get_line_size_in_bytes(tex, lod); } -void texGetDepthAndSize(struct tex *tex, s32 *deptharg, s32 *lenarg) +void tex_get_depth_and_size(struct tex *tex, s32 *deptharg, s32 *lenarg) { s32 depth = tex->depth; s32 numlods = tex->numlods ? tex->numlods : 1; @@ -381,11 +381,11 @@ void texGetDepthAndSize(struct tex *tex, s32 *deptharg, s32 *lenarg) } for (lod = 0; lod < numlods; lod++) { - *lenarg += texGetSizeInBytes(tex, lod) * 4; + *lenarg += tex_get_size_in_bytes(tex, lod) * 4; } } -s32 texDimensionToMask(s32 dimension) +s32 tex_dimension_to_mask(s32 dimension) { s32 i = 0; @@ -399,7 +399,7 @@ s32 texDimensionToMask(s32 dimension) return i; } -s32 texModeToGbiMode(s32 txmode) +s32 tex_mode_to_gbi_mode(s32 txmode) { if (txmode == TXMODE_CLAMP) { return G_TX_CLAMP; @@ -412,7 +412,7 @@ s32 texModeToGbiMode(s32 txmode) return G_TX_WRAP; } -Gfx *texWriteTileFromDefinition(Gfx *gdl, struct tex *tex, s32 offset, s32 shifts, s32 shiftt, s32 min) +Gfx *tex_write_tile_from_definition(Gfx *gdl, struct tex *tex, s32 offset, s32 shifts, s32 shiftt, s32 min) { struct texture *s0 = &g_Textures[tex->texturenum]; s32 masks; @@ -424,21 +424,21 @@ Gfx *texWriteTileFromDefinition(Gfx *gdl, struct tex *tex, s32 offset, s32 shift s32 lrs; s32 lrt; - masks = texDimensionToMask(tex->width); - maskt = texDimensionToMask(tex->height); + masks = tex_dimension_to_mask(tex->width); + maskt = tex_dimension_to_mask(tex->height); - line = texGetLineSizeInBytes(tex, 0); + line = tex_get_line_size_in_bytes(tex, 0); gDPSetPrimColorViaWord(gdl++, min, 0, 0xffffffff); - if (texTrySetLutMode(tex->lutmodeindex << G_MDSFT_TEXTLUT)) { + if (tex_try_set_lut_mode(tex->lutmodeindex << G_MDSFT_TEXTLUT)) { gDPSetTextureLUT(gdl++, tex->lutmodeindex << G_MDSFT_TEXTLUT); } - if (texTrySetTileState(0, tex->gbiformat, tex->depth, line, s0->unk04_00 + line * s0->unk04_04, 0, 0, masks - s0->unk04_08, maskt - s0->unk04_0c, shifts, shiftt)) { + if (tex_try_set_tile_state(0, tex->gbiformat, tex->depth, line, s0->unk04_00 + line * s0->unk04_04, 0, 0, masks - s0->unk04_08, maskt - s0->unk04_0c, shifts, shiftt)) { gDPSetTile(gdl++, tex->gbiformat, tex->depth, line, s0->unk04_00 + line * s0->unk04_04, 0, 0, - texModeToGbiMode(TXMODE_WRAP), maskt - s0->unk04_0c, shiftt, - texModeToGbiMode(TXMODE_WRAP), masks - s0->unk04_08, shifts); + tex_mode_to_gbi_mode(TXMODE_WRAP), maskt - s0->unk04_0c, shiftt, + tex_mode_to_gbi_mode(TXMODE_WRAP), masks - s0->unk04_08, shifts); } uls = (offset == 2 && !tex->hasloddata ? 2 : 0) + 0; @@ -446,7 +446,7 @@ Gfx *texWriteTileFromDefinition(Gfx *gdl, struct tex *tex, s32 offset, s32 shift lrs = (offset == 2 && !tex->hasloddata ? 2 : 0) + ((tex->width - 1) << 2); lrt = (offset == 2 && !tex->hasloddata ? 2 : 0) + ((tex->height - 1) << 2); - if (texTrySetTileSize(0, uls, ult, lrs, lrt)) { + if (tex_try_set_tile_size(0, uls, ult, lrs, lrt)) { gDPSetTileSize(gdl++, 0, uls, ult, lrs, lrt); } @@ -462,7 +462,7 @@ Gfx *texWriteTileFromDefinition(Gfx *gdl, struct tex *tex, s32 offset, s32 shift * If append is true then the command will be appended to the given gdl, * otherwise the existing texcmd will be patched in place. */ -Gfx *texWriteTextureCmd(Gfx *gdl, Gfx *texcmd, struct tex *tex, bool append) +Gfx *tex_write_texture_cmd(Gfx *gdl, Gfx *texcmd, struct tex *tex, bool append) { s32 lod = tex->numlods ? tex->numlods - 1 : 0; @@ -487,12 +487,12 @@ Gfx *texWriteTextureCmd(Gfx *gdl, Gfx *texcmd, struct tex *tex, bool append) return gdl; } -Gfx *texWriteLoadToTmemAddr(Gfx *gdl, struct tex *tex, s32 tmemoffset) +Gfx *tex_write_load_to_tmem_addr(Gfx *gdl, struct tex *tex, s32 tmemoffset) { s32 depth; s32 len; - texGetDepthAndSize(tex, &depth, &len); + tex_get_depth_and_size(tex, &depth, &len); if (tex->lutmodeindex == 0) { gDPSetTextureImage(gdl++, tex->gbiformat, depth, 1, tex->data); @@ -506,7 +506,7 @@ Gfx *texWriteLoadToTmemAddr(Gfx *gdl, struct tex *tex, s32 tmemoffset) gDPLoadSync(gdl++); gDPLoadBlock(gdl++, G_TX_LOADTILE, 0, 0, len - 1, 0); } else { - if (texTrySetTileState(5, 0, depth, 0, tmemoffset, 0, 0, 0, 0, 0, 0)) { + if (tex_try_set_tile_state(5, 0, depth, 0, tmemoffset, 0, 0, 0, 0, 0, 0)) { gDPSetTile(gdl++, G_IM_FMT_RGBA, depth, 0, tmemoffset, 5, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); @@ -527,7 +527,7 @@ Gfx *texWriteLoadToTmemAddr(Gfx *gdl, struct tex *tex, s32 tmemoffset) gDPLoadSync(gdl++); gDPLoadBlock(gdl++, G_TX_LOADTILE, 0, 0, len - 1, 0); } else { - if (texTrySetTileState(5, 0, depth, 0, tmemoffset, 0, 0, 0, 0, 0, 0)) { + if (tex_try_set_tile_state(5, 0, depth, 0, tmemoffset, 0, 0, 0, 0, 0, 0)) { gDPSetTile(gdl++, G_IM_FMT_RGBA, depth, 0, tmemoffset, 5, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); @@ -551,7 +551,7 @@ Gfx *texWriteLoadToTmemAddr(Gfx *gdl, struct tex *tex, s32 tmemoffset) return gdl; } -Gfx *texWriteTileLods(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, s32 starttile, s32 numlodsarg, u32 tmemoffsetarg) +Gfx *tex_write_tile_lods(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, s32 starttile, s32 numlodsarg, u32 tmemoffsetarg) { u32 tmemoffset; s32 numlods; @@ -567,32 +567,32 @@ Gfx *texWriteTileLods(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offse for (tile = starttile; tile < numlods + starttile && tile < 6; tile++) { s32 stack[2]; s32 lod = tile - starttile; - s32 masks = texDimensionToMask(texGetWidthAtLod(tex, lod)); - s32 maskt = texDimensionToMask(texGetHeightAtLod(tex, lod)); - s32 line = texGetLineSizeInBytes(tex, lod); + s32 masks = tex_dimension_to_mask(tex_get_width_at_lod(tex, lod)); + s32 maskt = tex_dimension_to_mask(tex_get_height_at_lod(tex, lod)); + s32 line = tex_get_line_size_in_bytes(tex, lod); s32 uls; s32 ult; s32 lrs; s32 lrt; - s32 bytes = texGetSizeInBytes(tex, lod); + s32 bytes = tex_get_size_in_bytes(tex, lod); bool hasloddata = tex->hasloddata; - if (texTrySetLutMode(tex->lutmodeindex << G_MDSFT_TEXTLUT)) { + if (tex_try_set_lut_mode(tex->lutmodeindex << G_MDSFT_TEXTLUT)) { gDPSetTextureLUT(gdl++, tex->lutmodeindex << G_MDSFT_TEXTLUT); } - if (texTrySetTileState(tile, tex->gbiformat, tex->depth, line, tmemoffset, smode, tmode, masks, maskt, lod, lod)) { + if (tex_try_set_tile_state(tile, tex->gbiformat, tex->depth, line, tmemoffset, smode, tmode, masks, maskt, lod, lod)) { gDPSetTile(gdl++, tex->gbiformat, tex->depth, line, tmemoffset, tile, 0, - texModeToGbiMode(tmode), maskt, lod, - texModeToGbiMode(smode), masks, tile - starttile); + tex_mode_to_gbi_mode(tmode), maskt, lod, + tex_mode_to_gbi_mode(smode), masks, tile - starttile); } uls = (offset == 2 && hasloddata == false ? 2 : 0) + 0; ult = (offset == 2 && hasloddata == false ? 2 : 0) + 0; - lrs = ((texGetWidthAtLod(tex, lod) - 1) << 2) + (offset == 2 && hasloddata == false ? 2 : 0); - lrt = ((texGetHeightAtLod(tex, lod) - 1) << 2) + (offset == 2 && hasloddata == false ? 2 : 0); + lrs = ((tex_get_width_at_lod(tex, lod) - 1) << 2) + (offset == 2 && hasloddata == false ? 2 : 0); + lrt = ((tex_get_height_at_lod(tex, lod) - 1) << 2) + (offset == 2 && hasloddata == false ? 2 : 0); - if (texTrySetTileSize(tile, uls, ult, lrs, lrt)) { + if (tex_try_set_tile_size(tile, uls, ult, lrs, lrt)) { gDPSetTileSize(gdl++, tile, uls, ult, lrs, lrt); } @@ -602,12 +602,12 @@ Gfx *texWriteTileLods(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offse return gdl; } -Gfx *texWriteLoadToTmemZero(Gfx *gdl, struct tex *tex) +Gfx *tex_write_load_to_tmem_zero(Gfx *gdl, struct tex *tex) { s32 depth; s32 len; - texGetDepthAndSize(tex, &depth, &len); + tex_get_depth_and_size(tex, &depth, &len); if (tex->lutmodeindex == 0) { gDPSetTextureImage(gdl++, tex->gbiformat, depth, 1, tex->data); @@ -621,7 +621,7 @@ Gfx *texWriteLoadToTmemZero(Gfx *gdl, struct tex *tex) gDPLoadSync(gdl++); gDPLoadBlock(gdl++, G_TX_LOADTILE, 0, 0, len - 1, 0); } else { - if (texTrySetTileState(5, 0, depth, 0, 0, 0, 0, 0, 0, 0, 0)) { + if (tex_try_set_tile_state(5, 0, depth, 0, 0, 0, 0, 0, 0, 0, 0)) { gDPSetTile(gdl++, G_IM_FMT_RGBA, depth, 0, 0x0000, 5, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); } @@ -640,7 +640,7 @@ Gfx *texWriteLoadToTmemZero(Gfx *gdl, struct tex *tex) gDPLoadSync(gdl++); gDPLoadBlock(gdl++, G_TX_LOADTILE, 0, 0, len - 1, 0); } else { - if (texTrySetTileState(5, 0, depth, 0, 0, 0, 0, 0, 0, 0, 0)) { + if (tex_try_set_tile_state(5, 0, depth, 0, 0, 0, 0, 0, 0, 0, 0)) { gDPSetTile(gdl++, G_IM_FMT_RGBA, depth, 0, 0x0000, 5, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); } @@ -662,7 +662,7 @@ Gfx *texWriteLoadToTmemZero(Gfx *gdl, struct tex *tex) return gdl; } -Gfx *texWriteTile(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, s32 tile) +Gfx *tex_write_tile(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, s32 tile) { s32 masks; s32 maskt; @@ -673,19 +673,19 @@ Gfx *texWriteTile(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, s s32 lrt; bool hasloddata; - masks = texDimensionToMask(tex->width); - maskt = texDimensionToMask(tex->height); - line = texGetLineSizeInBytes(tex, 0); + masks = tex_dimension_to_mask(tex->width); + maskt = tex_dimension_to_mask(tex->height); + line = tex_get_line_size_in_bytes(tex, 0); hasloddata = tex->hasloddata; - if (texTrySetLutMode(tex->lutmodeindex << G_MDSFT_TEXTLUT)) { + if (tex_try_set_lut_mode(tex->lutmodeindex << G_MDSFT_TEXTLUT)) { gDPSetTextureLUT(gdl++, tex->lutmodeindex << G_MDSFT_TEXTLUT); } - if (texTrySetTileState(tile, tex->gbiformat, tex->depth, line, 0, smode, tmode, masks, maskt, 0, 0)) { + if (tex_try_set_tile_state(tile, tex->gbiformat, tex->depth, line, 0, smode, tmode, masks, maskt, 0, 0)) { gDPSetTile(gdl++, tex->gbiformat, tex->depth, line, 0x0000, tile, 0, - texModeToGbiMode(tmode), maskt, G_TX_NOLOD, - texModeToGbiMode(smode), masks, G_TX_NOLOD); + tex_mode_to_gbi_mode(tmode), maskt, G_TX_NOLOD, + tex_mode_to_gbi_mode(smode), masks, G_TX_NOLOD); } uls = (offset == 2 && hasloddata == false ? 2 : 0) + 0; @@ -693,29 +693,29 @@ Gfx *texWriteTile(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, s lrs = (offset == 2 && hasloddata == false ? 2 : 0) + ((tex->width - 1) << 2); lrt = (offset == 2 && hasloddata == false ? 2 : 0) + ((tex->height - 1) << 2); - if (texTrySetTileSize(tile, uls, ult, lrs, lrt)) { + if (tex_try_set_tile_size(tile, uls, ult, lrs, lrt)) { gDPSetTileSize(gdl++, tile, uls, ult, lrs, lrt); } return gdl; } -Gfx *texHandleType2(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, bool flag) +Gfx *tex_handle_type2(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, bool flag) { s32 tile = 0; - gdl = texWriteLoadToTmemAddr(gdl, tex, 0); + gdl = tex_write_load_to_tmem_addr(gdl, tex, 0); if (flag) { - gdl = texWriteTileLods(gdl, tex, smode, tmode, offset, tile, 1, 0); + gdl = tex_write_tile_lods(gdl, tex, smode, tmode, offset, tile, 1, 0); tile++; } - gdl = texWriteTileLods(gdl, tex, smode, tmode, offset, tile, -1, 0); + gdl = tex_write_tile_lods(gdl, tex, smode, tmode, offset, tile, -1, 0); tile += tex->numlods; if (!flag && tex->numlods == 1) { - gdl = texWriteTileLods(gdl, tex, smode, tmode, offset, tile, -1, 0); + gdl = tex_write_tile_lods(gdl, tex, smode, tmode, offset, tile, -1, 0); tile += tex->numlods; } @@ -725,28 +725,28 @@ Gfx *texHandleType2(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, return gdl; } -Gfx *texHandleType1(Gfx *gdl, struct tex *tex1, s32 smode, s32 tmode, s32 offset, struct tex *tex2, s32 shifts, s32 shiftt, s32 min, bool flag) +Gfx *tex_handle_type1(Gfx *gdl, struct tex *tex1, s32 smode, s32 tmode, s32 offset, struct tex *tex2, s32 shifts, s32 shiftt, s32 min, bool flag) { - s32 size = texGetSizeInBytes(tex2, 0); + s32 size = tex_get_size_in_bytes(tex2, 0); s32 tile = 0; - gdl = texWriteLoadToTmemZero(gdl, tex2); + gdl = tex_write_load_to_tmem_zero(gdl, tex2); gDPTileSync(gdl++); - gdl = texWriteLoadToTmemAddr(gdl, tex1, size); + gdl = tex_write_load_to_tmem_addr(gdl, tex1, size); - gdl = texWriteTileFromDefinition(gdl, tex2, offset, shifts, shiftt, min); + gdl = tex_write_tile_from_definition(gdl, tex2, offset, shifts, shiftt, min); tile++; if (flag) { - gdl = texWriteTileLods(gdl, tex1, smode, tmode, offset, tile, 1, size); + gdl = tex_write_tile_lods(gdl, tex1, smode, tmode, offset, tile, 1, size); tile++; } - gdl = texWriteTileLods(gdl, tex1, smode, tmode, offset, tile, -1, size); + gdl = tex_write_tile_lods(gdl, tex1, smode, tmode, offset, tile, -1, size); tile += tex1->numlods; if (!flag && tex1->numlods == 1) { - gdl = texWriteTileLods(gdl, tex1, smode, tmode, offset, tile, -1, size); + gdl = tex_write_tile_lods(gdl, tex1, smode, tmode, offset, tile, -1, size); tile += tex1->numlods; } @@ -756,25 +756,25 @@ Gfx *texHandleType1(Gfx *gdl, struct tex *tex1, s32 smode, s32 tmode, s32 offset return gdl; } -Gfx *texHandleType0(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, s32 shifts, s32 shiftt, s32 min, bool flag) +Gfx *tex_handle_type0(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, s32 shifts, s32 shiftt, s32 min, bool flag) { s32 tile = 0; - gdl = texWriteLoadToTmemAddr(gdl, tex, 0); + gdl = tex_write_load_to_tmem_addr(gdl, tex, 0); - gdl = texWriteTileFromDefinition(gdl, tex, offset, shifts, shiftt, min); + gdl = tex_write_tile_from_definition(gdl, tex, offset, shifts, shiftt, min); tile++; if (flag) { - gdl = texWriteTileLods(gdl, tex, smode, tmode, offset, tile, 1, 0); + gdl = tex_write_tile_lods(gdl, tex, smode, tmode, offset, tile, 1, 0); tile++; } - gdl = texWriteTileLods(gdl, tex, smode, tmode, offset, tile, -1, 0); + gdl = tex_write_tile_lods(gdl, tex, smode, tmode, offset, tile, -1, 0); tile += tex->numlods; if (!flag && tex->numlods == 1) { - gdl = texWriteTileLods(gdl, tex, smode, tmode, offset, tile, -1, 0); + gdl = tex_write_tile_lods(gdl, tex, smode, tmode, offset, tile, -1, 0); tile += tex->numlods; } @@ -784,10 +784,10 @@ Gfx *texHandleType0(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset, return gdl; } -Gfx *texHandleType4(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset) +Gfx *tex_handle_type4(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset) { - gdl = texWriteLoadToTmemZero(gdl, tex); - gdl = texWriteTile(gdl, tex, smode, tmode, offset, 0); + gdl = tex_write_load_to_tmem_zero(gdl, tex); + gdl = tex_write_tile(gdl, tex, smode, tmode, offset, 0); gDPPipeSync(gdl++); g_TexPipeSynced = true; @@ -795,11 +795,11 @@ Gfx *texHandleType4(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset) return gdl; } -Gfx *texHandleType3(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset) +Gfx *tex_handle_type3(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset) { - gdl = texWriteLoadToTmemZero(gdl, tex); - gdl = texWriteTile(gdl, tex, smode, tmode, offset, 0); - gdl = texWriteTile(gdl, tex, smode, tmode, offset, 1); + gdl = tex_write_load_to_tmem_zero(gdl, tex); + gdl = tex_write_tile(gdl, tex, smode, tmode, offset, 0); + gdl = tex_write_tile(gdl, tex, smode, tmode, offset, 1); gDPPipeSync(gdl++); @@ -820,7 +820,7 @@ Gfx *texHandleType3(Gfx *gdl, struct tex *tex, s32 smode, s32 tmode, s32 offset) * The code that expands the C0 commands keeps track of RSP state and avoids * emitting duplicate or redundant commands. */ -s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpool *pool, u8 *vtxstart) +s32 tex_load_from_gdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpool *pool, u8 *vtxstart) { struct tex *tex1; struct tex *tex2; @@ -860,9 +860,9 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo numcmdsremaining = gdlsizeinbytes >> 3; - texResetTiles(); + tex_reset_tiles(); - spe0 = dyntexHasRoom(); + spe0 = dyntex_has_room(); if (spe0) { for (j = 0; j < ARRAYCOUNT(sp90); j++) { @@ -886,9 +886,9 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo texturenum = ingdl->words.w1 & 0xfff; flag = ingdl->words.w0 & 0x200; - texLoadFromTextureNum(texturenum, pool); + tex_load_from_texture_num(texturenum, pool); - tex1 = texFindInPool(texturenum, pool); + tex1 = tex_find_in_pool(texturenum, pool); if (tex1 != NULL) { spf4 = tex1->unk0c_03; @@ -897,7 +897,7 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo } if (tex1 != NULL) { - outgdl = texWriteTextureCmd(outgdl, texcmd, tex1, appendtex); + outgdl = tex_write_texture_cmd(outgdl, texcmd, tex1, appendtex); appendtex = false; animated = false; @@ -910,12 +910,12 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo shifts = (ingdl->words.w0 >> 14) & 0xf; shiftt = (ingdl->words.w0 >> 10) & 0xf; - outgdl = texHandleType0(outgdl, tex1, smode, tmode, offset, shifts, shiftt, min, flag); + outgdl = tex_handle_type0(outgdl, tex1, smode, tmode, offset, shifts, shiftt, min, flag); break; case 1: texturenum2 = (ingdl->words.w1 >> 12) & 0xfff; - texLoadFromTextureNum(texturenum2, pool); - tex2 = texFindInPool(texturenum2, pool); + tex_load_from_texture_num(texturenum2, pool); + tex2 = tex_find_in_pool(texturenum2, pool); if (tex2 != NULL) { min = (ingdl->words.w1 >> 24) & 0xff; @@ -925,7 +925,7 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo shifts = (ingdl->words.w0 >> 14) & 0xf; shiftt = (ingdl->words.w0 >> 10) & 0xf; - outgdl = texHandleType1(outgdl, tex1, smode, tmode, offset, tex2, shifts, shiftt, min, flag); + outgdl = tex_handle_type1(outgdl, tex1, smode, tmode, offset, tex2, shifts, shiftt, min, flag); } break; case 2: @@ -933,48 +933,48 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo tmode = (ingdl->words.w0 >> 20) & 3; offset = (ingdl->words.w0 >> 18) & 3; - outgdl = texHandleType2(outgdl, tex1, smode, tmode, offset, flag); + outgdl = tex_handle_type2(outgdl, tex1, smode, tmode, offset, flag); break; case 3: smode = (ingdl->words.w0 >> 22) & 3; tmode = (ingdl->words.w0 >> 20) & 3; offset = (ingdl->words.w0 >> 18) & 3; - outgdl = texHandleType3(outgdl, tex1, smode, tmode, offset); + outgdl = tex_handle_type3(outgdl, tex1, smode, tmode, offset); break; case 4: smode = (ingdl->words.w0 >> 22) & 3; tmode = (ingdl->words.w0 >> 20) & 3; offset = (ingdl->words.w0 >> 18) & 3; - outgdl = texHandleType4(outgdl, tex1, smode, tmode, offset); + outgdl = tex_handle_type4(outgdl, tex1, smode, tmode, offset); break; } if (spe0 != 0) { // Deep Sea - green river under floor if (texturenum == TEXTURE_06CB) { - dyntexSetCurrentType(DYNTEXTYPE_RIVER); + dyntex_set_current_type(DYNTEXTYPE_RIVER); animated = true; } // Deep Sea - juice that flows inside SA megaweapon // Attack Ship - juice that flows inside engine power node if (texturenum == TEXTURE_0A6A) { - dyntexSetCurrentType(DYNTEXTYPE_POWERJUICE); + dyntex_set_current_type(DYNTEXTYPE_POWERJUICE); animated = true; } // Deep Sea - white rings around SA megaweapon node // Attack Ship - white rings around engine power node if (texturenum == TEXTURE_0A69) { - dyntexSetCurrentType(DYNTEXTYPE_POWERRING); + dyntex_set_current_type(DYNTEXTYPE_POWERRING); animated = true; } // Deep Sea - teleport if (texturenum == TEXTURE_06E2) { - dyntexSetCurrentType(DYNTEXTYPE_TELEPORTAL); + dyntex_set_current_type(DYNTEXTYPE_TELEPORTAL); animated = true; } @@ -984,26 +984,26 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo // 0dae - Villa - shallow water // 0dae - Sewers (MP) if (texturenum == TEXTURE_01C7 || texturenum == TEXTURE_0DAE) { - dyntexSetCurrentType(DYNTEXTYPE_RIVER); + dyntex_set_current_type(DYNTEXTYPE_RIVER); animated = true; } // Air Force One - Monitor if (texturenum == TEXTURE_029B) { - dyntexSetCurrentType(DYNTEXTYPE_MONITOR); + dyntex_set_current_type(DYNTEXTYPE_MONITOR); animated = true; } // Villa - deep water // Complex - water if (texturenum == TEXTURE_090F) { - dyntexSetCurrentType(DYNTEXTYPE_OCEAN); + dyntex_set_current_type(DYNTEXTYPE_OCEAN); animated = true; } // Attack Ship - triangular arrows if (texturenum == TEXTURE_0A42) { - dyntexSetCurrentType(DYNTEXTYPE_ARROWS); + dyntex_set_current_type(DYNTEXTYPE_ARROWS); animated = true; } } @@ -1025,7 +1025,7 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo for (i = start; i < start + count; i++) { if (animated && sp90[i]) { - dyntexAddVertex(spa0[i]); + dyntex_add_vertex(spa0[i]); sp90[i] = 0; } @@ -1141,7 +1141,7 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo for (i = 0; i < ARRAYCOUNT(sp90); i++) { if (sp90[i]) { - dyntexAddVertex(spa0[i]); + dyntex_add_vertex(spa0[i]); sp90[i] = 0; } } @@ -1152,7 +1152,7 @@ s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpo return (uintptr_t) outgdl - (uintptr_t) outstart; } -void texCopyGdls(Gfx *src, Gfx *dst, s32 count) +void tex_copy_gdls(Gfx *src, Gfx *dst, s32 count) { count = (count >> 3); src = src + (count - 1); diff --git a/src/game/texdecompress.c b/src/game/texdecompress.c index 0162a4b76..5f9b79b60 100644 --- a/src/game/texdecompress.c +++ b/src/game/texdecompress.c @@ -141,7 +141,7 @@ void func0f16e810(u32 arg0) * * The zlib data is prefixed with the standard 5-byte rarezip header. */ -s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpool *pool, bool unusedarg) +s32 tex_inflate_zlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpool *pool, bool unusedarg) { s32 i; s32 imagebytesout; @@ -163,7 +163,7 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo writetocache = false; totalbytesout = 0; - texSetBitstring(src); + tex_set_bitstring(src); if (hasloddata && numlods) { numimages = numlods; @@ -184,18 +184,18 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo } } - format = texReadBits(8); - numcolours = texReadBits(8) + 1; + format = tex_read_bits(8); + numcolours = tex_read_bits(8) + 1; for (i = 0; i < numcolours; i++) { - palette[i] = texReadBits(16); + palette[i] = tex_read_bits(16); } foundthething = false; for (lod = 0; lod < numimages; lod++) { - width = texReadBits(8); - height = texReadBits(8); + width = tex_read_bits(8); + height = tex_read_bits(8); if (lod == 0) { pool->rightpos->width = width; @@ -209,7 +209,7 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo g_TexCacheItems[g_TexCacheCount].heights[lod - 1] = height; } - if (rzipInflate(g_TexBitstring, scratch2, scratch) == 0) { + if (rzip_inflate(g_TexBitstring, scratch2, scratch) == 0) { #if VERSION < VERSION_NTSC_1_0 char message[128]; sprintf(message, "DMA-Crash %s %d Ram: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", @@ -218,13 +218,13 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo g_TexBitstring[4], g_TexBitstring[5], g_TexBitstring[6], g_TexBitstring[7], g_TexBitstring[8], g_TexBitstring[9], g_TexBitstring[10], g_TexBitstring[11], g_TexBitstring[12], g_TexBitstring[13], g_TexBitstring[14], g_TexBitstring[15]); - crashSetMessage(message); + crash_set_message(message); CRASH(); #endif } - imagebytesout = texAlignIndices(scratch2, width, height, format, &dst[totalbytesout]); - texSetBitstring(rzipGetSomething()); + imagebytesout = tex_align_indices(scratch2, width, height, format, &dst[totalbytesout]); + tex_set_bitstring(rzip_get_something()); if (hasloddata == true) { if (IS4MB() && lod == 2 && !foundthething) { @@ -238,7 +238,7 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo foundthething = true; } } else { - texSwizzle(&dst[totalbytesout], width, height, format); + tex_swizzle(&dst[totalbytesout], width, height, format); totalbytesout += imagebytesout; } } else { @@ -267,7 +267,7 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo loddst = &dst[totalbytesout]; for (lod = 1; lod < numlods; lod++) { - imagebytesout = texShrinkPaletted(lodsrc, loddst, tmpwidth, tmpheight, format, palette, numcolours); + imagebytesout = tex_shrink_paletted(lodsrc, loddst, tmpwidth, tmpheight, format, palette, numcolours); if (IS4MB() && lod == 2) { pool->rightpos->numlods = lod; @@ -279,7 +279,7 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo break; } - texSwizzle(lodsrc, tmpwidth, tmpheight, format); + tex_swizzle(lodsrc, tmpwidth, tmpheight, format); totalbytesout += imagebytesout; @@ -290,9 +290,9 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo loddst += imagebytesout; } - texSwizzle(lodsrc, tmpwidth, tmpheight, format); + tex_swizzle(lodsrc, tmpwidth, tmpheight, format); } else { - texSwizzle(dst, width, height, format); + tex_swizzle(dst, width, height, format); } } @@ -324,7 +324,7 @@ s32 texInflateZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpoo * * Return the number of output bytes. */ -s32 texAlignIndices(u8 *src, s32 width, s32 height, s32 format, u8 *dst) +s32 tex_align_indices(u8 *src, s32 width, s32 height, s32 format, u8 *dst) { u8 *outptr = dst; s32 x; @@ -350,7 +350,7 @@ s32 texAlignIndices(u8 *src, s32 width, s32 height, s32 format, u8 *dst) return outptr - dst; } -s32 texGetAverageRed(u16 colour1, u16 colour2, u16 colour3, u16 colour4) +s32 tex_get_average_red(u16 colour1, u16 colour2, u16 colour3, u16 colour4) { s32 value = 0; @@ -372,7 +372,7 @@ s32 texGetAverageRed(u16 colour1, u16 colour2, u16 colour3, u16 colour4) return value; } -s32 texGetAverageGreen(u16 colour1, u16 colour2, u16 colour3, u16 colour4) +s32 tex_get_average_green(u16 colour1, u16 colour2, u16 colour3, u16 colour4) { s32 value = 0; @@ -394,7 +394,7 @@ s32 texGetAverageGreen(u16 colour1, u16 colour2, u16 colour3, u16 colour4) return value; } -s32 texGetAverageBlue(u16 colour1, u16 colour2, u16 colour3, u16 colour4) +s32 tex_get_average_blue(u16 colour1, u16 colour2, u16 colour3, u16 colour4) { s32 value = 0; @@ -416,7 +416,7 @@ s32 texGetAverageBlue(u16 colour1, u16 colour2, u16 colour3, u16 colour4) return value; } -s32 texGetAverageAlpha(u16 colour1, u16 colour2, u16 colour3, u16 colour4) +s32 tex_get_average_alpha(u16 colour1, u16 colour2, u16 colour3, u16 colour4) { s32 value = 0 + (colour1 & 1 ? 0xff : 0) @@ -443,7 +443,7 @@ s32 texGetAverageAlpha(u16 colour1, u16 colour2, u16 colour3, u16 colour4) * * Return the number of bytes written. */ -s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, u16 *palette, s32 numcolours) +s32 tex_shrink_paletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, u16 *palette, s32 numcolours) { s32 j; s32 i; @@ -505,12 +505,12 @@ s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, colour3 = palette[src8[nextrow + j]]; colour4 = palette[src8[nextrow + nextcol]]; - r = texGetAverageRed(colour1, colour2, colour3, colour4); - g = texGetAverageGreen(colour1, colour2, colour3, colour4); - b = texGetAverageBlue(colour1, colour2, colour3, colour4); - a = texGetAverageAlpha(colour1, colour2, colour3, colour4); + r = tex_get_average_red(colour1, colour2, colour3, colour4); + g = tex_get_average_green(colour1, colour2, colour3, colour4); + b = tex_get_average_blue(colour1, colour2, colour3, colour4); + a = tex_get_average_alpha(colour1, colour2, colour3, colour4); - dst8[j >> 1] = texFindClosestColourIndexRGBA(palette32, numcolours, r, g, b, a); + dst8[j >> 1] = tex_find_closest_colour_index_r_g_b_a(palette32, numcolours, r, g, b, a); } dst8 += aligneddstwidth; @@ -533,7 +533,7 @@ s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, c = ((((colour1 >> 8) & 0xff) + ((colour2 >> 8) & 0xff) + ((colour3 >> 8) & 0xff) + ((colour4 >> 8) & 0xff)) >> 2) & 0xff; a = ((((colour1 >> 0) & 0xff) + ((colour2 >> 0) & 0xff) + ((colour3 >> 0) & 0xff) + ((colour4 >> 0) & 0xff) + 1) >> 2) & 0xff; - dst8[j >> 1] = texFindClosestColourIndexIA(palette, numcolours, c, a); + dst8[j >> 1] = tex_find_closest_colour_index_i_a(palette, numcolours, c, a); } dst8 += aligneddstwidth; @@ -551,24 +551,24 @@ s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, colour3 = palette[(src8[nextrow + (j >> 1)] >> 4) & 0xf]; colour4 = palette[src8[nextrow + (j >> 1)] >> ((j + 1 < srcwidth ? 0 : 4)) & 0xf]; - r = texGetAverageRed(colour1, colour2, colour3, colour4); - g = texGetAverageGreen(colour1, colour2, colour3, colour4); - b = texGetAverageBlue(colour1, colour2, colour3, colour4); - a = texGetAverageAlpha(colour1, colour2, colour3, colour4); + r = tex_get_average_red(colour1, colour2, colour3, colour4); + g = tex_get_average_green(colour1, colour2, colour3, colour4); + b = tex_get_average_blue(colour1, colour2, colour3, colour4); + a = tex_get_average_alpha(colour1, colour2, colour3, colour4); - dst8[j >> 2] = texFindClosestColourIndexRGBA(palette32, numcolours, r, g, b, a) << 4; + dst8[j >> 2] = tex_find_closest_colour_index_r_g_b_a(palette32, numcolours, r, g, b, a) << 4; colour1 = palette[(src8[(j + 2) >> 1] >> 4) & 0xf]; colour2 = palette[(src8[(j + 2) >> 1] >> (j + 3 < srcwidth ? 0 : 4)) & 0xf]; colour3 = palette[(src8[nextrow + ((j + 2) >> 1)] >> 4) & 0xf]; colour4 = palette[(src8[nextrow + ((j + 2) >> 1)] >> (j + 3 < srcwidth ? 0 : 4)) & 0xf]; - r = texGetAverageRed(colour1, colour2, colour3, colour4); - g = texGetAverageGreen(colour1, colour2, colour3, colour4); - b = texGetAverageBlue(colour1, colour2, colour3, colour4); - a = texGetAverageAlpha(colour1, colour2, colour3, colour4); + r = tex_get_average_red(colour1, colour2, colour3, colour4); + g = tex_get_average_green(colour1, colour2, colour3, colour4); + b = tex_get_average_blue(colour1, colour2, colour3, colour4); + a = tex_get_average_alpha(colour1, colour2, colour3, colour4); - dst8[j >> 2] |= texFindClosestColourIndexRGBA(palette32, numcolours, r, g, b, a) & 0xff; + dst8[j >> 2] |= tex_find_closest_colour_index_r_g_b_a(palette32, numcolours, r, g, b, a) & 0xff; } dst8 += aligneddstwidth >> 1; @@ -593,7 +593,7 @@ s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, c = ((((colour1 >> 8) & 0xff) + ((colour2 >> 8) & 0xff) + ((colour3 >> 8) & 0xff) + ((colour4 >> 8) & 0xff)) >> 2) & 0xff; a = ((((colour1 >> 0) & 0xff) + ((colour2 >> 0) & 0xff) + ((colour3 >> 0) & 0xff) + ((colour4 >> 0) & 0xff) + 1) >> 2) & 0xff; - dst8[j >> 2] = texFindClosestColourIndexIA(palette, numcolours, c, a) << 4; + dst8[j >> 2] = tex_find_closest_colour_index_i_a(palette, numcolours, c, a) << 4; colour1 = palette[(src8[(j + 2) >> 1] >> 4) & 0xf]; colour2 = palette[(src8[(j + 2) >> 1] >> (j + 3 < srcwidth) ? 0 : 4) & 0xf]; @@ -603,7 +603,7 @@ s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, c = ((((colour1 >> 8) & 0xff) + ((colour2 >> 8) & 0xff) + ((colour3 >> 8) & 0xff) + ((colour4 >> 8) & 0xff)) >> 2) & 0xff; a = ((((colour1 >> 0) & 0xff) + ((colour2 >> 0) & 0xff) + ((colour3 >> 0) & 0xff) + ((colour4 >> 0) & 0xff) + 1) >> 2) & 0xff; - dst8[j >> 2] |= texFindClosestColourIndexIA(palette, numcolours, c, a) & 0xff; + dst8[j >> 2] |= tex_find_closest_colour_index_i_a(palette, numcolours, c, a) & 0xff; } dst8 += aligneddstwidth >> 1; @@ -616,7 +616,7 @@ s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, return 0; } -s32 texFindClosestColourIndexRGBA(u8 *palette, s32 numcolours, s32 r, s32 g, s32 b, s32 a) +s32 tex_find_closest_colour_index_r_g_b_a(u8 *palette, s32 numcolours, s32 r, s32 g, s32 b, s32 a) { s32 minindex = 0; s32 minvalue = 99999999; @@ -646,7 +646,7 @@ s32 texFindClosestColourIndexRGBA(u8 *palette, s32 numcolours, s32 r, s32 g, s32 return minindex; } -s32 texFindClosestColourIndexIA(u16 *palette, s32 numcolours, s32 intensity, s32 alpha) +s32 tex_find_closest_colour_index_i_a(u16 *palette, s32 numcolours, s32 intensity, s32 alpha) { s32 bestindex = 0; s32 bestvalue = 99999999; @@ -680,7 +680,7 @@ s32 texFindClosestColourIndexIA(u16 *palette, s32 numcolours, s32 intensity, s32 * h = height in pixels * c = compression method (see TEXCOMPMETHOD constants) */ -s32 texInflateNonZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpool *pool, bool unusedarg) +s32 tex_inflate_non_zlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct texpool *pool, bool unusedarg) { u8 scratch[0x2000]; u8 lookup[0x1000]; @@ -699,7 +699,7 @@ s32 texInflateNonZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct tex u8 *loddst; bool writetocache = false; - texSetBitstring(src); + tex_set_bitstring(src); numimages = hasloddata && numlods ? numlods : 1; @@ -717,10 +717,10 @@ s32 texInflateNonZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct tex } for (i = 0; i < numimages; i++) { - format = texReadBits(4); - width = texReadBits(8); - height = texReadBits(8); - compmethod = texReadBits(4); + format = tex_read_bits(4); + width = tex_read_bits(8); + height = tex_read_bits(8); + compmethod = tex_read_bits(4); if (i == 0) { pool->rightpos->width = width; @@ -740,77 +740,77 @@ s32 texInflateNonZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct tex switch (compmethod) { case TEXCOMPMETHOD_UNCOMPRESSED0: case TEXCOMPMETHOD_UNCOMPRESSED1: - imagebytesout = texReadUncompressed(&dst[totalbytesout], width, height, format); + imagebytesout = tex_read_uncompressed(&dst[totalbytesout], width, height, format); break; case TEXCOMPMETHOD_HUFFMAN: - texInflateHuffman(scratch, g_TexFormatNumChannels[format] * width * height, g_TexFormatChannelSizes[format]); + tex_inflate_huffman(scratch, g_TexFormatNumChannels[format] * width * height, g_TexFormatChannelSizes[format]); if (g_TexFormatHas1BitAlpha[format]) { - texReadAlphaBits(&scratch[width * height * 3], width * height); + tex_read_alpha_bits(&scratch[width * height * 3], width * height); } - imagebytesout = texChannelsToPixels(scratch, width, height, &dst[totalbytesout], format); + imagebytesout = tex_channels_to_pixels(scratch, width, height, &dst[totalbytesout], format); break; case TEXCOMPMETHOD_HUFFMANPERHCHANNEL: for (j = 0; j < g_TexFormatNumChannels[format]; j++) { - texInflateHuffman(&scratch[width * height * j], width * height, g_TexFormatChannelSizes[format]); + tex_inflate_huffman(&scratch[width * height * j], width * height, g_TexFormatChannelSizes[format]); } if (g_TexFormatHas1BitAlpha[format]) { - texReadAlphaBits(&scratch[width * height * 3], width * height); + tex_read_alpha_bits(&scratch[width * height * 3], width * height); } - imagebytesout = texChannelsToPixels(scratch, width, height, &dst[totalbytesout], format); + imagebytesout = tex_channels_to_pixels(scratch, width, height, &dst[totalbytesout], format); break; case TEXCOMPMETHOD_RLE: - texInflateRle(scratch, g_TexFormatNumChannels[format] * width * height); + tex_inflate_rle(scratch, g_TexFormatNumChannels[format] * width * height); if (g_TexFormatHas1BitAlpha[format]) { - texReadAlphaBits(&scratch[width * height * 3], width * height); + tex_read_alpha_bits(&scratch[width * height * 3], width * height); } - imagebytesout = texChannelsToPixels(scratch, width, height, &dst[totalbytesout], format); + imagebytesout = tex_channels_to_pixels(scratch, width, height, &dst[totalbytesout], format); break; case TEXCOMPMETHOD_LOOKUP: - value = texBuildLookup(lookup, g_TexFormatBitsPerPixel[format]); - imagebytesout = texInflateLookup(width, height, &dst[totalbytesout], lookup, value, format); + value = tex_build_lookup(lookup, g_TexFormatBitsPerPixel[format]); + imagebytesout = tex_inflate_lookup(width, height, &dst[totalbytesout], lookup, value, format); break; case TEXCOMPMETHOD_HUFFMANLOOKUP: - value = texBuildLookup(lookup, g_TexFormatBitsPerPixel[format]); - texInflateHuffman(scratch, width * height, value); - imagebytesout = texInflateLookupFromBuffer(scratch, width, height, &dst[totalbytesout], lookup, value, format); + value = tex_build_lookup(lookup, g_TexFormatBitsPerPixel[format]); + tex_inflate_huffman(scratch, width * height, value); + imagebytesout = tex_inflate_lookup_from_buffer(scratch, width, height, &dst[totalbytesout], lookup, value, format); break; case TEXCOMPMETHOD_RLELOOKUP: - value = texBuildLookup(lookup, g_TexFormatBitsPerPixel[format]); - texInflateRle(scratch, width * height); - imagebytesout = texInflateLookupFromBuffer(scratch, width, height, &dst[totalbytesout], lookup, value, format); + value = tex_build_lookup(lookup, g_TexFormatBitsPerPixel[format]); + tex_inflate_rle(scratch, width * height); + imagebytesout = tex_inflate_lookup_from_buffer(scratch, width, height, &dst[totalbytesout], lookup, value, format); break; case TEXCOMPMETHOD_HUFFMANBLUR: - value = texReadBits(3); - texInflateHuffman(scratch, g_TexFormatNumChannels[format] * width * height, g_TexFormatChannelSizes[format]); - texBlur(scratch, width, g_TexFormatNumChannels[format] * height, value, g_TexFormatChannelSizes[format]); + value = tex_read_bits(3); + tex_inflate_huffman(scratch, g_TexFormatNumChannels[format] * width * height, g_TexFormatChannelSizes[format]); + tex_blur(scratch, width, g_TexFormatNumChannels[format] * height, value, g_TexFormatChannelSizes[format]); if (g_TexFormatHas1BitAlpha[format]) { - texReadAlphaBits(&scratch[width * height * 3], width * height); + tex_read_alpha_bits(&scratch[width * height * 3], width * height); } - imagebytesout = texChannelsToPixels(scratch, width, height, &dst[totalbytesout], format); + imagebytesout = tex_channels_to_pixels(scratch, width, height, &dst[totalbytesout], format); break; case TEXCOMPMETHOD_RLEBLUR: - value = texReadBits(3); - texInflateRle(scratch, g_TexFormatNumChannels[format] * width * height); - texBlur(scratch, width, g_TexFormatNumChannels[format] * height, value, g_TexFormatChannelSizes[format]); + value = tex_read_bits(3); + tex_inflate_rle(scratch, g_TexFormatNumChannels[format] * width * height); + tex_blur(scratch, width, g_TexFormatNumChannels[format] * height, value, g_TexFormatChannelSizes[format]); if (g_TexFormatHas1BitAlpha[format]) { - texReadAlphaBits(&scratch[width * height * 3], width * height); + tex_read_alpha_bits(&scratch[width * height * 3], width * height); } - imagebytesout = texChannelsToPixels(scratch, width, height, &dst[totalbytesout], format); + imagebytesout = tex_channels_to_pixels(scratch, width, height, &dst[totalbytesout], format); break; } if (hasloddata == true) { - texSwizzle(&dst[totalbytesout], width, height, format); + tex_swizzle(&dst[totalbytesout], width, height, format); } imagebytesout = (imagebytesout + 7) & ~7; @@ -852,9 +852,9 @@ s32 texInflateNonZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct tex loddst = &dst[totalbytesout]; for (i = 1; i < numlods; i++) { - imagebytesout = texShrinkNonPaletted(lodsrc, loddst, tmpwidth, tmpheight, format); + imagebytesout = tex_shrink_non_paletted(lodsrc, loddst, tmpwidth, tmpheight, format); - texSwizzle(lodsrc, tmpwidth, tmpheight, format); + tex_swizzle(lodsrc, tmpwidth, tmpheight, format); totalbytesout += imagebytesout; @@ -865,9 +865,9 @@ s32 texInflateNonZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct tex loddst += imagebytesout; } - texSwizzle(lodsrc, tmpwidth, tmpheight, format); + tex_swizzle(lodsrc, tmpwidth, tmpheight, format); } else { - texSwizzle(dst, width, height, format); + tex_swizzle(dst, width, height, format); } } @@ -883,7 +883,7 @@ s32 texInflateNonZlib(u8 *src, u8 *dst, bool hasloddata, s32 numlods, struct tex * If the source width is an odd number, the destination's final column is * calculated by sampling the final source column twice. Likewise for the height. */ -s32 texShrinkNonPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format) +s32 tex_shrink_non_paletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format) { s32 i; s32 j; @@ -1173,7 +1173,7 @@ s32 texShrinkNonPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 form * implementation only stores a list of frequencies. It uses the chansize * to know how many values there are. */ -void texInflateHuffman(u8 *dst, s32 numiterations, s32 chansize) +void tex_inflate_huffman(u8 *dst, s32 numiterations, s32 chansize) { u16 frequencies[2048]; s16 nodes[2048][2]; @@ -1188,7 +1188,7 @@ void texInflateHuffman(u8 *dst, s32 numiterations, s32 chansize) // Read the frequencies list for (i = 0; i < chansize; i++) { - frequencies[i] = texReadBits(8); + frequencies[i] = tex_read_bits(8); } // Initialise the tree @@ -1289,7 +1289,7 @@ void texInflateHuffman(u8 *dst, s32 numiterations, s32 chansize) s32 indexorvalue = rootindex; while (indexorvalue < 10000) { - indexorvalue = nodes[indexorvalue][texReadBits(1)]; + indexorvalue = nodes[indexorvalue][tex_read_bits(1)]; } if (chansize <= 256) { @@ -1331,11 +1331,11 @@ void texInflateHuffman(u8 *dst, s32 numiterations, s32 chansize) * Every run must be followed by a literal block without the 1-bit marker. * The algorithm does not support back to back runs. */ -void texInflateRle(u8 *dst, s32 blockstotal) +void tex_inflate_rle(u8 *dst, s32 blockstotal) { - s32 btfieldsize = texReadBits(3); - s32 rlfieldsize = texReadBits(3); - s32 blocksize = texReadBits(4); + s32 btfieldsize = tex_read_bits(3); + s32 rlfieldsize = tex_read_bits(3); + s32 blocksize = tex_read_bits(4); s32 cost; s32 fudge; s32 blocksdone; @@ -1353,20 +1353,20 @@ void texInflateRle(u8 *dst, s32 blockstotal) blocksdone = 0; while (blocksdone < blockstotal) { - if (texReadBits(1) == 0) { + if (tex_read_bits(1) == 0) { // Found a literal directive if (blocksize <= 8) { - dst[blocksdone] = texReadBits(blocksize); + dst[blocksdone] = tex_read_bits(blocksize); blocksdone++; } else { u16 *tmp = (u16 *)dst; - tmp[blocksdone] = texReadBits(blocksize); + tmp[blocksdone] = tex_read_bits(blocksize); blocksdone++; } } else { // Found a run directive - s32 startblockindex = blocksdone - texReadBits(btfieldsize) - 1; - s32 runnumblocks = texReadBits(rlfieldsize) + fudge; + s32 startblockindex = blocksdone - tex_read_bits(btfieldsize) - 1; + s32 runnumblocks = tex_read_bits(rlfieldsize) + fudge; if (blocksize <= 8) { for (i = startblockindex; i < startblockindex + runnumblocks; i++) { @@ -1375,7 +1375,7 @@ void texInflateRle(u8 *dst, s32 blockstotal) } // The next instruction must be a literal - dst[blocksdone] = texReadBits(blocksize); + dst[blocksdone] = tex_read_bits(blocksize); blocksdone++; } else { u16 *tmp = (u16 *)dst; @@ -1386,7 +1386,7 @@ void texInflateRle(u8 *dst, s32 blockstotal) } // The next instruction must be a literal - tmp[blocksdone] = texReadBits(blocksize); + tmp[blocksdone] = tex_read_bits(blocksize); blocksdone++; } } @@ -1402,35 +1402,35 @@ void texInflateRle(u8 *dst, s32 blockstotal) * * This function does NOT work with pixel formats of 8 bits or less. */ -s32 texBuildLookup(u8 *lookup, s32 bitsperpixel) +s32 tex_build_lookup(u8 *lookup, s32 bitsperpixel) { - s32 numcolours = texReadBits(11); + s32 numcolours = tex_read_bits(11); s32 i; if (bitsperpixel <= 16) { u16 *dst = (u16 *)lookup; for (i = 0; i < numcolours; i++) { - dst[i] = texReadBits(bitsperpixel); + dst[i] = tex_read_bits(bitsperpixel); } } else if (bitsperpixel <= 24) { u32 *dst = (u32 *)lookup; for (i = 0; i < numcolours; i++) { - dst[i] = texReadBits(bitsperpixel); + dst[i] = tex_read_bits(bitsperpixel); } } else { u32 *dst = (u32 *)lookup; for (i = 0; i < numcolours; i++) { - dst[i] = texReadBits(24) << 8 | texReadBits(bitsperpixel - 24); + dst[i] = tex_read_bits(24) << 8 | tex_read_bits(bitsperpixel - 24); } } return numcolours; } -s32 texGetBitSize(s32 decimal) +s32 tex_get_bit_size(s32 decimal) { s32 count = 0; @@ -1444,12 +1444,12 @@ s32 texGetBitSize(s32 decimal) return count; } -void texReadAlphaBits(u8 *dst, s32 count) +void tex_read_alpha_bits(u8 *dst, s32 count) { s32 i; for (i = 0; i < count; i++) { - dst[i] = texReadBits(1); + dst[i] = tex_read_bits(1); } } @@ -1459,7 +1459,7 @@ void texReadAlphaBits(u8 *dst, s32 count) * * Return the number of output bytes. */ -s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) +s32 tex_read_uncompressed(u8 *dst, s32 width, s32 height, s32 format) { u32 *dst32 = (u32 *)(((uintptr_t)dst + 0xf) & ~0xf); u16 *dst16 = (u16 *)(((uintptr_t)dst + 7) & ~7); @@ -1471,8 +1471,8 @@ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) case TEXFORMAT_RGBA32: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst32[x] = texReadBits(16) << 16; - dst32[x] |= texReadBits(16); + dst32[x] = tex_read_bits(16) << 16; + dst32[x] |= tex_read_bits(16); } dst32 += (width + 3) & 0xffc; @@ -1482,7 +1482,7 @@ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) case TEXFORMAT_RGB24: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst32[x] = texReadBits(24) << 8 | 0xff; + dst32[x] = tex_read_bits(24) << 8 | 0xff; } dst32 += (width + 3) & 0xffc; @@ -1493,7 +1493,7 @@ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) case TEXFORMAT_IA16: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst16[x] = texReadBits(16); + dst16[x] = tex_read_bits(16); } dst16 += (width + 3) & 0xffc; @@ -1503,7 +1503,7 @@ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) case TEXFORMAT_RGB15: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst16[x] = texReadBits(15) << 1 | 1; + dst16[x] = tex_read_bits(15) << 1 | 1; } dst16 += (width + 3) & 0xffc; @@ -1514,7 +1514,7 @@ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) case TEXFORMAT_I8: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst8[x] = texReadBits(8); + dst8[x] = tex_read_bits(8); } dst8 += (width + 7) & 0xff8; @@ -1525,7 +1525,7 @@ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) case TEXFORMAT_I4: for (y = 0; y < height; y++) { for (x = 0; x < width; x += 2) { - dst8[x >> 1] = texReadBits(8); + dst8[x >> 1] = tex_read_bits(8); } dst8 += ((width + 15) & 0xff0) >> 1; @@ -1545,7 +1545,7 @@ s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format) * * The existence and size of the channels depends on the pixel format. */ -s32 texChannelsToPixels(u8 *src, s32 width, s32 height, u8 *dst, s32 format) +s32 tex_channels_to_pixels(u8 *src, s32 width, s32 height, u8 *dst, s32 format) { u32 *dst32 = (u32 *)dst; u16 *dst16 = (u16 *)dst; @@ -1687,7 +1687,7 @@ s32 texChannelsToPixels(u8 *src, s32 width, s32 height, u8 *dst, s32 format) * * Return the number of bytes written to dst. */ -s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, s32 format) +s32 tex_inflate_lookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, s32 format) { u32 *lookup32 = (u32 *)lookup; u16 *lookup16 = (u16 *)lookup; @@ -1696,13 +1696,13 @@ s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, u8 *dst8 = (u8 *)dst; s32 x; s32 y; - s32 bitspercolour = texGetBitSize(numcolours); + s32 bitspercolour = tex_get_bit_size(numcolours); switch (format) { case TEXFORMAT_RGBA32: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst32[x] = lookup32[texReadBits(bitspercolour)]; + dst32[x] = lookup32[tex_read_bits(bitspercolour)]; } dst32 += (width + 3) & 0xffc; @@ -1712,7 +1712,7 @@ s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, case TEXFORMAT_RGB24: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst32[x] = lookup32[texReadBits(bitspercolour)] << 8; + dst32[x] = lookup32[tex_read_bits(bitspercolour)] << 8; } dst32 += (width + 3) & 0xffc; @@ -1723,7 +1723,7 @@ s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, case TEXFORMAT_IA16: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst16[x] = lookup16[texReadBits(bitspercolour)]; + dst16[x] = lookup16[tex_read_bits(bitspercolour)]; } dst16 += (width + 3) & 0xffc; @@ -1733,7 +1733,7 @@ s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, case TEXFORMAT_RGB15: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst16[x] = lookup16[texReadBits(bitspercolour)] << 1 | 1; + dst16[x] = lookup16[tex_read_bits(bitspercolour)] << 1 | 1; } dst16 += (width + 3) & 0xffc; @@ -1744,7 +1744,7 @@ s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, case TEXFORMAT_I8: for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { - dst8[x] = lookup16[texReadBits(bitspercolour)]; + dst8[x] = lookup16[tex_read_bits(bitspercolour)]; } dst8 += (width + 7) & 0xff8; @@ -1755,10 +1755,10 @@ s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, case TEXFORMAT_I4: for (y = 0; y < height; y++) { for (x = 0; x < width; x += 2) { - dst8[x >> 1] = lookup16[texReadBits(bitspercolour)] << 4; + dst8[x >> 1] = lookup16[tex_read_bits(bitspercolour)] << 4; if (x + 1 < width) { - dst8[x >> 1] |= lookup[(texReadBits(bitspercolour) * 2) + 1]; + dst8[x >> 1] |= lookup[(tex_read_bits(bitspercolour) * 2) + 1]; } } @@ -1772,7 +1772,7 @@ s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, } /** - * Like texInflateLookup, but the indices are provided in the src argument + * Like tex_inflate_lookup, but the indices are provided in the src argument * as u8s or u16s rather than read from the global bitstring as tightly packed * bits. * @@ -1780,7 +1780,7 @@ s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, * in the lookup table. If there are more than 256 colours then it must use * u16s, otherwise it expects u8s. */ -s32 texInflateLookupFromBuffer(u8 *src, 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) { s32 x; s32 y; @@ -1908,7 +1908,7 @@ s32 texInflateLookupFromBuffer(u8 *src, s32 width, s32 height, u8 *dst, u8 *look /** * For every second row, swap every pair of words within that row. */ -void texSwizzle(u8 *dst, s32 width, s32 height, s32 format) +void tex_swizzle(u8 *dst, s32 width, s32 height, s32 format) { s32 x; s32 y; @@ -1972,7 +1972,7 @@ void texSwizzle(u8 *dst, s32 width, s32 height, s32 format) /** * Blur the pixels in the image with the surrounding pixels. */ -void texBlur(u8 *pixels, s32 width, s32 height, s32 method, s32 chansize) +void tex_blur(u8 *pixels, s32 width, s32 height, s32 method, s32 chansize) { s32 x; s32 y; @@ -2011,7 +2011,7 @@ void texBlur(u8 *pixels, s32 width, s32 height, s32 method, s32 chansize) } } -void texInitPool(struct texpool *pool, u8 *start, s32 len) +void tex_init_pool(struct texpool *pool, u8 *start, s32 len) { pool->start = start; pool->end = (struct tex *)(start + len); @@ -2019,7 +2019,7 @@ void texInitPool(struct texpool *pool, u8 *start, s32 len) pool->rightpos = (struct tex *)((s32)start + len); } -struct tex *texFindInPool(s32 texturenum, struct texpool *pool) +struct tex *tex_find_in_pool(s32 texturenum, struct texpool *pool) { struct tex *end; struct tex *cur; @@ -2061,24 +2061,24 @@ struct tex *texFindInPool(s32 texturenum, struct texpool *pool) return NULL; } -s32 texGetPoolFreeBytes(struct texpool *pool) +s32 tex_get_pool_free_bytes(struct texpool *pool) { return (s32) pool->rightpos - (s32) pool->leftpos; } -u8 *texGetPoolLeftPos(struct texpool *pool) +u8 *tex_get_pool_left_pos(struct texpool *pool) { return pool->leftpos; } -void texLoadFromDisplayList(Gfx *gdl, struct texpool *pool, s32 arg2) +void tex_load_from_display_list(Gfx *gdl, struct texpool *pool, s32 arg2) { u8 *bytes = (u8 *)gdl; while (bytes[0] != (u8)G_ENDDL) { // Look for GBI sequence: fd...... abcd.... if (bytes[0] == G_SETTIMG && bytes[4] == 0xab && bytes[5] == 0xcd) { - texLoad((s32 *)((s32)bytes + 4), pool, arg2); + tex_load((s32 *)((s32)bytes + 4), pool, arg2); } bytes += sizeof(Gfx); @@ -2113,7 +2113,7 @@ extern u8 _texturesdataSegmentRomStart; * that the additional levels of detail are not even read. * * This function reads the above information from the first byte of texture data, - * then calls the texInflateZlib or texInflateNonZlib to inflate the images. + * then calls the tex_inflate_zlib or tex_inflate_non_zlib to inflate the images. * * The format of the first byte is: * uzllllll @@ -2122,7 +2122,7 @@ extern u8 _texturesdataSegmentRomStart; * z = texture is compressed with zlib * l = number of levels of detail within the texture */ -void texLoad(s32 *updateword, struct texpool *pool, bool unusedarg) +void tex_load(s32 *updateword, struct texpool *pool, bool unusedarg) { u8 compbuffer[4 * 1024 + 0x40]; u8 *compptr; @@ -2155,7 +2155,7 @@ void texLoad(s32 *updateword, struct texpool *pool, bool unusedarg) if ((*updateword & 0xffff0000) == 0 || (*updateword & 0xffff0000) == 0xabcd0000) { g_TexNumToLoad = *updateword & 0xffff; - tex = texFindInPool(g_TexNumToLoad, pool); + tex = tex_find_in_pool(g_TexNumToLoad, pool); if (tex == NULL) { if (g_TexNumToLoad >= NUM_TEXTURES) { @@ -2179,7 +2179,7 @@ void texLoad(s32 *updateword, struct texpool *pool, bool unusedarg) } // Copy the compressed texture to RAM - dmaExec(alignedcompbuffer, + dma_exec(alignedcompbuffer, (romptr_t) &_texturesdataSegmentRomStart + (thisoffset & 0xfffffff8), ((u32) (nextoffset - thisoffset) + 0x1f) >> 4 << 4); @@ -2200,9 +2200,9 @@ void texLoad(s32 *updateword, struct texpool *pool, bool unusedarg) // only other option is a crash. GBI commands contain texture IDs // instead of pointers, and they must be replaced with pointers. if (usingsharedpool) { - freebytes = mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_ONBOARD) + mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_EXPANSION); + freebytes = memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_ONBOARD) + memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_EXPANSION); } else { - freebytes = texGetPoolFreeBytes(pool); + freebytes = tex_get_pool_free_bytes(pool); } if ((!iszlib && freebytes < 4300) || (iszlib && freebytes < 2600)) { @@ -2242,15 +2242,15 @@ void texLoad(s32 *updateword, struct texpool *pool, bool unusedarg) // Extract the texture data to the allocation (pool->leftpos) if (iszlib) { - bytesout = texInflateZlib(compptr, pool->leftpos, hasloddata, numlods, pool, unusedarg); + bytesout = tex_inflate_zlib(compptr, pool->leftpos, hasloddata, numlods, pool, unusedarg); } else { - bytesout = texInflateNonZlib(compptr, pool->leftpos, hasloddata, numlods, pool, unusedarg); + bytesout = tex_inflate_non_zlib(compptr, pool->leftpos, hasloddata, numlods, pool, unusedarg); } // If we're using the shared pool, the data must be copied out of // the stack and into the heap. if (usingsharedpool) { - u8 *ptr = mempAllocFromRight(ALIGN16(bytesout + 2 * sizeof(struct tex)), MEMPOOL_STAGE); + u8 *ptr = memp_alloc_from_right(ALIGN16(bytesout + 2 * sizeof(struct tex)), MEMPOOL_STAGE); pool->rightpos = (struct tex *) ptr; bcopy(tex, ptr, sizeof(struct tex)); @@ -2275,7 +2275,7 @@ void texLoad(s32 *updateword, struct texpool *pool, bool unusedarg) pool->leftpos += bytesout; if (!usingsharedpool) { - texGetPoolFreeBytes(pool); + tex_get_pool_free_bytes(pool); } } @@ -2283,13 +2283,13 @@ void texLoad(s32 *updateword, struct texpool *pool, bool unusedarg) } } -void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct texpool *pool, s32 arg3) +void tex_load_from_configs(struct textureconfig *configs, s32 numconfigs, struct texpool *pool, s32 arg3) { s32 i; for (i = 0; i < numconfigs; i++) { if ((s32)configs[i].texturenum < NUM_TEXTURES) { - texLoad(&configs[i].texturenum, pool, true); + tex_load(&configs[i].texturenum, pool, true); configs[i].unk0b = 1; } else { configs[i].texturenum += arg3; @@ -2297,11 +2297,11 @@ void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct te } } -void texLoadFromTextureNum(u32 texturenum, struct texpool *pool) +void tex_load_from_texture_num(u32 texturenum, struct texpool *pool) { s32 texturenumcopy = texturenum; - texLoad(&texturenumcopy, pool, true); + tex_load(&texturenumcopy, pool, true); } s32 func0f173510(s32 arg0, s32 arg1, s32 arg3) diff --git a/src/game/texinit.c b/src/game/texinit.c index 4c0a11314..1d2554ae9 100644 --- a/src/game/texinit.c +++ b/src/game/texinit.c @@ -6,14 +6,14 @@ #include "data.h" #include "types.h" -void texInit(void) +void tex_init(void) { extern u8 _textureslistSegmentRomStart; extern u8 _textureslistSegmentRomEnd; u32 len = ((&_textureslistSegmentRomEnd - &_textureslistSegmentRomStart) + 15) & -16; - g_Textures = mempAlloc(len, MEMPOOL_PERMANENT); + g_Textures = memp_alloc(len, MEMPOOL_PERMANENT); - dmaExec(g_Textures, (romptr_t) &_textureslistSegmentRomStart, len); + dma_exec(g_Textures, (romptr_t) &_textureslistSegmentRomStart, len); } diff --git a/src/game/texreset.c b/src/game/texreset.c index 635075698..e47fc2cc3 100644 --- a/src/game/texreset.c +++ b/src/game/texreset.c @@ -11,14 +11,14 @@ #include "textureconfig.h" #include "types.h" -void texSetBitstring(u8 *bitstring) +void tex_set_bitstring(u8 *bitstring) { g_TexBitstring = bitstring; g_TexAccumValue = 0; g_TexAccumNumBits = 0; } -s32 texReadBits(s32 wantnumbits) +s32 tex_read_bits(s32 wantnumbits) { while (g_TexAccumNumBits < wantnumbits) { g_TexAccumValue = g_TexAccumValue << 8 | *g_TexBitstring; @@ -41,14 +41,14 @@ extern u8 _textureconfigSegmentRomStart; extern u8 _textureconfigSegmentStart; extern u8 _textureconfigSegmentEnd; -void texReset(void) +void tex_reset(void) { s32 stage; u32 len = &_textureconfigSegmentEnd - &_textureconfigSegmentStart; s32 i; - g_TextureConfigSegment = mempAlloc(len, MEMPOOL_STAGE); - dmaExec(g_TextureConfigSegment, (romptr_t)&_textureconfigSegmentRomStart, len); + g_TextureConfigSegment = memp_alloc(len, MEMPOOL_STAGE); + dma_exec(g_TextureConfigSegment, (romptr_t)&_textureconfigSegmentRomStart, len); g_TexBase = (uintptr_t)g_TextureConfigSegment - ROM_SIZE * 1024 * 1024; g_TexGdl1 = (Gfx *)(g_TexBase + (uintptr_t)g_TcGdl1); @@ -73,49 +73,49 @@ void texReset(void) g_TexRadarConfigs = (struct textureconfig *)(g_TexBase + (uintptr_t)g_TcRadarConfigs); g_TexNumConfigs = (len - (uintptr_t)&g_TcWallhitConfigs + ROM_SIZE * 1024 * 1024) / sizeof(struct textureconfig); - g_TexWords = mempAlloc(ALIGN16(g_TexNumConfigs * 4), MEMPOOL_STAGE); + g_TexWords = memp_alloc(ALIGN16(g_TexNumConfigs * 4), MEMPOOL_STAGE); for (i = 0; i < g_TexNumConfigs; i++) { g_TexWords[i] = NULL; } for (i = 0; i < ARRAYCOUNT(g_TcExplosionTexturePairs); i++) { - texLoad(&g_ExplosionTexturePairs[i].texturenum1, NULL, false); - texLoad(&g_ExplosionTexturePairs[i].texturenum2, NULL, false); + tex_load(&g_ExplosionTexturePairs[i].texturenum1, NULL, false); + tex_load(&g_ExplosionTexturePairs[i].texturenum2, NULL, false); } - texLoadFromDisplayList(g_TexGdl1, 0, 0); - texLoadFromDisplayList(g_TexGdl3, 0, 0); + tex_load_from_display_list(g_TexGdl1, 0, 0); + tex_load_from_display_list(g_TexGdl3, 0, 0); - stage = mainGetStageNum(); + stage = main_get_stage_num(); if (IS4MB() && stage != STAGE_TITLE && stage != STAGE_CITRAINING && stage != STAGE_4MBMENU) { for (i = 0; i < ARRAYCOUNT(g_TcWallhitConfigs); i++) { - texLoadFromConfig(&g_TexWallhitConfigs[i]); + tex_load_from_config(&g_TexWallhitConfigs[i]); } for (i = 0; i < ARRAYCOUNT(g_TcBeamConfigs); i++) { - texLoadFromConfig(&g_TexBeamConfigs[i]); + tex_load_from_config(&g_TexBeamConfigs[i]); } for (i = 0; i < ARRAYCOUNT(g_TcSkyWaterConfigs); i++) { - texLoadFromConfig(&g_TexSkyWaterConfigs[i]); + tex_load_from_config(&g_TexSkyWaterConfigs[i]); } for (i = 0; i < ARRAYCOUNT(g_TcShadowConfigs); i++) { - texLoadFromConfig(&g_TexShadowConfigs[i]); + tex_load_from_config(&g_TexShadowConfigs[i]); } for (i = 0; i < ARRAYCOUNT(g_TcShieldConfigs); i++) { - texLoadFromConfig(&g_TexShieldConfigs[i]); + tex_load_from_config(&g_TexShieldConfigs[i]); } for (i = 0; i < ARRAYCOUNT(g_TcRadarConfigs); i++) { - texLoadFromConfig(&g_TexRadarConfigs[i]); + tex_load_from_config(&g_TexRadarConfigs[i]); } for (i = 0; i < ARRAYCOUNT(g_TcSparkConfigs); i++) { - texLoadFromConfig(&g_TexSparkConfigs[i]); + tex_load_from_config(&g_TexSparkConfigs[i]); } } } diff --git a/src/game/texselect.c b/src/game/texselect.c index ee0ad8acd..6ddaca527 100644 --- a/src/game/texselect.c +++ b/src/game/texselect.c @@ -10,7 +10,7 @@ #include "data.h" #include "types.h" -s32 texGetMask(s32 value) +s32 tex_get_mask(s32 value) { if (value < 2) { return 0; @@ -147,7 +147,7 @@ s32 tex0f0b3548(s32 width, s32 height, s32 lod) return sum; } -void texSetRenderMode(Gfx **gdlptr, s32 arg1, s32 numcycles, s32 arg3) +void tex_set_render_mode(Gfx **gdlptr, s32 arg1, s32 numcycles, s32 arg3) { Gfx *gdl = *gdlptr; @@ -242,14 +242,14 @@ void texSetRenderMode(Gfx **gdlptr, s32 arg1, s32 numcycles, s32 arg3) *gdlptr = gdl; } -void texLoadFromConfig(struct textureconfig *config) +void tex_load_from_config(struct textureconfig *config) { if ((u32)config->texturenum < NUM_TEXTURES) { - texLoadFromConfigs(config, 1, NULL, 0); + tex_load_from_configs(config, 1, NULL, 0); } } -void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, u32 ulst, bool arg5, struct texpool *pool) +void tex_select(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, u32 ulst, bool arg5, struct texpool *pool) { struct tex *tex; Gfx *gdl; @@ -258,7 +258,7 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, gdl = *gdlptr; if (tconfig == NULL) { - texSetRenderMode(&gdl, arg2, 1, arg3); + tex_set_render_mode(&gdl, arg2, 1, arg3); if (arg3 >= 2) { gSPTextureL(gdl++, 0xffff, 0xffff, 0, arg3, G_TX_RENDERTILE, G_ON); @@ -283,7 +283,7 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, tex = NULL; if ((u32)tconfig->texturenum < NUM_TEXTURES) { - texLoadFromConfigs(tconfig, 1, pool, 0); + tex_load_from_configs(tconfig, 1, pool, 0); } if (tconfig->unk0b == 1) { @@ -310,7 +310,7 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, } if (tex == NULL) { - tex = texFindInPool(texturenum, pool); + tex = tex_find_in_pool(texturenum, pool); if (index >= 0 && index < g_TexNumConfigs) { g_TexWords[index] = tex; @@ -354,7 +354,7 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, } if (arg5) { - texSetRenderMode(&gdl, arg2, 1, arg3); + tex_set_render_mode(&gdl, arg2, 1, arg3); if (arg3 >= 2) { gSPTextureL(gdl++, 0xffff, 0xffff, 0, arg3, G_TX_RENDERTILE, G_ON); @@ -421,8 +421,8 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, if (arg5) { gDPSetTile(gdl++, format, depth, line, 0x0000, G_TX_RENDERTILE, 0, - tconfig->t, texGetMask(height), G_TX_NOLOD, - tconfig->s, texGetMask(width), G_TX_NOLOD); + tconfig->t, tex_get_mask(height), G_TX_NOLOD, + tconfig->s, tex_get_mask(width), G_TX_NOLOD); gDPSetTileSize(gdl++, G_TX_RENDERTILE, ulst, ulst, ((width - 1) << 2) + ulst, ((height - 1) << 2) + ulst); } @@ -449,7 +449,7 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, } if (tex && tex->hasloddata) { - texGetDepthAndSize(tex, &depth2, &lrs); + tex_get_depth_and_size(tex, &depth2, &lrs); } else { switch (depth) { case G_IM_SIZ_32b: @@ -472,7 +472,7 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, } if (arg5) { - texSetRenderMode(&gdl, arg2, 2, arg3); + tex_set_render_mode(&gdl, arg2, 2, arg3); if (arg3 >= 2) { gSPTextureL(gdl++, 0xffff, 0xffff, lod - 1, arg3, G_TX_RENDERTILE, G_ON); @@ -542,8 +542,8 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, if (tile > 0) { if (tex && tex->hasloddata) { - width = texGetWidthAtLod(tex, tile); - height = texGetHeightAtLod(tex, tile); + width = tex_get_width_at_lod(tex, tile); + height = tex_get_height_at_lod(tex, tile); } else { if (width >= 2) { width >>= 1; @@ -574,8 +574,8 @@ void texSelect(Gfx **gdlptr, struct textureconfig *tconfig, u32 arg2, s32 arg3, if (arg5) { gDPSetTile(gdl++, format, depth, line, tmem, tile, 0, - tconfig->t, texGetMask(height), tile, - tconfig->s, texGetMask(width), tile); + tconfig->t, tex_get_mask(height), tile, + tconfig->s, tex_get_mask(width), tile); gDPSetTileSize(gdl++, tile, ulst, ulst, ((width - 1) << 2) + ulst, ((height - 1) << 2) + ulst); } diff --git a/src/game/tilesreset.c b/src/game/tilesreset.c index ed074c028..d43fbe18e 100644 --- a/src/game/tilesreset.c +++ b/src/game/tilesreset.c @@ -7,27 +7,27 @@ #include "data.h" #include "types.h" -void stageParseTiles(void); +void stage_parse_tiles(void); -void tilesReset(void) +void tiles_reset(void) { - s32 index = bgGetStageIndex(g_Vars.stagenum); + s32 index = bg_get_stage_index(g_Vars.stagenum); if (index < 0) { index = 0; } g_LoadType = LOADTYPE_TILES; - g_TileFileData.u8 = fileLoadToNew(g_Stages[index].tilefileid, FILELOADMETHOD_DEFAULT); + g_TileFileData.u8 = file_load_to_new(g_Stages[index].tilefileid, FILELOADMETHOD_DEFAULT); g_TileNumRooms = *g_TileFileData.u32; g_TileRooms = g_TileFileData.u32 + 1; - stageParseTiles(); + stage_parse_tiles(); } #define mult6(a) (((a) << 1) + ((a) << 2)) -void stageParseTiles(void) +void stage_parse_tiles(void) { struct geo *geo = (struct geo *)(g_TileFileData.u8 + g_TileRooms[0]); struct geo *end = (struct geo *)(g_TileFileData.u8 + g_TileRooms[g_TileNumRooms]); diff --git a/src/game/timing.c b/src/game/timing.c index 3739af362..b92c49b68 100644 --- a/src/game/timing.c +++ b/src/game/timing.c @@ -5,13 +5,13 @@ #include "data.h" #include "types.h" -void frametimeInit(void) +void frametime_init(void) { g_Vars.thisframestartt = osGetCount(); g_Vars.prevframestartt = g_Vars.thisframestartt; } -void frametimeApply(s32 diffframe60, s32 diffframe240, s32 frametime) +void frametime_apply(s32 diffframe60, s32 diffframe240, s32 frametime) { g_Vars.prevframestartt = g_Vars.thisframestartt; g_Vars.thisframestartt = frametime; @@ -27,7 +27,7 @@ void frametimeApply(s32 diffframe60, s32 diffframe240, s32 frametime) g_Vars.diffframe240freal = PALUPF(g_Vars.diffframe240f); } -void frametimeCalculate(void) +void frametime_calculate(void) { u32 count; u32 diffframet; @@ -48,7 +48,7 @@ void frametimeCalculate(void) g_Vars.mininc60 = 1; - frametimeApply(diffframe60, diffframe240, count); + frametime_apply(diffframe60, diffframe240, count); } void func0f16cf8c(s32 arg0) diff --git a/src/game/title.c b/src/game/title.c index 4d98556cf..6c1187b6b 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -103,7 +103,7 @@ Lights1 var800624f8jf = gdSPDefLights1(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, Lights1 var80062510jf = gdSPDefLights1(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f); #endif -char *mpPlayerGetWeaponOfChoiceName(u32 playernum, u32 slot) +char *mp_player_get_weapon_of_choice_name(u32 playernum, u32 slot) { char *name; s32 weapon1; @@ -111,19 +111,19 @@ char *mpPlayerGetWeaponOfChoiceName(u32 playernum, u32 slot) u32 prevplayernum = g_Vars.currentplayernum; s32 weapon; - setCurrentPlayerNum(playernum); + set_current_player_num(playernum); - invGetWeaponOfChoice(&weapon1, &weapon2); + inv_get_weapon_of_choice(&weapon1, &weapon2); weapon = slot == 1 ? weapon2 : weapon1; - name = bgunGetName(weapon); - setCurrentPlayerNum(prevplayernum); + name = bgun_get_name(weapon); + set_current_player_num(prevplayernum); return name; } -void titleSetLight(Lights1 *light, u8 r, u8 g, u8 b, f32 luminosity, struct coord *dir) +void title_set_light(Lights1 *light, u8 r, u8 g, u8 b, f32 luminosity, struct coord *dir) { light->a.l.col[0] = r * luminosity; light->a.l.col[1] = g * luminosity; @@ -146,9 +146,9 @@ void titleSetLight(Lights1 *light, u8 r, u8 g, u8 b, f32 luminosity, struct coor light->l[0].l.dir[2] = dir->z * 127.0f; } -void titleInitLegal(void) +void title_init_legal(void) { - musicQueueStopAllEvent(); + music_queue_stop_all_event(); var800624f4 = 1; g_TitleTimer = 0; g_TitleButtonPressed = false; @@ -156,65 +156,65 @@ void titleInitLegal(void) #if VERSION == VERSION_PAL_BETA // Play a sound if player has successfully enabled the crash screen. - // This is done in mainInit by holding all four C buttons. + // This is done in main_init by holding all four C buttons. if (g_CrashEnabled) { - sndStart(var80095200, SFX_8113, 0, -1, -1, -1.0f, -1, -1); + snd_start(var80095200, SFX_8113, 0, -1, -1, -1.0f, -1, -1); } #endif } -void titleExitLegal(void) +void title_exit_legal(void) { // empty } -void titleTickLegal(void) +void title_tick_legal(void) { - viSetFovY(60); - viSetAspect(1.33333333f); - viSetZRange(100, 10000); - viSetUseZBuf(false); + vi_set_fov_y(60); + vi_set_aspect(1.33333333f); + vi_set_z_range(100, 10000); + vi_set_use_z_buf(false); g_TitleTimer += g_Vars.lvupdate60; if (g_TitleTimer > TICKS(180)) { - titleSetNextMode(TITLEMODE_CHECKCONTROLLERS); + title_set_next_mode(TITLEMODE_CHECKCONTROLLERS); } } -void titleInitCheckControllers(void) +void title_init_check_controllers(void) { g_TitleTimer = 0; - viBlack(true); + vi_black(true); } -void titleExitCheckControllers(void) +void title_exit_check_controllers(void) { var800624e8 = 0; - viConfigureForLogos(); - viSetMode(VIMODE_HI); - viBlack(false); + vi_configure_for_logos(); + vi_set_mode(VIMODE_HI); + vi_black(false); } -void titleTickCheckControllers(void) +void title_tick_check_controllers(void) { g_TitleTimer++; - viSetZRange(100, 10000); - viSetUseZBuf(false); + vi_set_z_range(100, 10000); + vi_set_use_z_buf(false); if (g_TitleTimer > 6) { - if ((joyGetConnectedControllers() & 1) == 0) { - titleSetNextMode(TITLEMODE_NOCONTROLLER); + if ((joy_get_connected_controllers() & 1) == 0) { + title_set_next_mode(TITLEMODE_NOCONTROLLER); } else { - titleSetNextMode(TITLEMODE_RARELOGO); + title_set_next_mode(TITLEMODE_RARELOGO); } } } -Gfx *titleRenderCheckControllers(Gfx *gdl) +Gfx *title_render_check_controllers(Gfx *gdl) { if (g_TitleTimer > 2 && g_TitleTimer < 6) { - gdl = titleClear(gdl); + gdl = title_clear(gdl); } return gdl; @@ -230,12 +230,12 @@ Gfx *title0f0165f0(Gfx *gdl, s32 xcentre, s32 ycentre, s32 xscale, s32 yscale, c textwidth = 0; textheight = 0; - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = xcentre - xscale * textwidth / 2; y = ycentre - yscale * textheight / 2; - gdl = textRenderProjected(gdl, &x, &y, text, font1, font2, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, font1, font2, colour, vi_get_width(), vi_get_height(), 0, 0); return gdl; } @@ -313,7 +313,7 @@ struct legalelement g_LegalElements[] = { #endif }; -Gfx *titleRenderLegal(Gfx *gdl) +Gfx *title_render_legal(Gfx *gdl) { #if VERSION >= VERSION_PAL_BETA s32 prevx = 0; @@ -327,7 +327,7 @@ Gfx *titleRenderLegal(Gfx *gdl) struct font *font2; if (g_LegalEnabled) { - gdl = titleClear(gdl); + gdl = title_clear(gdl); #if VERSION == VERSION_JPN_FINAL gdl = func0f0d479c(gdl); #endif @@ -383,9 +383,9 @@ Gfx *titleRenderLegal(Gfx *gdl) if (elem->type == LEGALELEMENTTYPE_LINE) { gdl = text0f153780(gdl); #if VERSION == VERSION_JPN_FINAL - gdl = text0f153a34(gdl, elem->x, elem->y - 1, viGetWidth(), elem->y + 1, 0x7f7fff7f); + gdl = text0f153a34(gdl, elem->x, elem->y - 1, vi_get_width(), elem->y + 1, 0x7f7fff7f); #else - gdl = text0f153a34(gdl, elem->x, elem->y, viGetWidth(), elem->y + 2, 0x7f7fff7f); + gdl = text0f153a34(gdl, elem->x, elem->y, vi_get_width(), elem->y + 2, 0x7f7fff7f); #endif gdl = text0f153628(gdl); } else if (elem->type == LEGALELEMENTTYPE_DOLBYLOGO) { @@ -397,7 +397,7 @@ Gfx *titleRenderLegal(Gfx *gdl) gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, &g_TexGeneralConfigs[47], 1, 0, 2, 1, 0); + tex_select(&gdl, &g_TexGeneralConfigs[47], 1, 0, 2, 1, 0); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -420,7 +420,7 @@ Gfx *titleRenderLegal(Gfx *gdl) gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, &g_TexGeneralConfigs[49], 1, 0, 2, 1, 0); + tex_select(&gdl, &g_TexGeneralConfigs[49], 1, 0, 2, 1, 0); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -450,16 +450,16 @@ Gfx *titleRenderLegal(Gfx *gdl) x += 24; } - gdl = textRenderProjected(gdl, &x, &y, langGet(elem->textid), font1, font2, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(elem->textid), font1, font2, colour, vi_get_width(), vi_get_height(), 0, 0); var8007fad0 = 1; var80080108jf = 1; } else { - gdl = textRenderProjected(gdl, &x, &y, langGet(elem->textid), font1, font2, (colour & 0xffffff00) | ((colour & 0xff) * 2 / 3), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(elem->textid), font1, font2, (colour & 0xffffff00) | ((colour & 0xff) * 2 / 3), vi_get_width(), vi_get_height(), 0, 0); x = elem->x == -1 ? prevx : elem->x; y = elem->y; - gdl = textRenderProjected(gdl, &x, &y, langGet(elem->textid), font1, font2, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(elem->textid), font1, font2, colour, vi_get_width(), vi_get_height(), 0, 0); prevx = x; } @@ -468,23 +468,23 @@ Gfx *titleRenderLegal(Gfx *gdl) // Render a darker copy of the text one pixel above x = elem->x == -1 ? prevx : elem->x; y = elem->y - 1; - gdl = textRenderProjected(gdl, &x, &y, langGet(elem->textid), font1, font2, (colour & 0xffffff00) | ((colour & 0xff) * 2 / 3), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(elem->textid), font1, font2, (colour & 0xffffff00) | ((colour & 0xff) * 2 / 3), vi_get_width(), vi_get_height(), 0, 0); // Render the text properly x = elem->x == -1 ? prevx : elem->x; y = elem->y; - gdl = textRenderProjected(gdl, &x, &y, langGet(elem->textid), font1, font2, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(elem->textid), font1, font2, colour, vi_get_width(), vi_get_height(), 0, 0); prevx = x; #elif VERSION >= VERSION_PAL_BETA x = elem->x == -1 ? prevx : elem->x; y = elem->y; - gdl = textRenderProjected(gdl, &x, &y, langGet(elem->textid), font1, font2, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(elem->textid), font1, font2, colour, vi_get_width(), vi_get_height(), 0, 0); prevx = x; #else x = elem->x; y = elem->y; - gdl = textRenderProjected(gdl, &x, &y, langGet(elem->textid), font1, font2, colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, lang_get(elem->textid), font1, font2, colour, vi_get_width(), vi_get_height(), 0, 0); #endif } } @@ -499,7 +499,7 @@ bool g_LegalEnabled = true; bool g_PdLogoIsFirstTick = true; bool g_PdLogoTriggerExit = false; -void titleInitPdLogo(void) +void title_init_pd_logo(void) { u8 *nextaddr = var8009cca0; u32 remaining; @@ -532,86 +532,86 @@ void titleInitPdLogo(void) { struct coord coord = {0, 0, 0}; - g_ModelStates[MODEL_NLOGO].modeldef = modeldefLoad(g_ModelStates[MODEL_NLOGO].fileid, nextaddr, TITLE_ALLOCSIZE, 0); - size = ALIGN64(fileGetLoadedSize(g_ModelStates[MODEL_NLOGO].fileid)); + g_ModelStates[MODEL_NLOGO].modeldef = modeldef_load(g_ModelStates[MODEL_NLOGO].fileid, nextaddr, TITLE_ALLOCSIZE, 0); + size = ALIGN64(file_get_loaded_size(g_ModelStates[MODEL_NLOGO].fileid)); nextaddr += size; remaining = TITLE_ALLOCSIZE - size; - modelAllocateRwData(g_ModelStates[MODEL_NLOGO].modeldef); + model_allocate_rw_data(g_ModelStates[MODEL_NLOGO].modeldef); - g_TitleModel = modelmgrInstantiateModelWithAnim(g_ModelStates[MODEL_NLOGO].modeldef); - modelSetScale(g_TitleModel, 1); - modelSetRootPosition(g_TitleModel, &coord); + g_TitleModel = modelmgr_instantiate_model_with_anim(g_ModelStates[MODEL_NLOGO].modeldef); + model_set_scale(g_TitleModel, 1); + model_set_root_position(g_TitleModel, &coord); } { struct coord coord = {0, 0, 0}; - g_ModelStates[MODEL_NLOGO2].modeldef = modeldefLoad(g_ModelStates[MODEL_NLOGO2].fileid, nextaddr, remaining, 0); - size = ALIGN64(fileGetLoadedSize(g_ModelStates[MODEL_NLOGO2].fileid)); + g_ModelStates[MODEL_NLOGO2].modeldef = modeldef_load(g_ModelStates[MODEL_NLOGO2].fileid, nextaddr, remaining, 0); + size = ALIGN64(file_get_loaded_size(g_ModelStates[MODEL_NLOGO2].fileid)); nextaddr += size; remaining -= size; - modelAllocateRwData(g_ModelStates[MODEL_NLOGO2].modeldef); + model_allocate_rw_data(g_ModelStates[MODEL_NLOGO2].modeldef); - g_TitleModelNLogo2 = modelmgrInstantiateModelWithAnim(g_ModelStates[MODEL_NLOGO2].modeldef); - modelSetScale(g_TitleModelNLogo2, 1); - modelSetRootPosition(g_TitleModelNLogo2, &coord); + g_TitleModelNLogo2 = modelmgr_instantiate_model_with_anim(g_ModelStates[MODEL_NLOGO2].modeldef); + model_set_scale(g_TitleModelNLogo2, 1); + model_set_root_position(g_TitleModelNLogo2, &coord); } { struct coord coord = {0, 0, 0}; - g_ModelStates[MODEL_PDTWO].modeldef = modeldefLoad(g_ModelStates[MODEL_PDTWO].fileid, nextaddr, remaining, 0); - size = ALIGN64(fileGetLoadedSize(g_ModelStates[MODEL_PDTWO].fileid)); + g_ModelStates[MODEL_PDTWO].modeldef = modeldef_load(g_ModelStates[MODEL_PDTWO].fileid, nextaddr, remaining, 0); + size = ALIGN64(file_get_loaded_size(g_ModelStates[MODEL_PDTWO].fileid)); nextaddr += size; remaining -= size; - modelAllocateRwData(g_ModelStates[MODEL_PDTWO].modeldef); + model_allocate_rw_data(g_ModelStates[MODEL_PDTWO].modeldef); - g_TitleModelPdTwo = modelmgrInstantiateModelWithoutAnim(g_ModelStates[MODEL_PDTWO].modeldef); - modelSetScale(g_TitleModelPdTwo, 1); - modelSetRootPosition(g_TitleModelPdTwo, &coord); + g_TitleModelPdTwo = modelmgr_instantiate_model_without_anim(g_ModelStates[MODEL_PDTWO].modeldef); + model_set_scale(g_TitleModelPdTwo, 1); + model_set_root_position(g_TitleModelPdTwo, &coord); } #if VERSION == VERSION_JPN_FINAL { struct coord coord = {0, 0, 0}; - g_ModelStates[MODEL_JPNLOGO].modeldef = modeldefLoad(g_ModelStates[MODEL_JPNLOGO].fileid, nextaddr, remaining, 0); - size = ALIGN64(fileGetLoadedSize(g_ModelStates[MODEL_JPNLOGO].fileid)); + g_ModelStates[MODEL_JPNLOGO].modeldef = modeldef_load(g_ModelStates[MODEL_JPNLOGO].fileid, nextaddr, remaining, 0); + size = ALIGN64(file_get_loaded_size(g_ModelStates[MODEL_JPNLOGO].fileid)); nextaddr += size; remaining -= size; - modelAllocateRwData(g_ModelStates[MODEL_JPNLOGO].modeldef); + model_allocate_rw_data(g_ModelStates[MODEL_JPNLOGO].modeldef); - g_TitleModelJpnLogo1 = modelmgrInstantiateModelWithoutAnim(g_ModelStates[MODEL_JPNLOGO].modeldef); - g_TitleModelJpnLogo2 = modelmgrInstantiateModelWithoutAnim(g_ModelStates[MODEL_JPNLOGO].modeldef); - modelSetScale(g_TitleModelJpnLogo1, 1); - modelSetScale(g_TitleModelJpnLogo2, 1); - modelSetRootPosition(g_TitleModelJpnLogo1, &coord); - modelSetRootPosition(g_TitleModelJpnLogo2, &coord); + g_TitleModelJpnLogo1 = modelmgr_instantiate_model_without_anim(g_ModelStates[MODEL_JPNLOGO].modeldef); + g_TitleModelJpnLogo2 = modelmgr_instantiate_model_without_anim(g_ModelStates[MODEL_JPNLOGO].modeldef); + model_set_scale(g_TitleModelJpnLogo1, 1); + model_set_scale(g_TitleModelJpnLogo2, 1); + model_set_root_position(g_TitleModelJpnLogo1, &coord); + model_set_root_position(g_TitleModelJpnLogo2, &coord); - g_ModelStates[MODEL_JPNPD].modeldef = modeldefLoad(g_ModelStates[MODEL_JPNPD].fileid, nextaddr, remaining, 0); - size = ALIGN64(fileGetLoadedSize(g_ModelStates[MODEL_JPNPD].fileid)); + g_ModelStates[MODEL_JPNPD].modeldef = modeldef_load(g_ModelStates[MODEL_JPNPD].fileid, nextaddr, remaining, 0); + size = ALIGN64(file_get_loaded_size(g_ModelStates[MODEL_JPNPD].fileid)); nextaddr += size; remaining -= size; - modelAllocateRwData(g_ModelStates[MODEL_JPNPD].modeldef); + model_allocate_rw_data(g_ModelStates[MODEL_JPNPD].modeldef); - g_TitleModelJpnPd = modelmgrInstantiateModelWithoutAnim(g_ModelStates[MODEL_JPNPD].modeldef); - modelSetScale(g_TitleModelJpnPd, 1); - modelSetRootPosition(g_TitleModelJpnPd, &coord); + g_TitleModelJpnPd = modelmgr_instantiate_model_without_anim(g_ModelStates[MODEL_JPNPD].modeldef); + model_set_scale(g_TitleModelJpnPd, 1); + model_set_root_position(g_TitleModelJpnPd, &coord); } #endif { struct coord coord = {0, 0, 0}; - g_ModelStates[MODEL_PDTHREE].modeldef = modeldefLoad(g_ModelStates[MODEL_PDTHREE].fileid, nextaddr, remaining, 0); - size = ALIGN64(fileGetLoadedSize(g_ModelStates[MODEL_PDTHREE].fileid)); + g_ModelStates[MODEL_PDTHREE].modeldef = modeldef_load(g_ModelStates[MODEL_PDTHREE].fileid, nextaddr, remaining, 0); + size = ALIGN64(file_get_loaded_size(g_ModelStates[MODEL_PDTHREE].fileid)); nextaddr += size; remaining -= size; - modelAllocateRwData(g_ModelStates[MODEL_PDTHREE].modeldef); + model_allocate_rw_data(g_ModelStates[MODEL_PDTHREE].modeldef); - g_TitleModelPdThree = modelmgrInstantiateModelWithoutAnim(g_ModelStates[MODEL_PDTHREE].modeldef); - modelSetScale(g_TitleModelPdThree, 1); - modelSetRootPosition(g_TitleModelPdThree, &coord); + g_TitleModelPdThree = modelmgr_instantiate_model_without_anim(g_ModelStates[MODEL_PDTHREE].modeldef); + model_set_scale(g_TitleModelPdThree, 1); + model_set_root_position(g_TitleModelPdThree, &coord); } { - struct modelrodata_dl *rodata = (struct modelrodata_dl *)modelGetPartRodata(g_ModelStates[MODEL_PDTWO].modeldef, MODELPART_LOGO_FRONTSIDE); + struct modelrodata_dl *rodata = (struct modelrodata_dl *)model_get_part_rodata(g_ModelStates[MODEL_PDTWO].modeldef, MODELPART_LOGO_FRONTSIDE); size = ALIGN8(rodata->numvertices * sizeof(Vtx)); @@ -640,33 +640,33 @@ void titleInitPdLogo(void) g_PdLogoTriggerExit = false; if (g_TitleButtonPressed) { - titleSkipToPdTitle(); + title_skip_to_pd_title(); } } } -void titleExitPdLogo(void) +void title_exit_pd_logo(void) { - modelmgrFreeModel(g_TitleModel); - modelmgrFreeModel(g_TitleModelNLogo2); - modelmgrFreeModel(g_TitleModelPdTwo); - modelmgrFreeModel(g_TitleModelPdThree); + modelmgr_free_model(g_TitleModel); + modelmgr_free_model(g_TitleModelNLogo2); + modelmgr_free_model(g_TitleModelPdTwo); + modelmgr_free_model(g_TitleModelPdThree); #if VERSION == VERSION_JPN_FINAL - modelmgrFreeModel(g_TitleModelJpnLogo1); - modelmgrFreeModel(g_TitleModelJpnLogo2); - modelmgrFreeModel(g_TitleModelJpnPd); + modelmgr_free_model(g_TitleModelJpnLogo1); + modelmgr_free_model(g_TitleModelJpnLogo2); + modelmgr_free_model(g_TitleModelJpnPd); #endif joy00014810(true); } -void titleTickPdLogo(void) +void title_tick_pd_logo(void) { - viSetFovY(46); - viSetAspect(1.33333333f); - viSetZRange(100, 10000); - viSetUseZBuf(false); + vi_set_fov_y(46); + vi_set_aspect(1.33333333f); + vi_set_z_range(100, 10000); + vi_set_use_z_buf(false); g_TitleTimer += g_Vars.lvupdate60; g_PdLogoVtxColIndex = 1 - g_PdLogoVtxColIndex; @@ -681,36 +681,36 @@ void titleTickPdLogo(void) // Exiting due to player not pressing anything if (g_AltTitleEnabled && IS8MB()) { g_TitleMode = TITLEMODE_SKIP; - creditsRequestAltTitle(); + credits_request_alt_title(); g_TitleNextStage = STAGE_CREDITS; // for alt title screen - setNumPlayers(1); - mainChangeToStage(g_TitleNextStage); + set_num_players(1); + main_change_to_stage(g_TitleNextStage); g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - lvSetDifficulty(DIFF_A); - viBlack(true); + lv_set_difficulty(DIFF_A); + vi_black(true); } else { - titleSetNextMode(TITLEMODE_SKIP); + title_set_next_mode(TITLEMODE_SKIP); } } if (g_TitleButtonPressed && g_TitleTimer > TICKS(666)) { - titleSetNextMode(TITLEMODE_SKIP); + title_set_next_mode(TITLEMODE_SKIP); } - if (joyGetButtonsPressedThisFrame(0, 0xffff)) { + if (joy_get_buttons_pressed_this_frame(0, 0xffff)) { g_TitleButtonPressed = g_TitleFastForward = true; if (g_TitleTimer < TICKS(549)) { - titleSetNextMode(TITLEMODE_PDLOGO); + title_set_next_mode(TITLEMODE_PDLOGO); } } } -Gfx *titleRenderPdLogoModel(Gfx *gdl, struct model *model, bool arg2, f32 arg3, s32 arg4, f32 arg5, Mtxf *arg6, Vtx *vertices, Col *colours) +Gfx *title_render_pd_logo_model(Gfx *gdl, struct model *model, bool arg2, f32 arg3, s32 arg4, f32 arg5, Mtxf *arg6, Vtx *vertices, Col *colours) { struct modelrenderdata renderdata = {NULL, true, 3}; s32 tmp2; @@ -736,10 +736,10 @@ Gfx *titleRenderPdLogoModel(Gfx *gdl, struct model *model, bool arg2, f32 arg3, Col *s2; Mtxf sp6c; - tmp = modelGetNodeRwData(model, modelGetPart(model->definition, MODELPART_LOGO_0000)); + tmp = model_get_node_rw_data(model, model_get_part(model->definition, MODELPART_LOGO_0000)); tmp->toggle.visible = arg2; - tmp = modelGetNodeRwData(model, modelGetPart(model->definition, MODELPART_LOGO_0001)); + tmp = model_get_node_rw_data(model, model_get_part(model->definition, MODELPART_LOGO_0001)); tmp->toggle.visible = !arg2; s6 = arg3 * 65536.0f; @@ -780,28 +780,28 @@ Gfx *titleRenderPdLogoModel(Gfx *gdl, struct model *model, bool arg2, f32 arg3, for (i = 0; i < 4; i++) { if (i == 0) { - node1 = modelGetPart(model->definition, MODELPART_LOGO_FRONTSIDE); - node2 = modelGetPart(model->definition, MODELPART_LOGO_0003); + node1 = model_get_part(model->definition, MODELPART_LOGO_FRONTSIDE); + node2 = model_get_part(model->definition, MODELPART_LOGO_0003); } else if (i == 1) { - node1 = modelGetPart(model->definition, MODELPART_LOGO_RIGHTSIDE); - node2 = modelGetPart(model->definition, MODELPART_LOGO_0005); + node1 = model_get_part(model->definition, MODELPART_LOGO_RIGHTSIDE); + node2 = model_get_part(model->definition, MODELPART_LOGO_0005); } else if (i == 2) { - node1 = modelGetPart(model->definition, MODELPART_LOGO_BACKSIDE); - node2 = modelGetPart(model->definition, MODELPART_LOGO_0007); + node1 = model_get_part(model->definition, MODELPART_LOGO_BACKSIDE); + node2 = model_get_part(model->definition, MODELPART_LOGO_0007); } else { - node1 = modelGetPart(model->definition, MODELPART_LOGO_LEFTSIDE); - node2 = modelGetPart(model->definition, MODELPART_LOGO_0009); + node1 = model_get_part(model->definition, MODELPART_LOGO_LEFTSIDE); + node2 = model_get_part(model->definition, MODELPART_LOGO_0009); } if (node1 && node2) { if (arg2) { s5rodata = &node1->rodata->dl; s1rodata = &node2->rodata->dl; - rwdata = modelGetNodeRwData(model, node1); + rwdata = model_get_node_rw_data(model, node1); } else { s5rodata = &node2->rodata->dl; s1rodata = &node1->rodata->dl; - rwdata = modelGetNodeRwData(model, node2); + rwdata = model_get_node_rw_data(model, node2); } s1 = (Col *)ALIGN8(s5rodata->numvertices * sizeof(Vtx) + (s32)s5rodata->vertices); @@ -856,25 +856,25 @@ Gfx *titleRenderPdLogoModel(Gfx *gdl, struct model *model, bool arg2, f32 arg3, gDPSetPrimColor(gdl++, 0, 0, 0x00, 0x00, 0x00, alpha1); renderdata.unk00 = arg6; - renderdata.unk10 = gfxAllocate(model->definition->nummatrices * sizeof(Mtxf)); + renderdata.unk10 = gfx_allocate(model->definition->nummatrices * sizeof(Mtxf)); - mtx4Copy(arg6, renderdata.unk10); + mtx4_copy(arg6, renderdata.unk10); model->matrices = renderdata.unk10; - modelUpdateRelations(model); + model_update_relations(model); renderdata.flags = 3; renderdata.zbufferenabled = false; renderdata.gdl = gdl; - modelRender(&renderdata, model); + model_render(&renderdata, model); gdl = renderdata.gdl; for (j = 0, k = 0; j < model->definition->nummatrices; j++, k += sizeof(Mtxf)) { - mtx4Copy((Mtxf *)((uintptr_t)model->matrices + k), &sp6c); - mtxF2L(&sp6c, model->matrices + j); + mtx4_copy((Mtxf *)((uintptr_t)model->matrices + k), &sp6c); + mtx_f2l(&sp6c, model->matrices + j); } return gdl; @@ -915,7 +915,7 @@ f32 g_PdLogoLightDirFrac = 0; * * Assumes the title mode is already PdLogo, but at an earlier point. */ -void titleSkipToPdTitle(void) +void title_skip_to_pd_title(void) { g_PdLogoYRotCur = 0; g_PdLogoYRotSpeed = 0; @@ -949,10 +949,10 @@ void titleSkipToPdTitle(void) g_TitleTimer = TICKS(549); g_PdLogoIsFirstTick = false; - musicStartTemporaryPrimary(MUSIC_TITLE2); + music_start_temporary_primary(MUSIC_TITLE2); } -Gfx *titleRenderPdLogo(Gfx *gdl) +Gfx *title_render_pd_logo(Gfx *gdl) { struct modelrenderdata renderdata = {NULL, true, 3}; Mtxf sp2b0; @@ -1055,7 +1055,7 @@ Gfx *titleRenderPdLogo(Gfx *gdl) if (g_PdLogoYRotStopping) { if (g_PdLogoYRotCur < g_PdLogoEndYRot) { - applySpeed(&g_PdLogoYRotCur, g_PdLogoEndYRot, &g_PdLogoYRotSpeed, yrotaccel, yrotaccel, yrotmaxspeed); + apply_speed(&g_PdLogoYRotCur, g_PdLogoEndYRot, &g_PdLogoYRotSpeed, yrotaccel, yrotaccel, yrotmaxspeed); if (g_PdLogoYRotCur >= g_PdLogoEndYRot) { g_PdLogoYRotCur = g_PdLogoEndYRot; @@ -1126,7 +1126,7 @@ Gfx *titleRenderPdLogo(Gfx *gdl) if (g_PdLogoXRotCur > xrotmin) { // Implement the camera lowering effect, but it's actually // the model that rotates upwards to face the camera - applyRotation(&g_PdLogoXRotCur, xrotmin, &g_PdLogoXRotSpeed, xrotaccel, xrotaccel, xrotmaxspeed); + apply_rotation(&g_PdLogoXRotCur, xrotmin, &g_PdLogoXRotSpeed, xrotaccel, xrotaccel, xrotmaxspeed); if (g_PdLogoXRotCur <= xrotmin) { g_PdLogoXRotCur = xrotmin; @@ -1279,28 +1279,28 @@ Gfx *titleRenderPdLogo(Gfx *gdl) #if VERSION == VERSION_JPN_FINAL if (g_PdLogoTitleStep < 0) { - gdl = viSetFillColour(gdl, 0x00, 0x00, 0x00); + gdl = vi_set_fill_colour(gdl, 0x00, 0x00, 0x00); } else if (g_PdLogoTitleStep == 0) { step0value = g_PdLogoTitleStepFrac * 255.0f; - gdl = viSetFillColour(gdl, step0value, step0value, step0value); + gdl = vi_set_fill_colour(gdl, step0value, step0value, step0value); } else if (g_PdLogoTitleStep == 1) { step1weight = g_PdLogoTitleStepFrac * 255.0f; - step1colour = colourBlend(0xffffffff, 0xa5002c00, step1weight); - gdl = viSetFillColour(gdl, ((step1colour >> 24) & 0xff), (step1colour >> 16) & 0xff, (step1colour >> 8) & 0xff); + step1colour = colour_blend(0xffffffff, 0xa5002c00, step1weight); + gdl = vi_set_fill_colour(gdl, ((step1colour >> 24) & 0xff), (step1colour >> 16) & 0xff, (step1colour >> 8) & 0xff); } else { - gdl = viSetFillColour(gdl, 0xb9, 0x00, 0x2c); + gdl = vi_set_fill_colour(gdl, 0xb9, 0x00, 0x2c); } #else - gdl = viSetFillColour(gdl, 0x00, 0x00, 0x00); + gdl = vi_set_fill_colour(gdl, 0x00, 0x00, 0x00); #endif - gdl = viFillBuffer(gdl); + gdl = vi_fill_buffer(gdl); if (g_PdLogoBlackTimer != 0) { return gdl; } - lookat = gfxAllocateLookAt(2); + lookat = gfx_allocate_look_at(2); guLookAtReflect(&spf0, lookat, 0.0f, 0.0f, 4000.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f); gSPLookAt(gdl++, lookat); @@ -1363,10 +1363,10 @@ Gfx *titleRenderPdLogo(Gfx *gdl) model = g_PdLogoUseCombinedModel == true ? g_TitleModel : g_TitleModelNLogo2; - mtx4LoadYRotation(g_PdLogoYRotCur, &sp1e8); - mtx4LoadXRotation(g_PdLogoXRotCur, &sp1a8); - mtx4MultMtx4InPlace(&sp1a8, &sp1e8); - mtx4MultMtx4(&sp2b0, &sp1e8, &sp270); + mtx4_load_y_rotation(g_PdLogoYRotCur, &sp1e8); + mtx4_load_x_rotation(g_PdLogoXRotCur, &sp1a8); + mtx4_mult_mtx4_in_place(&sp1a8, &sp1e8); + mtx4_mult_mtx4(&sp2b0, &sp1e8, &sp270); mtx00015f04(g_PdLogoScale, &sp270); #if VERSION != VERSION_JPN_FINAL @@ -1382,27 +1382,27 @@ Gfx *titleRenderPdLogo(Gfx *gdl) s32 numvertices = 0; s32 numcolours = 0; - node = modelGetPart(model->definition, MODELPART_LOGO_FRONTSIDE); + node = model_get_part(model->definition, MODELPART_LOGO_FRONTSIDE); if (node != NULL) { rodata = &node->rodata->dl; numvertices += rodata->numvertices + 1; numcolours += rodata->numcolours + 1; - rwdata = modelGetNodeRwData(model, node); - rwdata->gdl = tmpgdl = gfxAllocate(5 * sizeof(Gfx)); + rwdata = model_get_node_rw_data(model, node); + rwdata->gdl = tmpgdl = gfx_allocate(5 * sizeof(Gfx)); gSPSetLights1(tmpgdl++, g_TitleLightPdLogoFront); gSPBranchList(tmpgdl++, rodata->opagdl); } - node = modelGetPart(model->definition, MODELPART_LOGO_RIGHTSIDE); + node = model_get_part(model->definition, MODELPART_LOGO_RIGHTSIDE); if (node != NULL) { rodata = &node->rodata->dl; numvertices += rodata->numvertices + 1; numcolours += rodata->numcolours + 1; - rwdata = modelGetNodeRwData(model, node); - rwdata->gdl = tmpgdl = gfxAllocate(5 * sizeof(Gfx)); + rwdata = model_get_node_rw_data(model, node); + rwdata->gdl = tmpgdl = gfx_allocate(5 * sizeof(Gfx)); if (g_PdLogoAmbientLightFrac > 0.0f) { gSPSetLights1(tmpgdl++, g_TitleLightPdLogoNotFront); @@ -1412,14 +1412,14 @@ Gfx *titleRenderPdLogo(Gfx *gdl) } } - node = modelGetPart(model->definition, MODELPART_LOGO_BACKSIDE); + node = model_get_part(model->definition, MODELPART_LOGO_BACKSIDE); if (node != NULL) { rodata = &node->rodata->dl; numvertices += rodata->numvertices + 1; numcolours += rodata->numcolours + 1; - rwdata = modelGetNodeRwData(model, node); - rwdata->gdl = tmpgdl = gfxAllocate(5 * sizeof(Gfx)); + rwdata = model_get_node_rw_data(model, node); + rwdata->gdl = tmpgdl = gfx_allocate(5 * sizeof(Gfx)); if (g_PdLogoAmbientLightFrac > 0.0f) { gSPSetLights1(tmpgdl++, g_TitleLightPdLogoNotFront); @@ -1429,14 +1429,14 @@ Gfx *titleRenderPdLogo(Gfx *gdl) } } - node = modelGetPart(model->definition, MODELPART_LOGO_LEFTSIDE); + node = model_get_part(model->definition, MODELPART_LOGO_LEFTSIDE); if (node != NULL) { rodata = &node->rodata->dl; numvertices += rodata->numvertices + 1; numcolours += rodata->numcolours + 1; - rwdata = modelGetNodeRwData(model, node); - rwdata->gdl = tmpgdl = gfxAllocate(5 * sizeof(Gfx)); + rwdata = model_get_node_rw_data(model, node); + rwdata->gdl = tmpgdl = gfx_allocate(5 * sizeof(Gfx)); if (g_PdLogoAmbientLightFrac > 0.0f) { gSPSetLights1(tmpgdl++, g_TitleLightPdLogoNotFront); @@ -1446,7 +1446,7 @@ Gfx *titleRenderPdLogo(Gfx *gdl) } } - gdl = titleRenderPdLogoModel(gdl, model, var80062804, g_PdLogoFrac, 240, 1.0f, &sp270, gfxAllocateVertices(numvertices), gfxAllocateColours(numcolours)); + gdl = title_render_pd_logo_model(gdl, model, var80062804, g_PdLogoFrac, 240, 1.0f, &sp270, gfx_allocate_vertices(numvertices), gfx_allocate_colours(numcolours)); } gSPSetLights1(gdl++, g_TitleLightPdLogoMain); @@ -1454,12 +1454,12 @@ Gfx *titleRenderPdLogo(Gfx *gdl) { u32 stack3[4]; struct coord sp64 = {0, 0, 1000}; - mtx4LoadTranslation(&sp64, &sp1e8); + mtx4_load_translation(&sp64, &sp1e8); } #if VERSION == VERSION_JPN_FINAL mtx00015ea8(0.01f, &sp1e8); - mtx4MultMtx4(&sp2b0, &sp1e8, &sp230); + mtx4_mult_mtx4(&sp2b0, &sp1e8, &sp230); mtx00015f04(0.308f, &sp230); mtx00015f04(3.5f, &sp230); @@ -1474,20 +1474,20 @@ Gfx *titleRenderPdLogo(Gfx *gdl) envalpha = (1.0f - g_PdLogoTitleStepFrac) * 255.0f; - mtx4LoadIdentity(&sp1b0); + mtx4_load_identity(&sp1b0); mtx00015f04(var8009d350jf * 1.5f, &sp1b0); mtx00016ae4(&sp2b0, 0.0f, 0.0f, 4000.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f); - mtx4MultMtx4InPlace(&sp2b0, &sp1b0); - mtx4Copy(&sp1b0, &sp2b0); + mtx4_mult_mtx4_in_place(&sp2b0, &sp1b0); + mtx4_copy(&sp1b0, &sp2b0); renderdata.unk00 = &sp2b0; - renderdata.unk10 = gfxAllocate(g_TitleModelJpnLogo2->definition->nummatrices * sizeof(Mtxf)); + renderdata.unk10 = gfx_allocate(g_TitleModelJpnLogo2->definition->nummatrices * sizeof(Mtxf)); - mtx4Copy(&sp2b0, renderdata.unk10); + mtx4_copy(&sp2b0, renderdata.unk10); g_TitleModelJpnLogo2->matrices = renderdata.unk10; - modelUpdateRelations(g_TitleModelJpnLogo2); + model_update_relations(g_TitleModelJpnLogo2); renderdata.unk30 = 5; renderdata.zbufferenabled = false; @@ -1495,14 +1495,14 @@ Gfx *titleRenderPdLogo(Gfx *gdl) renderdata.envcolour = 0xff000000 | envalpha; renderdata.gdl = gdl; - modelRender(&renderdata, g_TitleModelJpnLogo2); + model_render(&renderdata, g_TitleModelJpnLogo2); gdl = renderdata.gdl; for (mtxindex = 0; mtxindex < g_TitleModelJpnLogo2->definition->nummatrices; mtxindex++) { Mtxf mtx; - mtx4Copy((Mtxf *) ((uintptr_t) g_TitleModelJpnLogo2->matrices + mtxindex * sizeof(Mtxf)), &mtx); - mtxF2L(&mtx, g_TitleModelJpnLogo2->matrices + mtxindex); + mtx4_copy((Mtxf *) ((uintptr_t) g_TitleModelJpnLogo2->matrices + mtxindex * sizeof(Mtxf)), &mtx); + mtx_f2l(&mtx, g_TitleModelJpnLogo2->matrices + mtxindex); } } @@ -1537,13 +1537,13 @@ Gfx *titleRenderPdLogo(Gfx *gdl) renderdata.unk00 = &sp230; - renderdata.unk10 = gfxAllocate(g_TitleModelJpnPd->definition->nummatrices * sizeof(Mtxf)); + renderdata.unk10 = gfx_allocate(g_TitleModelJpnPd->definition->nummatrices * sizeof(Mtxf)); - mtx4Copy(&sp230, renderdata.unk10); + mtx4_copy(&sp230, renderdata.unk10); g_TitleModelJpnPd->matrices = renderdata.unk10; - modelUpdateRelations(g_TitleModelJpnPd); + model_update_relations(g_TitleModelJpnPd); // @bug: || should be | in fogcolour expression renderdata.zbufferenabled = false; @@ -1552,14 +1552,14 @@ Gfx *titleRenderPdLogo(Gfx *gdl) renderdata.envcolour = envcolour; renderdata.gdl = gdl; - modelRender(&renderdata, g_TitleModelJpnPd); + model_render(&renderdata, g_TitleModelJpnPd); gdl = renderdata.gdl; for (mtxindex = 0; mtxindex < g_TitleModelJpnPd->definition->nummatrices; mtxindex++) { Mtxf mtx; - mtx4Copy((Mtxf *) ((uintptr_t) g_TitleModelJpnPd->matrices + mtxindex * sizeof(Mtxf)), &mtx); - mtxF2L(&mtx, g_TitleModelJpnPd->matrices + mtxindex); + mtx4_copy((Mtxf *) ((uintptr_t) g_TitleModelJpnPd->matrices + mtxindex * sizeof(Mtxf)), &mtx); + mtx_f2l(&mtx, g_TitleModelJpnPd->matrices + mtxindex); } } @@ -1570,20 +1570,20 @@ Gfx *titleRenderPdLogo(Gfx *gdl) u32 stack7[4]; s32 mtxindex; - mtx4LoadIdentity(&spb0); + mtx4_load_identity(&spb0); mtx00015f04(var8009d34cjf * 1.5f, &spb0); mtx00016ae4(&sp2b0, 0.0f, 0.0f, 4000.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f); - mtx4MultMtx4InPlace(&sp2b0, &spb0); - mtx4Copy(&spb0, &sp2b0); + mtx4_mult_mtx4_in_place(&sp2b0, &spb0); + mtx4_copy(&spb0, &sp2b0); renderdata.unk00 = &sp2b0; - renderdata.unk10 = gfxAllocate(g_TitleModelJpnLogo1->definition->nummatrices * sizeof(Mtxf)); + renderdata.unk10 = gfx_allocate(g_TitleModelJpnLogo1->definition->nummatrices * sizeof(Mtxf)); - mtx4Copy(&sp2b0, renderdata.unk10); + mtx4_copy(&sp2b0, renderdata.unk10); g_TitleModelJpnLogo1->matrices = renderdata.unk10; - modelUpdateRelations(g_TitleModelJpnLogo1); + model_update_relations(g_TitleModelJpnLogo1); renderdata.zbufferenabled = false; renderdata.unk30 = 5; @@ -1591,20 +1591,20 @@ Gfx *titleRenderPdLogo(Gfx *gdl) renderdata.envcolour = 0x000000ff; renderdata.gdl = gdl; - modelRender(&renderdata, g_TitleModelJpnLogo1); + model_render(&renderdata, g_TitleModelJpnLogo1); gdl = renderdata.gdl; for (mtxindex = 0; mtxindex < g_TitleModelJpnLogo1->definition->nummatrices; mtxindex++) { Mtxf mtx; - mtx4Copy((Mtxf *) ((uintptr_t) g_TitleModelJpnLogo1->matrices + mtxindex * sizeof(Mtxf)), &mtx); - mtxF2L(&mtx, g_TitleModelJpnLogo1->matrices + mtxindex); + mtx4_copy((Mtxf *) ((uintptr_t) g_TitleModelJpnLogo1->matrices + mtxindex * sizeof(Mtxf)), &mtx); + mtx_f2l(&mtx, g_TitleModelJpnLogo1->matrices + mtxindex); } } } #else mtx00015f88(1.0f + sp13c, &sp1e8); - mtx4MultMtx4(&sp2b0, &sp1e8, &sp230); + mtx4_mult_mtx4(&sp2b0, &sp1e8, &sp230); mtx00015f04(0.308f, &sp230); // Render the "PERFECT DARK" model @@ -1614,18 +1614,18 @@ Gfx *titleRenderPdLogo(Gfx *gdl) } else if (g_PdLogoTitleStep == 1) { bool visible = g_PdLogoTitleStepFrac < 0.5f; model = g_TitleModelPdThree; - gdl = titleRenderPdLogoModel(gdl, model, visible, g_PdLogoTitleStepFrac, 255, g_PdLogoTitleStepFrac, &sp230, g_PdLogoVertices[g_PdLogoVtxColIndex], g_PdLogoColours[g_PdLogoVtxColIndex]); + gdl = title_render_pd_logo_model(gdl, model, visible, g_PdLogoTitleStepFrac, 255, g_PdLogoTitleStepFrac, &sp230, g_PdLogoVertices[g_PdLogoVtxColIndex], g_PdLogoColours[g_PdLogoVtxColIndex]); } else if (g_PdLogoTitleStep == 2) { bool visible = g_PdLogoTitleStepFrac < 0.5f; model = g_TitleModelPdTwo; - gdl = titleRenderPdLogoModel(gdl, model, visible, 1.0f - g_PdLogoTitleStepFrac, 255, 1.0f, &sp230, g_PdLogoVertices[g_PdLogoVtxColIndex], g_PdLogoColours[g_PdLogoVtxColIndex]); + gdl = title_render_pd_logo_model(gdl, model, visible, 1.0f - g_PdLogoTitleStepFrac, 255, 1.0f, &sp230, g_PdLogoVertices[g_PdLogoVtxColIndex], g_PdLogoColours[g_PdLogoVtxColIndex]); } else if (g_PdLogoTitleStep == 3) { bool visible = g_PdLogoTitleStepFrac < 0.5f; model = g_TitleModelPdTwo; - gdl = titleRenderPdLogoModel(gdl, model, visible, g_PdLogoTitleStepFrac, 255, 1.0f, &sp230, g_PdLogoVertices[g_PdLogoVtxColIndex], g_PdLogoColours[g_PdLogoVtxColIndex]); + gdl = title_render_pd_logo_model(gdl, model, visible, g_PdLogoTitleStepFrac, 255, 1.0f, &sp230, g_PdLogoVertices[g_PdLogoVtxColIndex], g_PdLogoColours[g_PdLogoVtxColIndex]); } else { model = g_TitleModelPdTwo; - gdl = titleRenderPdLogoModel(gdl, model, false, 1.0f, 255, 1.0f, &sp230, g_PdLogoVertices[g_PdLogoVtxColIndex], g_PdLogoColours[g_PdLogoVtxColIndex]); + gdl = title_render_pd_logo_model(gdl, model, false, 1.0f, 255, 1.0f, &sp230, g_PdLogoVertices[g_PdLogoVtxColIndex], g_PdLogoColours[g_PdLogoVtxColIndex]); } } #endif @@ -1636,14 +1636,14 @@ Gfx *titleRenderPdLogo(Gfx *gdl) struct sndstate *g_TitleAudioHandle = NULL; bool g_TitleTypewriterFinishing = false; -void titleInitRarePresents(void) +void title_init_rare_presents(void) { g_TitleTimer = 0; joy00014810(false); g_TitleAudioHandle = NULL; } -void titleExitRarePresents(void) +void title_exit_rare_presents(void) { if (g_TitleAudioHandle) { audioStop(g_TitleAudioHandle); @@ -1653,26 +1653,26 @@ void titleExitRarePresents(void) joy00014810(true); } -void titleTickRarePresents(void) +void title_tick_rare_presents(void) { - viSetFovY(60); - viSetAspect(1.33333333f); - viSetZRange(100, 10000); - viSetUseZBuf(false); + vi_set_fov_y(60); + vi_set_aspect(1.33333333f); + vi_set_z_range(100, 10000); + vi_set_use_z_buf(false); g_TitleTimer += g_Vars.lvupdate60; if (g_TitleTimer > TICKS(300)) { - titleSetNextMode(TITLEMODE_PDLOGO); - } else if (joyGetButtonsPressedThisFrame(0, 0xffff)) { - titleSetNextMode(TITLEMODE_SKIP); + title_set_next_mode(TITLEMODE_PDLOGO); + } else if (joy_get_buttons_pressed_this_frame(0, 0xffff)) { + title_set_next_mode(TITLEMODE_SKIP); } } -Gfx *titleRenderTypewriterText(Gfx *gdl, s32 *x, s32 *y, u16 textnum, s32 timer, s32 *colourcomponent) +Gfx *title_render_typewriter_text(Gfx *gdl, s32 *x, s32 *y, u16 textnum, s32 timer, s32 *colourcomponent) { s32 lentoprint = timer / 3; - char *text = langGet(textnum); + char *text = lang_get(textnum); s32 i; u8 buffer[] = {'\0', '\0'}; s32 fulllen = strlen(text); @@ -1700,44 +1700,44 @@ Gfx *titleRenderTypewriterText(Gfx *gdl, s32 *x, s32 *y, u16 textnum, s32 timer, *colourcomponent = tmp = (60 - remaining) * 255 / 60; buffer[0] = text[i]; - gdl = textRenderProjected(gdl, x, y, buffer, g_CharsHandelGothicLg, g_FontHandelGothicLg, - 0x7f7fffff | (tmp << 8) | (tmp << 16), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, x, y, buffer, g_CharsHandelGothicLg, g_FontHandelGothicLg, + 0x7f7fffff | (tmp << 8) | (tmp << 16), vi_get_width(), vi_get_height(), 0, 0); } return gdl; } -Gfx *titleRenderRarePresents(Gfx *gdl) +Gfx *title_render_rare_presents(Gfx *gdl) { s32 x; s32 y; s32 colourcomponent = 255; - gdl = titleClear(gdl); + gdl = title_clear(gdl); gdl = text0f153628(gdl); - x = viGetViewLeft() + 50; - y = viGetViewTop() + viGetViewHeight() - 80; + x = vi_get_view_left() + 50; + y = vi_get_view_top() + vi_get_view_height() - 80; g_TitleTypewriterFinishing = false; if (g_TitleMode == TITLEMODE_RAREPRESENTS1) { - gdl = titleRenderTypewriterText(gdl, &x, &y, L_OPTIONS_005, g_TitleTimer, &colourcomponent); // "earth:" + gdl = title_render_typewriter_text(gdl, &x, &y, L_OPTIONS_005, g_TitleTimer, &colourcomponent); // "earth:" if (g_TitleTimer > 70) { - x = viGetViewLeft() + 50; - y = viGetViewTop() + viGetViewHeight() - 60; - gdl = titleRenderTypewriterText(gdl, &x, &y, L_OPTIONS_006, g_TitleTimer - 100, &colourcomponent); // " prehistory" + x = vi_get_view_left() + 50; + y = vi_get_view_top() + vi_get_view_height() - 60; + gdl = title_render_typewriter_text(gdl, &x, &y, L_OPTIONS_006, g_TitleTimer - 100, &colourcomponent); // " prehistory" } } else { - gdl = titleRenderTypewriterText(gdl, &x, &y, L_OPTIONS_007, g_TitleTimer - 35, &colourcomponent); // "rare presents" + gdl = title_render_typewriter_text(gdl, &x, &y, L_OPTIONS_007, g_TitleTimer - 35, &colourcomponent); // "rare presents" } gdl = text0f153780(gdl); if (g_TitleTypewriterFinishing) { if (g_TitleAudioHandle == NULL) { - sndStart(var80095200, SFX_HUDMSG, &g_TitleAudioHandle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_HUDMSG, &g_TitleAudioHandle, -1, -1, -1, -1, -1); } } else { if (g_TitleAudioHandle) { @@ -1752,22 +1752,22 @@ Gfx *titleRenderRarePresents(Gfx *gdl) gdl = text0f153a34(gdl, x + 2, y, x + 12, y + 20, colour); } - gdl = bviewDrawIntroText(gdl); + gdl = bview_draw_intro_text(gdl); if (g_TitleTimer > TICKS(222)) { f32 alpha = ((g_TitleTimer - TICKS(222.0f)) / TICKS(78.0f)); u32 stack; - gdl = text0f153a34(gdl, viGetViewLeft(), viGetViewTop(), - viGetViewLeft() + viGetViewWidth(), - viGetViewTop() + viGetViewHeight(), + gdl = text0f153a34(gdl, vi_get_view_left(), vi_get_view_top(), + vi_get_view_left() + vi_get_view_width(), + vi_get_view_top() + vi_get_view_height(), 255.0f * alpha); } return gdl; } -void titleInitNintendoLogo(void) +void title_init_nintendo_logo(void) { u8 *nextaddr = var8009cca0; @@ -1782,20 +1782,20 @@ void titleInitNintendoLogo(void) { struct coord coord = {0, 0, 0}; - g_ModelStates[MODEL_NINTENDOLOGO].modeldef = modeldefLoad(g_ModelStates[MODEL_NINTENDOLOGO].fileid, nextaddr, TITLE_ALLOCSIZE, 0); + g_ModelStates[MODEL_NINTENDOLOGO].modeldef = modeldef_load(g_ModelStates[MODEL_NINTENDOLOGO].fileid, nextaddr, TITLE_ALLOCSIZE, 0); - modelAllocateRwData(g_ModelStates[MODEL_NINTENDOLOGO].modeldef); - g_TitleModel = modelmgrInstantiateModelWithoutAnim(g_ModelStates[MODEL_NINTENDOLOGO].modeldef); - modelSetScale(g_TitleModel, 1); - modelSetRootPosition(g_TitleModel, &coord); + model_allocate_rw_data(g_ModelStates[MODEL_NINTENDOLOGO].modeldef); + g_TitleModel = modelmgr_instantiate_model_without_anim(g_ModelStates[MODEL_NINTENDOLOGO].modeldef); + model_set_scale(g_TitleModel, 1); + model_set_root_position(g_TitleModel, &coord); var800624f4 = 1; joy00014810(false); } } -void titleExitNintendoLogo(void) +void title_exit_nintendo_logo(void) { - modelmgrFreeModel(g_TitleModel); + modelmgr_free_model(g_TitleModel); joy00014810(true); } @@ -1805,12 +1805,12 @@ void titleExitNintendoLogo(void) * logo, the Nintendo logo sequence will play at double speed until it exits at * the 140 tick mark. */ -void titleTickNintendoLogo(void) +void title_tick_nintendo_logo(void) { - viSetFovY(60); - viSetAspect(1.33333333f); - viSetZRange(100, 10000); - viSetUseZBuf(false); + vi_set_fov_y(60); + vi_set_aspect(1.33333333f); + vi_set_z_range(100, 10000); + vi_set_use_z_buf(false); g_TitleTimer += g_Vars.lvupdate60; @@ -1818,10 +1818,10 @@ void titleTickNintendoLogo(void) g_TitleTimer += g_Vars.lvupdate60; } - if (joyGetButtonsPressedThisFrame(0, 0xffff)) { + if (joy_get_buttons_pressed_this_frame(0, 0xffff)) { if (osResetType == RESETTYPE_WARM) { g_TitleButtonPressed = true; - titleSetNextMode(TITLEMODE_PDLOGO); + title_set_next_mode(TITLEMODE_PDLOGO); } else if (!g_TitleButtonPressed) { g_TitleFastForward = true; } @@ -1830,7 +1830,7 @@ void titleTickNintendoLogo(void) if (g_TitleFastForward && !g_TitleButtonPressed && g_TitleTimer > TICKS(140)) { g_TitleButtonPressed = true; g_TitleFastForward = false; - titleSetNextMode(TITLEMODE_PDLOGO); + title_set_next_mode(TITLEMODE_PDLOGO); } #if VERSION == VERSION_PAL_FINAL @@ -1839,11 +1839,11 @@ void titleTickNintendoLogo(void) if (g_TitleTimer > TICKS(240)) #endif { - titleSetNextMode(TITLEMODE_PDLOGO); + title_set_next_mode(TITLEMODE_PDLOGO); } } -Gfx *titleRenderNintendoLogo(Gfx *gdl) +Gfx *title_render_nintendo_logo(Gfx *gdl) { struct modelrenderdata renderdata = { NULL, true, 3 }; s32 i; @@ -1853,7 +1853,7 @@ Gfx *titleRenderNintendoLogo(Gfx *gdl) struct coord lightdir = {0, 0, 0}; s32 v0; - gdl = titleClear(gdl); + gdl = title_clear(gdl); gSPSetLights1(gdl++, g_TitleLightNintendoRare); @@ -1880,7 +1880,7 @@ Gfx *titleRenderNintendoLogo(Gfx *gdl) v0 = 0; } - titleSetLight(&g_TitleLightNintendoRare, v0, v0, v0, 0.0f, &lightdir); + title_set_light(&g_TitleLightNintendoRare, v0, v0, v0, 0.0f, &lightdir); { Mtxf spa8; @@ -1897,7 +1897,7 @@ Gfx *titleRenderNintendoLogo(Gfx *gdl) sp9c.y = (-cosf((1.0f - (fracdone / 1)) * M_PI) * 0.5f + .5f) * 0.35f; sp9c.z = 0.0f; - mtx4LoadRotation(&sp9c, &spa8); + mtx4_load_rotation(&sp9c, &spa8); mtx00015f88(fracdone * 0.2f + 1.0f, &spa8); mtx00016ae4(&sp108, @@ -1905,34 +1905,34 @@ Gfx *titleRenderNintendoLogo(Gfx *gdl) /* look */ 0.0f, 0.0f, 0.0f, /* up */ 0.0f, 1.0f, 0.0f); - mtx4MultMtx4InPlace(&sp108, &spa8); - mtx4Copy(&spa8, &sp108); + mtx4_mult_mtx4_in_place(&sp108, &spa8); + mtx4_copy(&spa8, &sp108); renderdata.unk00 = &sp108; - renderdata.unk10 = gfxAllocate(g_TitleModel->definition->nummatrices * sizeof(Mtxf)); - mtx4Copy(&sp108, renderdata.unk10); + renderdata.unk10 = gfx_allocate(g_TitleModel->definition->nummatrices * sizeof(Mtxf)); + mtx4_copy(&sp108, renderdata.unk10); g_TitleModel->matrices = renderdata.unk10; - modelUpdateRelations(g_TitleModel); + model_update_relations(g_TitleModel); renderdata.flags = 3; renderdata.zbufferenabled = false; renderdata.gdl = gdl; - modelRender(&renderdata, g_TitleModel); + model_render(&renderdata, g_TitleModel); gdl = renderdata.gdl; for (i = 0, j = 0; i < g_TitleModel->definition->nummatrices; i++, j += sizeof(Mtxf)) { - mtx4Copy((Mtxf *)((uintptr_t)g_TitleModel->matrices + j), &sp54); - mtxF2L(&sp54, g_TitleModel->matrices + i); + mtx4_copy((Mtxf *)((uintptr_t)g_TitleModel->matrices + j), &sp54); + mtx_f2l(&sp54, g_TitleModel->matrices + i); } } return gdl; } -void titleInitRareLogo(void) +void title_init_rare_logo(void) { u8 *nextaddr = var8009cca0; @@ -1941,16 +1941,16 @@ void titleInitRareLogo(void) { struct coord coord = {0, 0, 0}; - g_ModelStates[MODEL_RARELOGO].modeldef = modeldefLoad(g_ModelStates[MODEL_RARELOGO].fileid, nextaddr, TITLE_ALLOCSIZE, 0); + g_ModelStates[MODEL_RARELOGO].modeldef = modeldef_load(g_ModelStates[MODEL_RARELOGO].fileid, nextaddr, TITLE_ALLOCSIZE, 0); - modelAllocateRwData(g_ModelStates[MODEL_RARELOGO].modeldef); - g_TitleModel = modelmgrInstantiateModelWithoutAnim(g_ModelStates[MODEL_RARELOGO].modeldef); - modelSetScale(g_TitleModel, 1); - modelSetRootPosition(g_TitleModel, &coord); + model_allocate_rw_data(g_ModelStates[MODEL_RARELOGO].modeldef); + g_TitleModel = modelmgr_instantiate_model_without_anim(g_ModelStates[MODEL_RARELOGO].modeldef); + model_set_scale(g_TitleModel, 1); + model_set_root_position(g_TitleModel, &coord); var800624f4 = 1; - musicQueueStopAllEvent(); + music_queue_stop_all_event(); joy00014810(false); if (!g_IsTitleDemo && IS8MB()) { @@ -1959,9 +1959,9 @@ void titleInitRareLogo(void) } } -void titleExitRareLogo(void) +void title_exit_rare_logo(void) { - modelmgrFreeModel(g_TitleModel); + modelmgr_free_model(g_TitleModel); joy00014810(true); } @@ -1975,26 +1975,26 @@ void titleExitRareLogo(void) * early as possible, but if you press the button between 20-59 ticks it'll end * up taking longer than if you'd waited a second. */ -void titleTickRareLogo(void) +void title_tick_rare_logo(void) { - viSetFovY(60); - viSetAspect(1.33333333f); - viSetZRange(100, 10000); - viSetUseZBuf(false); + vi_set_fov_y(60); + vi_set_aspect(1.33333333f); + vi_set_z_range(100, 10000); + vi_set_use_z_buf(false); if (g_TitleTimer < 0) { g_TitleTimer++; } else { if (g_TitleTimer == 0) { - musicQueueStartEvent(TRACKTYPE_PRIMARY, MUSIC_TITLE1, 0, 0x7fff); + music_queue_start_event(TRACKTYPE_PRIMARY, MUSIC_TITLE1, 0, 0x7fff); } g_TitleTimer += g_Vars.lvupdate60; - if (joyGetButtonsPressedThisFrame(0, 0xffff)) { + if (joy_get_buttons_pressed_this_frame(0, 0xffff)) { if (osResetType == RESETTYPE_WARM) { g_TitleButtonPressed = true; - titleSetNextMode(TITLEMODE_PDLOGO); + title_set_next_mode(TITLEMODE_PDLOGO); } else if (!g_TitleButtonPressed) { if (g_TitleTimer < TICKS(60)) { g_TitleButtonPressed = true; @@ -2012,7 +2012,7 @@ void titleTickRareLogo(void) if (g_TitleTimer > TICKS(240) || g_TitleFastForward || (g_TitleButtonPressed && g_TitleTimer > TICKS(140))) { - titleSetNextMode(TITLEMODE_NINTENDOLOGO); + title_set_next_mode(TITLEMODE_NINTENDOLOGO); } } } @@ -2022,7 +2022,7 @@ f32 func0f019d0c(f32 arg0) return ((1.0f - arg0) + (1.0f - arg0)) * M_PI - DEG2RAD(90); } -Gfx *titleRenderRareLogo(Gfx *gdl) +Gfx *title_render_rare_logo(Gfx *gdl) { struct modelrenderdata renderdata = { NULL, true, 3 }; s32 i; @@ -2033,7 +2033,7 @@ Gfx *titleRenderRareLogo(Gfx *gdl) static f32 var80062920 = 0; - gdl = titleClear(gdl); + gdl = title_clear(gdl); if (g_TitleTimer < 0) { return gdl; @@ -2066,13 +2066,13 @@ Gfx *titleRenderRareLogo(Gfx *gdl) } if (fracdone < 0.2f) { - titleSetLight(&g_TitleLightNintendoRare, + title_set_light(&g_TitleLightNintendoRare, (s32)(255.0f * fracdone / 0.2f), (s32)(255.0f * fracdone / 0.2f), (s32)(255.0f * fracdone / 0.2f), 0, &lightdir); } else { - titleSetLight(&g_TitleLightNintendoRare, s0, s0, s0, 0, &lightdir); + title_set_light(&g_TitleLightNintendoRare, s0, s0, s0, 0, &lightdir); } s0 = s0 * 192 / 255; @@ -2081,9 +2081,9 @@ Gfx *titleRenderRareLogo(Gfx *gdl) lightdir.z = sinf(func0f019d0c(0.5f)); lightdir.x = cosf(func0f019d0c(0.5f)); guNormalize(&lightdir.x, &lightdir.y, &lightdir.z); - titleSetLight(&var800625a8, s0, s0, s0, 0, &lightdir); + title_set_light(&var800625a8, s0, s0, s0, 0, &lightdir); } else { - titleSetLight(&var800625a8, s0, s0, s0, 0, &lightdir); + title_set_light(&var800625a8, s0, s0, s0, 0, &lightdir); } var80062920 += g_Vars.lvupdate60f / 90; @@ -2094,7 +2094,7 @@ Gfx *titleRenderRareLogo(Gfx *gdl) spb4.y = RAD(90, 1.5707963705063f) * tmp; spb4.z = 0; - mtx4LoadRotation(&spb4, &spc0); + mtx4_load_rotation(&spb4, &spc0); mtx00015f88(1 + fracdone * 0.25f, &spc0); mtx00016ae4(&sp118, @@ -2102,30 +2102,30 @@ Gfx *titleRenderRareLogo(Gfx *gdl) /* look */ 0, 0, 0, /* up */ 0, 1, 0); - mtx4MultMtx4InPlace(&sp118, &spc0); - mtx4Copy(&spc0, &sp118); + mtx4_mult_mtx4_in_place(&sp118, &spc0); + mtx4_copy(&spc0, &sp118); renderdata.unk00 = &sp118; - renderdata.unk10 = gfxAllocate(g_TitleModel->definition->nummatrices * sizeof(Mtxf)); - mtx4Copy(&sp118, renderdata.unk10); + renderdata.unk10 = gfx_allocate(g_TitleModel->definition->nummatrices * sizeof(Mtxf)); + mtx4_copy(&sp118, renderdata.unk10); g_TitleModel->matrices = renderdata.unk10; - modelUpdateRelations(g_TitleModel); + model_update_relations(g_TitleModel); - rwdata = modelGetNodeRwData(g_TitleModel, modelGetPart(g_TitleModel->definition, MODELPART_RARELOGO_000B)); + rwdata = model_get_node_rw_data(g_TitleModel, model_get_part(g_TitleModel->definition, MODELPART_RARELOGO_000B)); if (rwdata) { rwdata->visible = false; } - rwdata = modelGetNodeRwData(g_TitleModel, modelGetPart(g_TitleModel->definition, MODELPART_RARELOGO_000D)); + rwdata = model_get_node_rw_data(g_TitleModel, model_get_part(g_TitleModel->definition, MODELPART_RARELOGO_000D)); if (rwdata) { rwdata->visible = true; } - rwdata = modelGetNodeRwData(g_TitleModel, modelGetPart(g_TitleModel->definition, MODELPART_RARELOGO_000C)); + rwdata = model_get_node_rw_data(g_TitleModel, model_get_part(g_TitleModel->definition, MODELPART_RARELOGO_000C)); if (rwdata) { rwdata->visible = false; @@ -2137,23 +2137,23 @@ Gfx *titleRenderRareLogo(Gfx *gdl) renderdata.zbufferenabled = 0; renderdata.gdl = gdl; - modelRender(&renderdata, g_TitleModel); + model_render(&renderdata, g_TitleModel); gdl = renderdata.gdl; - rwdata = modelGetNodeRwData(g_TitleModel, modelGetPart(g_TitleModel->definition, MODELPART_RARELOGO_000B)); + rwdata = model_get_node_rw_data(g_TitleModel, model_get_part(g_TitleModel->definition, MODELPART_RARELOGO_000B)); if (rwdata) { rwdata->visible = true; } - rwdata = modelGetNodeRwData(g_TitleModel, modelGetPart(g_TitleModel->definition, MODELPART_RARELOGO_000D)); + rwdata = model_get_node_rw_data(g_TitleModel, model_get_part(g_TitleModel->definition, MODELPART_RARELOGO_000D)); if (rwdata) { rwdata->visible = false; } - rwdata = modelGetNodeRwData(g_TitleModel, modelGetPart(g_TitleModel->definition, MODELPART_RARELOGO_000C)); + rwdata = model_get_node_rw_data(g_TitleModel, model_get_part(g_TitleModel->definition, MODELPART_RARELOGO_000C)); if (rwdata) { rwdata->visible = true; @@ -2165,14 +2165,14 @@ Gfx *titleRenderRareLogo(Gfx *gdl) renderdata.zbufferenabled = 0; renderdata.gdl = gdl; - modelRender(&renderdata, g_TitleModel); + model_render(&renderdata, g_TitleModel); gdl = renderdata.gdl; for (i = 0, j = 0; i < g_TitleModel->definition->nummatrices; i++, j += sizeof(Mtxf)) { Mtxf sp58; - mtx4Copy((Mtxf *)((uintptr_t)g_TitleModel->matrices + j), &sp58); - mtxF2L(&sp58, g_TitleModel->matrices + i); + mtx4_copy((Mtxf *)((uintptr_t)g_TitleModel->matrices + j), &sp58); + mtx_f2l(&sp58, g_TitleModel->matrices + i); } } @@ -2186,31 +2186,31 @@ u32 var80062930 = 0x00000001; u32 var80062934 = 0x00000001; u32 var80062938 = 0x00000000; -s32 getNumPlayers(void) +s32 get_num_players(void) { return g_NumPlayers; } -void setNumPlayers(s32 numplayers) +void set_num_players(s32 numplayers) { g_NumPlayers = numplayers; } -s32 playerGetTeam(s32 playernum) +s32 player_get_team(s32 playernum) { return g_PlayerConfigsArray[g_Vars.playerstats[playernum].mpindex].base.team; } -void playerSetTeam(s32 playernum, s32 team) +void player_set_team(s32 playernum, s32 team) { g_PlayerConfigsArray[g_Vars.playerstats[playernum].mpindex].base.team = team; } -void titleInitSkip(void) +void title_init_skip(void) { g_TitleNextStage = STAGE_CITRAINING; - setNumPlayers(1); + set_num_players(1); if (g_IsTitleDemo) { g_TitleNextStage = STAGE_DEFECTION; @@ -2219,44 +2219,44 @@ void titleInitSkip(void) if (IS4MB()) { g_TitleNextStage = STAGE_4MBMENU; - viSetAspect(PAL ? 1.7316017150879f : ((f32) FBALLOC_WIDTH_LO / (f32) FBALLOC_HEIGHT_LO)); - viSetSize(FBALLOC_WIDTH_LO, FBALLOC_HEIGHT_LO); - viSetBufSize(FBALLOC_WIDTH_LO, FBALLOC_HEIGHT_LO); - playermgrSetViewSize(FBALLOC_WIDTH_LO, FBALLOC_HEIGHT_LO); - viSetViewSize(FBALLOC_WIDTH_LO, FBALLOC_HEIGHT_LO); + vi_set_aspect(PAL ? 1.7316017150879f : ((f32) FBALLOC_WIDTH_LO / (f32) FBALLOC_HEIGHT_LO)); + vi_set_size(FBALLOC_WIDTH_LO, FBALLOC_HEIGHT_LO); + vi_set_buf_size(FBALLOC_WIDTH_LO, FBALLOC_HEIGHT_LO); + playermgr_set_view_size(FBALLOC_WIDTH_LO, FBALLOC_HEIGHT_LO); + vi_set_view_size(FBALLOC_WIDTH_LO, FBALLOC_HEIGHT_LO); } - mainChangeToStage(g_TitleNextStage); + main_change_to_stage(g_TitleNextStage); g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - lvSetDifficulty(DIFF_A); - viBlack(true); + lv_set_difficulty(DIFF_A); + vi_black(true); } -void titleInitNoController(void) +void title_init_no_controller(void) { g_TitleTimer = 0; } -void titleExitNoController(void) +void title_exit_no_controller(void) { // empty } -void titleTickNoController(void) +void title_tick_no_controller(void) { - viSetFovY(60); - viSetAspect(1.33333333f); - viSetZRange(100, 10000); - viSetUseZBuf(false); + vi_set_fov_y(60); + vi_set_aspect(1.33333333f); + vi_set_z_range(100, 10000); + vi_set_use_z_buf(false); g_TitleTimer += g_Vars.lvupdate60; } -Gfx *titleRenderNoController(Gfx *gdl) +Gfx *title_render_no_controller(Gfx *gdl) { s32 textheight; s32 textwidth; @@ -2272,9 +2272,9 @@ Gfx *titleRenderNoController(Gfx *gdl) if (1); // This was likely printed to console - joyGetConnectedControllers(); + joy_get_connected_controllers(); - gdl = titleClear(gdl); + gdl = title_clear(gdl); gdl = text0f153628(gdl); #if VERSION >= VERSION_JPN_FINAL @@ -2284,68 +2284,68 @@ Gfx *titleRenderNoController(Gfx *gdl) var80080108jf = 2; // Line 1 - text = langGet(L_MPWEAPONS_285); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_MPWEAPONS_285); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - textwidth; - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); y += 18; // Line 2 - text = langGet(L_MPWEAPONS_286); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_MPWEAPONS_286); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - textwidth; - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); y += 28; // Line 3 - text = langGet(L_MPWEAPONS_287); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_MPWEAPONS_287); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - textwidth; - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); y += 18; // Line 4 - text = langGet(L_MPWEAPONS_288); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_MPWEAPONS_288); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - textwidth; - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, vi_get_width(), vi_get_height(), 0, 0); y += 18; var8007fad0 = 1; var80080108jf = 1; #else // Line 1 - text = langGet(L_OPTIONS_071); // "- no controller in controller socket 1 -" - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_OPTIONS_071); // "- no controller in controller socket 1 -" + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - (textwidth >> 1); y = (g_TitleViewHeight / 2) - (textheight >> 1) - 12; if (g_Jpn) { - width = viGetWidth(); - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, 0x008000ff, width, viGetHeight(), 0, 0); + width = vi_get_width(); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, 0x008000ff, width, vi_get_height(), 0, 0); } else { - width = viGetWidth(); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, viGetHeight(), 0, 0); + width = vi_get_width(); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, vi_get_height(), 0, 0); } // Line 2 - text = langGet(L_OPTIONS_072); // "please power off and attach a controller" - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_OPTIONS_072); // "please power off and attach a controller" + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - (textwidth >> 1); y = (g_TitleViewHeight / 2) - (textheight >> 1) + 12; if (g_Jpn) { - width = viGetWidth(); - gdl = textRender(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, 0x008000ff, width, viGetHeight(), 0, 0); + width = vi_get_width(); + gdl = text_render(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, 0x008000ff, width, vi_get_height(), 0, 0); } else { - width = viGetWidth(); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, viGetHeight(), 0, 0); + width = vi_get_width(); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, vi_get_height(), 0, 0); } #endif @@ -2355,33 +2355,33 @@ Gfx *titleRenderNoController(Gfx *gdl) } #if VERSION >= VERSION_JPN_FINAL -void titleInitNoExpansion(void) +void title_init_no_expansion(void) { g_TitleTimer = 0; } #endif #if VERSION >= VERSION_JPN_FINAL -void titleExitNoExpansion(void) +void title_exit_no_expansion(void) { // empty } #endif #if VERSION >= VERSION_JPN_FINAL -void titleTickNoExpansion(void) +void title_tick_no_expansion(void) { - viSetFovY(60); - viSetAspect(1.33333333f); - viSetZRange(100, 10000); - viSetUseZBuf(0); + vi_set_fov_y(60); + vi_set_aspect(1.33333333f); + vi_set_z_range(100, 10000); + vi_set_use_z_buf(0); g_TitleTimer += g_Vars.lvupdate60; } #endif #if VERSION >= VERSION_JPN_FINAL -Gfx *titleRenderNoExpansion(Gfx *gdl) +Gfx *title_render_no_expansion(Gfx *gdl) { s32 textheight; s32 textwidth; @@ -2396,9 +2396,9 @@ Gfx *titleRenderNoExpansion(Gfx *gdl) if (1); if (1); - joyGetConnectedControllers(); + joy_get_connected_controllers(); - gdl = titleClear(gdl); + gdl = title_clear(gdl); gdl = text0f153628(gdl); x = 50; @@ -2407,25 +2407,25 @@ Gfx *titleRenderNoExpansion(Gfx *gdl) var8007fad0 = 2; var80080108jf = 2; - text = langGet(L_MPWEAPONS_281); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_MPWEAPONS_281); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - textwidth; - width = viGetWidth(); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, viGetHeight(), 0, 0); + width = vi_get_width(); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, vi_get_height(), 0, 0); y += 18; - text = langGet(L_MPWEAPONS_282); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_MPWEAPONS_282); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - textwidth; - width = viGetWidth(); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, viGetHeight(), 0, 0); + width = vi_get_width(); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, vi_get_height(), 0, 0); y += 18; - text = langGet(L_MPWEAPONS_284); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); + text = lang_get(L_MPWEAPONS_284); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0); x = 288 - textwidth; - width = viGetWidth(); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, viGetHeight(), 0, 0); + width = vi_get_width(); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicLg, g_FontHandelGothicLg, 0xffffffff, width, vi_get_height(), 0, 0); y += 18; var8007fad0 = 1; @@ -2437,31 +2437,31 @@ Gfx *titleRenderNoExpansion(Gfx *gdl) } #endif -void titleSetNextMode(s32 mode) +void title_set_next_mode(s32 mode) { if (g_TitleDelayedMode != mode) { g_TitleNextMode = mode; } } -s32 titleGetMode(void) +s32 title_get_mode(void) { return g_TitleMode; } -void titleTick(void) +void title_tick(void) { #if PAL - viSetAspect(576.0f / g_TitleViewHeight * 1.1904761791229f); + vi_set_aspect(576.0f / g_TitleViewHeight * 1.1904761791229f); #else - viSetAspect(576.0f / g_TitleViewHeight); + vi_set_aspect(576.0f / g_TitleViewHeight); #endif - viSetSize(576, g_TitleViewHeight); - viSetBufSize(576, g_TitleViewHeight); - playermgrSetViewSize(576, g_TitleViewHeight); - viSetViewSize(576, g_TitleViewHeight); - playermgrSetViewPosition(0, 0); - viSetViewPosition(0, 0); + vi_set_size(576, g_TitleViewHeight); + vi_set_buf_size(576, g_TitleViewHeight); + playermgr_set_view_size(576, g_TitleViewHeight); + vi_set_view_size(576, g_TitleViewHeight); + playermgr_set_view_position(0, 0); + vi_set_view_position(0, 0); // If there's a new mode to transition to, schedule it to apply in 3 ticks // time and call the exit function for the current mode. @@ -2471,32 +2471,32 @@ void titleTick(void) switch (g_TitleMode) { case TITLEMODE_LEGAL: - titleExitLegal(); + title_exit_legal(); break; case TITLEMODE_CHECKCONTROLLERS: - titleExitCheckControllers(); + title_exit_check_controllers(); break; case TITLEMODE_PDLOGO: - titleExitPdLogo(); + title_exit_pd_logo(); break; case TITLEMODE_NINTENDOLOGO: - titleExitNintendoLogo(); + title_exit_nintendo_logo(); break; case TITLEMODE_RARELOGO: - titleExitRareLogo(); + title_exit_rare_logo(); break; case TITLEMODE_NOCONTROLLER: - titleExitNoController(); + title_exit_no_controller(); break; #if VERSION >= VERSION_JPN_FINAL case TITLEMODE_NOEXPANSION: - titleExitNoExpansion(); + title_exit_no_expansion(); break; #endif } if (g_TitleMode != TITLEMODE_CHECKCONTROLLERS) { - viBlack(true); + vi_black(true); } g_TitleNextMode = -1; @@ -2524,76 +2524,76 @@ void titleTick(void) switch (g_TitleMode) { case TITLEMODE_LEGAL: - titleInitLegal(); + title_init_legal(); break; case TITLEMODE_CHECKCONTROLLERS: - titleInitCheckControllers(); + title_init_check_controllers(); break; case TITLEMODE_PDLOGO: - titleInitPdLogo(); + title_init_pd_logo(); break; case TITLEMODE_NINTENDOLOGO: - titleInitNintendoLogo(); + title_init_nintendo_logo(); break; case TITLEMODE_RARELOGO: - titleInitRareLogo(); + title_init_rare_logo(); break; case TITLEMODE_SKIP: - titleInitSkip(); + title_init_skip(); break; case TITLEMODE_NOCONTROLLER: - titleInitNoController(); + title_init_no_controller(); break; #if VERSION >= VERSION_JPN_FINAL case TITLEMODE_NOEXPANSION: - titleInitNoExpansion(); + title_init_no_expansion(); break; #endif } if (g_TitleMode != TITLEMODE_CHECKCONTROLLERS && g_TitleMode != TITLEMODE_SKIP) { - viBlack(false); + vi_black(false); } } // Run the current mode's tick function switch (g_TitleMode) { case TITLEMODE_LEGAL: - titleTickLegal(); + title_tick_legal(); break; case TITLEMODE_CHECKCONTROLLERS: - titleTickCheckControllers(); + title_tick_check_controllers(); break; case TITLEMODE_PDLOGO: - titleTickPdLogo(); + title_tick_pd_logo(); break; case TITLEMODE_NINTENDOLOGO: - titleTickNintendoLogo(); + title_tick_nintendo_logo(); break; case TITLEMODE_RARELOGO: - titleTickRareLogo(); + title_tick_rare_logo(); break; case TITLEMODE_NOCONTROLLER: - titleTickNoController(); + title_tick_no_controller(); break; #if VERSION >= VERSION_JPN_FINAL case TITLEMODE_NOEXPANSION: - titleTickNoExpansion(); + title_tick_no_expansion(); break; #endif case TITLEMODE_SKIP: - viSetUseZBuf(false); - titleSetNextMode(TITLEMODE_RARELOGO); + vi_set_use_z_buf(false); + title_set_next_mode(TITLEMODE_RARELOGO); break; } } -bool titleIsChangingMode(void) +bool title_is_changing_mode(void) { return g_TitleNextMode >= 0; } -bool titleIsKeepingMode(void) +bool title_is_keeping_mode(void) { if (g_TitleNextMode >= 0) { return false; @@ -2606,35 +2606,35 @@ bool titleIsKeepingMode(void) return true; } -void titleExit(void) +void title_exit(void) { switch (g_TitleMode) { case TITLEMODE_LEGAL: - titleExitLegal(); + title_exit_legal(); break; case TITLEMODE_CHECKCONTROLLERS: - titleExitCheckControllers(); + title_exit_check_controllers(); break; case TITLEMODE_PDLOGO: - titleExitPdLogo(); + title_exit_pd_logo(); break; case TITLEMODE_NINTENDOLOGO: - titleExitNintendoLogo(); + title_exit_nintendo_logo(); break; case TITLEMODE_RARELOGO: - titleExitRareLogo(); + title_exit_rare_logo(); break; case TITLEMODE_NOCONTROLLER: - titleExitNoController(); + title_exit_no_controller(); break; #if VERSION >= VERSION_JPN_FINAL case TITLEMODE_NOEXPANSION: - titleExitNoExpansion(); + title_exit_no_expansion(); break; #endif case TITLEMODE_RAREPRESENTS1: case TITLEMODE_RAREPRESENTS2: - titleExitRarePresents(); + title_exit_rare_presents(); break; } @@ -2642,28 +2642,28 @@ void titleExit(void) g_TitleMode = -1; } -void titleInitFromAiCmd(u32 value) +void title_init_from_ai_cmd(u32 value) { switch (value) { case TITLEAIMODE_RAREPRESENTS1: g_TitleMode = TITLEMODE_RAREPRESENTS1; - titleInitRarePresents(); + title_init_rare_presents(); break; case TITLEAIMODE_RARELOGO: g_TitleMode = TITLEMODE_RARELOGO; - titleInitRareLogo(); + title_init_rare_logo(); break; case TITLEAIMODE_RAREPRESENTS2: g_TitleMode = TITLEMODE_RAREPRESENTS2; - titleInitRarePresents(); + title_init_rare_presents(); break; case TITLEAIMODE_NINTENDOLOGO: g_TitleMode = TITLEMODE_NINTENDOLOGO; - titleInitNintendoLogo(); + title_init_nintendo_logo(); break; case TITLEAIMODE_PDLOGO: g_TitleMode = TITLEMODE_PDLOGO; - titleInitPdLogo(); + title_init_pd_logo(); break; } @@ -2672,7 +2672,7 @@ void titleInitFromAiCmd(u32 value) bool func0f01ad5c(void) { - if (!titleIsKeepingMode()) { + if (!title_is_keeping_mode()) { return false; } @@ -2689,75 +2689,75 @@ bool func0f01ad5c(void) void func0f01adb8(void) { - viSetMode(VIMODE_HI); - viSetSize(576, g_TitleViewHeight); - viSetBufSize(576, g_TitleViewHeight); - playermgrSetViewSize(576, g_TitleViewHeight); - viSetViewSize(576, g_TitleViewHeight); - playermgrSetViewPosition(0, 0); - viSetViewPosition(0, 0); + vi_set_mode(VIMODE_HI); + vi_set_size(576, g_TitleViewHeight); + vi_set_buf_size(576, g_TitleViewHeight); + playermgr_set_view_size(576, g_TitleViewHeight); + vi_set_view_size(576, g_TitleViewHeight); + playermgr_set_view_position(0, 0); + vi_set_view_position(0, 0); } -void titleTickOld(void) +void title_tick_old(void) { - if (titleIsKeepingMode()) { + if (title_is_keeping_mode()) { joy00014810(false); if (g_TitleDelayedTimer == 0) { switch (g_TitleMode) { case TITLEMODE_LEGAL: - titleTickLegal(); + title_tick_legal(); break; case TITLEMODE_CHECKCONTROLLERS: - titleTickCheckControllers(); + title_tick_check_controllers(); break; case TITLEMODE_PDLOGO: - titleTickPdLogo(); + title_tick_pd_logo(); break; case TITLEMODE_NINTENDOLOGO: - titleTickNintendoLogo(); + title_tick_nintendo_logo(); break; case TITLEMODE_RAREPRESENTS1: case TITLEMODE_RAREPRESENTS2: - titleTickRarePresents(); + title_tick_rare_presents(); break; case TITLEMODE_RARELOGO: - titleTickRareLogo(); + title_tick_rare_logo(); break; } } } } -Gfx *titleRender(Gfx *gdl) +Gfx *title_render(Gfx *gdl) { if (g_TitleDelayedTimer == 0) { switch (g_TitleMode) { case TITLEMODE_LEGAL: - gdl = titleRenderLegal(gdl); + gdl = title_render_legal(gdl); break; case TITLEMODE_CHECKCONTROLLERS: - gdl = titleRenderCheckControllers(gdl); + gdl = title_render_check_controllers(gdl); break; case TITLEMODE_PDLOGO: - gdl = titleRenderPdLogo(gdl); + gdl = title_render_pd_logo(gdl); break; case TITLEMODE_NINTENDOLOGO: - gdl = titleRenderNintendoLogo(gdl); + gdl = title_render_nintendo_logo(gdl); break; case TITLEMODE_RAREPRESENTS1: case TITLEMODE_RAREPRESENTS2: - gdl = titleRenderRarePresents(gdl); + gdl = title_render_rare_presents(gdl); break; case TITLEMODE_RARELOGO: - gdl = titleRenderRareLogo(gdl); + gdl = title_render_rare_logo(gdl); break; case TITLEMODE_NOCONTROLLER: - gdl = titleRenderNoController(gdl); + gdl = title_render_no_controller(gdl); break; #if VERSION >= VERSION_JPN_FINAL case TITLEMODE_NOEXPANSION: - gdl = titleRenderNoExpansion(gdl); + gdl = title_render_no_expansion(gdl); break; #endif } diff --git a/src/game/titleclear.c b/src/game/titleclear.c index 5d8e89e75..5d64d5196 100644 --- a/src/game/titleclear.c +++ b/src/game/titleclear.c @@ -5,12 +5,12 @@ #include "data.h" #include "types.h" -Gfx *titleClear(Gfx *gdl) +Gfx *title_clear(Gfx *gdl) { gDPSetCycleType(gdl++, G_CYC_FILL); - gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetWidth(), osVirtualToPhysical((void *)viGetBackBuffer())); + gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, vi_get_width(), osVirtualToPhysical((void *)vi_get_back_buffer())); gDPSetFillColor(gdl++, 0x00010001); - gDPFillRectangle(gdl++, 0, 0, viGetWidth() - 1, viGetHeight() - 1); + gDPFillRectangle(gdl++, 0, 0, vi_get_width() - 1, vi_get_height() - 1); return gdl; } diff --git a/src/game/titleinit.c b/src/game/titleinit.c index 1d26d2769..497894ea1 100644 --- a/src/game/titleinit.c +++ b/src/game/titleinit.c @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void titleInit(void) +void title_init(void) { g_TitleMode = -1; g_TitleNextMode = TITLEMODE_LEGAL; diff --git a/src/game/titlereset.c b/src/game/titlereset.c index 1144943ec..81bde5b44 100644 --- a/src/game/titlereset.c +++ b/src/game/titlereset.c @@ -7,7 +7,7 @@ #include "data.h" #include "types.h" -void titleReset(void) +void title_reset(void) { g_TitleMode = -1; var800624d4 = 0; @@ -21,7 +21,7 @@ void titleReset(void) g_TitleNextMode = TITLEMODE_SKIP; } - var8009cca0 = mempAlloc(TITLE_ALLOCSIZE, MEMPOOL_STAGE); + var8009cca0 = memp_alloc(TITLE_ALLOCSIZE, MEMPOOL_STAGE); - getitleReset(); + getitle_reset(); } diff --git a/src/game/training.c b/src/game/training.c index 48986de8f..8ca02ce8b 100644 --- a/src/game/training.c +++ b/src/game/training.c @@ -61,17 +61,17 @@ u16 g_FrPads[] = { 0x00f2, 0x00f1, 0x00f0, 0x00ef, 0x00ee, 0x00ed, 0x00ec, }; -bool ciIsTourDone(void) +bool ci_is_tour_done(void) { - return gamefileHasFlag(GAMEFILEFLAG_CI_TOUR_DONE); + return gamefile_has_flag(GAMEFILEFLAG_CI_TOUR_DONE); } -u8 ciGetFiringRangeScore(s32 weaponindex) +u8 ci_get_firing_range_score(s32 weaponindex) { // Data at firingrangescores is a u8 array where each score uses 2 bits #if VERSION == VERSION_JPN_FINAL - if (weaponindex == frGetWeaponIndexByWeapon(WEAPON_COMBATKNIFE)) { + if (weaponindex == fr_get_weapon_index_by_weapon(WEAPON_COMBATKNIFE)) { // The knife doesn't exist in the JPN version. // Treat it as completed so unlockables still work. return 3; @@ -81,9 +81,9 @@ u8 ciGetFiringRangeScore(s32 weaponindex) return (g_GameFile.firingrangescores[weaponindex >> 2] >> (weaponindex % 4) * 2) & 3; } -void frSaveScoreIfBest(s32 weaponindex, s32 difficulty) +void fr_save_score_if_best(s32 weaponindex, s32 difficulty) { - if (ciGetFiringRangeScore(weaponindex) < difficulty) { + if (ci_get_firing_range_score(weaponindex) < difficulty) { u32 byteindex = weaponindex >> 2; u32 shiftamount = (weaponindex % 4) * 2; u32 value = g_GameFile.firingrangescores[byteindex]; @@ -146,7 +146,7 @@ s32 func0f19ca78(u32 weaponnum) return -1; } -u8 frIsWeaponFound(s32 weaponnum) +u8 fr_is_weapon_found(s32 weaponnum) { u32 byteindex; @@ -167,7 +167,7 @@ u8 frIsWeaponFound(s32 weaponnum) #endif } -void frSetWeaponFound(s32 weaponnum) +void fr_set_weapon_found(s32 weaponnum) { if (weaponnum < (s32)sizeof(g_GameFile.weaponsfound) * 8) { u32 byteindex = weaponnum >> 3; @@ -179,7 +179,7 @@ void frSetWeaponFound(s32 weaponnum) } } -s32 ciIsStageComplete(s32 stageindex) +s32 ci_is_stage_complete(s32 stageindex) { return g_GameFile.besttimes[stageindex][0] || g_GameFile.besttimes[stageindex][1] @@ -192,18 +192,18 @@ bool func0f19cbcc(s32 weapon) return false; } - if (weapon == WEAPON_XRAYSCANNER && ciIsStageComplete(SOLOSTAGEINDEX_INFILTRATION)) { + if (weapon == WEAPON_XRAYSCANNER && ci_is_stage_complete(SOLOSTAGEINDEX_INFILTRATION)) { return true; } - if (weapon == WEAPON_CLOAKINGDEVICE && ciIsStageComplete(SOLOSTAGEINDEX_CHICAGO)) { + if (weapon == WEAPON_CLOAKINGDEVICE && ci_is_stage_complete(SOLOSTAGEINDEX_CHICAGO)) { return true; } - return frIsWeaponFound(weapon); + return fr_is_weapon_found(weapon); } -bool frIsWeaponAvailable(s32 weapon) +bool fr_is_weapon_available(s32 weapon) { #if VERSION == VERSION_JPN_FINAL if (weapon == WEAPON_COMBATKNIFE) { @@ -224,16 +224,16 @@ bool frIsWeaponAvailable(s32 weapon) #if VERSION < VERSION_NTSC_1_0 #ifdef DEBUG - if (debugIsAllTrainingEnabled() && weapon <= WEAPON_XRAYSCANNER) { + if (debug_is_all_training_enabled() && weapon <= WEAPON_XRAYSCANNER) { return true; } #endif #endif - return frIsWeaponFound(weapon); + return fr_is_weapon_found(weapon); } -u32 frGetWeaponIndexByWeapon(u32 weaponnum) +u32 fr_get_weapon_index_by_weapon(u32 weaponnum) { switch (weaponnum) { case WEAPON_FALCON2: return 0; @@ -273,7 +273,7 @@ u32 frGetWeaponIndexByWeapon(u32 weaponnum) return 0; } -u32 frGetWeaponScriptIndex(u32 weaponnum) +u32 fr_get_weapon_script_index(u32 weaponnum) { switch (weaponnum) { case WEAPON_FALCON2: return 1; @@ -313,78 +313,78 @@ u32 frGetWeaponScriptIndex(u32 weaponnum) return 0; } -s32 frIsClassicWeaponUnlocked(u32 weapon) +s32 fr_is_classic_weapon_unlocked(u32 weapon) { switch (weapon) { case WEAPON_PP9I: - return ciGetFiringRangeScore(0) == 3 - && ciGetFiringRangeScore(1) == 3 - && ciGetFiringRangeScore(2) == 3; + return ci_get_firing_range_score(0) == 3 + && ci_get_firing_range_score(1) == 3 + && ci_get_firing_range_score(2) == 3; case WEAPON_CC13: - return ciGetFiringRangeScore(3) == 3 - && ciGetFiringRangeScore(4) == 3 - && ciGetFiringRangeScore(5) == 3 - && ciGetFiringRangeScore(6) == 3 - && ciGetFiringRangeScore(7) == 3; + return ci_get_firing_range_score(3) == 3 + && ci_get_firing_range_score(4) == 3 + && ci_get_firing_range_score(5) == 3 + && ci_get_firing_range_score(6) == 3 + && ci_get_firing_range_score(7) == 3; case WEAPON_KL01313: - return ciGetFiringRangeScore(8) == 3 - && ciGetFiringRangeScore(9) == 3 - && ciGetFiringRangeScore(10) == 3 - && ciGetFiringRangeScore(11) == 3; + return ci_get_firing_range_score(8) == 3 + && ci_get_firing_range_score(9) == 3 + && ci_get_firing_range_score(10) == 3 + && ci_get_firing_range_score(11) == 3; case WEAPON_KF7SPECIAL: - return ciGetFiringRangeScore(12) == 3 - && ciGetFiringRangeScore(13) == 3 - && ciGetFiringRangeScore(14) == 3 - && ciGetFiringRangeScore(15) == 3 - && ciGetFiringRangeScore(16) == 3; + return ci_get_firing_range_score(12) == 3 + && ci_get_firing_range_score(13) == 3 + && ci_get_firing_range_score(14) == 3 + && ci_get_firing_range_score(15) == 3 + && ci_get_firing_range_score(16) == 3; case WEAPON_ZZT: - return ciGetFiringRangeScore(17) == 3 - && ciGetFiringRangeScore(18) == 3 - && ciGetFiringRangeScore(24) == 3 - && ciGetFiringRangeScore(25) == 3; + return ci_get_firing_range_score(17) == 3 + && ci_get_firing_range_score(18) == 3 + && ci_get_firing_range_score(24) == 3 + && ci_get_firing_range_score(25) == 3; case WEAPON_DMC: #if VERSION >= VERSION_NTSC_1_0 - return ciGetFiringRangeScore(29) == 3 - && ciGetFiringRangeScore(30) == 3 - && ciGetFiringRangeScore(31) == 3; + return ci_get_firing_range_score(29) == 3 + && ci_get_firing_range_score(30) == 3 + && ci_get_firing_range_score(31) == 3; #else - return ciGetFiringRangeScore(29) == 3 - && ciGetFiringRangeScore(30) == 3 - && ciGetFiringRangeScore(32) == 3 - && ciGetFiringRangeScore(33) == 3 - && ciGetFiringRangeScore(34) == 3; + return ci_get_firing_range_score(29) == 3 + && ci_get_firing_range_score(30) == 3 + && ci_get_firing_range_score(32) == 3 + && ci_get_firing_range_score(33) == 3 + && ci_get_firing_range_score(34) == 3; #endif case WEAPON_AR53: - return ciGetFiringRangeScore(19) == 3 - && ciGetFiringRangeScore(20) == 3 - && ciGetFiringRangeScore(26) == 3 - && ciGetFiringRangeScore(28) == 3; + return ci_get_firing_range_score(19) == 3 + && ci_get_firing_range_score(20) == 3 + && ci_get_firing_range_score(26) == 3 + && ci_get_firing_range_score(28) == 3; case WEAPON_RCP45: - return ciGetFiringRangeScore(21) == 3 - && ciGetFiringRangeScore(22) == 3 - && ciGetFiringRangeScore(23) == 3; + return ci_get_firing_range_score(21) == 3 + && ci_get_firing_range_score(22) == 3 + && ci_get_firing_range_score(23) == 3; } return false; } -s32 frGetSlot(void) +s32 fr_get_slot(void) { return g_FrData.slot; } -void frSetSlot(s32 slot) +void fr_set_slot(s32 slot) { g_FrData.slot = slot; } -u32 frGetWeaponBySlot(s32 slot) +u32 fr_get_weapon_by_slot(s32 slot) { s32 index = -1; s32 weapon; for (weapon = WEAPON_NONE; weapon <= WEAPON_HORIZONSCANNER; weapon++) { - if (frIsWeaponAvailable(weapon)) { + if (fr_is_weapon_available(weapon)) { index++; } @@ -396,13 +396,13 @@ u32 frGetWeaponBySlot(s32 slot) return WEAPON_UNARMED; } -s32 frGetNumWeaponsAvailable(void) +s32 fr_get_num_weapons_available(void) { s32 count = 0; s32 i; for (i = WEAPON_UNARMED; i <= WEAPON_HORIZONSCANNER; i++) { - if (frIsWeaponAvailable(i)) { + if (fr_is_weapon_available(i)) { count++; } } @@ -410,43 +410,43 @@ s32 frGetNumWeaponsAvailable(void) return count; } -void frInitLighting(void) +void fr_init_lighting(void) { if (g_FrData.donelighting == false) { s32 roomnum; for (roomnum = ROOM_DISH_0007; roomnum <= ROOM_DISH_0009; roomnum++) { - roomSetLightOp(roomnum, LIGHTOP_TRANSITION, 50, 100, TICKS(32)); + room_set_light_op(roomnum, LIGHTOP_TRANSITION, 50, 100, TICKS(32)); } - roomSetLightOp(ROOM_DISH_FIRINGRANGE, LIGHTOP_TRANSITION, 25, 100, TICKS(32)); + room_set_light_op(ROOM_DISH_FIRINGRANGE, LIGHTOP_TRANSITION, 25, 100, TICKS(32)); g_FrData.donelighting = true; - sndStart(var80095200, SFX_FR_LIGHTSON, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_FR_LIGHTSON, NULL, -1, -1, -1, -1, -1); } - chrSetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); + chr_set_stage_flag(NULL, STAGEFLAG_CI_IN_TRAINING); } -void frRestoreLighting(void) +void fr_restore_lighting(void) { if (g_FrData.donelighting == true) { s32 roomnum; for (roomnum = ROOM_DISH_0007; roomnum <= ROOM_DISH_0009; roomnum++) { - roomSetLightOp(roomnum, LIGHTOP_TRANSITION, 100, 50, TICKS(8)); + room_set_light_op(roomnum, LIGHTOP_TRANSITION, 100, 50, TICKS(8)); } - roomSetLightOp(ROOM_DISH_FIRINGRANGE, LIGHTOP_TRANSITION, 100, 25, TICKS(8)); + room_set_light_op(ROOM_DISH_FIRINGRANGE, LIGHTOP_TRANSITION, 100, 25, TICKS(8)); g_FrData.donelighting = false; - sndStart(var80095200, SFX_FR_LIGHTSOFF, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_FR_LIGHTSOFF, NULL, -1, -1, -1, -1, -1); } } -void frReset(void) +void fr_reset(void) { s32 i; @@ -476,18 +476,18 @@ void frReset(void) #endif } -void *frLoadRomData(u32 len) +void *fr_load_rom_data(u32 len) { - g_FrRomData = mempAlloc(ALIGN16(len), MEMPOOL_STAGE); + g_FrRomData = memp_alloc(ALIGN16(len), MEMPOOL_STAGE); if (g_FrRomData) { - return dmaExecWithAutoAlign(g_FrRomData, (romptr_t) &_firingrangeSegmentRomStart, len); + return dma_exec_with_auto_align(g_FrRomData, (romptr_t) &_firingrangeSegmentRomStart, len); } return NULL; } -void frSetDifficulty(s32 difficulty) +void fr_set_difficulty(s32 difficulty) { if (difficulty < FRDIFFICULTY_BRONZE) { difficulty = FRDIFFICULTY_BRONZE; @@ -500,19 +500,19 @@ void frSetDifficulty(s32 difficulty) g_FrData.difficulty = difficulty; } -u32 frGetDifficulty(void) +u32 fr_get_difficulty(void) { return g_FrData.difficulty; } -void frInitDefaults(void) +void fr_init_defaults(void) { s32 i; struct pad pad; g_FrNumSounds = 0; - padUnpack(g_FrPads[0], PADFIELD_POS, &pad); + pad_unpack(g_FrPads[0], PADFIELD_POS, &pad); g_FrData.maxactivetargets = 0; g_FrData.goalscore = 0; @@ -552,8 +552,8 @@ void frInitDefaults(void) g_FrData.targets[i].invincibletimer = 0; g_FrData.targets[i].frpadnum = -1; - wallhitsFreeByProp(g_FrData.targets[i].prop, 0); - wallhitsFreeByProp(g_FrData.targets[i].prop, 1); + wallhits_free_by_prop(g_FrData.targets[i].prop, 0); + wallhits_free_by_prop(g_FrData.targets[i].prop, 1); } g_FrData.timetaken = TICKS(-240); @@ -580,12 +580,12 @@ void frInitDefaults(void) g_FrData.ammoextra = -1; } -struct frdata *frGetData(void) +struct frdata *fr_get_data(void) { return &g_FrData; } -u32 frResolveFrPad(u32 arg0) +u32 fr_resolve_fr_pad(u32 arg0) { switch (arg0) { case 31: return random() % 9 + 4; // 4 - 12 @@ -597,7 +597,7 @@ u32 frResolveFrPad(u32 arg0) return g_FrData.padindexoffset + arg0; } -bool frIsDifficulty(u32 flags) +bool fr_is_difficulty(u32 flags) { if (g_FrData.difficulty == FRDIFFICULTY_BRONZE) { if ((flags & FRTARGETFLAG_BRONZE) == 0) { @@ -616,7 +616,7 @@ bool frIsDifficulty(u32 flags) return true; } -void frExecuteWeaponScript(s32 scriptindex) +void fr_execute_weapon_script(s32 scriptindex) { s32 offset = 0; @@ -638,12 +638,12 @@ void frExecuteWeaponScript(s32 scriptindex) offset += 2; break; case FRCMD_ADDTARGET: - if (!frIsDifficulty(script[offset + 4])) { + if (!fr_is_difficulty(script[offset + 4])) { offset += 5; break; } if (g_FrData.numtargets < ARRAYCOUNT(g_FrData.targets)) { - g_FrData.targets[g_FrData.numtargets].frpadindex = frResolveFrPad(script[offset + 1]); + g_FrData.targets[g_FrData.numtargets].frpadindex = fr_resolve_fr_pad(script[offset + 1]); g_FrData.targets[g_FrData.numtargets].scriptindex = script[offset + 2]; g_FrData.targets[g_FrData.numtargets].maxdamage = script[offset + 3]; g_FrData.targets[g_FrData.numtargets].inuse = true; @@ -685,7 +685,7 @@ void frExecuteWeaponScript(s32 scriptindex) offset += 4; break; case FRCMD_SETAMMOLIMIT: - capacity = bgunGetCapacityByAmmotype(bgunGetAmmoTypeForWeapon(frGetWeaponBySlot(g_FrData.slot), 0)); + capacity = bgun_get_capacity_by_ammotype(bgun_get_ammo_type_for_weapon(fr_get_weapon_by_slot(g_FrData.slot), 0)); g_FrData.ammolimit = script[g_FrData.difficulty + offset + 1]; if (g_FrData.ammolimit != 255) { @@ -699,7 +699,7 @@ void frExecuteWeaponScript(s32 scriptindex) offset += 4; break; case FRCMD_SETGRENADELIMIT: - capacity = bgunGetCapacityByAmmotype(AMMOTYPE_DEVASTATOR); + capacity = bgun_get_capacity_by_ammotype(AMMOTYPE_DEVASTATOR); g_FrData.sdgrenadelimit = script[g_FrData.difficulty + offset + 1]; if (g_FrData.sdgrenadelimit != 255) { @@ -770,7 +770,7 @@ void frExecuteWeaponScript(s32 scriptindex) } } -void frSetTargetProps(void) +void fr_set_target_props(void) { s32 i; u32 targets[] = { @@ -779,7 +779,7 @@ void frSetTargetProps(void) }; for (i = 0; i < ARRAYCOUNT(targets); i++) { - struct defaultobj *obj = objFindByTagId(targets[i]); + struct defaultobj *obj = obj_find_by_tag_id(targets[i]); if (obj) { g_FrData.targets[i].prop = obj->prop; @@ -790,7 +790,7 @@ void frSetTargetProps(void) s32 g_FrWeaponNum = WEAPON_UNARMED; -bool frTargetIsAtScriptStart(s32 targetnum) +bool fr_target_is_at_script_start(s32 targetnum) { return g_FrData.targets[targetnum].scriptoffset == 0; } @@ -806,14 +806,14 @@ bool frTargetIsAtScriptStart(s32 targetnum) * 7 => "ZOOM\n Hold R Button to enter Zoom mode.\n" * 8 => "FAST FIRE\n Press Z Button quickly to fire faster.\n" */ -char *frGetInstructionalText(u32 index) +char *fr_get_instructional_text(u32 index) { u16 textid = (u16)(g_FrRomData[index * 2] << 8) | g_FrRomData[index * 2 + 1]; - return langGet(textid); + return lang_get(textid); } -void frExecuteHelpScript(void) +void fr_execute_help_script(void) { if (!g_FrData.helpscriptenabled || g_Vars.lvupdate240 == 0) { return; @@ -832,7 +832,7 @@ void frExecuteHelpScript(void) g_FrData.helpscriptenabled = false; break; case FRCMD_HUDMSG: - hudmsgCreate(frGetInstructionalText(script[offset + 1]), HUDMSGTYPE_TRAINING); + hudmsg_create(fr_get_instructional_text(script[offset + 1]), HUDMSGTYPE_TRAINING); g_FrData.helpscriptoffset += 2; break; case FRCMD_HELPWAITSECONDS: @@ -858,7 +858,7 @@ void frExecuteHelpScript(void) } } -bool frExecuteTargetScript(s32 targetnum) +bool fr_execute_target_script(s32 targetnum) { if (g_FrData.targets[targetnum].inuse) { s32 index = FRSCRIPTINDEX_TARGETS + g_FrData.targets[targetnum].scriptindex; @@ -873,7 +873,7 @@ bool frExecuteTargetScript(s32 targetnum) g_FrData.targets[targetnum].scriptsleep = 255 * 60; return true; case FRCMD_GOTOPAD: - frpadnum = frResolveFrPad(script[offset + 1]); + frpadnum = fr_resolve_fr_pad(script[offset + 1]); if (frpadnum == g_FrData.targets[targetnum].frpadnum) { g_FrData.targets[targetnum].scriptoffset += 4; @@ -882,7 +882,7 @@ bool frExecuteTargetScript(s32 targetnum) g_FrData.targets[targetnum].frpadnum = frpadnum; - padUnpack(g_FrPads[frpadnum], PADFIELD_POS, &pad); + pad_unpack(g_FrPads[frpadnum], PADFIELD_POS, &pad); g_FrData.targets[targetnum].dstpos.x = pad.pos.x; g_FrData.targets[targetnum].dstpos.y = pad.pos.y; @@ -898,7 +898,7 @@ bool frExecuteTargetScript(s32 targetnum) } else { if (g_FrNumSounds < 3) { g_FrNumSounds++; - psCreate(NULL, g_FrData.targets[targetnum].prop, SFX_FR_CONVEYER, -1, + ps_create(NULL, g_FrData.targets[targetnum].prop, SFX_FR_CONVEYER, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } @@ -941,7 +941,7 @@ bool frExecuteTargetScript(s32 targetnum) return true; } -void frHideAllTargets(void) +void fr_hide_all_targets(void) { s32 i; @@ -951,11 +951,11 @@ void frHideAllTargets(void) target->flags2 |= OBJFLAG2_INVISIBLE; - psStopSound(prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(prop, PSTYPE_GENERAL, 0xffff); } } -void frInitTargets(void) +void fr_init_targets(void) { s32 count = 0; s32 i; @@ -975,7 +975,7 @@ void frInitTargets(void) { obj = prop->obj; - objFree(obj, false, true); + obj_free(obj, false, true); obj->damage = 0; prop->timetoregen = 0; @@ -992,7 +992,7 @@ void frInitTargets(void) g_FrData.targets[i].active = false; } - padUnpack(g_FrPads[g_FrData.targets[i].frpadindex], PADFIELD_POS, &pad); + pad_unpack(g_FrPads[g_FrData.targets[i].frpadindex], PADFIELD_POS, &pad); pos.f[0] = pad.pos.f[0]; pos.f[1] = pad.pos.f[1]; @@ -1002,7 +1002,7 @@ void frInitTargets(void) pos.f[2] = pad.pos.f[2]; #endif - frExecuteTargetScript(i); + fr_execute_target_script(i); if (g_FrData.targets[i].travelspeed == -1) { pos.x = g_FrData.targets[i].dstpos.x; @@ -1017,7 +1017,7 @@ void frInitTargets(void) if (obj->flags2 & OBJFLAG2_INVISIBLE) { #if VERSION < VERSION_NTSC_1_0 - padUnpack(g_FrPads[g_FrData.targets[i].frpadindex], PADFIELD_POS, &pad); + pad_unpack(g_FrPads[g_FrData.targets[i].frpadindex], PADFIELD_POS, &pad); pos.x = 0.0f; pos.y = 5000.0f; @@ -1030,15 +1030,15 @@ void frInitTargets(void) } if (g_FrData.targets[i].flags & FRTARGETFLAG_SPAWNFACINGAWAY) { - mtx4LoadYRotation(0.0f, &sp144); + mtx4_load_y_rotation(0.0f, &sp144); g_FrData.targets[i].angle = M_PI; } else { - mtx4LoadYRotation(M_PI, &sp144); + mtx4_load_y_rotation(M_PI, &sp144); } mtx00015f04(obj->model->scale, &sp144); - mtx4ToMtx3(&sp144, sp108); - mtx3Copy(sp108, obj->realrot); + mtx4_to_mtx3(&sp144, sp108); + mtx3_copy(sp108, obj->realrot); prop->pos.x = pos.x; prop->pos.y = pos.y; @@ -1049,20 +1049,20 @@ void frInitTargets(void) } } -void frCloseAndLockDoor(void) +void fr_close_and_lock_door(void) { - struct defaultobj *obj = objFindByTagId(0x91); + struct defaultobj *obj = obj_find_by_tag_id(0x91); if (obj && obj->prop && obj->prop->type == PROPTYPE_DOOR) { struct doorobj *door = (struct doorobj *)obj; door->keyflags |= 0x40; - doorsRequestMode(door, DOORMODE_CLOSING); + doors_request_mode(door, DOORMODE_CLOSING); } } -void frUnlockDoor(void) +void fr_unlock_door(void) { - struct defaultobj *obj = objFindByTagId(0x91); + struct defaultobj *obj = obj_find_by_tag_id(0x91); if (obj && obj->prop && obj->prop->type == PROPTYPE_DOOR) { struct doorobj *door = (struct doorobj *)obj; @@ -1070,7 +1070,7 @@ void frUnlockDoor(void) } } -void frLoadData(void) +void fr_load_data(void) { if (!g_FrDataLoaded) { s32 len = (s32)&_firingrangeSegmentRomEnd - (s32)&_firingrangeSegmentRomStart; @@ -1083,7 +1083,7 @@ void frLoadData(void) g_FrDataLoaded = true; - frLoadRomData(len); + fr_load_rom_data(len); for (i = 0x12; i < len; i++) { if (g_FrRomData[i] == FRCMD_START) { @@ -1092,7 +1092,7 @@ void frLoadData(void) } size = numscripts * sizeof(*g_FrScriptOffsets); - g_FrScriptOffsets = mempAlloc(ALIGN16(size), MEMPOOL_STAGE); + g_FrScriptOffsets = memp_alloc(ALIGN16(size), MEMPOOL_STAGE); if (numscripts < 0); @@ -1105,7 +1105,7 @@ void frLoadData(void) } } - frSetTargetProps(); + fr_set_target_props(); g_FrData.slot = 0; g_FrData.difficulty = FRDIFFICULTY_BRONZE; @@ -1113,43 +1113,43 @@ void frLoadData(void) } } -u32 frInitAmmo(s32 weaponnum) +u32 fr_init_ammo(s32 weaponnum) { u32 scriptindex; - u32 ammotype = bgunGetAmmoTypeForWeapon(weaponnum, 0); - u32 capacity = bgunGetCapacityByAmmotype(ammotype); + u32 ammotype = bgun_get_ammo_type_for_weapon(weaponnum, 0); + u32 capacity = bgun_get_capacity_by_ammotype(ammotype); - frInitDefaults(); - scriptindex = frGetWeaponScriptIndex(weaponnum); - frExecuteWeaponScript(scriptindex); + fr_init_defaults(); + scriptindex = fr_get_weapon_script_index(weaponnum); + fr_execute_weapon_script(scriptindex); if (g_FrData.ammolimit == 255) { - bgunSetAmmoQuantity(ammotype, capacity); + bgun_set_ammo_quantity(ammotype, capacity); } else { - bgunSetAmmoQuantity(ammotype, g_FrData.ammolimit); + bgun_set_ammo_quantity(ammotype, g_FrData.ammolimit); } if (weaponnum == WEAPON_SUPERDRAGON) { if (g_FrData.sdgrenadelimit == 255) { - bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity); + bgun_set_ammo_quantity(AMMOTYPE_DEVASTATOR, capacity); } else { - bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, g_FrData.sdgrenadelimit); + bgun_set_ammo_quantity(AMMOTYPE_DEVASTATOR, g_FrData.sdgrenadelimit); } } return scriptindex; } -void frBeginSession(s32 weapon) +void fr_begin_session(s32 weapon) { s32 i; - struct defaultobj *obj = objFindByTagId(0x7f); // computer + struct defaultobj *obj = obj_find_by_tag_id(0x7f); // computer if (obj) { obj->flags |= OBJFLAG_CANNOT_ACTIVATE; } - frCloseAndLockDoor(); + fr_close_and_lock_door(); for (i = 0; i < 2; i++) { if (g_Vars.currentplayer->gunctrl.ammotypes[i] >= 0) { @@ -1158,91 +1158,91 @@ void frBeginSession(s32 weapon) } } - g_FrIsValidWeapon = frInitAmmo(weapon) == 0 ? false : true; - frInitTargets(); - bgunSetPassiveMode(false); + g_FrIsValidWeapon = fr_init_ammo(weapon) == 0 ? false : true; + fr_init_targets(); + bgun_set_passive_mode(false); } -char *frGetWeaponDescription(void) +char *fr_get_weapon_description(void) { - u32 weapon = frGetWeaponBySlot(g_FrData.slot); + u32 weapon = fr_get_weapon_by_slot(g_FrData.slot); switch (weapon) { #if VERSION >= VERSION_PAL_BETA - case WEAPON_FALCON2: return langGet(L_DISH_283); - case WEAPON_FALCON2_SCOPE: return langGet(L_DISH_284); - case WEAPON_FALCON2_SILENCER: return langGet(L_DISH_285); - case WEAPON_MAGSEC4: return langGet(L_DISH_286); - case WEAPON_MAULER: return langGet(L_DISH_287); - case WEAPON_PHOENIX: return langGet(L_DISH_288); - case WEAPON_DY357MAGNUM: return langGet(L_DISH_289); - case WEAPON_DY357LX: return langGet(L_DISH_290); - case WEAPON_CMP150: return langGet(L_DISH_291); - case WEAPON_CYCLONE: return langGet(L_DISH_292); - case WEAPON_CALLISTO: return langGet(L_DISH_293); - case WEAPON_RCP120: return langGet(L_DISH_294); - case WEAPON_LAPTOPGUN: return langGet(L_DISH_295); - case WEAPON_DRAGON: return langGet(L_DISH_296); - case WEAPON_K7AVENGER: return langGet(L_DISH_297); - case WEAPON_AR34: return langGet(L_DISH_298); - case WEAPON_SUPERDRAGON: return langGet(L_DISH_299); - case WEAPON_SHOTGUN: return langGet(L_DISH_300); - case WEAPON_SNIPERRIFLE: return langGet(L_DISH_301); - case WEAPON_FARSIGHT: return langGet(L_DISH_302); - case WEAPON_CROSSBOW: return langGet(L_DISH_303); - case WEAPON_TRANQUILIZER: return langGet(L_DISH_304); - case WEAPON_REAPER: return langGet(L_DISH_305); - case WEAPON_DEVASTATOR: return langGet(L_DISH_306); - case WEAPON_ROCKETLAUNCHER: return langGet(L_DISH_307); - case WEAPON_SLAYER: return langGet(L_DISH_308); - case WEAPON_COMBATKNIFE: return langGet(L_DISH_309); - case WEAPON_LASER: return langGet(L_DISH_310); - case WEAPON_GRENADE: return langGet(L_DISH_311); - case WEAPON_NBOMB: return langGet(L_DISH_312); - case WEAPON_TIMEDMINE: return langGet(L_DISH_313); - case WEAPON_PROXIMITYMINE: return langGet(L_DISH_314); - case WEAPON_REMOTEMINE: return langGet(L_DISH_315); + case WEAPON_FALCON2: return lang_get(L_DISH_283); + case WEAPON_FALCON2_SCOPE: return lang_get(L_DISH_284); + case WEAPON_FALCON2_SILENCER: return lang_get(L_DISH_285); + case WEAPON_MAGSEC4: return lang_get(L_DISH_286); + case WEAPON_MAULER: return lang_get(L_DISH_287); + case WEAPON_PHOENIX: return lang_get(L_DISH_288); + case WEAPON_DY357MAGNUM: return lang_get(L_DISH_289); + case WEAPON_DY357LX: return lang_get(L_DISH_290); + case WEAPON_CMP150: return lang_get(L_DISH_291); + case WEAPON_CYCLONE: return lang_get(L_DISH_292); + case WEAPON_CALLISTO: return lang_get(L_DISH_293); + case WEAPON_RCP120: return lang_get(L_DISH_294); + case WEAPON_LAPTOPGUN: return lang_get(L_DISH_295); + case WEAPON_DRAGON: return lang_get(L_DISH_296); + case WEAPON_K7AVENGER: return lang_get(L_DISH_297); + case WEAPON_AR34: return lang_get(L_DISH_298); + case WEAPON_SUPERDRAGON: return lang_get(L_DISH_299); + case WEAPON_SHOTGUN: return lang_get(L_DISH_300); + case WEAPON_SNIPERRIFLE: return lang_get(L_DISH_301); + case WEAPON_FARSIGHT: return lang_get(L_DISH_302); + case WEAPON_CROSSBOW: return lang_get(L_DISH_303); + case WEAPON_TRANQUILIZER: return lang_get(L_DISH_304); + case WEAPON_REAPER: return lang_get(L_DISH_305); + case WEAPON_DEVASTATOR: return lang_get(L_DISH_306); + case WEAPON_ROCKETLAUNCHER: return lang_get(L_DISH_307); + case WEAPON_SLAYER: return lang_get(L_DISH_308); + case WEAPON_COMBATKNIFE: return lang_get(L_DISH_309); + case WEAPON_LASER: return lang_get(L_DISH_310); + case WEAPON_GRENADE: return lang_get(L_DISH_311); + case WEAPON_NBOMB: return lang_get(L_DISH_312); + case WEAPON_TIMEDMINE: return lang_get(L_DISH_313); + case WEAPON_PROXIMITYMINE: return lang_get(L_DISH_314); + case WEAPON_REMOTEMINE: return lang_get(L_DISH_315); #else - case WEAPON_FALCON2: return langGet(L_MISC_377); - case WEAPON_FALCON2_SCOPE: return langGet(L_MISC_378); - case WEAPON_FALCON2_SILENCER: return langGet(L_MISC_379); - case WEAPON_MAGSEC4: return langGet(L_MISC_380); - case WEAPON_MAULER: return langGet(L_MISC_381); - case WEAPON_PHOENIX: return langGet(L_MISC_382); - case WEAPON_DY357MAGNUM: return langGet(L_MISC_383); - case WEAPON_DY357LX: return langGet(L_MISC_384); - case WEAPON_CMP150: return langGet(L_MISC_385); - case WEAPON_CYCLONE: return langGet(L_MISC_386); - case WEAPON_CALLISTO: return langGet(L_MISC_387); - case WEAPON_RCP120: return langGet(L_MISC_388); - case WEAPON_LAPTOPGUN: return langGet(L_MISC_389); - case WEAPON_DRAGON: return langGet(L_MISC_390); - case WEAPON_K7AVENGER: return langGet(L_MISC_391); - case WEAPON_AR34: return langGet(L_MISC_392); - case WEAPON_SUPERDRAGON: return langGet(L_MISC_393); - case WEAPON_SHOTGUN: return langGet(L_MISC_394); - case WEAPON_SNIPERRIFLE: return langGet(L_MISC_395); - case WEAPON_FARSIGHT: return langGet(L_MISC_396); - case WEAPON_CROSSBOW: return langGet(L_MISC_397); - case WEAPON_TRANQUILIZER: return langGet(L_MISC_398); - case WEAPON_REAPER: return langGet(L_MISC_399); - case WEAPON_DEVASTATOR: return langGet(L_MISC_400); - case WEAPON_ROCKETLAUNCHER: return langGet(L_MISC_401); - case WEAPON_SLAYER: return langGet(L_MISC_402); - case WEAPON_COMBATKNIFE: return langGet(L_MISC_403); - case WEAPON_LASER: return langGet(L_MISC_404); - case WEAPON_GRENADE: return langGet(L_MISC_405); - case WEAPON_NBOMB: return langGet(L_MISC_406); - case WEAPON_TIMEDMINE: return langGet(L_MISC_407); - case WEAPON_PROXIMITYMINE: return langGet(L_MISC_408); - case WEAPON_REMOTEMINE: return langGet(L_MISC_409); + case WEAPON_FALCON2: return lang_get(L_MISC_377); + case WEAPON_FALCON2_SCOPE: return lang_get(L_MISC_378); + case WEAPON_FALCON2_SILENCER: return lang_get(L_MISC_379); + case WEAPON_MAGSEC4: return lang_get(L_MISC_380); + case WEAPON_MAULER: return lang_get(L_MISC_381); + case WEAPON_PHOENIX: return lang_get(L_MISC_382); + case WEAPON_DY357MAGNUM: return lang_get(L_MISC_383); + case WEAPON_DY357LX: return lang_get(L_MISC_384); + case WEAPON_CMP150: return lang_get(L_MISC_385); + case WEAPON_CYCLONE: return lang_get(L_MISC_386); + case WEAPON_CALLISTO: return lang_get(L_MISC_387); + case WEAPON_RCP120: return lang_get(L_MISC_388); + case WEAPON_LAPTOPGUN: return lang_get(L_MISC_389); + case WEAPON_DRAGON: return lang_get(L_MISC_390); + case WEAPON_K7AVENGER: return lang_get(L_MISC_391); + case WEAPON_AR34: return lang_get(L_MISC_392); + case WEAPON_SUPERDRAGON: return lang_get(L_MISC_393); + case WEAPON_SHOTGUN: return lang_get(L_MISC_394); + case WEAPON_SNIPERRIFLE: return lang_get(L_MISC_395); + case WEAPON_FARSIGHT: return lang_get(L_MISC_396); + case WEAPON_CROSSBOW: return lang_get(L_MISC_397); + case WEAPON_TRANQUILIZER: return lang_get(L_MISC_398); + case WEAPON_REAPER: return lang_get(L_MISC_399); + case WEAPON_DEVASTATOR: return lang_get(L_MISC_400); + case WEAPON_ROCKETLAUNCHER: return lang_get(L_MISC_401); + case WEAPON_SLAYER: return lang_get(L_MISC_402); + case WEAPON_COMBATKNIFE: return lang_get(L_MISC_403); + case WEAPON_LASER: return lang_get(L_MISC_404); + case WEAPON_GRENADE: return lang_get(L_MISC_405); + case WEAPON_NBOMB: return lang_get(L_MISC_406); + case WEAPON_TIMEDMINE: return lang_get(L_MISC_407); + case WEAPON_PROXIMITYMINE: return lang_get(L_MISC_408); + case WEAPON_REMOTEMINE: return lang_get(L_MISC_409); #endif } return NULL; } -void frEndSession(bool hidetargets) +void fr_end_session(bool hidetargets) { s32 i; s32 j; @@ -1254,41 +1254,41 @@ void frEndSession(bool hidetargets) u32 stack2; if (g_FrDataLoaded) { - struct defaultobj *terminal = objFindByTagId(0x7f); + struct defaultobj *terminal = obj_find_by_tag_id(0x7f); if (terminal) { terminal->flags &= ~OBJFLAG_CANNOT_ACTIVATE; } - frUnlockDoor(); + fr_unlock_door(); if (g_Vars.currentplayer->visionmode == VISIONMODE_SLAYERROCKET) { g_Vars.currentplayer->visionmode = VISIONMODE_NORMAL; } - bgunSetPassiveMode(true); + bgun_set_passive_mode(true); g_FrIsValidWeapon = 0; - frRestoreLighting(); + fr_restore_lighting(); if (hidetargets) { - frHideAllTargets(); + fr_hide_all_targets(); } if (g_ThrownLaptops[0].base.prop) { - objFreePermanently(&g_ThrownLaptops[0].base, true); + obj_free_permanently(&g_ThrownLaptops[0].base, true); } - roomsCopy(g_Vars.currentplayer->prop->rooms, rooms); + rooms_copy(g_Vars.currentplayer->prop->rooms, rooms); for (i = 0; g_Vars.currentplayer->prop->rooms[i] != -1; i++) { - bgRoomGetNeighbours(g_Vars.currentplayer->prop->rooms[i], rooms2, 10); - roomsAppend(rooms2, rooms, 20); + bg_room_get_neighbours(g_Vars.currentplayer->prop->rooms[i], rooms2, 10); + rooms_append(rooms2, rooms, 20); } // Remove projectiles and throwables - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; @@ -1300,7 +1300,7 @@ void frEndSession(bool hidetargets) if (prop->type == PROPTYPE_WEAPON) { if (obj->type == OBJTYPE_AUTOGUN) { - objFreePermanently(obj, true); + obj_free_permanently(obj, true); } if (obj->type == OBJTYPE_WEAPON) { @@ -1319,7 +1319,7 @@ void frEndSession(bool hidetargets) || weapon->weaponnum == WEAPON_SKROCKET || (weapon->weaponnum == WEAPON_DRAGON && weapon->gunfunc == FUNC_SECONDARY) || (weapon->weaponnum == WEAPON_LAPTOPGUN && weapon->gunfunc == FUNC_SECONDARY)) { - objFreePermanently(obj, true); + obj_free_permanently(obj, true); } } } @@ -1347,12 +1347,12 @@ void frEndSession(bool hidetargets) } } - playerDisplayHealth(); + player_display_health(); g_Vars.currentplayer->bondhealth = 1; } -bool frWasTooInaccurate(void) +bool fr_was_too_inaccurate(void) { f32 sum = (g_FrData.numhitsring3 + + g_FrData.numhitsbullseye @@ -1370,32 +1370,32 @@ bool frWasTooInaccurate(void) return false; } -void frSetFailReason(s32 failreason) +void fr_set_fail_reason(s32 failreason) { - frEndSession(false); + fr_end_session(false); - g_FrData.failreason = frWasTooInaccurate() ? FRFAILREASON_INACCURATE : failreason; + g_FrData.failreason = fr_was_too_inaccurate() ? FRFAILREASON_INACCURATE : failreason; g_FrData.menutype = FRMENUTYPE_FAILED; g_FrData.menucountdown = TICKS(60); } -void frSetCompleted(void) +void fr_set_completed(void) { - frEndSession(false); + fr_end_session(false); - if (frWasTooInaccurate()) { + if (fr_was_too_inaccurate()) { g_FrData.failreason = FRFAILREASON_INACCURATE; g_FrData.menutype = FRMENUTYPE_FAILED; } else { - u32 frweaponindex = frGetWeaponIndexByWeapon(frGetWeaponBySlot(g_FrData.slot)); - frSaveScoreIfBest(frweaponindex, g_FrData.difficulty + 1); + u32 frweaponindex = fr_get_weapon_index_by_weapon(fr_get_weapon_by_slot(g_FrData.slot)); + fr_save_score_if_best(frweaponindex, g_FrData.difficulty + 1); g_FrData.menutype = FRMENUTYPE_COMPLETED; } g_FrData.menucountdown = TICKS(60); } -bool frIsTargetOneHitExplodable(struct prop *prop) +bool fr_is_target_one_hit_explodable(struct prop *prop) { s32 i; @@ -1415,7 +1415,7 @@ bool frIsTargetOneHitExplodable(struct prop *prop) return false; } -f32 frGetTargetAngleToPos(struct coord *targetpos, f32 targetangle, struct coord *pos) +f32 fr_get_target_angle_to_pos(struct coord *targetpos, f32 targetangle, struct coord *pos) { f32 xdiff = targetpos->x - pos->x; f32 zdiff = targetpos->z - pos->z; @@ -1429,7 +1429,7 @@ f32 frGetTargetAngleToPos(struct coord *targetpos, f32 targetangle, struct coord return relativeangle; } -bool frIsTargetFacingPos(struct prop *prop, struct coord *pos) +bool fr_is_target_facing_pos(struct prop *prop, struct coord *pos) { s32 i; @@ -1441,7 +1441,7 @@ bool frIsTargetFacingPos(struct prop *prop, struct coord *pos) return false; } - angle = frGetTargetAngleToPos(&prop->pos, g_FrData.targets[i].angle, pos); + angle = fr_get_target_angle_to_pos(&prop->pos, g_FrData.targets[i].angle, pos); if (angle > RAD(90, 1.5707963705063f) && angle < RAD(270, 4.7116389274597f)) { return false; @@ -1454,7 +1454,7 @@ bool frIsTargetFacingPos(struct prop *prop, struct coord *pos) return true; } -struct prop *frChooseAutogunTarget(struct coord *autogunpos) +struct prop *fr_choose_autogun_target(struct coord *autogunpos) { f32 closestdist = 0x20000000; s32 facingtargets[ARRAYCOUNT(g_FrData.targets)]; @@ -1467,7 +1467,7 @@ struct prop *frChooseAutogunTarget(struct coord *autogunpos) if (g_FrData.targets[i].inuse && g_FrData.targets[i].destroyed == false && g_FrData.targets[i].active) { - f32 angle = frGetTargetAngleToPos(&g_FrData.targets[i].prop->pos, g_FrData.targets[i].angle, autogunpos); + f32 angle = fr_get_target_angle_to_pos(&g_FrData.targets[i].prop->pos, g_FrData.targets[i].angle, autogunpos); if (angle > RAD(90, 1.5707963705063f) && angle < RAD(270, 4.7116389274597f)) { // facing away @@ -1496,12 +1496,12 @@ struct prop *frChooseAutogunTarget(struct coord *autogunpos) return closesttarget; } -bool frIsAmmoWasted(void) +bool fr_is_ammo_wasted(void) { - s32 weaponnum = frGetWeaponBySlot(g_FrData.slot); + s32 weaponnum = fr_get_weapon_by_slot(g_FrData.slot); s32 i; - s32 priammotype = bgunGetAmmoTypeForWeapon(weaponnum, 0); - s32 secammotype = bgunGetAmmoTypeForWeapon(weaponnum, 1); + s32 priammotype = bgun_get_ammo_type_for_weapon(weaponnum, 0); + s32 secammotype = bgun_get_ammo_type_for_weapon(weaponnum, 1); struct hand *hand0 = &g_Vars.currentplayer->hands[0]; struct hand *hand1 = &g_Vars.currentplayer->hands[1]; s32 ammoloaded[2]; @@ -1524,8 +1524,8 @@ bool frIsAmmoWasted(void) // Check if player has ammo ammoloaded[0] = hand0->loadedammo[0] + hand1->loadedammo[0]; ammoloaded[1] = hand0->loadedammo[1] + hand1->loadedammo[1]; - ammototal[0] = bgunGetReservedAmmoCount(priammotype) + ammoloaded[0]; - ammototal[1] = bgunGetReservedAmmoCount(secammotype) + ammoloaded[1]; + ammototal[0] = bgun_get_reserved_ammo_count(priammotype) + ammoloaded[0]; + ammototal[1] = bgun_get_reserved_ammo_count(secammotype) + ammoloaded[1]; if (ammototal[0] <= 0 && ammototal[1] <= 0) { // Don't do any further checks if this is the first frame where we've @@ -1555,14 +1555,14 @@ bool frIsAmmoWasted(void) || weaponnum == WEAPON_TIMEDMINE || weaponnum == WEAPON_PROXIMITYMINE || weaponnum == WEAPON_REMOTEMINE) { - roomsCopy(g_Vars.currentplayer->prop->rooms, rooms20); + rooms_copy(g_Vars.currentplayer->prop->rooms, rooms20); for (i = 0; g_Vars.currentplayer->prop->rooms[i] != -1; i++) { - bgRoomGetNeighbours(g_Vars.currentplayer->prop->rooms[i], rooms10, 10); - roomsAppend(rooms10, rooms20, 20); + bg_room_get_neighbours(g_Vars.currentplayer->prop->rooms[i], rooms10, 10); + rooms_append(rooms10, rooms20, 20); } - roomGetProps(rooms20, propnums, 256); + room_get_props(rooms20, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { @@ -1599,10 +1599,10 @@ bool frIsAmmoWasted(void) if (g_FrData.proxyendtimer == 0) { // Initial state - set the timer to 5 seconds if player is now out of mines - ammotype = bgunGetAmmoTypeForWeapon(weaponnum, 0); + ammotype = bgun_get_ammo_type_for_weapon(weaponnum, 0); hand = &g_Vars.currentplayer->hands[HAND_RIGHT]; - if (bgunGetReservedAmmoCount(ammotype) + hand->loadedammo[0] == 0) { + if (bgun_get_reserved_ammo_count(ammotype) + hand->loadedammo[0] == 0) { g_FrData.proxyendtimer = TICKS(300); } @@ -1637,7 +1637,7 @@ bool frIsAmmoWasted(void) return false; } -void frTick(void) +void fr_tick(void) { s32 ammotype; s32 capacity; @@ -1671,8 +1671,8 @@ void frTick(void) if (g_FrIsValidWeapon && g_Vars.currentplayer->gunctrl.throwing == false - && invHasSingleWeaponIncAllGuns(frGetWeaponBySlot(g_FrData.slot))) { - bgunEquipWeapon(frGetWeaponBySlot(g_FrData.slot)); + && inv_has_single_weapon_inc_all_guns(fr_get_weapon_by_slot(g_FrData.slot))) { + bgun_equip_weapon(fr_get_weapon_by_slot(g_FrData.slot)); } // NTSC beta does the room code then menu code, @@ -1687,14 +1687,14 @@ void frTick(void) && g_FrData.targets[i].silent == false && g_FrData.targets[i].travelling) { g_FrData.targets[i].silent = true; - psStopSound(g_FrData.targets[i].prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(g_FrData.targets[i].prop, PSTYPE_GENERAL, 0xffff); } } g_Vars.currentplayer->training = false; - frEndSession(true); + fr_end_session(true); g_FrData.menucountdown = 0; // This assignment is in NTSC beta only - chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_IN_TRAINING); } return; } @@ -1717,25 +1717,25 @@ void frTick(void) for (i = 0; i < ARRAYCOUNT(g_FrData.targets); i++) { if (g_FrData.targets[i].prop) { - psStopSound(g_FrData.targets[i].prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(g_FrData.targets[i].prop, PSTYPE_GENERAL, 0xffff); } } switch (g_FrData.menutype) { case FRMENUTYPE_WEAPONLIST: - func0f0f85e0(ciGetFrWeaponListMenuDialog(), MENUROOT_TRAINING); + func0f0f85e0(ci_get_fr_weapon_list_menu_dialog(), MENUROOT_TRAINING); break; case FRMENUTYPE_DETAILS: func0f0f85e0(&g_FrTrainingInfoPreGameMenuDialog, MENUROOT_TRAINING); break; case FRMENUTYPE_FAILED: - sndStart(var80095200, SFX_TRAINING_FAIL, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_TRAINING_FAIL, NULL, -1, -1, -1, -1, -1); func0f0f85e0(&g_FrFailedMenuDialog, MENUROOT_TRAINING); break; case FRMENUTYPE_COMPLETED: - sndStart(var80095200, SFX_TRAINING_COMPLETE, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_TRAINING_COMPLETE, NULL, -1, -1, -1, -1, -1); func0f0f85e0(&g_FrCompletedMenuDialog, MENUROOT_TRAINING); - filemgrSaveOrLoad(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); + filemgr_save_or_load(&g_GameFileGuid, FILEOP_SAVE_GAME_000, 0); break; } } @@ -1752,13 +1752,13 @@ void frTick(void) && g_FrData.targets[i].silent == false && g_FrData.targets[i].travelling) { g_FrData.targets[i].silent = true; - psStopSound(g_FrData.targets[i].prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(g_FrData.targets[i].prop, PSTYPE_GENERAL, 0xffff); } } g_Vars.currentplayer->training = false; - frEndSession(true); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); + fr_end_session(true); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_IN_TRAINING); } return; } @@ -1769,7 +1769,7 @@ void frTick(void) } if (g_Vars.currentplayer->isdead) { - frEndSession(false); + fr_end_session(false); } // If paused, stop any target sounds @@ -1780,26 +1780,26 @@ void frTick(void) && g_FrData.targets[i].silent == false && g_FrData.targets[i].travelling) { g_FrData.targets[i].silent = true; - psStopSound(g_FrData.targets[i].prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(g_FrData.targets[i].prop, PSTYPE_GENERAL, 0xffff); } } return; } g_Vars.currentplayer->training = true; - frExecuteHelpScript(); + fr_execute_help_script(); // Top up the player's ammo if the config defined more ammo than the // weapon allows, or if it defined unlimited ammo if (g_FrData.numshotssincetopup != 0) { - weaponnum = frGetWeaponBySlot(g_FrData.slot); - ammotype = bgunGetAmmoTypeForWeapon(weaponnum, 0); - capacity = bgunGetCapacityByAmmotype(ammotype); - ammo = weaponGetAmmoByFunction(weaponnum, 0); + weaponnum = fr_get_weapon_by_slot(g_FrData.slot); + ammotype = bgun_get_ammo_type_for_weapon(weaponnum, 0); + capacity = bgun_get_capacity_by_ammotype(ammotype); + ammo = weapon_get_ammo_by_function(weaponnum, 0); capacity -= (ammo ? ammo->clipsize : 0); if (g_FrData.ammoextra > 0) { - tmp = bgunGetReservedAmmoCount(ammotype); + tmp = bgun_get_reserved_ammo_count(ammotype); g_FrData.ammoextra -= g_FrData.numshotssincetopup; if (g_FrData.ammoextra < 0) { @@ -1807,16 +1807,16 @@ void frTick(void) } capacity = tmp + g_FrData.numshotssincetopup; - bgunSetAmmoQuantity(ammotype, capacity); + bgun_set_ammo_quantity(ammotype, capacity); } else if (g_FrData.ammoextra == -1) { - bgunSetAmmoQuantity(ammotype, capacity); + bgun_set_ammo_quantity(ammotype, capacity); } if (weaponnum == WEAPON_SUPERDRAGON) { - capacity = bgunGetCapacityByAmmotype(AMMOTYPE_DEVASTATOR); + capacity = bgun_get_capacity_by_ammotype(AMMOTYPE_DEVASTATOR); if (g_FrData.sdgrenadeextra > 0) { - tmp = bgunGetReservedAmmoCount(AMMOTYPE_DEVASTATOR); + tmp = bgun_get_reserved_ammo_count(AMMOTYPE_DEVASTATOR); g_FrData.sdgrenadeextra -= g_FrData.numshotssincetopup; if (g_FrData.sdgrenadeextra < 0) { @@ -1824,9 +1824,9 @@ void frTick(void) } capacity = tmp + g_FrData.numshotssincetopup; - bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity); + bgun_set_ammo_quantity(AMMOTYPE_DEVASTATOR, capacity); } else if (g_FrData.sdgrenadeextra == -1) { - bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity); + bgun_set_ammo_quantity(AMMOTYPE_DEVASTATOR, capacity); } } @@ -1840,11 +1840,11 @@ void frTick(void) if (g_FrData.numshots == 0) { if (g_FrData.donealarm == false && g_FrData.timetaken > TICKS(-180)) { g_FrData.donealarm = true; - sndStart(var80095200, SFX_FR_ALARM, NULL, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_FR_ALARM, NULL, -1, -1, -1, -1, -1); } if (!g_FrData.donelighting && g_FrData.timetaken > TICKS(-225)) { - frInitLighting(); + fr_init_lighting(); } return; @@ -1852,7 +1852,7 @@ void frTick(void) // Fired a shot during prestart if (!g_FrData.donelighting) { - frInitLighting(); + fr_init_lighting(); } g_FrData.timetaken = 0; @@ -1864,20 +1864,20 @@ void frTick(void) if (g_FrData.targets[i].inuse && g_FrData.targets[i].destroyed == false && g_FrData.targets[i].active) { invincible = false; exploding = false; - weaponnum2 = frGetWeaponBySlot(g_FrData.slot); + weaponnum2 = fr_get_weapon_by_slot(g_FrData.slot); prop = g_FrData.targets[i].prop; obj = prop->obj; switch (weaponnum2) { case WEAPON_GRENADE: case WEAPON_PROXIMITYMINE: - coordTriggerProxies(&prop->pos, true); + coord_trigger_proxies(&prop->pos, true); break; } if (g_FrData.targets[i].travelling && g_FrData.targets[i].silent && g_FrData.targets[i].travelspeed != -1) { g_FrData.targets[i].silent = false; - psCreate(NULL, g_FrData.targets[i].prop, SFX_FR_CONVEYER, -1, + ps_create(NULL, g_FrData.targets[i].prop, SFX_FR_CONVEYER, -1, -1, 0, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); } @@ -1896,7 +1896,7 @@ void frTick(void) obj->damage = 0; } else if (g_FrData.targets[i].flags & FRTARGETFLAG_ONEHITEXPLODE || obj->damage >= obj->maxdamage - || frGetWeaponBySlot(g_FrData.slot) == WEAPON_PHOENIX) { + || fr_get_weapon_by_slot(g_FrData.slot) == WEAPON_PHOENIX) { g_FrData.numhitsbullseye++; g_FrData.score += 10; exploding = true; @@ -1908,22 +1908,22 @@ void frTick(void) // Handle target being destroyed if (exploding || (g_FrData.targets[i].maxdamage != 255 && g_FrData.targets[i].damage >= g_FrData.targets[i].maxdamage)) { - bbox = objFindBboxRodata(obj); + bbox = obj_find_bbox_rodata(obj); if (g_FrNumSounds && g_FrData.targets[i].travelling) { g_FrNumSounds--; - psStopSound(prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(prop, PSTYPE_GENERAL, 0xffff); } if (g_FrNumSounds); - shardsCreate(&prop->pos, &obj->realrot[0][0], &obj->realrot[1][0], &obj->realrot[2][0], + shards_create(&prop->pos, &obj->realrot[0][0], &obj->realrot[1][0], &obj->realrot[2][0], bbox->xmin, bbox->xmax, bbox->ymin, bbox->ymax, 2, prop); g_FrData.targetsdestroyed++; if (g_FrData.targets[i].flags & FRTARGETFLAG_ONEHITEXPLODE) { - explosionCreateSimple(g_FrData.targets[i].prop, &g_FrData.targets[i].prop->pos, + explosion_create_simple(g_FrData.targets[i].prop, &g_FrData.targets[i].prop->pos, g_FrData.targets[i].prop->rooms, EXPLOSIONTYPE_FRTARGET, 1); } @@ -1957,29 +1957,29 @@ void frTick(void) // Check if the session should end if (g_FrData.goaltargets == 255) { if (g_FrData.goalscore && g_FrData.score >= g_FrData.goalscore) { - frSetCompleted(); + fr_set_completed(); return; } } else { if (g_FrData.targetsdestroyed >= g_FrData.goaltargets && (g_FrData.goalscore == 0 || g_FrData.score >= g_FrData.goalscore)) { - frSetCompleted(); + fr_set_completed(); return; } } if (g_FrData.targetsdestroyed >= g_FrData.numtargets) { - frSetFailReason(FRFAILREASON_SCOREUNATTAINABLE); + fr_set_fail_reason(FRFAILREASON_SCOREUNATTAINABLE); return; } - if (frIsAmmoWasted()) { - frSetFailReason(FRFAILREASON_OUTOFAMMO); + if (fr_is_ammo_wasted()) { + fr_set_fail_reason(FRFAILREASON_OUTOFAMMO); return; } if (g_FrData.timelimit != 255 && g_FrData.timetaken >= g_FrData.timelimit * TICKS(60)) { - frSetFailReason(FRFAILREASON_TIMEOVER); + fr_set_fail_reason(FRFAILREASON_TIMEOVER); return; } @@ -2057,8 +2057,8 @@ void frTick(void) g_FrNumSounds--; } - psStopSound(prop, PSTYPE_GENERAL, 0xffff); - psCreate(NULL, prop, SFX_FR_CONVEYER_STOP, -1, + ps_stop_sound(prop, PSTYPE_GENERAL, 0xffff); + ps_create(NULL, prop, SFX_FR_CONVEYER_STOP, -1, -1, PSFLAG_0400, 0, PSTYPE_NONE, 0, -1, 0, -1, -1, -1, -1); if (g_FrNumSounds); @@ -2144,10 +2144,10 @@ void frTick(void) } } - mtx4LoadYRotation(g_FrData.targets[i].angle + M_PI, &spbc); + mtx4_load_y_rotation(g_FrData.targets[i].angle + M_PI, &spbc); mtx00015f04(obj->model->scale, &spbc); - mtx4ToMtx3(&spbc, sp98); - mtx3Copy(sp98, obj->realrot); + mtx4_to_mtx3(&spbc, sp98); + mtx3_copy(sp98, obj->realrot); } if (g_FrData.targets[i].scriptenabled && g_FrData.targets[i].scriptsleep != SECSTOTIME60(255)) { @@ -2156,10 +2156,10 @@ void frTick(void) if (g_FrData.targets[i].scriptsleep <= 0) { g_FrData.targets[i].scriptenabled = false; - while (!frExecuteTargetScript(i)); + while (!fr_execute_target_script(i)); - if (frTargetIsAtScriptStart(i)) { - while (!frExecuteTargetScript(i)); + if (fr_target_is_at_script_start(i)) { + while (!fr_execute_target_script(i)); } } } @@ -2183,7 +2183,7 @@ void func0f1a0924(struct prop *prop) sp56 = -2; sp60 = -2; - modelGetScreenCoords(obj->model, &sp56, &sp64, &sp60, &sp68); + model_get_screen_coords(obj->model, &sp56, &sp64, &sp60, &sp68); for (i = 0; i < ARRAYCOUNT(g_Vars.currentplayer->trackedprops); i++) { if (g_Vars.currentplayer->trackedprops[i].prop == prop) { @@ -2204,7 +2204,7 @@ void func0f1a0924(struct prop *prop) } } -bool frChooseFarsightTarget(void) +bool fr_choose_farsight_target(void) { struct prop *bestprop = NULL; f32 bestvalue = 1; @@ -2212,7 +2212,7 @@ bool frChooseFarsightTarget(void) bool found = false; s32 i; - if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) { + if (bgun_get_weapon_num(HAND_RIGHT) == WEAPON_FARSIGHT) { for (i = 0; i < ARRAYCOUNT(g_FrData.targets); i++) { if (g_FrData.targets[i].inuse && g_FrData.targets[i].destroyed == false @@ -2248,7 +2248,7 @@ bool frChooseFarsightTarget(void) return found; } -s32 frIsInTraining(void) +s32 fr_is_in_training(void) { if (g_FrData.menucountdown > 0 && (g_FrData.menutype == FRMENUTYPE_FAILED || g_FrData.menutype == FRMENUTYPE_COMPLETED)) { @@ -2257,10 +2257,10 @@ s32 frIsInTraining(void) return g_Vars.currentplayer->prop->rooms[0] == ROOM_DISH_FIRINGRANGE && g_FrIsValidWeapon - && mainGetStageNum() == STAGE_CITRAINING; + && main_get_stage_num() == STAGE_CITRAINING; } -void frCalculateHit(struct defaultobj *obj, struct coord *hitpos, f32 maulercharge) +void fr_calculate_hit(struct defaultobj *obj, struct coord *hitpos, f32 maulercharge) { s32 i; @@ -2280,7 +2280,7 @@ void frCalculateHit(struct defaultobj *obj, struct coord *hitpos, f32 maulerchar if (g_FrData.targets[i].flags & FRTARGETFLAG_ONEHITEXPLODE) { g_FrData.targets[i].damage = g_FrData.targets[i].maxdamage; - } else if (frGetWeaponBySlot(g_FrData.slot) == WEAPON_MAULER) { + } else if (fr_get_weapon_by_slot(g_FrData.slot) == WEAPON_MAULER) { g_FrData.targets[i].damage += (f32)((s32)(maulercharge * 0.1f) + 1); } else if ((g_FrData.targets[i].flags & FRTARGETFLAG_TMPINVINCIBLE) == 0 || g_FrData.targets[i].invincibletimer >= TICKS(300)) { @@ -2307,32 +2307,32 @@ void frCalculateHit(struct defaultobj *obj, struct coord *hitpos, f32 maulerchar } } -void frIncrementNumShots(void) +void fr_increment_num_shots(void) { g_FrData.numshots++; g_FrData.numshotssincetopup++; } -bool ciIsChrBioUnlocked(u32 bodynum) +bool ci_is_chr_bio_unlocked(u32 bodynum) { switch (bodynum) { case BODY_DARK_COMBAT: case BODY_CARRINGTON: return true; case BODY_CASSANDRA: - return ciIsStageComplete(SOLOSTAGEINDEX_DEFECTION); + return ci_is_stage_complete(SOLOSTAGEINDEX_DEFECTION); case BODY_DRCAROLL: - return ciIsStageComplete(SOLOSTAGEINDEX_INVESTIGATION); + return ci_is_stage_complete(SOLOSTAGEINDEX_INVESTIGATION); case BODY_MRBLONDE: - return ciIsStageComplete(SOLOSTAGEINDEX_EXTRACTION); + return ci_is_stage_complete(SOLOSTAGEINDEX_EXTRACTION); case BODY_TRENT: - return ciIsStageComplete(SOLOSTAGEINDEX_G5BUILDING); + return ci_is_stage_complete(SOLOSTAGEINDEX_G5BUILDING); case BODY_JONATHAN: - return ciIsStageComplete(SOLOSTAGEINDEX_INFILTRATION); + return ci_is_stage_complete(SOLOSTAGEINDEX_INFILTRATION); case BODY_THEKING: - return ciIsStageComplete(SOLOSTAGEINDEX_RESCUE); + return ci_is_stage_complete(SOLOSTAGEINDEX_RESCUE); case BODY_PRESIDENT: - return ciIsStageComplete(SOLOSTAGEINDEX_AIRFORCEONE); + return ci_is_stage_complete(SOLOSTAGEINDEX_AIRFORCEONE); } return false; @@ -2340,7 +2340,7 @@ bool ciIsChrBioUnlocked(u32 bodynum) u8 g_ChrBioSlot = 0; -struct chrbio *ciGetChrBioByBodynum(u32 bodynum) +struct chrbio *ci_get_chr_bio_by_bodynum(u32 bodynum) { #ifdef AVOID_UB static @@ -2388,7 +2388,7 @@ struct chrbio *ciGetChrBioByBodynum(u32 bodynum) case BODY_THEKING: return &bios[6]; case BODY_MRBLONDE: - if (ciIsStageComplete(SOLOSTAGEINDEX_CRASHSITE)) { + if (ci_is_stage_complete(SOLOSTAGEINDEX_CRASHSITE)) { return &bios[8]; } return &bios[7]; @@ -2399,19 +2399,19 @@ struct chrbio *ciGetChrBioByBodynum(u32 bodynum) return NULL; } -char *ciGetChrBioDescription(void) +char *ci_get_chr_bio_description(void) { - struct chrbio *bio = ciGetChrBioByBodynum(ciGetChrBioBodynumBySlot(g_ChrBioSlot)); - return langGet(bio->description); + struct chrbio *bio = ci_get_chr_bio_by_bodynum(ci_get_chr_bio_bodynum_by_slot(g_ChrBioSlot)); + return lang_get(bio->description); } -s32 ciGetNumUnlockedChrBios(void) +s32 ci_get_num_unlocked_chr_bios(void) { s32 count = 0; s32 bodynum; for (bodynum = 0; bodynum < ARRAYCOUNT(g_HeadsAndBodies) - 1; bodynum++) { - if (ciIsChrBioUnlocked(bodynum)) { + if (ci_is_chr_bio_unlocked(bodynum)) { count++; } } @@ -2419,13 +2419,13 @@ s32 ciGetNumUnlockedChrBios(void) return count; } -s32 ciGetChrBioBodynumBySlot(s32 slot) +s32 ci_get_chr_bio_bodynum_by_slot(s32 slot) { s32 index = -1; s32 bodynum; for (bodynum = 0; bodynum < ARRAYCOUNT(g_HeadsAndBodies) - 1; bodynum++) { - if (ciIsChrBioUnlocked(bodynum)) { + if (ci_is_chr_bio_unlocked(bodynum)) { index++; } @@ -2437,7 +2437,7 @@ s32 ciGetChrBioBodynumBySlot(s32 slot) return 0; } -struct miscbio *ciGetMiscBio(s32 index) +struct miscbio *ci_get_misc_bio(s32 index) { #ifdef AVOID_UB static @@ -2467,28 +2467,28 @@ struct miscbio *ciGetMiscBio(s32 index) return NULL; } -bool ciIsMiscBioUnlocked(s32 index) +bool ci_is_misc_bio_unlocked(s32 index) { switch (index) { case MISCBIO_MAIANS: - return ciIsStageComplete(SOLOSTAGEINDEX_RESCUE); + return ci_is_stage_complete(SOLOSTAGEINDEX_RESCUE); case MISCBIO_SKEDAR: - return ciIsStageComplete(SOLOSTAGEINDEX_ATTACKSHIP); + return ci_is_stage_complete(SOLOSTAGEINDEX_ATTACKSHIP); case MISCBIO_BACKGROUND: case MISCBIO_STORY: - return ciIsStageComplete(SOLOSTAGEINDEX_MBR); + return ci_is_stage_complete(SOLOSTAGEINDEX_MBR); } return false; } -s32 ciGetNumUnlockedMiscBios(void) +s32 ci_get_num_unlocked_misc_bios(void) { s32 count = 0; s32 i; for (i = 0; i < 4; i++) { - if (ciIsMiscBioUnlocked(i)) { + if (ci_is_misc_bio_unlocked(i)) { count++; } } @@ -2496,13 +2496,13 @@ s32 ciGetNumUnlockedMiscBios(void) return count; } -s32 ciGetMiscBioIndexBySlot(s32 slot) +s32 ci_get_misc_bio_index_by_slot(s32 slot) { s32 index = -1; s32 i; for (i = 0; i < 4; i++) { - if (ciIsMiscBioUnlocked(i)) { + if (ci_is_misc_bio_unlocked(i)) { index++; } @@ -2514,22 +2514,22 @@ s32 ciGetMiscBioIndexBySlot(s32 slot) return 0; } -char *ciGetMiscBioDescription(void) +char *ci_get_misc_bio_description(void) { - s32 index = ciGetMiscBioIndexBySlot(g_ChrBioSlot - ciGetNumUnlockedChrBios()); - struct miscbio *bio = ciGetMiscBio(index); + s32 index = ci_get_misc_bio_index_by_slot(g_ChrBioSlot - ci_get_num_unlocked_chr_bios()); + struct miscbio *bio = ci_get_misc_bio(index); - return langGet(bio->description); + return lang_get(bio->description); } -bool ciIsHangarBioAVehicle(s32 index) +bool ci_is_hangar_bio_a_vehicle(s32 index) { return index >= HANGARBIO_JUMPSHIP; } u8 g_HangarBioSlot = 0; -struct hangarbio *ciGetHangarBio(s32 index) +struct hangarbio *ci_get_hangar_bio(s32 index) { #ifdef AVOID_UB static @@ -2619,7 +2619,7 @@ struct hangarbio *ciGetHangarBio(s32 index) u8 g_DtSlot = 0; u8 var80088adc = 0; -bool ciIsHangarBioUnlocked(u32 bioindex) +bool ci_is_hangar_bio_unlocked(u32 bioindex) { u32 stage; @@ -2680,20 +2680,20 @@ bool ciIsHangarBioUnlocked(u32 bioindex) return false; } - return ciIsStageComplete(stage); + return ci_is_stage_complete(stage); } -s32 ciGetNumUnlockedLocationBios(void) +s32 ci_get_num_unlocked_location_bios(void) { s32 count = 0; s32 i; for (i = 0; i < 23; i++) { - if (ciIsHangarBioAVehicle(i)) { + if (ci_is_hangar_bio_a_vehicle(i)) { return count; } - if (ciIsHangarBioUnlocked(i)) { + if (ci_is_hangar_bio_unlocked(i)) { count++; } } @@ -2701,13 +2701,13 @@ s32 ciGetNumUnlockedLocationBios(void) return count; } -s32 ciGetNumUnlockedHangarBios(void) +s32 ci_get_num_unlocked_hangar_bios(void) { s32 count = 0; s32 i; for (i = 0; i < 23; i++) { - if (ciIsHangarBioUnlocked(i)) { + if (ci_is_hangar_bio_unlocked(i)) { count++; } } @@ -2715,13 +2715,13 @@ s32 ciGetNumUnlockedHangarBios(void) return count; } -s32 ciGetHangarBioIndexBySlot(s32 slot) +s32 ci_get_hangar_bio_index_by_slot(s32 slot) { s32 index = -1; s32 i; for (i = 0; i < 23; i++) { - if (ciIsHangarBioUnlocked(i)) { + if (ci_is_hangar_bio_unlocked(i)) { index++; } @@ -2733,29 +2733,29 @@ s32 ciGetHangarBioIndexBySlot(s32 slot) return 0; } -char *ciGetHangarBioDescription(void) +char *ci_get_hangar_bio_description(void) { - struct hangarbio *bio = ciGetHangarBio(ciGetHangarBioIndexBySlot(g_HangarBioSlot)); - return langGet(bio->description); + struct hangarbio *bio = ci_get_hangar_bio(ci_get_hangar_bio_index_by_slot(g_HangarBioSlot)); + return lang_get(bio->description); } -struct trainingdata *dtGetData(void) +struct trainingdata *dt_get_data(void) { return &g_DtData; } -void dtRestorePlayer(void) +void dt_restore_player(void) { - bgunSetPassiveMode(true); + bgun_set_passive_mode(true); if (g_DtData.obj) { - objFreePermanently(g_DtData.obj, true); + obj_free_permanently(g_DtData.obj, true); } g_DtData.obj = NULL; - if (dtGetWeaponByDeviceIndex(dtGetIndexBySlot(g_DtSlot)) == WEAPON_ECMMINE) { - bgunSetAmmoQuantity(AMMOTYPE_ECM_MINE, 0); + if (dt_get_weapon_by_device_index(dt_get_index_by_slot(g_DtSlot)) == WEAPON_ECMMINE) { + bgun_set_ammo_quantity(AMMOTYPE_ECM_MINE, 0); } if (g_Vars.currentplayer->eyespy) { @@ -2766,13 +2766,13 @@ void dtRestorePlayer(void) chr->chrflags |= CHRCFLAG_HIDDEN; - psStopSound(g_Vars.currentplayer->eyespy->prop, PSTYPE_GENERAL, 0xffff); + ps_stop_sound(g_Vars.currentplayer->eyespy->prop, PSTYPE_GENERAL, 0xffff); g_Vars.currentplayer->devicesactive &= ~DEVICE_EYESPY; } } -void dtPushEndscreen(void) +void dt_push_endscreen(void) { if (g_DtData.completed) { func0f0f85e0(&g_DtCompletedMenuDialog, MENUROOT_TRAINING); @@ -2787,30 +2787,30 @@ void dtPushEndscreen(void) g_DtData.holographedpc = false; } -void dtTick(void) +void dt_tick(void) { if (var80088adc) { if (g_DtData.intraining) { g_DtData.timetaken += g_Vars.lvupdate60; if (g_Vars.currentplayer->isdead) { - dtEnd(); + dt_end(); } - if (chrHasStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE)) { - dtEnd(); + if (chr_has_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE)) { + dt_end(); g_DtData.failed = true; g_DtData.timeleft = 1; g_DtData.finished = true; - } else if (chrHasStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_SUCCESS)) { - dtEnd(); + } else if (chr_has_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_SUCCESS)) { + dt_end(); g_DtData.completed = true; g_DtData.timeleft = 1; g_DtData.finished = true; } } else if (g_DtData.finished) { if (g_DtData.timeleft <= 0) { - dtPushEndscreen(); + dt_push_endscreen(); } else { g_DtData.timeleft -= g_Vars.lvupdate60; } @@ -2830,40 +2830,40 @@ void func0f1a1ac0(void) g_DtData.holographedpc = false; g_DtData.timetaken = 0; g_DtData.obj = NULL; - chrUnsetStageFlag(NULL, STAGEFLAG_CI_DEVICE_ABORTING); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_SUCCESS); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_DEVICE_ABORTING); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_SUCCESS); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE); } } -void dtBegin(void) +void dt_begin(void) { g_DtData.intraining = true; g_DtData.timetaken = 0; - chrUnsetStageFlag(NULL, STAGEFLAG_CI_DEVICE_ABORTING); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_SUCCESS); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE); - chrSetStageFlag(NULL, ciGetStageFlagByDeviceIndex(dtGetIndexBySlot(g_DtSlot))); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_DEVICE_ABORTING); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_SUCCESS); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE); + chr_set_stage_flag(NULL, ci_get_stage_flag_by_device_index(dt_get_index_by_slot(g_DtSlot))); g_Vars.currentplayer->training = true; - bgunSetPassiveMode(false); - chrSetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); + bgun_set_passive_mode(false); + chr_set_stage_flag(NULL, STAGEFLAG_CI_IN_TRAINING); } -void dtEnd(void) +void dt_end(void) { g_DtData.intraining = false; - dtRestorePlayer(); - bgunSetAmmoQuantity(AMMOTYPE_CLOAK, 0); - chrSetStageFlag(NULL, STAGEFLAG_CI_DEVICE_ABORTING); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE); - chrUnsetStageFlag(NULL, ciGetStageFlagByDeviceIndex(dtGetIndexBySlot(g_DtSlot))); + dt_restore_player(); + bgun_set_ammo_quantity(AMMOTYPE_CLOAK, 0); + chr_set_stage_flag(NULL, STAGEFLAG_CI_DEVICE_ABORTING); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE); + chr_unset_stage_flag(NULL, ci_get_stage_flag_by_device_index(dt_get_index_by_slot(g_DtSlot))); g_Vars.currentplayer->training = false; - chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); - playerDisplayHealth(); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_IN_TRAINING); + player_display_health(); g_Vars.currentplayer->bondhealth = 1; } -bool dtIsAvailable(s32 deviceindex) +bool dt_is_available(s32 deviceindex) { u8 flags[] = { GAMEFILEFLAG_CI_UPLINK_DONE, @@ -2884,20 +2884,20 @@ bool dtIsAvailable(s32 deviceindex) return true; } - if (deviceindex < 0 || gamefileHasFlag(flags[deviceindex])) { + if (deviceindex < 0 || gamefile_has_flag(flags[deviceindex])) { return true; } return false; } -s32 dtGetNumAvailable(void) +s32 dt_get_num_available(void) { s32 count = 0; s32 i; for (i = 0; i < NUM_DEVICETESTS; i++) { - if (dtIsAvailable(i)) { + if (dt_is_available(i)) { count++; } } @@ -2905,13 +2905,13 @@ s32 dtGetNumAvailable(void) return count; } -s32 dtGetIndexBySlot(s32 wantindex) +s32 dt_get_index_by_slot(s32 wantindex) { s32 index = -1; s32 i; for (i = 0; i < NUM_DEVICETESTS; i++) { - if (dtIsAvailable(i)) { + if (dt_is_available(i)) { index++; } @@ -2923,7 +2923,7 @@ s32 dtGetIndexBySlot(s32 wantindex) return 0; } -u32 dtGetWeaponByDeviceIndex(s32 deviceindex) +u32 dt_get_weapon_by_device_index(s32 deviceindex) { u32 weapons[] = { WEAPON_DATAUPLINK, @@ -2941,7 +2941,7 @@ u32 dtGetWeaponByDeviceIndex(s32 deviceindex) return weapons[deviceindex]; } -u32 ciGetStageFlagByDeviceIndex(u32 deviceindex) +u32 ci_get_stage_flag_by_device_index(u32 deviceindex) { u32 flags[] = { STAGEFLAG_CI_TRIGGER_UPLINK, @@ -2959,7 +2959,7 @@ u32 ciGetStageFlagByDeviceIndex(u32 deviceindex) return flags[deviceindex]; } -char *dtGetDescription(void) +char *dt_get_description(void) { u32 texts[] = { #if VERSION >= VERSION_PAL_BETA @@ -2987,10 +2987,10 @@ char *dtGetDescription(void) #endif }; - return langGet(texts[dtGetIndexBySlot(g_DtSlot)]); + return lang_get(texts[dt_get_index_by_slot(g_DtSlot)]); } -char *dtGetTip1(void) +char *dt_get_tip1(void) { u32 texts[] = { #if VERSION >= VERSION_PAL_BETA @@ -3018,10 +3018,10 @@ char *dtGetTip1(void) #endif }; - return langGet(texts[dtGetIndexBySlot(g_DtSlot)]); + return lang_get(texts[dt_get_index_by_slot(g_DtSlot)]); } -char *dtGetTip2(void) +char *dt_get_tip2(void) { u32 texts[] = { #if VERSION >= VERSION_PAL_BETA @@ -3049,15 +3049,15 @@ char *dtGetTip2(void) #endif }; - return langGet(texts[dtGetIndexBySlot(g_DtSlot)]); + return lang_get(texts[dt_get_index_by_slot(g_DtSlot)]); } -struct trainingdata *getHoloTrainingData(void) +struct trainingdata *get_holo_training_data(void) { return &g_HtData; } -void htPushEndscreen(void) +void ht_push_endscreen(void) { if (g_HtData.completed) { func0f0f85e0(&g_HtCompletedMenuDialog, MENUROOT_TRAINING); @@ -3074,30 +3074,30 @@ void htPushEndscreen(void) u8 var80088bb4 = 0; u8 var80088bb8 = 0; -void htTick(void) +void ht_tick(void) { if (var80088bb8) { if (g_HtData.intraining) { g_HtData.timetaken += g_Vars.lvupdate60; if (g_Vars.currentplayer->isdead) { - htEnd(); + ht_end(); } - if (chrHasStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE)) { - htEnd(); + if (chr_has_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE)) { + ht_end(); g_HtData.failed = true; g_HtData.timeleft = 1; g_HtData.finished = true; - } else if (chrHasStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS)) { - htEnd(); + } else if (chr_has_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS)) { + ht_end(); g_HtData.completed = true; g_HtData.timeleft = 1; g_HtData.finished = true; } } else if (g_HtData.finished) { if (g_HtData.timeleft <= 0) { - htPushEndscreen(); + ht_push_endscreen(); } else { g_HtData.timeleft -= g_Vars.lvupdate60; } @@ -3115,32 +3115,32 @@ void func0f1a2198(void) g_HtData.finished = false; g_HtData.timeleft = 0; g_HtData.timetaken = 0; - chrUnsetStageFlag(NULL, STAGEFLAG_CI_HOLO_ABORTING); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_HOLO_ABORTING); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE); } } -void htBegin(void) +void ht_begin(void) { struct waypoint *waypoints = g_StageSetup.waypoints; g_HtData.intraining = true; g_HtData.timetaken = 0; - chrUnsetStageFlag(NULL, STAGEFLAG_CI_HOLO_ABORTING); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE); - chrSetStageFlag(NULL, func0f1a25c0(htGetIndexBySlot(var80088bb4))); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_HOLO_ABORTING); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_SUCCESS); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE); + chr_set_stage_flag(NULL, func0f1a25c0(ht_get_index_by_slot(var80088bb4))); // Disable segment leading out of the door - navDisableSegment(&waypoints[0x20], &waypoints[0x31]); + nav_disable_segment(&waypoints[0x20], &waypoints[0x31]); g_Vars.currentplayer->training = true; - bgunSetPassiveMode(false); - chrSetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); + bgun_set_passive_mode(false); + chr_set_stage_flag(NULL, STAGEFLAG_CI_IN_TRAINING); } -void htEnd(void) +void ht_end(void) { struct prop *prop; s16 *propnum; @@ -3149,15 +3149,15 @@ void htEnd(void) struct waypoint *waypoints = g_StageSetup.waypoints; g_HtData.intraining = false; - chrSetStageFlag(NULL, STAGEFLAG_CI_HOLO_ABORTING); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE); - chrUnsetStageFlag(NULL, func0f1a25c0(htGetIndexBySlot(var80088bb4))); + chr_set_stage_flag(NULL, STAGEFLAG_CI_HOLO_ABORTING); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_TRIGGER_HOLO_FAILURE); + chr_unset_stage_flag(NULL, func0f1a25c0(ht_get_index_by_slot(var80088bb4))); // Enable segment leading out of the door - navEnableSegment(&waypoints[0x20], &waypoints[0x31]); + nav_enable_segment(&waypoints[0x20], &waypoints[0x31]); g_Vars.currentplayer->training = false; - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnum = &propnums[0]; // Remove dropped weapons @@ -3168,20 +3168,20 @@ void htEnd(void) struct defaultobj *obj = prop->obj; if (obj->type == OBJTYPE_WEAPON) { - objFreePermanently(obj, true); + obj_free_permanently(obj, true); } } propnum++; } - bgunSetPassiveMode(true); - chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING); - playerDisplayHealth(); + bgun_set_passive_mode(true); + chr_unset_stage_flag(NULL, STAGEFLAG_CI_IN_TRAINING); + player_display_health(); g_Vars.currentplayer->bondhealth = 1; } -bool htIsUnlocked(u32 value) +bool ht_is_unlocked(u32 value) { switch (value) { case 0: @@ -3197,13 +3197,13 @@ bool htIsUnlocked(u32 value) return false; } -s32 htGetNumUnlocked(void) +s32 ht_get_num_unlocked(void) { s32 count = 0; s32 i; for (i = 0; i < NUM_HOLOTESTS; i++) { - if (htIsUnlocked(i)) { + if (ht_is_unlocked(i)) { count++; } } @@ -3211,13 +3211,13 @@ s32 htGetNumUnlocked(void) return count; } -s32 htGetIndexBySlot(s32 slot) +s32 ht_get_index_by_slot(s32 slot) { s32 index = -1; s32 i; for (i = 0; i < NUM_HOLOTESTS; i++) { - if (htIsUnlocked(i)) { + if (ht_is_unlocked(i)) { index++; } @@ -3229,7 +3229,7 @@ s32 htGetIndexBySlot(s32 slot) return 0; } -char *htGetName(s32 index) +char *ht_get_name(s32 index) { u32 texts[] = { #if VERSION >= VERSION_PAL_BETA @@ -3251,7 +3251,7 @@ char *htGetName(s32 index) #endif }; - return langGet(texts[index]); + return lang_get(texts[index]); } u32 func0f1a25c0(s32 index) @@ -3270,7 +3270,7 @@ u32 func0f1a25c0(s32 index) return flags[index]; } -char *htGetDescription(void) +char *ht_get_description(void) { u32 texts[] = { #if VERSION >= VERSION_PAL_BETA @@ -3292,10 +3292,10 @@ char *htGetDescription(void) #endif }; - return langGet(texts[htGetIndexBySlot(var80088bb4)]); + return lang_get(texts[ht_get_index_by_slot(var80088bb4)]); } -char *htGetTip1(void) +char *ht_get_tip1(void) { u32 texts[] = { #if VERSION >= VERSION_PAL_BETA @@ -3317,10 +3317,10 @@ char *htGetTip1(void) #endif }; - return langGet(texts[htGetIndexBySlot(var80088bb4)]); + return lang_get(texts[ht_get_index_by_slot(var80088bb4)]); } -char *htGetTip2(void) +char *ht_get_tip2(void) { u32 texts[] = { #if VERSION >= VERSION_PAL_BETA @@ -3342,38 +3342,38 @@ char *htGetTip2(void) #endif }; - return langGet(texts[htGetIndexBySlot(var80088bb4)]); + return lang_get(texts[ht_get_index_by_slot(var80088bb4)]); } #if VERSION >= VERSION_JPN_FINAL -void frGetGoalTargetsText(char *buffer, char *buffer2) +void fr_get_goal_targets_text(char *buffer, char *buffer2) { - sprintf(buffer, "%s", langGet(L_MISC_417)); + sprintf(buffer, "%s", lang_get(L_MISC_417)); sprintf(buffer2, "%d\n", g_FrData.goaltargets); } #else -void frGetGoalTargetsText(char *buffer) +void fr_get_goal_targets_text(char *buffer) { // "GOAL TARGETS:" - sprintf(buffer, "%s %d\n", langGet(L_MISC_417), g_FrData.goaltargets); + sprintf(buffer, "%s %d\n", lang_get(L_MISC_417), g_FrData.goaltargets); } #endif -void frGetTargetsDestroyedValue(char *buffer) +void fr_get_targets_destroyed_value(char *buffer) { sprintf(buffer, "%02d\n", g_FrData.targetsdestroyed); } -void frGetScoreValue(char *buffer) +void fr_get_score_value(char *buffer) { sprintf(buffer, "%03d\n", g_FrData.score); } #if VERSION >= VERSION_JPN_FINAL -void frGetGoalScoreText(char *buffer1, char *buffer2) +void fr_get_goal_score_text(char *buffer1, char *buffer2) { if (g_FrData.goalscore) { - sprintf(buffer1, "%s", langGet(L_MISC_418)); + sprintf(buffer1, "%s", lang_get(L_MISC_418)); sprintf(buffer2, "%d\n", g_FrData.goalscore); } else { sprintf(buffer1, ""); @@ -3381,18 +3381,18 @@ void frGetGoalScoreText(char *buffer1, char *buffer2) } } #else -void frGetGoalScoreText(char *buffer) +void fr_get_goal_score_text(char *buffer) { if (g_FrData.goalscore) { // "GOAL SCORE:" - sprintf(buffer, "%s %d\n", langGet(L_MISC_418), g_FrData.goalscore); + sprintf(buffer, "%s %d\n", lang_get(L_MISC_418), g_FrData.goalscore); } else { sprintf(buffer, ""); } } #endif -f32 frGetAccuracy(char *buffer) +f32 fr_get_accuracy(char *buffer) { f32 sum = (g_FrData.numhitsring3 + g_FrData.numhitsbullseye @@ -3414,18 +3414,18 @@ f32 frGetAccuracy(char *buffer) } #if VERSION >= VERSION_JPN_FINAL -bool frGetMinAccuracy(char *buffer1, f32 accuracy, char *buffer2) +bool fr_get_min_accuracy(char *buffer1, f32 accuracy, char *buffer2) { - sprintf(buffer1, "%s", langGet(L_MISC_419)); + sprintf(buffer1, "%s", lang_get(L_MISC_419)); sprintf(buffer2, "%d%%\n", g_FrData.goalaccuracy); return accuracy < g_FrData.goalaccuracy; } #else -bool frGetMinAccuracy(char *buffer, f32 accuracy) +bool fr_get_min_accuracy(char *buffer, f32 accuracy) { // "MIN ACCURACY:" - sprintf(buffer, "%s %d%%\n", langGet(L_MISC_419), g_FrData.goalaccuracy); + sprintf(buffer, "%s %d%%\n", lang_get(L_MISC_419), g_FrData.goalaccuracy); return accuracy < g_FrData.goalaccuracy; } @@ -3441,7 +3441,7 @@ bool frGetMinAccuracy(char *buffer, f32 accuracy) * Negative time taken (such as when the player aborts before the challenge * starts) is wrapped to positive and will induce a failure. */ -bool frFormatTime(char *buffer) +bool fr_format_time(char *buffer) { s32 mins = 0; s32 mult = 1; @@ -3473,7 +3473,7 @@ bool frFormatTime(char *buffer) } #if VERSION >= VERSION_JPN_FINAL -bool frGetHudMiddleSubtext(char *buffer1, char *buffer2) +bool fr_get_hud_middle_subtext(char *buffer1, char *buffer2) { s32 secs; s32 mins; @@ -3481,12 +3481,12 @@ bool frGetHudMiddleSubtext(char *buffer1, char *buffer2) sprintf(buffer2, ""); if (g_FrData.timetaken < TICKS(-180)) { - sprintf(buffer1, "%s", langGet(L_MISC_420)); // "FIRE TO START" + sprintf(buffer1, "%s", lang_get(L_MISC_420)); // "FIRE TO START" return false; } if (g_FrData.timetaken < 0) { - sprintf(buffer1, "%s", langGet(L_MISC_421)); // "GET READY!" + sprintf(buffer1, "%s", lang_get(L_MISC_421)); // "GET READY!" return true; } @@ -3504,23 +3504,23 @@ bool frGetHudMiddleSubtext(char *buffer1, char *buffer2) } } - sprintf(buffer1, "%s", langGet(L_MISC_422)); // "LIMIT:" + sprintf(buffer1, "%s", lang_get(L_MISC_422)); // "LIMIT:" sprintf(buffer2, "%02d:%02d\n", mins, secs); return true; } #else -bool frGetHudMiddleSubtext(char *buffer) +bool fr_get_hud_middle_subtext(char *buffer) { s32 secs; s32 mins; if (g_FrData.timetaken < TICKS(-180)) { - sprintf(buffer, "%s", langGet(L_MISC_420)); // "FIRE TO START" + sprintf(buffer, "%s", lang_get(L_MISC_420)); // "FIRE TO START" return false; } if (g_FrData.timetaken < 0) { - sprintf(buffer, "%s", langGet(L_MISC_421)); // "GET READY!" + sprintf(buffer, "%s", lang_get(L_MISC_421)); // "GET READY!" return true; } @@ -3538,13 +3538,13 @@ bool frGetHudMiddleSubtext(char *buffer) } } - sprintf(buffer, "%s %02d:%02d\n", langGet(L_MISC_422), mins, secs); // "LIMIT:" + sprintf(buffer, "%s %02d:%02d\n", lang_get(L_MISC_422), mins, secs); // "LIMIT:" return true; } #endif #if VERSION >= VERSION_JPN_FINAL -bool frGetFeedback(char *scorebuffer, char *zonebuffer, char *extrabuffer) +bool fr_get_feedback(char *scorebuffer, char *zonebuffer, char *extrabuffer) { u32 texts[] = { L_MISC_423, // "ZONE 3" @@ -3573,19 +3573,19 @@ bool frGetFeedback(char *scorebuffer, char *zonebuffer, char *extrabuffer) switch (g_FrData.feedbackzone) { case FRZONE_RING3: - sprintf(zonebuffer, "%s", langGet(texts[0])); + sprintf(zonebuffer, "%s", lang_get(texts[0])); return true; case FRZONE_RING2: - sprintf(zonebuffer, "%s", langGet(texts[1])); + sprintf(zonebuffer, "%s", lang_get(texts[1])); return true; case FRZONE_RING1: - sprintf(zonebuffer, "%s", langGet(texts[2])); + sprintf(zonebuffer, "%s", lang_get(texts[2])); return true; case FRZONE_BULLSEYE: - sprintf(zonebuffer, "%s", langGet(texts[3])); + sprintf(zonebuffer, "%s", lang_get(texts[3])); return true; case FRZONE_EXPLODE: - sprintf(zonebuffer, "%s", langGet(texts[4])); + sprintf(zonebuffer, "%s", lang_get(texts[4])); return true; } @@ -3596,7 +3596,7 @@ bool frGetFeedback(char *scorebuffer, char *zonebuffer, char *extrabuffer) return false; } #else -bool frGetFeedback(char *scorebuffer, char *zonebuffer) +bool fr_get_feedback(char *scorebuffer, char *zonebuffer) { u32 texts[] = { L_MISC_423, // "ZONE 3" @@ -3623,19 +3623,19 @@ bool frGetFeedback(char *scorebuffer, char *zonebuffer) switch (g_FrData.feedbackzone) { case FRZONE_RING3: - sprintf(zonebuffer, "%s", langGet(texts[0])); + sprintf(zonebuffer, "%s", lang_get(texts[0])); return true; case FRZONE_RING2: - sprintf(zonebuffer, "%s", langGet(texts[1])); + sprintf(zonebuffer, "%s", lang_get(texts[1])); return true; case FRZONE_RING1: - sprintf(zonebuffer, "%s", langGet(texts[2])); + sprintf(zonebuffer, "%s", lang_get(texts[2])); return true; case FRZONE_BULLSEYE: - sprintf(zonebuffer, "%s", langGet(texts[3])); + sprintf(zonebuffer, "%s", lang_get(texts[3])); return true; case FRZONE_EXPLODE: - sprintf(zonebuffer, "%s", langGet(texts[4])); + sprintf(zonebuffer, "%s", lang_get(texts[4])); return true; } @@ -3648,9 +3648,9 @@ bool frGetFeedback(char *scorebuffer, char *zonebuffer) #endif #if VERSION >= VERSION_JPN_FINAL -Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, char *string3, u32 colour, u8 alpha) +Gfx *fr_render_hud_element(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, char *string3, u32 colour, u8 alpha) #else -Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u32 colour, u8 alpha) +Gfx *fr_render_hud_element(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u32 colour, u8 alpha) #endif { s32 textheight; @@ -3661,7 +3661,7 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3 u32 halfalpha = alpha >> 1; u32 fullcolour = (colour & 0xffffff00) | alpha; - textMeasure(&textheight, &textwidth, string1, g_CharsHandelGothicMd, g_FontHandelGothicMd, 0); + text_measure(&textheight, &textwidth, string1, g_CharsHandelGothicMd, g_FontHandelGothicMd, 0); x2 = x - (textwidth >> 1); y2 = y; @@ -3669,7 +3669,7 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3 #if VERSION >= VERSION_JPN_FINAL gdl = func0f1574d0jf(gdl, &x2, &y2, string1, - g_CharsHandelGothicMd, g_FontHandelGothicMd, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0); + g_CharsHandelGothicMd, g_FontHandelGothicMd, fullcolour, halfalpha, vi_get_width(), vi_get_height(), 0, 0); if (string2) { s32 textheight2; @@ -3677,8 +3677,8 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3 s32 textheight3; s32 textwidth3; - textMeasure(&textheight2, &textwidth2, string2, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); - textMeasure(&textheight3, &textwidth3, string3, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight2, &textwidth2, string2, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight3, &textwidth3, string3, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); textheight = textheight2; textwidth = textwidth2 + textwidth3; @@ -3689,7 +3689,7 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3 gdl = text0f153858(gdl, &x2, &y2, &textwidth, &textheight); gdl = func0f1574d0jf(gdl, &x2, &y2, string2, - g_CharsHandelGothicSm, g_FontHandelGothicSm, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0); + g_CharsHandelGothicSm, g_FontHandelGothicSm, fullcolour, halfalpha, vi_get_width(), vi_get_height(), 0, 0); y2 = y; y2 += 17; @@ -3697,21 +3697,21 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3 x2 -= 4; gdl = func0f1574d0jf(gdl, &x2, &y2, string3, - g_CharsHandelGothicSm, g_FontHandelGothicSm, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0); + g_CharsHandelGothicSm, g_FontHandelGothicSm, fullcolour, halfalpha, vi_get_width(), vi_get_height(), 0, 0); } #else - gdl = textRender(gdl, &x2, &y2, string1, - g_CharsHandelGothicMd, g_FontHandelGothicMd, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x2, &y2, string1, + g_CharsHandelGothicMd, g_FontHandelGothicMd, fullcolour, halfalpha, vi_get_width(), vi_get_height(), 0, 0); if (string2) { - textMeasure(&textheight, &textwidth, string2, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); + text_measure(&textheight, &textwidth, string2, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0); x2 = x - (textwidth >> 1); y2 = y + 17; gdl = text0f153858(gdl, &x2, &y2, &textwidth, &textheight); - gdl = textRender(gdl, &x2, &y2, string2, - g_CharsHandelGothicXs, g_FontHandelGothicXs, fullcolour, halfalpha, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render(gdl, &x2, &y2, string2, + g_CharsHandelGothicXs, g_FontHandelGothicXs, fullcolour, halfalpha, vi_get_width(), vi_get_height(), 0, 0); } #endif @@ -3719,7 +3719,7 @@ Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u3 } #if VERSION >= VERSION_JPN_FINAL -Gfx *frRenderHud(Gfx *gdl) +Gfx *fr_render_hud(Gfx *gdl) { char string1[128]; char string2[128]; @@ -3729,7 +3729,7 @@ Gfx *frRenderHud(Gfx *gdl) s32 alpha = 0xa0; f32 mult; - if (viGetViewWidth() > 400) { + if (vi_get_view_width() > 400) { mult = 1.7f; } else { mult = 1; @@ -3746,10 +3746,10 @@ Gfx *frRenderHud(Gfx *gdl) gdl = text0f153628(gdl); // Time - red = frFormatTime(string1); - exists = frGetHudMiddleSubtext(string2, string3); + red = fr_format_time(string1); + exists = fr_get_hud_middle_subtext(string2, string3); - gdl = frRenderHudElement(gdl, viGetViewWidth() >> 1, viGetViewTop() + 12, + gdl = fr_render_hud_element(gdl, vi_get_view_width() >> 1, vi_get_view_top() + 12, string1, exists ? string2 : NULL, exists ? string3 : NULL, @@ -3757,40 +3757,40 @@ Gfx *frRenderHud(Gfx *gdl) alpha); // Score - frGetScoreValue(string1); - frGetGoalScoreText(string2, string3); - gdl = frRenderHudElement(gdl, viGetViewLeft() + 65.0f * mult, viGetViewTop() + 12, + fr_get_score_value(string1); + fr_get_goal_score_text(string2, string3); + gdl = fr_render_hud_element(gdl, vi_get_view_left() + 65.0f * mult, vi_get_view_top() + 12, string1, string2, string3, 0x00ff00a0, alpha); // Feedback - if (frGetFeedback(string1, string2, string3)) { - gdl = frRenderHudElement(gdl,viGetViewLeft() + 65.0f * mult, viGetViewTop() + 48, + if (fr_get_feedback(string1, string2, string3)) { + gdl = fr_render_hud_element(gdl,vi_get_view_left() + 65.0f * mult, vi_get_view_top() + 48, string1, string2, string3, 0x00ff00a0, alpha); } if (g_FrData.goalaccuracy > 0) { - red = frGetMinAccuracy(string2, frGetAccuracy(string1), string3); + red = fr_get_min_accuracy(string2, fr_get_accuracy(string1), string3); - gdl = frRenderHudElement(gdl, viGetViewLeft() + viGetViewWidth() - 70.0f * mult, viGetViewTop() + 12, + gdl = fr_render_hud_element(gdl, vi_get_view_left() + vi_get_view_width() - 70.0f * mult, vi_get_view_top() + 12, string1, string2, string3, red ? 0xff4444ff : 0x00ff00a0, alpha); } else if (g_FrData.goaltargets != 255) { - frGetTargetsDestroyedValue(string1); - frGetGoalTargetsText(string2, string3); + fr_get_targets_destroyed_value(string1); + fr_get_goal_targets_text(string2, string3); if (mult == 2) { mult = 2.4; } - gdl = frRenderHudElement(gdl, viGetViewLeft() + viGetViewWidth() - 70.0f * mult, viGetViewTop() + 12, + gdl = fr_render_hud_element(gdl, vi_get_view_left() + vi_get_view_width() - 70.0f * mult, vi_get_view_top() + 12, string1, string2, string3, 0x00ff00a0, alpha); } return text0f153780(gdl); } #else -Gfx *frRenderHud(Gfx *gdl) +Gfx *fr_render_hud(Gfx *gdl) { char string1[128]; char string2[128]; @@ -3799,7 +3799,7 @@ Gfx *frRenderHud(Gfx *gdl) s32 alpha = 0xa0; f32 mult; - if (viGetViewWidth() > (VERSION >= VERSION_PAL_FINAL ? 330 : 400)) { + if (vi_get_view_width() > (VERSION >= VERSION_PAL_FINAL ? 330 : 400)) { mult = VERSION >= VERSION_PAL_FINAL ? 1.5f : 2; } else { mult = 1; @@ -3816,42 +3816,42 @@ Gfx *frRenderHud(Gfx *gdl) gdl = text0f153628(gdl); // Time - red = frFormatTime(string1); - exists = frGetHudMiddleSubtext(string2); + red = fr_format_time(string1); + exists = fr_get_hud_middle_subtext(string2); - gdl = frRenderHudElement(gdl, viGetViewWidth() >> 1, viGetViewTop() + 12, + gdl = fr_render_hud_element(gdl, vi_get_view_width() >> 1, vi_get_view_top() + 12, string1, exists ? string2 : NULL, red ? 0xff0000a0 : 0x00ff00a0, alpha); // Score - frGetScoreValue(string1); - frGetGoalScoreText(string2); - gdl = frRenderHudElement(gdl, viGetViewLeft() + 65.0f * mult, viGetViewTop() + 12, + fr_get_score_value(string1); + fr_get_goal_score_text(string2); + gdl = fr_render_hud_element(gdl, vi_get_view_left() + 65.0f * mult, vi_get_view_top() + 12, string1, string2, 0x00ff00a0, alpha); // Feedback - if (frGetFeedback(string1, string2)) { - gdl = frRenderHudElement(gdl,viGetViewLeft() + 65.0f * mult, viGetViewTop() + 40, + if (fr_get_feedback(string1, string2)) { + gdl = fr_render_hud_element(gdl,vi_get_view_left() + 65.0f * mult, vi_get_view_top() + 40, string1, string2, 0x00ff00a0, alpha); } if (g_FrData.goalaccuracy > 0) { - red = frGetMinAccuracy(string2, frGetAccuracy(string1)); + red = fr_get_min_accuracy(string2, fr_get_accuracy(string1)); - gdl = frRenderHudElement(gdl, viGetViewLeft() + viGetViewWidth() - 70.0f * mult, viGetViewTop() + 12, + gdl = fr_render_hud_element(gdl, vi_get_view_left() + vi_get_view_width() - 70.0f * mult, vi_get_view_top() + 12, string1, string2, red ? 0xff0000a0 : 0x00ff00a0, alpha); } else if (g_FrData.goaltargets != 255) { - frGetTargetsDestroyedValue(string1); - frGetGoalTargetsText(string2); + fr_get_targets_destroyed_value(string1); + fr_get_goal_targets_text(string2); if (mult == 2) { mult = 2.4; } - gdl = frRenderHudElement(gdl, viGetViewLeft() + viGetViewWidth() - 70.0f * mult, viGetViewTop() + 12, + gdl = fr_render_hud_element(gdl, vi_get_view_left() + vi_get_view_width() - 70.0f * mult, vi_get_view_top() + 12, string1, string2, 0x00ff00a0, alpha); } diff --git a/src/game/trainingmenus.c b/src/game/trainingmenus.c index db90ba2a8..5d8b67d5c 100644 --- a/src/game/trainingmenus.c +++ b/src/game/trainingmenus.c @@ -30,7 +30,7 @@ struct menudialogdef g_BioTextMenuDialog; struct menudialogdef g_HangarLocationDetailsMenuDialog; struct menudialogdef g_HangarVehicleDetailsMenuDialog; -MenuItemHandlerResult frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fr_details_ok_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 i; @@ -38,21 +38,21 @@ MenuItemHandlerResult frDetailsOkMenuHandler(s32 operation, struct menuitem *ite case MENUOP_CHECKPREFOCUSED: return true; case MENUOP_SET: - if (frIsInTraining() == false) { - s32 weapon = frGetWeaponBySlot(frGetSlot()); + if (fr_is_in_training() == false) { + s32 weapon = fr_get_weapon_by_slot(fr_get_slot()); if (g_FrWeaponNum != WEAPON_UNARMED) { - invRemoveItemByNum(g_FrWeaponNum); + inv_remove_item_by_num(g_FrWeaponNum); } if (weapon != WEAPON_UNARMED) { - invGiveSingleWeapon(weapon); + inv_give_single_weapon(weapon); } - invSetCurrentIndex(1); + inv_set_current_index(1); - if (bgunGetWeaponNum(HAND_RIGHT) != weapon) { - bgunEquipWeapon2(HAND_RIGHT, weapon); + if (bgun_get_weapon_num(HAND_RIGHT) != weapon) { + bgun_equip_weapon2(HAND_RIGHT, weapon); } g_FrWeaponNum = weapon; @@ -62,7 +62,7 @@ MenuItemHandlerResult frDetailsOkMenuHandler(s32 operation, struct menuitem *ite g_Vars.currentplayer->hands[1].gunroundsspent[i] = 0; } - frBeginSession(weapon); + fr_begin_session(weapon); } func0f0f8120(); @@ -72,11 +72,11 @@ MenuItemHandlerResult frDetailsOkMenuHandler(s32 operation, struct menuitem *ite return 0; } -MenuItemHandlerResult frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fr_abort_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - if (frIsInTraining()) { - frEndSession(true); + if (fr_is_in_training()) { + fr_end_session(true); } } @@ -85,7 +85,7 @@ MenuItemHandlerResult frAbortMenuHandler(s32 operation, struct menuitem *item, u struct menudialogdef g_FrDifficultyMenuDialog; -MenuItemHandlerResult frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fr_weapon_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { s32 weaponnum; s32 score; @@ -111,40 +111,40 @@ MenuItemHandlerResult frWeaponListMenuHandler(s32 operation, struct menuitem *it data->list.groupstartindex = 0; break; case MENUOP_GETOPTIONCOUNT: - data->list.value = frGetNumWeaponsAvailable(); + data->list.value = fr_get_num_weapons_available(); break; case MENUOP_GETOPTIONTEXT: return 0; case MENUOP_SET: - weaponnum = frGetWeaponBySlot(data->list.value); - score = ciGetFiringRangeScore(frGetWeaponIndexByWeapon(weaponnum)); + weaponnum = fr_get_weapon_by_slot(data->list.value); + score = ci_get_firing_range_score(fr_get_weapon_index_by_weapon(weaponnum)); #if VERSION < VERSION_NTSC_1_0 if (g_Menus[g_MpPlayerNum].layers[g_Menus[g_MpPlayerNum].depth - 1].numsiblings > 1) { - menuCloseDialog(); - menuPushDialog(&g_FrWeaponListMenuDialog); + menu_close_dialog(); + menu_push_dialog(&g_FrWeaponListMenuDialog); } #endif - frLoadData(); - frSetSlot(data->list.value); + fr_load_data(); + fr_set_slot(data->list.value); if (score) { - frSetDifficulty(ciGetFiringRangeScore(frGetWeaponIndexByWeapon(weaponnum))); - menuPushDialog(&g_FrDifficultyMenuDialog); + fr_set_difficulty(ci_get_firing_range_score(fr_get_weapon_index_by_weapon(weaponnum))); + menu_push_dialog(&g_FrDifficultyMenuDialog); } else { - frSetDifficulty(FRDIFFICULTY_BRONZE); - menuPushDialog(&g_FrTrainingInfoPreGameMenuDialog); + fr_set_difficulty(FRDIFFICULTY_BRONZE); + menu_push_dialog(&g_FrTrainingInfoPreGameMenuDialog); } break; case MENUOP_GETSELECTEDINDEX: - data->list.value = frGetSlot(); + data->list.value = fr_get_slot(); break; case MENUOP_RENDER: gdl = data->type19.gdl; renderdata = data->type19.renderdata2; - weaponnum2 = frGetWeaponBySlot(data->type19.unk04); - score2 = ciGetFiringRangeScore(frGetWeaponIndexByWeapon(weaponnum2)); + weaponnum2 = fr_get_weapon_by_slot(data->type19.unk04); + score2 = ci_get_firing_range_score(fr_get_weapon_index_by_weapon(weaponnum2)); // Render weapon name x = renderdata->x + 10; @@ -155,7 +155,7 @@ MenuItemHandlerResult frWeaponListMenuHandler(s32 operation, struct menuitem *it #endif gdl = text0f153628(gdl); - gdl = textRenderProjected(gdl, &x, &y, bgunGetName(weaponnum2), g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, bgun_get_name(weaponnum2), g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); // Prepare the star texture for the difficulties @@ -166,7 +166,7 @@ MenuItemHandlerResult frWeaponListMenuHandler(s32 operation, struct menuitem *it gDPSetTextureConvert(gdl++, G_TC_FILT); gDPSetTextureFilter(gdl++, G_TF_POINT); - texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -212,19 +212,19 @@ MenuItemHandlerResult frWeaponListMenuHandler(s32 operation, struct menuitem *it return 0; } -MenuDialogHandlerResult frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult fr_training_info_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { u32 stack; s32 weaponnum; switch (operation) { case MENUOP_OPEN: - weaponnum = frGetWeaponBySlot(frGetSlot()); + weaponnum = fr_get_weapon_by_slot(fr_get_slot()); g_Menus[g_MpPlayerNum].training.weaponnum = weaponnum; func0f105948(weaponnum); - if (!frIsInTraining()) { - frInitAmmo(weaponnum); + if (!fr_is_in_training()) { + fr_init_ammo(weaponnum); } break; case MENUOP_TICK: @@ -235,8 +235,8 @@ MenuDialogHandlerResult frTrainingInfoMenuDialog(s32 operation, struct menudialo } break; case MENUOP_CLOSE: - if (!frIsInTraining()) { - frEndSession(true); + if (!fr_is_in_training()) { + fr_end_session(true); } break; } @@ -244,11 +244,11 @@ MenuDialogHandlerResult frTrainingInfoMenuDialog(s32 operation, struct menudialo return 0; } -MenuDialogHandlerResult frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult fr_training_stats_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_CLOSE) { - if (frIsInTraining() == false) { - frEndSession(true); + if (fr_is_in_training() == false) { + fr_end_session(true); } } @@ -259,7 +259,7 @@ MenuDialogHandlerResult frTrainingStatsMenuDialog(s32 operation, struct menudial * This is an unused menu handler which implements the difficulty selection * using a dropdown. */ -MenuItemHandlerResult frDifficultyDropdownMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fr_difficulty_dropdown_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { u16 names[] = { L_MPMENU_439, // "Bronze" @@ -269,40 +269,40 @@ MenuItemHandlerResult frDifficultyDropdownMenuHandler(s32 operation, struct menu switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->dropdown.value = ciGetFiringRangeScore(frGetSlot()) + 1; + data->dropdown.value = ci_get_firing_range_score(fr_get_slot()) + 1; if (data->dropdown.value > 3) { data->dropdown.value = 3; } break; case MENUOP_GETOPTIONTEXT: - return (s32) langGet(names[data->dropdown.value]); + return (s32) lang_get(names[data->dropdown.value]); case MENUOP_SET: - frSetDifficulty(data->dropdown.value); - menuPushDialog(&g_FrTrainingInfoPreGameMenuDialog); + fr_set_difficulty(data->dropdown.value); + menu_push_dialog(&g_FrTrainingInfoPreGameMenuDialog); break; case MENUOP_GETSELECTEDINDEX: - data->dropdown.value = frGetDifficulty(); + data->dropdown.value = fr_get_difficulty(); break; } return 0; } -MenuItemHandlerResult frDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fr_difficulty_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_CHECKHIDDEN: - if (ciGetFiringRangeScore(frGetWeaponIndexByWeapon(frGetWeaponBySlot(frGetSlot()))) < item->param) { + if (ci_get_firing_range_score(fr_get_weapon_index_by_weapon(fr_get_weapon_by_slot(fr_get_slot()))) < item->param) { return true; } break; case MENUOP_SET: - frSetDifficulty(item->param); - menuPushDialog(&g_FrTrainingInfoPreGameMenuDialog); + fr_set_difficulty(item->param); + menu_push_dialog(&g_FrTrainingInfoPreGameMenuDialog); break; case MENUOP_CHECKPREFOCUSED: - if (ciGetFiringRangeScore(frGetWeaponIndexByWeapon(frGetWeaponBySlot(frGetSlot()))) >= item->param) { + if (ci_get_firing_range_score(fr_get_weapon_index_by_weapon(fr_get_weapon_by_slot(fr_get_slot()))) >= item->param) { return true; } break; @@ -311,29 +311,29 @@ MenuItemHandlerResult frDifficultyMenuHandler(s32 operation, struct menuitem *it return 0; } -char *frPrimaryFunctionMenuText(struct menuitem *item) +char *fr_primary_function_menu_text(struct menuitem *item) { - struct weaponfunc *func = weaponGetFunctionById(frGetWeaponBySlot(frGetSlot()), FUNC_PRIMARY); + struct weaponfunc *func = weapon_get_function_by_id(fr_get_weapon_by_slot(fr_get_slot()), FUNC_PRIMARY); if (func) { - return langGet(func->name); + return lang_get(func->name); } return "\n"; } -char *frSecondaryFunctionMenuText(struct menuitem *item) +char *fr_secondary_function_menu_text(struct menuitem *item) { - struct weaponfunc *func = weaponGetFunctionById(frGetWeaponBySlot(frGetSlot()), FUNC_SECONDARY); + struct weaponfunc *func = weapon_get_function_by_id(fr_get_weapon_by_slot(fr_get_slot()), FUNC_SECONDARY); if (func) { - return langGet(func->name); + return lang_get(func->name); } return "\n"; } -char *frMenuTextFailReason(struct menuitem *item) +char *fr_menu_text_fail_reason(struct menuitem *item) { u16 reasons[] = { L_MPMENU_456, // "Not Failed" @@ -343,12 +343,12 @@ char *frMenuTextFailReason(struct menuitem *item) L_MPMENU_460, // "Too Inaccurate" }; - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); - return langGet(reasons[frdata->failreason]); + return lang_get(reasons[frdata->failreason]); } -char *frMenuTextDifficultyName(struct menuitem *item) +char *fr_menu_text_difficulty_name(struct menuitem *item) { u16 names[] = { L_MPMENU_439, // "Bronze" @@ -356,14 +356,14 @@ char *frMenuTextDifficultyName(struct menuitem *item) L_MPMENU_441, // "Gold" }; - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); - return langGet(names[frdata->difficulty]); + return lang_get(names[frdata->difficulty]); } -char *frMenuTextTimeTakenValue(struct menuitem *item) +char *fr_menu_text_time_taken_value(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); f32 secs = frdata->timetaken / (PAL ? 50.0f : 60.0f); if (secs > frdata->timelimit) { @@ -387,37 +387,37 @@ char *frMenuTextTimeTakenValue(struct menuitem *item) return g_StringPointer; } -char *frMenuTextScoreValue(struct menuitem *item) +char *fr_menu_text_score_value(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); sprintf(g_StringPointer, "%d\n", frdata->score); return g_StringPointer; } -char *frMenuTextGoalScoreValueUnconditional(struct menuitem *item) +char *fr_menu_text_goal_score_value_unconditional(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); sprintf(g_StringPointer, "%d\n", frdata->goalscore); return g_StringPointer; } -char *frMenuTextWeaponName(struct menuitem *item) +char *fr_menu_text_weapon_name(struct menuitem *item) { - return bgunGetName(frGetWeaponBySlot(frGetSlot())); + return bgun_get_name(fr_get_weapon_by_slot(fr_get_slot())); } -char *frMenuTextTargetsDestroyedValue(struct menuitem *item) +char *fr_menu_text_targets_destroyed_value(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); sprintf(g_StringPointer, "%d\n", frdata->targetsdestroyed); return g_StringPointer; } -char *frMenuTextAccuracyValue(struct menuitem *item) +char *fr_menu_text_accuracy_value(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); f32 totalhits = (frdata->numhitsring3 + frdata->numhitsbullseye + frdata->numhitsring1 + frdata->numhitsring2) * 100.0f; f32 accuracy = 0; @@ -433,21 +433,21 @@ char *frMenuTextAccuracyValue(struct menuitem *item) return g_StringPointer; } -char *frMenuTextGoalScoreLabel(struct menuitem *item) +char *fr_menu_text_goal_score_label(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); if (frdata->goalscore > 0) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU_475)); // "Goal Score:" + sprintf(g_StringPointer, "%s", lang_get(L_MPMENU_475)); // "Goal Score:" return g_StringPointer; } return NULL; } -char *frMenuTextGoalScoreValue(struct menuitem *item) +char *fr_menu_text_goal_score_value(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); if (frdata->goalscore > 0) { sprintf(g_StringPointer2, "%d\n", frdata->goalscore); @@ -457,14 +457,14 @@ char *frMenuTextGoalScoreValue(struct menuitem *item) return NULL; } -char *frMenuTextMinAccuracyOrTargetsLabel(struct menuitem *item) +char *fr_menu_text_min_accuracy_or_targets_label(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); if (frdata->goalaccuracy > 0) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU_473)); // "Min Accuracy:" + sprintf(g_StringPointer, "%s", lang_get(L_MPMENU_473)); // "Min Accuracy:" } else if (frdata->goaltargets != 255) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU_474)); // "Goal Targets:" + sprintf(g_StringPointer, "%s", lang_get(L_MPMENU_474)); // "Goal Targets:" } else { return NULL; } @@ -472,9 +472,9 @@ char *frMenuTextMinAccuracyOrTargetsLabel(struct menuitem *item) return g_StringPointer; } -char *frMenuTextMinAccuracyOrTargetsValue(struct menuitem *item) +char *fr_menu_text_min_accuracy_or_targets_value(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); if (frdata->goalaccuracy > 0) { sprintf(g_StringPointer2, "%d%%\n", frdata->goalaccuracy); @@ -487,12 +487,12 @@ char *frMenuTextMinAccuracyOrTargetsValue(struct menuitem *item) return g_StringPointer2; } -char *frMenuTextTimeLimitLabel(struct menuitem *item) +char *fr_menu_text_time_limit_label(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); if (frdata->timelimit != 255) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU_472)); // "Time Limit:" + sprintf(g_StringPointer, "%s", lang_get(L_MPMENU_472)); // "Time Limit:" } else { return NULL; } @@ -500,9 +500,9 @@ char *frMenuTextTimeLimitLabel(struct menuitem *item) return g_StringPointer; } -char *frMenuTextTimeLimitValue(struct menuitem *item) +char *fr_menu_text_time_limit_value(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); if (frdata->timelimit != 255) { s32 secs = frdata->timelimit; @@ -525,12 +525,12 @@ char *frMenuTextTimeLimitValue(struct menuitem *item) return g_StringPointer2; } -char *frMenuTextAmmoLimitLabel(struct menuitem *item) +char *fr_menu_text_ammo_limit_label(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); if (frdata->ammolimit != 255) { - sprintf(g_StringPointer, "%s", langGet(L_MPMENU_471)); // "Ammo Limit:" + sprintf(g_StringPointer, "%s", lang_get(L_MPMENU_471)); // "Ammo Limit:" } else { return NULL; } @@ -538,14 +538,14 @@ char *frMenuTextAmmoLimitLabel(struct menuitem *item) return g_StringPointer; } -char *frMenuTextAmmoLimitValue(struct menuitem *item) +char *fr_menu_text_ammo_limit_value(struct menuitem *item) { - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); char suffix[16]; s32 weaponnum; if (frdata->ammolimit != 255) { - weaponnum = frGetWeaponBySlot(frdata->slot); + weaponnum = fr_get_weapon_by_slot(frdata->slot); if (weaponnum == WEAPON_SUPERDRAGON && frdata->sdgrenadelimit != 255) { sprintf(suffix, "/%d", frdata->sdgrenadelimit); @@ -568,7 +568,7 @@ char *frMenuTextAmmoLimitValue(struct menuitem *item) * as well as the player's score chart. There are lines leading from * the score chart to the diagram. */ -MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult fr_scoring_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_RENDER) { Gfx *gdl = data->type19.gdl; @@ -578,7 +578,7 @@ MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, s32 textheight; s32 textwidth; struct textureconfig *tconfig = &g_TexGeneralConfigs[50]; - struct frdata *frdata = frGetData(); + struct frdata *frdata = fr_get_data(); char text[128]; bool failed = frdata->menutype == FRMENUTYPE_FAILED; #if VERSION >= VERSION_JPN_FINAL @@ -610,14 +610,14 @@ MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, linecolourtex = (linecolourtex & 0xffffff00) | ((linecolourtex & 0xff) * (renderdata->colour & 0xff) >> 8); #endif - mainOverrideVariable("x1", &x1); - mainOverrideVariable("x2", &x2); - mainOverrideVariable("y1", &y1); - mainOverrideVariable("y2", &y2); - mainOverrideVariable("x3", &x3); - mainOverrideVariable("x4", &x4); - mainOverrideVariable("y3", &y3); - mainOverrideVariable("y4", &y4); + main_override_variable("x1", &x1); + main_override_variable("x2", &x2); + main_override_variable("y1", &y1); + main_override_variable("y2", &y2); + main_override_variable("x3", &x3); + main_override_variable("x4", &x4); + main_override_variable("y3", &y3); + main_override_variable("y4", &y4); gDPPipeSync(gdl++); gDPSetTexturePersp(gdl++, G_TP_NONE); @@ -626,7 +626,7 @@ MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, gDPSetTextureConvert(gdl++, G_TC_FILT); gDPSetTextureFilter(gdl++, G_TF_POINT); - texSelect(&gdl, tconfig, 2, 0, 2, 1, NULL); + tex_select(&gdl, tconfig, 2, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -668,10 +668,10 @@ MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, G_TX_RENDERTILE, 16, 1024, -1024 / g_ScaleX, 1024); #if VERSION >= VERSION_NTSC_1_0 - gdl = textSetPrimColour(gdl, ((failed ? 0xff000055 : 0x00ff0055) & 0xffffff00) | (((failed ? 0xff000055 : 0x00ff0055) & 0xff) * (renderdata->colour & 0xff) >> 8)); + gdl = text_set_prim_colour(gdl, ((failed ? 0xff000055 : 0x00ff0055) & 0xffffff00) | (((failed ? 0xff000055 : 0x00ff0055) & 0xff) * (renderdata->colour & 0xff) >> 8)); colour = ((failed ? 0xff6969aa : renderdata->colour) & 0xffffff00) | ((((failed ? 0xff6969aa : renderdata->colour) & 0xff) * (renderdata->colour & 0xff)) >> 8); #else - gdl = textSetPrimColour(gdl, failed ? 0xff000055 : 0x00ff0055); + gdl = text_set_prim_colour(gdl, failed ? 0xff000055 : 0x00ff0055); #endif // NTSC beta uses a static alpha channel, while newer versions take the @@ -692,92 +692,92 @@ MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, x = renderdata->x + 93; y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 15 : 14); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // "Bull's-eye" - sprintf(text, langGet(L_MPMENU_461)); + sprintf(text, lang_get(L_MPMENU_461)); x = renderdata->x + 122; y = renderdata->y + 14; gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // Bull's-eye score sprintf(text, "%d\n", frdata->numhitsbullseye * 10); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = renderdata->x - textheight + (VERSION == VERSION_JPN_FINAL ? 192 : 182); y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 15 : 14); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // Zone 1 count sprintf(text, "%d\n", frdata->numhitsring1); x = renderdata->x + 93; y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 27 : 25); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // "Zone 1" - sprintf(text, langGet(L_MPMENU_462)); + sprintf(text, lang_get(L_MPMENU_462)); x = renderdata->x + 122; y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 26 : 25); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // Zone 1 score sprintf(text, "%d\n", frdata->numhitsring1 * 5); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = renderdata->x - textheight + (VERSION == VERSION_JPN_FINAL ? 192 : 182); y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 27 : 25); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // Zone 2 count sprintf(text, "%d\n", frdata->numhitsring2); x = renderdata->x + 93; y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 39 : 36); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // "Zone 2" - sprintf(text, langGet(L_MPMENU_463)); + sprintf(text, lang_get(L_MPMENU_463)); x = renderdata->x + 122; y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 38 : 36); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // Zone 2 score sprintf(text, "%d\n", frdata->numhitsring2 * 2); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = renderdata->x - textheight + (VERSION == VERSION_JPN_FINAL ? 192 : 182); y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 39 : 36); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // Zone 3 count sprintf(text, "%d\n", frdata->numhitsring3); x = renderdata->x + 93; y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 51 : 47); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // "Zone 3" // Note: developers forgot to remove last argument when copy/pasting - sprintf(text, langGet(L_MPMENU_464), frdata->numhitsring3); + sprintf(text, lang_get(L_MPMENU_464), frdata->numhitsring3); x = renderdata->x + 122; y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 50 : 47); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // Zone 3 score sprintf(text, "%d\n", frdata->numhitsring3); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = renderdata->x - textheight + (VERSION == VERSION_JPN_FINAL ? 192 : 182); y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 51 : 47); gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // "Hit total" - sprintf(text, langGet(L_MPMENU_465)); + sprintf(text, lang_get(L_MPMENU_465)); x = renderdata->x + 133; y = renderdata->y + 63; @@ -787,11 +787,11 @@ MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, #endif gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // Hit total count sprintf(text, "%d\n", frdata->numhitsring3 + frdata->numhitsbullseye + frdata->numhitsring1 + frdata->numhitsring2); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); x = renderdata->x - textheight + 188; y = renderdata->y + (VERSION == VERSION_JPN_FINAL ? 64 : 63); @@ -801,76 +801,76 @@ MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, #endif gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // "Scoring" - sprintf(text, langGet(L_MPMENU_466)); + sprintf(text, lang_get(L_MPMENU_466)); x = renderdata->x + 83; y = renderdata->y + 1; gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, COLOUR(), vi_get_width(), vi_get_height(), 0, 0); // "10" - sprintf(text, langGet(L_MPMENU_467)); + sprintf(text, lang_get(L_MPMENU_467)); x = renderdata->x + 38; y = renderdata->y + 35; gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), vi_get_width(), vi_get_height(), 0, 0); // "5" - sprintf(text, langGet(L_MPMENU_468)); + sprintf(text, lang_get(L_MPMENU_468)); x = renderdata->x + 32; y = renderdata->y + 26; gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), vi_get_width(), vi_get_height(), 0, 0); // "2" - sprintf(text, langGet(L_MPMENU_469)); + sprintf(text, lang_get(L_MPMENU_469)); x = renderdata->x + 24; y = renderdata->y + 16; gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), vi_get_width(), vi_get_height(), 0, 0); // "1" - sprintf(text, langGet(L_MPMENU_470)); + sprintf(text, lang_get(L_MPMENU_470)); x = renderdata->x + 14; y = renderdata->y + 4; gdl = text0f153858(gdl, &x, &y, &textheight, &textwidth); - gdl = textRenderProjected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, COLOURWHITE(), vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153838(gdl); // Render lines between the score table and the target texture // Horizontal lines - bottom left - gdl = menugfxDrawFilledRect(gdl, renderdata->x + 45, renderdata->y + 36, renderdata->x + 81, renderdata->y + 37, linecolourtex, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 52, renderdata->y + 44, renderdata->x + 84, renderdata->y + 45, linecolourtex, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 62, renderdata->y + 50, renderdata->x + 87, renderdata->y + 51, linecolourtex, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 70, renderdata->y + 60, renderdata->x + 90, renderdata->y + 61, linecolourtex, linecolourmid); + gdl = menugfx_draw_filled_rect(gdl, renderdata->x + 45, renderdata->y + 36, renderdata->x + 81, renderdata->y + 37, linecolourtex, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 52, renderdata->y + 44, renderdata->x + 84, renderdata->y + 45, linecolourtex, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 62, renderdata->y + 50, renderdata->x + 87, renderdata->y + 51, linecolourtex, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 70, renderdata->y + 60, renderdata->x + 90, renderdata->y + 61, linecolourtex, linecolourmid); #if VERSION >= VERSION_JPN_FINAL // Vertical lines - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 82, renderdata->y + 37, linecolourmid, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 84, renderdata->y + 29, renderdata->x + 85, renderdata->y + 45, linecolourmid, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 87, renderdata->y + 41, renderdata->x + 88, renderdata->y + 51, linecolourmid, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 90, renderdata->y + 53, renderdata->x + 91, renderdata->y + 61, linecolourmid, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 82, renderdata->y + 37, linecolourmid, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 84, renderdata->y + 29, renderdata->x + 85, renderdata->y + 45, linecolourmid, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 87, renderdata->y + 41, renderdata->x + 88, renderdata->y + 51, linecolourmid, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 90, renderdata->y + 53, renderdata->x + 91, renderdata->y + 61, linecolourmid, linecolourmid); // Horizontal lines - top right - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 96, renderdata->y + 18, linecolourmid, linecolourfig); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 84, renderdata->y + 29, renderdata->x + 96, renderdata->y + 30, linecolourmid, linecolourfig); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 87, renderdata->y + 41, renderdata->x + 96, renderdata->y + 42, linecolourmid, linecolourfig); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 90, renderdata->y + 53, renderdata->x + 96, renderdata->y + 54, linecolourmid, linecolourfig); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 96, renderdata->y + 18, linecolourmid, linecolourfig); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 84, renderdata->y + 29, renderdata->x + 96, renderdata->y + 30, linecolourmid, linecolourfig); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 87, renderdata->y + 41, renderdata->x + 96, renderdata->y + 42, linecolourmid, linecolourfig); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 90, renderdata->y + 53, renderdata->x + 96, renderdata->y + 54, linecolourmid, linecolourfig); #else - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 82, renderdata->y + 37, linecolourmid, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 84, renderdata->y + 28, renderdata->x + 85, renderdata->y + 45, linecolourmid, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 87, renderdata->y + 39, renderdata->x + 88, renderdata->y + 51, linecolourmid, linecolourmid); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 90, renderdata->y + 50, renderdata->x + 91, renderdata->y + 61, linecolourmid, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 82, renderdata->y + 37, linecolourmid, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 84, renderdata->y + 28, renderdata->x + 85, renderdata->y + 45, linecolourmid, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 87, renderdata->y + 39, renderdata->x + 88, renderdata->y + 51, linecolourmid, linecolourmid); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 90, renderdata->y + 50, renderdata->x + 91, renderdata->y + 61, linecolourmid, linecolourmid); // Horizontal lines - top right - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 96, renderdata->y + 18, linecolourmid, linecolourfig); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 84, renderdata->y + 28, renderdata->x + 96, renderdata->y + 29, linecolourmid, linecolourfig); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 87, renderdata->y + 39, renderdata->x + 96, renderdata->y + 40, linecolourmid, linecolourfig); - gdl = menugfxDrawDialogBorderLine(gdl, renderdata->x + 90, renderdata->y + 50, renderdata->x + 96, renderdata->y + 51, linecolourmid, linecolourfig); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 81, renderdata->y + 17, renderdata->x + 96, renderdata->y + 18, linecolourmid, linecolourfig); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 84, renderdata->y + 28, renderdata->x + 96, renderdata->y + 29, linecolourmid, linecolourfig); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 87, renderdata->y + 39, renderdata->x + 96, renderdata->y + 40, linecolourmid, linecolourfig); + gdl = menugfx_draw_dialog_border_line(gdl, renderdata->x + 90, renderdata->y + 50, renderdata->x + 96, renderdata->y + 51, linecolourmid, linecolourfig); #endif return (s32)gdl; @@ -880,13 +880,13 @@ MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, } #if VERSION >= VERSION_NTSC_1_0 -MenuItemHandlerResult menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_fr_failed_continue(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { if (g_Vars.currentplayer->prop->rooms[0] == 0xa) { func0f0f3704(&g_FrWeaponListMenuDialog); } else { - menuPopDialog(); + menu_pop_dialog(); } } @@ -909,7 +909,7 @@ struct menuitem g_FrDifficultyMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPMENU_439, // "Bronze" L_OPTIONS_003, // "" - frDifficultyMenuHandler, + fr_difficulty_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -917,7 +917,7 @@ struct menuitem g_FrDifficultyMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPMENU_440, // "Silver" L_OPTIONS_003, // "" - frDifficultyMenuHandler, + fr_difficulty_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -925,7 +925,7 @@ struct menuitem g_FrDifficultyMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPMENU_441, // "Gold" L_OPTIONS_003, // "" - frDifficultyMenuHandler, + fr_difficulty_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -962,7 +962,7 @@ struct menuitem g_FrWeaponListMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG | MENUITEMFLAG_LIST_CUSTOMRENDER, 0x000000aa, 0, - frWeaponListMenuHandler, + fr_weapon_list_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -982,39 +982,39 @@ struct menuitem g_FrTrainingInfoInGameMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_443, // "Difficulty:" - (uintptr_t)&frMenuTextDifficultyName, + (uintptr_t)&fr_menu_text_difficulty_name, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (uintptr_t)&frMenuTextGoalScoreLabel, - (uintptr_t)&frMenuTextGoalScoreValue, + (uintptr_t)&fr_menu_text_goal_score_label, + (uintptr_t)&fr_menu_text_goal_score_value, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (uintptr_t)&frMenuTextMinAccuracyOrTargetsLabel, - (uintptr_t)&frMenuTextMinAccuracyOrTargetsValue, + (uintptr_t)&fr_menu_text_min_accuracy_or_targets_label, + (uintptr_t)&fr_menu_text_min_accuracy_or_targets_value, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (uintptr_t)&frMenuTextTimeLimitLabel, - (uintptr_t)&frMenuTextTimeLimitValue, + (uintptr_t)&fr_menu_text_time_limit_label, + (uintptr_t)&fr_menu_text_time_limit_value, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (uintptr_t)&frMenuTextAmmoLimitLabel, - (uintptr_t)&frMenuTextAmmoLimitValue, + (uintptr_t)&fr_menu_text_ammo_limit_label, + (uintptr_t)&fr_menu_text_ammo_limit_value, NULL, }, { @@ -1047,7 +1047,7 @@ struct menuitem g_FrTrainingInfoInGameMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG | MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_003, // "" L_MPMENU_428, // "Resume" - frDetailsOkMenuHandler, + fr_details_ok_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -1055,7 +1055,7 @@ struct menuitem g_FrTrainingInfoInGameMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG | MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_003, // "" L_MPMENU_430, // "Abort" - frAbortMenuHandler, + fr_abort_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -1064,7 +1064,7 @@ struct menudialogdef g_FrTrainingInfoInGameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_447, // "Training Info" g_FrTrainingInfoInGameMenuItems, - frTrainingInfoMenuDialog, + fr_training_info_menu_dialog, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE | MENUDIALOGFLAG_0400, NULL, }; @@ -1075,39 +1075,39 @@ struct menuitem g_FrTrainingInfoPreGameMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_443, // "Difficulty:" - (uintptr_t)&frMenuTextDifficultyName, + (uintptr_t)&fr_menu_text_difficulty_name, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (uintptr_t)&frMenuTextGoalScoreLabel, - (uintptr_t)&frMenuTextGoalScoreValue, + (uintptr_t)&fr_menu_text_goal_score_label, + (uintptr_t)&fr_menu_text_goal_score_value, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (uintptr_t)&frMenuTextMinAccuracyOrTargetsLabel, - (uintptr_t)&frMenuTextMinAccuracyOrTargetsValue, + (uintptr_t)&fr_menu_text_min_accuracy_or_targets_label, + (uintptr_t)&fr_menu_text_min_accuracy_or_targets_value, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (uintptr_t)&frMenuTextTimeLimitLabel, - (uintptr_t)&frMenuTextTimeLimitValue, + (uintptr_t)&fr_menu_text_time_limit_label, + (uintptr_t)&fr_menu_text_time_limit_value, NULL, }, { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_00000002, - (uintptr_t)&frMenuTextAmmoLimitLabel, - (uintptr_t)&frMenuTextAmmoLimitValue, + (uintptr_t)&fr_menu_text_ammo_limit_label, + (uintptr_t)&fr_menu_text_ammo_limit_value, NULL, }, { @@ -1140,7 +1140,7 @@ struct menuitem g_FrTrainingInfoPreGameMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG | MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_003, // "" L_MPMENU_427, // "Ok" - frDetailsOkMenuHandler, + fr_details_ok_menu_handler, }, { MENUITEMTYPE_SELECTABLE, @@ -1148,7 +1148,7 @@ struct menuitem g_FrTrainingInfoPreGameMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG | MENUITEMFLAG_SELECTABLE_CENTRE, L_OPTIONS_003, // "" L_MPMENU_429, // "Cancel" - frAbortMenuHandler, + fr_abort_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -1157,7 +1157,7 @@ struct menudialogdef g_FrTrainingInfoPreGameMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_447, // "Training Info" g_FrTrainingInfoPreGameMenuItems, - frTrainingInfoMenuDialog, + fr_training_info_menu_dialog, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE | MENUDIALOGFLAG_0400, NULL, }; @@ -1186,7 +1186,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_450, // "Score:" - (uintptr_t)&frMenuTextScoreValue, + (uintptr_t)&fr_menu_text_score_value, NULL, }, { @@ -1194,7 +1194,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_451, // "Targets Destroyed:" - (uintptr_t)&frMenuTextTargetsDestroyedValue, + (uintptr_t)&fr_menu_text_targets_destroyed_value, NULL, }, { @@ -1210,7 +1210,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_452, // "Difficulty:" - (uintptr_t)&frMenuTextDifficultyName, + (uintptr_t)&fr_menu_text_difficulty_name, NULL, }, { @@ -1218,7 +1218,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_453, // "Time Taken:" - (uintptr_t)&frMenuTextTimeTakenValue, + (uintptr_t)&fr_menu_text_time_taken_value, NULL, }, { @@ -1234,7 +1234,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_454, // "Weapon:" - (uintptr_t)&frMenuTextWeaponName, + (uintptr_t)&fr_menu_text_weapon_name, NULL, }, { @@ -1242,7 +1242,7 @@ struct menuitem g_FrCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_455, // "Accuracy:" - (uintptr_t)&frMenuTextAccuracyValue, + (uintptr_t)&fr_menu_text_accuracy_value, NULL, }, { @@ -1259,7 +1259,7 @@ struct menuitem g_FrCompletedMenuItems[] = { MENUITEMFLAG_00000002 | MENUITEMFLAG_LIST_CUSTOMRENDER, 0x000000d2, 0x00000050, - frScoringMenuHandler, + fr_scoring_menu_handler, }, #if VERSION >= VERSION_NTSC_1_0 { @@ -1268,7 +1268,7 @@ struct menuitem g_FrCompletedMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_252, // "Continue" 0, - menuhandlerFrFailedContinue, + menuhandler_fr_failed_continue, }, #endif { MENUITEMTYPE_END }, @@ -1278,7 +1278,7 @@ struct menudialogdef g_FrCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU_448, // "Training Stats" g_FrCompletedMenuItems, - frTrainingStatsMenuDialog, + fr_training_stats_menu_dialog, #if VERSION >= VERSION_NTSC_1_0 MENUDIALOGFLAG_STARTSELECTS, NULL, @@ -1293,7 +1293,7 @@ struct menuitem g_FrFailedMenuItems[] = { MENUITEMTYPE_LABEL, 0, MENUITEMFLAG_SELECTABLE_CENTRE, - (uintptr_t)&frMenuTextFailReason, + (uintptr_t)&fr_menu_text_fail_reason, 0, NULL, }, @@ -1312,7 +1312,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_450, // "Score:" - (uintptr_t)&frMenuTextScoreValue, + (uintptr_t)&fr_menu_text_score_value, NULL, }, { @@ -1320,7 +1320,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_451, // "Targets Destroyed:" - (uintptr_t)&frMenuTextTargetsDestroyedValue, + (uintptr_t)&fr_menu_text_targets_destroyed_value, NULL, }, { @@ -1336,7 +1336,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_452, // "Difficulty:" - (uintptr_t)&frMenuTextDifficultyName, + (uintptr_t)&fr_menu_text_difficulty_name, NULL, }, { @@ -1344,7 +1344,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_453, // "Time Taken:" - (uintptr_t)&frMenuTextTimeTakenValue, + (uintptr_t)&fr_menu_text_time_taken_value, NULL, }, { @@ -1360,7 +1360,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_454, // "Weapon:" - (uintptr_t)&frMenuTextWeaponName, + (uintptr_t)&fr_menu_text_weapon_name, NULL, }, { @@ -1368,7 +1368,7 @@ struct menuitem g_FrFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_455, // "Accuracy:" - (uintptr_t)&frMenuTextAccuracyValue, + (uintptr_t)&fr_menu_text_accuracy_value, NULL, }, { @@ -1385,7 +1385,7 @@ struct menuitem g_FrFailedMenuItems[] = { MENUITEMFLAG_00000002 | MENUITEMFLAG_LIST_CUSTOMRENDER, 0x000000d2, 0x00000050, - frScoringMenuHandler, + fr_scoring_menu_handler, }, #if VERSION >= VERSION_NTSC_1_0 { @@ -1394,7 +1394,7 @@ struct menuitem g_FrFailedMenuItems[] = { MENUITEMFLAG_SELECTABLE_CENTRE, L_MPWEAPONS_252, // "Continue" 0, - menuhandlerFrFailedContinue, + menuhandler_fr_failed_continue, }, #endif { MENUITEMTYPE_END }, @@ -1404,7 +1404,7 @@ struct menudialogdef g_FrFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU_448, // "Training Stats" g_FrFailedMenuItems, - frTrainingStatsMenuDialog, + fr_training_stats_menu_dialog, #if VERSION >= VERSION_NTSC_1_0 MENUDIALOGFLAG_STARTSELECTS, NULL, @@ -1414,15 +1414,15 @@ struct menudialogdef g_FrFailedMenuDialog = { #endif }; -MenuItemHandlerResult ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult ci_office_information_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[2] = { { 0, L_MPMENU_421 }, // "Character Profiles" { 0, L_MPMENU_422 }, // "Other Information" }; - s32 numunlockedchrbios = ciGetNumUnlockedChrBios(); - s32 numunlockedmiscbios = ciGetNumUnlockedMiscBios(); + s32 numunlockedchrbios = ci_get_num_unlocked_chr_bios(); + s32 numunlockedmiscbios = ci_get_num_unlocked_misc_bios(); struct chrbio *chrbio; struct miscbio *miscbio; @@ -1434,19 +1434,19 @@ MenuItemHandlerResult ciOfficeInformationMenuHandler(s32 operation, struct menui break; case MENUOP_GETOPTIONTEXT: if (data->list.value < numunlockedchrbios) { - chrbio = ciGetChrBioByBodynum(ciGetChrBioBodynumBySlot(data->list.value)); - return (s32) langGet(chrbio->name); + chrbio = ci_get_chr_bio_by_bodynum(ci_get_chr_bio_bodynum_by_slot(data->list.value)); + return (s32) lang_get(chrbio->name); } else { - miscbio = ciGetMiscBio(ciGetMiscBioIndexBySlot(data->list.value - numunlockedchrbios)); - return (s32) langGet(miscbio->name); + miscbio = ci_get_misc_bio(ci_get_misc_bio_index_by_slot(data->list.value - numunlockedchrbios)); + return (s32) lang_get(miscbio->name); } break; case MENUOP_SET: g_ChrBioSlot = data->list.value; if (g_ChrBioSlot < numunlockedchrbios) { - menuPushDialog(&g_BioProfileMenuDialog); + menu_push_dialog(&g_BioProfileMenuDialog); } else { - menuPushDialog(&g_BioTextMenuDialog); + menu_push_dialog(&g_BioTextMenuDialog); } break; case MENUOP_GETSELECTEDINDEX: @@ -1456,7 +1456,7 @@ MenuItemHandlerResult ciOfficeInformationMenuHandler(s32 operation, struct menui data->list.value = 2; break; case MENUOP_GETOPTGROUPTEXT: - return (s32) langGet(groups[data->list.value].name); + return (s32) lang_get(groups[data->list.value].name); case MENUOP_GETGROUPSTARTINDEX: data->list.groupstartindex = data->list.value == 0 ? 0 : numunlockedchrbios; break; @@ -1472,7 +1472,7 @@ struct menuitem g_BioListMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, 0x000000c8, 0, - ciOfficeInformationMenuHandler, + ci_office_information_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -1523,11 +1523,11 @@ struct menudialogdef g_NowSafeMenuDialog = { NULL, }; -MenuDialogHandlerResult ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult ci_character_profile_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { - u32 bodynum = ciGetChrBioBodynumBySlot(g_ChrBioSlot); - u32 mpbodynum = mpGetMpbodynumByBodynum(bodynum); - u32 mpheadnum = mpGetMpheadnumByMpbodynum(mpbodynum); + u32 bodynum = ci_get_chr_bio_bodynum_by_slot(g_ChrBioSlot); + u32 mpbodynum = mp_get_mpbodynum_by_bodynum(bodynum); + u32 mpheadnum = mp_get_mpheadnum_by_mpbodynum(mpbodynum); f32 x; f32 y; f32 scale; @@ -1549,26 +1549,26 @@ MenuDialogHandlerResult ciCharacterProfileMenuDialog(s32 operation, struct menud if (g_ViRes != VIRES_HI) { x = -117; - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { + if (options_get_screen_ratio() == SCREENRATIO_16_9) { x = -87; } } else { x = -177; - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { + if (options_get_screen_ratio() == SCREENRATIO_16_9) { x = -127; } } #elif VERSION == VERSION_PAL_BETA x = -117; - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { + if (options_get_screen_ratio() == SCREENRATIO_16_9) { x = -87; } #else x = -130; - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { + if (options_get_screen_ratio() == SCREENRATIO_16_9) { x = -100; } #endif @@ -1583,7 +1583,7 @@ MenuDialogHandlerResult ciCharacterProfileMenuDialog(s32 operation, struct menud scale = 0.8f; } - menuConfigureModel(&g_Menus[g_MpPlayerNum].menumodel, x, y, 0, 0, 0, 0, scale, + menu_configure_model(&g_Menus[g_MpPlayerNum].menumodel, x, y, 0, 0, 0, 0, scale, MENUMODELFLAG_HASSCALE | MENUMODELFLAG_HASPOSITION | MENUMODELFLAG_HASROTATION); g_Menus[g_MpPlayerNum].menumodel.curposx = 8.2f; @@ -1646,50 +1646,50 @@ MenuDialogHandlerResult ciCharacterProfileMenuDialog(s32 operation, struct menud return 0; } -char *ciMenuTextChrBioName(struct menuitem *item) +char *ci_menu_text_chr_bio_name(struct menuitem *item) { - struct chrbio *bio = ciGetChrBioByBodynum(ciGetChrBioBodynumBySlot(g_ChrBioSlot)); - sprintf(g_StringPointer, "%s\n", langGet(bio->name)); + struct chrbio *bio = ci_get_chr_bio_by_bodynum(ci_get_chr_bio_bodynum_by_slot(g_ChrBioSlot)); + sprintf(g_StringPointer, "%s\n", lang_get(bio->name)); return g_StringPointer; } -char *ciMenuTextChrBioAge(struct menuitem *item) +char *ci_menu_text_chr_bio_age(struct menuitem *item) { - struct chrbio *bio = ciGetChrBioByBodynum(ciGetChrBioBodynumBySlot(g_ChrBioSlot)); - sprintf(g_StringPointer, "%s\n", langGet(bio->age)); + struct chrbio *bio = ci_get_chr_bio_by_bodynum(ci_get_chr_bio_bodynum_by_slot(g_ChrBioSlot)); + sprintf(g_StringPointer, "%s\n", lang_get(bio->age)); return g_StringPointer; } -char *ciMenuTextChrBioRace(struct menuitem *item) +char *ci_menu_text_chr_bio_race(struct menuitem *item) { - struct chrbio *bio = ciGetChrBioByBodynum(ciGetChrBioBodynumBySlot(g_ChrBioSlot)); - sprintf(g_StringPointer, "%s\n", langGet(bio->race)); + struct chrbio *bio = ci_get_chr_bio_by_bodynum(ci_get_chr_bio_bodynum_by_slot(g_ChrBioSlot)); + sprintf(g_StringPointer, "%s\n", lang_get(bio->race)); return g_StringPointer; } -char *ciMenuTextMiscBioName(struct menuitem *item) +char *ci_menu_text_misc_bio_name(struct menuitem *item) { - struct miscbio *bio = ciGetMiscBio(ciGetMiscBioIndexBySlot(g_ChrBioSlot - ciGetNumUnlockedChrBios())); + struct miscbio *bio = ci_get_misc_bio(ci_get_misc_bio_index_by_slot(g_ChrBioSlot - ci_get_num_unlocked_chr_bios())); - sprintf(g_StringPointer, "%s\n", langGet(bio->name)); + sprintf(g_StringPointer, "%s\n", lang_get(bio->name)); return g_StringPointer; } -MenuItemHandlerResult dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult dt_device_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->list.value = dtGetNumAvailable(); + data->list.value = dt_get_num_available(); break; case MENUOP_GETOPTIONTEXT: - return (s32) bgunGetName(dtGetWeaponByDeviceIndex(dtGetIndexBySlot(data->list.value))); + return (s32) bgun_get_name(dt_get_weapon_by_device_index(dt_get_index_by_slot(data->list.value))); case MENUOP_SET: g_DtSlot = data->list.value; - menuPushDialog(&g_DtDetailsMenuDialog); + menu_push_dialog(&g_DtDetailsMenuDialog); break; case MENUOP_GETSELECTEDINDEX: data->list.value = g_DtSlot; @@ -1707,19 +1707,19 @@ MenuItemHandlerResult dtDeviceListMenuHandler(s32 operation, struct menuitem *it return 0; } -char *dtMenuTextName(struct menuitem *item) +char *dt_menu_text_name(struct menuitem *item) { - u32 weaponnum = dtGetWeaponByDeviceIndex(dtGetIndexBySlot(g_DtSlot)); + u32 weaponnum = dt_get_weapon_by_device_index(dt_get_index_by_slot(g_DtSlot)); - return bgunGetName(weaponnum); + return bgun_get_name(weaponnum); } -MenuItemHandlerResult menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult menuhandler_dt_ok_or_resume(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - // @bug: dtBegin() should not be called if training is already in + // @bug: dt_begin() should not be called if training is already in // progress. Doing this resets the training timer. - dtBegin(); + dt_begin(); func0f0f8120(); } @@ -1729,7 +1729,7 @@ MenuItemHandlerResult menuhandlerDtOkOrResume(s32 operation, struct menuitem *it MenuItemHandlerResult menuhandler001a6514(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - dtEnd(); + dt_end(); } return 0; @@ -1749,7 +1749,7 @@ struct menuitem g_BioProfileMenuItems[] = { 0, MENUITEMFLAG_NEWCOLUMN | MENUITEMFLAG_00000002, L_MPMENU_432, // "Name:" - (uintptr_t)&ciMenuTextChrBioName, + (uintptr_t)&ci_menu_text_chr_bio_name, NULL, }, { @@ -1757,7 +1757,7 @@ struct menuitem g_BioProfileMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_433, // "Age:" - (uintptr_t)&ciMenuTextChrBioAge, + (uintptr_t)&ci_menu_text_chr_bio_age, NULL, }, { @@ -1765,7 +1765,7 @@ struct menuitem g_BioProfileMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_434, // "Race:" - (uintptr_t)&ciMenuTextChrBioRace, + (uintptr_t)&ci_menu_text_chr_bio_race, NULL, }, { @@ -1807,7 +1807,7 @@ struct menudialogdef g_BioProfileMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MPMENU_431, // "Character Profile" g_BioProfileMenuItems, - ciCharacterProfileMenuDialog, + ci_character_profile_menu_dialog, MENUDIALOGFLAG_0002, NULL, }; @@ -1842,7 +1842,7 @@ struct menuitem g_BioTextMenuItems[] = { struct menudialogdef g_BioTextMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&ciMenuTextMiscBioName, + (uintptr_t)&ci_menu_text_misc_bio_name, g_BioTextMenuItems, NULL, MENUDIALOGFLAG_DISABLERESIZE, @@ -1856,7 +1856,7 @@ struct menuitem g_DtListMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, 0x000000a0, 0, - dtDeviceListMenuHandler, + dt_device_list_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -1870,12 +1870,12 @@ struct menudialogdef g_DtListMenuDialog = { NULL, }; -MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult dt_training_details_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { switch (operation) { case MENUOP_OPEN: { - s32 weaponnum = dtGetWeaponByDeviceIndex(dtGetIndexBySlot(g_DtSlot)); + s32 weaponnum = dt_get_weapon_by_device_index(dt_get_index_by_slot(g_DtSlot)); u16 unused[] = {64250, 38500, 25650, 25700, 12950}; func0f1a1ac0(); g_Menus[g_MpPlayerNum].training.weaponnum = weaponnum; @@ -1883,7 +1883,7 @@ MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudi #if VERSION == VERSION_PAL_FINAL if (g_ViRes == VIRES_HI) { - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { + if (options_get_screen_ratio() == SCREENRATIO_16_9) { g_Menus[g_MpPlayerNum].menumodel.newposx = 84; g_Menus[g_MpPlayerNum].menumodel.curposx = 84; } else { @@ -1891,7 +1891,7 @@ MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudi g_Menus[g_MpPlayerNum].menumodel.curposx = 104; } } else { - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { + if (options_get_screen_ratio() == SCREENRATIO_16_9) { g_Menus[g_MpPlayerNum].menumodel.newposx = 64; g_Menus[g_MpPlayerNum].menumodel.curposx = 64; } else { @@ -1900,7 +1900,7 @@ MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudi } } #elif VERSION == VERSION_PAL_BETA - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { + if (options_get_screen_ratio() == SCREENRATIO_16_9) { g_Menus[g_MpPlayerNum].menumodel.newposx = 64; g_Menus[g_MpPlayerNum].menumodel.curposx = 64; } else { @@ -1908,7 +1908,7 @@ MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudi g_Menus[g_MpPlayerNum].menumodel.curposx = 84; } #else - if (optionsGetScreenRatio() == SCREENRATIO_16_9) { + if (options_get_screen_ratio() == SCREENRATIO_16_9) { g_Menus[g_MpPlayerNum].menumodel.newposx = 70; g_Menus[g_MpPlayerNum].menumodel.curposx = 70; } else { @@ -1924,7 +1924,7 @@ MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudi break; case MENUOP_TICK: if (g_Menus[g_MpPlayerNum].curdialog && g_Menus[g_MpPlayerNum].curdialog->definition == dialogdef) { - if (dtGetWeaponByDeviceIndex(dtGetIndexBySlot(g_DtSlot)) == WEAPON_DISGUISE41) { + if (dt_get_weapon_by_device_index(dt_get_index_by_slot(g_DtSlot)) == WEAPON_DISGUISE41) { g_Menus[g_MpPlayerNum].menumodel.newanimnum = ANIM_006A; g_Menus[g_MpPlayerNum].menumodel.rottimer60 = TICKS(60); g_Menus[g_MpPlayerNum].menumodel.zoomtimer60 = TICKS(120); @@ -1939,31 +1939,31 @@ MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudi return 0; } -char *dtMenuTextOkOrResume(struct menuitem *item) +char *dt_menu_text_ok_or_resume(struct menuitem *item) { - struct trainingdata *data = dtGetData(); + struct trainingdata *data = dt_get_data(); if (data->intraining) { - return langGet(L_MPMENU_428); // "Resume" + return lang_get(L_MPMENU_428); // "Resume" } - return langGet(L_MPMENU_427); // "Ok" + return lang_get(L_MPMENU_427); // "Ok" } -char *dtMenuTextCancelOrAbort(struct menuitem *item) +char *dt_menu_text_cancel_or_abort(struct menuitem *item) { - struct trainingdata *data = dtGetData(); + struct trainingdata *data = dt_get_data(); if (data->intraining) { - return langGet(L_MPMENU_430); // "Abort" + return lang_get(L_MPMENU_430); // "Abort" } - return langGet(L_MPMENU_429); // "Cancel" + return lang_get(L_MPMENU_429); // "Cancel" } -char *dtMenuTextTimeTakenValue(struct menuitem *item) +char *dt_menu_text_time_taken_value(struct menuitem *item) { - struct trainingdata *data = dtGetData(); + struct trainingdata *data = dt_get_data(); f32 secs = data->timetaken / (PAL ? 50.0f : 60.0f); if (secs >= 60.0f) { @@ -1983,26 +1983,26 @@ char *dtMenuTextTimeTakenValue(struct menuitem *item) return g_StringPointer; } -MenuDialogHandlerResult menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_device_training_results(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_CLOSE) { - chrSetStageFlag(NULL, 0x08000000); + chr_set_stage_flag(NULL, 0x08000000); } return false; } -MenuItemHandlerResult htHoloListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult ht_holo_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->list.value = htGetNumUnlocked(); + data->list.value = ht_get_num_unlocked(); break; case MENUOP_GETOPTIONTEXT: - return (s32) htGetName(htGetIndexBySlot(data->list.value)); + return (s32) ht_get_name(ht_get_index_by_slot(data->list.value)); case MENUOP_SET: var80088bb4 = data->list.value; - menuPushDialog(&g_HtDetailsMenuDialog); + menu_push_dialog(&g_HtDetailsMenuDialog); break; case MENUOP_GETSELECTEDINDEX: data->list.value = var80088bb4; @@ -2020,15 +2020,15 @@ MenuItemHandlerResult htHoloListMenuHandler(s32 operation, struct menuitem *item return 0; } -char *htMenuTextName(struct menuitem *item) +char *ht_menu_text_name(struct menuitem *item) { - return htGetName(htGetIndexBySlot(var80088bb4)); + return ht_get_name(ht_get_index_by_slot(var80088bb4)); } MenuItemHandlerResult menuhandler001a6a34(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - htBegin(); + ht_begin(); func0f0f8120(); } @@ -2038,7 +2038,7 @@ MenuItemHandlerResult menuhandler001a6a34(s32 operation, struct menuitem *item, MenuItemHandlerResult menuhandler001a6a70(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_SET) { - htEnd(); + ht_end(); } return 0; @@ -2057,31 +2057,31 @@ MenuDialogHandlerResult menudialog001a6aa4(s32 operation, struct menudialogdef * return false; } -char *htMenuTextOkOrResume(struct menuitem *item) +char *ht_menu_text_ok_or_resume(struct menuitem *item) { - struct trainingdata *data = getHoloTrainingData(); + struct trainingdata *data = get_holo_training_data(); if (data->intraining) { - return langGet(L_MPMENU_428); // "Resume" + return lang_get(L_MPMENU_428); // "Resume" } - return langGet(L_MPMENU_427); // "Ok" + return lang_get(L_MPMENU_427); // "Ok" } -char *htMenuTextCancelOrAbort(struct menuitem *item) +char *ht_menu_text_cancel_or_abort(struct menuitem *item) { - struct trainingdata *data = getHoloTrainingData(); + struct trainingdata *data = get_holo_training_data(); if (data->intraining) { - return langGet(L_MPMENU_430); // "Abort" + return lang_get(L_MPMENU_430); // "Abort" } - return langGet(L_MPMENU_429); // "Cancel" + return lang_get(L_MPMENU_429); // "Cancel" } -char *htMenuTextTimeTakenValue(struct menuitem *item) +char *ht_menu_text_time_taken_value(struct menuitem *item) { - struct trainingdata *data = getHoloTrainingData(); + struct trainingdata *data = get_holo_training_data(); f32 secs = data->timetaken / (PAL ? 50.0f : 60.0f); if (secs >= 60.0f) { @@ -2101,31 +2101,31 @@ char *htMenuTextTimeTakenValue(struct menuitem *item) return g_StringPointer; } -MenuDialogHandlerResult menudialogFiringRangeResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult menudialog_firing_range_results(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { if (operation == MENUOP_CLOSE) { - chrSetStageFlag(NULL, 0x08000000); + chr_set_stage_flag(NULL, 0x08000000); } return false; } -char *bioMenuTextName(struct menuitem *item) +char *bio_menu_text_name(struct menuitem *item) { - struct hangarbio *bio = ciGetHangarBio(ciGetHangarBioIndexBySlot(g_HangarBioSlot)); + struct hangarbio *bio = ci_get_hangar_bio(ci_get_hangar_bio_index_by_slot(g_HangarBioSlot)); - return langGet(bio->name); + return lang_get(bio->name); } /** * The subheading is stored in the same string as the name, separated by a pipe. * eg. "Lucerne Tower\0|Global headquarters\n" */ -char *ciMenuTextHangarBioSubheading(struct menuitem *item) +char *ci_menu_text_hangar_bio_subheading(struct menuitem *item) { s32 index = 0; - struct hangarbio *bio = ciGetHangarBio(ciGetHangarBioIndexBySlot(g_HangarBioSlot)); - char *name = langGet(bio->name); + struct hangarbio *bio = ci_get_hangar_bio(ci_get_hangar_bio_index_by_slot(g_HangarBioSlot)); + char *name = lang_get(bio->name); while (name[index] != '|') { index++; @@ -2165,15 +2165,15 @@ struct menuitem g_DtDetailsMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - (uintptr_t)&dtMenuTextOkOrResume, + (uintptr_t)&dt_menu_text_ok_or_resume, 0, - menuhandlerDtOkOrResume, + menuhandler_dt_ok_or_resume, }, { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - (uintptr_t)&dtMenuTextCancelOrAbort, + (uintptr_t)&dt_menu_text_cancel_or_abort, 0, menuhandler001a6514, }, @@ -2182,9 +2182,9 @@ struct menuitem g_DtDetailsMenuItems[] = { struct menudialogdef g_DtDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&dtMenuTextName, + (uintptr_t)&dt_menu_text_name, g_DtDetailsMenuItems, - dtTrainingDetailsMenuDialog, + dt_training_details_menu_dialog, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLERESIZE, NULL, }; @@ -2211,7 +2211,7 @@ struct menuitem g_DtFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_424, // "Time Taken:" - (uintptr_t)&dtMenuTextTimeTakenValue, + (uintptr_t)&dt_menu_text_time_taken_value, NULL, }, { @@ -2237,7 +2237,7 @@ struct menudialogdef g_DtFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU_423, // "Training Stats" g_DtFailedMenuItems, - menudialogDeviceTrainingResults, + menudialog_device_training_results, MENUDIALOGFLAG_DISABLERESIZE, &g_DtListMenuDialog, }; @@ -2264,7 +2264,7 @@ struct menuitem g_DtCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_424, // "Time Taken:" - (uintptr_t)&dtMenuTextTimeTakenValue, + (uintptr_t)&dt_menu_text_time_taken_value, NULL, }, { @@ -2290,7 +2290,7 @@ struct menudialogdef g_DtCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU_423, // "Training Stats" g_DtCompletedMenuItems, - menudialogDeviceTrainingResults, + menudialog_device_training_results, MENUDIALOGFLAG_DISABLERESIZE, &g_DtListMenuDialog, }; @@ -2302,7 +2302,7 @@ struct menuitem g_HtListMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, 0x000000a0, 0, - htHoloListMenuHandler, + ht_holo_list_menu_handler, }, { MENUITEMTYPE_END }, }; @@ -2345,7 +2345,7 @@ struct menuitem g_HtDetailsMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - (uintptr_t)&htMenuTextOkOrResume, + (uintptr_t)&ht_menu_text_ok_or_resume, 0, menuhandler001a6a34, }, @@ -2353,7 +2353,7 @@ struct menuitem g_HtDetailsMenuItems[] = { MENUITEMTYPE_SELECTABLE, 0, MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, - (uintptr_t)&htMenuTextCancelOrAbort, + (uintptr_t)&ht_menu_text_cancel_or_abort, 0, menuhandler001a6a70, }, @@ -2362,7 +2362,7 @@ struct menuitem g_HtDetailsMenuItems[] = { struct menudialogdef g_HtDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&htMenuTextName, + (uintptr_t)&ht_menu_text_name, g_HtDetailsMenuItems, menudialog001a6aa4, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_STARTSELECTS | MENUDIALOGFLAG_DISABLERESIZE, @@ -2391,7 +2391,7 @@ struct menuitem g_HtFailedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_424, // "Time Taken:" - (uintptr_t)&htMenuTextTimeTakenValue, + (uintptr_t)&ht_menu_text_time_taken_value, NULL, }, { @@ -2423,7 +2423,7 @@ struct menudialogdef g_HtFailedMenuDialog = { MENUDIALOGTYPE_DANGER, L_MPMENU_423, // "Training Stats" g_HtFailedMenuItems, - menudialogFiringRangeResults, + menudialog_firing_range_results, MENUDIALOGFLAG_DISABLERESIZE, &g_HtListMenuDialog, }; @@ -2450,7 +2450,7 @@ struct menuitem g_HtCompletedMenuItems[] = { 0, MENUITEMFLAG_00000002, L_MPMENU_424, // "Time Taken:" - (uintptr_t)&htMenuTextTimeTakenValue, + (uintptr_t)&ht_menu_text_time_taken_value, NULL, }, { @@ -2482,12 +2482,12 @@ struct menudialogdef g_HtCompletedMenuDialog = { MENUDIALOGTYPE_SUCCESS, L_MPMENU_423, // "Training Stats" g_HtCompletedMenuItems, - menudialogFiringRangeResults, + menudialog_firing_range_results, MENUDIALOGFLAG_DISABLERESIZE, &g_HtListMenuDialog, }; -MenuItemHandlerResult ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult ci_hangar_information_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { struct optiongroup groups[2] = { { 0, L_MPMENU_419 }, // "Locations" @@ -2497,23 +2497,23 @@ MenuItemHandlerResult ciHangarInformationMenuHandler(s32 operation, struct menui s32 bioindex; struct hangarbio *bio; - groups[1].offset = ciGetNumUnlockedLocationBios(); + groups[1].offset = ci_get_num_unlocked_location_bios(); switch (operation) { case MENUOP_GETOPTIONCOUNT: - data->list.value = ciGetNumUnlockedHangarBios(); + data->list.value = ci_get_num_unlocked_hangar_bios(); break; case MENUOP_GETOPTIONTEXT: - bio = ciGetHangarBio(ciGetHangarBioIndexBySlot(data->list.value)); - return (s32) langGet(bio->name); + bio = ci_get_hangar_bio(ci_get_hangar_bio_index_by_slot(data->list.value)); + return (s32) lang_get(bio->name); case MENUOP_SET: g_HangarBioSlot = data->list.value; - bioindex = ciGetHangarBioIndexBySlot(g_HangarBioSlot); + bioindex = ci_get_hangar_bio_index_by_slot(g_HangarBioSlot); if (bioindex <= HANGARBIO_SKEDARRUINS) { - menuPushDialog(&g_HangarLocationDetailsMenuDialog); + menu_push_dialog(&g_HangarLocationDetailsMenuDialog); } else { - menuPushDialog(&g_HangarVehicleDetailsMenuDialog); + menu_push_dialog(&g_HangarVehicleDetailsMenuDialog); } break; case MENUOP_GETSELECTEDINDEX: @@ -2523,7 +2523,7 @@ MenuItemHandlerResult ciHangarInformationMenuHandler(s32 operation, struct menui data->list.value = 2; break; case MENUOP_GETOPTGROUPTEXT: - return (s32) langGet(groups[data->list.value].name); + return (s32) lang_get(groups[data->list.value].name); case MENUOP_GETGROUPSTARTINDEX: data->list.groupstartindex = data->list.value == 0 ? 0 : groups[1].offset; break; @@ -2532,7 +2532,7 @@ MenuItemHandlerResult ciHangarInformationMenuHandler(s32 operation, struct menui return 0; } -MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data) +MenuItemHandlerResult ci_hangar_title_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data) { if (operation == MENUOP_RENDER) { Gfx *gdl = data->type19.gdl; @@ -2541,7 +2541,7 @@ MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *i s32 textheight; s32 leftmargin; char *text; - s32 index = ciGetHangarBioIndexBySlot(g_HangarBioSlot); + s32 index = ci_get_hangar_bio_index_by_slot(g_HangarBioSlot); if (index < NUM_BIO_LOCATIONS) { // Location bio - render texture @@ -2554,7 +2554,7 @@ MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *i gDPSetTextureLOD(gdl++, G_TL_TILE); gDPSetTextureConvert(gdl++, G_TC_FILT); - texSelect(&gdl, &g_TexGeneralConfigs[texturenum], 1, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[texturenum], 1, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA); @@ -2578,8 +2578,8 @@ MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *i gdl = text0f153628(gdl); // Render title - text = bioMenuTextName(NULL); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, 0); + text = bio_menu_text_name(NULL); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, 0); if (leftmargin == -1) { textwidth = renderdata->x + 64; @@ -2588,11 +2588,11 @@ MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *i } textheight = renderdata->y + 8; - gdl = textRenderProjected(gdl, &textwidth, &textheight, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &textwidth, &textheight, text, g_CharsHandelGothicMd, g_FontHandelGothicMd, renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); // Render subheading - text = ciMenuTextHangarBioSubheading(NULL); - textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); + text = ci_menu_text_hangar_bio_subheading(NULL); + text_measure(&textheight, &textwidth, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, 0); if (leftmargin == -1) { textwidth = renderdata->x + 64; @@ -2601,7 +2601,7 @@ MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *i } textheight = renderdata->y + 25; - gdl = textRenderProjected(gdl, &textwidth, &textheight, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, viGetWidth(), viGetHeight(), 0, 0); + gdl = text_render_projected(gdl, &textwidth, &textheight, text, g_CharsHandelGothicSm, g_FontHandelGothicSm, renderdata->colour, vi_get_width(), vi_get_height(), 0, 0); gdl = text0f153780(gdl); @@ -2624,9 +2624,9 @@ struct modelpartvisibility g_BioPartVisibility[] = { { 255 }, }; -MenuDialogHandlerResult ciHangarHolographMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) +MenuDialogHandlerResult ci_hangar_holograph_menu_dialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data) { - s32 index = ciGetHangarBioIndexBySlot(g_HangarBioSlot); + s32 index = ci_get_hangar_bio_index_by_slot(g_HangarBioSlot); if (index >= NUM_BIO_LOCATIONS) { struct biovehicleitem items[] = { @@ -2715,7 +2715,7 @@ MenuDialogHandlerResult ciHangarHolographMenuDialog(s32 operation, struct menudi return 0; } -struct menudialogdef *ciGetFrWeaponListMenuDialog(void) +struct menudialogdef *ci_get_fr_weapon_list_menu_dialog(void) { return &g_FrWeaponListMenuDialog; } @@ -2727,7 +2727,7 @@ struct menuitem g_HangarDetailsMenuItems[] = { MENUITEMFLAG_00000002 | MENUITEMFLAG_LIST_CUSTOMRENDER, 0x00000104, 0x0000002c, - ciHangarTitleMenuHandler, + ci_hangar_title_menu_handler, }, { MENUITEMTYPE_SEPARATOR, @@ -2796,14 +2796,14 @@ struct menudialogdef g_HangarVehicleHolographMenuDialog = { MENUDIALOGTYPE_DEFAULT, L_MISC_471, // "Holograph" g_HangarVehicleHolographMenuItems, - ciHangarHolographMenuDialog, + ci_hangar_holograph_menu_dialog, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE, NULL, }; struct menudialogdef g_HangarVehicleDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&bioMenuTextName, + (uintptr_t)&bio_menu_text_name, g_HangarDetailsMenuItems, NULL, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE, @@ -2812,7 +2812,7 @@ struct menudialogdef g_HangarVehicleDetailsMenuDialog = { struct menudialogdef g_HangarLocationDetailsMenuDialog = { MENUDIALOGTYPE_DEFAULT, - (uintptr_t)&bioMenuTextName, + (uintptr_t)&bio_menu_text_name, g_HangarDetailsMenuItems, NULL, MENUDIALOGFLAG_0002 | MENUDIALOGFLAG_DISABLERESIZE, @@ -2826,7 +2826,7 @@ struct menuitem g_HangarListMenuItems[] = { MENUITEMFLAG_SELECTABLE_CLOSESDIALOG, 0x000000a0, 0, - ciHangarInformationMenuHandler, + ci_hangar_information_menu_handler, }, { MENUITEMTYPE_END }, }; diff --git a/src/game/utils.c b/src/game/utils.c index 0432870f4..a0733d617 100644 --- a/src/game/utils.c +++ b/src/game/utils.c @@ -78,17 +78,17 @@ u32 align32(u32 arg0) return arg0; } -void utilsInit(void) +void utils_init(void) { s32 i; u32 stack; u32 slotssize = 0x1900; u32 allocsize; - var800ac0d0 = mempAlloc(10000, MEMPOOL_8); + var800ac0d0 = memp_alloc(10000, MEMPOOL_8); allocsize = align16(0x3900); - var800ac0e8[0] = mempAlloc(allocsize, MEMPOOL_8); + var800ac0e8[0] = memp_alloc(allocsize, MEMPOOL_8); if (var800ac0e8[0] != NULL) { for (i = 0; i < ARRAYCOUNT(var800ac0e8); i++) { @@ -247,7 +247,7 @@ bool func0f1773c8(struct coord *a, struct coord *b) return false; } -f32 coordsGetDistance(struct coord *a, struct coord *b) +f32 coords_get_distance(struct coord *a, struct coord *b) { f32 xdiff = b->x - a->x; f32 ydiff = b->y - a->y; @@ -363,7 +363,7 @@ bool func0f1777b8(struct coord *a, struct coord *b, struct coord *c, struct coor return true; } -void utilsReset(void) +void utils_reset(void) { s32 i; diff --git a/src/game/varsreset.c b/src/game/varsreset.c index 29d301316..3431c2849 100644 --- a/src/game/varsreset.c +++ b/src/game/varsreset.c @@ -7,14 +7,14 @@ #include "data.h" #include "types.h" -void varsResetRoomProps(void); +void vars_reset_room_props(void); -void varsReset(void) +void vars_reset(void) { s32 i; - g_Vars.props = mempAlloc(ALIGN64(g_Vars.maxprops * sizeof(struct prop)), MEMPOOL_STAGE); - g_Vars.onscreenprops = mempAlloc(ALIGN64(200 * sizeof(void *)), MEMPOOL_STAGE); + g_Vars.props = memp_alloc(ALIGN64(g_Vars.maxprops * sizeof(struct prop)), MEMPOOL_STAGE); + g_Vars.onscreenprops = memp_alloc(ALIGN64(200 * sizeof(void *)), MEMPOOL_STAGE); g_AutoAimScale = 1; @@ -34,7 +34,7 @@ void varsReset(void) g_Vars.props[i].next = &g_Vars.props[i + 1]; } - varsResetRoomProps(); + vars_reset_room_props(); if (g_Vars.normmplayerisrunning) { g_Vars.numpropstates = 4; @@ -58,13 +58,13 @@ void varsReset(void) } } -void varsResetRoomProps(void) +void vars_reset_room_props(void) { s32 i; s32 j; - g_RoomPropListChunkIndexes = mempAlloc(ALIGN16(g_Vars.roomcount * sizeof(s16)), MEMPOOL_STAGE); - g_RoomPropListChunks = mempAlloc(MAX_ROOMPROPLISTCHUNKS * sizeof(struct roomproplistchunk), MEMPOOL_STAGE); + g_RoomPropListChunkIndexes = memp_alloc(ALIGN16(g_Vars.roomcount * sizeof(s16)), MEMPOOL_STAGE); + g_RoomPropListChunks = memp_alloc(MAX_ROOMPROPLISTCHUNKS * sizeof(struct roomproplistchunk), MEMPOOL_STAGE); for (i = 0; i < g_Vars.roomcount; i++) { g_RoomPropListChunkIndexes[i] = -1; diff --git a/src/game/vmstats.c b/src/game/vmstats.c index 6df2190cc..e7702c97f 100644 --- a/src/game/vmstats.c +++ b/src/game/vmstats.c @@ -6,23 +6,23 @@ #include "data.h" #include "types.h" -void vmPrintStatsIfEnabled(void) +void vm_print_stats_if_enabled(void) { char buffer[80]; if (g_Is4Mb) { #ifdef DEBUG if (g_VmShowStats) { - dhudSetFgColour(0xff, 0xff, 0xff, 0xff); - dhudSetBgColour(0, 0, 0, 0xff); + dhud_set_fg_colour(0xff, 0xff, 0xff, 0xff); + dhud_set_bg_colour(0, 0, 0, 0xff); sprintf(buffer, "VM: Page Misses %d (%d Replaces)", g_VmNumPageMisses, g_VmNumPageReplaces); - dhudSetPos(2, 1); - dhudPrintString(buffer); + dhud_set_pos(2, 1); + dhud_print_string(buffer); sprintf(buffer, "VM: TLB Misses %d", g_VmNumTlbMisses); - dhudSetPos(2, 2); - dhudPrintString(buffer); + dhud_set_pos(2, 2); + dhud_print_string(buffer); } #endif diff --git a/src/game/vtxstore.c b/src/game/vtxstore.c index de494845e..09791afbb 100644 --- a/src/game/vtxstore.c +++ b/src/game/vtxstore.c @@ -46,7 +46,7 @@ struct vtxstoretype g_VtxstoreTypes[] = { * Search all props and their model data for something, and replace it with * something else. */ -void vtxstoreFixRefs(void *find, void *replacement) +void vtxstore_fix_refs(void *find, void *replacement) { u32 stack; struct prop *prop = g_Vars.activeprops; @@ -69,13 +69,13 @@ void vtxstoreFixRefs(void *find, void *replacement) } break; case MODELNODETYPE_DISTANCE: - modelApplyDistanceRelations(obj->model, node); + model_apply_distance_relations(obj->model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(obj->model, node); + model_apply_toggle_relations(obj->model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(obj->model, node); + model_apply_head_relations(obj->model, node); break; } @@ -98,7 +98,7 @@ void vtxstoreFixRefs(void *find, void *replacement) } } -void vtxstoreTick(void) +void vtxstore_tick(void) { s32 i; s32 j; @@ -111,9 +111,9 @@ void vtxstoreTick(void) && g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[i].node == g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].node && g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[i].level == g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].level) { s32 size = ALIGN16(g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].count * 0x0c); - vtxstoreFixRefs(g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].unk00, g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[i].unk00); + vtxstore_fix_refs(g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].unk00, g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[i].unk00); g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[i].unk0e += g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].unk0e; - memaFree(g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].unk00, size); + mema_free(g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].unk00, size); g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].unk0e = 0; g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].val2 += g_VtxstoreTypes[VTXSTORETYPE_OBJVTX].unk24[j].count; } @@ -127,7 +127,7 @@ void vtxstoreTick(void) } } -void *vtxstoreAllocate(s32 count, s32 index, struct modelnode *node, s32 level) +void *vtxstore_allocate(s32 count, s32 index, struct modelnode *node, s32 level) { s32 i; s32 numchrs; @@ -146,12 +146,12 @@ void *vtxstoreAllocate(s32 count, s32 index, struct modelnode *node, s32 level) for (i = 0; i < g_VtxstoreTypes[index].numallocated; i++) { if (g_VtxstoreTypes[index].unk24[i].unk0e == 0) { size = ALIGN16(count * 0xc); - g_VtxstoreTypes[index].unk24[i].unk00 = memaAlloc(size); + g_VtxstoreTypes[index].unk24[i].unk00 = mema_alloc(size); #if VERSION < VERSION_NTSC_1_0 if (!g_VtxstoreTypes[index].unk24[i].unk00) { - bgGarbageCollectRooms(size, false); - g_VtxstoreTypes[index].unk24[i].unk00 = memaAlloc(size); + bg_garbage_collect_rooms(size, false); + g_VtxstoreTypes[index].unk24[i].unk00 = mema_alloc(size); } #endif @@ -174,7 +174,7 @@ void *vtxstoreAllocate(s32 count, s32 index, struct modelnode *node, s32 level) // reaping on a random corpse and replace its entry in the array. // So at the end, we'll have an array of up to six unreapable corpses and // all other corpses will be flagged for reaping. - numchrs = chrsGetNumSlots(); + numchrs = chrs_get_num_slots(); tally = 0; for (i = 0; i < numchrs; i++) { @@ -190,7 +190,7 @@ void *vtxstoreAllocate(s32 count, s32 index, struct modelnode *node, s32 level) tally++; } else { rand = random() % tally; - chrFadeCorpseWhenOffScreen(chrs[rand]); + chr_fade_corpse_when_off_screen(chrs[rand]); chrs[rand] = chr; } } @@ -205,7 +205,7 @@ void *vtxstoreAllocate(s32 count, s32 index, struct modelnode *node, s32 level) i = random() % tally; if (chrs[i]) { - chrFadeCorpseWhenOffScreen(chrs[i]); + chr_fade_corpse_when_off_screen(chrs[i]); chrs[i] = NULL; rand--; } @@ -214,7 +214,7 @@ void *vtxstoreAllocate(s32 count, s32 index, struct modelnode *node, s32 level) return NULL; } -void vtxstoreFree(s32 type, void *arg1) +void vtxstore_free(s32 type, void *arg1) { s32 i; @@ -226,7 +226,7 @@ void vtxstoreFree(s32 type, void *arg1) return; } - memaFree(g_VtxstoreTypes[type].unk24[i].unk00, ALIGN16(g_VtxstoreTypes[type].unk24[i].count * 0xc)); + mema_free(g_VtxstoreTypes[type].unk24[i].unk00, ALIGN16(g_VtxstoreTypes[type].unk24[i].count * 0xc)); g_VtxstoreTypes[type].val2 += g_VtxstoreTypes[type].unk24[i].count; return; diff --git a/src/game/vtxstorereset.c b/src/game/vtxstorereset.c index a95e0a244..bd12e51af 100644 --- a/src/game/vtxstorereset.c +++ b/src/game/vtxstorereset.c @@ -5,7 +5,7 @@ #include "data.h" #include "types.h" -void vtxstoreReset(void) +void vtxstore_reset(void) { s32 i; s32 j; @@ -25,7 +25,7 @@ void vtxstoreReset(void) } if (num > 0) { - g_VtxstoreTypes[i].unk24 = mempAlloc(num * sizeof(struct var8007e3d0_data), MEMPOOL_STAGE); + g_VtxstoreTypes[i].unk24 = memp_alloc(num * sizeof(struct var8007e3d0_data), MEMPOOL_STAGE); } for (j = 0; j < num; j++) { diff --git a/src/game/wallhit.c b/src/game/wallhit.c index 3c23a9771..0839a7501 100644 --- a/src/game/wallhit.c +++ b/src/game/wallhit.c @@ -67,7 +67,7 @@ struct wallhittex g_WallhitTexes[] = { /*0x11*/ { 6, 6, WALLHITTYPE_BULLET }, // WALLHITTEX_METAL }; -s16 wallhitFinaliseAxis(f32 value) +s16 wallhit_finalise_axis(f32 value) { if (value > var8007f754) { var8007f754 = value; @@ -90,7 +90,7 @@ s16 wallhitFinaliseAxis(f32 value) return value; } -void wallhitFree(struct wallhit *wallhit) +void wallhit_free(struct wallhit *wallhit) { struct wallhit *iter; s32 i; @@ -192,46 +192,46 @@ void wallhitFree(struct wallhit *wallhit) } } -void wallhitsFreeByProp(struct prop *prop, s8 layer) +void wallhits_free_by_prop(struct prop *prop, s8 layer) { struct prop *copy = prop; if (layer) { while (copy->xluwallhits) { - wallhitFade(copy->xluwallhits, 1); - wallhitFree(copy->xluwallhits); + wallhit_fade(copy->xluwallhits, 1); + wallhit_free(copy->xluwallhits); } } else { while (copy->opawallhits) { - wallhitFade(copy->opawallhits, 1); - wallhitFree(copy->opawallhits); + wallhit_fade(copy->opawallhits, 1); + wallhit_free(copy->opawallhits); } } } -bool chrIsUsingPaintball(struct chrdata *chr) +bool chr_is_using_paintball(struct chrdata *chr) { s32 prevplayernum = g_Vars.currentplayernum; bool paintball; if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) { - setCurrentPlayerNum(playermgrGetPlayerNumByProp(chr->prop)); + set_current_player_num(playermgr_get_player_num_by_prop(chr->prop)); } else { - setCurrentPlayerNum(random() % PLAYERCOUNT()); + set_current_player_num(random() % PLAYERCOUNT()); } - paintball = optionsGetPaintball(g_Vars.currentplayerstats->mpindex); + paintball = options_get_paintball(g_Vars.currentplayerstats->mpindex); - setCurrentPlayerNum(prevplayernum); + set_current_player_num(prevplayernum); return paintball; } -void wallhitChooseBloodColour(struct prop *prop) +void wallhit_choose_blood_colour(struct prop *prop) { if (prop && prop->chr && (prop->type == PROPTYPE_CHR || prop->type == PROPTYPE_PLAYER)) { struct chrdata *chr = prop->chr; - chrGetBloodColour(chr->bodynum, g_WallhitBloodColour, NULL); + chr_get_blood_colour(chr->bodynum, g_WallhitBloodColour, NULL); } else { g_WallhitBloodColour[0] = 0x40; g_WallhitBloodColour[1] = 0x0a; @@ -239,7 +239,7 @@ void wallhitChooseBloodColour(struct prop *prop) } } -void wallhitFade(struct wallhit *wallhit, u32 arg1) +void wallhit_fade(struct wallhit *wallhit, u32 arg1) { if (!wallhit->fading) { if (wallhit->objprop) { @@ -279,7 +279,7 @@ void wallhitFade(struct wallhit *wallhit, u32 arg1) * be favoured over a blood puddle. The actual wallhit to be removed will * be the oldest one that meets that criteria. */ -bool wallhitRemoveOneInRoom(s32 room) +bool wallhit_remove_one_in_room(s32 room) { if (room == -1 || g_WallhitCountsPerRoom[room]) { f32 ratio = 0.0f; @@ -333,15 +333,15 @@ bool wallhitRemoveOneInRoom(s32 room) if (ratio > g_WallhitTargetBloodRatio && (blooddropindex != -1 || bloodpuddleindex != -1)) { if (blooddropindex != -1) { - wallhitFade(&g_Wallhits[blooddropindex], TICKS(30)); + wallhit_fade(&g_Wallhits[blooddropindex], TICKS(30)); return true; } else { - wallhitFade(&g_Wallhits[bloodpuddleindex], TICKS(30)); + wallhit_fade(&g_Wallhits[bloodpuddleindex], TICKS(30)); return true; } } else { if (otherindex != -1) { - wallhitFade(&g_Wallhits[otherindex], TICKS(30)); + wallhit_fade(&g_Wallhits[otherindex], TICKS(30)); return true; } } @@ -360,7 +360,7 @@ bool wallhitRemoveOneInRoom(s32 room) * The chosen room will be the one with the most wallhits within one of those * three categories. */ -void wallhitRemoveOne(void) +void wallhit_remove_one(void) { s32 room; u32 i; @@ -398,7 +398,7 @@ void wallhitRemoveOne(void) s32 min = bestroom == 0 ? g_MinPropWallhits : g_MinBgWallhitsPerRoom; if (g_WallhitCountsPerRoom[bestroom] > min) { - if (wallhitRemoveOneInRoom(bestroom)) { + if (wallhit_remove_one_in_room(bestroom)) { done = true; } } @@ -406,13 +406,13 @@ void wallhitRemoveOne(void) } if (!done) { - wallhitRemoveOneInRoom(-1); + wallhit_remove_one_in_room(-1); } if (1); } -void wallhitsTick(void) +void wallhits_tick(void) { f32 sp12c; f32 fov; @@ -432,9 +432,9 @@ void wallhitsTick(void) static s32 var8007f834 = 0; sp12c = (g_Vars.lvupdate240 + 2.0f) * 0.25f; - fov = currentPlayerGetGunZoomFov(); + fov = current_player_get_gun_zoom_fov(); - mainOverrideVariable("wallhit", &var8007f750); + main_override_variable("wallhit", &var8007f750); var8007f740 = 0; @@ -450,13 +450,13 @@ void wallhitsTick(void) numallocated = g_WallhitsNumFree + g_WallhitsNumUsed; if (numallocated < g_WallhitsCriticalSpareLimit) { - wallhitRemoveOne(); + wallhit_remove_one(); } else if (numallocated < g_WallhitsGoalSpareLimit) { var8007f834++; if (var8007f834 == 8) { var8007f834 = 0; - wallhitRemoveOne(); + wallhit_remove_one(); } } @@ -488,7 +488,7 @@ void wallhitsTick(void) if (amount < wallhit->timercur) { wallhit->timercur -= amount; } else { - wallhitFree(wallhit); + wallhit_free(wallhit); } } @@ -512,7 +512,7 @@ void wallhitsTick(void) f30 = (1.0f - frac) * sinf(tmp); f22 = 1.0f - tmp + 0.6f; - wallhit->vertices2 = gfxAllocateVertices(4); + wallhit->vertices2 = gfx_allocate_vertices(4); midx = var800845dc.x; \ midy = var800845dc.y; \ @@ -632,7 +632,7 @@ const char var7f1b5c24[] = "tLifeTime=%s%s%f, tScalarGbl=%f"; const char var7f1b5c44[] = ""; const char var7f1b5c48[] = ""; -void wallhitCreate(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], +void wallhit_create(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], s16 arg4[3], s16 texnum, RoomNum room, struct prop *objprop, s8 mtxindex, s8 arg9, struct chrdata *chr, bool xlu) { @@ -640,14 +640,14 @@ void wallhitCreate(struct coord *relpos, struct coord *arg1, struct coord *arg2, f32 width = g_WallhitTexes[texnum].width * scale; f32 height = g_WallhitTexes[texnum].height * scale; - wallhitCreateWith20Args(relpos, arg1, arg2, arg3, + wallhit_create_with_20_args(relpos, arg1, arg2, arg3, arg4, texnum, room, objprop, NULL, mtxindex, arg9, chr, width, height, 0xff, 0xff, 0, 0, 0, xlu); } -void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], +void wallhit_create_with_20_args(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], s16 arg4[3], s16 texnum, RoomNum room, struct prop *objprop, struct prop *chrprop, s8 mtxindex, s8 arg10, struct chrdata *chr, f32 width, f32 height, u8 minalpha, u8 maxalpha, @@ -693,7 +693,7 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co #endif #if VERSION >= VERSION_NTSC_1_0 - paintball = chrIsUsingPaintball(chr); + paintball = chr_is_using_paintball(chr); if (paintball && g_WallhitTexes[texnum].type != WALLHITTYPE_BLOOD) { if (texnum != WALLHITTEX_SCORCH) { @@ -745,7 +745,7 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co break; } - if (chrIsUsingPaintball(chr) && g_WallhitTexes[texnum].type != WALLHITTYPE_BLOOD) { + if (chr_is_using_paintball(chr) && g_WallhitTexes[texnum].type != WALLHITTYPE_BLOOD) { if (texnum != WALLHITTEX_SCORCH) { width = 15.0f; height = 15.0f; @@ -771,11 +771,11 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co } if (g_WallhitCountsPerRoom[room2] > max) { - if (!wallhitRemoveOneInRoom(room2)) { + if (!wallhit_remove_one_in_room(room2)) { return; } } else if (g_WallhitCountsPerRoom[room] > g_MaxBgWallhitsPerRoom) { - if (!wallhitRemoveOneInRoom(room)) { + if (!wallhit_remove_one_in_room(room)) { return; } } @@ -948,8 +948,8 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co sp78.y = sp1d0.y; sp78.z = sp1d0.z; - mtx4RotateVecInPlace(mtx, &sp84); - mtx4RotateVecInPlace(mtx, &sp78); + mtx4_rotate_vec_in_place(mtx, &sp84); + mtx4_rotate_vec_in_place(mtx, &sp78); width /= sqrtf(sp84.x * sp84.x + sp84.y * sp84.y + sp84.z * sp84.z); height /= sqrtf(sp78.x * sp78.x + sp78.y * sp78.y + sp78.z * sp78.z); @@ -960,7 +960,7 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co obj->hidden2 |= OBJH2FLAG_HASOPA; } } else { - struct coord *roompos = roomGetPosPtr(room); + struct coord *roompos = room_get_pos_ptr(room); if (arg2 != NULL) { f32 xdist = arg2->x - relpos->x; @@ -1041,9 +1041,9 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co sp58.y = sp17c[i].y + sp1ac.y; sp58.z = sp17c[i].z + sp1ac.z; - x = wallhitFinaliseAxis(sp58.x); - y = wallhitFinaliseAxis(sp58.y); - z = wallhitFinaliseAxis(sp58.z); + x = wallhit_finalise_axis(sp58.x); + y = wallhit_finalise_axis(sp58.y); + z = wallhit_finalise_axis(sp58.z); wallhit->vertices[i].x = x; wallhit->vertices[i].y = y; @@ -1078,7 +1078,7 @@ void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct co u8 b; u8 a; - brightnessfrac = roomGetFinalBrightnessForPlayer(room2) * (1.0f / 255.0f); + brightnessfrac = room_get_final_brightness_for_player(room2) * (1.0f / 255.0f); range = maxalpha - (u32)minalpha; @@ -1196,7 +1196,7 @@ s32 wallhit0f140750(struct coord *coord) return 128; } -Gfx *wallhitRenderOpaBgHits(s32 roomnum, Gfx *gdl) +Gfx *wallhit_render_opa_bg_hits(s32 roomnum, Gfx *gdl) { struct wallhit *wallhit; Col *colours; @@ -1214,7 +1214,7 @@ Gfx *wallhitRenderOpaBgHits(s32 roomnum, Gfx *gdl) prevtexturenum = -1; prev6b = -1; - gdl = roomApplyMtx(gdl, roomnum); + gdl = room_apply_mtx(gdl, roomnum); wallhit = g_Rooms[roomnum].opawallhits; @@ -1227,13 +1227,13 @@ Gfx *wallhitRenderOpaBgHits(s32 roomnum, Gfx *gdl) } if (wallhit->texturenum != prevtexturenum || wallhit->unk6b != prev6b) { - texSelect(&gdl, &g_TexWallhitConfigs[wallhit->texturenum], 2, wallhit->unk6b, 2, 1, NULL); + tex_select(&gdl, &g_TexWallhitConfigs[wallhit->texturenum], 2, wallhit->unk6b, 2, 1, NULL); prevtexturenum = wallhit->texturenum; prev6b = wallhit->unk6b; } - colours = gfxAllocateColours(4); + colours = gfx_allocate_colours(4); colours[0] = wallhit->finalcolours[0]; colours[1] = wallhit->finalcolours[1]; colours[2] = wallhit->finalcolours[2]; @@ -1259,7 +1259,7 @@ Gfx *wallhitRenderOpaBgHits(s32 roomnum, Gfx *gdl) return gdl; } -Gfx *wallhitRenderXluBgHits(s32 roomnum, Gfx *gdl) +Gfx *wallhit_render_xlu_bg_hits(s32 roomnum, Gfx *gdl) { struct wallhit *wallhit; Col *colours; @@ -1276,7 +1276,7 @@ Gfx *wallhitRenderXluBgHits(s32 roomnum, Gfx *gdl) prevtexturenum = -1; prev6b = -1; - gdl = roomApplyMtx(gdl, roomnum); + gdl = room_apply_mtx(gdl, roomnum); wallhit = g_Rooms[roomnum].xluwallhits; @@ -1285,13 +1285,13 @@ Gfx *wallhitRenderXluBgHits(s32 roomnum, Gfx *gdl) wallhit->unk6b = 1; if (wallhit->texturenum != prevtexturenum || wallhit->unk6b != prev6b) { - texSelect(&gdl, &g_TexWallhitConfigs[wallhit->texturenum], 2, wallhit->unk6b, 2, 1, NULL); + tex_select(&gdl, &g_TexWallhitConfigs[wallhit->texturenum], 2, wallhit->unk6b, 2, 1, NULL); prevtexturenum = wallhit->texturenum; prev6b = wallhit->unk6b; } - colours = gfxAllocateColours(4); + colours = gfx_allocate_colours(4); colours[0] = wallhit->finalcolours[0]; colours[1] = wallhit->finalcolours[1]; colours[2] = wallhit->finalcolours[2]; @@ -1317,7 +1317,7 @@ Gfx *wallhitRenderXluBgHits(s32 roomnum, Gfx *gdl) return gdl; } -Gfx *wallhitRenderPropHits(Gfx *gdl, struct prop *prop, bool xlu) +Gfx *wallhit_render_prop_hits(Gfx *gdl, struct prop *prop, bool xlu) { Col *colours; struct defaultobj *obj = prop->obj; @@ -1372,13 +1372,13 @@ Gfx *wallhitRenderPropHits(Gfx *gdl, struct prop *prop, bool xlu) } if (prevtexturenum != wallhit->texturenum || prev6b != wallhit->unk6b) { - texSelect(&gdl, &g_TexWallhitConfigs[wallhit->texturenum], 2, wallhit->unk6b, 2, 1, NULL); + tex_select(&gdl, &g_TexWallhitConfigs[wallhit->texturenum], 2, wallhit->unk6b, 2, 1, NULL); prevtexturenum = wallhit->texturenum; prev6b = wallhit->unk6b; } - colours = gfxAllocateColours(4); + colours = gfx_allocate_colours(4); colours[0] = wallhit->finalcolours[0]; colours[1] = wallhit->finalcolours[1]; colours[2] = wallhit->finalcolours[2]; @@ -1408,20 +1408,20 @@ Gfx *wallhitRenderPropHits(Gfx *gdl, struct prop *prop, bool xlu) return gdl; } -Gfx *wallhitRenderBgHits(s32 roomnum, Gfx *gdl) +Gfx *wallhit_render_bg_hits(s32 roomnum, Gfx *gdl) { if (g_Rooms[roomnum].opawallhits != NULL) { - gdl = wallhitRenderOpaBgHits(roomnum, gdl); + gdl = wallhit_render_opa_bg_hits(roomnum, gdl); } if (g_Rooms[roomnum].xluwallhits != NULL) { - gdl = wallhitRenderXluBgHits(roomnum, gdl); + gdl = wallhit_render_xlu_bg_hits(roomnum, gdl); } return gdl; } -void wallhitsRecolour(void) +void wallhits_recolour(void) { s32 i; s32 j; @@ -1475,7 +1475,7 @@ void wallhitsRecolour(void) } } -void wallhitFadeSplatsForRemovedChr(struct prop *chrprop) +void wallhit_fade_splats_for_removed_chr(struct prop *chrprop) { s32 i; @@ -1487,7 +1487,7 @@ void wallhitFadeSplatsForRemovedChr(struct prop *chrprop) && wallhit->chrprop == chrprop && g_WallhitTexes[wallhit->texturenum].type == WALLHITTYPE_BLOOD) { if (IS_BLOOD_DROP(wallhit->texturenum) || (random() % 100) < 35) { - wallhitFade(wallhit, TICKS(120)); + wallhit_fade(wallhit, TICKS(120)); } else { wallhit->createdframe = g_Vars.lvframenum; } @@ -1495,7 +1495,7 @@ void wallhitFadeSplatsForRemovedChr(struct prop *chrprop) } } -void wallhitRemoveOldestWoundedSplatByChr(struct prop *chrprop) +void wallhit_remove_oldest_wounded_splat_by_chr(struct prop *chrprop) { s32 oldestframe = 0x0fffffff; s32 oldestindex = -1; @@ -1517,7 +1517,7 @@ void wallhitRemoveOldestWoundedSplatByChr(struct prop *chrprop) } if (oldestindex != -1) { - wallhitFade(&g_Wallhits[oldestindex], TICKS(120)); + wallhit_fade(&g_Wallhits[oldestindex], TICKS(120)); } } diff --git a/src/game/wallhitreset.c b/src/game/wallhitreset.c index 6ca25d69f..34f3b5cf4 100644 --- a/src/game/wallhitreset.c +++ b/src/game/wallhitreset.c @@ -27,7 +27,7 @@ f32 g_WallhitTargetBloodRatio; * Related to blood splats, bullet holes and scorch marks. * With this function nopped they do not appear. */ -void wallhitReset(void) +void wallhit_reset(void) { s32 stack; s32 type = 2; @@ -108,7 +108,7 @@ void wallhitReset(void) numberssize += 0xf; numberssize &= ~0xf; - ptr = mempAlloc(structssize + numberssize, MEMPOOL_STAGE); + ptr = memp_alloc(structssize + numberssize, MEMPOOL_STAGE); g_WallhitCountsPerRoom = ptr; g_Wallhits = (struct wallhit *)((uintptr_t)ptr + numberssize); diff --git a/src/game/weather.c b/src/game/weather.c index e17ead0d4..b733bcf93 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -24,7 +24,7 @@ struct weatherdata *g_WeatherData = NULL; -Gfx *weatherRender(Gfx *gdl) +Gfx *weather_render(Gfx *gdl) { struct weatherdata *weather; @@ -46,7 +46,7 @@ Gfx *weatherRender(Gfx *gdl) gSPDisplayList(gdl++, &var80061380); if (weather->type == WEATHERTYPE_SNOW) { - texSelect(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_NOISE); @@ -61,41 +61,41 @@ Gfx *weatherRender(Gfx *gdl) switch (weather->type) { case WEATHERTYPE_RAIN: - gdl = weatherRenderRain(gdl, weather, 0); + gdl = weather_render_rain(gdl, weather, 0); break; case WEATHERTYPE_SNOW: - gdl = weatherRenderSnow(gdl, weather, 0); + gdl = weather_render_snow(gdl, weather, 0); break; } return gdl; } -void weatherSetBoundaries(struct weatherparticledata *data, s32 index, f32 min, f32 max) +void weather_set_boundaries(struct weatherparticledata *data, s32 index, f32 min, f32 max) { ((f32 *)(&data->boundarymin))[index] = min; ((f32 *)(&data->boundarymax))[index] = max; ((f32 *)(&data->boundaryrange))[index] = ABS(min) + ABS(max); } -struct weatherparticledata *weatherAllocateParticles(void) +struct weatherparticledata *weather_allocate_particles(void) { - struct weatherparticledata *data = mempAlloc(sizeof(struct weatherparticledata), MEMPOOL_STAGE); + struct weatherparticledata *data = memp_alloc(sizeof(struct weatherparticledata), MEMPOOL_STAGE); u32 i; data->unk3e80.x = 0; data->unk3e80.y = 0; data->unk3e80.z = 0; - weatherSetBoundaries(data, 0, -800, 800); + weather_set_boundaries(data, 0, -800, 800); if ((u32)g_StageIndex == STAGEINDEX_CRASHSITE) { - weatherSetBoundaries(data, 1, -500, 500); + weather_set_boundaries(data, 1, -500, 500); } else { - weatherSetBoundaries(data, 1, -800, 800); + weather_set_boundaries(data, 1, -800, 800); } - weatherSetBoundaries(data, 2, -800, 800); + weather_set_boundaries(data, 2, -800, 800); i = 0; @@ -147,7 +147,7 @@ void func0f131678(s32 arg0) } } -void weatherSetIntensity(s32 intensity) +void weather_set_intensity(s32 intensity) { s32 dotheloop = -1; s32 special = -1; @@ -261,7 +261,7 @@ u32 g_RainSpeedExtra; u32 g_SnowSpeed; u32 g_SnowSpeedExtra; -void weatherTickRain(struct weatherdata *weather) +void weather_tick_rain(struct weatherdata *weather) { \ s32 lVar6 = 0; s32 relativetotal = 0; // eg. -10 if deleted 10 particles, +10 if created 10 @@ -271,7 +271,7 @@ void weatherTickRain(struct weatherdata *weather) f32 rand; s32 lvupdate; - mainOverrideVariable("rainspeedxtra", &g_RainSpeedExtra); + main_override_variable("rainspeedxtra", &g_RainSpeedExtra); if (weather->unk90 > 0) { weather->unk88 += (weather->unk8c - weather->unk88) / weather->unk90; @@ -305,20 +305,20 @@ void weatherTickRain(struct weatherdata *weather) iVar10 = weather->unk58[i].unk00 * 32767.0f * weather->unk88; - if (lvIsPaused()) { + if (lv_is_paused()) { iVar10 = 0; } if (iVar10 > 0) { if (weather->audiohandles[i] == 0 && sounds[i] >= 0) { weather->unkf8 = sounds[i]; - sndStart(var80095200, weather->unkf8, &weather->audiohandles[i], -1, + snd_start(var80095200, weather->unkf8, &weather->audiohandles[i], -1, -1, -1, -1, -1); } if (weather->audiohandles[i] != 0) { if (sndGetState(weather->audiohandles[i]) != AL_STOPPED) { - sndAdjust(&weather->audiohandles[i], 0, iVar10 * 3 / 4, -1, + snd_adjust(&weather->audiohandles[i], 0, iVar10 * 3 / 4, -1, weather->unkf8, 1, 1, -1, 1); } } @@ -425,7 +425,7 @@ u32 g_RainSpeedExtra = 20; u32 g_SnowSpeed = 15; u32 g_SnowSpeedExtra = 10; -void weatherTickSnow(struct weatherdata *weather) +void weather_tick_snow(struct weatherdata *weather) { \ s32 lVar7 = 0; s32 relativetotal = 0; // eg. -10 if deleted 10 particles, +10 if created 10 @@ -434,8 +434,8 @@ void weatherTickSnow(struct weatherdata *weather) s32 i; struct weatherparticledata *data; - mainOverrideVariable("snowspeed", &g_SnowSpeed); - mainOverrideVariable("snowspeedxtra", &g_SnowSpeedExtra); + main_override_variable("snowspeed", &g_SnowSpeed); + main_override_variable("snowspeedxtra", &g_SnowSpeedExtra); if (g_StageIndex == STAGEINDEX_AIRBASE) { weather->windanglerad = RAD(90, 1.5707963705063f); @@ -600,23 +600,23 @@ void weatherTickSnow(struct weatherdata *weather) } } -void weatherConfigureRain(u32 intensity) +void weather_configure_rain(u32 intensity) { if (g_WeatherData) { g_WeatherData->type = WEATHERTYPE_RAIN; - weatherSetIntensity(intensity); + weather_set_intensity(intensity); } } -void weatherConfigureSnow(u32 intensity) +void weather_configure_snow(u32 intensity) { if (g_WeatherData) { g_WeatherData->type = WEATHERTYPE_SNOW; - weatherSetIntensity(intensity); + weather_set_intensity(intensity); } } -bool weatherIsRoomWeatherProof(s32 room) +bool weather_is_room_weather_proof(s32 room) { if (g_StageIndex == STAGEINDEX_CHICAGO) { // Rooms listed do not have weather @@ -761,7 +761,7 @@ bool weatherIsRoomWeatherProof(s32 room) return false; } -Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) +Gfx *weather_render_rain(Gfx *gdl, struct weatherdata *weather, s32 arg2) { s32 numtestrooms; u32 stack; @@ -800,14 +800,14 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) numtestrooms = 0; numbadrooms = 0; - mainOverrideVariable("raincol1", &raincol1); - mainOverrideVariable("raincol2", &raincol2); - mainOverrideVariable("rainwidth", &rainwidth); - mainOverrideVariable("rainout", &rainout); - mainOverrideVariable("cddiv", &cddiv); - mainOverrideVariable("wetclip", &wetclip); - mainOverrideVariable("bounder", &bounder); - mainOverrideVariable("trypitch", &trypitch); + main_override_variable("raincol1", &raincol1); + main_override_variable("raincol2", &raincol2); + main_override_variable("rainwidth", &rainwidth); + main_override_variable("rainout", &rainout); + main_override_variable("cddiv", &cddiv); + main_override_variable("wetclip", &wetclip); + main_override_variable("bounder", &bounder); + main_override_variable("trypitch", &trypitch); if (g_Vars.lvupdate240 <= 0) { numsparksavailable = 0; @@ -819,7 +819,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) timings1[i] = 0; } - texSelect(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); @@ -861,16 +861,16 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) particledata = weather->particledata[arg2]; numtris = 0; - mtx4LoadIdentity(&worldtoscreenmtx); - mtx00015be0(camGetWorldToScreenMtxf(), &worldtoscreenmtx); + mtx4_load_identity(&worldtoscreenmtx); + mtx00015be0(cam_get_world_to_screen_mtxf(), &worldtoscreenmtx); worldtoscreenmtx.m[3][0] = 0.0f; worldtoscreenmtx.m[3][1] = 0.0f; worldtoscreenmtx.m[3][2] = 0.0f; - mtx = gfxAllocateMatrix(); + mtx = gfx_allocate_matrix(); - mtxF2L(&worldtoscreenmtx, mtx); + mtx_f2l(&worldtoscreenmtx, mtx); gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -939,7 +939,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) // Increase or decrease rain volume depending on whether the camera // is in a weatherproof room or not. - if (weatherIsRoomWeatherProof(g_Vars.currentplayer->cam_room)) { + if (weather_is_room_weather_proof(g_Vars.currentplayer->cam_room)) { if (weather->unk88 > 0.99f) { weather->unk8c = 0.65f; weather->unk90 = 9; @@ -976,8 +976,8 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) } for (i = 1; i < g_Vars.roomcount; i++) { - if (!weatherIsRoomWeatherProof(i)) { - roomSetFlashBrightness(i, brightness); + if (!weather_is_room_weather_proof(i)) { + room_set_flash_brightness(i, brightness); } } } @@ -1025,7 +1025,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) if (weather->audiohandles[3] == NULL) { weather->unkf8 = soundnum; - sndStart(var80095200, soundnum, &weather->audiohandles[3], -1, -1, -1, -1, -1); + snd_start(var80095200, soundnum, &weather->audiohandles[3], -1, -1, -1, -1, -1); weather->unk58[3].unk00 = 1; if (weather->audiohandles[3] != NULL) { @@ -1035,7 +1035,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) volume /= 2; } - sndAdjust(&weather->audiohandles[3], 0, volume, -1, weather->unkf8, 1.00f, 1, -1, 1); + snd_adjust(&weather->audiohandles[3], 0, volume, -1, weather->unkf8, 1.00f, 1, -1, 1); audioPostEvent(weather->audiohandles[3], AL_SNDP_PITCH_EVT, *(s32 *)&pitch); } } @@ -1063,7 +1063,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) } for (scale = 1.0f, t = 0; t < numtestrooms; t++) { - numneighbours = bgRoomGetNeighbours(testrooms[t], neighbours, ARRAYCOUNT(neighbours)); + numneighbours = bg_room_get_neighbours(testrooms[t], neighbours, ARRAYCOUNT(neighbours)); for (n = 0; n < numneighbours; n++) { if (g_Rooms[neighbours[n]].flags & ROOMFLAG_ONSCREEN) { @@ -1100,7 +1100,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) } for (t = 0; t < numtestrooms; t++) { - if (weatherIsRoomWeatherProof(testrooms[t])) { + if (weather_is_room_weather_proof(testrooms[t])) { // @bug: Overflowing badbbmin and badbbmax if badrooms is full. // (These writes should be inside the if statement). badbbmin[numbadrooms].f[0] = g_Rooms[testrooms[t]].bbmin[0] / scale; @@ -1130,7 +1130,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) } } - colours = gfxAllocateColours(2); + colours = gfx_allocate_colours(2); colours[0].word = raincol1; colours[1].word = raincol2; @@ -1168,7 +1168,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) // empty } else { if (numtris == 0) { - vertices = gfxAllocateVertices(12); + vertices = gfx_allocate_vertices(12); } sp218[0] /= sp214; @@ -1227,7 +1227,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) && spc9c.f[1] <= g_Rooms[badrooms[i]].bbmax[1] && spca8.f[1] >= g_Rooms[badrooms[i]].bbmin[1] && bounder - && bgTestLineIntersectsIntBbox(&spc90, &spfc, &bboxes[i][0], &bboxes[i][3])) { + && bg_test_line_intersects_int_bbox(&spc90, &spfc, &bboxes[i][0], &bboxes[i][3])) { draw = false; } } @@ -1286,7 +1286,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) spd4.f[1] = g_Rooms[testrooms[i]].bbmin[1] / scale; spd4.f[2] = particle2->pos.f[2] + particledata->unk3e80.f[2]; - sparksCreate(testrooms[i], NULL, &spd4, &particle2->inc, NULL, SPARKTYPE_SHALLOWWATER); + sparks_create(testrooms[i], NULL, &spd4, &particle2->inc, NULL, SPARKTYPE_SHALLOWWATER); numsparksavailable--; } @@ -1362,7 +1362,7 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) #if MATCHING GLOBAL_ASM( -glabel weatherRenderSnow +glabel weather_render_snow .late_rodata glabel var7f1b5784 .word 0x4096cbe4 @@ -1404,7 +1404,7 @@ glabel var7f1b5790 /* f134720: 24060004 */ addiu $a2,$zero,0x4 /* f134724: afa00018 */ sw $zero,0x18($sp) /* f134728: afa01268 */ sw $zero,0x1268($sp) -/* f13472c: 0fc2ce70 */ jal texSelect +/* f13472c: 0fc2ce70 */ jal tex_select /* f134730: 00003825 */ or $a3,$zero,$zero /* f134734: 8fb81398 */ lw $t8,0x1398($sp) /* f134738: 8fa81268 */ lw $t0,0x1268($sp) @@ -1466,31 +1466,31 @@ glabel var7f1b5790 /* f134818: af380004 */ sw $t8,0x4($t9) /* f13481c: 24a5f104 */ addiu $a1,$a1,%lo(var8007f104) /* f134820: 2484569c */ addiu $a0,$a0,%lo(var7f1b569c) -/* f134824: 0c0036cc */ jal mainOverrideVariable +/* f134824: 0c0036cc */ jal main_override_variable /* f134828: afa81268 */ sw $t0,0x1268($sp) /* f13482c: 3c047f1b */ lui $a0,%hi(var7f1b56a8) /* f134830: 3c058008 */ lui $a1,%hi(var8007f108) /* f134834: 24a5f108 */ addiu $a1,$a1,%lo(var8007f108) -/* f134838: 0c0036cc */ jal mainOverrideVariable +/* f134838: 0c0036cc */ jal main_override_variable /* f13483c: 248456a8 */ addiu $a0,$a0,%lo(var7f1b56a8) /* f134840: 3c047f1b */ lui $a0,%hi(var7f1b56b4) /* f134844: 3c058008 */ lui $a1,%hi(var8007f10c) /* f134848: 24a5f10c */ addiu $a1,$a1,%lo(var8007f10c) -/* f13484c: 0c0036cc */ jal mainOverrideVariable +/* f13484c: 0c0036cc */ jal main_override_variable /* f134850: 248456b4 */ addiu $a0,$a0,%lo(var7f1b56b4) /* f134854: 3c047f1b */ lui $a0,%hi(var7f1b56c0) /* f134858: 3c058008 */ lui $a1,%hi(var8007f110) /* f13485c: 24a5f110 */ addiu $a1,$a1,%lo(var8007f110) -/* f134860: 0c0036cc */ jal mainOverrideVariable +/* f134860: 0c0036cc */ jal main_override_variable /* f134864: 248456c0 */ addiu $a0,$a0,%lo(var7f1b56c0) /* f134868: 0013c880 */ sll $t9,$s3,0x2 /* f13486c: 02397021 */ addu $t6,$s1,$t9 /* f134870: 27b001cc */ addiu $s0,$sp,0x1cc /* f134874: 8dd20024 */ lw $s2,0x24($t6) /* f134878: afa00198 */ sw $zero,0x198($sp) -/* f13487c: 0c00566c */ jal mtx4LoadIdentity +/* f13487c: 0c00566c */ jal mtx4_load_identity /* f134880: 02002025 */ or $a0,$s0,$zero -/* f134884: 0fc2d5be */ jal camGetWorldToScreenMtxf +/* f134884: 0fc2d5be */ jal cam_get_world_to_screen_mtxf /* f134888: 00000000 */ nop /* f13488c: 00402025 */ or $a0,$v0,$zero /* f134890: 0c0056f8 */ jal mtx00015be0 @@ -1499,11 +1499,11 @@ glabel var7f1b5790 /* f13489c: 00000000 */ nop /* f1348a0: e7b401fc */ swc1 $f20,0x1fc($sp) /* f1348a4: e7b40200 */ swc1 $f20,0x200($sp) -/* f1348a8: 0fc59e66 */ jal gfxAllocateMatrix +/* f1348a8: 0fc59e66 */ jal gfx_allocate_matrix /* f1348ac: e7b40204 */ swc1 $f20,0x204($sp) /* f1348b0: 00408825 */ or $s1,$v0,$zero /* f1348b4: 02002025 */ or $a0,$s0,$zero -/* f1348b8: 0c005815 */ jal mtxF2L +/* f1348b8: 0c005815 */ jal mtx_f2l /* f1348bc: 00402825 */ or $a1,$v0,$zero /* f1348c0: 8fb01398 */ lw $s0,0x1398($sp) /* f1348c4: 3c190102 */ lui $t9,0x102 @@ -1762,7 +1762,7 @@ glabel var7f1b5790 /* f134c68: afa81268 */ sw $t0,0x1268($sp) /* f134c6c: 02602825 */ or $a1,$s3,$zero /* f134c70: 24060014 */ addiu $a2,$zero,0x14 -/* f134c74: 0fc5916a */ jal bgRoomGetNeighbours +/* f134c74: 0fc5916a */ jal bg_room_get_neighbours /* f134c78: 00001025 */ or $v0,$zero,$zero /* f134c7c: 8fa81268 */ lw $t0,0x1268($sp) /* f134c80: 8fac00ac */ lw $t4,0xac($sp) @@ -1874,7 +1874,7 @@ glabel var7f1b5790 /* f134df0: 8d840000 */ lw $a0,0x0($t4) /* f134df4: afad0184 */ sw $t5,0x184($sp) /* f134df8: afac00ac */ sw $t4,0xac($sp) -/* f134dfc: 0fc4ca87 */ jal weatherIsRoomWeatherProof +/* f134dfc: 0fc4ca87 */ jal weather_is_room_weather_proof /* f134e00: afa81268 */ sw $t0,0x1268($sp) /* f134e04: 8fa81268 */ lw $t0,0x1268($sp) /* f134e08: 8fac00ac */ lw $t4,0xac($sp) @@ -2094,7 +2094,7 @@ glabel var7f1b5790 /* f135140: 26310004 */ addiu $s1,$s1,0x4 /* f135144: 1420ffdf */ bnez $at,.L0f1350c4 /* f135148: e600fffc */ swc1 $f0,-0x4($s0) -/* f13514c: 0fc59e73 */ jal gfxAllocateColours +/* f13514c: 0fc59e73 */ jal gfx_allocate_colours /* f135150: 24040010 */ addiu $a0,$zero,0x10 /* f135154: 00408025 */ or $s0,$v0,$zero /* f135158: 240310ef */ addiu $v1,$zero,0x10ef @@ -2199,7 +2199,7 @@ glabel var7f1b5790 /* f1352d4: 0019c880 */ sll $t9,$t9,0x2 /* f1352d8: 17000004 */ bnez $t8,.L0f1352ec /* f1352dc: afb90080 */ sw $t9,0x80($sp) -/* f1352e0: 0fc59e59 */ jal gfxAllocateVertices +/* f1352e0: 0fc59e59 */ jal gfx_allocate_vertices /* f1352e4: 24040008 */ addiu $a0,$zero,0x8 /* f1352e8: afa20214 */ sw $v0,0x214($sp) .L0f1352ec: @@ -2824,7 +2824,7 @@ u32 var8007f108 = 10; u32 var8007f10c = 0x8888aaff; u32 var8007f110 = 0xffffff7f; #else -Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) +Gfx *weather_render_snow(Gfx *gdl, struct weatherdata *weather, s32 arg2) { struct weatherparticledata *particledata; struct weatherparticle *particle; @@ -2890,7 +2890,7 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) s7 = 0; sp1268 = 0; - texSelect(&gdl, &g_TexGeneralConfigs[0], 4, 0, 2, 1, NULL); + tex_select(&gdl, &g_TexGeneralConfigs[0], 4, 0, 2, 1, NULL); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetColorDither(gdl++, G_CD_DISABLE); @@ -2902,25 +2902,25 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) 0, 0, 0, SHADE, TEXEL0, 0, SHADE, 0, 0, 0, 0, SHADE, TEXEL0, 0, SHADE, 0); - mainOverrideVariable("snowwidth", &snowwidth); - mainOverrideVariable("snowheight", &snowheight); - mainOverrideVariable("snowcol1", &snowcol1); - mainOverrideVariable("snowcol2", &snowcol2); + main_override_variable("snowwidth", &snowwidth); + main_override_variable("snowheight", &snowheight); + main_override_variable("snowcol1", &snowcol1); + main_override_variable("snowcol2", &snowcol2); particledata = weather->particledata[arg2]; sp198 = 0; - mtx4LoadIdentity(&sp1cc); - mtx00015be0(camGetWorldToScreenMtxf(), &sp1cc); + mtx4_load_identity(&sp1cc); + mtx00015be0(cam_get_world_to_screen_mtxf(), &sp1cc); sp1cc.m[3][0] = 0.0f; sp1cc.m[3][1] = 0.0f; sp1cc.m[3][2] = 0.0f; - mtx = gfxAllocateMatrix(); + mtx = gfx_allocate_matrix(); - mtxF2L(&sp1cc, mtx); + mtx_f2l(&sp1cc, mtx); gSPMatrix(gdl++, osVirtualToPhysical(mtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -3003,7 +3003,7 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) // 4c54 for (i = 0; i < sp1268; i++) { - numneighbours = bgRoomGetNeighbours(sp126c[i], sp144, ARRAYCOUNT(sp144)); + numneighbours = bg_room_get_neighbours(sp126c[i], sp144, ARRAYCOUNT(sp144)); for (j2 = 0; j2 < numneighbours; j2++) { a0 = true; @@ -3041,7 +3041,7 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) // 4dc0 for (i = 0; i < sp1268; i++) { - if (weatherIsRoomWeatherProof(sp126c[i])) { + if (weather_is_room_weather_proof(sp126c[i])) { spe20[s7].f[0] = g_Rooms[sp126c[i]].bbmin[0] / 1; spe20[s7].f[1] = g_Rooms[sp126c[i]].bbmin[1] / 1; spe20[s7].f[2] = g_Rooms[sp126c[i]].bbmin[2] / 1; @@ -3092,7 +3092,7 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) } // 514c - colours = gfxAllocateColours(numcolours); + colours = gfx_allocate_colours(numcolours); for (j = 0; j < numcolours; j++) { u32 alpha = ((numcolours + 1) * 255 - j * 255) / (numcolours + 1); @@ -3126,7 +3126,7 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) // empty } else { if (sp198 == 0) { - vertices = gfxAllocateVertices(8); + vertices = gfx_allocate_vertices(8); } sp260 = 0.0f; @@ -3380,7 +3380,7 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) } #endif -void weatherStop(void) +void weather_stop(void) { if (g_WeatherData) { if (g_WeatherData->audiohandles[0]) { diff --git a/src/game/weatherreset.c b/src/game/weatherreset.c index 3bba7cc86..d11963eb5 100644 --- a/src/game/weatherreset.c +++ b/src/game/weatherreset.c @@ -11,7 +11,7 @@ u32 var800623f4 = 0x00000000; u32 var800623f8 = 0x00000000; u32 var800623fc = 0x00000000; -void weatherReset(void) +void weather_reset(void) { g_WeatherActive = false; g_WeatherData = NULL; @@ -21,8 +21,8 @@ void weatherReset(void) || g_StageIndex == STAGEINDEX_G5BUILDING || g_StageIndex == STAGEINDEX_CRASHSITE) && PLAYERCOUNT() < 2) { - g_WeatherData = mempAlloc(sizeof(struct weatherdata), MEMPOOL_STAGE); - g_WeatherData->particledata[0] = weatherAllocateParticles(); + g_WeatherData = memp_alloc(sizeof(struct weatherdata), MEMPOOL_STAGE); + g_WeatherData->particledata[0] = weather_allocate_particles(); g_WeatherData->type = -1; g_WeatherData->windanglerad = 0; g_WeatherData->unk0c = 0; diff --git a/src/game/weathertick.c b/src/game/weathertick.c index 4a45b71c9..b4cae7d92 100644 --- a/src/game/weathertick.c +++ b/src/game/weathertick.c @@ -9,7 +9,7 @@ u32 var80062950 = 100; bool g_WeatherTickEnabled = true; -void weatherTick(void) +void weather_tick(void) { if (!g_WeatherData || (g_StageIndex == STAGEINDEX_AIRBASE && g_Vars.currentplayer->cam_pos.z < -2000.0f) @@ -17,16 +17,16 @@ void weatherTick(void) return; } - mainOverrideVariable("wettick", (u32 *)&g_WeatherTickEnabled); - mainOverrideVariable("windspeed", &var80062950); + main_override_variable("wettick", (u32 *)&g_WeatherTickEnabled); + main_override_variable("windspeed", &var80062950); if (g_WeatherTickEnabled) { switch (g_WeatherData->type) { case WEATHERTYPE_RAIN: - weatherTickRain(g_WeatherData); + weather_tick_rain(g_WeatherData); break; case WEATHERTYPE_SNOW: - weatherTickSnow(g_WeatherData); + weather_tick_snow(g_WeatherData); break; } } diff --git a/src/game/zbuf.c b/src/game/zbuf.c index 14ec16a31..446066ed1 100644 --- a/src/game/zbuf.c +++ b/src/game/zbuf.c @@ -20,18 +20,18 @@ u16 g_ArtifactsCfb2[0x180]; u16 *g_ZbufPtr1 = NULL; u16 *g_ZbufPtr2 = NULL; -void *zbufGetAllocation(void) +void *zbuf_get_allocation(void) { return g_ZbufPtr1; } -void zbufReset(s32 stagenum) +void zbuf_reset(s32 stagenum) { g_ZbufPtr1 = NULL; g_ZbufPtr2 = NULL; if (stagenum != STAGE_TITLE) { - zbufAllocate(); + zbuf_allocate(); } } @@ -48,7 +48,7 @@ void zbufReset(s32 stagenum) * The allocation sizes need to enforce a minimum because the allocation is also * used by lighting initialisation code. */ -void zbufAllocate(void) +void zbuf_allocate(void) { if (IS4MB()) { g_ZbufWidth = MAX(320, FBALLOC_WIDTH_LO); @@ -68,7 +68,7 @@ void zbufAllocate(void) } } - g_ZbufPtr1 = mempAlloc(g_ZbufWidth * g_ZbufHeight * sizeof(u16) + 0x40, MEMPOOL_STAGE); + g_ZbufPtr1 = memp_alloc(g_ZbufWidth * g_ZbufHeight * sizeof(u16) + 0x40, MEMPOOL_STAGE); g_ZbufPtr1 = (void *) (((uintptr_t) g_ZbufPtr1 + 0x3f) & ~0x3f); g_ZbufPtr2 = g_ZbufPtr1; } @@ -81,7 +81,7 @@ void zbufAllocate(void) * Perhaps the developers implemented two buffers with swapping before realising * they only needed one. */ -void zbufSwap(void) +void zbuf_swap(void) { g_ZbufPtr2 = g_ZbufPtr1; } @@ -92,19 +92,19 @@ void zbufSwap(void) * a scissor on the viewport. * * This allows the z-buffer allocation to be half a screen instead of a full - * screen, however zbufAllocate allocates the full hi-res screen for 8MB, + * screen, however zbuf_allocate allocates the full hi-res screen for 8MB, * so this benefit is not realised. The shifting code is likely from GE. */ -Gfx *zbufConfigureRdp(Gfx *gdl) +Gfx *zbuf_configure_rdp(Gfx *gdl) { u32 subamount; uintptr_t addr; if (g_Vars.normmplayerisrunning && (g_Vars.currentplayernum >= 2 || (PLAYERCOUNT() == 2 && g_Vars.currentplayernum == 1))) { - subamount = playerGetFbWidth() * playerGetFbHeight(); + subamount = player_get_fb_width() * player_get_fb_height(); - if (IS4MB() || optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { + if (IS4MB() || options_get_screen_split() == SCREENSPLIT_VERTICAL) { subamount = 0; } } else { @@ -123,36 +123,36 @@ Gfx *zbufConfigureRdp(Gfx *gdl) /** * Clear the current player's portion of the z-buffer. */ -Gfx *zbufClear(Gfx *gdl) +Gfx *zbuf_clear(Gfx *gdl) { s32 left; s32 right; gDPPipeSync(gdl++); gDPSetRenderMode(gdl++, G_RM_NOOP, G_RM_NOOP2); - gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetWidth(), OS_PHYSICAL_TO_K0(g_ZbufPtr2)); + gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, vi_get_width(), OS_PHYSICAL_TO_K0(g_ZbufPtr2)); gDPSetCycleType(gdl++, G_CYC_FILL); gDPSetFillColor(gdl++, 0xfffcfffc); - gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, playerGetFbWidth() * 4.0f, playerGetFbHeight() * 4.0f); + gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, player_get_fb_width() * 4.0f, player_get_fb_height() * 4.0f); if (PLAYERCOUNT() <= 2) { left = 0; - right = playerGetFbWidth() - 1; + right = player_get_fb_width() - 1; } else if (g_Vars.currentplayernum == 0 || g_Vars.currentplayernum == 2) { left = 0; - right = playerGetFbWidth() / 2 - 1; + right = player_get_fb_width() / 2 - 1; } else { - left = playerGetFbWidth() / 2; - right = playerGetFbWidth() - 1; + left = player_get_fb_width() / 2; + right = player_get_fb_width() - 1; } - gDPFillRectangle(gdl++, left, 0, right, playerGetFbHeight() - 1); + gDPFillRectangle(gdl++, left, 0, right, player_get_fb_height() - 1); gDPPipeSync(gdl++); return gdl; } -u16 *zbufGetArtifactsCfb(s32 index) +u16 *zbuf_get_artifacts_cfb(s32 index) { u16 *addr; @@ -173,9 +173,9 @@ u16 *zbufGetArtifactsCfb(s32 index) return addr; } -Gfx *zbufDrawArtifactsOffscreen(Gfx *gdl) +Gfx *zbuf_draw_artifacts_offscreen(Gfx *gdl) { - struct artifact *artifacts = schedGetWriteArtifacts(); + struct artifact *artifacts = sched_get_write_artifacts(); u32 stack; u16 *sp4c = g_ZbufPtr1; u32 s4 = 0; @@ -184,12 +184,12 @@ Gfx *zbufDrawArtifactsOffscreen(Gfx *gdl) u16 *image; s32 i; - viGetBackBuffer(); - sp44 = zbufGetArtifactsCfb(g_SchedWriteArtifactsIndex); + vi_get_back_buffer(); + sp44 = zbuf_get_artifacts_cfb(g_SchedWriteArtifactsIndex); g_SchedSpecialArtifactIndexes[g_SchedWriteArtifactsIndex] = 1; gDPPipeSync(gdl++); - gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetBufWidth(), OS_PHYSICAL_TO_K0(sp44)); + gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, vi_get_buf_width(), OS_PHYSICAL_TO_K0(sp44)); gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, SCREEN_320, SCREEN_240); gDPSetCycleType(gdl++, G_CYC_COPY); gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, 5, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); @@ -217,12 +217,12 @@ Gfx *zbufDrawArtifactsOffscreen(Gfx *gdl) if (artifacts[i].type != ARTIFACTTYPE_FREE) { s2 = &sp44[s4]; - image = &sp4c[artifacts[i].unk0c.u16_1 * viGetWidth()]; + image = &sp4c[artifacts[i].unk0c.u16_1 * vi_get_width()]; gDPPipeSync(gdl++); gDPSetTextureImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_320, image); gDPLoadSync(gdl++); - gDPLoadBlock(gdl++, 5, 0, 0, viGetWidth() - 1, 0); + gDPLoadBlock(gdl++, 5, 0, 0, vi_get_width() - 1, 0); gDPPipeSync(gdl++); gSPTextureRectangle(gdl++, @@ -240,8 +240,8 @@ Gfx *zbufDrawArtifactsOffscreen(Gfx *gdl) gDPPipeSync(gdl++); gDPLoadSync(gdl++); gDPTileSync(gdl++); - gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, viGetBufWidth(), OS_PHYSICAL_TO_K0(viGetBackBuffer())); - gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetWidth() * 4.0f, viGetHeight() * 4.0f); + gDPSetColorImage(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, vi_get_buf_width(), OS_PHYSICAL_TO_K0(vi_get_back_buffer())); + gDPSetScissorFrac(gdl++, G_SC_NON_INTERLACE, 0, 0, vi_get_width() * 4.0f, vi_get_height() * 4.0f); gSPSetGeometryMode(gdl++, G_ZBUFFER); gDPSetTextureFilter(gdl++, G_TF_BILERP); gDPSetTexturePersp(gdl++, G_TP_PERSP); diff --git a/src/include/constants.h b/src/include/constants.h index 173b82065..11f04af06 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -60,7 +60,7 @@ #define IS4MB() (g_Is4Mb == true) #define IS8MB() (g_Is4Mb != true) #define LINEHEIGHT (VERSION == VERSION_JPN_FINAL ? 14 : 11) -#define MIXCOLOUR(dialog, property) dialog->transitionfrac < 0.0f ? g_MenuColours[dialog->type].property : colourBlend(g_MenuColours[dialog->type2].property, g_MenuColours[dialog->type].property, dialog->colourweight) +#define MIXCOLOUR(dialog, property) dialog->transitionfrac < 0.0f ? g_MenuColours[dialog->type].property : colour_blend(g_MenuColours[dialog->type2].property, g_MenuColours[dialog->type].property, dialog->colourweight) #define MPCHR(index) ((index) < MAX_PLAYERS ? &g_PlayerConfigsArray[index].base : &g_BotConfigsArray[(index) - MAX_PLAYERS].base) #define RANDOMFRAC() (random() * (1.0f / U32_MAX)) #define SECSTOTIME240(secs) (secs * 240) diff --git a/src/include/game/activemenu.h b/src/include/game/activemenu.h index 20bd6bef4..5f72484b7 100644 --- a/src/include/game/activemenu.h +++ b/src/include/game/activemenu.h @@ -4,27 +4,27 @@ #include "data.h" #include "types.h" -void amTick(void); +void am_tick(void); -void amOpenPickTarget(void); +void am_open_pick_target(void); MenuDialogHandlerResult menudialog000fcd48(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult amPickTargetMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -void amSetAiBuddyTemperament(bool aggressive); -void amSetAiBuddyStealth(void); -s32 amGetFirstBuddyIndex(void); -void amApply(s32 slot); -void amGetSlotDetails(s32 slot, u32 *flags, char *label); -void amReset(void); -s16 amCalculateSlotWidth(void); -void amChangeScreen(s32 step); -void amAssignWeaponSlots(void); -void amOpen(void); -void amClose(void); -bool amIsCramped(void); -void amCalculateSlotPosition(s16 column, s16 row, s16 *x, s16 *y); -Gfx *amRenderText(Gfx *gdl, char *text, u32 colour, s16 left, s16 top); -Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum); -Gfx *amRenderSlot(Gfx *gdl, char *text, s16 x, s16 y, s32 mode, s32 flags); -Gfx *amRender(Gfx *gdl); +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 0ac8645ca..0149002eb 100644 --- a/src/include/game/bg.h +++ b/src/include/game/bg.h @@ -4,103 +4,103 @@ #include "data.h" #include "types.h" -void bgUnpausePropsInRoom(u32 roomnum, bool tintedglassonly); -void bgSetRoomOnscreen(s32 room, s32 draworder, struct screenbox *arg2); -void bgGetRoomBrightnessRange(s32 roomnum, u8 *min, u8 *max); -struct drawslot *bgGetRoomDrawSlot(s32 roomnum); -Gfx *bgRenderXrayData(Gfx *gdl, struct xraydata *xraydata); -Gfx *bgAddXrayTri(Gfx *gdl, struct xraydata *xraydata, s16 vertices1[3], s16 vertices2[3], s16 vertices3[3], u32 colour1, u32 colour2, u32 colour3); -void bgChooseXrayVtxColour(bool *inrange, s16 vertex[3], u32 *colour, struct xraydata *xraydata); -Gfx *bgProcessXrayTri(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 *bgRenderGdlInXray(Gfx *gdl, s8 *readgdl, Vtx *vertices, s16 arg3[3]); -Gfx *bgRenderRoomXrayPass(Gfx *gdl, s32 roomnum, struct roomblock *blocks, bool recurse, s16 arg4[3]); -Gfx *bgRenderRoomInXray(Gfx *gdl, s32 roomnum); -Gfx *bgRenderSceneInXray(Gfx *gdl); -Gfx *bgRenderScene(Gfx *gdl); -Gfx *bgRenderArtifacts(Gfx *gdl); -void bgLoadFile(void *memaddr, u32 offset, u32 len); -s32 bgGetStageIndex(s32 stagenum); -f32 bgCalculatePortalSurfaceArea(s32 portal); -u8 bgCalculatePortalAlpha(s32 portal); +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 bgXorBabebabe(u32 value); -void bgReset(s32 stagenum); -void bgBuildTables(s32 stagenum); -void bgStop(void); -void bgSetStageTranslationThing(f32 arg0); -f32 bgGetStageTranslationThing(void); -f32 bgGetScaleBg2Gfx(void); -void bgSetScaleBg2Gfx(f32 arg0); -void bgTickCounter(void); -void bgTick(void); -Gfx *bgRender(Gfx *gdl); -Gfx *bgScissorToViewport(Gfx *gdl); -Gfx *bgScissorWithinViewportF(Gfx *gdl, f32 viewleft, f32 viewtop, f32 viewright, f32 viewbottom); -Gfx *bgScissorWithinViewport(Gfx *gdl, s32 viewleft, s32 viewtop, s32 viewright, s32 viewbottom); -void bgClearPortalCameraCache(void); -bool bgRoomIntersectsScreenBox(s32 room, struct screenbox *arg1); -bool bg3dPosTo2dPos(struct coord *cornerpos, struct coord *screenpos); -bool bgGetPortalScreenBbox(s32 portal, struct screenbox *arg1); -Gfx *bgDrawBoxEdge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); -bool bgGetBoxIntersection(struct screenbox *a, struct screenbox *b); -void bgExpandBox(struct screenbox *a, struct screenbox *b); -void bgCopyBox(struct screenbox *dst, struct screenbox *src); -bool bgRoomIsOnscreen(s32 room); -bool bgRoomIsStandby(s32 room); -bool bgRoomIsOnPlayerScreen(s32 room, u32 playernum); -bool bgRoomIsOnPlayerStandby(s32 room, u32 aibotindex); -s32 bgFindPortalByVertices(struct portalvertices *pvertices); -u32 bgInflate(u8 *src, u8 *dst, u32 len); -Gfx *bgGetNextGdlInBlock(struct roomblock *block, Gfx *start, Gfx *end); -Gfx *bgGetNextGdlInLayer(s32 roomnum, Gfx *start, u32 types); -Vtx *bgFindVerticesForGdl(s32 roomnum, Gfx *gdl); -void bgLoadRoom(s32 roomnum); -void bgUnloadRoom(s32 room); -void bgUnloadAllRooms(void); -void bgGarbageCollectRooms(s32 bytesneeded, bool desparate); -void bgTickRooms(void); -Gfx *bgRenderRoomPass(Gfx *gdl, s32 roomnum, struct roomblock *blocks, bool arg3); -Gfx *bgRenderRoomOpaque(Gfx *gdl, s32 roomnum); -Gfx *bgRenderRoomXlu(Gfx *gdl, s32 roomnum); -s32 bgPopulateVtxBatchType(s32 roomnum, struct vtxbatch *batches, Gfx *gdl, s32 batchindex, Vtx *vertices, s32 arg5); -void bgFindRoomVtxBatches(s32 roomnum); -bool bgTestLineIntersectsIntBbox(struct coord *arg0, struct coord *arg1, s32 *arg2, s32 *arg3); -bool bgTestLineIntersectsBbox(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3); -bool bgTestHitOnObj(struct coord *arg0, struct coord *arg1, struct coord *arg2, Gfx *gdl, Gfx *gdl2, Vtx *vertices, struct hitthing *hitthing); -bool bgTestHitOnChr(struct model *model, struct coord *arg1, struct coord *arg2, struct coord *arg3, Gfx *arg4, Gfx *arg5, Vtx *vertices, f32 *arg7, struct hitthing *hitthing); -bool bgTestHitInVtxBatch(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct vtxbatch *batches, s32 roomnum, struct hitthing *hitthing); +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 bgTestHitInRoom(struct coord *frompos, struct coord *topos, s32 roomnum, struct hitthing *hitthing); -bool bgRoomIsLoaded(s32 room); -bool bgRoomContainsCoord(struct coord *pos, RoomNum roomnum); -bool bgTestPosInRoomCheap(struct coord *pos, RoomNum roomnum); -bool bgTestPosInRoomExpensive(struct coord *pos, RoomNum roomnum); -bool bgTestPosInRoom(struct coord *pos, RoomNum roomnum); -void bgFindRoomsByPos(struct coord *pos, RoomNum *inrooms, RoomNum *aboverooms, s32 max, RoomNum *bestroom); -bool bgCmdPushValue(bool value); -bool bgCmdPopValue(void); -bool bgCmdGetNthValueFromEnd(s32 offset); -struct bgcmd *bgCmdExecuteBranch(struct bgcmd *cmd, bool s2); -struct bgcmd *bgCmdExecute(struct bgcmd *cmd); -void bgTickPortalsXray(void); -void bgAddToSnake(RoomNum fromroomnum, RoomNum roomnum, s16 draworder, struct screenbox *box); -void bgConsumeSnakeItem(struct bgsnakeitem *arg0); -bool bgTryConsumeSnake(void); -void bgChooseRoomsToLoad(void); -void bgTickPortals(void); -Gfx *bgRenderSceneAndLoadCandidate(Gfx *gdl); -s32 bgGetForceOnscreenRooms(RoomNum *rooms, s32 len); -s32 bgRoomGetNeighbours(s32 room, RoomNum *rooms, s32 len); -bool bgRoomsAreNeighbours(s32 roomnum1, s32 roomnum2); -void bgCalculateScreenProperties(void); -void bgExpandRoomToPortals(s32 roomnum); -void bgPortalSwapRooms(s32 portal); -void bgInitPortal(s32 portalnum); -void bgInitRoom(s32 roomnum); -void bgSetPortalOpenState(s32 portal, bool open); -s32 bgFindPortalBetweenPositions(struct coord *pos1, struct coord *pos2); -bool bgIsBboxOverlapping(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3); -void bgCalculatePortalBbox(s32 portalnum, struct coord *bbmin, struct coord *bbmax); -void bgFindEnteredRooms(struct coord *bbmin, struct coord *upper, RoomNum *rooms, s32 maxlen, bool arg4); +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_snake(RoomNum fromroomnum, RoomNum roomnum, s16 draworder, struct screenbox *box); +void bg_consume_snake_item(struct bgsnakeitem *arg0); +bool bg_try_consume_snake(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); +void bg_calculate_portal_bbox(s32 portalnum, struct coord *bbmin, struct coord *bbmax); +void bg_find_entered_rooms(struct coord *bbmin, struct coord *upper, RoomNum *rooms, s32 maxlen, bool arg4); #endif diff --git a/src/include/game/body.h b/src/include/game/body.h index 4cc36931c..224c8bfb2 100644 --- a/src/include/game/body.h +++ b/src/include/game/body.h @@ -4,19 +4,19 @@ #include "data.h" #include "types.h" -void bodiesInit(void); +void bodies_init(void); -void bodiesReset(s32 stagenum); +void bodies_reset(s32 stagenum); -u32 bodyGetRace(s32 bodynum); -bool bodyLoad(s32 bodynum); +u32 body_get_race(s32 bodynum); +bool body_load(s32 bodynum); struct model *body0f02ce8c(s32 bodynum, s32 headnum, struct modeldef *bodymodeldef, struct modeldef *headmodeldef, bool sunglasses, struct model *model, bool isplayer, u8 varyheight); struct model *body0f02d338(s32 bodynum, s32 headnum, struct modeldef *bodymodeldef, struct modeldef *headmodeldef, bool sunglasses, u8 varyheight); -struct model *bodyAllocateModel(s32 bodynum, s32 headnum, u32 spawnflags); +struct model *body_allocate_model(s32 bodynum, s32 headnum, u32 spawnflags); s32 body0f02d3f8(void); -s32 bodyChooseHead(s32 bodynum); -void bodyAllocateChr(s32 stagenum, struct packedchr *packed, s32 cmdindex); -struct prop *bodyAllocateEyespy(struct pad *pad, RoomNum room); -void bodyCalculateHeadOffset(struct modeldef *headmodeldef, s32 headnum, s32 bodynum); +s32 body_choose_head(s32 bodynum); +void body_allocate_chr(s32 stagenum, struct packedchr *packed, s32 cmdindex); +struct prop *body_allocate_eyespy(struct pad *pad, RoomNum room); +void body_calculate_head_offset(struct modeldef *headmodeldef, s32 headnum, s32 bodynum); #endif diff --git a/src/include/game/bondbike.h b/src/include/game/bondbike.h index 18e44628c..0976528a1 100644 --- a/src/include/game/bondbike.h +++ b/src/include/game/bondbike.h @@ -4,21 +4,21 @@ #include "data.h" #include "types.h" -void bbikeInit(void); -void bbikeExit(void); -void bbikeUpdateVehicleOffset(void); -void bbikeTryDismountAngle(f32 relativeangle, f32 distance); -void bbikeHandleActivate(void); -void bbikeApplyMoveData(struct movedata *data); +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 bbikeCalculateNewPosition(struct coord *arg0, f32 arg1); -s32 bbikeCalculateNewPositionWithPush(struct coord *arg0, f32 arg1); -void bbikeUpdateVertical(struct coord *pos); +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 bbikeTick(void); +void bbike_tick(void); #endif diff --git a/src/include/game/bondcutscene.h b/src/include/game/bondcutscene.h index 02269d5be..4d07bb116 100644 --- a/src/include/game/bondcutscene.h +++ b/src/include/game/bondcutscene.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void bcutsceneInit(void); -void bcutsceneTick(void); +void bcutscene_init(void); +void bcutscene_tick(void); #endif diff --git a/src/include/game/bondeyespy.h b/src/include/game/bondeyespy.h index 033893c17..0a2d1c17d 100644 --- a/src/include/game/bondeyespy.h +++ b/src/include/game/bondeyespy.h @@ -4,16 +4,16 @@ #include "data.h" #include "types.h" -f32 eyespyFindGround(RoomNum *floorroom); -s32 eyespyTryMoveUpwards(f32 yvel); -s32 eyespyCalculateNewPosition(struct coord *vel); -bool eyespyCalculateNewPositionWithPush(struct coord *vel); +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); s32 eyespy0f0cf890(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4); s32 eyespy0f0cf9f8(struct coord *arg0, struct coord *arg1, struct coord *arg2); s32 eyespy0f0cfafc(struct coord *arg0, struct coord *arg1, struct coord *arg2); s32 eyespy0f0cfdd0(struct coord *vel, struct coord *arg1, struct coord *arg2); -void eyespyUpdateVertical(void); -bool eyespyTryLaunch(void); -void eyespyProcessInput(bool allowbuttons); +void eyespy_update_vertical(void); +bool eyespy_try_launch(void); +void eyespy_process_input(bool allowbuttons); #endif diff --git a/src/include/game/bondgrab.h b/src/include/game/bondgrab.h index 1d3e2757d..52f38d1fc 100644 --- a/src/include/game/bondgrab.h +++ b/src/include/game/bondgrab.h @@ -4,27 +4,27 @@ #include "data.h" #include "types.h" -void bgrabInit(void); -void bgrabExit(void); +void bgrab_init(void); +void bgrab_exit(void); void bgrab0f0ccbf0(struct coord *delta, f32 angle, struct defaultobj *obj); -bool bgrabTryMoveUpwards(f32 y); -s32 bgrabCalculateNewPosition(struct coord *delta, f32 angle, bool arg2); -bool bgrabCalculateNewPositiontWithPush(struct coord *delta, f32 angle, bool arg2); +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 bgrabUpdatePrevPos(void); +void bgrab_update_prev_pos(void); void bgrab0f0ce178(void); -void bgrabUpdateVertical(void); -void bgrabHandleActivate(void); -void bgrabUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult); -void bgrabUpdateSpeedForwards(f32 target, f32 speed); -void bgrabApplyMoveData(struct movedata *data); -void bgrabUpdateSpeedTheta(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 bgrabTick(void); +void bgrab_tick(void); #endif diff --git a/src/include/game/bondgun.h b/src/include/game/bondgun.h index 435901a61..6ba6383f3 100644 --- a/src/include/game/bondgun.h +++ b/src/include/game/bondgun.h @@ -4,184 +4,184 @@ #include "data.h" #include "types.h" -void bgunReset(void); +void bgun_reset(void); -void bgunStop(void); +void bgun_stop(void); -void bgunRumble(s32 handnum, s32 weaponnum); -s32 bgunGetUnequippedReloadIndex(s32 weaponnum); -void bgunTickUnequippedReload(void); -bool bgunTestGunVisCommand(struct gunviscmd *cmd, struct hand *hand); -void bgunSetPartVisible(s16 partnum, bool visible, struct hand *hand, struct modeldef *modeldef); -void bgunExecuteGunVisCommands(struct hand *hand, struct modeldef *arg1, struct gunviscmd *command); +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 bgun0f098030(struct hand *hand, struct modeldef *arg1); f32 bgun0f09815c(struct hand *hand); void bgun0f0981e8(struct hand *hand, struct modeldef *modeldef); bool bgun0f098884(struct guncmd *cmd, struct gset *gset); -void bgunStartAnimation(struct guncmd *cmd, s32 handnum, struct hand *hand); +void bgun_start_animation(struct guncmd *cmd, s32 handnum, struct hand *hand); bool bgun0f098a44(struct hand *hand, s32 time); -bool bgunIsAnimBusy(struct hand *hand); -void bgunResetAnim(struct hand *hand); -void bgunGetWeaponInfo(struct handweaponinfo *info, s32 handnum); +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 bgun0f098ca0(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 bgun0f099008(s32 handnum); bool bgun0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon); bool bgun0f099188(struct hand *hand, s32 gunfunc); -s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -void bgunSetArmPitch(struct hand *hand, f32 angle); -s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -bool bgunIsReloading(struct hand *hand); -s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgunTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); +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_auto_switch(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_change_func(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 bgunTickRecoil(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc_shoot *func); -bool bgunTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct hand *hand); -bool bgunTickIncAttackingThrow(s32 handnum, struct hand *hand); -s32 bgunGetMinClipQty(s32 weaponnum, s32 funcnum); -bool bgunTickIncAttackingMelee(s32 handnum, struct hand *hand); -bool bgunTickIncAttackingSpecial(struct hand *hand); -s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgunTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -bool bgunIsReadyToSwitch(s32 handnum); -bool bgunCanFreeWeapon(s32 handnum); +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_attack_empty(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 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgunTickIncState2(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate); -s32 bgunTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate); -bool bgunSetState(s32 handnum, s32 state); -void bgunTickHand(s32 handnum); -void bgunTickSwitch(void); -void bgunInitHandAnims(void); -f32 bgunGetNoiseRadius(s32 handnum); -void bgunDecreaseNoiseRadius(void); -void bgunCalculateBlend(s32 hand); -void bgunUpdateBlend(struct hand *hand, s32 handnum); +s32 bgun_tick_inc_change_gun(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 bgunIsLoaded(void); -u32 bgunGetGunMemType(void); -u8 *bgunGetGunMem(void); -u32 bgunCalculateGunMemCapacity(void); -void bgunFreeGunMem(void); -void bgunSetGunMemWeapon(s32 weaponnum); -void bgunEnterFlux(void); -bool bgunChangeGunMem(s32 newowner); -void bgunTickGunLoad(void); -void bgunTickMasterLoad(void); -void bgunTickLoad(void); -bool bgunLoadAll(void); -struct modeldef *bgunGetCartModeldef(void); +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 *bgunCreateThrownProjectile2(struct chrdata *chr, struct gset *gset, struct coord *pos, RoomNum *rooms, Mtxf *arg4, struct coord *velocity); -void bgunCreateThrownProjectile(s32 handnum, struct gset *gset); -void bgunUpdateHeldRocket(s32 handnum); -void bgunCreateHeldRocket(s32 handnum, struct weaponfunc_shootprojectile *func); -void bgunFreeHeldRocket(s32 handnum); -void bgunCreateFiredProjectile(s32 handnum); -void bgunSwivel(f32 autoaimx, f32 autoaimy, f32 crossdamp, f32 aimdamp); -void bgunSwivelWithDamp(f32 screenx, f32 screeny, f32 damp); -void bgunSwivelWithoutDamp(f32 arg0, f32 arg1); -void bgunGetCrossPos(f32 *x, f32 *y); +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 bgunCalculatePlayerShotSpread(struct coord *arg0, struct coord *arg1, s32 handnum, bool dorandom); -void bgunCalculateBotShotSpread(struct coord *arg0, s32 weaponnum, s32 funcnum, bool arg3, s32 crouchpos, bool dual); -void bgunSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum); -s32 bgunGetShotsToTake(s32 handnum); -void bgunFreeWeapon(s32 handnum); -void bgunTickSwitch2(void); -void bgunEquipWeapon(s32 weaponnum); -s32 bgunGetWeaponNum(s32 handnum); +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 bgunGetSwitchToWeapon(s32 handnum); -void bgunSwitchToPrevious(void); -void bgunCycleForward(void); -void bgunCycleBack(void); -bool bgunHasAmmoForWeapon(s32 weaponnum); -void bgunAutoSwitchWeapon(void); -void bgunEquipWeapon2(s32 handnum, s32 weaponnum); -s32 bgunIsFiring(s32 handnum); -s32 bgunGetAttackType(s32 handnum); -char *bgunGetName(s32 weaponnum); -u16 bgunGetNameId(s32 weaponnum); -char *bgunGetShortName(s32 arg0); -void bgunReloadIfPossible(s32 handnum); -void bgunSetAdjustPos(f32 angle); -void bgunStartSlide(s32 handnum); -void bgunUpdateSlide(s32 handnum); +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); +char *bgun_get_name(s32 weaponnum); +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 bgun0f0a27c8(void); -void bgunHandlePlayerDead(void); -bool bgunIsMissionCritical(s32 weaponnum); -void bgunDisarm(struct prop *attacker); -void bgunExecuteModelCmdList(s32 *arg0); -s32 bgunCreateModelCmdList(struct model *model, struct modelnode *node, s32 *ptr); -void bgunStartDetonateAnimation(s32 playernum); -void bgunUpdateGangsta(struct hand *hand, s32 handnum, struct coord *arg2, struct weaponfunc *funcdef, Mtxf *arg4, Mtxf *arg5); -void bgunUpdateSmoke(struct hand *hand, s32 handnum, s32 weaponnum, struct weaponfunc *funcdef); -void bgunUpdateLasersight(struct hand *hand, struct modeldef *modeldef, s32 handnum, u8 *allocation); -void bgunUpdateReaper(struct hand *hand, struct modeldef *modeldef); -void bgunUpdateSniperRifle(struct modeldef *modeldef, u8 *allocation); -void bgunUpdateDevastator(struct hand *hand, u8 *allocation, struct modeldef *modeldef); -void bgunUpdateShotgun(struct hand *hand, u8 *allocation, bool *arg2, struct modeldef *modeldef); -void bgunUpdateLaser(struct hand *hand); -void bgunUpdateMagnum(struct hand *hand, s32 handnum, struct modeldef *modeldef, Mtxf *mtx); -void bgunUpdateRocketLauncher(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func); +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_update_magnum(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 bgunTickEject(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 bgunCreateFx(struct hand *hand, s32 handnum, struct weaponfunc *funcdef, s32 weaponnum, struct modeldef *modeldef, u8 *allocation); +void bgun_create_fx(struct hand *hand, s32 handnum, struct weaponfunc *funcdef, s32 weaponnum, struct modeldef *modeldef, u8 *allocation); void bgun0f0a5550(s32 handnum); -void bgunTickMaulerCharge(void); -void bgunTickGameplay2(void); -s32 bgunAllocateFireslot(void); -void bgunRender(Gfx **gdl); -struct sndstate **bgunAllocateAudioHandle(void); -void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 texturenum); -void bgunPlayGlassHitSound(struct coord *pos, RoomNum *rooms, s32 texturenum); -void bgunPlayBgHitSound(struct gset *gset, struct coord *hitpos, s32 texturenum, RoomNum *rooms); -void bgunSetTriggerOn(s32 handnum, bool on); -s32 bgunConsiderToggleGunFunction(s32 usedowntime, bool trigpressed, bool fromactivemenu); +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 bgunIsUsingSecondaryFunction(void); -void bgunTickGameplay(bool triggeron); -void bgunSetPassiveMode(bool enable); -void bgunSetAimType(u32 aimtype); -void bgunSetAimPos(struct coord *coord); -void bgunSetHitPos(struct coord *coord); +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); -void bgunSetGunAmmoVisible(u32 reason, bool enable); -void bgunSetAmmoQuantity(s32 ammotype, s32 quantity); -s32 bgunGetReservedAmmoCount(s32 type); -s32 bgunGetAmmoCount(s32 ammotype); -s32 bgunGetCapacityByAmmotype(s32 ammotype); -bool bgunAmmotypeAllowsUnlimitedAmmo(u32 ammotype); -void bgunGiveMaxAmmo(bool force); -u32 bgunGetAmmoTypeForWeapon(u32 weaponnum, u32 func); -s32 bgunGetAmmoQtyForWeapon(u32 weaponnum, u32 func); -void bgunSetAmmoQtyForWeapon(u32 weaponnum, u32 func, u32 quantity); -s32 bgunGetAmmoCapacityForWeapon(s32 weaponnum, s32 func); -Gfx *bgunDrawHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 valign, u32 colour); -Gfx *bgunDrawHudInteger(Gfx *gdl, s32 value, s32 x, bool halign, s32 y, s32 valign, u32 colour); -void bgunResetAbmag(struct abmag *abmag); +void bgun_set_gun_ammo_visible(u32 reason, bool enable); +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); +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 *bgunDrawHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *abmag, s32 remaining, s32 capacity, u32 vacantcolour, u32 occupiedcolour, bool flip); -Gfx *bgunDrawHud(Gfx *gdl); -void bgunAddBoost(s32 arg0); -void bgunSubtractBoost(s32 arg0); -void bgunApplyBoost(void); -void bgunRevertBoost(void); -void bgunTickBoost(void); -void bgunSetSightVisible(u32 bits, bool visible); -Gfx *bgunDrawSight(Gfx *gdl); +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 bgunGetWeaponNum2(s32 handnum); -s8 bgunFreeFireslotWrapper(s32 fireslot); -s8 bgunFreeFireslot(s32 fireslot); +s32 bgun_get_weapon_num2(s32 handnum); +s8 bgun_free_fireslot_wrapper(s32 fireslot); +s8 bgun_free_fireslot(s32 fireslot); #endif diff --git a/src/include/game/bondguninit.h b/src/include/game/bondguninit.h index cd567040b..f77ed2d89 100644 --- a/src/include/game/bondguninit.h +++ b/src/include/game/bondguninit.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -void bgunReset(void); +void bgun_reset(void); #endif diff --git a/src/include/game/bondhead.h b/src/include/game/bondhead.h index a1adcbc62..7ec1fe346 100644 --- a/src/include/game/bondhead.h +++ b/src/include/game/bondhead.h @@ -4,17 +4,17 @@ #include "data.h" #include "types.h" -void bheadReset(void); +void bhead_reset(void); -void bheadFlipAnimation(void); -void bheadUpdateIdleRoll(void); -void bheadUpdatePos(struct coord *vel); -void bheadUpdateRot(struct coord *lookvel, struct coord *upvel); -void bheadSetDamp(f32 headdamp); -void bheadUpdate(f32 arg0, f32 arg1); -void bheadAdjustAnimation(f32 speed); -void bheadStartDeathAnimation(s16 animnum, u32 flip, f32 fstarttime, f32 speed); -void bheadSetSpeed(f32 speed); -f32 bheadGetBreathingValue(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 arg0, f32 arg1); +void bhead_adjust_animation(f32 speed); +void bhead_start_death_animation(s16 animnum, u32 flip, f32 fstarttime, f32 speed); +void bhead_set_speed(f32 speed); +f32 bhead_get_breathing_value(void); #endif diff --git a/src/include/game/bondmove.h b/src/include/game/bondmove.h index 7733b613f..81eed2307 100644 --- a/src/include/game/bondmove.h +++ b/src/include/game/bondmove.h @@ -4,44 +4,44 @@ #include "data.h" #include "types.h" -void bmoveSetControlDef(u32 controldef); -void bmoveSetAutoMoveCentreEnabled(bool enabled); -void bmoveSetAutoAimY(bool enabled); -bool bmoveIsAutoAimYEnabled(void); -bool bmoveIsAutoAimYEnabledForCurrentWeapon(void); -bool bmoveIsInSightAimMode(void); -void bmoveUpdateAutoAimYProp(struct prop *prop, f32 autoaimy); -void bmoveSetAutoAimX(bool enabled); -bool bmoveIsAutoAimXEnabled(void); -bool bmoveIsAutoAimXEnabledForCurrentWeapon(void); -void bmoveUpdateAutoAimXProp(struct prop *prop, f32 autoaimx); -struct prop *bmoveGetHoverbike(void); -struct prop *bmoveGetGrabbedProp(void); -void bmoveGrabProp(struct prop *prop); -void bmoveSetMode(u32 movemode); -void bmoveSetModeForAllPlayers(u32 movemode); -void bmoveHandleActivate(void); -void bmoveApplyMoveData(struct movedata *data); -void bmoveUpdateSpeedTheta(void); -f32 bmoveGetSpeedVertaLimit(f32 value); -void bmoveUpdateSpeedVerta(f32 value); -f32 bmoveGetSpeedThetaControlLimit(f32 value); -void bmoveUpdateSpeedThetaControl(f32 value); -f32 bmoveCalculateLookahead(void); -void bmoveResetMoveData(struct movedata *data); -void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2); -void bmoveFindEnteredRoomsByPos(struct player *player, struct coord *arg1, RoomNum *rooms); -void bmoveFindEnteredRooms(struct player *player, RoomNum *rooms); -void bmoveUpdateRooms(struct player *player); +void bmove_set_control_def(u32 controldef); +void bmove_set_auto_move_centre_enabled(bool enabled); +void bmove_set_auto_aim_y(bool enabled); +bool bmove_is_auto_aim_y_enabled(void); +bool bmove_is_auto_aim_y_enabled_for_current_weapon(void); +bool bmove_is_in_sight_aim_mode(void); +void bmove_update_auto_aim_y_prop(struct prop *prop, f32 autoaimy); +void bmove_set_auto_aim_x(bool enabled); +bool bmove_is_auto_aim_x_enabled(void); +bool bmove_is_auto_aim_x_enabled_for_current_weapon(void); +void bmove_update_auto_aim_x_prop(struct prop *prop, f32 autoaimx); +struct prop *bmove_get_hoverbike(void); +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 bmove0f0cb904(struct coord *coord); void bmove0f0cba88(f32 *a, f32 *b, struct coord *c, f32 mult1, f32 mult2); -void bmoveUpdateMoveInitSpeed(struct coord *newpos); -void bmoveTick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2); -void bmoveUpdateVerta(void); +void bmove_update_move_init_speed(struct coord *newpos); +void bmove_tick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2); +void bmove_update_verta(void); void bmove0f0cc19c(struct coord *arg); -void bmoveUpdateHead(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4); +void bmove_update_head(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4); void bmove0f0cc654(f32 arg0, f32 arg1, f32 arg2); -s32 bmoveGetCrouchPos(void); -s32 bmoveGetCrouchPosByPlayer(s32 playernum); +s32 bmove_get_crouch_pos(void); +s32 bmove_get_crouch_pos_by_player(s32 playernum); #endif diff --git a/src/include/game/bondview.h b/src/include/game/bondview.h index 70322b588..36fb2009f 100644 --- a/src/include/game/bondview.h +++ b/src/include/game/bondview.h @@ -4,27 +4,27 @@ #include "data.h" #include "types.h" -Gfx *bviewDrawIrRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); -Gfx *bviewCopyPixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s32 left, s32 width); -Gfx *bviewDrawFisheyeRect(Gfx *gdl, s32 arg1, f32 arg2, s32 arg3, s32 arg4); -Gfx *bviewPrepareStaticRgba16(Gfx *gdl, u32 colour, u32 alpha); -Gfx *bviewPrepareStaticI8(Gfx *gdl, u32 colour, u32 alpha); -Gfx *bviewDrawMotionBlur(Gfx *gdl, u32 colour, u32 alpha); -Gfx *bviewDrawStatic(Gfx *gdl, u32 arg1, s32 arg2); -Gfx *bviewDrawSlayerRocketInterlace(Gfx *gdl, u32 arg1, u32 arg2); -Gfx *bviewDrawFilmInterlace(Gfx *gdl, u32 colour, u32 alpha); -Gfx *bviewDrawZoomBlur(Gfx *gdl, u32 colour, s32 alpha, f32 arg3, f32 arg4); +Gfx *bview_draw_ir_rect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); +Gfx *bview_copy_pixels(Gfx *gdl, u16 *fb, s32 top, u32 tile, s32 arg4, f32 arg5, s32 left, s32 width); +Gfx *bview_draw_fisheye_rect(Gfx *gdl, s32 arg1, f32 arg2, s32 arg3, s32 arg4); +Gfx *bview_prepare_static_rgba16(Gfx *gdl, u32 colour, u32 alpha); +Gfx *bview_prepare_static_i8(Gfx *gdl, u32 colour, u32 alpha); +Gfx *bview_draw_motion_blur(Gfx *gdl, u32 colour, u32 alpha); +Gfx *bview_draw_static(Gfx *gdl, u32 arg1, s32 arg2); +Gfx *bview_draw_slayer_rocket_interlace(Gfx *gdl, u32 arg1, u32 arg2); +Gfx *bview_draw_film_interlace(Gfx *gdl, u32 colour, u32 alpha); +Gfx *bview_draw_zoom_blur(Gfx *gdl, u32 colour, s32 alpha, f32 arg3, f32 arg4); f32 bview0f142d74(s32 arg0, f32 arg1, f32 arg2, f32 arg3); -Gfx *bviewDrawFisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 startuptimer60, u8 hit); -Gfx *bviewDrawEyespySideRect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha); -Gfx *bviewDrawEyespyMetrics(Gfx *gdl); -Gfx *bviewDrawNvLens(Gfx *gdl); -Gfx *bviewDrawIrLens(Gfx *gdl); -Gfx *bviewDrawIntroText(Gfx *gdl); -Gfx *bviewDrawHorizonScanner(Gfx *gdl); -Gfx *bviewDrawIrBinoculars(Gfx *gdl); -void bviewSetMotionBlur(u32 bluramount); -void bviewClearMotionBlur(void); -Gfx *bviewDrawNvBinoculars(Gfx *gdl); +Gfx *bview_draw_fisheye(Gfx *gdl, u32 colour, u32 alpha, s32 shuttertime60, s8 startuptimer60, u8 hit); +Gfx *bview_draw_eyespy_side_rect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha); +Gfx *bview_draw_eyespy_metrics(Gfx *gdl); +Gfx *bview_draw_nv_lens(Gfx *gdl); +Gfx *bview_draw_ir_lens(Gfx *gdl); +Gfx *bview_draw_intro_text(Gfx *gdl); +Gfx *bview_draw_horizon_scanner(Gfx *gdl); +Gfx *bview_draw_ir_binoculars(Gfx *gdl); +void bview_set_motion_blur(u32 bluramount); +void bview_clear_motion_blur(void); +Gfx *bview_draw_nv_binoculars(Gfx *gdl); #endif diff --git a/src/include/game/bondwalk.h b/src/include/game/bondwalk.h index 23f9e253d..773d71c84 100644 --- a/src/include/game/bondwalk.h +++ b/src/include/game/bondwalk.h @@ -4,31 +4,31 @@ #include "data.h" #include "types.h" -void bwalkInit(void); -void bwalkSetSwayTarget(s32 value); -void bwalkAdjustCrouchPos(s32 value); +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 bwalkTryMoveUpwards(f32 amount); -bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, f32 extrawidth, s32 arg4); -bool bwalkCalculateNewPositionWithPush(struct coord *delta, f32 rotateamount, bool apply, f32 extrawidth, s32 types); +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 bwalkUpdateSpeedSideways(f32 targetspeed, f32 accelspeed, s32 mult); -void bwalkUpdateSpeedForwards(f32 targetspeed, f32 accelspeed); -void bwalkUpdateVertical(void); -void bwalkApplyCrouchSpeed(void); -void bwalkUpdateCrouchOffsetReal(void); -void bwalkUpdateCrouchOffset(void); -void bwalkUpdateTheta(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 bwalkUpdatePrevPos(void); -void bwalkHandleActivate(void); -void bwalkApplyMoveData(struct movedata *data); -void bwalkUpdateSpeedTheta(void); +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 bwalkTick(void); +void bwalk_tick(void); #endif diff --git a/src/include/game/bossfile.h b/src/include/game/bossfile.h index 6ee68a317..a66d354f1 100644 --- a/src/include/game/bossfile.h +++ b/src/include/game/bossfile.h @@ -4,10 +4,10 @@ #include "data.h" #include "types.h" -bool bossfileLoadFull(void); -u32 bossfileFindFileId(void); -void bossfileLoad(void); -void bossfileSave(void); -void bossfileSetDefaults(void); +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 ac368a0dc..8483f0079 100644 --- a/src/include/game/bot.h +++ b/src/include/game/bot.h @@ -4,60 +4,60 @@ #include "data.h" #include "types.h" -bool botroomFindPos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnumptr, s32 *covernumptr); +bool botroom_find_pos(RoomNum room, struct coord *pos, f32 *angleptr, s32 *padnumptr, s32 *covernumptr); -bool botIsDizzy(struct chrdata *chr); -void botReset(struct chrdata *chr, u8 respawning); -void botSpawn(struct chrdata *chr, u8 full); -void botSpawnAll(void); +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 botPickupProp(struct prop *prop, struct chrdata *chr); -bool botTestPropForPickup(struct prop *prop, struct chrdata *chr); -void botCheckPickups(struct chrdata *chr); -s32 botGuessCrouchPos(struct chrdata *chr); -bool botApplyMovement(struct chrdata *chr); -bool botIsAboutToAttack(struct chrdata *chr, bool arg1); -s32 botTick(struct prop *prop); -f32 botCalculateMaxSpeed(struct chrdata *chr); +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); #if VERSION >= VERSION_NTSC_1_0 -void botUpdateLateral(struct chrdata *chr, f32 *move, s32 numupdates, f32 arg3); +void bot_update_lateral(struct chrdata *chr, f32 *move, s32 numupdates, f32 arg3); #else -void botUpdateLateral(struct chrdata *chr, f32 *move); +void bot_update_lateral(struct chrdata *chr, f32 *move); #endif -void botDisarm(struct chrdata *chr, struct prop *attacker); -void botSetTarget(struct chrdata *chr, s32 propnum); -bool botIsTargetInvisible(struct chrdata *botchr, struct chrdata *otherchr); -bool botHasGround(struct chrdata *chr); -void botUpdateZeroAngle(struct chrdata *chr); -bool botPassesPeaceCheck(struct chrdata *botchr, struct chrdata *otherchr); -bool botPassesCowardCheck(struct chrdata *botchr, struct chrdata *otherchr); -void botChooseGeneralTarget(struct chrdata *chr); -void botScheduleReload(struct chrdata *chr, s32 handnum); -struct prop *botFindPickup(struct chrdata *chr, s32 criteria); -s32 botGetNumOpponentsInHill(struct chrdata *chr); -void botTickUnpaused(struct chrdata *chr); -s32 botIsObjCollectable(struct defaultobj *obj); -s32 botGetWeaponNum(struct chrdata *chr); -u8 botGetTargetsWeaponNum(struct chrdata *chr); -char *botGetCommandName(s32 command); -void botApplyAttack(struct chrdata *chr, struct prop *prop); -void botApplyFollow(struct chrdata *chr, struct prop *prop); -void botApplyProtect(struct chrdata *chr, struct prop *prop); -void botApplyDefend(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle); -void botApplyHold(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle); -void botApplyScenarioCommand(struct chrdata *chr, u32 arg1); -bool botCanFollow(struct chrdata *leader, struct chrdata *follower); -s32 botFindTeammateToFollow(struct chrdata *chr, f32 range); -bool botCanDoCriticalPickup(struct chrdata *chr); -struct prop *botFindDefaultPickup(struct chrdata *chr); -struct prop *botFindAnyPickup(struct chrdata *chr); -s32 botGetTeamSize(struct chrdata *chr); -s32 botGetCountInTeamDoingCommand(struct chrdata *self, u32 command, bool includeself); -s32 botIsChrsCtcTokenHeld(struct chrdata *chr); -bool botShouldReturnCtcToken(struct chrdata *chr); -s32 botGetNumTeammatesDefendingHill(struct chrdata *bot); -void botCheckFetch(struct chrdata *chr); +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); +void bot_apply_follow(struct chrdata *chr, struct prop *prop); +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/botact.h b/src/include/game/botact.h index 4b91ac0d4..a72400b7a 100644 --- a/src/include/game/botact.h +++ b/src/include/game/botact.h @@ -4,22 +4,22 @@ #include "data.h" #include "types.h" -s32 botactGetAmmoTypeByFunction(s32 weaponnum, s32 funcnum); -s32 botactGetClipCapacityByFunction(s32 weaponnum, u32 funcnum); -void botactReload(struct chrdata *chr, s32 handnum, bool withsound); -s32 botactGetAmmoQuantityByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, bool include_equipped); -s32 botactGetAmmoQuantityByType(struct aibot *aibot, s32 ammotype, bool include_equipped); -s32 botactTryRemoveAmmoFromReserve(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 qty); -void botactGiveAmmoByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 qty); -void botactGiveAmmoByType(struct aibot *aibot, u32 ammotype, s32 quantity); -bool botactShootFarsight(struct chrdata *chr, s32 arg1, struct coord *arg2, struct coord *arg3); -bool botactIsWeaponThrowable(s32 weaponnum, bool is_secondary); -u32 botactGetProjectileThrowInterval(u32 weapon); -s32 botactGetWeaponByAmmoType(s32 ammotype); -void botactThrow(struct chrdata *chr); -s32 botactGetShootInterval60(s32 weaponnum, s32 funcnum); -bool botactFindRocketRoute(struct chrdata *chr, struct coord *frompos, struct coord *topos, RoomNum *fromrooms, RoomNum *torooms, struct projectile *projectile); -void botactGetRocketNextStepPos(u16 padnum, struct coord *pos); -void botactCreateSlayerRocket(struct chrdata *chr); +s32 botact_get_ammo_type_by_function(s32 weaponnum, s32 funcnum); +s32 botact_get_clip_capacity_by_function(s32 weaponnum, u32 funcnum); +void botact_reload(struct chrdata *chr, s32 handnum, bool withsound); +s32 botact_get_ammo_quantity_by_weapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, bool include_equipped); +s32 botact_get_ammo_quantity_by_type(struct aibot *aibot, s32 ammotype, bool include_equipped); +s32 botact_try_remove_ammo_from_reserve(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 qty); +void botact_give_ammo_by_weapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32 qty); +void botact_give_ammo_by_type(struct aibot *aibot, u32 ammotype, s32 quantity); +bool botact_shoot_farsight(struct chrdata *chr, s32 arg1, struct coord *arg2, struct coord *arg3); +bool botact_is_weapon_throwable(s32 weaponnum, bool is_secondary); +u32 botact_get_projectile_throw_interval(u32 weapon); +s32 botact_get_weapon_by_ammo_type(s32 ammotype); +void botact_throw(struct chrdata *chr); +s32 botact_get_shoot_interval60(s32 weaponnum, s32 funcnum); +bool botact_find_rocket_route(struct chrdata *chr, struct coord *frompos, struct coord *topos, RoomNum *fromrooms, RoomNum *torooms, struct projectile *projectile); +void botact_get_rocket_next_step_pos(u16 padnum, struct coord *pos); +void botact_create_slayer_rocket(struct chrdata *chr); #endif diff --git a/src/include/game/botcmd.h b/src/include/game/botcmd.h index 04ff15758..74c7fb418 100644 --- a/src/include/game/botcmd.h +++ b/src/include/game/botcmd.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void botcmdTickDistMode(struct chrdata *chr); -void botcmdApply(struct chrdata *chr, u32 command); +void botcmd_tick_dist_mode(struct chrdata *chr); +void botcmd_apply(struct chrdata *chr, u32 command); #endif diff --git a/src/include/game/botinv.h b/src/include/game/botinv.h index d06175dfb..8c7b3e8b4 100644 --- a/src/include/game/botinv.h +++ b/src/include/game/botinv.h @@ -4,27 +4,27 @@ #include "data.h" #include "types.h" -void botinvClear(struct chrdata *chr); -struct invitem *botinvGetFreeSlot(struct chrdata *chr); -struct invitem *botinvGetItem(struct chrdata *chr, s32 weaponnum); -void botinvRemoveItem(struct chrdata *chr, s32 weaponnum); -u32 botinvGetItemType(struct chrdata *chr, u32 weaponnum); -bool botinvGiveSingleWeapon(struct chrdata *chr, u32 weaponnum); -void botinvGiveDualWeapon(struct chrdata *chr, u32 weaponnum); -s16 botinvGetWeaponPad(struct chrdata *chr, u32 weaponnum); -bool botinvGiveProp(struct chrdata *chr, struct prop *prop); -void botinvScoreAllWeapons(struct chrdata *chr, s32 *weaponnums, s32 *scores1, s32 *scores2); -bool mpHasShield(void); -s32 mpGetWeaponSlotByWeaponNum(s32 weaponnum); -void botinvScoreWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2, bool arg7, bool learn); -void botinvScoreWeaponAgainstTarget(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2); -void botinvScoreWeaponByItself(struct chrdata *chr, s32 weaponnum, s32 funcnum, s32 ifammo, bool dual, s32 *dst1, s32 *dst2); -s32 botinvGetDistConfig(s32 weaponnum, s32 funcnum); -bool botinvAllowsWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum); -void botinvTick(struct chrdata *chr); -bool botinvSwitchToWeapon(struct chrdata *chr, s32 weaponnum, s32 funcnum); -void botinvDrop(struct chrdata *chr, s32 weaponnum, u8 dropall); -void botinvDropAll(struct chrdata *chr, u32 weaponnum); -void botinvDropOne(struct chrdata *chr, u32 weaponnum); +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); +bool botinv_give_single_weapon(struct chrdata *chr, u32 weaponnum); +void botinv_give_dual_weapon(struct chrdata *chr, u32 weaponnum); +s16 botinv_get_weapon_pad(struct chrdata *chr, u32 weaponnum); +bool botinv_give_prop(struct chrdata *chr, struct prop *prop); +void botinv_score_all_weapons(struct chrdata *chr, s32 *weaponnums, s32 *scores1, s32 *scores2); +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); #endif diff --git a/src/include/game/botinvinit.h b/src/include/game/botinvinit.h index be927242c..acf3b6f36 100644 --- a/src/include/game/botinvinit.h +++ b/src/include/game/botinvinit.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -void botinvInit(struct chrdata *chr, s32 maxitems); +void botinv_init(struct chrdata *chr, s32 maxitems); #endif diff --git a/src/include/game/botmgr.h b/src/include/game/botmgr.h index e5530bf7e..c19da4deb 100644 --- a/src/include/game/botmgr.h +++ b/src/include/game/botmgr.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void botmgrRemoveAll(void); -void botmgrAllocateBot(s32 chrnum, s32 aibotnum); +void botmgr_remove_all(void); +void botmgr_allocate_bot(s32 chrnum, s32 aibotnum); #endif diff --git a/src/include/game/camdraw.h b/src/include/game/camdraw.h index 3c58fb303..0d3a01f39 100644 --- a/src/include/game/camdraw.h +++ b/src/include/game/camdraw.h @@ -10,13 +10,13 @@ void func0f149e58(u8 *arg0, u32 size); void func0f14a00c(bool arg0); struct var8007f8e0 *func0f14a06c(s32 index); void func0f14a16c(s32 arg0); -char *phGetStyleName(s32 stylenum); -char *phGetColourName(s32 colournum); +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 pheadInit(void); -void pheadReset(void); +void phead_init(void); +void phead_reset(void); void func0f14a52c(void); void func0f14a560(void); void func0f14a594(s32 arg0); @@ -86,8 +86,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 phGetGuid(s32 index, struct fileguid *guid); -void pheadInit2(void); +void ph_get_guid(s32 index, struct fileguid *guid); +void phead_init2(void); extern const char var7f1b6050[]; extern const char var7f1b6058[]; diff --git a/src/include/game/camera.h b/src/include/game/camera.h index 9047f5d50..16a44694b 100644 --- a/src/include/game/camera.h +++ b/src/include/game/camera.h @@ -4,45 +4,45 @@ #include "data.h" #include "types.h" -void camSetScreenSize(f32 width, f32 height); -void camSetScreenPosition(f32 left, f32 top); -void camSetPerspective(f32 near, f32 fovy, f32 aspect); +void cam_set_screen_size(f32 width, f32 height); +void cam_set_screen_position(f32 left, f32 top); +void cam_set_perspective(f32 near, f32 fovy, f32 aspect); f32 cam0f0b49b8(f32 arg0); -void camSetScale(void); +void cam_set_scale(void); void cam0f0b4c3c(f32 pos2d[2], struct coord *dir2d, f32 arg2); void cam0f0b4d04(struct coord *in, f32 *out); void cam0f0b4d68(struct coord *in, f32 out[2]); void cam0f0b4dec(struct coord *in, f32 out[2]); void cam0f0b4e68(f32 in[2], f32 divisor, f32 out[2]); void cam0f0b4eb8(struct coord *arg0, f32 arg1[2], f32 zoom, f32 aspect); -void camSetMtxL1738(Mtx *mtx); -void camSetMtxL173c(Mtx *mtx); -Mtx *camGetMtxL173c(void); -void camSetMtxF006c(Mtxf *mtx); -Mtxf *camGetMtxF006c(void); -void camSetPerspectiveMtxL(Mtx *value); -Mtx *camGetPerspectiveMtxL(void); -void camSetOrthogonalMtxL(Mtx *mtx); -Mtx *camGetOrthogonalMtxL(void); -void camSetWorldToScreenMtxf(Mtxf *mtx); +void cam_set_mtxl1738(Mtx *mtx); +void cam_set_mtxl173c(Mtx *mtx); +Mtx *cam_get_mtxl173c(void); +void cam_set_mtxf006c(Mtxf *mtx); +Mtxf *cam_get_mtxf006c(void); +void cam_set_perspective_mtxl(Mtx *value); +Mtx *cam_get_perspective_mtxl(void); +void cam_set_orthogonal_mtxl(Mtx *mtx); +Mtx *cam_get_orthogonal_mtxl(void); +void cam_set_world_to_screen_mtxf(Mtxf *mtx); Mtxf *cam0f0b5050(u8 *arg0); Mtxf *cam0f0b53a4(u8 *arg0); -Mtxf *camGetWorldToScreenMtxf(void); -void camSetMtxF1754(Mtxf *mtx); -Mtxf *camGetMtxF1754(void); -void camSetProjectionMtxF(Mtxf *mtx); -Mtxf *camGetProjectionMtxF(void); -void camSetLookAt(LookAt *lookat); -LookAt *camGetLookAt(void); -f32 camGetLodScaleZ(void); -f32 camGetScreenWidth(void); -f32 camGetScreenHeight(void); -f32 camGetScreenLeft(void); -f32 camGetScreenTop(void); -f32 camGetPerspAspect(void); +Mtxf *cam_get_world_to_screen_mtxf(void); +void cam_set_mtxf1754(Mtxf *mtx); +Mtxf *cam_get_mtxf1754(void); +void cam_set_projection_mtxf(Mtxf *mtx); +Mtxf *cam_get_projection_mtxf(void); +void cam_set_look_at(LookAt *lookat); +LookAt *cam_get_look_at(void); +f32 cam_get_lod_scale_z(void); +f32 cam_get_screen_width(void); +f32 cam_get_screen_height(void); +f32 cam_get_screen_left(void); +f32 cam_get_screen_top(void); +f32 cam_get_persp_aspect(void); void cam0f0b5838(void); bool cam0f0b5b9c(struct coord *arg0, f32 arg1); -bool camIsPosInScreenBox(struct coord *pos, f32 arg1, struct drawslot *drawslot); -bool camIsPosInFovAndVisibleRoom(RoomNum *rooms, struct coord *pos, f32 arg2); +bool cam_is_pos_in_screen_box(struct coord *pos, f32 arg1, struct drawslot *drawslot); +bool cam_is_pos_in_fov_and_visible_room(RoomNum *rooms, struct coord *pos, f32 arg2); #endif diff --git a/src/include/game/casing.h b/src/include/game/casing.h index f9211fc15..611d940ab 100644 --- a/src/include/game/casing.h +++ b/src/include/game/casing.h @@ -4,8 +4,8 @@ #include "data.h" #include "types.h" -void casingsReset(void); -void casingTick(struct casing *arg0); -void casingsTick(void); +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 e5a814e79..3f1dc6265 100644 --- a/src/include/game/challenge.h +++ b/src/include/game/challenge.h @@ -7,45 +7,45 @@ extern u32 g_MpChallengeIndex; extern struct mpconfigfull *g_MpCurrentChallengeConfig; -void challengesInit(void); +void challenges_init(void); -void challengeDetermineUnlockedFeatures(void); -void challengePerformSanityChecks(void); -char *challengeGetNameBySlot(s32 slot); -bool challengeIsCompletedByAnyChrWithNumPlayersBySlot(s32 slot, s32 numplayers); -struct mpconfigfull *challengeLoadConfig(s32 confignum, u8 *buffer, s32 len); -s32 challengeForceUnlockFeature(s32 featurenum, u8 *array, s32 tail, s32 len); -s32 challengeForceUnlockSetupFeatures(struct mpsetup *mpsetup, u8 *array, s32 len); -void challengeForceUnlockConfigFeatures(struct mpconfig *config, u8 *array, s32 len, s32 challengeindex); -void challengeForceUnlockBotFeatures(void); -void challengeApply(void); -char *challengeGetCurrentDescription(void); -char *challengeGetConfigDescription(struct mpconfigfull *mpconfig); -bool challengeIsCompleteForEndscreen(void); -bool aiMpInitSimulants(void); -void vmPrintStatsIfEnabled(void); -bool challengeIsAvailableToPlayer(s32 chrnum, s32 challengeindex); -bool challengeIsAvailableToAnyPlayer(s32 challengeindex); -s32 challengeGetNumAvailable(void); -char *challengeGetName(s32 challengeindex); -void challengeSetCurrentBySlot(s32 slotnum); -s32 challengeGetCurrent(void); -struct mpconfigfull *challengeLoad(s32 challengeindex, u8 *buffer, s32 len); -struct mpconfigfull *challengeLoadBySlot(s32 n, u8 *buffer, s32 len); -struct mpconfigfull *challengeLoadCurrent(u8 *buffer, s32 len); -void challengeRemoveForceUnlocks(void); -s32 challengeRemovePlayerLock(void); -void challengeLoadAndStoreCurrent(u8 *buffer, s32 len); -void challengeUnsetCurrent(void); -bool challengeIsLoaded(void); -s32 challengeGetAutoFocusedIndex(s32 mpchrnum); -char *challengeGetName2(s32 playernum, s32 challengeindex); -bool challengeIsCompletedByPlayerWithNumPlayers2(s32 mpchrnum, s32 index, s32 numplayers); -bool challengeIsCompletedByAnyPlayerWithNumPlayers(s32 index, s32 numplayers); -void challengeSetCompletedByAnyPlayerWithNumPlayers(s32 index, s32 numplayers, bool completed); -bool challengeIsCompletedByPlayerWithNumPlayers(s32 mpchrnum, s32 index, s32 numplayers); -void challengeSetCompletedByPlayerWithNumPlayers(u32 mpchrnum, s32 index, s32 numplayers, bool completed); -void challengeConsiderMarkingComplete(void); -bool challengeIsFeatureUnlocked(s32 feature); +void challenge_determine_unlocked_features(void); +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); +void challenge_unset_current(void); +bool challenge_is_loaded(void); +s32 challenge_get_auto_focused_index(s32 mpchrnum); +char *challenge_get_name2(s32 playernum, s32 challengeindex); +bool challenge_is_completed_by_player_with_num_players2(s32 mpchrnum, s32 index, s32 numplayers); +bool challenge_is_completed_by_any_player_with_num_players(s32 index, s32 numplayers); +void challenge_set_completed_by_any_player_with_num_players(s32 index, s32 numplayers, bool completed); +bool challenge_is_completed_by_player_with_num_players(s32 mpchrnum, s32 index, s32 numplayers); +void challenge_set_completed_by_player_with_num_players(u32 mpchrnum, s32 index, s32 numplayers, bool completed); +void challenge_consider_marking_complete(void); +bool challenge_is_feature_unlocked(s32 feature); #endif diff --git a/src/include/game/cheats.h b/src/include/game/cheats.h index 384324dc8..2371a5870 100644 --- a/src/include/game/cheats.h +++ b/src/include/game/cheats.h @@ -12,21 +12,21 @@ extern struct menudialogdef g_CheatsClassicWeaponsMenuDialog; extern struct menudialogdef g_CheatsWeaponsMenuDialog; extern struct menudialogdef g_CheatsBuddiesMenuDialog; -u32 cheatIsUnlocked(s32 cheat_id); -bool cheatIsActive(s32 cheat_id); -void cheatActivate(s32 cheat_id); -void cheatDeactivate(s32 cheat_id); -void cheatsInit(void); -void cheatsReset(void); -char *cheatGetNameIfUnlocked(struct menuitem *item); -char *cheatGetMarquee(struct menuitem *item); -s32 cheatGetByTimedStageIndex(s32 stage_index, s32 difficulty); -s32 cheatGetByCompletedStageIndex(s32 stage_index); -s32 cheatGetTime(s32 cheat_id); -char *cheatGetName(s32 cheat_id); -MenuDialogHandlerResult cheatMenuHandleDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult cheatCheckboxMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult cheatMenuHandleBuddyCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult cheatMenuHandleTurnOffAllCheats(s32 operation, struct menuitem *item, union handlerdata *data); +u32 cheat_is_unlocked(s32 cheat_id); +bool cheat_is_active(s32 cheat_id); +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 0287d1b26..791677d9e 100644 --- a/src/include/game/chr.h +++ b/src/include/game/chr.h @@ -4,9 +4,9 @@ #include "data.h" #include "types.h" -void chrSetChrnum(struct chrdata *chr, s16 chrnum); -void chrDeregister(s32 chrnum); -void chrCalculatePushPos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, bool arg3); +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 bool chr0f01f264(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 arg3, bool arg4); @@ -15,85 +15,85 @@ bool chr0f01f264(struct chrdata *chr, struct coord *pos, RoomNum *rooms, f32 arg #endif bool chr0f01f378(struct model *model, struct coord *arg1, struct coord *arg2, f32 *mangroundptr); -s32 chrsGetNumFree(void); -s16 chrsGetNextUnusedChrnum(void); +s32 chrs_get_num_free(void); +s16 chrs_get_next_unused_chrnum(void); struct prop *chr0f020b14(struct prop *prop, struct model *model, struct coord *pos, RoomNum *rooms, f32 arg3, u8 *ailist); -void chrRemove(struct prop *prop, bool free); -void chrUpdateAimProperties(struct chrdata *chr); -void chrFlinchBody(struct chrdata *chr); -void chrFlinchHead(struct chrdata *chr, f32 arg1); -f32 chrGetFlinchAmount(struct chrdata *chr); +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 chr0f021fa8(struct chrdata *chr, struct coord *pos, RoomNum *rooms); void chr0f0220ec(struct chrdata *chr, s32 lvupdate240, bool arg2); void chr0f022214(struct chrdata *chr, struct prop *child, bool fulltick); -void chrUpdateCloak(struct chrdata *chr); -s32 chrGetCloakAlpha(struct chrdata *chr); -void chrSetPoisoned(struct chrdata *chr, struct prop *poisonprop); -void chrTickPoisoned(struct chrdata *chr); -bool chrTickBeams(struct prop *prop); -s32 chrTick(struct prop *prop); -void chrDropConcealedItems(struct chrdata *chr); -void chrSetHudpieceVisible(struct chrdata *chr, bool visible); -void chrDropItemsForOwnerReap(struct chrdata *chr); +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 chr0f0246e4(u8 *arg0); bool chr0f024738(struct chrdata *chr); bool chr0f024b18(struct model *model, struct modelnode *node); -void chrRenderAttachedObject(struct prop *prop, struct modelrenderdata *renderdata, bool xlupass, struct chrdata *chr); -void chrGetBloodColour(s16 bodynum, u8 *colour1, u32 *colour2); -Gfx *chrRender(struct prop *prop, Gfx *gdl, bool xlupass); -void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct coord *coord, struct coord *coord2, struct chrdata *chr2); +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 chr0f0260c4(struct model *model, s32 hitpart, struct modelnode *node, struct coord *arg3); -void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct coord *arg3); -void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius); -f32 chrGetHitRadius(struct chrdata *chr); -void chrTestHit(struct prop *prop, struct shotdata *shotdata, bool isshooting, bool cheap); -void chrHit(struct shotdata *shotdata, struct hit *hit); +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); +void chr_hit(struct shotdata *shotdata, struct hit *hit); void chr0f028498(bool value); -void chrsCheckForNoise(f32 noiseradius); -bool chrCalculateAutoAim(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3); +void chrs_check_for_noise(f32 noiseradius); +bool chr_calculate_auto_aim(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3); s32 chr0f028e18(struct prop *arg0, struct modelnode *node, struct model *model, struct prop *arg3); bool chr0f028e6c(s32 arg0, struct prop *prop, struct prop **propptr, struct modelnode **nodeptr, struct model **modelptr); -void shieldhitCreate(struct prop *prop, f32 shield, struct prop *arg2, struct modelnode *node, struct model *model, s32 side, s16 *arg6); -void shieldhitRemove(struct shieldhit *shieldhit); -void shieldhitsRemoveByProp(struct prop *prop); +void shieldhit_create(struct prop *prop, f32 shield, struct prop *arg2, 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 chr0f02932c(struct prop *prop, s32 arg1); s32 chr0f0293ec(struct prop *prop, s32 arg1); s32 chr0f0294cc(struct prop *prop, s32 arg1); void chr0f0295f8(f32 arg0, s32 *arg1, s32 *arg2, s32 *arg3); -f32 propGetShieldThing(struct prop **propptr); -Gfx *chrRenderShieldComponent(Gfx *gdl, struct shieldhit *hit, struct prop *prop, struct model *model, struct modelnode *node, s32 side, s32 arg6, s32 arg7, s32 alpha); -Gfx *shieldhitRender(Gfx *gdl, struct prop *prop1, struct prop *prop2, s32 alpha, bool arg4, s32 cmnum1, s32 cmnum2, s32 cmnum3, s32 cmnum4); -Gfx *chrRenderCloak(Gfx *gdl, struct prop *chr1, struct prop *chr2); -Gfx *chrRenderShield(Gfx *gdl, struct chrdata *chr, u32 alpha); -void shieldhitsTick(void); -void chrSetDrCarollImages(struct chrdata *drcaroll, s32 imageleft, s32 imageright); -s32 chrsGetNumSlots(void); -void chrRegister(s32 chrnum, s32 chrindex); -Vtx *chrAllocateVertices(s32 numvertices); -void chrsSetVar8006297c(u32 arg0); -u32 chrsGetVar8006297c(void); -void chrsSetVar80062980(u32 arg0); -u32 chrsGetVar80062980(void); -void chrSetPerimEnabled(struct chrdata *chr, bool enable); -void chrSetMaxDamage(struct chrdata *chr, f32 maxdamage); -f32 chrGetMaxDamage(struct chrdata *chr); -void chrAddHealth(struct chrdata *chr, f32 health); -f32 chrGetArmor(struct chrdata *chr); -void chrInit(struct prop *prop, u8 *ailist); -struct prop *chrAllocate(struct model *model, struct coord *pos, RoomNum *rooms, f32 faceangle, u8 *ailist); -void chrClearReferences(s32 propnum); +f32 prop_get_shield_thing(struct prop **propptr); +Gfx *chr_render_shield_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_dr_caroll_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 chrs_set_var8006297c(u32 arg0); +u32 chrs_get_var8006297c(void); +void chrs_set_var80062980(u32 arg0); +u32 chrs_get_var80062980(void); +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_init(struct prop *prop, u8 *ailist); +struct prop *chr_allocate(struct model *model, struct coord *pos, RoomNum *rooms, f32 faceangle, u8 *ailist); +void chr_clear_references(s32 propnum); void chr0f022084(struct chrdata *chr, RoomNum *room); void chr0f0220ac(struct chrdata *chr); -void chrCloak(struct chrdata *chr, bool arg1); -void chrUncloak(struct chrdata *chr, bool value); -void chrUncloakTemporarily(struct chrdata *chr); +void chr_cloak(struct chrdata *chr, bool arg1); +void chr_uncloak(struct chrdata *chr, bool value); +void chr_uncloak_temporarily(struct chrdata *chr); void chr0f02472c(void); void chr0f028490(f32 arg1); -struct chrdata *chrFindByLiteralId(s32 chrnum); -struct prop *chrGetHeldProp(struct chrdata *chr, s32 hand); -struct prop *chrGetHeldUsableProp(struct chrdata *chr, s32 hand); -struct prop *chrGetTargetProp(struct chrdata *chr); -bool chrUpdateGeometry(struct prop *prop, u8 **start, u8 **end); -void chrGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin); +struct chrdata *chr_find_by_literal_id(s32 chrnum); +struct prop *chr_get_held_prop(struct chrdata *chr, s32 hand); +struct prop *chr_get_held_usable_prop(struct chrdata *chr, s32 hand); +struct prop *chr_get_target_prop(struct chrdata *chr); +bool chr_update_geometry(struct prop *prop, u8 **start, u8 **end); +void chr_get_bbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin); #endif diff --git a/src/include/game/chraction.h b/src/include/game/chraction.h index ec85d4269..236b45bc5 100644 --- a/src/include/game/chraction.h +++ b/src/include/game/chraction.h @@ -5,334 +5,334 @@ #include "types.h" f32 func0f02dff0(s16 animnum); -bool chrGoPosIsWaiting(struct chrdata *chr); -bool weaponIsOneHanded(struct prop *prop); -f32 chrGetRangedSpeed(struct chrdata *chr, f32 min, f32 max); -s32 chrGetPercentageOfSlowness(struct chrdata *chr, s32 percentage); -f32 chrGetRangedArghSpeed(struct chrdata *chr, f32 min, f32 max); -f32 chrGetAttackEntityRelativeAngle(struct chrdata *chr, s32 attackflags, s32 entityid); -f32 chrGetAttackEntityDistance(struct chrdata *chr, u32 attackflags, s32 entityid); +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 chrChooseStandAnimation(struct chrdata *chr, f32 mergetime); -void chrStand(struct chrdata *chr); -bool chrFaceCover(struct chrdata *chr); -void chrKneelChooseAnimation(struct chrdata *chr); -void chrStartAlarmChooseAnimation(struct chrdata *chr); -void chrThrowGrenadeChooseAnimation(struct chrdata *chr); -void chrSurprisedChooseAnimation(struct chrdata *chr); -void chrDoSurprisedOneHand(struct chrdata *chr); -void chrSurrenderChooseAnimation(struct chrdata *chr); -void chrSidestepChooseAnimation(struct chrdata *chr); -void chrJumpOutChooseAnimation(struct chrdata *chr); -void chrRunPosChooseAnimation(struct chrdata *chr); -void chrAttackStand(struct chrdata *chr, u32 attackflags, s32 entityid); -void chrAttackLie(struct chrdata *chr, u32 attackflags, s32 entityid); -void chrAttackKneel(struct chrdata *chr, u32 attackflags, s32 entityid); -void chrAttackWalkChooseAnimation(struct chrdata *chr); -void chrAttackWalk(struct chrdata *chr, bool run); -void chrAttackRollChooseAnimation(struct chrdata *chr); -void chrAttackRoll(struct chrdata *chr, bool toleft); -void chrStartAnim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed); +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 chrAttack(struct chrdata *chr, struct attackanimgroup **animgroups, bool flip, bool *firing, u32 attackflags, s32 entityid, bool standing); -void chrAttackAmount(struct chrdata *chr, u32 attackflags, u32 entityid, u32 maxshots); -void chrBeginDeath(struct chrdata *chr, struct coord *dir, f32 relangle, s32 hitpart, struct gset *gset, bool knockout, s32 aplayernum); -void chrBeginArgh(struct chrdata *chr, f32 angle, s32 hitpart); -void chrReactToDamage(struct chrdata *chr, struct coord *dir, f32 angle, s32 hitpart, struct gset *gset, s32 playernum); -void chrYeetFromPos(struct chrdata *chr, struct coord *pos, f32 arg2); -s32 gsetGetBlurAmount(struct gset *gset); -void chrKnockOut(struct chrdata *chr, f32 angle, s32 hitpart, struct gset *gset); -bool chrIsAnimPreventingArgh(struct chrdata *chr, f32 *arg1); -void chrChoke(struct chrdata *chr, s32 choketype); -void chrSetShield(struct chrdata *chr, f32 shield); +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 func0f034080(struct chrdata *chr, struct modelnode *node, struct prop *prop, struct model *model, s32 side, s16 *arg5); -void chrDamageByMisc(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop); -void chrDamageByLaser(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop); +void chr_damage_by_misc(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop); +void chr_damage_by_laser(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop); void func0f0341dc(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 *arg10); -void chrDamageByImpact(struct chrdata *chr, f32 damage, struct coord *vector, struct gset *gset, struct prop *prop, s32 arg5); -void chrDamageByExplosion(struct chrdata *chr, f32 damage, struct coord *vector, struct prop *prop, struct coord *explosionpos); -void playerUpdateDamageStats(struct prop *attacker, struct prop *victim, f32 damage); -void chrDamage(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); +void chr_damage_by_impact(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 propchrHasClearLineToPos(struct prop *prop, struct coord *dstpos, struct coord *vector); -bool propchrHasClearLineInVector(struct prop *prop, struct coord *coord, f32 arg2); +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 chrGetSideVectorToTarget(struct chrdata *chr, bool side, struct coord *vector); -bool chrCanRollInDirection(struct chrdata *chr, bool toleft, f32 distance); -void chrGetSideVector(struct chrdata *chr, bool side, struct coord *vector); -bool chrCanJumpInDirection(struct chrdata *chr, bool side, f32 distance); -bool chrIsRoomOffScreen(struct chrdata *chr, struct coord *waypos, RoomNum *wayrooms); -void chrGoPosInitMagic(struct chrdata *chr, struct waydata *waydata, struct coord *arg2, struct coord *prevpos); -void chrGoPosGetCurWaypointInfoWithFlags(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 *flags); +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); f32 func0f0370a8(struct chrdata *chr); -s32 chrGoPosCalculateBaseTtl(struct chrdata *chr); -void chrGoPosConsiderRestart(struct chrdata *chr); -void chrGoPosInitExpensive(struct chrdata *chr); -void chrGoPosAdvanceWaypoint(struct chrdata *chr); -s32 chrPatrolCalculateStep(struct chrdata *chr, bool *forward, s32 numsteps); -s16 chrPatrolCalculatePadNum(struct chrdata *chr, s32 numsteps); -void chrPatrolGetCurWaypointInfoWithFlags(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 chrNavTickMagic(struct chrdata *chr, struct waydata *waydata, f32 speed, struct coord *arg3, RoomNum *rooms); -void chrCalculatePosition(struct chrdata *chr, struct coord *pos); -void chrGoPosChooseAnimation(struct chrdata *chr); -bool chrGoToRoomPos(struct chrdata *chr, struct coord *pos, RoomNum *rooms, u32 goposflags); -void chrPatrolChooseAnimation(struct chrdata *chr); -void chrStartPatrol(struct chrdata *chr, struct path *path); -bool chrHasLosToEntity(struct chrdata *chr, struct coord *chrpos, RoomNum *chrrooms, bool allowextraheight, u32 attackflags, u32 entityid); -bool chrHasLosToAttackTarget(struct chrdata *chr, struct coord *pos, RoomNum *rooms, bool allowextraheight); -bool chrHasLosToChr(struct chrdata *chr, struct chrdata *target, RoomNum *room); -bool chrHasLosToPos(struct chrdata *viewerchr, struct coord *pos, RoomNum *rooms); -bool chrHasLosToPosWasteful(struct chrdata *chr, struct coord *pos, RoomNum *room); -bool chrHasLosToProp(struct chrdata *chr, struct prop *prop); -bool chrIsStopped(struct chrdata *chr); -bool chrCheckCanSeeTarget(struct chrdata *chr); -bool chrIsReadyForOrders(struct chrdata *chr); -bool chrTrySidestep(struct chrdata *chr); -bool chrTryJumpOut(struct chrdata *chr); -bool chrTryRunSideways(struct chrdata *chr); -bool chrTryAttackWalk(struct chrdata *chr); -bool chrTryAttackRun(struct chrdata *chr); -bool chrTryAttackRoll(struct chrdata *chr); -bool chrTryAttackAmount(struct chrdata *chr, u32 arg1, u32 arg2, u8 arg3, u8 arg4); -bool chrGoToPad(struct chrdata *chr, s32 padnum, u32 goposflags); -bool chrGoToPos(struct chrdata *chr, struct coord *pos, u32 goposflags); +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); +bool chr_try_attack_walk(struct chrdata *chr); +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 chrTryRunFromTarget(struct chrdata *chr); -bool chrGoToCoverProp(struct chrdata *chr); -bool chrDropItem(struct chrdata *chr, u32 modelnum, u32 weaponnum); -void chrPunchInflictDamage(struct chrdata *chr, s32 damage, s32 range, u8 reverse); -bool chrTryPunch(struct chrdata *chr, u8 reverse); -struct eyespy *chrToEyespy(struct chrdata *chr); -void chrTickStand(struct chrdata *chr); -void chrTickAnim(struct chrdata *chr); -void chrTickSurrender(struct chrdata *chr); -void chrTickDead(struct chrdata *chr); -void chrAlertOthersOfInjury(struct chrdata *chr, bool dying); -void chrTickDie(struct chrdata *chr); -void chrTickDruggedComingUp(struct chrdata *chr); -void chrTickDruggedDrop(struct chrdata *chr); -void chrTickDruggedKo(struct chrdata *chr); -void chrTickArgh(struct chrdata *chr); -void chrTickPreArgh(struct chrdata *chr); -void chrTickSidestep(struct chrdata *chr); -void chrTickJumpOut(struct chrdata *chr); -void chrTickStartAlarm(struct chrdata *chr); -void chrTickSurprised(struct chrdata *chr); -void chrUpdateFireslot(struct chrdata *chr, s32 handnum, bool withsound, bool withbeam, struct coord *from, struct coord *to); -f32 chrGetInverseTheta(struct chrdata *chr); -f32 chrGetAimAngle(struct chrdata *chr); -f32 chrGetPitchAngle(struct chrdata *chr); -s32 chrTurn(struct chrdata *chr, s32 turning, f32 endanimframe, f32 speed, f32 toleranceangle); +bool chr_try_run_from_target(struct chrdata *chr); +bool chr_go_to_cover_prop(struct chrdata *chr); +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 chrCalculateAimEndProperties(struct chrdata *chr, struct attackanimconfig *animcfg, bool firingleft, bool firingright, f32 shootrotx); -f32 chrGetAimLimitAngle(f32 sqdist); -void chrCalculateHit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gset *gset); -bool chrGetGunPos(struct chrdata *chr, s32 handnum, struct coord *gunpos); -void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord *vector, struct modelnode **node, s32 *hitpart, struct model **model, s32 *side); -void chrCalculateTrajectory(struct coord *frompos, f32 arg1, struct coord *aimpos, struct coord *arg3); -void chrTickShoot(struct chrdata *chr, s32 handnum); +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 chrAttackAmountUpdateAnimation(struct chrdata *chr); -void chrTickFire(struct chrdata *chr); -void chrTickAttackAmount(struct chrdata *chr); -void robotSetMuzzleFlash(struct chrdata *chr, bool right, bool enabled); -void robotAttack(struct chrdata *chr); -void chrTickRobotAttack(struct chrdata *chr); -void chrTickAttack(struct chrdata *chr); -void chrTickAttackRoll(struct chrdata *chr); -void propPrintDangerous(void); -void chrTickThrowGrenade(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 chrTickAttackWalk(struct chrdata *chr); -bool posIsMovingTowardsPosOrStoppedInRange(struct coord *prevpos, struct coord *moveddelta, struct coord *targetpos, f32 range); -bool posIsArrivingLaterallyAtPos(struct coord *prevpos, struct coord *curpos, struct coord *targetpos, f32 range); -bool posIsArrivingAtPos(struct coord *prevpos, struct coord *curpos, struct coord *targetpos, f32 range); -void chrTickRunPos(struct chrdata *chr); +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 chrNavCanSeeNextPos(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 chrNavCheckForObstacle(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 chrNavTryObstacle(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 *chrOpenDoor(struct chrdata *chr, struct coord *rangepos); -void chrNavTickMain(struct chrdata *chr, struct coord *pos, struct waydata *waydata, bool arg3); -bool chrGoPosUpdateLiftAction(struct chrdata *chr, u32 curpadflags, bool arg2, bool arrivingatlift, s16 curpadnum, s32 nextpadnum); -s16 chrGoPosGetNextPadNum(struct chrdata *chr); -void chrTickGoPos(struct chrdata *chr); -void chrTickPatrol(struct chrdata *chr); -bool chrStartSkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4); -void chrTickSkJump(struct chrdata *chr); -void chraTick(struct chrdata *chr); -void cutsceneStart(u32 ailistid); -void chraTickBg(void); -f32 chrGetAngleToPos(struct chrdata *chr, struct coord *pos); -void chrGetAttackEntityPos(struct chrdata *chr, u32 attackflags, s32 entityid, struct coord *pos, RoomNum *rooms); -f32 chrGetAngleFromTargetsFov(struct chrdata *chr); -f32 chrGetVerticalAngleToTarget(struct chrdata *chr); -bool chrIsInTargetsFovX(struct chrdata *chr, u8 fov360); -bool chrIsVerticalAngleToTargetWithin(struct chrdata *chr, u8 arg1); +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 arg1, 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 chrIsTargetInFov(struct chrdata *chr, u8 arg1, u8 reverse); -bool chrIsLookingAtPos(struct chrdata *chr, struct coord *pos, u8 arg2); -f32 chrGetSameFloorDistanceToPad(struct chrdata *chr, s32 pad_id); -void chrsClearRefsToPlayer(s32 playernum); -s32 chrResolveId(struct chrdata *ref, s32 id); -f32 chrGetTimer(struct chrdata *chr); -bool chrIsTargetAimingAtMe(struct chrdata *chr); -bool chrSawInjury(struct chrdata *chr, u8 arg1); -bool chrSawDeath(struct chrdata *chr, u8 arg1); -bool waypointIsWithin90DegreesOfPosAngle(struct waypoint *waypoint, struct coord *pos, f32 angle); -s32 chrFindWaypointWithinPosQuadrant(struct coord *pos, RoomNum *rooms, f32 angle, u8 quadrant); +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 chrSetPadPresetToWaypointWithinTargetQuadrant(struct chrdata *chr, u8 arg1); -bool chrSetChrPresetToChrNearPad(u32 checktype, struct chrdata *chr, f32 distance, s32 padnum); -bool chrSetChrPresetToChrNearPos(u8 checktype, struct chrdata *chr, f32 distance, struct coord *pos, RoomNum *room); -bool chrSetPadPresetToPadOnRouteToTarget(struct chrdata *chr); -bool chrIsPosOffScreen(struct coord *pos, RoomNum *rooms); +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 chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force, bool onlysurrounding); +bool chr_adjust_pos_for_spawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force, bool onlysurrounding); #else -bool chrAdjustPosForSpawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force); +bool chr_adjust_pos_for_spawn(f32 chrradius, struct coord *pos, RoomNum *rooms, f32 angle, bool allowonscreen, bool force); #endif -struct prop *chrSpawnAtCoord(s32 body, s32 head, struct coord *pos, RoomNum *room, f32 angle, u8 *ailist, u32 spawnflags); -bool chrIsPropPresetBlockingSightToTarget(struct chrdata *chr); -bool chrMoveToPos(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle, bool ignorebg); -bool chrCheckCoverOutOfSight(struct chrdata *chr, s32 covernum, bool soft); -s32 chrAssignCoverByCriteria(struct chrdata *chr, u16 arg1, s32 arg2); -s32 chrAssignCoverAwayFromDanger(struct chrdata *chr, s32 mindist, s32 maxdist); -bool chrRunFromPos(struct chrdata *chr, u32 goposflags, f32 distance, struct coord *frompos); +struct prop *chr_spawn_at_coord(s32 body, s32 head, struct coord *pos, RoomNum *room, f32 angle, u8 *ailist, u32 spawnflags); +bool chr_is_prop_preset_blocking_sight_to_target(struct chrdata *chr); +bool chr_move_to_pos(struct chrdata *chr, struct coord *pos, RoomNum *room, f32 angle, bool ignorebg); +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 func0f04c784(struct chrdata *chr); bool chr0f04c874(struct chrdata *chr, u32 angle360, struct coord *pos, u8 arg3, u8 arg4); -void rebuildTeams(void); -void rebuildSquadrons(void); -void chrAvoid(struct chrdata *chr); +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 chrStop(struct chrdata *chr); -void chrKneel(struct chrdata *chr); -void chrStartAlarm(struct chrdata *chr); -void chrThrowGrenade(struct chrdata *chr, s32 arg1, s32 arg2); -void chrDoSurprisedSurrender(struct chrdata *chr); -void chrDoSurprisedLookAround(struct chrdata *chr); -void chrSurrender(struct chrdata *chr); -void chrSidestep(struct chrdata *chr, bool side); -void chrJumpOut(struct chrdata *chr, bool side); -void chrRunToPos(struct chrdata *chr, struct coord *pos); -void chrBeginDead(struct chrdata *chr); -f32 chrGetShield(struct chrdata *chr); -void chrDie(struct chrdata *chr, s32 aplayernum); -void chrGoPosGetCurWaypointInfo(struct chrdata *chr, struct coord *pos, RoomNum *rooms); -void chrGoPosClearRestartTtl(struct chrdata *chr); -void chrPatrolGetCurWaypointInfo(struct chrdata *chr, struct coord *pos, RoomNum *rooms); -struct path *pathFindById(u32 path_id); -void chrRecordLastVisibleTargetTime(struct chrdata *chr); -bool chrHasLosToTarget(struct chrdata *chr); -void chrRecordLastSeeTargetTime(struct chrdata *chr); -void chrRecordLastHearTargetTime(struct chrdata *chr); -bool chrIsDead(struct chrdata *chr); -bool chrTryAttackStand(struct chrdata *chr, u32 attackflags, s32 entityid); -bool chrTryAttackKneel(struct chrdata *chr, u32 attackflags, s32 entityid); -bool chrTryAttackLie(struct chrdata *chr, u32 attackflags, s32 entityid); -bool chrTryModifyAttack(struct chrdata *chr, u32 attackflags, s32 entityid); -bool chrFaceEntity(struct chrdata *chr, u32 attackflags, s32 entityid); -bool chrSetPath(struct chrdata *chr, u32 path_id); -bool chrTryStartPatrol(struct chrdata *chr); -bool chrTrySurrender(struct chrdata *chr); -bool chrFadeOut(struct chrdata *chr); -bool chrGoToTarget(struct chrdata *chr, u32 goposflags); -bool chrGoToChr(struct chrdata *chr, u32 dst_chrnum, u32 goposflags); -bool chrGoToProp(struct chrdata *chr, struct prop *prop, u32 goposflags); -bool chrTryStop(struct chrdata *chr); -bool chrTrySurprisedOneHand(struct chrdata *chr); -bool chrTrySurprisedSurrender(struct chrdata *chr); -bool chrTrySurprisedLookAround(struct chrdata *chr); -bool chrTryKneel(struct chrdata *chr); -bool chrTryStartAnim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed); -bool chrTryStartAlarm(struct chrdata *chr, s32 pad_id); -bool chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid); -void chrTickKneel(struct chrdata *chr); -void chrFadeCorpse(struct chrdata *chr); -void chrFadeCorpseWhenOffScreen(struct chrdata *chr); -void chrTickTest(struct chrdata *chr); -void chrSetLookAngle(struct chrdata *chr, f32 angle); -f32 chrGetRotY(struct chrdata *chr); -void chrSetRotY(struct chrdata *chr, f32 arg1); -void chrResetAimEndProperties(struct chrdata *chr); -void chrSetFiring(struct chrdata *chr, s32 hand, bool firing); -void chrStopFiring(struct chrdata *chr); -void chrSetHandFiring(struct chrdata *chr, s32 hand, bool arg2); +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); +bool chr_try_attack_kneel(struct chrdata *chr, u32 attackflags, s32 entityid); +bool chr_try_attack_lie(struct chrdata *chr, u32 attackflags, s32 entityid); +bool chr_try_modify_attack(struct chrdata *chr, u32 attackflags, s32 entityid); +bool chr_face_entity(struct chrdata *chr, u32 attackflags, s32 entityid); +bool chr_set_path(struct chrdata *chr, u32 path_id); +bool chr_try_start_patrol(struct chrdata *chr); +bool chr_try_surrender(struct chrdata *chr); +bool chr_fade_out(struct chrdata *chr); +bool chr_go_to_target(struct chrdata *chr, u32 goposflags); +bool chr_go_to_chr(struct chrdata *chr, u32 dst_chrnum, u32 goposflags); +bool chr_go_to_prop(struct chrdata *chr, struct prop *prop, u32 goposflags); +bool chr_try_stop(struct chrdata *chr); +bool chr_try_surprised_one_hand(struct chrdata *chr); +bool chr_try_surprised_surrender(struct chrdata *chr); +bool chr_try_surprised_look_around(struct chrdata *chr); +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 propUnsetDangerous(struct prop *prop); -void propSetDangerous(struct prop *prop); -bool chrDetectDangerousObject(struct chrdata *chr, u8 flags); -void chrTickBondDie(struct chrdata *chr); -s32 chrIsUsingLift(struct chrdata *chr); -bool chrTrySkJump(struct chrdata *chr, u8 arg1, u8 arg2, s32 arg3, u8 arg4); -bool chrSawTargetRecently(struct chrdata *chr); -bool chrHeardTargetRecently(struct chrdata *chr); -f32 chrGetAngleToTarget(struct chrdata *chr); -f32 chrGetDistanceToTarget(struct chrdata *chr); -f32 chrGetDistanceToTarget2(struct chrdata *chr); -f32 chrGetDistanceToCurrentPlayer(struct chrdata *chr); -f32 propGetDistanceToProp(struct prop *a, struct prop *b); -f32 propGetLateralDistanceToProp(struct prop *a, struct prop *b); -f32 chrGetDistanceToPad(struct chrdata *chr, s32 pad_id); -f32 chrGetDistanceToCoord(struct chrdata *chr, struct coord *pos); -f32 chrGetLateralDistanceToCoord(struct chrdata *chr, struct coord *pos); -f32 chrGetLateralDistanceToPad(struct chrdata *chr, s32 pad_id); -f32 chrGetSquaredDistanceToCoord(struct chrdata *chr, struct coord *pos); -f32 coordGetSquaredDistanceToCoord(struct coord *a, struct coord *b); -s32 chrGetPadRoom(struct chrdata *chr, s32 pad_id); -s32 chrResolvePadId(struct chrdata *chr, s32 pad_id); -struct chrdata *chrFindById(struct chrdata *data, s32 chrnum); -s32 propGetIndexByChrId(struct chrdata *chr, s32 chrnum); -f32 chrGetDistanceToChr(struct chrdata *chr1, s32 chr2num); -f32 chrGetDistanceFromTargetToPad(struct chrdata *chr, s32 pad_id); -void chrSetFlags(struct chrdata *chr, u32 flags, u8 bank); -void chrUnsetFlags(struct chrdata *chr, u32 flags, u8 bank); -bool chrHasFlag(struct chrdata *chr, u32 flag, u8 bank); -void chrSetFlagsById(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank); -void chrUnsetFlagsById(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank); -bool chrHasFlagById(struct chrdata *ref, u32 chrnum, u32 flag, u32 bank); -void chrSetStageFlag(struct chrdata *chr, u32 flag); -void chrUnsetStageFlag(struct chrdata *chr, u32 flag); -bool chrHasStageFlag(struct chrdata *chr, u32 flag); -bool chrIsHearingTarget(struct chrdata *chr); -void chrRestartTimer(struct chrdata *chr); -bool chrResetNearMiss(struct chrdata *chr); -s32 chrGetNumArghs(struct chrdata *chr); -s32 chrGetNumCloseArghs(struct chrdata *chr); -void decrementByte(u8 *dst, u8 amount); -void incrementByte(u8 *dst, u8 amount); -bool chrCanHearAlarm(struct chrdata *chr); -bool chrSetChrPresetToAnyChrNearSelf(struct chrdata *chr, f32 distance); -bool chrSetChrPresetToChrNearSelf(u8 checktype, struct chrdata *chr, f32 distance); -bool chrCompareTeams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype); -void chrSetChrPreset(struct chrdata *chr, s32 chrpreset); -void chrSetChrPresetByChrnum(struct chrdata *chr, s32 chrnum, s32 chrpreset); -void chrSetPadPreset(struct chrdata *chr, s32 pad_id); -void chrSetPadPresetByChrnum(struct chrdata *chr, s32 chrnum, s32 pad_id); -struct prop *chrSpawnAtPad(struct chrdata *chr, s32 body, s32 head, s32 pad, u8 *ailist, u32 spawnflags); -struct prop *chrSpawnAtChr(struct chrdata *basechr, s32 body, s32 head, u32 chrnum, u8 *ailist, u32 spawnflags); -s16 chrGoToCover(struct chrdata *chr, u8 speed); -void chrAddTargetToBdlist(struct chrdata *chr); -s32 chrGetDistanceLostToTargetInLastSecond(struct chrdata *chr); -bool chrIsTargetNearlyInSight(struct chrdata *chr, u32 distance); -bool chrIsNearlyInTargetsSight(struct chrdata *chr, u32 distance); -s16 *teamGetChrIds(s32 team_id); -s16 *squadronGetChrIds(s32 squadron_id); -void audioMarkAsRecentlyPlayed(s16 audioid); -bool audioWasNotPlayedRecently(s16 audioid); -Gfx *chrsRenderChrStats(Gfx *gdl, RoomNum *rooms); -void chrToggleModelPart(struct chrdata *chr, s32 partnum); -bool chrIsAvoiding(struct chrdata *chr); -void chrDrCarollEmitSparks(struct chrdata *chr); +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 arg1, u8 arg2, s32 arg3, u8 arg4); +bool chr_saw_target_recently(struct chrdata *chr); +bool chr_heard_target_recently(struct chrdata *chr); +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); +s32 chr_resolve_pad_id(struct chrdata *chr, s32 pad_id); +struct chrdata *chr_find_by_id(struct chrdata *data, s32 chrnum); +s32 prop_get_index_by_chr_id(struct chrdata *chr, s32 chrnum); +f32 chr_get_distance_to_chr(struct chrdata *chr1, s32 chr2num); +f32 chr_get_distance_from_target_to_pad(struct chrdata *chr, s32 pad_id); +void chr_set_flags(struct chrdata *chr, u32 flags, u8 bank); +void chr_unset_flags(struct chrdata *chr, u32 flags, u8 bank); +bool chr_has_flag(struct chrdata *chr, u32 flag, u8 bank); +void chr_set_flags_by_id(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank); +void chr_unset_flags_by_id(struct chrdata *ref, u32 chrnum, u32 flags, u32 bank); +bool chr_has_flag_by_id(struct chrdata *ref, u32 chrnum, u32 flag, u32 bank); +void chr_set_stage_flag(struct chrdata *chr, u32 flag); +void chr_unset_stage_flag(struct chrdata *chr, u32 flag); +bool chr_has_stage_flag(struct chrdata *chr, u32 flag); +bool chr_is_hearing_target(struct chrdata *chr); +void chr_restart_timer(struct chrdata *chr); +bool chr_reset_near_miss(struct chrdata *chr); +s32 chr_get_num_arghs(struct chrdata *chr); +s32 chr_get_num_close_arghs(struct chrdata *chr); +void decrement_byte(u8 *dst, u8 amount); +void increment_byte(u8 *dst, u8 amount); +bool chr_can_hear_alarm(struct chrdata *chr); +bool chr_set_chr_preset_to_any_chr_near_self(struct chrdata *chr, f32 distance); +bool chr_set_chr_preset_to_chr_near_self(u8 checktype, struct chrdata *chr, f32 distance); +bool chr_compare_teams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype); +void chr_set_chr_preset(struct chrdata *chr, s32 chrpreset); +void chr_set_chr_preset_by_chrnum(struct chrdata *chr, s32 chrnum, s32 chrpreset); +void chr_set_pad_preset(struct chrdata *chr, s32 pad_id); +void chr_set_pad_preset_by_chrnum(struct chrdata *chr, s32 chrnum, s32 pad_id); +struct prop *chr_spawn_at_pad(struct chrdata *chr, s32 body, s32 head, s32 pad, u8 *ailist, u32 spawnflags); +struct prop *chr_spawn_at_chr(struct chrdata *basechr, s32 body, s32 head, u32 chrnum, u8 *ailist, u32 spawnflags); +s16 chr_go_to_cover(struct chrdata *chr, u8 speed); +void chr_add_target_to_bdlist(struct chrdata *chr); +s32 chr_get_distance_lost_to_target_in_last_second(struct chrdata *chr); +bool chr_is_target_nearly_in_sight(struct chrdata *chr, u32 distance); +bool chr_is_nearly_in_targets_sight(struct chrdata *chr, u32 distance); +s16 *team_get_chr_ids(s32 team_id); +s16 *squadron_get_chr_ids(s32 squadron_id); +void audio_mark_as_recently_played(s16 audioid); +bool audio_was_not_played_recently(s16 audioid); +Gfx *chrs_render_chr_stats(Gfx *gdl, RoomNum *rooms); +void chr_toggle_model_part(struct chrdata *chr, s32 partnum); +bool chr_is_avoiding(struct chrdata *chr); +void chr_dr_caroll_emit_sparks(struct chrdata *chr); #endif diff --git a/src/include/game/chrai.h b/src/include/game/chrai.h index 9f3d27604..b561d99e9 100644 --- a/src/include/game/chrai.h +++ b/src/include/game/chrai.h @@ -4,9 +4,9 @@ #include "data.h" #include "types.h" -s32 chraiGetListIdByList(u8 *ailist, bool *is_global); -u32 chraiGoToLabel(u8 *ailist, u32 aioffset, u8 label); -void chraiExecute(void *entity, s32 proptype); -u32 chraiGetCommandLength(u8 *ailist, u32 aioffset); +s32 chrai_get_list_id_by_list(u8 *ailist, bool *is_global); +u32 chrai_go_to_label(u8 *ailist, u32 aioffset, u8 label); +void chrai_execute(void *entity, s32 proptype); +u32 chrai_get_command_length(u8 *ailist, u32 aioffset); #endif diff --git a/src/include/game/chraicommands.h b/src/include/game/chraicommands.h index 5198df2f7..b3fee8133 100644 --- a/src/include/game/chraicommands.h +++ b/src/include/game/chraicommands.h @@ -4,448 +4,448 @@ #include "data.h" #include "types.h" -/*0x0000*/ bool aiGoToNext(void); -/*0x0001*/ bool aiGoToFirst(void); -/*0x0002*/ bool aiLabel(void); -/*0x0003*/ bool aiYield(void); -/*0x0004*/ bool aiEndList(void); -/*0x0005*/ bool aiSetList(void); -/*0x0006*/ bool aiSetReturnList(void); -/*0x0007*/ bool aiSetShotList(void); -/*0x0008*/ bool aiReturn(void); -/*0x0009*/ bool aiStop(void); -/*0x000a*/ bool aiKneel(void); -/*0x000b*/ bool aiChrDoAnimation(void); -/*0x000c*/ bool aiIfIdle(void); -/*0x000d*/ bool aiBeSurprisedOneHand(void); -/*0x000e*/ bool aiBeSurprisedLookAround(void); -/*0x000f*/ bool aiTrySidestep(void); -/*0x0010*/ bool aiTryJumpOut(void); -/*0x0011*/ bool aiTryRunSideways(void); -/*0x0012*/ bool aiTryAttackWalk(void); -/*0x0013*/ bool aiTryAttackRun(void); -/*0x0014*/ bool aiTryAttackRoll(void); -/*0x0015*/ bool aiTryAttackStand(void); -/*0x0016*/ bool aiTryAttackKneel(void); -/*0x0017*/ bool aiTryModifyAttack(void); -/*0x0018*/ bool aiFaceEntity(void); +/*0x0000*/ bool ai_go_to_next(void); +/*0x0001*/ bool ai_go_to_first(void); +/*0x0002*/ bool ai_label(void); +/*0x0003*/ bool ai_yield(void); +/*0x0004*/ bool ai_end_list(void); +/*0x0005*/ bool ai_set_list(void); +/*0x0006*/ bool ai_set_return_list(void); +/*0x0007*/ bool ai_set_shot_list(void); +/*0x0008*/ bool ai_return(void); +/*0x0009*/ bool ai_stop(void); +/*0x000a*/ bool ai_kneel(void); +/*0x000b*/ bool ai_chr_do_animation(void); +/*0x000c*/ bool ai_if_idle(void); +/*0x000d*/ bool ai_be_surprised_one_hand(void); +/*0x000e*/ bool ai_be_surprised_look_around(void); +/*0x000f*/ bool ai_try_sidestep(void); +/*0x0010*/ bool ai_try_jump_out(void); +/*0x0011*/ bool ai_try_run_sideways(void); +/*0x0012*/ bool ai_try_attack_walk(void); +/*0x0013*/ bool ai_try_attack_run(void); +/*0x0014*/ bool ai_try_attack_roll(void); +/*0x0015*/ bool ai_try_attack_stand(void); +/*0x0016*/ bool ai_try_attack_kneel(void); +/*0x0017*/ bool ai_try_modify_attack(void); +/*0x0018*/ bool ai_face_entity(void); /*0x0019*/ bool ai0019(void); -/*0x001a*/ bool aiChrDamageChr(void); -/*0x001b*/ bool aiConsiderGrenadeThrow(void); -/*0x001c*/ bool aiDropItem(void); -/*0x001d*/ bool aiJogToPad(void); -/*0x001e*/ bool aiGoToPadPreset(void); -/*0x001f*/ bool aiWalkToPad(void); -/*0x0020*/ bool aiRunToPad(void); -/*0x0021*/ bool aiSetPath(void); -/*0x0022*/ bool aiStartPatrol(void); -/*0x0023*/ bool aiIfPatrolling(void); -/*0x0024*/ bool aiSurrender(void); -/*0x0025*/ bool aiFadeOut(void); -/*0x0026*/ bool aiRemoveChr(void); -/*0x0027*/ bool aiTryStartAlarm(void); -/*0x0028*/ bool aiActivateAlarm(void); -/*0x0029*/ bool aiDeactivateAlarm(void); -/*0x002a*/ bool aiTryRunFromTarget(void); -/*0x002b*/ bool aiTryJogToTargetProp(void); -/*0x002c*/ bool aiTryWalkToTargetProp(void); -/*0x002d*/ bool aiTryRunToTargetProp(void); -/*0x002e*/ bool aiTryGoToCoverProp(void); -/*0x002f*/ bool aiTryJogToChr(void); -/*0x0030*/ bool aiTryWalkToChr(void); -/*0x0031*/ bool aiTryRunToChr(void); -/*0x0032*/ bool aiIfStopped(void); -/*0x0033*/ bool aiIfChrDead(void); -/*0x0034*/ bool aiIfChrDeathAnimationFinished(void); -/*0x0035*/ bool aiIfCanSeeTarget(void); -/*0x0036*/ bool aiRandom(void); -/*0x0037*/ bool aiIfRandomLessThan(void); -/*0x0038*/ bool aiIfRandomGreaterThan(void); -/*0x0039*/ bool aiIfCanHearAlarm(void); -/*0x003a*/ bool aiIfAlarmActive(void); -/*0x003b*/ bool aiIfGasActive(void); -/*0x003c*/ bool aiIfHearsTarget(void); -/*0x003d*/ bool aiIfSawInjury(void); -/*0x003e*/ bool aiIfSawDeath(void); -/*0x003f*/ bool aiIfLosToTarget(void); -/*0x0040*/ bool aiIfTargetNearlyInSight(void); -/*0x0041*/ bool aiIfNearlyInTargetsSight(void); -/*0x0042*/ bool aiSetPadPresetToPadOnRouteToTarget(void); -/*0x0043*/ bool aiIfSawTargetRecently(void); -/*0x0044*/ bool aiIfHeardTargetRecently(void); -/*0x0045*/ bool aiIfLosToChr(void); -/*0x0046*/ bool aiIfNeverBeenOnScreen(void); -/*0x0047*/ bool aiIfOnScreen(void); -/*0x0048*/ bool aiIfChrInOnScreenRoom(void); -/*0x0049*/ bool aiIfRoomIsOnScreen(void); -/*0x004a*/ bool aiIfTargetAimingAtMe(void); -/*0x004b*/ bool aiIfNearMiss(void); -/*0x004c*/ bool aiIfSeesSuspiciousItem(void); -/*0x004d*/ bool aiIfTargetInFovLeft(void); -/*0x004e*/ bool aiIfCheckFovWithTarget(void); -/*0x004f*/ bool aiIfTargetOutOfFovLeft(void); -/*0x0050*/ bool aiIfTargetInFov(void); -/*0x0051*/ bool aiIfTargetOutOfFov(void); -/*0x0052*/ bool aiIfDistanceToTargetLessThan(void); -/*0x0053*/ bool aiIfDistanceToTargetGreaterThan(void); -/*0x0054*/ bool aiIfChrDistanceToPadLessThan(void); -/*0x0055*/ bool aiIfChrDistanceToPadGreaterThan(void); -/*0x0056*/ bool aiIfDistanceToChrLessThan(void); -/*0x0057*/ bool aiIfDistanceToChrGreaterThan(void); +/*0x001a*/ bool ai_chr_damage_chr(void); +/*0x001b*/ bool ai_consider_grenade_throw(void); +/*0x001c*/ bool ai_drop_item(void); +/*0x001d*/ bool ai_jog_to_pad(void); +/*0x001e*/ bool ai_go_to_pad_preset(void); +/*0x001f*/ bool ai_walk_to_pad(void); +/*0x0020*/ bool ai_run_to_pad(void); +/*0x0021*/ bool ai_set_path(void); +/*0x0022*/ bool ai_start_patrol(void); +/*0x0023*/ bool ai_if_patrolling(void); +/*0x0024*/ bool ai_surrender(void); +/*0x0025*/ bool ai_fade_out(void); +/*0x0026*/ bool ai_remove_chr(void); +/*0x0027*/ bool ai_try_start_alarm(void); +/*0x0028*/ bool ai_activate_alarm(void); +/*0x0029*/ bool ai_deactivate_alarm(void); +/*0x002a*/ bool ai_try_run_from_target(void); +/*0x002b*/ bool ai_try_jog_to_target_prop(void); +/*0x002c*/ bool ai_try_walk_to_target_prop(void); +/*0x002d*/ bool ai_try_run_to_target_prop(void); +/*0x002e*/ bool ai_try_go_to_cover_prop(void); +/*0x002f*/ bool ai_try_jog_to_chr(void); +/*0x0030*/ bool ai_try_walk_to_chr(void); +/*0x0031*/ bool ai_try_run_to_chr(void); +/*0x0032*/ bool ai_if_stopped(void); +/*0x0033*/ bool ai_if_chr_dead(void); +/*0x0034*/ bool ai_if_chr_death_animation_finished(void); +/*0x0035*/ bool ai_if_can_see_target(void); +/*0x0036*/ bool ai_random(void); +/*0x0037*/ bool ai_if_random_less_than(void); +/*0x0038*/ bool ai_if_random_greater_than(void); +/*0x0039*/ bool ai_if_can_hear_alarm(void); +/*0x003a*/ bool ai_if_alarm_active(void); +/*0x003b*/ bool ai_if_gas_active(void); +/*0x003c*/ bool ai_if_hears_target(void); +/*0x003d*/ bool ai_if_saw_injury(void); +/*0x003e*/ bool ai_if_saw_death(void); +/*0x003f*/ bool ai_if_los_to_target(void); +/*0x0040*/ bool ai_if_target_nearly_in_sight(void); +/*0x0041*/ bool ai_if_nearly_in_targets_sight(void); +/*0x0042*/ bool ai_set_pad_preset_to_pad_on_route_to_target(void); +/*0x0043*/ bool ai_if_saw_target_recently(void); +/*0x0044*/ bool ai_if_heard_target_recently(void); +/*0x0045*/ bool ai_if_los_to_chr(void); +/*0x0046*/ bool ai_if_never_been_on_screen(void); +/*0x0047*/ bool ai_if_on_screen(void); +/*0x0048*/ bool ai_if_chr_in_on_screen_room(void); +/*0x0049*/ bool ai_if_room_is_on_screen(void); +/*0x004a*/ bool ai_if_target_aiming_at_me(void); +/*0x004b*/ bool ai_if_near_miss(void); +/*0x004c*/ bool ai_if_sees_suspicious_item(void); +/*0x004d*/ bool ai_if_target_in_fov_left(void); +/*0x004e*/ bool ai_if_check_fov_with_target(void); +/*0x004f*/ bool ai_if_target_out_of_fov_left(void); +/*0x0050*/ bool ai_if_target_in_fov(void); +/*0x0051*/ bool ai_if_target_out_of_fov(void); +/*0x0052*/ bool ai_if_distance_to_target_less_than(void); +/*0x0053*/ bool ai_if_distance_to_target_greater_than(void); +/*0x0054*/ bool ai_if_chr_distance_to_pad_less_than(void); +/*0x0055*/ bool ai_if_chr_distance_to_pad_greater_than(void); +/*0x0056*/ bool ai_if_distance_to_chr_less_than(void); +/*0x0057*/ bool ai_if_distance_to_chr_greater_than(void); /*0x0058*/ bool ai0058(void); -/*0x0059*/ bool aiIfDistanceFromTargetToPadLessThan(void); -/*0x005a*/ bool aiIfDistanceFromTargetToPadGreaterThan(void); -/*0x005b*/ bool aiIfChrInRoom(void); -/*0x005c*/ bool aiIfTargetInRoom(void); -/*0x005d*/ bool aiIfChrHasObject(void); -/*0x005e*/ bool aiIfWeaponThrown(void); -/*0x005f*/ bool aiIfWeaponThrownOnObject(void); -/*0x0060*/ bool aiIfChrHasWeaponEquipped(void); -/*0x0061*/ bool aiIfGunUnclaimed(void); -/*0x0062*/ bool aiIfObjectHealthy(void); -/*0x0063*/ bool aiIfChrActivatedObject(void); -/*0x0065*/ bool aiObjInteract(void); -/*0x0066*/ bool aiDestroyObject(void); +/*0x0059*/ bool ai_if_distance_from_target_to_pad_less_than(void); +/*0x005a*/ bool ai_if_distance_from_target_to_pad_greater_than(void); +/*0x005b*/ bool ai_if_chr_in_room(void); +/*0x005c*/ bool ai_if_target_in_room(void); +/*0x005d*/ bool ai_if_chr_has_object(void); +/*0x005e*/ bool ai_if_weapon_thrown(void); +/*0x005f*/ bool ai_if_weapon_thrown_on_object(void); +/*0x0060*/ bool ai_if_chr_has_weapon_equipped(void); +/*0x0061*/ bool ai_if_gun_unclaimed(void); +/*0x0062*/ bool ai_if_object_healthy(void); +/*0x0063*/ bool ai_if_chr_activated_object(void); +/*0x0065*/ bool ai_obj_interact(void); +/*0x0066*/ bool ai_destroy_object(void); /*0x0067*/ bool ai0067(void); -/*0x0068*/ bool aiChrDropItems(void); -/*0x0069*/ bool aiChrDropWeapon(void); -/*0x006a*/ bool aiGiveObjectToChr(void); -/*0x006b*/ bool aiObjectMoveToPad(void); -/*0x006c*/ bool aiOpenDoor(void); -/*0x006d*/ bool aiCloseDoor(void); -/*0x006e*/ bool aiIfDoorState(void); -/*0x006f*/ bool aiIfObjectIsDoor(void); -/*0x0070*/ bool aiLockDoor(void); -/*0x0071*/ bool aiUnlockDoor(void); -/*0x0072*/ bool aiIfDoorLocked(void); -/*0x0073*/ bool aiIfObjectiveComplete(void); -/*0x0074*/ bool aiIfObjectiveFailed(void); +/*0x0068*/ bool ai_chr_drop_items(void); +/*0x0069*/ bool ai_chr_drop_weapon(void); +/*0x006a*/ bool ai_give_object_to_chr(void); +/*0x006b*/ bool ai_object_move_to_pad(void); +/*0x006c*/ bool ai_open_door(void); +/*0x006d*/ bool ai_close_door(void); +/*0x006e*/ bool ai_if_door_state(void); +/*0x006f*/ bool ai_if_object_is_door(void); +/*0x0070*/ bool ai_lock_door(void); +/*0x0071*/ bool ai_unlock_door(void); +/*0x0072*/ bool ai_if_door_locked(void); +/*0x0073*/ bool ai_if_objective_complete(void); +/*0x0074*/ bool ai_if_objective_failed(void); /*0x0075*/ bool ai0075(void); -/*0x0076*/ bool aiSetPadPresetToTargetQuadrant(void); -/*0x0077*/ bool aiIfDifficultyLessThan(void); -/*0x0078*/ bool aiIfDifficultyGreaterThan(void); -/*0x0079*/ bool aiIfStageTimerLessThan(void); -/*0x007a*/ bool aiIfStageTimerGreaterThan(void); -/*0x007b*/ bool aiIfStageIdLessThan(void); -/*0x007c*/ bool aiIfStageIdGreaterThan(void); -/*0x007d*/ bool aiIfNumArghsLessThan(void); -/*0x007e*/ bool aiIfNumArghsGreaterThan(void); -/*0x007f*/ bool aiIfNumCloseArghsLessThan(void); -/*0x0080*/ bool aiIfNumCloseArghsGreaterThan(void); -/*0x0081*/ bool aiIfChrHealthGreaterThan(void); -/*0x0082*/ bool aiIfChrHealthLessThan(void); -/*0x0083*/ bool aiIfInjured(void); -/*0x0084*/ bool aiSetMorale(void); -/*0x0085*/ bool aiAddMorale(void); -/*0x0086*/ bool aiChrAddMorale(void); -/*0x0087*/ bool aiSubtractMorale(void); -/*0x0088*/ bool aiIfMoraleLessThan(void); -/*0x0089*/ bool aiIfMoraleLessThanRandom(void); -/*0x008a*/ bool aiSetAlertness(void); -/*0x008b*/ bool aiAddAlertness(void); -/*0x008c*/ bool aiChrAddAlertness(void); -/*0x008d*/ bool aiSubtractAlertness(void); -/*0x008e*/ bool aiIfAlertness(void); -/*0x008f*/ bool aiIfChrAlertnessLessThan(void); -/*0x0090*/ bool aiIfAlertnessLessThanRandom(void); -/*0x0091*/ bool aiNoOp0091(void); -/*0x0092*/ bool aiSetHearDistance(void); -/*0x0093*/ bool aiSetViewDistance(void); -/*0x0094*/ bool aiSetGrenadeProbability(void); -/*0x0095*/ bool aiSetChrNum(void); -/*0x0096*/ bool aiSetMaxDamage(void); -/*0x0097*/ bool aiAddHealth(void); -/*0x0098*/ bool aiSetReactionSpeed(void); -/*0x0099*/ bool aiSetRecoverySpeed(void); -/*0x009a*/ bool aiSetAccuracy(void); -/*0x009b*/ bool aiSetFlag(void); -/*0x009c*/ bool aiUnsetFlag(void); -/*0x009d*/ bool aiIfHasFlag(void); -/*0x009e*/ bool aiChrSetFlag(void); -/*0x009f*/ bool aiChrUnsetFlag(void); -/*0x00a0*/ bool aiIfChrHasFlag(void); -/*0x00a1*/ bool aiSetStageFlag(void); -/*0x00a2*/ bool aiUnsetStageFlag(void); -/*0x00a3*/ bool aiIfStageFlagEq(void); -/*0x00a4*/ bool aiSetChrflag(void); -/*0x00a5*/ bool aiUnsetChrflag(void); -/*0x00a6*/ bool aiIfHasChrflag(void); -/*0x00a7*/ bool aiChrSetChrflag(void); -/*0x00a8*/ bool aiChrUnsetChrflag(void); -/*0x00a9*/ bool aiIfChrHasChrflag(void); -/*0x00aa*/ bool aiSetObjFlag(void); -/*0x00ab*/ bool aiUnsetObjFlag(void); -/*0x00ac*/ bool aiIfObjHasFlag(void); -/*0x00ad*/ bool aiSetObjFlag2(void); -/*0x00ae*/ bool aiUnsetObjFlag2(void); -/*0x00af*/ bool aiIfObjHasFlag2(void); -/*0x00b0*/ bool aiSetChrPreset(void); -/*0x00b1*/ bool aiSetChrTarget(void); -/*0x00b2*/ bool aiSetPadPreset(void); -/*0x00b3*/ bool aiChrSetPadPreset(void); -/*0x00b4*/ bool aiChrCopyPadPreset(void); -/*0x00b5*/ bool aiPrint(void); -/*0x00b6*/ bool aiRestartTimer(void); -/*0x00b7*/ bool aiResetTimer(void); -/*0x00b8*/ bool aiPauseTimer(void); -/*0x00b9*/ bool aiResumeTimer(void); -/*0x00ba*/ bool aiIfTimerStopped(void); -/*0x00bb*/ bool aiIfTimerGreaterThanRandom(void); -/*0x00bc*/ bool aiIfTimerLessThan(void); -/*0x00bd*/ bool aiIfTimerGreaterThan(void); -/*0x00be*/ bool aiShowCountdownTimer(void); -/*0x00bf*/ bool aiHideCountdownTimer(void); -/*0x00c0*/ bool aiSetCountdownTimerValue(void); -/*0x00c1*/ bool aiStopCountdownTimer(void); -/*0x00c2*/ bool aiStartCountdownTimer(void); -/*0x00c3*/ bool aiIfCountdownTimerStopped(void); -/*0x00c4*/ bool aiIfCountdownTimerLessThan(void); -/*0x00c5*/ bool aiIfCountdownTimerGreaterThan(void); -/*0x00c6*/ bool aiSpawnChrAtPad(void); -/*0x00c7*/ bool aiSpawnChrAtChr(void); -/*0x00c8*/ bool aiTryEquipWeapon(void); -/*0x00c9*/ bool aiTryEquipHat(void); -/*0x00ca*/ bool aiDuplicateChr(void); -/*0x00cb*/ bool aiShowHudmsg(void); -/*0x00cc*/ bool aiShowHudmsgTopMiddle(void); -/*0x00cd*/ bool aiSpeak(void); -/*0x00ce*/ bool aiPlaySound(void); -/*0x00cf*/ bool aiSetObjectSoundPlaying(void); -/*0x00d0*/ bool aiPlayRepeatingSoundFromPad(void); -/*0x00d1*/ bool aiSetObjectSoundVolume(void); -/*0x00d2*/ bool aiSetObjectSoundVolumeByDistance(void); -/*0x00d3*/ bool aiAudioMuteChannel(void); -/*0x00d4*/ bool aiIfObjectSoundVolumeLessThan(void); -/*0x00d5*/ bool aiHovercarBeginPath(void); -/*0x00d6*/ bool aiSetVehicleSpeed(void); -/*0x00d7*/ bool aiSetRotorSpeed(void); -/*0x00d8*/ bool aiNoOp00d8(void); -/*0x00d9*/ bool aiNoOp00d9(void); -/*0x00da*/ bool aiSetObjImage(void); -/*0x00db*/ bool aiNoOp00db(void); -/*0x00dc*/ bool aiEndLevel(void); +/*0x0076*/ bool ai_set_pad_preset_to_target_quadrant(void); +/*0x0077*/ bool ai_if_difficulty_less_than(void); +/*0x0078*/ bool ai_if_difficulty_greater_than(void); +/*0x0079*/ bool ai_if_stage_timer_less_than(void); +/*0x007a*/ bool ai_if_stage_timer_greater_than(void); +/*0x007b*/ bool ai_if_stage_id_less_than(void); +/*0x007c*/ bool ai_if_stage_id_greater_than(void); +/*0x007d*/ bool ai_if_num_arghs_less_than(void); +/*0x007e*/ bool ai_if_num_arghs_greater_than(void); +/*0x007f*/ bool ai_if_num_close_arghs_less_than(void); +/*0x0080*/ bool ai_if_num_close_arghs_greater_than(void); +/*0x0081*/ bool ai_if_chr_health_greater_than(void); +/*0x0082*/ bool ai_if_chr_health_less_than(void); +/*0x0083*/ bool ai_if_injured(void); +/*0x0084*/ bool ai_set_morale(void); +/*0x0085*/ bool ai_add_morale(void); +/*0x0086*/ bool ai_chr_add_morale(void); +/*0x0087*/ bool ai_subtract_morale(void); +/*0x0088*/ bool ai_if_morale_less_than(void); +/*0x0089*/ bool ai_if_morale_less_than_random(void); +/*0x008a*/ bool ai_set_alertness(void); +/*0x008b*/ bool ai_add_alertness(void); +/*0x008c*/ bool ai_chr_add_alertness(void); +/*0x008d*/ bool ai_subtract_alertness(void); +/*0x008e*/ bool ai_if_alertness(void); +/*0x008f*/ bool ai_if_chr_alertness_less_than(void); +/*0x0090*/ bool ai_if_alertness_less_than_random(void); +/*0x0091*/ bool ai_noop_0091(void); +/*0x0092*/ bool ai_set_hear_distance(void); +/*0x0093*/ bool ai_set_view_distance(void); +/*0x0094*/ bool ai_set_grenade_probability(void); +/*0x0095*/ bool ai_set_chr_num(void); +/*0x0096*/ bool ai_set_max_damage(void); +/*0x0097*/ bool ai_add_health(void); +/*0x0098*/ bool ai_set_reaction_speed(void); +/*0x0099*/ bool ai_set_recovery_speed(void); +/*0x009a*/ bool ai_set_accuracy(void); +/*0x009b*/ bool ai_set_flag(void); +/*0x009c*/ bool ai_unset_flag(void); +/*0x009d*/ bool ai_if_has_flag(void); +/*0x009e*/ bool ai_chr_set_flag(void); +/*0x009f*/ bool ai_chr_unset_flag(void); +/*0x00a0*/ bool ai_if_chr_has_flag(void); +/*0x00a1*/ bool ai_set_stage_flag(void); +/*0x00a2*/ bool ai_unset_stage_flag(void); +/*0x00a3*/ bool ai_if_stage_flag_eq(void); +/*0x00a4*/ bool ai_set_chrflag(void); +/*0x00a5*/ bool ai_unset_chrflag(void); +/*0x00a6*/ bool ai_if_has_chrflag(void); +/*0x00a7*/ bool ai_chr_set_chrflag(void); +/*0x00a8*/ bool ai_chr_unset_chrflag(void); +/*0x00a9*/ bool ai_if_chr_has_chrflag(void); +/*0x00aa*/ bool ai_set_obj_flag(void); +/*0x00ab*/ bool ai_unset_obj_flag(void); +/*0x00ac*/ bool ai_if_obj_has_flag(void); +/*0x00ad*/ bool ai_set_obj_flag2(void); +/*0x00ae*/ bool ai_unset_obj_flag2(void); +/*0x00af*/ bool ai_if_obj_has_flag2(void); +/*0x00b0*/ bool ai_set_chr_preset(void); +/*0x00b1*/ bool ai_set_chr_target(void); +/*0x00b2*/ bool ai_set_pad_preset(void); +/*0x00b3*/ bool ai_chr_set_pad_preset(void); +/*0x00b4*/ bool ai_chr_copy_pad_preset(void); +/*0x00b5*/ bool ai_print(void); +/*0x00b6*/ bool ai_restart_timer(void); +/*0x00b7*/ bool ai_reset_timer(void); +/*0x00b8*/ bool ai_pause_timer(void); +/*0x00b9*/ bool ai_resume_timer(void); +/*0x00ba*/ bool ai_if_timer_stopped(void); +/*0x00bb*/ bool ai_if_timer_greater_than_random(void); +/*0x00bc*/ bool ai_if_timer_less_than(void); +/*0x00bd*/ bool ai_if_timer_greater_than(void); +/*0x00be*/ bool ai_show_countdown_timer(void); +/*0x00bf*/ bool ai_hide_countdown_timer(void); +/*0x00c0*/ bool ai_set_countdown_timer_value(void); +/*0x00c1*/ bool ai_stop_countdown_timer(void); +/*0x00c2*/ bool ai_start_countdown_timer(void); +/*0x00c3*/ bool ai_if_countdown_timer_stopped(void); +/*0x00c4*/ bool ai_if_countdown_timer_less_than(void); +/*0x00c5*/ bool ai_if_countdown_timer_greater_than(void); +/*0x00c6*/ bool ai_spawn_chr_at_pad(void); +/*0x00c7*/ bool ai_spawn_chr_at_chr(void); +/*0x00c8*/ bool ai_try_equip_weapon(void); +/*0x00c9*/ bool ai_try_equip_hat(void); +/*0x00ca*/ bool ai_duplicate_chr(void); +/*0x00cb*/ bool ai_show_hudmsg(void); +/*0x00cc*/ bool ai_show_hudmsg_top_middle(void); +/*0x00cd*/ bool ai_speak(void); +/*0x00ce*/ bool ai_play_sound(void); +/*0x00cf*/ bool ai_set_object_sound_playing(void); +/*0x00d0*/ bool ai_play_repeating_sound_from_pad(void); +/*0x00d1*/ bool ai_set_object_sound_volume(void); +/*0x00d2*/ bool ai_set_object_sound_volume_by_distance(void); +/*0x00d3*/ bool ai_audio_mute_channel(void); +/*0x00d4*/ bool ai_if_object_sound_volume_less_than(void); +/*0x00d5*/ bool ai_hovercar_begin_path(void); +/*0x00d6*/ bool ai_set_vehicle_speed(void); +/*0x00d7*/ bool ai_set_rotor_speed(void); +/*0x00d8*/ bool ai_noop_00d8(void); +/*0x00d9*/ bool ai_noop_00d9(void); +/*0x00da*/ bool ai_set_obj_image(void); +/*0x00db*/ bool ai_noop_00db(void); +/*0x00dc*/ bool ai_end_level(void); /*0x00dd*/ bool ai00dd(void); -/*0x00de*/ bool aiMoveCameraToPad(void); -/*0x00df*/ bool aiMoveCameraToPreset(void); -/*0x00e0*/ bool aiRevokeControl(void); -/*0x00e1*/ bool aiGrantControl(void); -/*0x00e2*/ bool aiChrMoveToPad(void); +/*0x00de*/ bool ai_move_camera_to_pad(void); +/*0x00df*/ bool ai_move_camera_to_preset(void); +/*0x00e0*/ bool ai_revoke_control(void); +/*0x00e1*/ bool ai_grant_control(void); +/*0x00e2*/ bool ai_chr_move_to_pad(void); /*0x00e3*/ bool ai00e3(void); /*0x00e4*/ bool ai00e4(void); -/*0x00e5*/ bool aiIfColourFadeComplete(void); -/*0x00e8*/ bool aiSetDoorOpen(void); +/*0x00e5*/ bool ai_if_colour_fade_complete(void); +/*0x00e8*/ bool ai_set_door_open(void); /*0x00e9*/ bool ai00e9(void); -/*0x00ea*/ bool aiIfNumPlayersLessThan(void); -/*0x00eb*/ bool aiIfChrAmmoQuantityLessThan(void); -/*0x00ec*/ bool aiChrDrawWeapon(void); -/*0x00ed*/ bool aiChrDrawWeaponInCutscene(void); +/*0x00ea*/ bool ai_if_num_players_less_than(void); +/*0x00eb*/ bool ai_if_chr_ammo_quantity_less_than(void); +/*0x00ec*/ bool ai_chr_draw_weapon(void); +/*0x00ed*/ bool ai_chr_draw_weapon_in_cutscene(void); /*0x00ee*/ bool ai00ee(void); -/*0x00ef*/ bool aiIfObjInRoom(void); +/*0x00ef*/ bool ai_if_obj_in_room(void); /*0x00f0*/ bool ai00f0(void); -/*0x00f1*/ bool aiIfAttacking(void); -/*0x00f2*/ bool aiSwitchToAltSky(void); -/*0x00f3*/ bool aiChrSetInvincible(void); -/*0x00f4*/ bool aiMoveCameraToPos(void); +/*0x00f1*/ bool ai_if_attacking(void); +/*0x00f2*/ bool ai_switch_to_alt_sky(void); +/*0x00f3*/ bool ai_chr_set_invincible(void); +/*0x00f4*/ bool ai_move_camera_to_pos(void); /*0x00f5*/ bool ai00f5(void); /*0x00f6*/ bool ai00f6(void); -/*0x00f7*/ bool aiIfAllObjectivesComplete(void); -/*0x00f8*/ bool aiIfPlayerIsInvincible(void); -/*0x00f9*/ bool aiPlayXTrack(void); -/*0x00fa*/ bool aiStopXTrack(void); -/*0x00fb*/ bool aiChrExplosions(void); -/*0x00fc*/ bool aiIfKillCountGreaterThan(void); +/*0x00f7*/ bool ai_if_all_objectives_complete(void); +/*0x00f8*/ bool ai_if_player_is_invincible(void); +/*0x00f9*/ bool ai_play_x_track(void); +/*0x00fa*/ bool ai_stop_x_track(void); +/*0x00fb*/ bool ai_chr_explosions(void); +/*0x00fc*/ bool ai_if_kill_count_greater_than(void); /*0x00fd*/ bool ai00fd(void); -/*0x00fe*/ bool aiKillBond(void); -/*0x00ff*/ bool aiBeSurprisedSurrender(void); -/*0x0100*/ bool aiNoOp0100(void); -/*0x0101*/ bool aiNoOp0101(void); -/*0x0102*/ bool aiSetLights(void); -/*0x0103*/ bool aiIfPropPresetIsBlockingSightToTarget(void); -/*0x0104*/ bool aiRemoveObjectAtPropPreset(void); -/*0x0105*/ bool aiIfPropPresetHeightLessThan(void); -/*0x0106*/ bool aiSetTarget(void); -/*0x0107*/ bool aiIfPresetsTargetIsNotMyTarget(void); -/*0x0108*/ bool aiIfChrTarget(void); -/*0x0109*/ bool aiSetChrPresetToChrNearSelf(void); -/*0x010a*/ bool aiSetChrPresetToChrNearPad(void); -/*0x010b*/ bool aiChrSetTeam(void); -/*0x010c*/ bool aiIfCompareChrPresetsTeam(void); -/*0x010d*/ bool aiNoOp010d(void); -/*0x010e*/ bool aiSetShield(void); -/*0x010f*/ bool aiIfChrShieldLessThan(void); -/*0x0110*/ bool aiIfChrShieldGreaterThan(void); -/*0x0111*/ bool aiSetCameraAnimation(void); -/*0x0112*/ bool aiObjectDoAnimation(void); -/*0x0113*/ bool aiIfInCutscene(void); -/*0x0114*/ bool aiEnableChr(void); -/*0x0115*/ bool aiDisableChr(void); -/*0x0116*/ bool aiEnableObj(void); -/*0x0117*/ bool aiDisableObj(void); -/*0x0118*/ bool aiSetObjFlag3(void); -/*0x0119*/ bool aiUnsetObjFlag3(void); -/*0x011a*/ bool aiIfObjHasFlag3(void); -/*0x011b*/ bool aiChrSetHiddenFlag(void); -/*0x011c*/ bool aiChrUnsetHiddenFlag(void); -/*0x011d*/ bool aiIfChrHasHiddenFlag(void); -/*0x011e*/ bool aiIfHuman(void); -/*0x011f*/ bool aiIfSkedar(void); -/*0x0120*/ bool aiIfSafety2LessThan(void); -/*0x0121*/ bool aiFindCover(void); -/*0x0122*/ bool aiFindCoverWithinDist(void); -/*0x0123*/ bool aiFindCoverOutsideDist(void); -/*0x0124*/ bool aiGoToCover(void); -/*0x0125*/ bool aiCheckCoverOutOfSight(void); -/*0x0126*/ bool aiIfPlayerUsingCmpOrAr34(void); -/*0x0127*/ bool aiDetectEnemyOnSameFloor(void); -/*0x0128*/ bool aiDetectEnemy(void); -/*0x0129*/ bool aiIfSafetyLessThan(void); -/*0x012a*/ bool aiIfTargetMovingSlowly(void); -/*0x012b*/ bool aiIfTargetMovingCloser(void); -/*0x012c*/ bool aiIfTargetMovingAway(void); +/*0x00fe*/ bool ai_kill_bond(void); +/*0x00ff*/ bool ai_be_surprised_surrender(void); +/*0x0100*/ bool ai_noop_0100(void); +/*0x0101*/ bool ai_noop_0101(void); +/*0x0102*/ bool ai_set_lights(void); +/*0x0103*/ bool ai_if_prop_preset_is_blocking_sight_to_target(void); +/*0x0104*/ bool ai_remove_object_at_prop_preset(void); +/*0x0105*/ bool ai_if_prop_preset_height_less_than(void); +/*0x0106*/ bool ai_set_target(void); +/*0x0107*/ bool ai_if_presets_target_is_not_my_target(void); +/*0x0108*/ bool ai_if_chr_target(void); +/*0x0109*/ bool ai_set_chr_preset_to_chr_near_self(void); +/*0x010a*/ bool ai_set_chr_preset_to_chr_near_pad(void); +/*0x010b*/ bool ai_chr_set_team(void); +/*0x010c*/ bool ai_if_compare_chr_presets_team(void); +/*0x010d*/ bool ai_noop_010d(void); +/*0x010e*/ bool ai_set_shield(void); +/*0x010f*/ bool ai_if_chr_shield_less_than(void); +/*0x0110*/ bool ai_if_chr_shield_greater_than(void); +/*0x0111*/ bool ai_set_camera_animation(void); +/*0x0112*/ bool ai_object_do_animation(void); +/*0x0113*/ bool ai_if_in_cutscene(void); +/*0x0114*/ bool ai_enable_chr(void); +/*0x0115*/ bool ai_disable_chr(void); +/*0x0116*/ bool ai_enable_obj(void); +/*0x0117*/ bool ai_disable_obj(void); +/*0x0118*/ bool ai_set_obj_flag3(void); +/*0x0119*/ bool ai_unset_obj_flag3(void); +/*0x011a*/ bool ai_if_obj_has_flag3(void); +/*0x011b*/ bool ai_chr_set_hidden_flag(void); +/*0x011c*/ bool ai_chr_unset_hidden_flag(void); +/*0x011d*/ bool ai_if_chr_has_hidden_flag(void); +/*0x011e*/ bool ai_if_human(void); +/*0x011f*/ bool ai_if_skedar(void); +/*0x0120*/ bool ai_if_safety2_less_than(void); +/*0x0121*/ bool ai_find_cover(void); +/*0x0122*/ bool ai_find_cover_within_dist(void); +/*0x0123*/ bool ai_find_cover_outside_dist(void); +/*0x0124*/ bool ai_go_to_cover(void); +/*0x0125*/ bool ai_check_cover_out_of_sight(void); +/*0x0126*/ bool ai_if_player_using_cmp_or_ar34(void); +/*0x0127*/ bool ai_detect_enemy_on_same_floor(void); +/*0x0128*/ bool ai_detect_enemy(void); +/*0x0129*/ bool ai_if_safety_less_than(void); +/*0x012a*/ bool ai_if_target_moving_slowly(void); +/*0x012b*/ bool ai_if_target_moving_closer(void); +/*0x012c*/ bool ai_if_target_moving_away(void); /*0x012f*/ bool ai012f(void); -/*0x0130*/ bool aiSayQuip(void); -/*0x0131*/ bool aiIncreaseSquadronAlertness(void); -/*0x0132*/ bool aiSetAction(void); -/*0x0133*/ bool aiSetTeamOrders(void); -/*0x0134*/ bool aiIfOrders(void); -/*0x0135*/ bool aiIfHasOrders(void); -/*0x0136*/ bool aiRetreat(void); -/*0x0137*/ bool aiIfChrInSquadronDoingAction(void); -/*0x0138*/ bool aiIfChannelFree(void); +/*0x0130*/ bool ai_say_quip(void); +/*0x0131*/ bool ai_increase_squadron_alertness(void); +/*0x0132*/ bool ai_set_action(void); +/*0x0133*/ bool ai_set_team_orders(void); +/*0x0134*/ bool ai_if_orders(void); +/*0x0135*/ bool ai_if_has_orders(void); +/*0x0136*/ bool ai_retreat(void); +/*0x0137*/ bool ai_if_chr_in_squadron_doing_action(void); +/*0x0138*/ bool ai_if_channel_free(void); /*0x0139*/ bool ai0139(void); -/*0x013a*/ bool aiSetChrPresetToUnalertedTeammate(void); -/*0x013b*/ bool aiSetSquadron(void); -/*0x013c*/ bool aiFaceCover(void); -/*0x013d*/ bool aiIfDangerousObjectNearby(void); +/*0x013a*/ bool ai_set_chr_preset_to_unalerted_teammate(void); +/*0x013b*/ bool ai_set_squadron(void); +/*0x013c*/ bool ai_face_cover(void); +/*0x013d*/ bool ai_if_dangerous_object_nearby(void); /*0x013e*/ bool ai013e(void); -/*0x013f*/ bool aiIfHeliWeaponsArmed(void); -/*0x0140*/ bool aiIfHoverbotNextStep(void); -/*0x0141*/ bool aiShuffleInvestigationTerminals(void); -/*0x0142*/ bool aiSetPadPresetToInvestigationTerminal(void); -/*0x0143*/ bool aiHeliArmWeapons(void); -/*0x0144*/ bool aiHeliUnarmWeapons(void); -/*0x0145*/ bool aiRebuildTeams(void); -/*0x0146*/ bool aiRebuildSquadrons(void); -/*0x0147*/ bool aiIfSquadronIsDead(void); -/*0x0148*/ bool aiChrSetListening(void); -/*0x0149*/ bool aiIfChrListening(void); -/*0x014a*/ bool aiIfTrue(void); -/*0x014b*/ bool aiIfNotListening(void); -/*0x0152*/ bool aiIfNumChrsInSquadronGreaterThan(void); -/*0x0157*/ bool aiSetTintedGlassEnabled(void); -/*0x015b*/ bool aiPlayTrackIsolated(void); -/*0x015c*/ bool aiPlayDefaultTracks(void); -/*0x0165*/ bool aiIfChrInjured(void); -/*0x0166*/ bool aiIfAction(void); -/*0x0167*/ bool aiHovercopterFireRocket(void); -/*0x0168*/ bool aiIfShieldDamaged(void); -/*0x0169*/ bool aiIfNaturalAnim(void); -/*0x016a*/ bool aiIfY(void); -/*0x016b*/ bool aiPlayRepeatingSoundFromObject(void); -/*0x016c*/ bool aiNoOp016c(void); -/*0x016d*/ bool aiChrAdjustMotionBlur(void); -/*0x016e*/ bool aiDamageChrByAmount(void); -/*0x016f*/ bool aiIfChrHasGun(void); -/*0x0170*/ bool aiDoGunCommand(void); -/*0x0171*/ bool aiIfDistanceToGunLessThan(void); -/*0x0172*/ bool aiRecoverGun(void); -/*0x0173*/ bool aiChrCopyProperties(void); -/*0x0174*/ bool aiIfCutsceneButtonPressed(void); +/*0x013f*/ bool ai_if_heli_weapons_armed(void); +/*0x0140*/ bool ai_if_hoverbot_next_step(void); +/*0x0141*/ bool ai_shuffle_investigation_terminals(void); +/*0x0142*/ bool ai_set_pad_preset_to_investigation_terminal(void); +/*0x0143*/ bool ai_heli_arm_weapons(void); +/*0x0144*/ bool ai_heli_unarm_weapons(void); +/*0x0145*/ bool ai_rebuild_teams(void); +/*0x0146*/ bool ai_rebuild_squadrons(void); +/*0x0147*/ bool ai_if_squadron_is_dead(void); +/*0x0148*/ bool ai_chr_set_listening(void); +/*0x0149*/ bool ai_if_chr_listening(void); +/*0x014a*/ bool ai_if_true(void); +/*0x014b*/ bool ai_if_not_listening(void); +/*0x0152*/ bool ai_if_num_chrs_in_squadron_greater_than(void); +/*0x0157*/ bool ai_set_tinted_glass_enabled(void); +/*0x015b*/ bool ai_play_track_isolated(void); +/*0x015c*/ bool ai_play_default_tracks(void); +/*0x0165*/ bool ai_if_chr_injured(void); +/*0x0166*/ bool ai_if_action(void); +/*0x0167*/ bool ai_hovercopter_fire_rocket(void); +/*0x0168*/ bool ai_if_shield_damaged(void); +/*0x0169*/ bool ai_if_natural_anim(void); +/*0x016a*/ bool ai_if_y(void); +/*0x016b*/ bool ai_play_repeating_sound_from_object(void); +/*0x016c*/ bool ai_noop_016c(void); +/*0x016d*/ bool ai_chr_adjust_motion_blur(void); +/*0x016e*/ bool ai_damage_chr_by_amount(void); +/*0x016f*/ bool ai_if_chr_has_gun(void); +/*0x0170*/ bool ai_do_gun_command(void); +/*0x0171*/ bool ai_if_distance_to_gun_less_than(void); +/*0x0172*/ bool ai_recover_gun(void); +/*0x0173*/ bool ai_chr_copy_properties(void); +/*0x0174*/ bool ai_if_cutscene_button_pressed(void); /*0x0175*/ bool ai0175(void); -/*0x0176*/ bool aiIfBotRespawning(void); -/*0x0177*/ bool aiPlayerAutoWalk(void); -/*0x0178*/ bool aiIfPlayerAutoWalkFinished(void); -/*0x0179*/ bool aiPlaySoundFromEntity(void); -/*0x017a*/ bool aiIfLosToAttackTarget(void); -/*0x017b*/ bool aiIfChrKnockedOut(void); -/*0x017c*/ bool aiAssignSound(void); -/*0x017d*/ bool aiPlayCutsceneTrack(void); -/*0x017e*/ bool aiStopCutsceneTrack(void); -/*0x017f*/ bool aiPlayTemporaryTrack(void); -/*0x0180*/ bool aiStopAmbientTrack(void); -/*0x0181*/ bool aiIfPlayerLookingAtObject(void); -/*0x0182*/ bool aiPunchOrKick(void); -/*0x0183*/ bool aiIfTargetIsPlayer(void); +/*0x0176*/ bool ai_if_bot_respawning(void); +/*0x0177*/ bool ai_player_auto_walk(void); +/*0x0178*/ bool ai_if_player_auto_walk_finished(void); +/*0x0179*/ bool ai_play_sound_from_entity(void); +/*0x017a*/ bool ai_if_los_to_attack_target(void); +/*0x017b*/ bool ai_if_chr_knocked_out(void); +/*0x017c*/ bool ai_assign_sound(void); +/*0x017d*/ bool ai_play_cutscene_track(void); +/*0x017e*/ bool ai_stop_cutscene_track(void); +/*0x017f*/ bool ai_play_temporary_track(void); +/*0x0180*/ bool ai_stop_ambient_track(void); +/*0x0181*/ bool ai_if_player_looking_at_object(void); +/*0x0182*/ bool ai_punch_or_kick(void); +/*0x0183*/ bool ai_if_target_is_player(void); /*0x0184*/ bool ai0184(void); -/*0x0185*/ bool aiMpInitSimulants(void); -/*0x0186*/ bool aiIfSoundTimer(void); -/*0x0187*/ bool aiSetTargetToEyespyIfInSight(void); -/*0x0188*/ bool aiIfLiftStationary(void); -/*0x0189*/ bool aiLiftGoToStop(void); -/*0x018a*/ bool aiIfLiftAtStop(void); -/*0x018b*/ bool aiConfigureRain(void); -/*0x018c*/ bool aiChrToggleModelPart(void); -/*0x018d*/ bool aiActivateLift(void); -/*0x018e*/ bool aiMiniSkedarTryPounce(void); -/*0x018f*/ bool aiIfObjectDistanceToPadLessThan(void); -/*0x0190*/ bool aiSetSavefileFlag(void); -/*0x0191*/ bool aiUnsetSavefileFlag(void); -/*0x0192*/ bool aiIfSavefileFlagIsSet(void); -/*0x0193*/ bool aiIfSavefileFlagIsUnset(void); -/*0x019e*/ bool aiIfObjHealthLessThan(void); -/*0x019f*/ bool aiSetObjHealth(void); -/*0x01a0*/ bool aiSetChrSpecialDeathAnimation(void); -/*0x01a1*/ bool aiSetRoomToSearch(void); -/*0x01a2*/ bool aiSayCiStaffQuip(void); -/*0x01a3*/ bool aiDoPresetAnimation(void); -/*0x01a4*/ bool aiShowHudmsgMiddle(void); -/*0x01a5*/ bool aiIfUsingLift(void); -/*0x01a6*/ bool aiIfTargetYDifferenceLessThan(void); -/*0x01a7*/ bool aiIfChrNotTalking(void); +/*0x0185*/ bool ai_mp_init_simulants(void); +/*0x0186*/ bool ai_if_sound_timer(void); +/*0x0187*/ bool ai_set_target_to_eyespy_if_in_sight(void); +/*0x0188*/ bool ai_if_lift_stationary(void); +/*0x0189*/ bool ai_lift_go_to_stop(void); +/*0x018a*/ bool ai_if_lift_at_stop(void); +/*0x018b*/ bool ai_configure_rain(void); +/*0x018c*/ bool ai_chr_toggle_model_part(void); +/*0x018d*/ bool ai_activate_lift(void); +/*0x018e*/ bool ai_mini_skedar_try_pounce(void); +/*0x018f*/ bool ai_if_object_distance_to_pad_less_than(void); +/*0x0190*/ bool ai_set_savefile_flag(void); +/*0x0191*/ bool ai_unset_savefile_flag(void); +/*0x0192*/ bool ai_if_savefile_flag_is_set(void); +/*0x0193*/ bool ai_if_savefile_flag_is_unset(void); +/*0x019e*/ bool ai_if_obj_health_less_than(void); +/*0x019f*/ bool ai_set_obj_health(void); +/*0x01a0*/ bool ai_set_chr_special_death_animation(void); +/*0x01a1*/ bool ai_set_room_to_search(void); +/*0x01a2*/ bool ai_say_ci_staff_quip(void); +/*0x01a3*/ bool ai_do_preset_animation(void); +/*0x01a4*/ bool ai_show_hudmsg_middle(void); +/*0x01a5*/ bool ai_if_using_lift(void); +/*0x01a6*/ bool ai_if_target_y_difference_less_than(void); +/*0x01a7*/ bool ai_if_chr_not_talking(void); /*0x01aa*/ bool ai01aa(void); -/*0x01ab*/ bool aiIfNumKnockedOutChrs(void); -/*0x01ad*/ bool aiReleaseObject(void); -/*0x01ae*/ bool aiClearInventory(void); -/*0x01af*/ bool aiChrGrabObject(void); -/*0x01b1*/ bool aiShuffleRuinsPillars(void); -/*0x01b2*/ bool aiSetWindSpeed(void); -/*0x01b3*/ bool aiToggleP1P2(void); +/*0x01ab*/ bool ai_if_num_knocked_out_chrs(void); +/*0x01ad*/ bool ai_release_object(void); +/*0x01ae*/ bool ai_clear_inventory(void); +/*0x01af*/ bool ai_chr_grab_object(void); +/*0x01b1*/ bool ai_shuffle_ruins_pillars(void); +/*0x01b2*/ bool ai_set_wind_speed(void); +/*0x01b3*/ bool ai_toggle_p1p2(void); /*0x01b4*/ bool ai01b4(void); -/*0x01b5*/ bool aiChrSetP1P2(void); -/*0x01b6*/ bool aiConfigureSnow(void); -/*0x01b7*/ bool aiChrSetCloaked(void); -/*0x01b8*/ bool aiSetAutogunTargetTeam(void); -/*0x01b9*/ bool aiShufflePelagicSwitches(void); -/*0x01ba*/ bool aiTryAttackLie(void); -/*0x01bb*/ bool aiNoOp01bb(void); +/*0x01b5*/ bool ai_chr_set_p1p2(void); +/*0x01b6*/ bool ai_configure_snow(void); +/*0x01b7*/ bool ai_chr_set_cloaked(void); +/*0x01b8*/ bool ai_set_autogun_target_team(void); +/*0x01b9*/ bool ai_shuffle_pelagic_switches(void); +/*0x01ba*/ bool ai_try_attack_lie(void); +/*0x01bb*/ bool ai_noop_01bb(void); /*0x01bc*/ bool ai01bc(void); -/*0x01bd*/ bool aiIfTrainingPcHolographed(void); -/*0x01be*/ bool aiIfPlayerUsingDevice(void); -/*0x01bf*/ bool aiChrBeginOrEndTeleport(void); -/*0x01c0*/ bool aiIfChrTeleportFullWhite(void); -/*0x01c1*/ bool aiSetPunchDodgeList(void); -/*0x01c2*/ bool aiSetShootingAtMeList(void); -/*0x01c3*/ bool aiSetDarkRoomList(void); -/*0x01c4*/ bool aiSetPlayerDeadList(void); -/*0x01c5*/ bool aiAvoid(void); -/*0x01c6*/ bool aiSetDodgeRating(void); -/*0x01c7*/ bool aiSetUnarmedDodgeRating(void); -/*0x01c8*/ bool aiTitleInitMode(void); -/*0x01c9*/ bool aiTryExitTitle(void); -/*0x01ca*/ bool aiChrSetCutsceneWeapon(void); -/*0x01cb*/ bool aiFadeScreen(void); -/*0x01cc*/ bool aiIfFadeComplete(void); -/*0x01cd*/ bool aiSetChrHudpieceVisible(void); -/*0x01ce*/ bool aiSetPassiveMode(void); -/*0x01cf*/ bool aiChrSetFiringInCutscene(void); -/*0x01d0*/ bool aiSetPortalFlag(void); -/*0x01d1*/ bool aiObjSetModelPartVisible(void); -/*0x01d2*/ bool aiChrEmitSparks(void); -/*0x01d3*/ bool aiSetDrCarollImages(void); -/*0x01d4*/ bool aiSetRoomFlag(void); -/*0x01d5*/ bool aiShowCutsceneChrs(void); -/*0x01d6*/ bool aiConfigureEnvironment(void); -/*0x01d7*/ bool aiIfDistanceToTarget2LessThan(void); -/*0x01d8*/ bool aiIfDistanceToTarget2GreaterThan(void); -/*0x01d9*/ bool aiPlaySoundFromProp(void); -/*0x01da*/ bool aiPlayTemporaryPrimaryTrack(void); -/*0x01db*/ bool aiChrKill(void); -/*0x01dc*/ bool aiRemoveWeaponFromInventory(void); -/*0x01dd*/ bool aiIfMusicEventQueueIsEmpty(void); -/*0x01de*/ bool aiIfCoopMode(void); -/*0x01df*/ bool aiIfChrSameFloorDistanceToPadLessThan(void); -/*0x01e0*/ bool aiRemoveReferencesToChr(void); +/*0x01bd*/ bool ai_if_training_pc_holographed(void); +/*0x01be*/ bool ai_if_player_using_device(void); +/*0x01bf*/ bool ai_chr_begin_or_end_teleport(void); +/*0x01c0*/ bool ai_if_chr_teleport_full_white(void); +/*0x01c1*/ bool ai_set_punch_dodge_list(void); +/*0x01c2*/ bool ai_set_shooting_at_me_list(void); +/*0x01c3*/ bool ai_set_dark_room_list(void); +/*0x01c4*/ bool ai_set_player_dead_list(void); +/*0x01c5*/ bool ai_avoid(void); +/*0x01c6*/ bool ai_set_dodge_rating(void); +/*0x01c7*/ bool ai_set_unarmed_dodge_rating(void); +/*0x01c8*/ bool ai_title_init_mode(void); +/*0x01c9*/ bool ai_try_exit_title(void); +/*0x01ca*/ bool ai_chr_set_cutscene_weapon(void); +/*0x01cb*/ bool ai_fade_screen(void); +/*0x01cc*/ bool ai_if_fade_complete(void); +/*0x01cd*/ bool ai_set_chr_hudpiece_visible(void); +/*0x01ce*/ bool ai_set_passive_mode(void); +/*0x01cf*/ bool ai_chr_set_firing_in_cutscene(void); +/*0x01d0*/ bool ai_set_portal_flag(void); +/*0x01d1*/ bool ai_obj_set_model_part_visible(void); +/*0x01d2*/ bool ai_chr_emit_sparks(void); +/*0x01d3*/ bool ai_set_dr_caroll_images(void); +/*0x01d4*/ bool ai_set_room_flag(void); +/*0x01d5*/ bool ai_show_cutscene_chrs(void); +/*0x01d6*/ bool ai_configure_environment(void); +/*0x01d7*/ bool ai_if_distance_to_target2_less_than(void); +/*0x01d8*/ bool ai_if_distance_to_target2_greater_than(void); +/*0x01d9*/ bool ai_play_sound_from_prop(void); +/*0x01da*/ bool ai_play_temporary_primary_track(void); +/*0x01db*/ bool ai_chr_kill(void); +/*0x01dc*/ bool ai_remove_weapon_from_inventory(void); +/*0x01dd*/ bool ai_if_music_event_queue_is_empty(void); +/*0x01de*/ bool ai_if_coop_mode(void); +/*0x01df*/ bool ai_if_chr_same_floor_distance_to_pad_less_than(void); +/*0x01e0*/ bool ai_remove_references_to_chr(void); -void propDecrementSoundCount(struct prop *prop); +void prop_decrement_sound_count(struct prop *prop); #endif diff --git a/src/include/game/chrmgr.h b/src/include/game/chrmgr.h index e3c7a4a82..aa3c3efc7 100644 --- a/src/include/game/chrmgr.h +++ b/src/include/game/chrmgr.h @@ -4,9 +4,9 @@ #include "data.h" #include "types.h" -void chrmgrReset(void); -void chrmgrConfigure(s32 numchrs); +void chrmgr_reset(void); +void chrmgr_configure(s32 numchrs); -void chrmgrStop(void); +void chrmgr_stop(void); #endif diff --git a/src/include/game/crc.h b/src/include/game/crc.h index ebd786436..fb27dfa22 100644 --- a/src/include/game/crc.h +++ b/src/include/game/crc.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void crcCalculateU32Pair(u8 *start, u8 *end, u32 *checksum); -void crcCalculateU16Pair(u8 *start, u8 *end, u16 *checksum); +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/credits.h b/src/include/game/credits.h index 75ef843e8..9929f098f 100644 --- a/src/include/game/credits.h +++ b/src/include/game/credits.h @@ -4,9 +4,9 @@ #include "data.h" #include "types.h" -Gfx *creditsDraw(Gfx *gdl); -void creditsReset(void); -void creditsRequestAltTitle(void); +Gfx *credits_draw(Gfx *gdl); +void credits_reset(void); +void credits_request_alt_title(void); void credits0f13ae04(Mtxf *mtx); #endif diff --git a/src/include/game/debug.h b/src/include/game/debug.h index 5b7776a23..0a9796f1c 100644 --- a/src/include/game/debug.h +++ b/src/include/game/debug.h @@ -6,48 +6,48 @@ void debug0f119a80nb(void); u32 dprint(); -s32 debugGetProfileMode(void); -bool debugIsBgRenderingEnabled(void); -bool debugIsPropRenderingEnabled(void); +s32 debug_get_profile_mode(void); +bool debug_is_bg_rendering_enabled(void); +bool debug_is_prop_rendering_enabled(void); bool debug0f11ed88(void); -bool debugIsManPosEnabled(void); -bool debugIsRoomGfxExtraMemEnabled(void); -bool debugIsObjDeformDebugEnabled(void); -bool debugIsRoomStateDebugEnabled(void); -s32 debugIsTurboModeEnabled(void); -bool debugForceAllObjectivesComplete(void); -bool debugIsZBufferDisabled(void); +bool debug_is_man_pos_enabled(void); +bool debug_is_room_gfx_extra_mem_enabled(void); +bool debug_is_obj_deform_debug_enabled(void); +bool debug_is_room_state_debug_enabled(void); +s32 debug_is_turbo_mode_enabled(void); +bool debug_force_all_objectives_complete(void); +bool debug_is_z_buffer_disabled(void); bool debug0f11ee40(void); bool debug0f1199f0nb(void); bool debug0f119a14nb(void); -s32 debugGetSlowMotion(void); -s32 debugGetTilesDebugMode(void); -s32 debugGetPadsDebugMode(void); +s32 debug_get_slow_motion(void); +s32 debug_get_tiles_debug_mode(void); +s32 debug_get_pads_debug_mode(void); bool debug0f11eea8(void); -bool debugDangerousProps(void); -s32 debugGetMotionBlur(void); -bool debugIsFootstepsEnabled(void); -bool debugIsAllChallengesEnabled(void); -bool debugIsAllBuddiesEnabled(void); -bool debugIsSetCompleteEnabled(void); -bool debugIsAllTrainingEnabled(void); -bool debugAllowEndLevel(void); -bool debugIsChrStatsEnabled(void); +bool debug_dangerous_props(void); +s32 debug_get_motion_blur(void); +bool debug_is_footsteps_enabled(void); +bool debug_is_all_challenges_enabled(void); +bool debug_is_all_buddies_enabled(void); +bool debug_is_set_complete_enabled(void); +bool debug_is_all_training_enabled(void); +bool debug_allow_end_level(void); +bool debug_is_chr_stats_enabled(void); bool debug0f11ef80(void); -bool debugIsMemInfoEnabled(void); +bool debug_is_mem_info_enabled(void); -s32 dmenuGetSelectedOption(void); -void dmenuSetSelectedOption(s32 option); -void dmenuSetMenu(char **labels, s32 (*positions)[2], s32 *offsets); -void dmenuNavigateRight(void); -void dmenuNavigateLeft(void); -void dmenuNavigateUp(void); -void dmenuNavigateDown(void); -Gfx *dmenuRender(Gfx *gdl); +s32 dmenu_get_selected_option(void); +void dmenu_set_selected_option(s32 option); +void dmenu_set_menu(char **labels, s32 (*positions)[2], s32 *offsets); +void dmenu_navigate_right(void); +void dmenu_navigate_left(void); +void dmenu_navigate_up(void); +void dmenu_navigate_down(void); +Gfx *dmenu_render(Gfx *gdl); -void debugUpdateMenu(void); -bool debugProcessInput(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe); -bool debugIsLineModeEnabled(void); +void debug_update_menu(void); +bool debug_process_input(s8 stickx, s8 sticky, u16 buttons, u16 buttonsthisframe); +bool debug_is_line_mode_enabled(void); extern s32 var800786f4nb; extern s32 g_DebugMenuPositions[][2]; diff --git a/src/include/game/dlights.h b/src/include/game/dlights.h index a52b251ce..8bbef139f 100644 --- a/src/include/game/dlights.h +++ b/src/include/game/dlights.h @@ -5,45 +5,45 @@ #include "types.h" u32 func0f000920(s32 portalnum1, s32 portalnum2); -struct light *roomGetLight(s32 roomnum, s32 lightnum); -u8 roomGetFinalBrightness(s32 roomnum); -u8 roomGetFinalBrightnessForPlayer(s32 roomnum); -u8 roomGetSettledRegionalBrightnessForPlayer(s32 roomnum); -u8 roomGetSettledLocalBrightness(s32 room); -s32 roomGetFlashBrightness(s32 roomnum); -f32 roomGetLightOpCurFrac(s32 roomnum); -f32 roomGetSettledLocalBrightnessFrac(s32 roomnum); -bool lightGetBboxCentre(s32 roomnum, u32 lightnum, struct coord *pos); -bool lightIsHealthy(s32 roomnum, s32 lightnum); -bool lightIsVulnerable(s32 roomnum, s32 lightnum); -bool lightIsOn(s32 roomnum, s32 lightnum); -void roomSetFlashBrightness(s32 roomnum, s32 value); -void roomSetDefaults(struct room *room); -Gfx *lightsSetForRoom(Gfx *gdl, RoomNum roomnum); -Gfx *lightsSetDefault(Gfx *gdl); -void roomInitLights(s32 roomnum); -bool lightsHandleHit(struct coord *gunpos, struct coord *hitpos, s32 roomnum); -void roomSetLightsFaulty(s32 roomnum, s32 chance); -void roomSetLightBroken(s32 roomnum, s32 lightnum); -void lightsReset(void); +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); +u8 room_get_settled_local_brightness(s32 room); +s32 room_get_flash_brightness(s32 roomnum); +f32 room_get_light_op_cur_frac(s32 roomnum); +f32 room_get_settled_local_brightness_frac(s32 roomnum); +bool light_get_bbox_centre(s32 roomnum, u32 lightnum, struct coord *pos); +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); +bool lights_handle_hit(struct coord *gunpos, struct coord *hitpos, s32 roomnum); +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 lightsCalculateRoomDimensions(void); +void lights_calculate_room_dimensions(void); void func0f00259c(s32 roomnum); void func0f002844(s32 roomnum, f32 arg1, s32 arg2, s32 portalnum); void func0f002a98(void); -void roomSetLightsOn(s32 roomnum, s32 enable); -void roomSetLightOp(s32 roomnum, s32 operation, u8 br_to, u8 br_from, u8 duration60); -bool lightTickBroken(s32 roomnum, s32 lightnum); -void lightingTick(void); -void lightsConfigureForPerfectDarknessCutscene(void); -void lightsConfigureForPerfectDarknessGameplay(void); -void lightsTickPerfectDarkness(void); -void roomsTickLighting(void); -void lightsTick(void); -void roomFlashLighting(s32 roomnum, s32 start, s32 limit); -void roomFlashLocalLighting(s32 roomnum, s32 increment, s32 limit); -void roomHighlight(s32 roomnum); +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); diff --git a/src/include/game/dyntex.h b/src/include/game/dyntex.h index f6c2cd952..719d134b9 100644 --- a/src/include/game/dyntex.h +++ b/src/include/game/dyntex.h @@ -4,11 +4,11 @@ #include "data.h" #include "types.h" -void dyntexTickRoom(s32 roomnum, Vtx *vertices); -void dyntexAddVertex(Vtx *vertex); -void dyntexSetCurrentType(s16 type); -void dyntexSetCurrentRoom(RoomNum roomnum); -void dyntexReset(void); -bool dyntexHasRoom(void); +void dyntex_tick_room(s32 roomnum, Vtx *vertices); +void dyntex_add_vertex(Vtx *vertex); +void dyntex_set_current_type(s16 type); +void dyntex_set_current_room(RoomNum roomnum); +void dyntex_reset(void); +bool dyntex_has_room(void); #endif diff --git a/src/include/game/endscreen.h b/src/include/game/endscreen.h index c12cf2566..b37d107b9 100644 --- a/src/include/game/endscreen.h +++ b/src/include/game/endscreen.h @@ -4,39 +4,39 @@ #include "data.h" #include "types.h" -MenuDialogHandlerResult endscreenHandleRetryMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult endscreenHandle2PCompleted(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult endscreenHandle2PFailed(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult endscreenHandleDeclineMission(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult endscreenHandleCheatInfo(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult endscreenHandleContinueMission(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult endscreenHandleReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult endscreenHandleReplayPreviousMission(s32 operation, struct menuitem *item, union handlerdata *data); -char *endscreenMenuTitleRetryMission(struct menudialogdef *dialogdef); -char *endscreenMenuTitleNextMission(struct menudialogdef *dialogdef); -char *endscreenMenuTextNumKills(struct menuitem *item); -char *endscreenMenuTextNumShots(struct menuitem *item); -char *endscreenMenuTextNumHeadShots(struct menuitem *item); -char *endscreenMenuTextNumBodyShots(struct menuitem *item); -char *endscreenMenuTextNumLimbShots(struct menuitem *item); -char *endscreenMenuTextNumOtherShots(struct menuitem *item); -char *endscreenMenuTextAccuracy(struct menuitem *item); -char *endscreenMenuTextMissionStatus(struct menuitem *item); -char *endscreenMenuTextAgentStatus(struct menuitem *item); -char *endscreenMenuTitleStageCompleted(struct menuitem *item); -char *endscreenMenuTextCurrentStageName3(struct menuitem *item); -char *endscreenMenuTitleStageFailed(struct menuitem *item); -char *endscreenMenuTextMissionTime(struct menuitem *item); -struct menudialogdef *endscreenAdvance(void); -void endscreenResetModels(void); -void endscreenContinue(s32 context); -char *endscreenMenuTextTimedCheatName(struct menuitem *item); -char *endscreenMenuTextCompletionCheatName(struct menuitem *item); -char *endscreenMenuTextTargetTime(struct menuitem *item); -void endscreenSetCoopCompleted(void); -void endscreenPrepare(void); -void endscreenPushCoop(void); -void endscreenPushSolo(void); -void endscreenPushAnti(void); +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); +void endscreen_push_anti(void); #endif diff --git a/src/include/game/env.h b/src/include/game/env.h index d0e2df0fd..d928bd877 100644 --- a/src/include/game/env.h +++ b/src/include/game/env.h @@ -10,18 +10,18 @@ struct distfadesettings { f32 refdist; }; -struct environment *envGetCurrent(void); -f32 envGetSquaredFogMax(void); -void envTick(void); -void envApplyFogEnvironment(struct fogenvironment *sky); -void envApplyNoFogEnvironment(struct nofogenvironment *sky); -void envSetStageNum(s32 stagenum); -void envChooseAndApply(s32 stagenum, bool allowoverride); -void envApplyTransitionFrac(f32 arg0); -Gfx *envStartFog(Gfx *gdl, bool xlupass); -Gfx *envStopFog(Gfx *gdl); -bool envIsPosInFogMaxDistance(struct coord *pos, f32 tolerance); -struct distfadesettings *envGetDistFadeSettings(void); -s32 envGetObjShadeMode(struct prop *prop, f32 arg1[4]); +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); +Gfx *env_start_fog(Gfx *gdl, bool xlupass); +Gfx *env_stop_fog(Gfx *gdl); +bool env_is_pos_in_fog_max_distance(struct coord *pos, f32 tolerance); +struct distfadesettings *env_get_dist_fade_settings(void); +s32 env_get_obj_shade_mode(struct prop *prop, f32 arg1[4]); #endif diff --git a/src/include/game/explosions.h b/src/include/game/explosions.h index f6d15e212..f2442b45e 100644 --- a/src/include/game/explosions.h +++ b/src/include/game/explosions.h @@ -4,23 +4,23 @@ #include "data.h" #include "types.h" -void explosionsReset(void); +void explosions_reset(void); -void explosionsStop(void); +void explosions_stop(void); -bool explosionCreateSimple(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum); -bool explosionCreateComplex(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum); -f32 explosionGetHorizontalRangeAtFrame(struct explosion *exp, s32 frame); -f32 explosionGetVerticalRangeAtFrame(struct explosion *exp, s32 frame); -void explosionGetBboxAtFrame(struct coord *lower, struct coord *upper, s32 frame, struct prop *prop); -void explosionAlertChrs(f32 *radius, struct coord *noisepos); -bool explosionCreate(struct prop *prop, struct coord *pos, RoomNum *rooms, s16 type, s32 playernum, bool makescorch, struct coord *arg6, RoomNum room, struct coord *arg8); -void explosionsUpdateShake(struct coord *arg0, struct coord *arg1, struct coord *arg2); -bool explosionOverlapsProp(struct explosion *exp, struct prop *prop, struct coord *pos1, struct coord *pos2); -void explosionInflictDamage(struct prop *prop); -u32 explosionTick(struct prop *prop); -u32 explosionTickPlayer(struct prop *prop); -Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool xlupass); -Gfx *explosionRenderPart(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); +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/file.h b/src/include/game/file.h index d26f6ca61..a64b69e07 100644 --- a/src/include/game/file.h +++ b/src/include/game/file.h @@ -4,17 +4,17 @@ #include "data.h" #include "types.h" -romptr_t fileGetRomAddress(s32 filenum); -s32 fileGetRomSize(s32 filenum); -void filesInit(void); -void fileLoadPartToAddr(u16 filenum, void *memaddr, s32 offset, u32 len); -u32 fileGetInflatedSize(s32 filenum); -void *fileLoadToNew(s32 filenum, u32 method); -void *fileLoadToAddr(s32 filenum, s32 method, u8 *ptr, u32 size); -u32 fileGetLoadedSize(s32 filenum); -u32 fileGetAllocationSize(s32 filenum); -void fileSetSize(s32 filenum, void *ptr, u32 size, bool reallocate); -void filesStop(u8 arg0); +romptr_t file_get_rom_address(s32 filenum); +s32 file_get_rom_size(s32 filenum); +void files_init(void); +void file_load_part_to_addr(u16 filenum, void *memaddr, s32 offset, u32 len); +u32 file_get_inflated_size(s32 filenum); +void *file_load_to_new(s32 filenum, u32 method); +void *file_load_to_addr(s32 filenum, s32 method, u8 *ptr, u32 size); +u32 file_get_loaded_size(s32 filenum); +u32 file_get_allocation_size(s32 filenum); +void file_set_size(s32 filenum, void *ptr, u32 size, bool reallocate); +void files_stop(u8 arg0); void func0f167330(void); #endif diff --git a/src/include/game/filelist.h b/src/include/game/filelist.h index b22811613..ca4be4deb 100644 --- a/src/include/game/filelist.h +++ b/src/include/game/filelist.h @@ -6,10 +6,10 @@ void func0f110bf0(void); void func0f110bf8(void); -void filelistCreate(s32 listnum, u8 filetype); -s32 filelistFindOrCreate(u8 filetype); -void filelistInvalidatePak(s32 device); -void filelistsTick(void); -void filelistUpdate(struct filelist *list); +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 d1f56f76b..bc74ebf85 100644 --- a/src/include/game/filemgr.h +++ b/src/include/game/filemgr.h @@ -6,80 +6,80 @@ extern struct menudialogdef g_ChooseLanguageMenuDialog; -char *filemgrGetDeviceName(s32 index); -char *filemgrMenuTextDeviceName(struct menuitem *item); -void filemgrGetSelectName(char *buffer, struct filelistfile *file, u32 filetype); -char *filemgrMenuTextDeleteFileName(struct menuitem *item); -void filemgrSetDevice1BySerial(s32 deviceserial); -void filemgrSetDevice1ByFile(struct filelistfile *file); -void filemgrSetFileToDelete(struct filelistfile *file, s32 filetype); -char *filemgrMenuTextFailReason(struct menuitem *item); -char *filemgrMenuTextDeviceNameForError(struct menuitem *item); -void filemgrPushErrorDialog(u16 errno); -s32 filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex); -char *filemgrMenuTextErrorTitle(struct menuitem *item); -char *filemgrMenuTextFileType(struct menuitem *item); +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 filemgrHandleSuccess(void); -void filemgrEraseCorruptFile(void); -char *filemgrMenuTextInsertOriginalPak(struct menuitem *item); -void filemgrRetrySave(s32 arg0); -bool filemgrAttemptOperation(s32 device, bool closeonsuccess); -bool filemgrSaveOrLoad(struct fileguid *guid, s32 fileop, u32 playernum); -void filemgrDeleteCurrentFile(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 filemgrSaveGameToDevice(s32 device); -void filemgrGetFileName(char *dst, struct filelistfile *file); -void filemgrGetRenameName(char *buffer); -void filemgrSetRenameName(char *name); -bool filemgrIsNameAvailable(s32 arg0); -void filemgrSaveToDevice(void); -char *filemgrMenuTextDeviceNameContainingDuplicateFile(struct menuitem *item); -char *filemgrMenuTextDuplicateFileName(struct menuitem *item); -char *filemgrMenuTextLocationName2(struct menuitem *item); -char *filemgrMenuTextSaveLocationSpaces(struct menuitem *item); -void filemgrPushSelectLocationDialog(s32 arg0, u32 filetype); -char *filemgrMenuTextFileInUseDescription(struct menuitem *item); -Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, s32 filenum, s32 deviceserial); -bool filemgrIsFileInUse(struct filelistfile *file); -MenuItemHandlerResult filemgrFileToCopyOrDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, bool isdelete); -void filemgrPushDeleteFileDialog(s32 listnum); -char *pakMenuTextPagesFree(struct menuitem *item); -char *pakMenuTextPagesUsed(struct menuitem *item); -char *pakMenuTextStatusMessage(struct menuitem *item); -char *pakMenuTextEditingPakName(struct menuitem *item); -bool filemgrConsiderPushingFileSelectDialog(void); -void bootmenuReset(void); -MenuItemHandlerResult filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult pakGameNoteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrFileToCopyListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrFileToDeleteListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult filemgrInsertOriginalPakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult filemgrCopyOrDeleteListMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult pakGameNotesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult pakChoosePakMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult filemgrDeviceNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrFileNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrDeviceNameForErrorMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrRetrySaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrCancelSave2MenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrAcknowledgeFileLostMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrReinsertedOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrReinsertedCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrDuplicateRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrDuplicateCancelMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrCancelSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrDeleteFilesForSaveMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrConfirmDeleteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult pakDeleteGameNoteMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult pakSelectionMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrAgentNameKeyboardMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrOpenCopyFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrOpenDeleteFileMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrConfirmRenameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrSaveElsewhereYesMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult filemgrSelectLocationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); +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 591da78ef..ad9d7d2d5 100644 --- a/src/include/game/fmb.h +++ b/src/include/game/fmb.h @@ -4,11 +4,11 @@ #include "data.h" #include "types.h" -void fmbReset(void); -MenuItemHandlerResult fmbHandleDropOut(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fmdHandleAbortGame(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fmbHandleAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult fmbHandleAcceptChallenge(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult fmbHandleMainMenu(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +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/footstep.h b/src/include/game/footstep.h index 08c032c7f..21fd3f4be 100644 --- a/src/include/game/footstep.h +++ b/src/include/game/footstep.h @@ -4,8 +4,8 @@ #include "data.h" #include "types.h" -s32 footstepChooseSound(struct chrdata *chr, s32 index); -void footstepCheckDefault(struct chrdata *chr); -void footstepCheckMagic(struct chrdata *chr); +s32 footstep_choose_sound(struct chrdata *chr, s32 index); +void footstep_check_default(struct chrdata *chr); +void footstep_check_magic(struct chrdata *chr); #endif diff --git a/src/include/game/game_006900.h b/src/include/game/game_006900.h index 203a12c51..1505da3d1 100644 --- a/src/include/game/game_006900.h +++ b/src/include/game/game_006900.h @@ -4,11 +4,11 @@ #include "data.h" #include "types.h" -u32 colourBlend(u32 a, u32 b, u32 weight); -void menuTickTimers(void); -f32 menuGetSinOscFrac(f32 freq); -f32 menuGetCosOscFrac(f32 freq); -f32 menuGetLinearIntervalFrac(f32 freq); -f32 menuGetLinearOscPauseFrac(f32 frac); +u32 colour_blend(u32 a, u32 b, u32 weight); +void menu_tick_timers(void); +f32 menu_get_sin_osc_frac(f32 freq); +f32 menu_get_cos_osc_frac(f32 freq); +f32 menu_get_linear_interval_frac(f32 freq); +f32 menu_get_linear_osc_pause_frac(f32 frac); #endif diff --git a/src/include/game/game_00b320.h b/src/include/game/game_00b320.h index fa4b464f6..e973fceb2 100644 --- a/src/include/game/game_00b320.h +++ b/src/include/game/game_00b320.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -void langReset(s32 stagenum); +void lang_reset(s32 stagenum); #endif diff --git a/src/include/game/game_00b820.h b/src/include/game/game_00b820.h index a7b6bb262..ed747269c 100644 --- a/src/include/game/game_00b820.h +++ b/src/include/game/game_00b820.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void resetSomeStageThings(void); -void stageAllocateBgChrs(void); +void reset_some_stage_things(void); +void stage_allocate_bg_chrs(void); #endif diff --git a/src/include/game/game_0147d0.h b/src/include/game/game_0147d0.h index 27bbd26cd..21172ffe9 100644 --- a/src/include/game/game_0147d0.h +++ b/src/include/game/game_0147d0.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void boltbeamsReset(void); -void lasersightsReset(void); +void boltbeams_reset(void); +void lasersights_reset(void); #endif diff --git a/src/include/game/game_096360.h b/src/include/game/game_096360.h index 4408c574b..6abe3efc7 100644 --- a/src/include/game/game_096360.h +++ b/src/include/game/game_096360.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void mtxLoadRandomRotation(Mtxf *mtx); +void mtx_load_random_rotation(Mtxf *mtx); void func0f0964b4(struct coord *arg0, Mtxf *mtx); void func0f0965e4(f32 *arg0, f32 *arg1, f32 arg2); void func0f096698(Mtxf *arg0, Mtxf *arg1, s32 count); diff --git a/src/include/game/game_0b0fd0.h b/src/include/game/game_0b0fd0.h index cd573b5ae..0b7d7edf1 100644 --- a/src/include/game/game_0b0fd0.h +++ b/src/include/game/game_0b0fd0.h @@ -4,38 +4,38 @@ #include "data.h" #include "types.h" -struct weapon *weaponFindById(s32 itemid); -struct weaponfunc *weaponGetFunctionById(u32 weaponnum, u32 which); -struct weaponfunc *gsetGetWeaponFunction2(struct gset *gset); -struct weaponfunc *gsetGetWeaponFunction(struct gset *gset); -struct weaponfunc *weaponGetFunction(struct gset *gset, s32 which); -struct weaponfunc *currentPlayerGetWeaponFunction(u32 hand); -struct invaimsettings *gsetGetAimSettings(struct gset *gset); -struct inventory_ammo *weaponGetAmmoByFunction(u32 weaponnum, u32 funcnum); -f32 handGetXShift(s32 handnum); +struct weapon *weapon_find_by_id(s32 itemid); +struct weaponfunc *weapon_get_function_by_id(u32 weaponnum, u32 which); +struct weaponfunc *gset_get_weapon_function2(struct gset *gset); +struct weaponfunc *gset_get_weapon_function(struct gset *gset); +struct weaponfunc *weapon_get_function(struct gset *gset, s32 which); +struct weaponfunc *current_player_get_weapon_function(u32 hand); +struct invaimsettings *gset_get_aim_settings(struct gset *gset); +struct inventory_ammo *weapon_get_ammo_by_function(u32 weaponnum, u32 funcnum); +f32 hand_get_x_shift(s32 handnum); f32 func0f0b131c(s32 handnum); -f32 currentPlayerGetGunZoomFov(void); -void currentPlayerZoomOut(f32 fovpersec); -void currentPlayerZoomIn(f32 fovpersec); -bool weaponHasFlag(s32 itemid, u32 flag); -bool weaponHasAimFlag(s32 weaponnum, u32 flag); -bool weaponHasAmmoFlag(s32 weaponnum, s32 funcnum, u32 flag); -s32 currentPlayerGetDeviceState(s32 weaponnum); -void currentPlayerSetDeviceActive(s32 weaponum, bool active); -u16 weaponGetFileNum(s32 weaponnum); -u16 weaponGetFileNum2(s32 weaponnum); -void gsetPopulateFromCurrentPlayer(s32 handnum, struct gset *gset); -struct inventory_ammo *gsetGetAmmoDefinition(struct gset *gset); -u8 gsetGetSinglePenetration(struct gset *gset); -f32 gsetGetImpactForce(struct gset *gset); -f32 gsetGetDamage(struct gset *gset); -u8 gsetGetFireslotDuration(struct gset *gset); -u16 gsetGetSingleShootSound(struct gset *gset); -bool gsetHasFunctionFlags(struct gset *gset, u32 flags); -s8 weaponGetNumTicksPerShot(u32 weaponnum, u32 funcindex); -u32 currentPlayerGetSight(void); -void gsetGetNoiseSettings(struct gset *gset, struct noisesettings *settings); -struct guncmd *gsetGetPriToSecAnim(struct gset *gset); -struct guncmd *gsetGetSecToPriAnim(struct gset *gset); +f32 current_player_get_gun_zoom_fov(void); +void current_player_zoom_out(f32 fovpersec); +void current_player_zoom_in(f32 fovpersec); +bool weapon_has_flag(s32 itemid, u32 flag); +bool weapon_has_aim_flag(s32 weaponnum, u32 flag); +bool weapon_has_ammo_flag(s32 weaponnum, s32 funcnum, u32 flag); +s32 current_player_get_device_state(s32 weaponnum); +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); +u8 gset_get_fireslot_duration(struct gset *gset); +u16 gset_get_single_shoot_sound(struct gset *gset); +bool gset_has_function_flags(struct gset *gset, u32 flags); +s8 weapon_get_num_ticks_per_shot(u32 weaponnum, u32 funcindex); +u32 current_player_get_sight(void); +void gset_get_noise_settings(struct gset *gset, struct noisesettings *settings); +struct guncmd *gset_get_pri_to_sec_anim(struct gset *gset); +struct guncmd *gset_get_sec_to_pri_anim(struct gset *gset); #endif diff --git a/src/include/game/game_13c510.h b/src/include/game/game_13c510.h index 0f5102260..e37ed77df 100644 --- a/src/include/game/game_13c510.h +++ b/src/include/game/game_13c510.h @@ -4,14 +4,14 @@ #include "data.h" #include "types.h" -void artifactsClear(void); -void artifactsTick(void); +void artifacts_clear(void); +void artifacts_tick(void); u16 func0f13c574(f32 arg0); s32 func0f13c710(f32 arg0); -void artifactsCalculateGlaresForRoom(s32 roomnum); +void artifacts_calculate_glares_for_room(s32 roomnum); u8 func0f13d3c4(u8 arg0, u8 arg1); -Gfx *artifactsConfigureForGlares(Gfx *gdl); -Gfx *artifactsUnconfigureForGlares(Gfx *gdl); -Gfx *artifactsRenderGlaresForRoom(Gfx *gdl, s32 roomnum); +Gfx *artifacts_configure_for_glares(Gfx *gdl); +Gfx *artifacts_unconfigure_for_glares(Gfx *gdl); +Gfx *artifacts_render_glares_for_room(Gfx *gdl, s32 roomnum); #endif diff --git a/src/include/game/game_1531a0.h b/src/include/game/game_1531a0.h index 243b8eb51..866788f57 100644 --- a/src/include/game/game_1531a0.h +++ b/src/include/game/game_1531a0.h @@ -8,16 +8,16 @@ #define DIAGMODE_REDRAW 1 #define DIAGMODE_FADEOUT 2 -void textInit(void); -void textSetRotation90(bool rotated); -void textSetWrapIndent(s32 count); +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 textLoadFont(u8 *romstart, u8 *romend, struct font **fontptr, struct fontchar **charsptr, bool monospace); -void textReset(void); +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); -Gfx *textSetPrimColour(Gfx *gdl, u32 colour); +Gfx *text_set_prim_colour(Gfx *gdl, u32 colour); Gfx *text0f153838(Gfx *gdl); Gfx *text0f153858(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2); Gfx *text0f1538e4(Gfx *gdl, s32 *x1, s32 *y1, s32 *x2, s32 *y2); @@ -26,18 +26,18 @@ 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 textSetDiagonalBlend(s32 x, s32 y, f32 redrawtimer, u8 populated); -void textBackupDiagonalBlendSettings(void); -void textRestoreDiagonalBlendSettings(void); -void textSetHorizontalBlend(s32 x1, s32 x2, u32 arg2); -void textBackupAndResetBlends(void); -void textRestoreBlends(void); -void textSetWaveBlend(s32 arg0, s32 arg1, s32 cthresh); -void textSetMenuBlend(f32 arg0); -void textSetWaveColours(u32 colour1, u32 colour2); -void textResetBlends(void); -bool textHasDiagonalBlend(void); -u32 textApplyProjectionColour(s32 x, s32 y, u32 colour); +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); +void text_set_horizontal_blend(s32 x1, s32 x2, u32 arg2); +void text_backup_and_reset_blends(void); +void text_restore_blends(void); +void text_set_wave_blend(s32 arg0, s32 arg1, s32 cthresh); +void text_set_menu_blend(f32 arg0); +void text_set_wave_colours(u32 colour1, u32 colour2); +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); @@ -45,12 +45,12 @@ Gfx *text0f1552d4(Gfx *gdl, f32 x, f32 y, f32 widthscale, f32 heightscale, char 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 *textRenderProjected(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 *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 *textRender(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 textMeasure(s32 *textheight, s32 *textwidth, char *text, struct fontchar *font1, struct font *font2, s32 lineheight); -void textWrap(s32 width, char *in, char *out, struct fontchar *font1, struct font *font2); +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); Gfx *func0f1574d0jf(Gfx *gdl, s32 *x, s32 *y, char *text, struct fontchar *font1, struct font *font2, s32 colour, u32 colour2, s32 width, s32 height, s32 arg9, u32 arg10); diff --git a/src/include/game/gamefile.h b/src/include/game/gamefile.h index 62fa97830..196664663 100644 --- a/src/include/game/gamefile.h +++ b/src/include/game/gamefile.h @@ -4,14 +4,14 @@ #include "data.h" #include "types.h" -u32 gamefileHasFlag(u32 value); -void gamefileSetFlag(u32 value); -void gamefileUnsetFlag(u32 value); -void gamefilePrintFlags(void); -void gamefileApplyOptions(struct gamefile *file); -void gamefileLoadDefaults(struct gamefile *file); -s32 gamefileLoad(s32 device); -s32 gamefileSave(s32 device, s32 filenum, u16 deviceserial); -void gamefileGetOverview(char *arg0, char *name, u8 *stage, u8 *difficulty, u32 *time); +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); +s32 gamefile_save(s32 device, s32 filenum, u16 deviceserial); +void gamefile_get_overview(char *arg0, char *name, u8 *stage, u8 *difficulty, u32 *time); #endif diff --git a/src/include/game/getitle.h b/src/include/game/getitle.h index 32a694268..8399689d4 100644 --- a/src/include/game/getitle.h +++ b/src/include/game/getitle.h @@ -4,9 +4,9 @@ #include "data.h" #include "types.h" -void getitleReset(void); +void getitle_reset(void); -void getitleLoad(void *addr, u32 arg1); -Gfx *getitleRender(Gfx *gdl); +void getitle_load(void *addr, u32 arg1); +Gfx *getitle_render(Gfx *gdl); #endif diff --git a/src/include/game/gfxmemory.h b/src/include/game/gfxmemory.h index f8269caaa..98328ddeb 100644 --- a/src/include/game/gfxmemory.h +++ b/src/include/game/gfxmemory.h @@ -6,14 +6,14 @@ extern u8 *g_GfxBuffers[3]; -void gfxReset(void); -Gfx *gfxGetMasterDisplayList(void); -Vtx *gfxAllocateVertices(u32 count); -void *gfxAllocateMatrix(void); -LookAt *gfxAllocateLookAt(s32 count); -Col *gfxAllocateColours(s32 count); -void *gfxAllocate(u32 size); -void gfxSwapBuffers(void); -s32 gfxGetFreeGfx(Gfx *gdl); +void gfx_reset(void); +Gfx *gfx_get_master_display_list(void); +Vtx *gfx_allocate_vertices(u32 count); +void *gfx_allocate_matrix(void); +LookAt *gfx_allocate_look_at(s32 count); +Col *gfx_allocate_colours(s32 count); +void *gfx_allocate(u32 size); +void gfx_swap_buffers(void); +s32 gfx_get_free_gfx(Gfx *gdl); #endif diff --git a/src/include/game/gfxreplace.h b/src/include/game/gfxreplace.h index 892f1fff3..05f80f0fe 100644 --- a/src/include/game/gfxreplace.h +++ b/src/include/game/gfxreplace.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void gfxReplaceGbiCommands(Gfx *gdl, Gfx *endgdl, s32 type); -void gfxReplaceGbiCommandsRecursively(struct roomblock *arg0, s32 type); +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 2d97b9cdb..123b8ac0f 100644 --- a/src/include/game/gunfx.h +++ b/src/include/game/gunfx.h @@ -4,34 +4,34 @@ #include "data.h" #include "types.h" -void boltbeamsReset(void); -void lasersightsReset(void); +void boltbeams_reset(void); +void lasersights_reset(void); -void beamCreate(struct beam *beam, s32 weaponnum, struct coord *from, struct coord *to); -void beamCreateForHand(s32 handnum); -Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *arg1, f32 arg2, struct coord *arg3, u32 colour1, f32 arg5, struct coord *arg6, u32 colour2); -Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3); -void beamTick(struct beam *beam); +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 *casingCreate(struct modeldef *modeldef, Mtxf *mtx); -void casingCreateForHand(s32 handnum, f32 ground, Mtxf *mtx); -void casingRender(struct casing *casing, Gfx **gdlptr); -void casingsRender(Gfx **gdlptr); +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 boltbeamFindByProp(struct prop *prop); -s32 boltbeamCreate(struct prop *prop); -void boltbeamSetHeadPos(s32 beamnum, struct coord *pos); -void boltbeamSetTailPos(s32 beamnum, struct coord *pos); -void boltbeamIncrementHeadPos(s32 beamnum, f32 newlength, bool arg2); -void boltbeamSetAutomatic(s32 beamnum, f32 speed); -Gfx *boltbeamsRender(Gfx *gdl); -void boltbeamsTick(void); +s32 boltbeam_find_by_prop(struct prop *prop); +s32 boltbeam_create(struct prop *prop); +void boltbeam_set_head_pos(s32 beamnum, struct coord *pos); +void boltbeam_set_tail_pos(s32 beamnum, struct coord *pos); +void boltbeam_increment_head_pos(s32 beamnum, f32 newlength, bool arg2); +void boltbeam_set_automatic(s32 beamnum, f32 speed); +Gfx *boltbeams_render(Gfx *gdl); +void boltbeams_tick(void); -bool lasersightExists(s32 id, s32 *index); -Gfx *lasersightRenderDot(Gfx *gdl); -Gfx *lasersightRenderBeam(Gfx *gdl); -void lasersightSetBeam(s32 id, s32 arg1, struct coord *near, struct coord *far); -void lasersightSetDot(s32 arg0, struct coord *pos, struct coord *rot); -void lasersightFree(s32 arg0); +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); +void lasersight_set_dot(s32 arg0, struct coord *pos, struct coord *rot); +void lasersight_free(s32 arg0); #endif diff --git a/src/include/game/healthbar.h b/src/include/game/healthbar.h index e762c5911..7603a13e0 100644 --- a/src/include/game/healthbar.h +++ b/src/include/game/healthbar.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -Gfx *healthbarDraw(Gfx *gdl, struct chrdata *chr, s32 offy, f32 heightfrac); +Gfx *healthbar_draw(Gfx *gdl, struct chrdata *chr, s32 offy, f32 heightfrac); #endif diff --git a/src/include/game/hudmsg.h b/src/include/game/hudmsg.h index 7f857ab4e..8b7e09a62 100644 --- a/src/include/game/hudmsg.h +++ b/src/include/game/hudmsg.h @@ -4,31 +4,31 @@ #include "data.h" #include "types.h" -u8 hudmsgsAreActive(void); -s32 hudmsgIsZoomRangeVisible(void); -Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 alpha); -Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha); -Gfx *hudmsgRenderBox(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, f32 bgopacity, u32 bordercolour, f32 textopacity); +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 hudmsgsHideByChannel(s32 value); -void hudmsgsReset(void); -void hudmsgRemoveAll(void); -s32 hudmsgGetNext(s32 refid); -void hudmsgCreate(char *text, s32 type); -void hudmsgCreateWithFlags(char *text, s32 type, u32 flags); -void hudmsgCreateWithColour(char *text, s32 type, u8 colour); -void hudmsgCreateWithDuration(char *text, s32 type, struct hudmsgtype *config, s32 duration60); -void hudmsgCreateAsSubtitle(char *text, s32 type, u8 colourindex, s32 audiochannelnum); -void hudmsgCalculatePosition(struct hudmessage *msg); -void hudmsgCreateFromArgs(char *text, s32 type, s32 conf00, s32 conf01, s32 conf02, +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 hudmsgsTick(void); -void hudmsgsSetOn(u32 reason); -void hudmsgsSetOff(u32 reason); -void hudmsgsRemoveForDeadPlayer(s32 playernum); -Gfx *hudmsgsRender(Gfx *gdl); -void hudmsgsStop(void); +void hudmsgs_tick(void); +void hudmsgs_set_on(u32 reason); +void hudmsgs_set_off(u32 reason); +void hudmsgs_remove_for_dead_player(s32 playernum); +Gfx *hudmsgs_render(Gfx *gdl); +void hudmsgs_stop(void); #endif diff --git a/src/include/game/inv.h b/src/include/game/inv.h index 0022db45d..9ab2a5acb 100644 --- a/src/include/game/inv.h +++ b/src/include/game/inv.h @@ -8,52 +8,52 @@ extern struct noisesettings invnoisesettings_silent; extern struct invaimsettings invaimsettings_default; extern struct weapon *g_Weapons[WEAPON_SUICIDEPILL + 1]; -void invReset(void); -void invInit(s32 numdoubles); +void inv_reset(void); +void inv_init(s32 numdoubles); -void invClear(void); -void invSortItem(struct invitem *item); -void invInsertItem(struct invitem *item); -void invRemoveItem(struct invitem *item); -struct invitem *invFindUnusedSlot(void); -void invSetAllGuns(bool enable); -struct invitem *invFindSingleWeapon(s32 weaponnum); -bool invHasSingleWeaponExcAllGuns(s32 weaponnum); -struct invitem *invFindDoubleWeapon(s32 weapon1, s32 weapon2); -bool invHasDoubleWeaponExcAllGuns(s32 weapon1, s32 weapon2); -bool invHasSingleWeaponOrProp(s32 weaponnum); -s32 invAddOneIfCantHaveSlayer(s32 arg0); -s32 currentStageForbidsSlayer(void); -bool invCanHaveAllGunsWeapon(s32 weaponnum); -bool invHasSingleWeaponIncAllGuns(s32 weaponnum); -bool invHasDoubleWeaponIncAllGuns(s32 weapon1, s32 weapon2); -bool invGiveSingleWeapon(s32 weaponnum); -bool invGiveDoubleWeapon(s32 weapon1, s32 weapon2); -void invRemoveItemByNum(s32 weaponnum); -bool invGiveProp(struct prop *prop); -void invRemoveProp(struct prop *prop); -s32 invGiveWeaponsByProp(struct prop *prop); -void invChooseCycleForwardWeapon(s32 *weaponnum1, s32 *weaponnum2, bool arg2); -void invChooseCycleBackWeapon(s32 *weaponnum1, s32 *weaponnum2, bool arg2); -bool invHasKeyFlags(u32 wantkeyflags); -bool invHasBriefcase(void); -bool invHasDataUplink(void); -bool invHasProp(struct prop *prop); -s32 invGetCount(void); -struct invitem *invGetItemByIndex(s32 index); -struct textoverride *invGetTextOverrideForObj(struct defaultobj *obj); -struct textoverride *invGetTextOverrideForWeapon(s32 weaponnum); -s32 invGetWeaponNumByIndex(s32 index); -u16 invGetNameIdByIndex(s32 index); -char *invGetNameByIndex(s32 index); -char *invGetShortNameByIndex(s32 index); -void invInsertTextOverride(struct textoverride *override); -u32 invGetCurrentIndex(void); -void invSetCurrentIndex(u32 item); -void invCalculateCurrentIndex(void); -char *invGetPickupTextByObj(struct defaultobj *obj); -char *invGetPickupTextByWeaponNum(s32 weaponnum); -void invIncrementHeldTime(s32 param_1, s32 param_2); -void invGetWeaponOfChoice(s32 *weapon1, s32 *weapon2); +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); +bool inv_give_double_weapon(s32 weapon1, s32 weapon2); +void inv_remove_item_by_num(s32 weaponnum); +bool inv_give_prop(struct prop *prop); +void inv_remove_prop(struct prop *prop); +s32 inv_give_weapons_by_prop(struct prop *prop); +void inv_choose_cycle_forward_weapon(s32 *weaponnum1, s32 *weaponnum2, bool arg2); +void inv_choose_cycle_back_weapon(s32 *weaponnum1, s32 *weaponnum2, bool arg2); +bool inv_has_key_flags(u32 wantkeyflags); +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); +char *inv_get_short_name_by_index(s32 index); +void inv_insert_text_override(struct textoverride *override); +u32 inv_get_current_index(void); +void inv_set_current_index(u32 item); +void inv_calculate_current_index(void); +char *inv_get_pickup_text_by_obj(struct defaultobj *obj); +char *inv_get_pickup_text_by_weapon_num(s32 weaponnum); +void inv_increment_held_time(s32 param_1, s32 param_2); +void inv_get_weapon_of_choice(s32 *weapon1, s32 *weapon2); #endif diff --git a/src/include/game/lang.h b/src/include/game/lang.h index 6f1553e41..61e366e55 100644 --- a/src/include/game/lang.h +++ b/src/include/game/lang.h @@ -6,20 +6,20 @@ extern u8 *g_LangBuffer; -void langInit(void); -void langReset(s32 stagenum); -void langTick(void); +void lang_init(void); +void lang_reset(s32 stagenum); +void lang_tick(void); -u32 langGetLangBankIndexFromStagenum(s32 stagenum); -struct jpncharpixels *langGetJpnCharPixels(s32 codepoint); -s32 langGetFileNumOffset(void); -s32 langGetFileId(s32 bank); -void langLoad(s32 bank); -void langLoadToAddr(s32 bank, u8 *dst, s32 size); -void langClearBank(s32 bank); -char *langGet(s32 textid); -void langReload(void); -void langSetEuropean(u32 arg0); -void langSetJpnEnabled(bool enable); +u32 lang_get_lang_bank_index_from_stagenum(s32 stagenum); +struct jpncharpixels *lang_get_jpn_char_pixels(s32 codepoint); +s32 lang_get_file_num_offset(void); +s32 lang_get_file_id(s32 bank); +void lang_load(s32 bank); +void lang_load_to_addr(s32 bank, u8 *dst, s32 size); +void lang_clear_bank(s32 bank); +char *lang_get(s32 textid); +void lang_reload(void); +void lang_set_european(u32 arg0); +void lang_set_jpn_enabled(bool enable); #endif diff --git a/src/include/game/lv.h b/src/include/game/lv.h index bc14d4356..9e5fa1e99 100644 --- a/src/include/game/lv.h +++ b/src/include/game/lv.h @@ -4,38 +4,38 @@ #include "data.h" #include "types.h" -u32 getVar80084040(void); -void lvInit(void); -void lvResetMiscSfx(void); -s32 lvGetMiscSfxIndex(u32 arg0); -void lvSetMiscSfxState(u32 type, bool play); -void lvUpdateMiscSfx(void); -void lvReset(s32 stagenum); -Gfx *lvRenderFade(Gfx *gdl); -void lvFadeReset(void); -bool lvUpdateTrackedProp(struct trackedprop *trackedprop, s32 index); -void lvFindThreatsForProp(struct prop *prop, bool inchild, struct coord *playerpos, s32 *activeslots, f32 *param_5); +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 lvFindThreats(void); -Gfx *lvRender(Gfx *gdl); -void lvUpdateSoloHandicaps(void); +void lv_find_threats(void); +Gfx *lv_render(Gfx *gdl); +void lv_update_solo_handicaps(void); s32 sub54321(s32 value); -void lvUpdateCutsceneTime(void); -s32 lvGetSlowMotionType(void); -void lvTick(void); -void lvTickPlayer(void); -void lvCheckPauseStateChanged(void); -void lvSetPaused(bool paused); -void lvConfigureFade(u32 color, s16 num_frames); -bool lvIsFadeActive(void); -void lvStop(void); -bool lvIsPaused(void); -s32 lvGetDifficulty(void); -void lvSetDifficulty(s32 difficulty); -void lvSetMpTimeLimit60(u32 limit); -void lvSetMpScoreLimit(u32 limit); -void lvSetMpTeamScoreLimit(u32 limit); -f32 lvGetStageTimeInSeconds(void); -s32 lvGetStageTime60(void); +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); +void lv_stop(void); +bool lv_is_paused(void); +s32 lv_get_difficulty(void); +void lv_set_difficulty(s32 difficulty); +void lv_set_mp_time_limit60(u32 limit); +void lv_set_mp_score_limit(u32 limit); +void lv_set_mp_team_score_limit(u32 limit); +f32 lv_get_stage_time_in_seconds(void); +s32 lv_get_stage_time60(void); #endif diff --git a/src/include/game/mainmenu.h b/src/include/game/mainmenu.h index 349d7458c..e9327119e 100644 --- a/src/include/game/mainmenu.h +++ b/src/include/game/mainmenu.h @@ -11,79 +11,79 @@ extern struct menudialogdef g_PreAndPostMissionBriefingMenuDialog; extern struct menudialogdef g_RetryMissionMenuDialog; extern struct menudialogdef g_NextMissionMenuDialog; -char *menuTextCurrentStageName(struct menuitem *item); -char *soloMenuTextDifficulty(struct menuitem *item); -MenuItemHandlerResult menuhandlerControlStyleImpl(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpindex); -char *soloMenuTitleStageOverview(struct menudialogdef *dialogdef); +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 isStageDifficultyUnlocked(s32 stageindex, s32 difficulty); -char *soloMenuTextBestTime(struct menuitem *item); -s32 getMaxAiBuddies(void); -s32 getNumUnlockedSpecialStages(void); +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 *invMenuTextPrimaryFunction(struct menuitem *item); -char *invMenuTextSecondaryFunction(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 *invMenuTextWeaponName(struct menuitem *item); -char *invMenuTextWeaponManufacturer(struct menuitem *item); -char *invMenuTextWeaponDescription(struct menuitem *item); -bool soloChoosePauseDialog(void); -MenuDialogHandlerResult menudialogBriefing(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +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 menudialogCoopAntiOptions(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 inventoryMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialogAbortMission(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult soloMenuDialogPauseStatus(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 menuhandlerAcceptMission(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAcceptPdModeSettings(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerCoopDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAntiDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMissionList(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerControlStyle(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerFrInventoryList(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerInventoryList(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAbortMission(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerCinema(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAimControl(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAlternativeTitle(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAlwaysShowTarget(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAmmoOnScreen(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAntiPlayer(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAntiRadar(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerAutoAim(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerChangeAgent(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerCoopBuddy(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerCoopFriendlyFire(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerCoopRadar(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerCutsceneSubtitles(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerHeadRoll(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerHiRes(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerInGameSubtitles(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerLangFilter(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerLookAhead(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMusicVolume(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerPaintball(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerPdMode(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerPdModeSetting(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerReversePitch(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerScreenRatio(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_auto_aim(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 menuhandlerLanguage(s32 operation, struct menuitem *item, union handlerdata *data); +MenuItemHandlerResult menuhandler_language(s32 operation, struct menuitem *item, union handlerdata *data); #endif -MenuItemHandlerResult menuhandlerScreenSize(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerScreenSplit(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerSfxVolume(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerShowGunFunction(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerShowMissionTime(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerShowZoomRange(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerSightOnScreen(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerSoloDifficulty(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerSoundMode(s32 operation, struct menuitem *item, union handlerdata *data); +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 46fd44ad6..07f463c82 100644 --- a/src/include/game/menu.h +++ b/src/include/game/menu.h @@ -8,20 +8,20 @@ extern const struct menucolourpalette g_MenuColours[]; extern const struct menucolourpalette g_MenuWave1Colours[]; extern const struct menucolourpalette g_MenuWave2Colours[]; -void menuTick(void); +void menu_tick(void); -void menuStop(void); +void menu_stop(void); -void menuPlaySound(s32 menusound); -bool menuIsSoloMissionOrMp(void); -bool currentPlayerIsMenuOpenInSoloOrMp(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 menuSetBanner(s32 bannernum, bool allplayers); +void menu_set_banner(s32 bannernum, bool allplayers); #if VERSION >= VERSION_NTSC_1_0 -Gfx *menuRenderBanner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum, s32 arg7, s32 arg8); +Gfx *menu_render_banner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum, s32 arg7, s32 arg8); #else -Gfx *menuRenderBanner(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, bool big, s32 msgnum); +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); @@ -29,26 +29,26 @@ void func0f0f139c(struct menuitem *item, f32 arg1); void func0f0f13ec(struct menuitem *item); void func0f0f1418(void); void func0f0f1494(void); -char *menuResolveText(uintptr_t thing, void *dialogoritem); -char *menuResolveParam2Text(struct menuitem *item); -char *menuResolveDialogTitle(struct menudialogdef *dialogdef); -void menuGetItemBlocksRequired(struct menuitem *item, s32 *arg1); -void menuCalculateItemSize(struct menuitem *item, s16 *width, s16 *height, struct menudialog *dialog); +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 dialogCalculateContentSize(struct menudialogdef *dialogdef, struct menudialog *dialog, struct menu *menu); -s32 dialogFindItem(struct menudialog *dialog, struct menuitem *item, s32 *rowindex, s32 *colindex); -bool menuIsScrollableUnscrollable(struct menuitem *item); -bool menuIsItemDisabled(struct menuitem *item, struct menudialog *dialog); -bool menuIsItemFocusable(struct menuitem *item, struct menudialog *dialog, s32 arg2); -struct menuitem *dialogFindItemAtColY(s32 targety, s32 colindex, struct menudialogdef *dialogdef, s32 *rowindexptr, struct menudialog *dialog); -struct menuitem *dialogFindFirstItem(struct menudialog *dialog); -struct menuitem *dialogFindFirstItemRight(struct menudialog *dialog); -void dialogChangeItemFocusVertically(struct menudialog *dialog, s32 updown); -s32 dialogChangeItemFocusHorizontally(struct menudialog *dialog, s32 leftright); -s32 dialogChangeItemFocus(struct menudialog *dialog, s32 leftright, s32 updown); -void menuOpenDialog(struct menudialogdef *dialogdef, struct menudialog *arg1, struct menu *menu); -void menuPushDialog(struct menudialogdef *dialogdef); +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 bool func0f0f3220(s32 arg0); @@ -56,62 +56,62 @@ bool func0f0f3220(s32 arg0); void func0f0f3220(s32 arg0); #endif -void menuCloseDialog(void); -void menuUpdateCurFrame(void); -void menuPopDialog(void); +void menu_close_dialog(void); +void menu_update_cur_frame(void); +void menu_pop_dialog(void); void func0f0f3704(struct menudialogdef *dialogdef); -void menuConfigureModel(struct menumodel *menumodel, f32 x, f32 y, f32 z, f32 rotx, f32 roty, f32 rotz, f32 scale, u8 flags); -void menuUnsetModel(struct menumodel *menumodel); -Gfx *menuRenderModel(Gfx *gdl, struct menumodel *menumodel, s32 modeltype); -void menuGetTeamTitlebarColours(u32 *top, u32 *middle, u32 *bottom); -Gfx *menuApplyScissor(Gfx *gdl); -Gfx *dialogRender(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight); -void menuGetContPads(s8 *contpadnum1, s8 *contpadnum2); +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 menuFindAvailableSize(s32 *xmin, s32 *ymin, s32 *xmax, s32 *ymax, struct menudialog *dialog); +void menu_find_available_size(s32 *xmin, s32 *ymin, s32 *xmax, s32 *ymax, struct menudialog *dialog); #else -void menuFindAvailableSize(s32 *xmin, s32 *ymin, s32 *xmax, s32 *ymax); +void menu_find_available_size(s32 *xmin, s32 *ymin, s32 *xmax, s32 *ymax); #endif -void dialogCalculatePosition(struct menudialog *dialog); -void menuClose(void); +void dialog_calculate_position(struct menudialog *dialog); +void menu_close(void); void func0f0f8120(void); void func0f0f820c(struct menudialogdef *dialogdef, s32 root); -void menuSetBackground(s32 bg); +void menu_set_background(s32 bg); void func0f0f8300(void); -void menuPushRootDialog(struct menudialogdef *dialogdef, s32 arg1); +void menu_push_root_dialog(struct menudialogdef *dialogdef, s32 arg1); void func0f0f85e0(struct menudialogdef *dialogdef, s32 root); -Gfx *menuRenderDialog(Gfx *gdl, struct menudialog *dialog, struct menu *menu, bool lightweight); -Gfx *menuRenderDialogs(Gfx *gdl); -void menuResetModel(struct menumodel *menumodel, u32 allocationlen, bool allocate); -void menuReset(void); -void menuSwipe(s32 direction); -void dialogTick(struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags); -void dialogInitItems(struct menudialog *dialog); +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 menuProcessInput(void); -Gfx *menuRenderBackgroundLayer1(Gfx *gdl, u8 bg, f32 frac); -Gfx *menuRenderBackgroundLayer2(Gfx *gdl, u8 bg, f32 frac); -Gfx *menuRender(Gfx *gdl); -u32 menuChooseMusic(void); -u32 menuGetRoot(void); -void menuPushPakDialogForPlayer(struct menudialogdef *dialogdef, s32 playernum, s32 arg2); -char *menuTextSaveDeviceName(struct menuitem *item); -s32 menuPakNumToPlayerNum(s32 paknum); -bool menuIsReadyForPakError(s32 device, s32 arg1); -void menuPushPakErrorDialog(s32 arg0, s32 arg1); +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); void func0f0fd548(s32 arg0); -struct menudialog *menuIsDialogOpen(struct menudialogdef *dialogdef); -struct chrdata *currentPlayerGetCommandingAibot(void); +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 amPickTargetMenuList(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerRepairPak(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerRetrySavePak(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerWarnRepairPak(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 6ad443df2..32500c106 100644 --- a/src/include/game/menugfx.h +++ b/src/include/game/menugfx.h @@ -4,36 +4,36 @@ #include "data.h" #include "types.h" -void menugfxCreateBlur(void); -Gfx *menugfxRenderBgBlur(Gfx *gdl, u32 colour, s16 arg2, s16 arg3); -Gfx *menugfxRenderDialogBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct menudialog *dialog, u32 colour1, u32 colour2, f32 arg8); -Gfx *menugfxRenderBgGreenHaze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); -Gfx *menugfxDrawDropdownBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2); +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 -Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3, u8 alpha); +Gfx *menugfx_draw_list_group_header(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3, u8 alpha); #else -Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3); +Gfx *menugfx_draw_list_group_header(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3); #endif -Gfx *menugfxRenderGradient(Gfx *gdl, s32 x, s32 y, s32 width, s32 height, u32 colour1, u32 colour2, u32 colour3); -Gfx *menugfxRenderSlider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, u32 colour); +Gfx *menugfx_render_gradient(Gfx *gdl, s32 x, s32 y, s32 width, s32 height, u32 colour1, u32 colour2, u32 colour3); +Gfx *menugfx_render_slider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, u32 colour); Gfx *menugfx0f0e2348(Gfx *gdl); Gfx *menugfx0f0e2498(Gfx *gdl); -Gfx *menugfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7); -Gfx *menugfxDrawLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); -Gfx *menugfxDrawProjectedLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); -Gfx *menugfxDrawShimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bool arg6, s32 arg7, bool lefttoright); -Gfx *menugfxDrawDialogBorderLine(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); -Gfx *menugfxDrawFilledRect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); -Gfx *menugfxDrawCarouselChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u32 colour1, u32 colour2); -Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 arg2, s32 arg3, u32 colour1, u32 colour2, f32 arg7); -Gfx *menugfxDrawCheckbox(Gfx *gdl, s32 x, s32 y, s32 size, bool fill, u32 bordercolour, u32 fillcolour); -Gfx *menugfxRenderBgFailure(Gfx *gdl); -Gfx *menugfxRenderBgCone(Gfx *gdl); -Gfx *menugfxRenderBgFailureCopy(Gfx *gdl); -void menugfxFreeParticles(void); -u32 menugfxGetParticleArraySize(void); -Gfx *menugfxRenderBgSuccess(Gfx *gdl); +Gfx *menugfx_draw_tri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, bool arg7); +Gfx *menugfx_draw_line(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); +Gfx *menugfx_draw_projected_line(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); +Gfx *menugfx_draw_shimmer(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour, bool arg6, s32 arg7, bool lefttoright); +Gfx *menugfx_draw_dialog_border_line(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); +Gfx *menugfx_draw_filled_rect(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2); +Gfx *menugfx_draw_carousel_chevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u32 colour1, u32 colour2); +Gfx *menugfx_draw_dialog_chevron(Gfx *gdl, s32 x, s32 y, s32 arg2, s32 arg3, u32 colour1, u32 colour2, f32 arg7); +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); #endif diff --git a/src/include/game/menuitem.h b/src/include/game/menuitem.h index 27747bf71..7f7b1935f 100644 --- a/src/include/game/menuitem.h +++ b/src/include/game/menuitem.h @@ -5,78 +5,78 @@ #include "types.h" s32 menuitem0f0e5d2c(s32 arg0, struct menuitem *item); -s16 menuitemListGetOffsetY(s16 optionindex, struct menuitem *item); -Gfx *menuitemListRenderHeader(Gfx *gdl, s16 x1, s16 y1, s16 width, s16 arg4, s16 height, char *text, struct menudialog *dialog); -Gfx *menuitemListOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2); -Gfx *menuitemListRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemListTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); +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 menuitemDropdownInit(struct menuitem *item, union menuitemdata *data); -Gfx *menuitemDropdownRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemDropdownTick(struct menuitem *item, struct menudialog *dialog, 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 *menuitemDropdownOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data); -bool menuitemKeyboardIsStringEmptyOrSpaces(char *text); -Gfx *menuitemKeyboardRender(Gfx *gdl, struct menurendercontext *thing); -bool menuitemKeyboardTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitemKeyboardInit(struct menuitem *item, 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 *menuitemSeparatorRender(Gfx *gdl, struct menurendercontext *context); +Gfx *menuitem_separator_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitemObjectivesRenderOne(Gfx *gdl, struct menudialog *dialog, s32 index, s32 position, s16 objx, s16 objy, s16 width, s16 height, bool withstatus, bool narrow); -Gfx *menuitemObjectivesRender(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 *menuitemModelRender(Gfx *gdl, struct menurendercontext *context); +Gfx *menuitem_model_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitemLabelRender(Gfx *gdl, struct menurendercontext *context); +Gfx *menuitem_label_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitemMeterRender(Gfx *gdl, struct menurendercontext *context); +Gfx *menuitem_meter_render(Gfx *gdl, struct menurendercontext *context); -Gfx *menuitemSelectableRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemSelectableTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags); +Gfx *menuitem_selectable_render(Gfx *gdl, struct menurendercontext *context); +bool menuitem_selectable_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags); -Gfx *menuitemSliderRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemSliderTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitemSliderInit(union menuitemdata *data); +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 *menuitemCarouselRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemCarouselTick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags); +Gfx *menuitem_carousel_render(Gfx *gdl, struct menurendercontext *context); +bool menuitem_carousel_tick(struct menuitem *item, struct menuinputs *inputs, u32 tickflags); -Gfx *menuitemCheckboxRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemCheckboxTick(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 *menuitemScrollableGetText(u32 type); -Gfx *menuitemScrollableRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemScrollableTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitemScrollableInit(union menuitemdata *data); +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 *menuitemMarqueeRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemMarqueeTick(struct menuitem *item, union menuitemdata *data); -void menuitemMarqueeInit(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 *menuitem07Render(Gfx *gdl); +Gfx *menuitem07_render(Gfx *gdl); -Gfx *menuitemRankingRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemRankingTick(struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitemRankingInit(union menuitemdata *data); +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 *menuitemPlayerStatsRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemPlayerStatsTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -Gfx *menuitemPlayerStatsOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data); -void menuitemPlayerStatsInit(struct menuitem *item, 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 *menuitemControllerRenderLine(Gfx *gdl, s32 speed, s32 x1, s32 y1, s32 x2, s32 y2); -Gfx *menuitemControllerRenderTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32 alpha); -Gfx *menuitemControllerRenderLines(Gfx *gdl, struct menurendercontext *context, s32 firstindex, s32 lastindex, s32 padx, s32 pady, u32 alpha); -u16 menuitemControllerGetButtonAction(s32 mode, s32 buttonnum); -Gfx *menuitemControllerRenderText(Gfx *gdl, s32 curmode, struct menurendercontext *context, s32 padx, s32 pady, u32 valuecolour, u32 labelcolour, s8 prevmode); -Gfx *menuitemControllerRenderPad(Gfx *gdl, struct menurendercontext *context, s32 padx, s32 pady, s32 curmode, u32 alpha, u32 colour1, u32 colour2, s8 prevmode); -Gfx *menuitemControllerRender(Gfx *gdl, struct menurendercontext *context); -void menuitemControllerInit(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 *menuitemRender(Gfx *gdl, struct menurendercontext *context); -bool menuitemTick(struct menuitem *item, struct menudialog *dialog, struct menuinputs *inputs, u32 tickflags, union menuitemdata *data); -void menuitemInit(struct menuitem *item, union menuitemdata *data); -Gfx *menuitemOverlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, 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); +void menuitem_init(struct menuitem *item, union menuitemdata *data); +Gfx *menuitem_overlay(Gfx *gdl, s16 x, s16 y, s16 x2, s16 y2, struct menuitem *item, struct menudialog *dialog, union menuitemdata *data); #endif diff --git a/src/include/game/modeldef.h b/src/include/game/modeldef.h index 4cf142756..88df60191 100644 --- a/src/include/game/modeldef.h +++ b/src/include/game/modeldef.h @@ -5,8 +5,8 @@ #include "types.h" void modeldef0f1a7560(struct modeldef *modeldef, u16 filenum, u32 arg2, struct modeldef *modeldef2, struct texpool *texpool, bool arg5); -void modelPromoteTypeToPointer(struct modeldef *modeldef); -struct modeldef *modeldefLoad(u16 fileid, u8 *arg1, s32 arg2, struct texpool *arg3); -struct modeldef *modeldefLoadToNew(u16 fileid); +void model_promote_type_to_pointer(struct modeldef *modeldef); +struct modeldef *modeldef_load(u16 fileid, u8 *arg1, s32 arg2, struct texpool *arg3); +struct modeldef *modeldef_load_to_new(u16 fileid); #endif diff --git a/src/include/game/modelmgr.h b/src/include/game/modelmgr.h index 136f64720..722e68168 100644 --- a/src/include/game/modelmgr.h +++ b/src/include/game/modelmgr.h @@ -4,14 +4,14 @@ #include "data.h" #include "types.h" -bool modelmgrCanSlotFitRwdata(struct model *modelslot, struct modeldef *modeldef); -void modelmgrPrintCounts(void); -struct model *modelmgrInstantiateModel(struct modeldef *modeldef, bool arg1); -struct model *modelmgrInstantiateModelWithoutAnim(struct modeldef *modeldef); -void modelmgrFreeModel(struct model *model); -struct model *modelmgrInstantiateModelWithAnim(struct modeldef *modeldef); -void modelmgrAttachHead(struct model *model, struct modelnode *node, struct modeldef *headmodeldef); -struct anim *modelmgrInstantiateAnim(void); -void modelmgrFreeAnim(struct anim *anim); +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); +void modelmgr_attach_head(struct model *model, struct modelnode *node, struct modeldef *headmodeldef); +struct anim *modelmgr_instantiate_anim(void); +void modelmgr_free_anim(struct anim *anim); #endif diff --git a/src/include/game/mplayer/ingame.h b/src/include/game/mplayer/ingame.h index 5aea7031e..ad91e12d3 100644 --- a/src/include/game/mplayer/ingame.h +++ b/src/include/game/mplayer/ingame.h @@ -4,26 +4,26 @@ #include "data.h" #include "types.h" -MenuItemHandlerResult mpStatsForPlayerDropdownHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextInGameLimit(struct menuitem *item); -char *menutextPauseOrUnpause(s32 arg0); -char *menutextMatchTime(s32 arg0); -char *mpMenuTextWeaponDescription(struct menuitem *item); -char *mpMenuTitleStatsFor(struct menudialogdef *dialogdef); -char *mpMenuTextWeaponOfChoiceName(struct menuitem *item); -char *mpMenuTextAward1(struct menuitem *item); -char *mpMenuTextAward2(struct menuitem *item); -char *mpMenuTextPlacementWithSuffix(struct menuitem *item); -MenuItemHandlerResult mpPlacementMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult mpAwardsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult mpPlayerTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextPlayerTitle(s32 arg0); -MenuItemHandlerResult mpConfirmPlayerNameHandler(s32 operation, struct menuitem *item, union handlerdata *data); -void mpPushPauseDialog(void); -void mpPushEndscreenDialog(u32 arg0, u32 playernum); -MenuItemHandlerResult menuhandlerMpEndGame(s32 operation, struct menuitem *item, union handlerdata *data); +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 menuhandlerMpInGameLimitLabel(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpPause(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 bb4b17e56..8764994ac 100644 --- a/src/include/game/mplayer/mplayer.h +++ b/src/include/game/mplayer/mplayer.h @@ -4,119 +4,119 @@ #include "data.h" #include "types.h" -f32 mpHandicapToDamageScale(u8 value); +f32 mp_handicap_to_damage_scale(u8 value); void func0f187838(struct mpchrconfig *mpchr); -void mpStartMatch(void); -void mpReset(void); -void mpCalculateTeamIsOnlyAi(void); +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 mpPlayerSetDefaults(s32 playernum, bool autonames); +void mp_player_set_defaults(s32 playernum, bool autonames); void func0f1881d4(s32 index); -void mpInit(void); -void mpGetTeamsWithDefaultName(u8 *mask); -void mpSetTeamNamesToDefault(u8 mask); -void mpSetDefaultNamesIfEmpty(void); -s32 mpCalculateTeamScoreLimit(void); -void mpApplyLimits(void); -s32 mpGetPlayerRankings(struct ranking *rankings); -s32 mpCalculateTeamScore(s32 arg0, s32 *arg1); -s32 mpGetTeamRankings(struct ranking *rankings); +void mp_init(void); +void mp_get_teams_with_default_name(u8 *mask); +void mp_set_team_names_to_default(u8 mask); +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 mpGetNumWeaponOptions(void); -char *mpGetWeaponLabel(s32 weaponnum); -void mpSetWeaponSlot(s32 slot, s32 mpweaponnum); -s32 mpGetWeaponSlot(s32 slot); -struct mpweapon *mpGetMpWeaponByLocation(s32 locationindex); -s32 mpCountWeaponSetThing(s32 weaponsetindex); +s32 mp_get_num_weapon_options(void); +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 *mpGetWeaponSetName(s32 arg0); +char *mp_get_weapon_set_name(s32 arg0); void func0f18913c(void); -void mpApplyWeaponSet(void); -void mpSetWeaponSet(s32 weaponsetnum); +void mp_apply_weapon_set(void); +void mp_set_weapon_set(s32 weaponsetnum); void func0f1895e8(void); -s32 mpGetWeaponSet(void); -bool mpIsPaused(void); -void mpSetPaused(u8 mode); -Gfx *mpRenderModalText(Gfx *gdl); -s32 mpFindMaxInt(s32 playercount, s32 val0, s32 val1, s32 val2, s32 val3); -s32 mpFindMinInt(s32 playercount, s32 val0, s32 val1, s32 val2, s32 val3); -s32 mpFindMaxFloat(s32 playercount, f32 val0, f32 val1, f32 val2, f32 val3); -s32 mpFindMinFloat(s32 playercount, f32 val0, f32 val1, f32 val2, f32 val3); -void mpCalculatePlayerTitle(struct mpplayerconfig *mpplayer); -void mpCalculateAwards(void); -void mpEndMatch(void); -s32 mpGetNumHeads2(void); -s32 mpGetNumHeads(void); -s32 mpGetHeadId(u8 headnum); -s32 mpGetHeadRequiredFeature(u8 headnum); -s32 mpGetBeauHeadId(u8 headnum); -u32 mpGetNumBodies(void); -s32 mpGetBodyId(u8 bodynum); -s32 mpGetMpbodynumByBodynum(u16 bodynum); -char *mpGetBodyName(u8 mpbodynum); -u8 mpGetBodyRequiredFeature(u8 bodynum); -s32 mpGetMpheadnumByMpbodynum(s32 bodynum); -s32 mpChooseRandomLockPlayer(void); -bool mpSetLock(s32 locktype, s32 playernum); -s32 mpGetLockType(void); -u32 mpGetLockPlayerNum(void); -bool mpIsPlayerLockedOut(s32 playernum); -void mpCalculateLockIfLastWinnerOrLoser(void); -bool mpIsTrackUnlocked(s32 tracknum); -s32 mpGetTrackSlotIndex(s32 tracknum); -s32 mpGetTrackNumAtSlotIndex(s32 slotindex); -s32 mpGetNumUnlockedTracks(void); -s32 mpGetTrackMusicNum(s32 slotindex); -char *mpGetTrackName(s32 slotindex); -void mpSetUsingMultipleTunes(bool enable); -bool mpGetUsingMultipleTunes(void); -bool mpIsMultiTrackSlotEnabled(s32 slot); -void mpSetMultiTrackSlotEnabled(s32 slot, bool enable); -void mpSetTrackSlotEnabled(s32 slot); -void mpEnableAllMultiTracks(void); -void mpDisableAllMultiTracks(void); -void mpRandomiseMultiTracks(void); -void mpSetTrackToRandom(void); -s32 mpGetCurrentTrackSlotNum(void); -s32 mpChooseTrack(void); -struct mpchrconfig *mpGetChrConfigBySlotNum(s32 slot); -s32 mpGetChrIndexBySlotNum(s32 slot); -s32 mpGetNumChrs(void); -u8 mpFindUnusedTeamNum(void); -void mpCreateBotFromProfile(s32 botnum, u8 difficulty); -void mpSetBotDifficulty(s32 botnum, s32 difficulty); -s32 mpGetSlotForNewBot(void); -void mpRemoveSimulant(s32 index); -bool mpHasSimulants(void); -bool mpHasUnusedBotSlots(void); -bool mpIsSimSlotEnabled(s32 slot); -s32 mpFindBotProfile(s32 type, s32 difficulty); -void mpGenerateBotNames(void); -s32 mpPlayerGetIndex(struct chrdata *chr); -struct chrdata *mpGetChrFromPlayerIndex(s32 index); +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); +s32 mp_get_head_id(u8 headnum); +s32 mp_get_head_required_feature(u8 headnum); +s32 mp_get_beau_head_id(u8 headnum); +u32 mp_get_num_bodies(void); +s32 mp_get_body_id(u8 bodynum); +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); +void mp_randomise_multi_tracks(void); +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); +void mp_remove_simulant(s32 index); +bool mp_has_simulants(void); +bool mp_has_unused_bot_slots(void); +bool mp_is_sim_slot_enabled(s32 slot); +s32 mp_find_bot_profile(s32 type, s32 difficulty); +void mp_generate_bot_names(void); +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 mpplayerfileLoadGunFuncs(struct savebuffer *buffer, s32 playernum); -void mpplayerfileSaveGunFuncs(struct savebuffer *buffer, s32 playernum); -void mpplayerfileLoadWad(s32 playernum, struct savebuffer *buffer, s32 arg2); -void mpplayerfileSaveWad(s32 playernum, struct savebuffer *buffer); -void mpplayerfileGetOverview(char *arg0, char *name, u32 *playtime); -s32 mpplayerfileSave(s32 playernum, s32 device, s32 fileid, u16 deviceserial); -s32 mpplayerfileLoad(s32 playernum, s32 device, s32 arg2, u16 deviceserial); -s32 mpGetNumPresets(void); -bool mpIsPresetUnlocked(s32 presetnum); -s32 mpGetNumUnlockedPresets(void); -char *mpGetPresetNameBySlot(s32 slot); -void mpApplyConfig(struct mpconfigfull *mpconfig); +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 mpsetupfileLoadWad(struct savebuffer *buffer); -void mpsetupfileSaveWad(struct savebuffer *buffer); -void mpsetupfileGetOverview(char *arg0, char *filename, u16 *numsims, u16 *stagenum, u16 *scenarionum); -s32 mpsetupfileSave(s32 device, s32 filenum, u16 deviceserial); -s32 mpsetupfileLoad(s32 device, s32 filenum, u16 deviceserial); +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); void func0f18e558(void); struct modeldef *func0f18e57c(s32 index, s32 *headnum); diff --git a/src/include/game/mplayer/scenarios.h b/src/include/game/mplayer/scenarios.h index a04f0d021..91ec72108 100644 --- a/src/include/game/mplayer/scenarios.h +++ b/src/include/game/mplayer/scenarios.h @@ -16,18 +16,18 @@ struct mpscenariooverview { extern struct mpscenariooverview g_MpScenarioOverviews[6]; -MenuItemHandlerResult menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data); -void scenarioReadSave(struct savebuffer *buffer); -void scenarioWriteSave(struct savebuffer *buffer); -void scenarioInit(void); -s32 scenarioNumProps(void); -void scenarioInitProps(void); -void scenarioTick(void); -void scenarioTickChr(struct chrdata *chr); -Gfx *scenarioRadarExtra(Gfx *gdl); -bool scenarioRadarChr(Gfx **gdl, struct prop *prop); -f32 scenarioChooseSpawnLocation(f32 chrradius, struct coord *pos, RoomNum *rooms, struct prop *prop); -s32 scenarioGetMaxTeams(void); -void scenarioHighlightRoom(RoomNum room, s32 *arg1, s32 *arg2, s32 *arg3); +MenuItemHandlerResult menuhandler_mp_open_options(s32 operation, struct menuitem *item, union handlerdata *data); +void scenario_read_save(struct savebuffer *buffer); +void scenario_write_save(struct savebuffer *buffer); +void scenario_init(void); +s32 scenario_num_props(void); +void scenario_init_props(void); +void scenario_tick(void); +void scenario_tick_chr(struct chrdata *chr); +Gfx *scenario_radar_extra(Gfx *gdl); +bool scenario_radar_chr(Gfx **gdl, struct prop *prop); +f32 scenario_choose_spawn_location(f32 chrradius, struct coord *pos, RoomNum *rooms, struct prop *prop); +s32 scenario_get_max_teams(void); +void scenario_highlight_room(RoomNum room, s32 *arg1, s32 *arg2, s32 *arg3); #endif diff --git a/src/include/game/mplayer/setup.h b/src/include/game/mplayer/setup.h index ebb915747..d41e5445c 100644 --- a/src/include/game/mplayer/setup.h +++ b/src/include/game/mplayer/setup.h @@ -4,178 +4,178 @@ #include "data.h" #include "types.h" -char *mpGetCurrentPlayerName(struct menuitem *item); -s16 mpChooseRandomStage(void); -MenuItemHandlerResult mpArenaMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextWeaponNameForSlot(struct menuitem *item); -char *mpMenuTextSetupName(struct menuitem *item); -MenuItemHandlerResult mpCharacterBodyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpbodynum, s32 mpheadnum, bool isplayer); +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 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextKills(struct menuitem *item); -char *mpMenuTextDeaths(struct menuitem *item); -char *mpMenuTextGamesPlayed(struct menuitem *item); -char *mpMenuTextGamesWon(struct menuitem *item); -char *mpMenuTextGamesLost(struct menuitem *item); -char *mpMenuTextHeadShots(struct menuitem *item); -char *mpMenuTextMedalAccuracy(struct menuitem *item); -char *mpMenuTextMedalHeadShot(struct menuitem *item); -char *mpMenuTextMedalKillMaster(struct menuitem *item); -char *mpMenuTextMedalSurvivor(struct menuitem *item); -char *mpMenuTextAmmoUsed(struct menuitem *item); -char *mpMenuTextDistance(struct menuitem *item); -char *mpMenuTextTime(struct menuitem *item); -char *mpMenuTextAccuracy(struct menuitem *item); -void mpFormatDamageValue(char *dst, f32 damage); -char *mpMenuTextPainReceived(struct menuitem *item); -char *mpMenuTextDamageDealt(struct menuitem *item); -MenuItemHandlerResult mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTitleStatsForPlayerName(struct menudialogdef *dialogdef); -char *mpMenuTextUsernamePassword(struct menuitem *item); -MenuItemHandlerResult mpCharacterHeadMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data, s32 mpheadnum, bool arg4); -char *mpMenuTextBodyName(struct menuitem *item); +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 mpPlayerNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult mpLoadSettingsMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextMpconfigMarquee(struct menuitem *item); -MenuItemHandlerResult mpLoadPlayerMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpHandicapPlayer(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextHandicapPlayerName(struct menuitem *item); -MenuItemHandlerResult mpAddChangeSimulantMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextSimulantDescription(struct menuitem *item); +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 mpBotDifficultyMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTitleEditSimulant(struct menudialogdef *dialogdef); -char *mpMenuTextSimulantName(struct menuitem *item); -MenuItemHandlerResult menuhandlerMpNTeams(s32 operation, struct menuitem *item, union handlerdata *data, s32 numteams); -char *mpMenuTextChrNameForTeamSetup(struct menuitem *item); +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 *mpMenuTextSelectTuneOrTunes(struct menuitem *item); -MenuItemHandlerResult mpSelectTuneListHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextCurrentTrack(struct menuitem *item); -MenuItemHandlerResult mpTeamNameMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextTeamName(struct menuitem *item); +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 mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -char *mpMenuTextChallengeName(struct menuitem *item); -MenuDialogHandlerResult mpCombatChallengesMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -char *mpMenuTextSavePlayerOrCopy(struct menuitem *item); -char *mpMenuTextArenaName(struct menuitem *item); -char *mpMenuTextWeaponSetName(struct menuitem *item); -void mpConfigureQuickTeamPlayers(void); -void mpConfigureQuickTeamSimulants(void); +MenuItemHandlerResult mp_challenges_list_menu_handler(s32 operation, struct menuitem *item, union handlerdata *data); +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 menuhandlerPlayerTeam(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpNumberOfSimulants(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpSimulantsPerTeam(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, union handlerdata *data); -void mpCloseDialogsForNewSetup(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 menuhandlerMpSlowMotion(s32 operation, struct menuitem *item, union handlerdata *data); -void htbAddPad(s16 padnum); -void htbRemoveAmmoCrateAtPad(s16 padnum); -void htbReset(void); -void htbCreateToken(void); -Gfx *htbRenderHud(Gfx *gdl); -void ctcInitProps(void); -bool ctcHighlightProp(struct prop *prop, s32 *colour); -void ctcAddPad(s32 *cmd); -void ctcHighlightRoom(RoomNum roomnum, s32 *arg1, s32 *arg2, s32 *arg3); -void kohTick(void); -Gfx *kohRenderHud(Gfx *gdl); -void kohAddHill(s32 *cmd); -void kohHighlightRoom(RoomNum roomnum, s32 *arg1, s32 *arg2, s32 *arg3); -void htmAddPad(s16 padnum); -void htmReset(void); -void htbCreateUplink(void); -void htmInitProps(void); -void htmTickChr(struct chrdata *chr); -Gfx *htmRenderHud(Gfx *gdl); -Gfx *htmRadarExtra(Gfx *gdl); -void pacReset(void); -bool pacHighlightProp(struct prop *prop, s32 *colour); -void pacApplyNextVictim(void); -void pacHandleDeath(s32 cplayernum, s32 vplayernum); -void pacTick(void); -Gfx *pacRenderHud(Gfx *gdl); -bool pacRadarChr(Gfx **gdl, struct prop *prop); -MenuDialogHandlerResult mpOptionsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -char *mpMenuTextScenarioShortName(struct menuitem *item); -char *mpMenuTextScenarioName(struct menuitem *item); -MenuItemHandlerResult scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -void scenarioCreateMatchStartHudmsgs(void); -Gfx *scenarioRenderHud(Gfx *gdl); -void scenarioCalculatePlayerScore(struct mpchrconfig *mpchr, s32 chrnum, s32 *arg2, s32 *arg3); -bool scenarioHighlightProp(struct prop *prop, s32 *colour); -void scenarioReset(void); -struct prop *scenarioCreateObj(s32 modelnum, s16 padnum, f32 arg2, u32 flags, u32 flags2, u32 flags3); -void scenarioCreateHudmsg(s32 playernum, char *message); -bool scenarioChrsAreSameTeam(s32 playernum1, s32 playernum2); -s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop); -void scenarioHandleDroppedToken(struct chrdata *chr, struct prop *prop); -s32 scenarioPickUpUplink(struct chrdata *chr, struct prop *prop); -void scenarioHandleActivatedProp(struct chrdata *chr, struct prop *prop); -MenuItemHandlerResult menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data); -s32 mpGetNumStages(void); -MenuItemHandlerResult menuhandlerMpControlStyle(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpWeaponSlot(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpWeaponSetDropdown(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpControlCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpAimControl(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpCheckboxOption(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpTeamsEnabled(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpDisplayOptionCheckbox(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpConfirmSaveChr(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpSetupName(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpSaveSetupOverwrite(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpSaveSetupCopy(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpCharacterBody(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpUsernamePassword(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpCharacterHead(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpTimeLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpTeamScoreLimitSlider(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpRestoreScoreDefaults(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpRestoreHandicapDefaults(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialogMpReady(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialogMpSimulant(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpSimulantHead(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpSimulantBody(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpDeleteSimulant(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpChangeSimulantType(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpClearAllSimulants(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpAddSimulant(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpSimulantSlot(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialogMpSimulants(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpTwoTeams(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpThreeTeams(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpFourTeams(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpMaximumTeams(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpHumansVsSimulants(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpHumanSimulantPairs(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpTeamSlot(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialogMpSelectTune(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpMultipleTunes(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpTeamNameSlot(s32 operation, struct menuitem *item, union handlerdata *data); +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); +void ctc_add_pad(s32 *cmd); +void ctc_highlight_room(RoomNum roomnum, s32 *arg1, s32 *arg2, s32 *arg3); +void koh_tick(void); +Gfx *koh_render_hud(Gfx *gdl); +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); +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); +void scenario_reset(void); +struct prop *scenario_create_obj(s32 modelnum, s16 padnum, f32 arg2, u32 flags, u32 flags2, u32 flags3); +void scenario_create_hudmsg(s32 playernum, char *message); +bool scenario_chrs_are_same_team(s32 playernum1, s32 playernum2); +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 menuhandlerMpAbortChallenge(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpStartChallenge(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 menuhandlerMpLock(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpSavePlayer(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 menuhandlerMpSaveSettings(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialogMpGameSetup(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialogMpQuickGo(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpFinishedSetup(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerQuickTeamSeparator(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpQuickTeamOption(s32 operation, struct menuitem *item, union handlerdata *data); -MenuDialogHandlerResult menudialogCombatSimulator(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpAdvancedSetup(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpDisplayTeam(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerMpOneHitKills(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); #endif diff --git a/src/include/game/mpstats.h b/src/include/game/mpstats.h index c736bfdb5..713c557df 100644 --- a/src/include/game/mpstats.h +++ b/src/include/game/mpstats.h @@ -4,19 +4,19 @@ #include "data.h" #include "types.h" -void mpstatsIncrementPlayerShotCount(struct gset *gset, s32 region); -void mpstatsIncrementPlayerShotCount2(struct gset *gset, s32 region); +void mpstats_increment_player_shot_count(struct gset *gset, s32 region); +void mpstats_increment_player_shot_count2(struct gset *gset, s32 region); void mpstats0f0b0520(void); -s32 mpstatsGetPlayerShotCountByRegion(u32 type); -void mpstatsIncrementTotalKillCount(void); -void mpstatsIncrementTotalKnockoutCount(void); -void mpstatsDecrementTotalKnockoutCount(void); -u8 mpstatsGetTotalKnockoutCount(void); -u32 mpstatsGetTotalKillCount(void); -void mpstatsRecordPlayerKill(void); -s32 mpstatsGetPlayerKillCount(void); -void mpstatsRecordPlayerDeath(void); -void mpstatsRecordPlayerSuicide(void); -void mpstatsRecordDeath(s32 aplayernum, s32 vplayernum); +s32 mpstats_get_player_shot_count_by_region(u32 type); +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/mtxf2lbulk.h b/src/include/game/mtxf2lbulk.h index 296261a2b..8ed61df8e 100644 --- a/src/include/game/mtxf2lbulk.h +++ b/src/include/game/mtxf2lbulk.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -void mtxF2LBulk(Mtxf *matrices, s32 count); +void mtx_f2l_bulk(Mtxf *matrices, s32 count); #endif diff --git a/src/include/game/music.h b/src/include/game/music.h index f1b0e1dfc..0bb42a178 100644 --- a/src/include/game/music.h +++ b/src/include/game/music.h @@ -4,42 +4,42 @@ #include "data.h" #include "types.h" -u16 musicGetVolume(void); -void musicSetVolume(u16 volume); -bool musicIsTrackState(s32 tracktype, s32 state); -s32 musicGetTrackState(s32 tracktype); -void musicQueueStartEvent(u32 tracktype, u32 tracknum, f32 arg2, u16 volume); -void musicQueueStopEvent(s32 tracktype); -void musicQueueFadeEvent(s32 tracktype, f32 arg1, bool keepafterfade); -void musicReset(void); -void musicQueueStopAllEvent(void); -void musicSaveInterval(void); -void musicRestoreInterval(void); -void musicStartPrimary(f32 arg0); -void musicStartAmbient(f32 arg0); -bool musicIsAnyPlayerInAmbientRoom(void); -void musicStartNrg(f32 arg0); -void musicStartTrackAsMenu(s32 tracknum); -void musicSetStageAndStartMusic(s32 stagenum); -void musicSetStage(s32 stagenum); -void musicStop(void); -void musicActivateNrg(void); -void musicDeactivateNrg(void); -void musicStartMenu(void); -void musicEndMenu(void); -void musicStartSoloDeath(void); -void _musicStartMpDeath(f32 arg0); -void musicStartMpDeath(void); -void musicEndDeath(void); -void musicPlayTrackIsolated(s32 tracknum); -void musicPlayDefaultTracks(void); -void musicStartTemporaryPrimary(s32 tracknum); -void musicStartCutscene(s32 tracknum); -void musicEndCutscene(void); -void musicStartTemporaryAmbient(s32 tracknum); -void musicEndTemporaryAmbient(void); -void musicSetXReason(s32 reason, u32 minsecs, u32 maxsecs); -void musicUnsetXReason(s32 reason); -void musicTickAmbient(void); +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); +void music_stop(void); +void music_activate_nrg(void); +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); +void music_play_default_tracks(void); +void music_start_temporary_primary(s32 tracknum); +void music_start_cutscene(s32 tracknum); +void music_end_cutscene(void); +void music_start_temporary_ambient(s32 tracknum); +void music_end_temporary_ambient(void); +void music_set_x_reason(s32 reason, u32 minsecs, u32 maxsecs); +void music_unset_x_reason(s32 reason); +void music_tick_ambient(void); #endif diff --git a/src/include/game/nbomb.h b/src/include/game/nbomb.h index f9a43bef5..577ce295f 100644 --- a/src/include/game/nbomb.h +++ b/src/include/game/nbomb.h @@ -5,18 +5,18 @@ #include "types.h" Gfx *func0f008558(Gfx *gdl, s32 depth); -void nbombReset(struct nbomb *nbomb); -s32 nbombCalculateAlpha(struct nbomb *nbomb); -Gfx *nbombCreateGdl(void); -Gfx *nbombRender(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl); +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 nbombInflictDamage(struct nbomb *nbomb); -void nbombTick(struct nbomb *nbomb); -void nbombsTick(void); -Gfx *nbombsRender(Gfx *gdl); -void nbombCreateStorm(struct coord *pos, struct prop *ownerprop); -f32 gasGetDoorFrac(s32 tagnum); -Gfx *nbombRenderOverlay(Gfx *gdl); -Gfx *gasRender(Gfx *gdl); +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); #endif diff --git a/src/include/game/objectives.h b/src/include/game/objectives.h index fa13c3834..bc83348ec 100644 --- a/src/include/game/objectives.h +++ b/src/include/game/objectives.h @@ -4,33 +4,33 @@ #include "data.h" #include "types.h" -void objectivesStop(void); +void objectives_stop(void); -void objectivesReset(void); -void tagInsert(struct tag *tag); -void briefingInsert(struct briefingobj *obj); -void objectiveInsert(struct objective *objective); -void objectiveAddRoomEnteredCriteria(struct criteria_roomentered *criteria); -void objectiveAddThrowInRoomCriteria(struct criteria_throwinroom *criteria); -void objectiveAddHolographCriteria(struct criteria_holograph *criteria); +void objectives_reset(void); +void tag_insert(struct tag *tag); +void briefing_insert(struct briefingobj *obj); +void objective_insert(struct objective *objective); +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 xorBaffbeff(u32 value); -u32 xorBabeffff(u32 value); -u32 xorBoobless(u32 value); -void tagsReset(void); -s32 objGetTagNum(struct defaultobj *obj); -s32 objectiveGetCount(void); -u32 objectiveGetDifficultyBits(s32 index); -s32 objectiveCheck(s32 index); -bool objectiveIsAllComplete(void); -void objectivesDisableChecking(void); -void objectivesShowHudmsg(char *buffer, s32 hudmsgtype); -void objectivesCheckAll(void); -void objectiveCheckRoomEntered(s32 currentroom); -void objectiveCheckThrowInRoom(s32 arg0, RoomNum *requiredrooms); -void objectiveCheckHolograph(f32 sqdist); -struct prop *chopperGetTargetProp(struct chopperobj *heli); -struct defaultobj *objFindByTagId(s32 tag_id); -struct tag *tagFindById(s32 tag_id); +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); +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); +void objective_check_holograph(f32 sqdist); +struct prop *chopper_get_target_prop(struct chopperobj *heli); +struct defaultobj *obj_find_by_tag_id(s32 tag_id); +struct tag *tag_find_by_id(s32 tag_id); #endif diff --git a/src/include/game/options.h b/src/include/game/options.h index d73d4a4f0..bf17812f7 100644 --- a/src/include/game/options.h +++ b/src/include/game/options.h @@ -4,47 +4,47 @@ #include "data.h" #include "types.h" -s32 optionsGetControlMode(s32 mpchrnum); -void optionsSetControlMode(s32 mpchrnum, s32 mode); -s32 optionsGetContpadNum1(s32 mpchrnum); -s32 optionsGetContpadNum2(s32 mpchrnum); -s32 optionsGetForwardPitch(s32 mpchrnum); -s32 optionsGetAutoAim(s32 mpchrnum); -s32 optionsGetLookAhead(s32 mpchrnum); -s32 optionsGetAimControl(s32 mpchrnum); -s32 optionsGetSightOnScreen(s32 mpchrnum); -s32 optionsGetAmmoOnScreen(s32 mpchrnum); -s32 optionsGetShowGunFunction(s32 mpchrnum); -s32 optionsGetAlwaysShowTarget(s32 mpchrnum); -s32 optionsGetShowZoomRange(s32 mpchrnum); -s32 optionsGetPaintball(s32 mpchrnum); -s32 optionsGetShowMissionTime(s32 mpchrnum); -u8 optionsGetInGameSubtitles(void); -u8 optionsGetCutsceneSubtitles(void); -s32 optionsGetHeadRoll(s32 mpchrnum); +s32 options_get_control_mode(s32 mpchrnum); +void options_set_control_mode(s32 mpchrnum, s32 mode); +s32 options_get_contpad_num1(s32 mpchrnum); +s32 options_get_contpad_num2(s32 mpchrnum); +s32 options_get_forward_pitch(s32 mpchrnum); +s32 options_get_auto_aim(s32 mpchrnum); +s32 options_get_look_ahead(s32 mpchrnum); +s32 options_get_aim_control(s32 mpchrnum); +s32 options_get_sight_on_screen(s32 mpchrnum); +s32 options_get_ammo_on_screen(s32 mpchrnum); +s32 options_get_show_gun_function(s32 mpchrnum); +s32 options_get_always_show_target(s32 mpchrnum); +s32 options_get_show_zoom_range(s32 mpchrnum); +s32 options_get_paintball(s32 mpchrnum); +s32 options_get_show_mission_time(s32 mpchrnum); +u8 options_get_in_game_subtitles(void); +u8 options_get_cutscene_subtitles(void); +s32 options_get_head_roll(s32 mpchrnum); -void optionsSetForwardPitch(s32 mpchrnum, bool enable); -void optionsSetAutoAim(s32 mpchrnum, bool enable); -void optionsSetLookAhead(s32 mpchrnum, bool enable); -void optionsSetAimControl(s32 mpchrnum, s32 index); -void optionsSetSightOnScreen(s32 mpchrnum, bool enable); -void optionsSetAmmoOnScreen(s32 mpchrnum, bool enable); -void optionsSetShowGunFunction(s32 mpchrnum, bool enable); -void optionsSetAlwaysShowTarget(s32 mpchrnum, bool enable); -void optionsSetShowZoomRange(s32 mpchrnum, bool enable); -void optionsSetPaintball(s32 mpchrnum, bool enable); -void optionsSetShowMissionTime(s32 mpchrnum, bool enable); -void optionsSetInGameSubtitles(s32 enable); -void optionsSetCutsceneSubtitles(s32 enable); -void optionsSetHeadRoll(s32 mpchrnum, bool enable); -s32 optionsGetEffectiveScreenSize(void); -s32 optionsGetScreenSize(void); -void optionsSetScreenSize(s32 size); -s32 optionsGetScreenRatio(void); -void optionsSetScreenRatio(s32 ratio); -u8 optionsGetScreenSplit(void); -void optionsSetScreenSplit(u8 split); -u16 optionsGetMusicVolume(void); -void optionsSetMusicVolume(u16 volume); +void options_set_forward_pitch(s32 mpchrnum, bool enable); +void options_set_auto_aim(s32 mpchrnum, bool enable); +void options_set_look_ahead(s32 mpchrnum, bool enable); +void options_set_aim_control(s32 mpchrnum, s32 index); +void options_set_sight_on_screen(s32 mpchrnum, bool enable); +void options_set_ammo_on_screen(s32 mpchrnum, bool enable); +void options_set_show_gun_function(s32 mpchrnum, bool enable); +void options_set_always_show_target(s32 mpchrnum, bool enable); +void options_set_show_zoom_range(s32 mpchrnum, bool enable); +void options_set_paintball(s32 mpchrnum, bool enable); +void options_set_show_mission_time(s32 mpchrnum, bool enable); +void options_set_in_game_subtitles(s32 enable); +void options_set_cutscene_subtitles(s32 enable); +void options_set_head_roll(s32 mpchrnum, bool enable); +s32 options_get_effective_screen_size(void); +s32 options_get_screen_size(void); +void options_set_screen_size(s32 size); +s32 options_get_screen_ratio(void); +void options_set_screen_ratio(s32 ratio); +u8 options_get_screen_split(void); +void options_set_screen_split(u8 split); +u16 options_get_music_volume(void); +void options_set_music_volume(u16 volume); #endif diff --git a/src/include/game/pad.h b/src/include/game/pad.h index b4d05c8d1..a6e4c2530 100644 --- a/src/include/game/pad.h +++ b/src/include/game/pad.h @@ -4,20 +4,20 @@ #include "data.h" #include "types.h" -void padUnpack(s32 padnum, u32 fields, struct pad *pad); -bool padHasBboxData(s32 padnum); -void padGetCentre(s32 padnum, struct coord *coord); -void padRotateForDoor(s32 padnum); -void padCopyBboxFromPad(s32 padnum, struct pad *src); -void padSetFlag(s32 padnum, u32 flag); -void padUnsetFlag(s32 padnum, u32 flag); -s32 coverGetCount(void); -bool coverUnpack(s32 covernum, struct cover *cover); -bool coverIsInUse(s32 covernum); -void coverSetInUse(s32 covernum, bool enable); -void coverSetFlag(s32 covernum, u32 flag); -void coverUnsetFlag(s32 covernum, u32 flag); -void coverSetOutOfSight(s32 covernum, bool enable); -bool coverIsSpecial(struct cover *cover); +void pad_unpack(s32 padnum, u32 fields, struct pad *pad); +bool pad_has_bbox_data(s32 padnum); +void pad_get_centre(s32 padnum, struct coord *coord); +void pad_rotate_for_door(s32 padnum); +void pad_copy_bbox_from_pad(s32 padnum, struct pad *src); +void pad_set_flag(s32 padnum, u32 flag); +void pad_unset_flag(s32 padnum, u32 flag); +s32 cover_get_count(void); +bool cover_unpack(s32 covernum, struct cover *cover); +bool cover_is_in_use(s32 covernum); +void cover_set_in_use(s32 covernum, bool enable); +void cover_set_flag(s32 covernum, u32 flag); +void cover_unset_flag(s32 covernum, u32 flag); +void cover_set_out_of_sight(s32 covernum, bool enable); +bool cover_is_special(struct cover *cover); #endif diff --git a/src/include/game/padhalllv.h b/src/include/game/padhalllv.h index 9d4306c29..e631782db 100644 --- a/src/include/game/padhalllv.h +++ b/src/include/game/padhalllv.h @@ -4,28 +4,28 @@ #include "data.h" #include "types.h" -void navSetSeed(u32 upper, u32 lower); -struct waypoint *waypointFindClosestToPos(struct coord *pos, RoomNum *rooms); -struct waygroup *waygroupChooseNeighbour(s32 *groupnums, s32 step, u32 ignoremask); -void waygroupSetStepIfUndiscovered(s32 *groupnums, s32 step, u32 ignoremask); -bool waygroupDiscoverOneStep(struct waygroup *group, s32 step, u32 ignoremask); -bool waygroupDiscoverSteps(struct waygroup *from, struct waygroup *to, struct waygroup *groups, bool discoverall, u32 ignoremask); -bool waygroupFindRoute(struct waygroup *from, struct waygroup *to, struct waygroup *groups); -struct waypoint *waypointChooseNeighbour(s32 *pointnums, s32 step, s32 groupnum, u32 ignoremask); -void waypointSetStepIfUndiscovered(s32 *pointnums, s32 value, s32 groupnum, u32 ignoremask); -bool waypointDiscoverOneStep(s32 *pointnums, s32 step, s32 groupnum, u32 ignoremask); -void waypointDiscoverSteps(struct waypoint *from, struct waypoint *to, bool discoverall, u32 ignoremask); -void waypointFindRoute(struct waypoint *from, struct waypoint *to); -s32 waypointCollectLocal(struct waypoint *from, struct waypoint *to, struct waypoint **arr, s32 arrlen); -void waypointFindSegmentIntoGroup(struct waygroup *fromgroup, struct waygroup *togroup, struct waypoint **frompoint, struct waypoint **topoint); -s32 navFindRoute(struct waypoint *from, struct waypoint *to, struct waypoint **arr, s32 arrlen); -void waypointResetAllSteps(void); -struct waypoint *waypointFindRandomAtStep(s32 *pointnums, s32 step); -struct waygroup *waygroupFindRandomAtStep(s32 *groupnums, s32 step); -struct waypoint *navChooseRetreatPoint(struct waypoint *chrpoint, struct waypoint *targetpoint); -void navDisableSegmentInDirection(struct waypoint *a, struct waypoint *b); -void navEnableSegmentInDirection(struct waypoint *a, struct waypoint *b); -void navDisableSegment(struct waypoint *a, struct waypoint *b); -void navEnableSegment(struct waypoint *a, struct waypoint *b); +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); #endif diff --git a/src/include/game/pak.h b/src/include/game/pak.h index 327fcfd1a..37066df36 100644 --- a/src/include/game/pak.h +++ b/src/include/game/pak.h @@ -4,117 +4,117 @@ #include "data.h" #include "types.h" -u32 pakGetBlockSize(s8 device); -u32 pakAlign(s8 device, u32 size); -s32 pakGetAlignedFileLenByBodyLen(s8 device, u32 bodylen); -u32 pakGetBodyLenByFileLen(u32 filelen); -u32 pakGenerateSerial(s8 device); -bool mempakIsOkay(s8 device); -s32 pakGetFileIdsByType(s8 device, u32 filetype, u32 *fileids); +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); -s32 pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3); -s32 pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *body, s32 *outfileid, u8 *olddata); -bool pakDeleteFile(s8 device, s32 fileid); -PakErr1 pakDeleteGameNote(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name); +s32 pak_read_body_at_guid(s8 device, s32 fileid, u8 *body, s32 arg3); +s32 pak_save_at_guid(s8 device, s32 fileid, s32 filetype, u8 *body, s32 *outfileid, u8 *olddata); +bool pak_delete_file(s8 device, s32 fileid); +PakErr1 pak_delete_game_note(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name); PakErr1 pak0f1168c4(s8 device, struct pakdata **arg1); -s32 pakGetType(s8 device); -s32 pakGetSerial(s8 device); +s32 pak_get_type(s8 device); +s32 pak_get_serial(s8 device); void pak0f11698c(s8 device); void pak0f116994(void); void pak0f1169c8(s8 device, bool tick); -bool mempakIsReady(s8 device); -bool mempakIsReadyOrFull(s8 device); +bool mempak_is_ready(s8 device); +bool mempak_is_ready_or_full(s8 device); void pak0f116bdc(s8 device, u8 *arg1, u8 *arg2); -u16 _pakGetSerial(s8 device); -u32 _pakGetType(s8 device); -void pakSetState(s8 device, s32 value); +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 _pakDeleteGameNote(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name); -s32 _pakDeleteFile(s8 device, s32 fileid); -s32 pakGetPlugCount(s8 device); -u32 pakGetMaxFileSize(s8 device); -s32 pakGetBodyLenByType(s8 device, u32 filetype); +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 pakGetUnk008(s8 device); -bool pakRetrieveBlockFromCache(s8 device, u32 offset, u8 *dst); -PakErr2 pakReadHeaderAtOffset(s8 device, u32 offset, struct pakfileheader *header); -void pakDumpBuffer(u8 *buffer, u32 len, char *name); -void pakDumpEeprom(void); -s32 _pakSaveAtGuid(s8 device, s32 fileid, s32 filetype, u8 *newdata, s32 *outfileid, u8 *olddata); +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 pakInitPak(OSMesgQueue *mq, OSPfs *pfs, s32 channel, s32 *arg3); +PakErr1 pak_init_pak(OSMesgQueue *mq, OSPfs *pfs, s32 channel, s32 *arg3); #else -PakErr1 pakInitPak(OSMesgQueue *mq, OSPfs *pfs, s32 channel); +PakErr1 pak_init_pak(OSMesgQueue *mq, OSPfs *pfs, s32 channel); #endif -PakErr1 _pakReadWriteBlock(OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer); -PakErr1 pakQueryNumNotes(OSPfs *pfs, s32 *max_files, s32 *files_used); -PakErr1 pakQueryNumFreeBytes(OSPfs *pfs, s32 *bytes_not_used); -PakErr1 pakQueryNoteState(OSPfs *pfs, s32 file_no, OSPfsState *note); -PakErr1 pakAllocateNote(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 size, s32 *file_no); -PakErr1 pakDeleteGameNote3(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name); -PakErr1 pakFindNote(OSPfs *pfs, u16 company_code, u32 game_code, char *game_name, char *ext_name, s32 *file_no); -PakErr1 _pakResizeNote(OSPfs *pfs, u16 company_code, u32 game_code, u8 *game_name, u8 *ext_name, u32 numbytes); -s32 pakGetPdNumPages(s8 device); -u32 pakGetPdNumBytes(s8 device); -s32 pakQueryNumFreePages(s8 device); -bool pakCanFitCameraFileInPak(s8 device); -s32 pakGetNumFreeCameraSpacesInPak(s8 device); -s32 _pakCreateCameraFile(s8 device, s32 *outfileid); -bool pakResizeNote(s8 device, s32 numpages); +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 paksInit(void); -void pakCalculateChecksum(u8 *arg0, u8 *arg1, u16 *arg2); -s32 _pakReadBodyAtGuid(s8 device, s32 fileid, u8 *body, s32 arg3); -s32 _pakGetFileIdsByType(s8 device, u32 filetype, u32 *fileids); -s32 pakCheckFileCanFitInNote(s8 device, s32 filetype, s32 *numspaces); +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 pakFindFile(s8 device, u32 fileid, struct pakfileheader *header); +s32 pak_find_file(s8 device, u32 fileid, struct pakfileheader *header); #if VERSION >= VERSION_NTSC_FINAL -bool pakWriteBlankFile(s8 device, u32 offset, struct pakfileheader *header); +bool pak_write_blank_file(s8 device, u32 offset, struct pakfileheader *header); #endif -bool pakRepairAsBlank(s8 device, u32 *offset, struct pakfileheader *header); -s32 pakRepairFilesystem(s8 device); -void pakCorrupt(void); +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 pakCreateInitialFiles(s8 device); +bool pak_create_initial_files(s8 device); #else -void pakCreateInitialFiles(s8 device); +void pak_create_initial_files(s8 device); #endif -s32 pakFindMaxFileId(s8 device); -void pakMergeBlanks(s8 device); -void paksReset(void); -void pakSetFeatures(s8 device, u8 features, u32 line, char *file); -void pakSetDefaults(s8 arg0); -PakErr1 pakReadWriteBlock(s8 device, OSPfs *pfs, s32 file_no, u8 flag, u32 address, u32 len, u8 *buffer); -bool pakQueryTotalUsage(s8 device); -void pakQueryPdSize(s8 device); -bool mempakPrepare(s8 device); -bool pakProbe(s8 device); -void pakWipe(s8 device, u32 blocknumstart, u32 blocknumend); -void pakSaveHeaderToCache(s8 device, s32 blocknum, struct pakfileheader *header); -bool pakRetrieveHeaderFromCache(s8 device, s32 blocknum, struct pakfileheader *header); -s32 pakCreateFilesystem(s8 device); -bool pakGetFilesystemLength(s8 device, u32 *outlen); +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 pakReplaceFileAtOffsetWithBlank(s8 device, u32 offset); -s32 pakWriteFileAtOffset(s8 device, u32 offset, u32 filetype, u8 *newdata, s32 bodylen, s32 *outfileid, u8 *olddata, u32 fileid, u32 generation); -bool pakRepair(s8 device); -bool pakHandleResult(s32 err1, s8 device, bool arg2, u32 line); -void paksTick(void); +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 pakExecuteDebugOperations(void); -void pakCheckPlugged(void); -void gbpakHandleError(u32 arg0); -bool gbpakRead(s8 device, u16 address, u8 *buffer, u16 size); -bool gbpakWrite(s8 device, u16 address, u8 *buffer, u16 size); +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); @@ -129,31 +129,31 @@ void pak0f11d620(s8 device); void pak0f11d9c4(s8 device, u8 *arg1, u8 *arg2, u32 arg3); #if VERSION >= VERSION_NTSC_1_0 -void pakRumble(s32 device, f32 numsecs, s32 onduration, s32 offduration); +void pak_rumble(s32 device, f32 numsecs, s32 onduration, s32 offduration); #else -void pakRumble(s8 device, f32 numsecs, s32 onduration, s32 offduration); +void pak_rumble(s8 device, f32 numsecs, s32 onduration, s32 offduration); #endif -void paksStop(bool disablepolling); -void pakDisableRumbleForPlayer(s8 playernum); -void pakEnableRumbleForPlayer(s8 playernum); -void pakDisableRumbleForAllPlayers(void); -void pakEnableRumbleForAllPlayers(void); -void pakDumpPak(void); -void pakTickState(s8 device); +void paks_stop(bool disablepolling); +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 pakProbeEeprom(void); -PakErr1 pakReadEeprom(u8 address, u8 *buffer, u32 len); -PakErr1 pakWriteEeprom(u8 address, u8 *buffer, u32 len); -void pakSetBitflag(s32 flagnum, u8 *bitstream, bool set); -bool pakHasBitflag(u32 flagnum, u8 *stream); -void pakClearAllBitflags(u8 *flags); -void pakN64FontCodeToAscii(char *src, char *dst, s32 len); -s8 pakFindBySerial(s32 deviceserial); +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 gbpakIsAnyPerfectDark(void); -bool gbpakStrcmp(char *a, char *b); -s32 gbpakIdentifyGame(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[]; diff --git a/src/include/game/pdmode.h b/src/include/game/pdmode.h index f9a3c9696..5c997290a 100644 --- a/src/include/game/pdmode.h +++ b/src/include/game/pdmode.h @@ -4,11 +4,11 @@ #include "data.h" #include "types.h" -f32 pdmodeGetEnemyReactionSpeed(void); -f32 pdmodeGetEnemyHealth(void); -f32 pdmodeGetEnemyDamage(void); -f32 pdmodeGetEnemyAccuracy(void); +f32 pdmode_get_enemy_reaction_speed(void); +f32 pdmode_get_enemy_health(void); +f32 pdmode_get_enemy_damage(void); +f32 pdmode_get_enemy_accuracy(void); void func0f01b148(u32 arg0); -void titleSetNextStage(s32 stagenum); +void title_set_next_stage(s32 stagenum); #endif diff --git a/src/include/game/player.h b/src/include/game/player.h index dd24caeea..64e42d13e 100644 --- a/src/include/game/player.h +++ b/src/include/game/player.h @@ -4,107 +4,107 @@ #include "data.h" #include "types.h" -f32 playerChooseSpawnLocation(f32 chrradius, struct coord *dstpos, RoomNum *dstrooms, struct prop *prop, s16 *spawnpads, s32 numspawnpads); -f32 playerChooseGeneralSpawnLocation(f32 chrradius, struct coord *pos, RoomNum *rooms, struct prop *prop); -void playerStartNewLife(void); -void playerLoadDefaults(void); -bool playerSpawnAnti(struct chrdata *chr, s32 param_2); -void playerSpawn(void); -void playerResetBond(struct playerbond *pb, struct coord *pos); -void playersTickAllChrBodies(void); -void playerChooseBodyAndHead(s32 *bodynum, s32 *headnum, s32 *arg2); -void playerTickChrBody(void); -void playerRemoveChrBody(void); -void playerTickMpSwirl(void); -void playerChangeCamera(void); -void playerStartCutscene(s16 anim_id); -void playerReorientForCutsceneStop(s32 tweenduration60); -void playerTickCutscene(bool arg0); -f32 playerGetCutsceneBlurFrac(void); -void playerSetZoomFovY(f32 fovy, f32 timemax); -f32 playerGetZoomFovY(void); -void playerTweenFovY(f32 targetfovy); -f32 playerGetTeleportFovY(void); -void playerUpdateZoom(void); -void playerStopAudioForPause(void); -void playerTickPauseMenu(void); -void playerPause(s32 root); -void playerUnpause(void); +f32 player_choose_spawn_location(f32 chrradius, struct coord *dstpos, RoomNum *dstrooms, struct prop *prop, s16 *spawnpads, s32 numspawnpads); +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 *playerDrawFade(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac); -Gfx *playerDrawStoredFade(Gfx *gdl); -void playerUpdateColourScreenProperties(void); -void playerTickChrFade(void); -void playerDisplayHealth(void); -void playerTickDamageAndHealth(void); -void playerDisplayDamage(void); -Gfx *playerRenderHealthBar(Gfx *gdl); -void playerSurroundWithExplosions(s32 arg0); -void playerTickExplode(void); -void playerResetLoResIf4Mb(void); -s16 playerGetFbWidth(void); -s16 playerGetFbHeight(void); -bool playerHasSharedViewport(void); -s16 playerGetViewportWidth(void); -s16 playerGetViewportLeft(void); -s16 playerGetViewportHeight(void); -s16 playerGetViewportTop(void); -f32 playerGetAspectRatio(void); -void playerUpdateShake(void); -void playerTickTeleport(f32 *arg0); -void playerConfigureVi(void); -void playerTick(bool arg0); -void playerAllocateMatrices(struct coord *cam_pos, struct coord *cam_look, struct coord *cam_up); -Gfx *playerUpdateShootRot(Gfx *gdl); -void playerDisplayShield(void); -Gfx *playerRenderShield(Gfx *gdl); -Gfx *playerRenderHud(Gfx *gdl); -void playerDie(bool force); -void playerDieByShooter(u32 shooter, bool force); -void playerCheckIfShotInBack(s32 attackerplayernum, f32 x, f32 z); -f32 playerGetHealthBarHeightFrac(void); -void playerMoveCameraFromPosRooms(struct coord *pos, struct coord *up, struct coord *look, struct coord *pos2, RoomNum *rooms); -void playerMoveCameraFromPosRoom(struct coord *pos, struct coord *up, struct coord *look, struct coord *memcampos, s32 memcamroom); -void playerMoveCamera(struct coord *pos, struct coord *up, struct coord *look); -void playersClearMemCamRoom(void); -void playerSetPerimEnabled(struct prop *prop, bool enable); -bool playerUpdateGeometry(struct prop *prop, u8 **start, u8 **end); -void playerUpdatePerimInfo(void); -void playerGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin); -f32 playerGetHealthFrac(void); -f32 playerGetShieldFrac(void); -void playerSetShieldFrac(f32 frac); -s32 playerGetMissionTime(void); -s32 playerTickBeams(struct prop *prop); -s32 playerTickThirdPerson(struct prop *prop); -void playerChooseThirdPersonAnimation(struct chrdata *chr, s32 crouchpos, f32 speedsideways, f32 speedforwards, f32 speedtheta, f32 *angleoffset, struct attackanimconfig **animcfg); -Gfx *playerRender(struct prop *prop, Gfx *gdl, bool xlupass); -Gfx *playerLoadMatrix(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_update_geometry(struct prop *prop, u8 **start, u8 **end); +void player_update_perim_info(void); +void player_get_bbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin); +f32 player_get_health_frac(void); +f32 player_get_shield_frac(void); +void player_set_shield_frac(f32 frac); +s32 player_get_mission_time(void); +s32 player_tick_beams(struct prop *prop); +s32 player_tick_third_person(struct prop *prop); +void player_choose_third_person_animation(struct chrdata *chr, s32 crouchpos, f32 speedsideways, f32 speedforwards, f32 speedtheta, f32 *angleoffset, struct attackanimconfig **animcfg); +Gfx *player_render(struct prop *prop, Gfx *gdl, bool xlupass); +Gfx *player_load_matrix(Gfx *gdl); void player0f0c3320(Mtxf *matrices, s32 count); -void playerSetTickMode(s32 tickmode); -void playerBeginGeFadeIn(void); -void playersBeginMpSwirl(void); +void player_set_tick_mode(s32 tickmode); +void player_begin_ge_fade_in(void); +void players_begin_mp_swirl(void); void player0f0b9a20(void); -void playerEndCutscene(void); -void playerPrepareMoveCameraToPad(s16 pad_id); -void playerPrepareMoveCameraToPreset(struct camerapresetobj *preset, bool hasdir, s32 arg2); -void playerPrepareMoveCameraToPos(f32 posangle, f32 rotangle, f32 range, f32 height1, f32 height2, s32 padnum); -void playerStartCutscene2(void); -void playerSetFadeColour(s32 r, s32 g, s32 b, f32 a); -void playerAdjustFade(f32 maxfadetime, s32 r, s32 g, s32 b, f32 frac); -void playerSetFadeFrac(f32 maxfadetime, f32 frac); -bool playerIsFadeComplete(void); -void playerStartChrFade(f32 duration60, f32 targetfrac); -void playerSetHiResEnabled(bool enable); -void playerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist); -void playerLaunchSlayerRocket(struct weaponobj *rocket); -void playerSetGlobalDrawWorldOffset(s32 room); -void playerSetGlobalDrawCameraOffset(void); -bool playerIsHealthVisible(void); -void playerSetCameraMode(s32 mode); -void playerSetCamPropertiesInBounds(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void playerSetCamPropertiesOutOfBounds(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void playerSetCamProperties(struct coord *pos, struct coord *up, struct coord *look, s32 room); -void playerClearMemCamRoom(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 1981597b8..8fdb97e23 100644 --- a/src/include/game/playermgr.h +++ b/src/include/game/playermgr.h @@ -4,22 +4,22 @@ #include "data.h" #include "types.h" -void playermgrInit(void); -void playermgrReset(void); -void playermgrAllocatePlayers(s32 count); -void playermgrAllocatePlayer(s32 index); -void playermgrCalculateAiBuddyNums(void); -void setCurrentPlayerNum(s32 playernum); -s32 playermgrGetPlayerNumByProp(struct prop *prop); -void playermgrSetViewSize(s32 viewx, s32 viewy); -void playermgrSetViewPosition(s32 viewleft, s32 viewtop); -void playermgrSetFovY(f32 fovy); -void playermgrSetAspectRatio(f32 aspect); -s32 playermgrGetModelOfWeapon(s32 weapon); -void playermgrDeleteWeapon(s32 hand); -void playermgrCreateWeapon(s32 hand); -void playermgrShuffle(void); -s32 playermgrGetOrderOfPlayer(s32 playernum); -s32 playermgrGetPlayerAtOrder(s32 ordernum); +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); +void playermgr_set_view_size(s32 viewx, s32 viewy); +void playermgr_set_view_position(s32 viewleft, s32 viewtop); +void playermgr_set_fov_y(f32 fovy); +void playermgr_set_aspect_ratio(f32 aspect); +s32 playermgr_get_model_of_weapon(s32 weapon); +void playermgr_delete_weapon(s32 hand); +void playermgr_create_weapon(s32 hand); +void playermgr_shuffle(void); +s32 playermgr_get_order_of_player(s32 playernum); +s32 playermgr_get_player_at_order(s32 ordernum); #endif diff --git a/src/include/game/playerreset.h b/src/include/game/playerreset.h index bfa2ffb9f..e98d342d1 100644 --- a/src/include/game/playerreset.h +++ b/src/include/game/playerreset.h @@ -4,11 +4,11 @@ #include "data.h" #include "types.h" -void modelmgrReset(void); -void modelmgrSetLvResetting(bool value); -void modelmgrAllocateSlots(s32 numobjs, s32 numchrs); -bool modelmgrLoadProjectileModeldefs(s32 weaponnum); -void playerInitEyespy(void); -void playerReset(void); +void modelmgr_reset(void); +void modelmgr_set_lv_resetting(bool value); +void modelmgr_allocate_slots(s32 numobjs, s32 numchrs); +bool modelmgr_load_projectile_modeldefs(s32 weaponnum); +void player_init_eyespy(void); +void player_reset(void); #endif diff --git a/src/include/game/portal.h b/src/include/game/portal.h index 0624d076f..e4e21ab86 100644 --- a/src/include/game/portal.h +++ b/src/include/game/portal.h @@ -4,12 +4,12 @@ #include "data.h" #include "types.h" -void portalSetXluFrac2(s32 portalnum, f32 frac); -void portalSetXluFrac(s32 portalnum, f32 frac); -f32 portalGetXluFrac2(s32 arg0); -f32 portalGetXluFrac(s32 arg0); +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 portalsReset(void); -void acousticReset(void); +void portals_reset(void); +void acoustic_reset(void); #endif diff --git a/src/include/game/portalconv.h b/src/include/game/portalconv.h index 168d8265c..8ced68425 100644 --- a/src/include/game/portalconv.h +++ b/src/include/game/portalconv.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -s32 portalConvertCoordinates(s32 portalnum, s32 *start, struct portalthing2 *things); +s32 portal_convert_coordinates(s32 portalnum, s32 *start, struct portalthing2 *things); #endif diff --git a/src/include/game/prop.h b/src/include/game/prop.h index 2105cc061..3d38f5d51 100644 --- a/src/include/game/prop.h +++ b/src/include/game/prop.h @@ -6,63 +6,63 @@ extern f32 g_AutoAimScale; -void propsTick(void); +void props_tick(void); -void propsStop(void); +void props_stop(void); -void propsSort(void); -void propEnable(struct prop *prop); -void propDisable(struct prop *prop); -struct prop *propAllocate(void); -void propFree(struct prop *prop); -void propActivate(struct prop *prop); -void propActivateThisFrame(struct prop *prop); -void propDelist(struct prop *prop); -void propReparent(struct prop *mover, struct prop *adopter); -void propDetach(struct prop *prop); -Gfx *propRender(Gfx *gdl, struct prop *prop, bool xlupass); -Gfx *propsRender(Gfx *gdl, RoomNum renderroomnum, s32 renderpass, RoomNum *roomnumsbyprop); -void weaponPlayWhooshSound(s32 weaponnum, struct prop *prop); +void props_sort(void); +void prop_enable(struct prop *prop); +void prop_disable(struct prop *prop); +struct prop *prop_allocate(void); +void prop_free(struct prop *prop); +void prop_activate(struct prop *prop); +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_whoosh_sound(s32 weaponnum, struct prop *prop); void func0f060bac(s32 weaponnum, struct prop *prop); -struct prop *shotCalculateHits(s32 handnum, bool isshooting, struct coord *gunpos2d, struct coord *gundir2d, struct coord *gunpos3d, struct coord *gundir3d, u32 arg6, f32 distance, bool arg8); -struct prop *propFindAimingAt(s32 handnum, bool isshooting, u32 context); -void shotCreate(s32 handnum, bool arg1, bool dorandom, s32 numshots, bool arg4); -void hitCreate(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 handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2); -void handTickAttack(s32 handnum); -void handsTickAttack(void); -void propExecuteTickOperation(struct prop *prop, s32 op); -struct prop *propFindForInteract(bool eyespy); -void propFindForUplink(void); -bool currentPlayerInteract(bool eyespy); -void propPause(struct prop *prop); -void propUnpause(struct prop *prop); -void propsTickPlayer(bool islastplayer); -void propsTickPadEffects(void); -void propSetPerimEnabled(struct prop *prop, bool enable); -void propsTestForPickup(void); +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); f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f32 *arg4, bool throughobjects, bool cangangsta, s32 arg7); -void farsightChooseTarget(void); -void autoaimTick(void); -u32 propDoorGetCdTypes(struct prop *prop); -bool propIsOfCdType(struct prop *prop, u32 types); -void roomsCopy(RoomNum *srcrooms, RoomNum *dstrooms); -void roomsAppend(RoomNum *newrooms, RoomNum *dstrooms, s32 maxlen); -bool arrayIntersects(RoomNum *a, RoomNum *b); -bool propTryAddToChunk(s16 propnum, s32 chunkindex); -s32 roomAllocatePropListChunk(s32 room, s32 arg1); -void propRegisterRoom(struct prop *prop, RoomNum room); -void propDeregisterRoom(struct prop *prop, RoomNum room); -void propDeregisterRooms(struct prop *prop); -void propRegisterRooms(struct prop *prop); +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 func0f065d1c(struct coord *pos, RoomNum *rooms, struct coord *newpos, RoomNum *newrooms, RoomNum *morerooms, u32 arg5); void func0f065dd8(struct coord *pos, RoomNum *rooms, struct coord *newpos, RoomNum *newrooms); void func0f065dfc(struct coord *pos, RoomNum *rooms, struct coord *newpos, RoomNum *newrooms, RoomNum *morerooms, u32 arg5); void func0f065e74(struct coord *pos, RoomNum *rooms, struct coord *newpos, RoomNum *newrooms); void func0f065e98(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2); -void roomGetProps(RoomNum *room, s16 *propnums, s32 len); -void propsDefragRoomProps(void); -void propGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin); -bool propUpdateGeometry(struct prop *prop, u8 **start, u8 **end); +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_update_geometry(struct prop *prop, u8 **start, u8 **end); #endif diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index 9939e260b..384fc33ab 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -15,43 +15,43 @@ extern f32 g_AutogunDamageTxScale; extern f32 g_AutogunDamageRxScale; extern struct beam *g_ThrownLaptopBeams; -void alarmActivate(void); -void alarmDeactivate(void); -bool alarmIsActive(void); -f32 countdownTimerGetValue60(void); -bool countdownTimerIsVisible(void); -bool countdownTimerIsRunning(void); -void countdownTimerSetRunning(bool running); -void countdownTimerSetValue60(f32 value); -void countdownTimerSetVisible(u32 reason, bool visible); -void countdownTimerTick(void); -bool doorCallLift(struct prop *doorprop, bool allowclose); -bool doorIsPadlockFree(struct doorobj *door); -bool objCanPickupFromSafe(struct defaultobj *obj); -void objUpdateLinkedScenery(struct defaultobj *obj, struct prop *prop); -f32 objGetLocalXMin(struct modelrodata_bbox *bbox); -f32 objGetLocalXMax(struct modelrodata_bbox *bbox); -f32 objGetLocalYMin(struct modelrodata_bbox *bbox); -f32 objGetLocalYMax(struct modelrodata_bbox *bbox); -f32 objGetLocalZMin(struct modelrodata_bbox *bbox); -f32 objGetLocalZMax(struct modelrodata_bbox *bbox); -f32 objGetRotatedLocalXMinByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 objGetRotatedLocalXMaxByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 objGetRotatedLocalYMinByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 objGetRotatedLocalYMaxByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 objGetRotatedLocalZMinByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 objGetRotatedLocalZMaxByMtx4(struct modelrodata_bbox *bbox, Mtxf *mtx); -f32 objGetRotatedLocalXMinByMtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); -f32 objGetRotatedLocalXMaxByMtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); -f32 objGetRotatedLocalYMinByMtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); -f32 objGetRotatedLocalYMaxByMtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); -f32 objGetRotatedLocalZMinByMtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); -f32 objGetRotatedLocalZMaxByMtx3(struct modelrodata_bbox *bbox, f32 realrot[3][3]); -f32 objGetRotatedLocalMin(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 arg3); -f32 objGetRotatedLocalMax(struct modelrodata_bbox *bbox, f32 arg1, f32 arg2, f32 arg3); -s32 objCalculateGeoBlockVertices(f32 xmin, f32 xmax, f32 ymin, f32 ymax, f32 zmin, f32 zmax, Mtxf *mtx, struct geoblock *block); -void objCalculateGeoBlockFromBboxAndMtx(struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block); -void objCalculateGeoBlockFromNode19Data(struct modelrodata_type19 *rodata19, struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block); +void alarm_activate(void); +void alarm_deactivate(void); +bool alarm_is_active(void); +f32 countdown_timer_get_value60(void); +bool countdown_timer_is_visible(void); +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_calculate_geo_block_vertices(f32 xmin, f32 xmax, f32 ymin, f32 ymax, f32 zmin, f32 zmax, Mtxf *mtx, struct geoblock *block); +void obj_calculate_geo_block_from_bbox_and_mtx(struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block); +void obj_calculate_geo_block_from_node19_data(struct modelrodata_type19 *rodata19, struct modelrodata_bbox *bbox, Mtxf *mtx, struct geoblock *block); bool func0f0675c8(struct coord *pos, f32 arg1, struct modelrodata_bbox *bbox, Mtxf *mtx); bool func0f0677ac(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 func0f0678f8(struct coord *coord, struct coord *arg1, s32 padnum); @@ -59,295 +59,295 @@ bool func0f06797c(struct coord *coord, f32 arg1, s32 padnum); bool func0f0679ac(struct model *model, f32 *max, f32 *min, f32 arg3[2], f32 arg4[2]); void func0f067bc4(struct model *model, f32 *max, f32 *min, s32 axis); void func0f067d88(struct model *model, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4); -bool modelGetScreenCoords2(struct model *model, f32 *x2, f32 *x1, f32 *y2, f32 *y1); -bool modelGetScreenCoords(struct model *model, f32 *x2, f32 *x1, f32 *y2, f32 *y1); +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 *objFindByPadNum(s32 padnum); -struct defaultobj *objFindByPos(struct coord *pos, RoomNum *rooms); -void projectileFree(struct projectile *projectile); -void projectilesUnrefOwner(struct prop *owner); -void projectileReset(struct projectile *projectile); -struct projectile *projectileAllocate(void); +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 projectileSetSticky(struct prop *prop); -void embedmentFree(struct embedment *embedment); -struct embedment *embedmentAllocate(void); -s32 objGetShotsTaken(struct defaultobj *obj); -s32 objGetDestroyedLevel(struct defaultobj *obj); +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 *func0f0687e4(struct model *model); -struct modelnode *modeldefFindBboxNode(struct modeldef *modeldef); -struct modelrodata_bbox *modeldefFindBboxRodata(struct modeldef *modeldef); -struct modelnode *modelFindBboxNode(struct model *model); -struct modelrodata_bbox *modelFindBboxRodata(struct model *model); -struct modelnode *objFindBboxNode(struct defaultobj *obj); -struct modelrodata_bbox *objFindBboxRodata(struct defaultobj *obj); -s32 objGetAverageBrightnessInRooms(RoomNum *rooms, s32 arg1); +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 door0f068c04(struct prop *prop, s32 *arg1, s32 *arg2); s32 func0f068fc8(struct prop *prop, bool arg1); -void propCalculateShadeColour(struct prop *prop, u8 *nextcol, u16 floorcol); -void propCalculateShadeInfo(struct prop *prop, u8 *nextcol, u16 floorcol); -void colourTween(u8 *col, u8 *nextcol); -void objMergeColourFracs(s32 *colour, s32 shademode, f32 fracs[4]); +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 func0f069850(struct defaultobj *obj, struct coord *pos, f32 rot[3][3], struct geocyl *cyl); void func0f069b4c(struct defaultobj *obj); void func0f069c1c(struct defaultobj *obj); void func0f069c70(struct defaultobj *obj, bool arg1, bool arg2); -void objInitToggleNodes(struct defaultobj *obj); -void objCreateOneDebris(struct defaultobj *obj, s32 partindex, struct prop *prop); -void objCreateDebris(struct defaultobj *obj, struct prop *prop); -struct prop *objInit(struct defaultobj *obj, struct modeldef *modeldef, struct prop *prop, struct model *model); -struct prop *objInitWithModelDef(struct defaultobj *obj, struct modeldef *modeldef); -struct prop *objInitWithAutoModel(struct defaultobj *obj); +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 objFreeProjectile(struct defaultobj *obj); -void objFreeEmbedmentOrProjectile(struct prop *prop); -void objFree(struct defaultobj *obj, bool freeprop, bool canregen); -void objFreePermanently(struct defaultobj *obj, bool freeprop); -f32 objGetRadius(struct defaultobj *obj); +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 projectileFindCollidingProp(struct prop *prop, struct coord *pos, struct coord *arg2, u32 cdtypes, struct coord *arg4, struct coord *arg5, RoomNum *rooms); +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 applySpeed(f32 *distdone, f32 maxdist, f32 *speed, f32 accel, f32 decel, f32 maxspeed); -void applyRotation(f32 *angle, f32 maxrot, f32 *speed, f32 accel, f32 decel, f32 maxspeed); -void projectileFall(struct defaultobj *obj, f32 mtx[3][3]); -void knifePlayWooshSound(struct defaultobj *obj); +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 objLand2(struct defaultobj *obj, struct coord *arg1, struct coord *arg2); -void boltLand(struct weaponobj *weapon, struct coord *arg1); -void knifeLand(struct defaultobj *obj, struct coord *arg1, struct coord *arg2); -bool objEmbed(struct prop *prop, struct prop *parent, struct model *model, struct modelnode *node); -void objLand(struct prop *prop, struct coord *arg1, struct coord *arg2, bool *embedded); -bool propExplode(struct prop *prop, s32 explosiontype); -void ammocrateTick(struct prop *ammocrate); -void weaponTick(struct prop *weapon); +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 objDropRecursively(struct prop *prop, bool arg1); +void obj_drop_recursively(struct prop *prop, bool arg1); void func0f0706f8(struct prop *prop, bool fulltick); void func0f07079c(struct prop *prop, bool fulltick); -s32 glassCalculateOpacity(struct coord *pos, f32 xludist, f32 opadist, f32 arg3); +s32 glass_calculate_opacity(struct coord *pos, f32 xludist, f32 opadist, f32 arg3); void func0f070a1c(struct modelrodata_bbox *bbox, f32 realrot[3][3], struct coord *pos, struct coord *vertices); void func0f070bd0(struct modelrodata_type19 *rodata, f32 realrot[3][3], struct coord *pos, struct coord *vertices); void func0f070ca0(struct defaultobj *obj, struct geotilef *tile, u32 flags, struct modelrodata_bbox *bbox, struct modelrodata_type19 *rodata); -void liftActivate(struct prop *prop, u8 liftnum); -struct prop *liftFindByPad(s16 padnum); -f32 liftGetY(struct liftobj *lift); -void liftUpdateTiles(struct liftobj *lift, bool stationary); -void liftGoToStop(struct liftobj *lift, s32 stopnum); -f32 objGetHovBobOffsetY(struct defaultobj *obj); -void hovUpdateGround(struct defaultobj *obj, struct hov *hov, struct coord *pos, RoomNum *rooms, f32 matrix[3][3]); -void hovTick(struct defaultobj *obj, struct hov *hov); -s32 objIsHoverpropOrBike(struct defaultobj *obj); -f32 hoverpropGetTurnAngle(struct defaultobj *obj); -void hoverpropSetTurnAngle(struct defaultobj *obj, f32 angle); +void lift_activate(struct prop *prop, u8 liftnum); +struct prop *lift_find_by_pad(s16 padnum); +f32 lift_get_y(struct liftobj *lift); +void lift_update_tiles(struct liftobj *lift, bool stationary); +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 hovercarFindNextPath(struct hovercarobj *hovercar); -void hovercarStartNextPath(struct hovercarobj *hovercar); -void hovercarIncrementStep(struct hovercarobj *hovercar); -f32 objCollide(struct defaultobj *obj, struct coord *arg1, f32 arg2); -void hoverbikeUpdateMovement(struct hoverbikeobj *hoverbike, f32 arg1, f32 arg2, f32 arg3); -void platformDisplaceProps2(struct prop *platform, Mtxf *arg1); -bool rocketTickFbw(struct weaponobj *rocket); -s32 projectileLaunch(struct defaultobj *obj, struct projectile *projectile, struct coord *arg2, struct coord *arg3); -s32 projectileTick(struct defaultobj *obj, bool *embedded); -void doorTick(struct prop *doorprop); -void doorUpdatePortalIfWindowed(struct prop *door, s32 playercount); -void doorInitMatrices(struct prop *door); -void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *prevpos, struct coord *newpos); -void liftTick(struct prop *lift); -void escastepTick(struct prop *escalator); -void cctvTick(struct prop *camera); -void cctvInitMatrices(struct prop *cctv, Mtxf *mtx); -void fanTick(struct prop *fan); -void fanUpdateModel(struct prop *fan); -void autogunTick(struct prop *autogun); -void autogunInitMatrices(struct prop *autogun, Mtxf *mtx); -void autogunTickShoot(struct prop *autogun); -void chopperInitMatrices(struct prop *chopper); -struct chopperobj *chopperFromHovercar(struct chopperobj *obj); -bool chopperCheckTargetInFov(struct chopperobj *hovercar, u8 param_2); -bool chopperCheckTargetInSight(struct chopperobj *obj); -void chopperSetTarget(struct chopperobj *obj, u32 chrnum); -bool chopperAttack(struct chopperobj *obj); -bool chopperStop(struct chopperobj *obj); -bool chopperSetArmed(struct chopperobj *obj, bool armed); -void chopperRestartTimer(struct chopperobj *obj); -f32 chopperGetTimer(struct chopperobj *heli); -void chopperSetMaxDamage(struct chopperobj *obj, u16 health); +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); +void chopper_set_target(struct chopperobj *obj, u32 chrnum); +bool chopper_attack(struct chopperobj *obj); +bool chopper_stop(struct chopperobj *obj); +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 chopperFireRocket(struct chopperobj *chopper, bool side); -void chopperIncrementBarrel(struct prop *prop, bool firing); -void chopperIncrementMovement(struct prop *prop, f32 goalroty, f32 goalrotx, struct coord *dir, bool firing); -void chopperTickFall(struct prop *chopper); -void chopperTickIdle(struct prop *chopper); -void chopperTickPatrol(struct prop *chopper); -void chopperTickCombat(struct prop *chopper); -void hovercarTick(struct prop *hovercar); -void hoverpropTick(struct prop *hoverprop, bool arg1); -void hoverbikeTick(struct prop *hoverbike, bool arg1); -void dropshipUpdateInterior(struct prop *prop); -void glassUpdatePortal(struct prop *glass, s32 playercount, bool *arg2); -void weaponInitMatrices(struct prop *weapon); -void hangingmonitorInitMatrices(struct prop *hangingmonitors); -void objInitMatrices(struct prop *prop); -bool propCanRegen(struct prop *prop); -u32 objTick(struct prop *prop); -s32 objTickPlayer(struct prop *prop); -Gfx *propsRenderBeams(Gfx *gdl); -void tvscreenSetCmdlist(struct tvscreen *screen, u32 *cmdlist); -void tvscreenSetImageByNum(struct tvscreen *screen, s32 imagenum); -void tvscreenSetTexture(struct tvscreen *screen, s32 texturenum); -Gfx *tvscreenRender(struct model *model, struct modelnode *node, struct tvscreen *screen, Gfx *gdl, s32 arg4, s32 arg5); -void objRenderProp(struct prop *prop, struct modelrenderdata *renderdata, bool xlupass); -Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, u32 colour); -Gfx *objRenderShadow(struct defaultobj *obj, Gfx *gdl); -Gfx *objRender(struct prop *prop, Gfx *gdl, bool xlupass); -bool modelIsNodeNotTvscreen(struct modeldef *modeldef, struct modelnode *node); -void objDeform(struct defaultobj *obj, s32 level); -void objBounce(struct defaultobj *obj, struct coord *gundir2d); -void objSetDropped(struct prop *prop, u32 droptype); -void objApplyMomentum(struct defaultobj *obj, struct coord *speed, f32 rotation, bool addspeed, bool addrotation); -void piracyRestore(void); +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 objDetach(struct prop *prop); -bool objDrop(struct prop *prop, bool lazy); -void objFall(struct defaultobj *obj, s32 playernum); -void objDestroySupportedObjects(struct prop *prop, s32 playernum); -void objCheckDestroyed(struct defaultobj *obj, struct coord *pos, s32 playernum); +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 glassDestroy(struct defaultobj *obj); -void doorDestroyGlass(struct doorobj *door); -void cctvHandleLensShot(struct defaultobj *obj); +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 objIsMortal(struct defaultobj *obj); -void objTakeGunfire(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weaponnum, s32 playernum); -void objDamage(struct defaultobj *obj, f32 damage, struct coord *pos, s32 weaponnum, s32 playernum); +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 objTestHit(struct prop *prop, struct shotdata *shotdata); -void objHit(struct shotdata *shotdata, struct hit *hit); -u32 propobjGetCiTagId(struct prop *prop); -bool objIsHealthy(struct defaultobj *obj); -bool objTestForInteract(struct prop *prop); -bool currentPlayerTryMountHoverbike(struct prop *prop); -bool propobjInteract(struct prop *prop); -void objSetPerimEnabled(struct prop *prop, bool enable); -bool objUpdateGeometry(struct prop *prop, u8 **start, u8 **end); -void objGetBbox(struct prop *prop, f32 *radius, f32 *ymax, f32 *ymin); -void ammotypeGetPickedUpText(char *dst); -void ammotypeGetDeterminer(char *dst, s32 ammotype, s32 qty); -void ammotypeGetPickupName(char *dst, s32 ammotype, s32 qty); -void ammotypePlayPickupSound(u32 ammotype); -s32 propPlayPickupSound(struct prop *prop, s32 weapon); -void weaponPlayPickupSound(s32 weaponnum); -void ammotypeGetPickupMessage(char *dst, s32 ammotype, s32 qty); -void currentPlayerQueuePickupAmmoHudmsg(s32 ammotype, s32 pickupqty); -void ammoHandlePickup(s32 ammotype, s32 quantity, bool withsound, bool withhudmsg); -s32 ammocrateGetPickupAmmoQty(struct ammocrateobj *crate); -s32 weaponGetPickupAmmoQty(struct weaponobj *weapon); -void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual); -void currentPlayerQueuePickupWeaponHudmsg(u32 weaponnum, bool dual); -s32 propPickupByPlayer(struct prop *prop, bool showhudmsg); -s32 objTestForPickup(struct prop *prop); +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); +bool propobj_interact(struct prop *prop); +void obj_set_perim_enabled(struct prop *prop, bool enable); +bool obj_update_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 *arg2, f32 *arg3); -void modelFreeVertices(s32 vtxstoretype, struct model *model); -struct prop *hatApplyToChr(struct hatobj *hat, struct chrdata *chr, struct modeldef *modeldef, struct prop *prop, struct model *model); -void hatLoadAndApplyToChr(struct hatobj *hat, struct chrdata *chr); -void hatAssignToChr(struct hatobj *hat, struct chrdata *chr); -struct prop *hatCreateForChr(struct chrdata *chr, s32 modelnum, u32 flags); -struct weaponobj *weaponCreate(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef); -struct hatobj *hatCreate(bool musthaveprop, bool musthavemodel, struct modeldef *modeldef); -struct ammocrateobj *ammocrateAllocate(void); -struct defaultobj *debrisAllocate(void); -void playerActivateRemoteMineDetonator(s32 playernum); -struct weaponobj *weaponFindChildByWeaponNum(s32 weaponnum, struct prop *prop); -struct weaponobj *weaponFindLanded(s32 weaponnum); -void weaponRegisterProxy(struct weaponobj *weapon); -void weaponUnregisterProxy(struct weaponobj *weapon); -void coordTriggerProxies(struct coord *pos, bool arg1); -void chrsTriggerProxies(void); -void propweaponSetDual(struct weaponobj *weapon1, struct weaponobj *weapon2); +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 chrEquipWeapon(struct weaponobj *weapon, struct chrdata *chr); +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 *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata *chr); -struct weaponobj *weaponCreateProjectileFromGset(s32 modelnum, struct gset *gset, struct chrdata *chr); -struct weaponobj *weaponCreateProjectileFromWeaponNum(s32 modelnum, s32 weaponnum, struct chrdata *chr); -void weaponDeleteFromChr(struct chrdata *chr, s32 hand); -struct prop *weaponCreateForChr(struct chrdata *chr, s32 modelnum, s32 weaponnum, u32 flags, struct weaponobj *obj, struct modeldef *modeldef); -struct prop *chrGiveWeapon(struct chrdata *chr, s32 model, s32 weaponnum, u32 flags); -s32 weaponTestForPickup(struct prop *prop); -void weaponSetGunfireVisible(struct prop *prop, bool visible, RoomNum room); -bool weaponIsGunfireVisible(struct prop *prop); -s32 hatGetType(struct prop *prop); -bool doorIsUnlocked(struct prop *playerprop, struct prop *doorprop); -bool doorIsPosInRange(struct doorobj *door, struct coord *pos, f32 arg2, bool isbike); -bool doorIsObjInRange(struct doorobj *door, struct defaultobj *obj, bool isbike); -bool vectorIsInFrontOfDoor(struct doorobj *door, struct coord *vector); -bool doorIsRangeEmpty(struct doorobj *door); -void doorsCheckAutomatic(void); +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); +struct weaponobj *weapon_create_projectile_from_weapon_num(s32 modelnum, s32 weaponnum, struct chrdata *chr); +void weapon_delete_from_chr(struct chrdata *chr, s32 hand); +struct prop *weapon_create_for_chr(struct chrdata *chr, s32 modelnum, s32 weaponnum, u32 flags, struct weaponobj *obj, struct modeldef *modeldef); +struct prop *chr_give_weapon(struct chrdata *chr, s32 model, s32 weaponnum, u32 flags); +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 func0f08c424(struct doorobj *door, Mtxf *matrix); -void doorGetBbox(struct doorobj *door, struct modelrodata_bbox *dst); -void doorUpdateTiles(struct doorobj *door); +void door_get_bbox(struct doorobj *door, struct modelrodata_bbox *dst); +void door_update_tiles(struct doorobj *door); void door0f08cb20(struct doorobj *door, Vtx *src, Vtx *dst, s32 numvertices); void func0f08d3dc(struct doorobj *door); void func0f08d460(struct doorobj *door); -void doorActivatePortal(struct doorobj *door); -void doorDeactivatePortal(struct doorobj *door); -struct prop *doorInit(struct doorobj *door, struct coord *pos, Mtxf *mtx, RoomNum *rooms, struct coord *coord, struct coord *centre); -void doorPlayOpeningSound(s32 soundtype, struct prop *prop); -void doorPlayClosingSound(s32 soundtype, struct prop *prop); -void doorPlayOpenedSound(s32 soundtype, struct prop *prop); -void doorPlayClosedSound(s32 soundtype, struct prop *prop); -void doorStartOpen(struct doorobj *door); -void doorStartClose(struct doorobj *door); -u32 decodeXorAaaaaaaa(u32 value); -void doorFinishOpen(struct doorobj *door); -void doorFinishClose(struct doorobj *door); -void doorSetMode(struct doorobj *door, s32 newmode); -void doorsRequestMode(struct doorobj *door, s32 newmode); -s32 doorIsClosed(struct doorobj *door); -s32 doorIsOpen(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 *coord, 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 objCalculateFadeDistOpacityFrac(struct prop *prop, f32 modelscale); -bool posIsInObjFadeDistance(struct coord *coord, f32 modelscale); +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 posIsInDrawDistance(struct coord *arg); -void doorCreateSparks(struct doorobj *door); -bool doorCalcIntendedFrac(struct doorobj *door); -void doorsCalcFrac(struct doorobj *door); +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); f32 func0f08f538(f32 x, f32 y); void door0f08f604(struct doorobj *door, f32 *arg1, f32 *arg2, f32 *arg3, f32 *arg4, bool altcoordsystem); bool func0f08f968(struct doorobj *door, bool altcoordsystem); -bool doorTestForInteract(struct prop *prop); -void doorsActivate(struct prop *prop, bool allowliftclose); -bool posIsInFrontOfDoor(struct coord *pos, struct doorobj *door); -void doorsChooseSwingDirection(struct prop *chrprop, struct doorobj *door); -bool propdoorInteract(struct prop *doorprop); -void alarmStopAudio(void); -void gasReleaseFromPos(struct coord *pos); -void gasStopAudio(void); -bool gasIsActive(void); -void gasTick(void); -Gfx *countdownTimerRender(Gfx *gdl); -void projectilesDebug(void); -void alarmTick(void); +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); void func0f091030(void); -void currentPlayerDropAllItems(void); -void weaponCreateForPlayerDrop(s32 weaponnum); -void projectileCreate(struct prop *fromprop, struct fireslotthing *arg1, struct coord *pos, struct coord *direction, u8 weaponnum, struct prop *targetprop); -void objSetModelPartVisible(struct defaultobj *obj, s32 partnum, bool visible); +void current_player_drop_all_items(void); +void weapon_create_for_player_drop(s32 weaponnum); +void projectile_create(struct prop *fromprop, struct fireslotthing *arg1, struct coord *pos, struct coord *direction, u8 weaponnum, struct prop *targetprop); +void obj_set_model_part_visible(struct defaultobj *obj, s32 partnum, bool visible); #endif diff --git a/src/include/game/propobjstop.h b/src/include/game/propobjstop.h index 6a1ae5ceb..7957b4d89 100644 --- a/src/include/game/propobjstop.h +++ b/src/include/game/propobjstop.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -void objsStop(void); +void objs_stop(void); #endif diff --git a/src/include/game/propsnd.h b/src/include/game/propsnd.h index d1b236033..60d0417b9 100644 --- a/src/include/game/propsnd.h +++ b/src/include/game/propsnd.h @@ -4,35 +4,35 @@ #include "data.h" #include "types.h" -void psReset(void); +void ps_reset(void); -void psStop(void); +void ps_stop(void); -bool psPropHasSoundWithContext(struct prop *prop, s32 type); -void psStopSound(struct prop *prop, s32 type, u16 flags); -s32 psCalculateVolumeFromDistance(f32 playerdist, f32 dist1, f32 dist2, f32 dist3, s32 fullvolume); -s32 psGetVolume(s32 channelnum); -void psCreateIfNotDupe(struct prop *prop, s16 soundnum, s32 type); -void psStopChannel(s32 channelnum); -void psPrintChannel(struct pschannel *channel); -s32 psGetSubtitleOpacity(s32 channelnum); -void psTickChannel(s32 channelnum); -void psTick(void); -void psSetPitch(struct prop *prop, f32 targetpitch, s32 changespeed); -void psSetVolume(struct prop *prop, s32 vol); -void psStopOneShootChannel(struct prop *prop); -s16 psCreate(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 psPlayFromProp(s32 channelnum, s16 soundnum, s32 vol, struct prop *prop, s16 type, u16 flags); -void psMuteChannel(s32 channelnum); -bool psIsChannelFree(s32 channelnum); -void psModify(s32 channelnum, s32 arg1, s16 padnum, struct prop *prop, s32 volchangetimer60, s32 dist2, s32 dist3, u16 flags); -s32 psCalculateVol(struct coord *pos, f32 arg1, f32 arg2, f32 arg3, RoomNum *rooms, s16 soundnum, s32 arg6, f32 *arg7); -s32 psCalculatePan3(s32 degrees, f32 arg1, struct pschannel *channel); -s32 psCalculatePan2(struct coord *pos, s32 arg1, f32 arg2, struct pschannel *channel); -s32 psCalculatePan(struct coord *pos, f32 dist1, f32 dist2, f32 dist3, f32 playerdist, bool arg5, struct pschannel *channel); -void psGetTheoreticalVolPan(struct coord *pos, RoomNum *rooms, s16 soundnum, s32 *vol, s32 *pan); -void psApplyVolPan(struct sndstate *handle, struct coord *pos, f32 dist1, f32 dist2, f32 dist3, RoomNum *rooms, s16 soundnum, s32 arg7, f32 *distanceptr); -s32 psGetRandomSparkSound(void); -s32 psGetDuration60(s32 channelnum); +bool ps_prop_has_sound_with_context(struct prop *prop, s32 type); +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); +s32 ps_get_duration60(s32 channelnum); #endif diff --git a/src/include/game/quaternion.h b/src/include/game/quaternion.h index bf86a7170..ff8e20310 100644 --- a/src/include/game/quaternion.h +++ b/src/include/game/quaternion.h @@ -5,12 +5,12 @@ #include "types.h" void quaternion0f096ca0(struct coord *arg0, f32 quat[4]); -void quaternionToMtx(f32 arg0[4], Mtxf *arg1); +void quaternion_to_mtx(f32 arg0[4], Mtxf *arg1); void quaternion0f097044(Mtxf *matrix, f32 arg1[4]); -void quaternionToTransformMtx(struct coord *pos, f32 rot[4], Mtxf *matrix); -void quaternionSlerp(f32 q1[4], f32 q2[4], f32 t, f32 result[4]); +void quaternion_to_transform_mtx(struct coord *pos, f32 rot[4], Mtxf *matrix); +void quaternion_slerp(f32 q1[4], f32 q2[4], f32 t, f32 result[4]); void quaternion0f097518(f32 q[4], f32 t, f32 result[4]); void quaternion0f0976c0(f32 q1[4], f32 q2[4]); -void quaternionMultQuaternion(f32 a[4], f32 b[4], f32 result[4]); +void quaternion_mult_quaternion(f32 a[4], f32 b[4], f32 result[4]); #endif diff --git a/src/include/game/race.h b/src/include/game/race.h index 00c08ab01..562121647 100644 --- a/src/include/game/race.h +++ b/src/include/game/race.h @@ -4,14 +4,14 @@ #include "data.h" #include "types.h" -void racesInit(void); +void races_init(void); -u16 raceGetAnimSumAngleAsInt(s16 animnum, s32 frame, s32 endframe); -s32 raceGetAnimSumForwardAsInt(s16 animnum, s32 startframe, s32 endframe); -s32 raceInitAnimGroup(struct attackanimconfig *configs); -void raceInitAnimGroups(struct attackanimgroup **groups); -s32 raceCountAnims(struct animtablerow *rows); +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); f32 race0f0005c0(s16 animnum); -void raceInitAnims(void); +void race_init_anims(void); #endif diff --git a/src/include/game/radar.h b/src/include/game/radar.h index 7082c3809..fca74df84 100644 --- a/src/include/game/radar.h +++ b/src/include/game/radar.h @@ -4,10 +4,10 @@ #include "data.h" #include "types.h" -Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s32 arg3, s32 arg4); -s32 radarGetTeamIndex(s32 team); -Gfx *radarDrawDot(Gfx *gdl, struct prop *prop, struct coord *dist, u32 colour1, u32 colour2, bool swapcolours); -Gfx *radarRender(Gfx *gdl); -Gfx *radarRenderRTrackedProps(Gfx *gdl); +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 f94305dc7..eab021c12 100644 --- a/src/include/game/room.h +++ b/src/include/game/room.h @@ -4,19 +4,19 @@ #include "data.h" #include "types.h" -void roomsReset(void); +void rooms_reset(void); -void roomsTick(void); +void rooms_tick(void); -void roomSetLastForOffset(s32 room); -void roomLinkMtx(s32 index, s32 roomnum); -void roomUnlinkMtx(s32 index, s32 roomnum); -void roomFreeMtx(s32 index); -s32 roomAllocateMtx(void); -void roomPopulateMtx(Mtxf *matrix, s32 roomnum); -s32 roomTouchMtx(s32 roomnum); -Gfx *roomApplyMtx(Gfx *gdl, s32 roomnum); -struct coord *roomGetPosPtr(s32 room); -void roomGetPos(s32 room, struct coord *pos); +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); #endif diff --git a/src/include/game/savebuffer.h b/src/include/game/savebuffer.h index 3975a51c0..27b423353 100644 --- a/src/include/game/savebuffer.h +++ b/src/include/game/savebuffer.h @@ -10,20 +10,20 @@ Gfx *func0f0d479c(Gfx *gdl); Gfx *func0f0d49c8(Gfx *gdl); Gfx *func0f0d4a3c(Gfx *gdl, s32 arg1); Gfx *func0f0d4c80(Gfx *gdl); -Gfx *menugfxDrawPlane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 colour2, s32 type); -void savebufferOr(struct savebuffer *buffer, u32 arg1, s32 arg2); -void savebufferWriteBits(struct savebuffer *buffer, u32 value, s32 numbits, u8 *dst); -u32 savebufferReadBits(struct savebuffer *buffer, s32 offset); -void savebufferClear(struct savebuffer *buffer); +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); void func0f0d54c4(struct savebuffer *buffer); -void savebufferReadString(struct savebuffer *buffer, char *dst, bool addlinebreak); +void savebuffer_read_string(struct savebuffer *buffer, char *dst, bool addlinebreak); void func0f0d55a4(struct savebuffer *buffer, char *src); void func0f0d564c(u8 *data, char *dst, bool addlinebreak); void func0f0d5690(u8 *dst, char *buffer); -void savebufferWriteGuid(struct savebuffer *buffer, struct fileguid *guid); -void savebufferReadGuid(struct savebuffer *buffer, struct fileguid *guid); -void formatTime(char *dst, s32 time60, s32 precision); +void savebuffer_write_guid(struct savebuffer *buffer, struct fileguid *guid); +void savebuffer_read_guid(struct savebuffer *buffer, struct fileguid *guid); +void format_time(char *dst, s32 time60, s32 precision); void func0f0d5a7c(void); #endif diff --git a/src/include/game/setup.h b/src/include/game/setup.h index b09f0f1ca..aff5def38 100644 --- a/src/include/game/setup.h +++ b/src/include/game/setup.h @@ -4,35 +4,35 @@ #include "data.h" #include "types.h" -void setupPreparePads(void); -void setupLoadWaypoints(void); -void setupPrepareCover(void); +void setup_prepare_pads(void); +void setup_load_waypoints(void); +void setup_prepare_cover(void); -void propsReset(void); -void setupCreateLiftDoor(struct linkliftdoorobj *link); -void setupCreatePadlockedDoor(struct padlockeddoorobj *link); -void setupCreateSafeItem(struct safeitemobj *link); -void setupCreateConditionalScenery(struct linksceneryobj *link); -void setupCreateBlockedPath(struct blockedpathobj *link); -void setupReset0f00cc8c(void); -void setupResetProxyMines(void); -s32 setupCountCommandType(u32 type); -void setupCreateObject(struct defaultobj *obj, s32 cmdindex); -void setupPlaceWeapon(struct weaponobj *weapon, s32 cmdindex); -void setupCreateHat(struct hatobj *hat, s32 cmdindex); -void setupCreateKey(struct keyobj *key, s32 cmdindex); -void setupCreateMine(struct mineobj *mine, s32 cmdindex); -void setupCreateCctv(struct cctvobj *camera, s32 cmdindex); -void setupCreateAutogun(struct autogunobj *autogun, s32 cmdindex); -void setupCreateHangingMonitors(struct hangingmonitorsobj *monitors, s32 cmdindex); -void setupCreateSingleMonitor(struct singlemonitorobj *monitor, s32 cmdindex); -void setupCreateMultiMonitor(struct multimonitorobj *monitor, s32 cmdindex); -s32 setupGetPortalByPad(s32 padnum); -s32 setupGetPortalByDoorPad(s32 padnum); -void setupCreateDoor(struct doorobj *door, s32 cmdindex); -void setupCreateHov(struct defaultobj *obj, struct hov *hov); -void setupLoadBriefing(s32 stagenum, u8 *buffer, s32 bufferlen, struct briefing *briefing); -void setupLoadFiles(s32 stagenum); -void setupCreateProps(s32 stagenum); +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); #endif diff --git a/src/include/game/setuputils.h b/src/include/game/setuputils.h index 86cad9dea..104455c48 100644 --- a/src/include/game/setuputils.h +++ b/src/include/game/setuputils.h @@ -4,16 +4,16 @@ #include "data.h" #include "types.h" -u32 setupGetCmdLength(u32 *cmd); -u32 *setupGetCmdByIndex(s32 cmdindex); -s32 setupGetCmdIndexByTag(struct tag *tag); -u32 setupGetCmdIndexByProp(struct prop *prop); -bool setupLoadModeldef(s32 modelnum); -bool setupGetObjBbox(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], struct coord *arg3, struct coord *arg4); +u32 setup_get_cmd_length(u32 *cmd); +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 setup0f09233c(struct defaultobj *obj, struct coord *pos, f32 realrot[3][3], RoomNum *rooms); void setup0f0923d4(struct defaultobj *obj); -struct defaultobj *setupGetObjByCmdIndex(u32 cmdindex); -struct defaultobj *setupFindObjForReuse(s32 type, struct defaultobj **arg1, struct defaultobj **arg2, bool musthaveprop, bool musthavemodel, struct modeldef *modeldef); +struct defaultobj *setup_get_obj_by_cmd_index(u32 cmdindex); +struct defaultobj *setup_find_obj_for_reuse(s32 type, struct defaultobj **arg1, struct defaultobj **arg2, bool musthaveprop, bool musthavemodel, struct modeldef *modeldef); #endif diff --git a/src/include/game/shards.h b/src/include/game/shards.h index 3681d77ee..54928afe4 100644 --- a/src/include/game/shards.h +++ b/src/include/game/shards.h @@ -4,10 +4,10 @@ #include "data.h" #include "types.h" -void shardsCreate(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 xmin, f32 xmax, f32 ymin, f32 ymax, s32 type, struct prop *prop); -void shardsReset(void); -Gfx *shardsRender(Gfx *gdl); -void shardsStop(void); -void shardsTick(void); +void shards_create(struct coord *pos, f32 *rotx, f32 *roty, f32 *rotz, f32 xmin, f32 xmax, f32 ymin, f32 ymax, s32 type, struct prop *prop); +void shards_reset(void); +Gfx *shards_render(Gfx *gdl); +void shards_stop(void); +void shards_tick(void); #endif diff --git a/src/include/game/sight.h b/src/include/game/sight.h index bae1e87cd..324a89f07 100644 --- a/src/include/game/sight.h +++ b/src/include/game/sight.h @@ -4,25 +4,25 @@ #include "data.h" #include "types.h" -bool sightIsPropFriendly(struct prop *prop); -bool sightCanTargetProp(struct prop *prop, s32 max); -bool sightIsReactiveToProp(struct prop *prop); -s32 sightFindFreeTargetIndex(s32 max); +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 sightTick(bool sighton); -s32 sightCalculateBoxBound(s32 arg0, s32 arg1, s32 arg2, s32 arg3); -Gfx *sightDrawTargetBox(Gfx *gdl, struct trackedprop *trackedprop, s32 textid, s32 time); -Gfx *sightDrawAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colour); -Gfx *sightDrawDelayedAimer(Gfx *gdl, s32 x, s32 y, s32 radius, s32 cornergap, u32 colour); -Gfx *sightDrawDefault(Gfx *gdl, bool sighton); -Gfx *sightDrawClassic(Gfx *gdl, bool sighton); -Gfx *sightDrawType2(Gfx *gdl, bool sighton); -Gfx *sightDrawSkedarTriangle(Gfx *gdl, s32 x, s32 y, s32 dir, u32 colour); -Gfx *sightDrawSkedar(Gfx *gdl, bool sighton); -Gfx *sightDrawZoom(Gfx *gdl, bool sighton); -Gfx *sightDrawMaian(Gfx *gdl, bool sighton); -Gfx *sightDrawTarget(Gfx *gdl); -bool sightHasTargetWhileAiming(s32 sight); -Gfx *sightDraw(Gfx *gdl, bool sighton, s32 sight); +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 ffb77834a..5a0e74b60 100644 --- a/src/include/game/sky.h +++ b/src/include/game/sky.h @@ -4,32 +4,32 @@ #include "data.h" #include "types.h" -void skyReset(u32 stagenum); +void sky_reset(u32 stagenum); -void skyTick(void); +void sky_tick(void); -void skyGetWorldPosFromScreenPos(f32 left, f32 top, struct coord *dst); -bool skyIsScreenCornerInSky(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac); -bool skyIsCornerInWater(struct coord *corner3dpos, struct coord *dstpos, f32 *dstfrac); -void skyCalculateEdgeVertex(struct coord *arg0, struct coord *arg1, struct coord *out); -f32 skyClamp(f32 value, f32 min, f32 max); -f32 skyRound(f32 value); -void skyChooseCloudVtxColour(struct skyvtx3d *arg0, f32 arg1); -void skyChooseWaterVtxColour(struct skyvtx3d *arg0, f32 arg1); -Gfx *skyRender(Gfx *gdl); -void skyConvertVertex(struct skyvtx3d *arg0, Mtxf *arg1, u16 arg2, f32 arg3, f32 arg4, struct skyvtx2d *arg5); -bool skyVerticesAreSame(struct skyvtx2d *arg0, struct skyvtx2d *arg1); -Gfx *skyRenderTri(Gfx *gdl, struct skyvtx2d *arg1, struct skyvtx2d *arg2, struct skyvtx2d *arg3, f32 arg4, bool textured); -Gfx *skyRenderFull(Gfx *gdl, struct skyvtx2d *arg1, struct skyvtx2d *arg2, struct skyvtx2d *arg3, struct skyvtx2d *arg4, f32 arg5); -void skyCreateSunArtifact(struct artifact *artifact, s32 x, s32 y); -f32 skyGetArtifactGroupIntensityFrac(struct artifact *artifacts); -Gfx *skyRenderSuns(Gfx *gdl, bool xray); -Gfx *skyRenderFlare(Gfx *gdl, f32 x, f32 y, f32 intensityfrac, f32 size, s32 flaretimer240, f32 alphafrac); -Gfx *skyRenderTeleportFlare(Gfx *gdl, f32 x, f32 y, f32 z, f32 size, f32 intensityfrac); -Gfx *skyRenderTeleportFlares(Gfx *gdl); -Gfx *skyRenderArtifacts(Gfx *gdl); -void skySetOverexposure(s32 arg0, s32 arg1, s32 arg2); -s32 skyCalculateOverexposureComponent(s32 arg0, s32 arg1); -Gfx *skyRenderOverexposure(Gfx *gdl); +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 221ecda59..26368f921 100644 --- a/src/include/game/smoke.h +++ b/src/include/game/smoke.h @@ -4,23 +4,23 @@ #include "data.h" #include "types.h" -void smokesInit(void); +void smokes_init(void); -void smokeReset(void); +void smoke_reset(void); -void smokeStop(void); +void smoke_stop(void); -Gfx *smokeRenderPart(struct smoke *smoke, struct smokepart *part, Gfx *gdl, struct coord *coord, f32 size); -struct smoke *smokeCreate(struct coord *pos, RoomNum *rooms, s16 type); -bool smokeCreateForHand(struct coord *pos, RoomNum *rooms, s16 type, s32 handnum); -bool smokeCreateWithSource(void *source, struct coord *pos, RoomNum *rooms, s16 type, bool srcispadeffect); -void smokeCreateAtProp(struct prop *prop, s16 type); -void smokeCreateAtPadEffect(struct padeffectobj *effect, struct coord *pos, RoomNum *rooms, s16 type); -void smokeClearForProp(struct prop *prop); -struct smoke *smokeCreateSimple(struct coord *pos, RoomNum *rooms, s16 type); -u32 smokeTick(struct prop *prop); -u32 smokeTickPlayer(struct prop *prop); -Gfx *smokeRender(struct prop *prop, Gfx *gdl, bool xlupass); -void smokeClearSomeTypes(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); +struct smoke *smoke_create_simple(struct coord *pos, RoomNum *rooms, s16 type); +u32 smoke_tick(struct prop *prop); +u32 smoke_tick_player(struct prop *prop); +Gfx *smoke_render(struct prop *prop, Gfx *gdl, bool xlupass); +void smoke_clear_some_types(void); #endif diff --git a/src/include/game/sparks.h b/src/include/game/sparks.h index a10fdfae9..e8ca34751 100644 --- a/src/include/game/sparks.h +++ b/src/include/game/sparks.h @@ -4,13 +4,13 @@ #include "data.h" #include "types.h" -void sparksReset(void); +void sparks_reset(void); -void sparksTick(void); +void sparks_tick(void); -void sparkCreate(struct coord *pos, struct sparktype *type); -void sparkgroupEnsureFreeSparkSlot(struct sparkgroup *group); -void sparksCreate(s32 room, struct prop *prop, struct coord *pos, struct coord *arg3, struct coord *dir, s32 type); -Gfx *sparksRender(Gfx *gdl); +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); #endif diff --git a/src/include/game/splat.h b/src/include/game/splat.h index 5ebc854a3..96a7c7415 100644 --- a/src/include/game/splat.h +++ b/src/include/game/splat.h @@ -4,10 +4,10 @@ #include "data.h" #include "types.h" -void splatTickChr(struct prop *prop); -void splatsCreateForChrHit(struct prop *prop, struct shotdata *arg1, struct coord *arg2, struct coord *arg3, s32 arg4, s32 arg5, struct chrdata *arg6); -s32 splatsCreate(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 splatsTick(void); -void splatResetChr(struct chrdata *chr); +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); #endif diff --git a/src/include/game/stagemusic.h b/src/include/game/stagemusic.h index e77c422eb..53a1d0bdc 100644 --- a/src/include/game/stagemusic.h +++ b/src/include/game/stagemusic.h @@ -4,8 +4,8 @@ #include "data.h" #include "types.h" -s32 stageGetPrimaryTrack(s32 stagenum); -s32 stageGetAmbientTrack(s32 stagenum); -s32 stageGetNrgTrack(s32 stagenum); +s32 stage_get_primary_track(s32 stagenum); +s32 stage_get_ambient_track(s32 stagenum); +s32 stage_get_nrg_track(s32 stagenum); #endif diff --git a/src/include/game/stagetable.h b/src/include/game/stagetable.h index 91323033e..5e1b2ef66 100644 --- a/src/include/game/stagetable.h +++ b/src/include/game/stagetable.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -struct stagetableentry *stageGetCurrent(void); -s32 stageGetIndex(s32 stagenum); +struct stagetableentry *stage_get_current(void); +s32 stage_get_index(s32 stagenum); #endif diff --git a/src/include/game/stars.h b/src/include/game/stars.h index 07e4d7e98..50c843a94 100644 --- a/src/include/game/stars.h +++ b/src/include/game/stars.h @@ -5,8 +5,8 @@ #include "types.h" void stars0f135c70(void); -void starInsert(s32 arg0, struct coord *arg1); -void starsReset(void); -Gfx *starsRender(Gfx *gdl); +void star_insert(s32 arg0, struct coord *arg1); +void stars_reset(void); +Gfx *stars_render(Gfx *gdl); #endif diff --git a/src/include/game/tex.h b/src/include/game/tex.h index e14fc9eea..9d6cb8a18 100644 --- a/src/include/game/tex.h +++ b/src/include/game/tex.h @@ -4,29 +4,29 @@ #include "data.h" #include "types.h" -void texInit(void); +void tex_init(void); -void surfaceReset(void); +void surface_reset(void); -void texSetBitstring(u8 *arg0); -s32 texReadBits(s32 arg0); -void texReset(void); +void tex_set_bitstring(u8 *arg0); +s32 tex_read_bits(s32 arg0); +void tex_reset(void); -s32 texGetMask(s32 value); +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 texSetRenderMode(Gfx **gdlptr, s32 arg1, s32 numcycles, s32 arg3); -void texLoadFromConfig(struct textureconfig *config); -void texSelect(Gfx **gdl, struct textureconfig *tconfig, u32 arg2, s32 arg3, u32 ulst, bool arg5, struct texpool *pool); +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 texGetWidthAtLod(struct tex *tex, s32 lod); -s32 texGetHeightAtLod(struct tex *tex, s32 lod); -s32 texGetLineSizeInBytes(struct tex *tex, s32 lod); -s32 texGetSizeInBytes(struct tex *tex, s32 lod); -void texGetDepthAndSize(struct tex *tex, s32 *arg1, s32 *arg2); -s32 texLoadFromGdl(Gfx *instart, s32 gdlsizeinbytes, Gfx *outstart, struct texpool *pool, u8 *vtxstart); -void texCopyGdls(Gfx *src, Gfx *dst, s32 numbytes); +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); #endif diff --git a/src/include/game/texdecompress.h b/src/include/game/texdecompress.h index 8dada258c..54cc0094a 100644 --- a/src/include/game/texdecompress.h +++ b/src/include/game/texdecompress.h @@ -5,35 +5,35 @@ #include "types.h" void func0f16e810(u32 arg0); -s32 texInflateZlib(u8 *src, u8 *dst, bool arg2, s32 forcenumimages, struct texpool *pool, s32 unusedarg); -s32 texAlignIndices(u8 *arg0, s32 width, s32 height, s32 format, u8 *dst); -s32 texGetAverageRed(u16 colour1, u16 colour2, u16 colour3, u16 colour4); -s32 texGetAverageGreen(u16 colour1, u16 colour2, u16 colour3, u16 colour4); -s32 texGetAverageBlue(u16 colour1, u16 colour2, u16 colour3, u16 colour4); -s32 texGetAverageAlpha(u16 colour1, u16 colour2, u16 colour3, u16 colour4); -s32 texShrinkPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format, u16 *palette, s32 numcolours); -s32 texFindClosestColourIndexRGBA(u8 *palette, s32 numcolours, s32 r, s32 g, s32 b, s32 a); -s32 texFindClosestColourIndexIA(u16 *palette, s32 numcolours, s32 intensity, s32 alpha); -s32 texInflateNonZlib(u8 *src, u8 *dst, s32 arg2, s32 forcenumimages, struct texpool *pool, s32 unusedarg); -s32 texShrinkNonPaletted(u8 *src, u8 *dst, s32 srcwidth, s32 srcheight, s32 format); -void texInflateHuffman(u8 *dst, s32 numiterations, s32 chansize); -void texInflateRle(u8 *arg0, s32 arg1); -s32 texBuildLookup(u8 *arg0, s32 bpp); -s32 texGetBitSize(s32 arg0); -void texReadAlphaBits(u8 *dst, s32 count); -s32 texReadUncompressed(u8 *dst, s32 width, s32 height, s32 format); -s32 texChannelsToPixels(u8 *src, s32 width, s32 height, u8 *dst, s32 format); -s32 texInflateLookup(s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, s32 format); -s32 texInflateLookupFromBuffer(u8 *src, s32 width, s32 height, u8 *dst, u8 *lookup, s32 numcolours, s32 format); -void texSwizzle(u8 *arg0, s32 width, s32 height, s32 format); -void texBlur(u8 *pixels, s32 width, s32 height, s32 method, s32 chansize); -void texInitPool(struct texpool *pool, u8 *start, s32 len); -struct tex *texFindInPool(s32 texturenum, struct texpool *pool); -s32 texGetPoolFreeBytes(struct texpool *pool); -u8 *texGetPoolLeftPos(struct texpool *pool); -void texLoadFromDisplayList(Gfx *gdl, struct texpool *pool, s32 arg2); -void texLoad(s32 *updateword, struct texpool *pool, bool unusedarg); -void texLoadFromConfigs(struct textureconfig *configs, s32 numconfigs, struct texpool *pool, s32 arg3); -void texLoadFromTextureNum(u32 arg0, struct texpool *pool); +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); +void tex_load_from_configs(struct textureconfig *configs, s32 numconfigs, struct texpool *pool, s32 arg3); +void tex_load_from_texture_num(u32 arg0, struct texpool *pool); #endif diff --git a/src/include/game/tiles.h b/src/include/game/tiles.h index b7e1e17e7..e97c11ff5 100644 --- a/src/include/game/tiles.h +++ b/src/include/game/tiles.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -void tilesReset(void); +void tiles_reset(void); #endif diff --git a/src/include/game/timing.h b/src/include/game/timing.h index b93b2ee81..4692805e4 100644 --- a/src/include/game/timing.h +++ b/src/include/game/timing.h @@ -4,9 +4,9 @@ #include "data.h" #include "types.h" -void frametimeInit(void); -void frametimeApply(s32 diffframe60, s32 diffframe240, s32 frametime); -void frametimeCalculate(void); +void frametime_init(void); +void frametime_apply(s32 diffframe60, s32 diffframe240, s32 frametime); +void frametime_calculate(void); void func0f16cf94(void); extern const char var7f1b78c0[]; diff --git a/src/include/game/title.h b/src/include/game/title.h index 6dc4ed517..3dfce006d 100644 --- a/src/include/game/title.h +++ b/src/include/game/title.h @@ -10,58 +10,58 @@ extern u32 var800624d4; extern u32 var800624d8; extern u32 var800624dc; -void titleInit(void); +void title_init(void); -void titleReset(void); +void title_reset(void); -Gfx *titleClear(Gfx *gdl); +Gfx *title_clear(Gfx *gdl); -char *mpPlayerGetWeaponOfChoiceName(u32 playernum, u32 slot); -void titleSetLight(Lights1 *light, u8 r, u8 g, u8 b, f32 luminosity, struct coord *dir); -void titleInitLegal(void); -void titleTickLegal(void); -void titleInitCheckControllers(void); -void titleExitCheckControllers(void); -void titleTickCheckControllers(void); -Gfx *titleRenderCheckControllers(Gfx *gdl); -Gfx *titleRenderLegal(Gfx *gdl); -void titleInitPdLogo(void); -void titleExitPdLogo(void); -void titleTickPdLogo(void); -Gfx *titleRenderPdLogoModel(Gfx *gdl, struct model *model, s32 arg2, f32 arg3, s32 arg4, f32 arg5, Mtxf *arg6, Vtx *vertices, Col *colours); -void titleSkipToPdTitle(void); -Gfx *titleRenderPdLogo(Gfx *gdl); -void titleInitRarePresents(void); -void titleExitRarePresents(void); -void titleTickRarePresents(void); -Gfx *titleRenderTypewriterText(Gfx *gdl, s32 *x, s32 *y, u16 textnum, s32 timer, s32 *colourcomponent); -Gfx *titleRenderRarePresents(Gfx *gdl); -void titleInitNintendoLogo(void); -void titleExitNintendoLogo(void); -void titleTickNintendoLogo(void); -Gfx *titleRenderNintendoLogo(Gfx *gdl); -void titleInitRareLogo(void); -void titleExitRareLogo(void); -void titleTickRareLogo(void); +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 *titleRenderRareLogo(Gfx *gdl); -void titleInitSkip(void); -void titleInitNoController(void); -void titleTickNoController(void); -Gfx *titleRenderNoController(Gfx *gdl); -void titleSetNextMode(s32 mode); -void titleTick(void); -bool titleIsChangingMode(void); -bool titleIsKeepingMode(void); -void titleExit(void); -void titleInitFromAiCmd(u32 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); +bool title_is_keeping_mode(void); +void title_exit(void); +void title_init_from_ai_cmd(u32 arg0); bool func0f01ad5c(void); void func0f01adb8(void); -void titleTickOld(void); -Gfx *titleRender(Gfx *gdl); -void titleExitLegal(void); -s32 getNumPlayers(void); -void setNumPlayers(s32 numplayers); -void titleExitNoController(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 d23654652..6b477b067 100644 --- a/src/include/game/training.h +++ b/src/include/game/training.h @@ -11,127 +11,127 @@ extern u8 var80088bb4; extern u8 g_HangarBioSlot; extern u8 g_DtSlot; -bool ciIsTourDone(void); -u8 ciGetFiringRangeScore(s32 weaponindex); -void frSaveScoreIfBest(s32 weaponindex, s32 difficulty); -u8 frIsWeaponFound(s32 weapon); -void frSetWeaponFound(s32 weaponnum); -s32 ciIsStageComplete(s32 stageindex); +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 frIsWeaponAvailable(s32 weapon); -u32 frGetWeaponIndexByWeapon(u32 weaponnum); -u32 frGetWeaponScriptIndex(u32 weaponnum); -s32 frIsClassicWeaponUnlocked(u32 weapon); -s32 frGetSlot(void); -void frSetSlot(s32 slot); -u32 frGetWeaponBySlot(s32 slot); -s32 frGetNumWeaponsAvailable(void); -void frInitLighting(void); -void frRestoreLighting(void); -void frReset(void); -void *frLoadRomData(u32 len); -void frSetDifficulty(s32 difficulty); -u32 frGetDifficulty(void); -void frInitDefaults(void); -struct frdata *frGetData(void); -u32 frResolveFrPad(u32 arg0); -bool frIsDifficulty(u32 difficulties); -void frExecuteWeaponScript(s32 scriptindex); -void frSetTargetProps(void); -bool frTargetIsAtScriptStart(s32 targetnum); -char *frGetInstructionalText(u32 index); -void frExecuteHelpScript(void); -bool frExecuteTargetScript(s32 targetnum); -void frHideAllTargets(void); -void frInitTargets(void); -void frCloseAndLockDoor(void); -void frUnlockDoor(void); -void frLoadData(void); -u32 frInitAmmo(s32 weapon); -void frBeginSession(s32 weapon); -char *frGetWeaponDescription(void); -void frEndSession(bool hidetargets); -bool frWasTooInaccurate(void); -void frSetFailReason(s32 failreason); -void frSetCompleted(void); -bool frIsTargetOneHitExplodable(struct prop *prop); -f32 frGetTargetAngleToPos(struct coord *a, f32 angle, struct coord *b); -bool frIsTargetFacingPos(struct prop *prop, struct coord *pos); -struct prop *frChooseAutogunTarget(struct coord *autogunpos); -bool frIsAmmoWasted(void); -void frTick(void); +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 frChooseFarsightTarget(void); -s32 frIsInTraining(void); -void frCalculateHit(struct defaultobj *obj, struct coord *hitpos, f32 maulercharge); -void frIncrementNumShots(void); -bool ciIsChrBioUnlocked(u32 bodynum); -struct chrbio *ciGetChrBioByBodynum(u32 bodynum); -char *ciGetChrBioDescription(void); -s32 ciGetNumUnlockedChrBios(void); -s32 ciGetChrBioBodynumBySlot(s32 slot); -struct miscbio *ciGetMiscBio(s32 index); -bool ciIsMiscBioUnlocked(s32 index); -s32 ciGetNumUnlockedMiscBios(void); -s32 ciGetMiscBioIndexBySlot(s32 slot); -char *ciGetMiscBioDescription(void); -bool ciIsHangarBioAVehicle(s32 index); -struct hangarbio *ciGetHangarBio(s32 index); -bool ciIsHangarBioUnlocked(u32 bioindex); -s32 ciGetNumUnlockedLocationBios(void); -s32 ciGetNumUnlockedHangarBios(void); -s32 ciGetHangarBioIndexBySlot(s32 slot); -char *ciGetHangarBioDescription(void); -struct trainingdata *dtGetData(void); -void dtRestorePlayer(void); -void dtPushEndscreen(void); -void dtTick(void); +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 dtBegin(void); -void dtEnd(void); -bool dtIsAvailable(s32 deviceindex); -s32 dtGetNumAvailable(void); -s32 dtGetIndexBySlot(s32 wantindex); -u32 dtGetWeaponByDeviceIndex(s32 deviceindex); -u32 ciGetStageFlagByDeviceIndex(u32 deviceindex); -char *dtGetDescription(void); -char *dtGetTip1(void); -char *dtGetTip2(void); -struct trainingdata *getHoloTrainingData(void); -void htPushEndscreen(void); -void htTick(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); +struct trainingdata *get_holo_training_data(void); +void ht_push_endscreen(void); +void ht_tick(void); void func0f1a2198(void); -void htBegin(void); -void htEnd(void); -bool htIsUnlocked(u32 value); -s32 htGetNumUnlocked(void); -s32 htGetIndexBySlot(s32 slot); -char *htGetName(s32 index); +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 *htGetDescription(void); -char *htGetTip1(void); -char *htGetTip2(void); +char *ht_get_description(void); +char *ht_get_tip1(void); +char *ht_get_tip2(void); #if VERSION >= VERSION_JPN_FINAL -void frGetGoalTargetsText(char *buffer1, char *buffer2); -void frGetGoalScoreText(char *buffer1, char *buffer2); -bool frGetMinAccuracy(char *buffer1, f32 accuracy, char *buffer2); -bool frGetHudMiddleSubtext(char *buffer1, char *buffer2); -bool frGetFeedback(char *score, char *zone, char *extrabuffer); -Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, char *string3, u32 colour, u8 alpha); +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 frGetGoalTargetsText(char *buffer); -void frGetGoalScoreText(char *buffer); -bool frGetMinAccuracy(char *buffer, f32 accuracy); -bool frGetHudMiddleSubtext(char *buffer); -bool frGetFeedback(char *score, char *zone); -Gfx *frRenderHudElement(Gfx *gdl, s32 x, s32 y, char *string1, char *string2, u32 colour, u8 alpha); +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 frGetTargetsDestroyedValue(char *buffer); -void frGetScoreValue(char *buffer); -f32 frGetAccuracy(char *buffer); -bool frFormatTime(char *buffer); -Gfx *frRenderHud(Gfx *gdl); +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 4feaa1923..00fade9c2 100644 --- a/src/include/game/trainingmenus.h +++ b/src/include/game/trainingmenus.h @@ -4,58 +4,58 @@ #include "data.h" #include "types.h" -char *frMenuTextFailReason(struct menuitem *item); -char *frMenuTextDifficultyName(struct menuitem *item); -char *frMenuTextTimeTakenValue(struct menuitem *item); -char *frMenuTextScoreValue(struct menuitem *item); -char *frMenuTextWeaponName(struct menuitem *item); -char *frMenuTextTargetsDestroyedValue(struct menuitem *item); -char *frMenuTextAccuracyValue(struct menuitem *item); -char *frMenuTextGoalScoreLabel(struct menuitem *item); -char *frMenuTextGoalScoreValue(struct menuitem *item); -char *frMenuTextMinAccuracyOrTargetsLabel(struct menuitem *item); -char *frMenuTextMinAccuracyOrTargetsValue(struct menuitem *item); -char *frMenuTextTimeLimitLabel(struct menuitem *item); -char *frMenuTextTimeLimitValue(struct menuitem *item); -char *frMenuTextAmmoLimitLabel(struct menuitem *item); -char *frMenuTextAmmoLimitValue(struct menuitem *item); -char *ciMenuTextChrBioName(struct menuitem *item); -char *ciMenuTextChrBioAge(struct menuitem *item); -char *ciMenuTextChrBioRace(struct menuitem *item); -char *ciMenuTextMiscBioName(struct menuitem *item); -char *dtMenuTextName(struct menuitem *item); -char *dtMenuTextOkOrResume(struct menuitem *item); -char *dtMenuTextCancelOrAbort(struct menuitem *item); -char *dtMenuTextTimeTakenValue(struct menuitem *item); -char *htMenuTextName(struct menuitem *item); -char *htMenuTextOkOrResume(struct menuitem *item); -char *htMenuTextCancelOrAbort(struct menuitem *item); -char *htMenuTextTimeTakenValue(struct menuitem *item); -char *bioMenuTextName(struct menuitem *item); -char *ciMenuTextHangarBioSubheading(struct menuitem *item); -struct menudialogdef *ciGetFrWeaponListMenuDialog(void); -MenuDialogHandlerResult frTrainingInfoMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult frTrainingStatsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult ciCharacterProfileMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult dtTrainingDetailsMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult menudialogDeviceTrainingResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); +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 menudialogFiringRangeResults(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuDialogHandlerResult ciHangarHolographMenuDialog(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data); -MenuItemHandlerResult frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult frAbortMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerFrFailedContinue(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult ciOfficeInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, 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 htHoloListMenuHandler(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 ciHangarInformationMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data); -MenuItemHandlerResult frDifficultyMenuHandler(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 5e992a212..1a266fe92 100644 --- a/src/include/game/utils.h +++ b/src/include/game/utils.h @@ -8,14 +8,14 @@ void func0f176d70(s32 arg0); u32 align4(u32 arg0); u32 align16(u32 arg0); u32 align32(u32 arg0); -void utilsInit(void); +void utils_init(void); 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 coordsGetDistance(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 utilsReset(void); +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); diff --git a/src/include/game/vtxstore.h b/src/include/game/vtxstore.h index 450fea2aa..b807562ee 100644 --- a/src/include/game/vtxstore.h +++ b/src/include/game/vtxstore.h @@ -4,11 +4,11 @@ #include "data.h" #include "types.h" -void vtxstoreReset(void); +void vtxstore_reset(void); -void vtxstoreFixRefs(void *find, void *replacement); -void vtxstoreTick(void); -void *vtxstoreAllocate(s32 count, s32 index, struct modelnode *node, s32 level); -void vtxstoreFree(s32 type, void *arg1); +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); #endif diff --git a/src/include/game/wallhit.h b/src/include/game/wallhit.h index 9866462ee..0b961c1f0 100644 --- a/src/include/game/wallhit.h +++ b/src/include/game/wallhit.h @@ -4,33 +4,33 @@ #include "data.h" #include "types.h" -void wallhitReset(void); +void wallhit_reset(void); -s16 wallhitFinaliseAxis(f32 arg0); -void wallhitFree(struct wallhit *wallhit); -void wallhitsFreeByProp(struct prop *prop, s8 layer); -bool chrIsUsingPaintball(struct chrdata *chr); -void wallhitChooseBloodColour(struct prop *prop); -void wallhitFade(struct wallhit *wallhit, u32 arg1); -bool wallhitRemoveOneInRoom(s32 arg0); -void wallhitRemoveOne(void); -void wallhitsTick(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 wallhitCreate(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], +void wallhit_create(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], s16 arg4[3], s16 texnum, RoomNum room, struct prop *objprop, s8 mtxindex, s8 arg9, struct chrdata *chr, bool xlu); -void wallhitCreateWith20Args(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], +void wallhit_create_with_20_args(struct coord *relpos, struct coord *arg1, struct coord *arg2, s16 arg3[3], s16 arg4[3], s16 texnum, RoomNum room, struct prop *objprop, struct prop *chrprop, s8 mtxindex, s8 arg10, struct chrdata *chr, f32 width, f32 height, u8 minalpha, u8 maxalpha, s32 rotdeg, u32 timermax, u32 timerspeed, bool xlu); s32 wallhit0f140750(struct coord *coord); -Gfx *wallhitRenderPropHits(Gfx *gdl, struct prop *prop, bool xlupass); -Gfx *wallhitRenderBgHits(s32 roomnum, Gfx *gdl); -void wallhitsRecolour(void); -void wallhitFadeSplatsForRemovedChr(struct prop *chrprop); -void wallhitRemoveOldestWoundedSplatByChr(struct prop *chrprop); +Gfx *wallhit_render_prop_hits(Gfx *gdl, struct prop *prop, bool xlupass); +Gfx *wallhit_render_bg_hits(s32 roomnum, Gfx *gdl); +void wallhits_recolour(void); +void wallhit_fade_splats_for_removed_chr(struct prop *chrprop); +void wallhit_remove_oldest_wounded_splat_by_chr(struct prop *chrprop); #endif diff --git a/src/include/game/weather.h b/src/include/game/weather.h index 053d8811c..519175469 100644 --- a/src/include/game/weather.h +++ b/src/include/game/weather.h @@ -4,23 +4,23 @@ #include "data.h" #include "types.h" -void weatherReset(void); +void weather_reset(void); -void weatherTick(void); +void weather_tick(void); -Gfx *weatherRender(Gfx *gdl); -void weatherSetBoundaries(struct weatherparticledata *data, s32 index, f32 min, f32 max); -struct weatherparticledata *weatherAllocateParticles(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 weatherSetIntensity(s32 intensity); -void weatherTickRain(struct weatherdata *weather); -void weatherTickSnow(struct weatherdata *weather); -void weatherConfigureRain(u32 intensity); -void weatherConfigureSnow(u32 intensity); -bool weatherIsRoomWeatherProof(s32 room); -Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2); -Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2); -void weatherStop(void); +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 7addb41d3..70d0f1a57 100644 --- a/src/include/game/zbuf.h +++ b/src/include/game/zbuf.h @@ -4,12 +4,12 @@ #include "data.h" #include "types.h" -void *zbufGetAllocation(void); -void zbufReset(s32 stagenum); -void zbufAllocate(void); -void zbufSwap(void); -Gfx *zbufConfigureRdp(Gfx *gdl); -Gfx *zbufClear(Gfx *gdl); -Gfx *zbufDrawArtifactsOffscreen(Gfx *gdl); +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); +Gfx *zbuf_draw_artifacts_offscreen(Gfx *gdl); #endif diff --git a/src/include/lib/ailist.h b/src/include/lib/ailist.h index 439581e8e..be1d60d98 100644 --- a/src/include/lib/ailist.h +++ b/src/include/lib/ailist.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -u8 *ailistFindById(s32 ailistid); +u8 *ailist_find_by_id(s32 ailistid); #endif diff --git a/src/include/lib/anim.h b/src/include/lib/anim.h index 908d41182..8778522ab 100644 --- a/src/include/lib/anim.h +++ b/src/include/lib/anim.h @@ -4,24 +4,24 @@ #include "data.h" #include "types.h" -void animsInit(void); -void animsInitTables(void); -void animsReset(void); -s32 animGetNumFrames(s16 anim_id); -bool animHasFrames(s16 animnum); -s32 animGetNumAnimations(void); -u8 *animDma(u8 *dst, u32 segoffset, u32 len); -s32 animGetRemappedFrame(s16 animnum, s32 frame); -bool animRemapFrameForLoad(s16 animnum, s32 frame, s32 *frameptr); -bool animIsFrameCutSkipped(s16 animnum, s32 frame); -u8 animLoadFrame(s16 animnum, s32 framenum); -void animForgetFrameBirths(void); -void animLoadHeader(s16 animnum); -s32 animReadBits(u8 *ptr, u8 readbitlen, u32 bitoffset); -s32 animReadSignedShort(u8 *arg0, u8 arg1, s32 arg2); -void animGetRotTranslateScale(s32 part, bool flip, struct skeleton *skel, s16 animnum, u8 frameslot, struct coord *rot, struct coord *translate, struct coord *scale); -u16 animGetPosAngleAsInt(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, s16 inttranslate[3], bool arg6); -f32 animGetTranslateAngle(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, struct coord *pos, bool arg6); -f32 animGetCameraValue(s32 part, s16 animnum, u8 frameslot); +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 arg6); +f32 anim_get_translate_angle(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, struct coord *pos, bool arg6); +f32 anim_get_camera_value(s32 part, s16 animnum, u8 frameslot); #endif diff --git a/src/include/lib/args.h b/src/include/lib/args.h index 307e1fa56..6bfd2fa65 100644 --- a/src/include/lib/args.h +++ b/src/include/lib/args.h @@ -4,10 +4,10 @@ #include "data.h" #include "types.h" -char *argParseString(char *str); -void argSetString(char *string); -s32 argsParseDebugArgs(void); -char *argFindByPrefix(s32 occurrence, char *string); -void argGetLevel(s32 *stagenum); +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); +void arg_get_level(s32 *stagenum); #endif diff --git a/src/include/lib/audiodma.h b/src/include/lib/audiodma.h index fcafd7421..cc95072b1 100644 --- a/src/include/lib/audiodma.h +++ b/src/include/lib/audiodma.h @@ -6,9 +6,9 @@ struct admastate; -void admaInit(void); -void *admaNew(struct admastate **state); -void admaBeginFrame(void); -void admaReceiveAll(void); +void adma_init(void); +void *adma_new(struct admastate **state); +void adma_begin_frame(void); +void adma_receive_all(void); #endif diff --git a/src/include/lib/audiomgr.h b/src/include/lib/audiomgr.h index 1a140dc94..6607c0c4a 100644 --- a/src/include/lib/audiomgr.h +++ b/src/include/lib/audiomgr.h @@ -4,16 +4,16 @@ #include "data.h" #include "types.h" -void amgrInit(void); +void amgr_init(void); #if VERSION >= VERSION_PAL_BETA -void amgrCreate(ALSynConfig *config, u32 *settings); +void amgr_create(ALSynConfig *config, u32 *settings); #else -void amgrCreate(ALSynConfig *config); +void amgr_create(ALSynConfig *config); #endif -void amgrStartThread(void); -OSMesgQueue *amgrGetFrameMesgQueue(void); -void amgrStopThread(void); +void amgr_start_thread(void); +OSMesgQueue *amgr_get_frame_mesg_queue(void); +void amgr_stop_thread(void); #endif diff --git a/src/include/lib/boot.h b/src/include/lib/boot.h index 2c359a0fc..2b2a9bb0a 100644 --- a/src/include/lib/boot.h +++ b/src/include/lib/boot.h @@ -3,9 +3,9 @@ #include void boot(void); -s32 bootGetMemSize(void); -void *bootAllocateStack(s32 threadid, s32 size); -void bootCreateThreads(void *arg); -void bootCheckStackOverflow(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 a227b2331..9ef2468a0 100644 --- a/src/include/lib/collision.h +++ b/src/include/lib/collision.h @@ -8,64 +8,64 @@ 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 cd00024e40(void); -void cdGetEdge(struct coord *pos1, struct coord *pos2, u32 line, char *file); -f32 cd00024e98(void); -s32 cd00024ea4(void); -struct prop *cdGetObstacleProp(void); -void cdGetPos(struct coord *pos, u32 line, char *file); -void cdGetObstacleNormal(struct coord *normal); -u32 cdGetGeoFlags(void); -void cdSetSavedPos(struct coord *pos1, struct coord *pos2); -bool cdGetSavedPos(struct coord *arg0, struct coord *arg1); -void cdGetGeoNormal(struct geo *geo, struct coord *normal); -void cdGetFloorCol(struct geo *tile, u16 *floorcol); -void cdGetFloorType(struct geo *tile, u8 *floortype); -bool cd000266a4(f32 x, f32 z, struct geo *tile); -void cdGetPropsOnPlatform(struct prop *platform, s16 *propnums, s32 len); -s32 cd000274e0Block(struct geoblock *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collision *collision); -bool cd000276c8Cyl(struct geocyl *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collision *collision); -bool cdFindLadder(struct coord *pos, f32 width, f32 ymax, f32 ymin, RoomNum *rooms, u16 geoflags, struct coord *laddernormal); -bool cd0002a13c(struct coord *pos, f32 radius, f32 arg2, f32 arg3, RoomNum *rooms, u16 geoflags); -f32 cdFindGroundInfoAtCyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *floorcol, u8 *floortype, u16 *floorflags, RoomNum *floorroom, s32 *inlift, struct prop **lift); -f32 cdReturnZero(void); -f32 cdFindGroundAtCyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *floorcol, u8 *floortype); -f32 cdFindFloorYColourTypeAtPos(struct coord *pos, RoomNum *rooms, u16 *floorcol, u8 *floortype); -s32 cdFindFloorRoomAtPos(struct coord *pos, RoomNum *nearrooms); +f32 cd_00024e40(void); +void cd_get_edge(struct coord *pos1, struct coord *pos2, u32 line, char *file); +f32 cd_00024e98(void); +s32 cd_00024ea4(void); +struct prop *cd_get_obstacle_prop(void); +void cd_get_pos(struct coord *pos, u32 line, char *file); +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); +bool cd_000276c8_cyl(struct geocyl *tile, f32 x, f32 z, f32 width, struct prop *prop, struct collision *collision); +bool cd_find_ladder(struct coord *pos, f32 width, f32 ymax, f32 ymin, RoomNum *rooms, u16 geoflags, struct coord *laddernormal); +bool cd_0002a13c(struct coord *pos, f32 radius, f32 arg2, f32 arg3, RoomNum *rooms, u16 geoflags); +f32 cd_find_ground_info_at_cyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *floorcol, u8 *floortype, u16 *floorflags, RoomNum *floorroom, s32 *inlift, struct prop **lift); +f32 cd_return_zero(void); +f32 cd_find_ground_at_cyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *floorcol, u8 *floortype); +f32 cd_find_floor_y_colour_type_at_pos(struct coord *pos, RoomNum *rooms, u16 *floorcol, u8 *floortype); +s32 cd_find_floor_room_at_pos(struct coord *pos, RoomNum *nearrooms); #if VERSION >= VERSION_NTSC_1_0 -RoomNum cdFindFloorRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr); -RoomNum cdFindCeilingRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr); +RoomNum cd_find_floor_room_y_colour_flags_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr); +RoomNum cd_find_ceiling_room_y_colour_flags_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr); #else -RoomNum cdFindFloorRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr); -RoomNum cdFindCeilingRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr); +RoomNum cd_find_floor_room_y_colour_flags_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr); +RoomNum cd_find_ceiling_room_y_colour_flags_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr); #endif -RoomNum cdFindFloorRoomYColourNormalPropAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcol, struct coord *normal, struct prop **propptr); -RoomNum cdFindCeilingRoomYColourFlagsNormalAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcol, u16 *geoflags, struct coord *normal); -s32 cdTestVolume(struct coord *pos, f32 radius, RoomNum *rooms, s32 types, bool checkvertical, f32 ymax, f32 ymin); -s32 cdExamCylMove01(struct coord *pos, struct coord *pos2, f32 radius, RoomNum *rooms, s32 types, bool checkvertical, f32 ymax, f32 ymin); -s32 cdExamCylMove02(struct coord *origpos, struct coord *dstpos, f32 width, RoomNum *dstrooms, s32 types, bool checkvertical, f32 ymax, f32 ymin); -bool cdTestCylMove01(struct coord *pos, RoomNum *rooms, struct coord *targetpos, u32 types, u32 arg4, f32 ymax, f32 ymin); -s32 cdTestCylMove02(struct coord *pos, RoomNum *rooms, struct coord *coord2, RoomNum *rooms2, u32 types, bool arg5, f32 ymax, f32 ymin); -s32 cdExamCylMove03(struct coord *pos, RoomNum *rooms, struct coord *arg2, u32 types, u32 arg4, f32 ymax, f32 ymin); -s32 cdTestCylMove04(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, s32 arg5, f32 ymax, f32 ymin); -s32 cdExamCylMove05(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, s32 types, bool arg5, f32 ymax, f32 ymin); -s32 cdExamCylMove06(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, f32 arg4, s32 types, s32 arg6, f32 ymax, f32 ymin); -s32 cdExamCylMove07(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, s32 arg5, f32 ymax, f32 ymin); -s32 cdExamCylMove08(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, f32 width, u32 types, s32 arg6, f32 ymax, f32 ymin); -bool cdTestLos03(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, u32 types, u16 geoflags); -bool cdTestLos04(struct coord *coord, RoomNum *rooms, struct coord *coord2, s32 arg3); -bool cdTestLos05(struct coord *coord, RoomNum *rooms, struct coord *coord2, RoomNum *rooms2, s32 cdtypes, u16 geoflags); -bool cdTestLos06(struct coord *arg0, RoomNum *rooms1, struct coord *arg2, RoomNum *rooms2, u32 types); -bool cdTestLos07(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, RoomNum *rooms3, u32 types, u16 geoflags); -s32 cdExamLos08(struct coord *pos, RoomNum *rooms, struct coord *pos2, u32 types, u16 geoflags); -s32 cdExamLos09(struct coord *pos, RoomNum *rooms, struct coord *pos2, u32 types); -s32 cdTestLos10(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, u16 geoflags); -s32 cdTestLos11(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types); -bool cd0002ded8(struct coord *arg0, struct coord *arg1, struct prop *prop); -s32 cdTestBlockOverlapsAnyProp(struct geoblock *geo, RoomNum *rooms, u32 types); -s32 cd0002f02c(struct geoblock *block, RoomNum *rooms, s32 types); -bool cdIsNearlyInSight(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, f32 distance, s32 arg4); +RoomNum cd_find_floor_room_y_colour_normal_prop_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcol, struct coord *normal, struct prop **propptr); +RoomNum cd_find_ceiling_room_y_colour_flags_normal_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcol, u16 *geoflags, struct coord *normal); +s32 cd_test_volume(struct coord *pos, f32 radius, RoomNum *rooms, s32 types, bool checkvertical, f32 ymax, f32 ymin); +s32 cd_exam_cyl_move01(struct coord *pos, struct coord *pos2, f32 radius, RoomNum *rooms, s32 types, bool checkvertical, f32 ymax, f32 ymin); +s32 cd_exam_cyl_move02(struct coord *origpos, struct coord *dstpos, f32 width, RoomNum *dstrooms, s32 types, bool checkvertical, f32 ymax, f32 ymin); +bool cd_test_cyl_move01(struct coord *pos, RoomNum *rooms, struct coord *targetpos, u32 types, u32 arg4, f32 ymax, f32 ymin); +s32 cd_test_cyl_move02(struct coord *pos, RoomNum *rooms, struct coord *coord2, RoomNum *rooms2, u32 types, bool arg5, f32 ymax, f32 ymin); +s32 cd_exam_cyl_move03(struct coord *pos, RoomNum *rooms, struct coord *arg2, u32 types, u32 arg4, f32 ymax, f32 ymin); +s32 cd_test_cyl_move04(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, s32 arg5, f32 ymax, f32 ymin); +s32 cd_exam_cyl_move05(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, s32 types, bool arg5, f32 ymax, f32 ymin); +s32 cd_exam_cyl_move06(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, f32 arg4, s32 types, s32 arg6, f32 ymax, f32 ymin); +s32 cd_exam_cyl_move07(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, s32 arg5, f32 ymax, f32 ymin); +s32 cd_exam_cyl_move08(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, f32 width, u32 types, s32 arg6, f32 ymax, f32 ymin); +bool cd_test_los03(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, u32 types, u16 geoflags); +bool cd_test_los04(struct coord *coord, RoomNum *rooms, struct coord *coord2, s32 arg3); +bool cd_test_los05(struct coord *coord, RoomNum *rooms, struct coord *coord2, RoomNum *rooms2, s32 cdtypes, u16 geoflags); +bool cd_test_los06(struct coord *arg0, RoomNum *rooms1, struct coord *arg2, RoomNum *rooms2, u32 types); +bool cd_test_los07(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, RoomNum *rooms3, u32 types, u16 geoflags); +s32 cd_exam_los08(struct coord *pos, RoomNum *rooms, struct coord *pos2, u32 types, u16 geoflags); +s32 cd_exam_los09(struct coord *pos, RoomNum *rooms, struct coord *pos2, u32 types); +s32 cd_test_los10(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, u16 geoflags); +s32 cd_test_los11(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types); +bool cd_0002ded8(struct coord *arg0, struct coord *arg1, struct prop *prop); +s32 cd_test_block_overlaps_any_prop(struct geoblock *geo, RoomNum *rooms, u32 types); +s32 cd_0002f02c(struct geoblock *block, RoomNum *rooms, s32 types); +bool cd_is_nearly_in_sight(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, f32 distance, s32 arg4); #endif diff --git a/src/include/lib/crash.h b/src/include/lib/crash.h index 3f72f5309..c1a5b28a3 100644 --- a/src/include/lib/crash.h +++ b/src/include/lib/crash.h @@ -93,21 +93,21 @@ extern u8 g_CrashHasMessage; extern bool g_CrashEnabled; #endif -void crashSetMessage(char *string); -void crashCreateThread(void); -u32 crashGetParentStackFrame(u32 *ptr, u32 *start, u32 sp, u32 *regs); -bool crashIsReturnAddress(u32 *instruction); -u32 crashGetStackEnd(u32 sp, s32 tid); -u32 crashGetStackStart(u32 arg0, s32 tid); -bool crashIsDouble(f32 value); -void crashPrintFloat(s32 index, f32 arg1); -void crashPrint2Floats(s32 index, f32 value1, f32 value2); -void crashPrint3Floats(s32 index, f32 value1, f32 value2, f32 value3); -void crashPutChar(s32 x, s32 y, char c); -void crashAppendChar(char c); -void crashScroll(s32 numlines); -void crashRenderChar(s32 x, s32 y, char c); -void crashReset(void); -void crashRenderFrame(u16 *fb); +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); #endif diff --git a/src/include/lib/debughud.h b/src/include/lib/debughud.h index ac2a34b8f..8481ba39b 100644 --- a/src/include/lib/debughud.h +++ b/src/include/lib/debughud.h @@ -4,15 +4,15 @@ #include "data.h" #include "types.h" -void dhudPutCharAt(s32 x, s32 y, char c); -void dhudInit(void); -void dhudReset(void); -void dhudClear(void); -void dhudSetPos(s32 x, s32 y); -void dhudSetFgColour(s32 r, s32 g, s32 b, s32 a); -void dhudSetBgColour(s32 r, s32 g, s32 b, s32 a); -void dhudPrintChar(u8 c); -void dhudPrintString(char *text); -Gfx *dhudRender(Gfx *gdl); +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); #endif diff --git a/src/include/lib/dma.h b/src/include/lib/dma.h index 18b588c2f..e56c974bd 100644 --- a/src/include/lib/dma.h +++ b/src/include/lib/dma.h @@ -4,12 +4,12 @@ #include "data.h" #include "types.h" -void dmaInit(void); -void dmaStart(void *memaddr, u32 romaddr, u32 len, bool priority); -void dmaCheckPiracy(void *memaddr, u32 len); -void dmaWait(void); -void dmaExec(void *memaddr, u32 romaddr, u32 len); -void dmaExecHighPriority(void *memaddr, u32 romaddr, u32 len); -void *dmaExecWithAutoAlign(void *memaddr, u32 romaddr, u32 len); +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); +void *dma_exec_with_auto_align(void *memaddr, u32 romaddr, u32 len); #endif diff --git a/src/include/lib/fault.h b/src/include/lib/fault.h index 1f1c51cfc..c78e6c873 100644 --- a/src/include/lib/fault.h +++ b/src/include/lib/fault.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void faultInit(void); -void faultAssert(char *msg, char *file, s32 line); +void fault_init(void); +void fault_assert(char *msg, char *file, s32 line); #endif diff --git a/src/include/lib/joy.h b/src/include/lib/joy.h index adff70a59..d81517cad 100644 --- a/src/include/lib/joy.h +++ b/src/include/lib/joy.h @@ -4,53 +4,53 @@ #include "data.h" #include "types.h" -void joyLockCyclicPolling(void); -void joyUnlockCyclicPolling(void); -void joySetPfsPollEnabled(bool enabled); -bool joyIsPfsPollEnabled(void); -void joySetPfsPollInterval(s32 value); -void joySetDefaultPfsPollInterval(void); -s32 joyShiftPfsStates(void); -void joyRecordPfsState(u8 pfsstate); -void joyPollPfs(s32 force); -void joySetPfsTemporarilyPlugged(s8 index); -void joyInit(void); -void joyDisableTemporarily(void); -void joyReset(void); +void joy_lock_cyclic_polling(void); +void joy_unlock_cyclic_polling(void); +void joy_set_pfs_poll_enabled(bool enabled); +bool joy_is_pfs_poll_enabled(void); +void joy_set_pfs_poll_interval(s32 value); +void joy_set_default_pfs_poll_interval(void); +s32 joy_shift_pfs_states(void); +void joy_record_pfs_state(u8 pfsstate); +void joy_poll_pfs(s32 force); +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 joyGetConnectedControllers(void); +u32 joy_get_connected_controllers(void); void joy00014238(void); -void joyDebugJoy(void); -s32 joyStartReadData(OSMesgQueue *mq); -void joyReadData(void); -void joysHandleRetrace(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 joyGetNumSamples(void); -s32 joyGetStickXOnSample(s32 samplenum, s8 contpadnum); -s32 joyGetStickYOnSample(s32 samplenum, s8 contpadnum); -s32 joyGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum); -u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask); -u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask); -s32 joyCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask); -s8 joyGetStickX(s8 contpadnum); -s8 joyGetStickY(s8 contpadnum); -u16 joyGetButtons(s8 contpadnum, u16 mask); -u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask); -bool joyIsCyclicPollingEnabled(void); +s32 joy_get_num_samples(void); +s32 joy_get_stick_x_on_sample(s32 samplenum, s8 contpadnum); +s32 joy_get_stick_y_on_sample(s32 samplenum, s8 contpadnum); +s32 joy_get_stick_y_on_sample_index(s32 samplenum, s8 contpadnum); +u16 joy_get_buttons_on_sample(s32 samplenum, s8 contpadnum, u16 mask); +u16 joy_get_buttons_pressed_on_sample(s32 samplenum, s8 contpadnum, u16 mask); +s32 joy_count_buttons_on_specific_samples(u32 *arg0, s8 contpadnum, u16 mask); +s8 joy_get_stick_x(s8 contpadnum); +s8 joy_get_stick_y(s8 contpadnum); +u16 joy_get_buttons(s8 contpadnum, u16 mask); +u16 joy_get_buttons_pressed_this_frame(s8 contpadnum, u16 mask); +bool joy_is_cyclic_polling_enabled(void); #if VERSION >= VERSION_NTSC_1_0 -void joyDisableCyclicPolling(void); -void joyEnableCyclicPolling(void); +void joy_disable_cyclic_polling(void); +void joy_enable_cyclic_polling(void); #else -void joyDisableCyclicPolling(s32 line, char *file); -void joyEnableCyclicPolling(s32 line, char *file); +void joy_disable_cyclic_polling(s32 line, char *file); +void joy_enable_cyclic_polling(s32 line, char *file); #endif -void joyDestroy(void); -void joyGetContpadNumsForPlayer(s8 playernum, s32 *pad1, s32 *pad2); -void joyStopRumble(s8 device, bool disablepolling); -s32 joyGetPakState(s8 device); -s32 joyGetPakState2(s8 device); -void joysTickRumble(void); +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_17ce0.h b/src/include/lib/lib_17ce0.h index a6d970059..68b0f7f93 100644 --- a/src/include/lib/lib_17ce0.h +++ b/src/include/lib/lib_17ce0.h @@ -8,9 +8,9 @@ #define PORTALINTERSECTION_BEHINDTOFRONT 1 #define PORTALINTERSECTION_FRONTTOBEHIND 2 -void portalGetAvgVertexPos(s32 portalnum, struct coord *avg); +void portal_get_avg_vertex_pos(s32 portalnum, struct coord *avg); void portal00017dc4(RoomNum *rooms, RoomNum roomnum); -s32 portalCalculateIntersection(s32 portalnum, struct coord *pos1, struct coord *pos2); +s32 portal_calculate_intersection(s32 portalnum, struct coord *pos1, struct coord *pos2); void portal00018148(struct coord *pos, struct coord *pos2, RoomNum *rooms, RoomNum *arg3, RoomNum *arg4, s32 arg5); #endif diff --git a/src/include/lib/lib_3e8c0.h b/src/include/lib/lib_3e8c0.h index 8b0ef8f9e..5771bbe34 100644 --- a/src/include/lib/lib_3e8c0.h +++ b/src/include/lib/lib_3e8c0.h @@ -4,14 +4,14 @@ #include "data.h" #include "types.h" -bool mp3decInit(void); +bool mp3dec_init(void); bool mp3dec00040164(struct asistream *stream, u32 gr, u32 ch); -bool mp3decUnpackScaleFac(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 mp3decReduceAliases(struct asistream *stream, u32 gr, u32 ch); -bool mp3decSetSideInfo(struct asistream *stream); -bool mp3decDecodeFrame(struct asistream *stream); +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); #endif diff --git a/src/include/lib/main.h b/src/include/lib/main.h index cecbeb216..9da673011 100644 --- a/src/include/lib/main.h +++ b/src/include/lib/main.h @@ -6,15 +6,15 @@ extern s32 g_MainIsBooting; -void mainInit(void); -void mainProc(void); -void mainOverrideVariable(char *name, void *value); -void mainLoop(void); -void mainTick(void); -void mainEndStage(void); -void mainChangeToStage(s32 stagenum); +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 mainGetStageNum(void); +s32 main_get_stage_num(void); #endif diff --git a/src/include/lib/mema.h b/src/include/lib/mema.h index c83878ef6..9bd72cb4a 100644 --- a/src/include/lib/mema.h +++ b/src/include/lib/mema.h @@ -4,15 +4,15 @@ #include "data.h" #include "types.h" -void memaDefrag(void); -void memaInit(void); -void memaReset(void *ptr, u32 size); -void memaPrint(void); -void *memaAlloc(u32 size); -s32 memaGrow(s32 addr, u32 amount); -void _memaFree(s32 addr, s32 size); -void memaFree(void *addr, s32 size); -s32 memaGetLongestFree(void); -bool memaRealloc(s32 addr, u32 oldsize, u32 newsize); +void mema_defrag(void); +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); +bool mema_realloc(s32 addr, u32 oldsize, u32 newsize); #endif diff --git a/src/include/lib/memp.h b/src/include/lib/memp.h index 7653e1fc1..69317799f 100644 --- a/src/include/lib/memp.h +++ b/src/include/lib/memp.h @@ -4,16 +4,16 @@ #include "data.h" #include "types.h" -void mempInit(void); -void mempSetHeap(u8 *heapstart, u32 heaplen); -u32 mempGetStageFree(void); -void *mempGetNextStageAllocation(void); -void *mempAlloc(u32 len, u8 pool); -s32 mempRealloc(void *allocation, s32 newsize, u8 poolnum); -u32 mempGetPoolFree(u8 poolnum, u32 bank); -u32 mempGetPoolSize(u8 poolnum, u32 bank); -void mempResetPool(u8 pool); -void mempDisablePool(u8 pool); -void *mempAllocFromRight(u32 len, u8 pool); +void memp_init(void); +void memp_set_heap(u8 *heapstart, u32 heaplen); +u32 memp_get_stage_free(void); +void *memp_get_next_stage_allocation(void); +void *memp_alloc(u32 len, u8 pool); +s32 memp_realloc(void *allocation, s32 newsize, u8 poolnum); +u32 memp_get_pool_free(u8 poolnum, u32 bank); +u32 memp_get_pool_size(u8 poolnum, u32 bank); +void memp_reset_pool(u8 pool); +void memp_disable_pool(u8 pool); +void *memp_alloc_from_right(u32 len, u8 pool); #endif diff --git a/src/include/lib/model.h b/src/include/lib/model.h index 7994a2a36..f5a5fdc25 100644 --- a/src/include/lib/model.h +++ b/src/include/lib/model.h @@ -9,102 +9,102 @@ extern Vtx *(*g_ModelVtxAllocatorFunc)(s32 numvertices); extern void (*g_ModelJointPositionedFunc)(s32 mtxindex, Mtxf *mtx); bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model); -void modelSetDistanceScale(f32 value); -void modelSetVtxAllocatorFunc(Vtx *(*fn)(s32 numvertices)); -s32 modelFindNodeMtxIndex(struct modelnode *node, s32 arg1); -Mtxf *modelFindNodeMtx(struct model *model, struct modelnode *node, s32 arg2); -Mtxf *modelGetRootMtx(struct model *model); -struct modelnode *modelFindNodeByMtxIndex(struct model *model, s32 mtxindex); -struct modelnode *modelNodeFindMtxNode(struct modelnode *node); -struct modelnode *modelNodeFindParentMtxNode(struct modelnode *node); -struct modelnode *modelNodeFindChildMtxNode(struct modelnode *node); -struct modelnode *modelNodeFindChildOrParentMtxNode(struct modelnode *node); -struct modelnode *modelGetPart(struct modeldef *arg0, s32 partnum); -void *modelGetPartRodata(struct modeldef *modeldef, s32 partnum); -f32 modelGetScreenDistance(struct model *model); -void *modelGetNodeRwData(struct model *model, struct modelnode *node); -void modelNodeGetPosition(struct model *model, struct modelnode *node, struct coord *pos); -void modelNodeSetPosition(struct model *model, struct modelnode *node, struct coord *pos); -void modelGetRootPosition(struct model *model, struct coord *pos); -void modelSetRootPosition(struct model *model, struct coord *pos); -void modelNodeGetModelRelativePosition(struct model *model, struct modelnode *node, struct coord *pos); -f32 modelGetChrRotY(struct model *model); -void modelSetChrRotY(struct model *model, f32 angle); -void modelSetScale(struct model *model, f32 scale); -void modelSetAnimScale(struct model *model, f32 scale); -f32 modelGetEffectiveScale(struct model *model); -void modelTweenPos(struct coord *pos, struct coord *to, f32 frac); -f32 modelTweenRotAxis(f32 arg0, f32 angle, f32 frac); -void modelTweenRot(struct coord *arg0, struct coord *arg1, f32 mult); -void modelUpdateChrInfo(struct model *model, struct modelnode *node); -void modelUpdateInfo(struct model *model); -void modelUpdateChrNodeMtx(struct modelrenderdata *arg0, struct model *model, struct modelnode *node); -void modelPositionJointUsingVecRot(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node, struct coord *rot, struct coord *pos, bool allowscale, struct coord *arg6); -void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node, f32 rot[4], struct coord *pos, struct coord *arg5); -void modelUpdatePositionNodeMtx(struct modelrenderdata *arg0, struct model *model, struct modelnode *node); -void modelUpdatePositionHeldNodeMtx(struct modelrenderdata *arg0, struct model *model, struct modelnode *node); -void modelUpdateDistanceRelations(struct model *model, struct modelnode *node); -void modelApplyDistanceRelations(struct model *model, struct modelnode *node); -void modelApplyToggleRelations(struct model *model, struct modelnode *node); -void modelApplyHeadRelations(struct model *model, struct modelnode *node); -void modelApplyReorderRelationsByArg(struct modelnode *basenode, bool reverse); -void modelApplyReorderRelations(struct model *model, struct modelnode *node); -void modelUpdateReorderRelations(struct model *model, struct modelnode *node); -void modelUpdateRelationsQuick(struct model *model, struct modelnode *node); -void modelUpdateRelations(struct model *model); -void modelUpdateMatrices(struct modelrenderdata *arg0, struct model *model); -void modelSetMatrices(struct modelrenderdata *arg0, struct model *model); -void modelSetMatricesWithAnim(struct modelrenderdata *renderdata, struct model *model); -s16 modelGetAnimNum(struct model *model); -bool modelIsFlipped(struct model *model); -f32 modelGetCurAnimFrame(struct model *model); -f32 modelGetAnimEndFrame(struct model *model); -s32 modelGetNumAnimFrames(struct model *model); -f32 modelGetAnimSpeed(struct model *model); -f32 modelGetAbsAnimSpeed(struct model *model); -s32 modelConstrainOrWrapAnimFrame(s32 frame, s16 animnum, f32 endframe); -void modelCopyAnimForMerge(struct model *model, f32 merge); -void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge); -bool modelIsAnimMerging(struct model *model); -void modelSetAnimationWithMerge(struct model *model, s16 animnum, u32 flip, f32 startframe, f32 speed, f32 timemerge, bool domerge); -void modelSetAnimation(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge); -void modelCopyAnimData(struct model *src, struct model *dst); -void modelSetAnimLooping(struct model *model, f32 loopframe, f32 loopmerge); -void modelSetAnimEndFrame(struct model *model, f32 endframe); -void modelSetAnimFlipFunction(struct model *model, void *callback); -void modelSetAnimSpeed(struct model *model, f32 speed, f32 startframe); -void modelSetAnimSpeedAuto(struct model *model, f32 arg1, f32 startframe); -void modelSetAnimPlaySpeed(struct model *model, f32 speed, f32 frame); -void modelSetAnim70(struct model *model, void *callback); -void modelSetAnimFrame(struct model *model, f32 startframe); -void modelSetAnimFrame2(struct model *model, f32 arg1, f32 arg2); -void modelSetAnimMergingEnabled(bool value); -bool modelIsAnimMergingEnabled(void); -void modelSetAnimFrame2WithChrStuff(struct model *model, f32 frame, f32 arg2, f32 frame2, f32 arg4); -void modelTickAnimQuarterSpeed(struct model *model, s32 lvupdate240, bool arg2); -void modelTickAnim(struct model *model, s32 lvupdate240, bool arg2); -void modelApplyRenderModeType1(struct modelrenderdata *renderdata); -void modelApplyRenderModeType3(struct modelrenderdata *renderdata, bool arg1); -void modelApplyRenderModeType4(struct modelrenderdata *renderdata, bool arg1); -void modelApplyRenderModeType2(struct modelrenderdata *renderdata); -void modelApplyCullMode(struct modelrenderdata *renderdata); -void modelRenderNodeGundl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node); -void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node); -void modelRenderNodeStarGunfire(struct modelrenderdata *renderdata, struct modelnode *node); -void modelSelectTexture(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2); -void modelRenderNodeChrGunfire(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node); -void modelRender(struct modelrenderdata *renderdata, struct model *model); -bool modelTestBboxNodeForHit(struct modelrodata_bbox *bbox, Mtxf *mtx, struct coord *arg2, struct coord *arg3); -s32 modelTestForHit(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode); -void modelPromoteNodeOffsetsToPointers(struct modelnode *node, u32 vma, u32 fileramaddr); -void modelPromoteOffsetsToPointers(struct modeldef *modeldef, u32 arg1, uintptr_t arg2); -s32 modelCalculateRwDataIndexes(struct modelnode *node); -void modelAllocateRwData(struct modeldef *modeldef); -void modelInitRwData(struct model *model, struct modelnode *node); -void modelInit(struct model *model, struct modeldef *modeldef, u32 *rwdatas, bool resetanim); -void animInit(struct anim *anim); -void modelAttachHead(struct model *model, struct modeldef *arg1, struct modelnode *node, struct modeldef *arg3); -void modelIterateDisplayLists(struct modeldef *modeldef, struct modelnode **nodeptr, Gfx **gdlptr); -void modelNodeReplaceGdl(struct modeldef *modeldef, struct modelnode *node, Gfx *find, Gfx *replacement); +void model_set_distance_scale(f32 value); +void model_set_vtx_allocator_func(Vtx *(*fn)(s32 numvertices)); +s32 model_find_node_mtx_index(struct modelnode *node, s32 arg1); +Mtxf *model_find_node_mtx(struct model *model, struct modelnode *node, s32 arg2); +Mtxf *model_get_root_mtx(struct model *model); +struct modelnode *model_find_node_by_mtx_index(struct model *model, s32 mtxindex); +struct modelnode *model_node_find_mtx_node(struct modelnode *node); +struct modelnode *model_node_find_parent_mtx_node(struct modelnode *node); +struct modelnode *model_node_find_child_mtx_node(struct modelnode *node); +struct modelnode *model_node_find_child_or_parent_mtx_node(struct modelnode *node); +struct modelnode *model_get_part(struct modeldef *arg0, s32 partnum); +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); +f32 model_get_chr_rot_y(struct model *model); +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); +bool model_is_flipped(struct model *model); +f32 model_get_cur_anim_frame(struct model *model); +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); +void model_copy_anim_data(struct model *src, struct model *dst); +void model_set_anim_looping(struct model *model, f32 loopframe, f32 loopmerge); +void model_set_anim_end_frame(struct model *model, f32 endframe); +void model_set_anim_flip_function(struct model *model, void *callback); +void model_set_anim_speed(struct model *model, f32 speed, f32 startframe); +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); +void anim_init(struct anim *anim); +void model_attach_head(struct model *model, struct modeldef *arg1, struct modelnode *node, struct modeldef *arg3); +void model_iterate_display_lists(struct modeldef *modeldef, struct modelnode **nodeptr, Gfx **gdlptr); +void model_node_replace_gdl(struct modeldef *modeldef, struct modelnode *node, Gfx *find, Gfx *replacement); #endif diff --git a/src/include/lib/mp3.h b/src/include/lib/mp3.h index 6369dd7e8..681e27e05 100644 --- a/src/include/lib/mp3.h +++ b/src/include/lib/mp3.h @@ -4,8 +4,8 @@ #include "data.h" #include "types.h" -void mp3Init(ALHeap *heap); -void mp3PlayFile(s32 romaddr, s32 filesize); +void mp3_init(ALHeap *heap); +void mp3_play_file(s32 romaddr, s32 filesize); void func00037e1c(void); void func00037e38(void); void func00037e68(void); @@ -15,6 +15,6 @@ void func00037f5c(s32 arg0, bool arg1); s32 func00037fc0(s32 arg0, Acmd **cmd); void func00038924(struct mp3vars *vars); void func00038b90(void *fn); -void mp3Dma(void); +void mp3_dma(void); #endif diff --git a/src/include/lib/mtx.h b/src/include/lib/mtx.h index 4b120b058..262d5fd36 100644 --- a/src/include/lib/mtx.h +++ b/src/include/lib/mtx.h @@ -4,20 +4,20 @@ #include "data.h" #include "types.h" -void mtx4LoadIdentity(Mtxf *mtx); -void mtx4MultMtx4InPlace(Mtxf *multmtx, Mtxf *subject); -void mtx4MultMtx4(Mtxf *mtx1, Mtxf *mtx2, Mtxf *dst); -void mtx4RotateVecInPlace(Mtxf *mtx, struct coord *vec); -void mtx4RotateVec(Mtxf *mtx, struct coord *vec, struct coord *dst); -void mtx4TransformVecInPlace(Mtxf *mtx, struct coord *vec); -void mtx4TransformVec(Mtxf *mtx, struct coord *vec, struct coord *dst); +void mtx4_load_identity(Mtxf *mtx); +void mtx4_mult_mtx4_in_place(Mtxf *multmtx, Mtxf *subject); +void mtx4_mult_mtx4(Mtxf *mtx1, Mtxf *mtx2, Mtxf *dst); +void mtx4_rotate_vec_in_place(Mtxf *mtx, struct coord *vec); +void mtx4_rotate_vec(Mtxf *mtx, struct coord *vec, struct coord *dst); +void mtx4_transform_vec_in_place(Mtxf *mtx, struct coord *vec); +void mtx4_transform_vec(Mtxf *mtx, struct coord *vec, struct coord *dst); void mtx00015be0(Mtxf *matrix1, Mtxf *matrix2); void mtx00015be4(Mtxf *arg0, Mtxf *arg1, Mtxf *dst); -void mtx3Copy(f32 src[3][3], f32 dst[3][3]); -void mtx4Copy(Mtxf *src, Mtxf *dst); -void mtx3ToMtx4(f32 src[3][3], Mtxf *dst); -void mtx4ToMtx3(Mtxf *src, f32 dst[3][3]); -void mtx4SetTranslation(struct coord *pos, Mtxf *mtx); +void mtx3_copy(f32 src[3][3], f32 dst[3][3]); +void mtx4_copy(Mtxf *src, Mtxf *dst); +void mtx3_to_mtx4(f32 src[3][3], Mtxf *dst); +void mtx4_to_mtx3(Mtxf *src, f32 dst[3][3]); +void mtx4_set_translation(struct coord *pos, Mtxf *mtx); void mtx00015df0(f32 arg0, Mtxf *mtx); void mtx00015e24(f32 mult, Mtxf *mtx); void mtx00015e4c(f32 arg0, Mtxf *mtx); @@ -27,20 +27,20 @@ void mtx00015edc(f32 mult, Mtxf *mtx); void mtx00015f04(f32 scale, Mtxf *arg1); void mtx00015f4c(f32 scale, Mtxf *arg1); void mtx00015f88(f32 arg0, Mtxf *arg1); -u32 mtxGetObfuscatedRomBase(void); -void mtxF2L(Mtxf *src, Mtxf *dst); +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 mtx4LoadYRotationWithTranslation(struct coord *pos, f32 radians, Mtxf *mtx); -void mtx4LoadXRotation(f32 radians, Mtxf *mtx); -void mtx4LoadYRotation(f32 radians, Mtxf *mtx); -void mtx4LoadZRotation(f32 radians, Mtxf *mtx); -void mtx4LoadRotation(struct coord *rot, Mtxf *mtx); -void mtx4GetRotation(f32 mtx[4][4], struct coord *dst); -void mtx4LoadRotationAndTranslation(struct coord *pos, struct coord *rot, Mtxf *mtx); -void mtx4LoadTranslation(struct coord *pos, Mtxf *mtx); +void mtx4_load_y_rotation_with_translation(struct coord *pos, f32 radians, Mtxf *mtx); +void mtx4_load_x_rotation(f32 radians, Mtxf *mtx); +void mtx4_load_y_rotation(f32 radians, Mtxf *mtx); +void mtx4_load_z_rotation(f32 radians, Mtxf *mtx); +void mtx4_load_rotation(struct coord *rot, Mtxf *mtx); +void mtx4_get_rotation(f32 mtx[4][4], struct coord *dst); +void mtx4_load_rotation_and_translation(struct coord *pos, struct coord *rot, Mtxf *mtx); +void mtx4_load_translation(struct coord *pos, Mtxf *mtx); void mtx00016710(f32 mult, f32 mtx[4][4]); void mtx00016748(f32 arg0); void mtx00016760(void); @@ -53,8 +53,8 @@ void mtx00016b58(Mtxf *mtx, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, void mtx00016d58(Mtxf *mtx, f32 posx, f32 posy, f32 posz, f32 lookx, f32 looky, f32 lookz, f32 upx, f32 upy, f32 upz); u32 mtx00016dcc(f32 arg0, f32 arg1); void mtx00016e98(f32 mtx[4][4], f32 angle, f32 x, f32 y, f32 z); -void mtx4Align(f32 mtx[4][4], f32 radians, f32 x, f32 y, f32 z); -void mtx4LoadRotationFrom(f32 src[4][4], f32 dst[4][4]); +void mtx4_align(f32 mtx[4][4], f32 radians, f32 x, f32 y, f32 z); +void mtx4_load_rotation_from(f32 src[4][4], f32 dst[4][4]); 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]); diff --git a/src/include/lib/music.h b/src/include/lib/music.h index 8fdaf9f68..825a9c149 100644 --- a/src/include/lib/music.h +++ b/src/include/lib/music.h @@ -4,12 +4,12 @@ #include "data.h" #include "types.h" -s32 musicHandlePlayEvent(struct musicevent *event, s32 result); -s32 musicHandleStopEvent(struct musicevent *event, s32 result); -s32 musicHandleFadeEvent(struct musicevent *event, s32 result); -s32 musicHandleStopAllEvent(s32 result); -s32 musicHandleSetIntervalEvent(struct musicevent *event, s32 result); -void musicTickEvents(void); -void musicTick(void); +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); #endif diff --git a/src/include/lib/path.h b/src/include/lib/path.h index 2145885df..9a15d086d 100644 --- a/src/include/lib/path.h +++ b/src/include/lib/path.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -void objSetBlockedPathUnblocked(struct defaultobj *blocker, bool unblocked); +void obj_set_blocked_path_unblocked(struct defaultobj *blocker, bool unblocked); #endif diff --git a/src/include/lib/pimgr.h b/src/include/lib/pimgr.h index cb79f747c..0ce3e044d 100644 --- a/src/include/lib/pimgr.h +++ b/src/include/lib/pimgr.h @@ -4,6 +4,6 @@ #include "data.h" #include "types.h" -void pimgrCreate(void); +void pimgr_create(void); #endif diff --git a/src/include/lib/profile.h b/src/include/lib/profile.h index 6d732dd37..fc23eb0aa 100644 --- a/src/include/lib/profile.h +++ b/src/include/lib/profile.h @@ -4,11 +4,11 @@ #include "data.h" #include "types.h" -void profileInit(void); -void profileTick(void); -void profileReset(void); +void profile_init(void); +void profile_tick(void); +void profile_reset(void); void profile00009a98(void); -void profileSetMarker(u32 arg0); -Gfx *profileRender(Gfx *gdl); +void profile_set_marker(u32 arg0); +Gfx *profile_render(Gfx *gdl); #endif diff --git a/src/include/lib/rdp.h b/src/include/lib/rdp.h index 6d54e5e44..d5e95eaf1 100644 --- a/src/include/lib/rdp.h +++ b/src/include/lib/rdp.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void rdpInit(void); -void rdpCreateTask(Gfx *gdlstart, Gfx *gdlend, u32 arg2, s32 msg); +void rdp_init(void); +void rdp_create_task(Gfx *gdlstart, Gfx *gdlend, u32 arg2, s32 msg); #endif diff --git a/src/include/lib/reset.h b/src/include/lib/reset.h index 5de944caf..ceb59067f 100644 --- a/src/include/lib/reset.h +++ b/src/include/lib/reset.h @@ -3,6 +3,6 @@ #include void resetproc(void *data); -void resetThreadCreate(void); +void reset_thread_create(void); #endif diff --git a/src/include/lib/rmon.h b/src/include/lib/rmon.h index 8891d9598..b8701c9cf 100644 --- a/src/include/lib/rmon.h +++ b/src/include/lib/rmon.h @@ -8,7 +8,7 @@ void rmonproc(); void rmon0002fa30(u32 *arg0, s32 arg1); void rmon0002fa38(s32 arg0); void rmon0002fa40(void); -bool rmonIsDisabled(void); -void rmonPrintf(const char *format, ...); +bool rmon_is_disabled(void); +void rmon_printf(const char *format, ...); #endif diff --git a/src/include/lib/rng.h b/src/include/lib/rng.h index 32741640f..a3ccecf8e 100644 --- a/src/include/lib/rng.h +++ b/src/include/lib/rng.h @@ -5,6 +5,6 @@ #include "types.h" u32 random(void); -u32 rngRotateSeed(u64 *value); +u32 rng_rotate_seed(u64 *value); #endif diff --git a/src/include/lib/rzip.h b/src/include/lib/rzip.h index efa7b7d5c..816ae0101 100644 --- a/src/include/lib/rzip.h +++ b/src/include/lib/rzip.h @@ -4,9 +4,9 @@ #include "data.h" #include "types.h" -s32 rzipInflate(void *src, void *dst, void *scratch); -u32 rzipInit(void); -bool rzipIs1173(void *buffer); -void *rzipGetSomething(void); +s32 rzip_inflate(void *src, void *dst, void *scratch); +u32 rzip_init(void); +bool rzip_is_1173(void *buffer); +void *rzip_get_something(void); #endif diff --git a/src/include/lib/sched.h b/src/include/lib/sched.h index b81898a57..c7d77b77b 100644 --- a/src/include/lib/sched.h +++ b/src/include/lib/sched.h @@ -4,8 +4,8 @@ #include #include "types.h" -void schedSetCrashEnable2(s32 enable); -void schedSubmitTask(OSSched *sc, OSScTask *t); +void sched_set_crash_enable2(s32 enable); +void sched_submit_task(OSSched *sc, OSScTask *t); void __scHandleRetrace(OSSched *sc); void __scHandleRSP(OSSched *sc); void __scHandleRDP(OSSched *sc); @@ -14,14 +14,14 @@ void __scAppendList(OSSched *sc, OSScTask *t); void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp); void __scMain(void *arg); void __scYield(OSSched *sc); -void schedInitArtifacts(void); -void schedResetArtifacts(void); -struct artifact *schedGetWriteArtifacts(void); -struct artifact *schedGetFrontArtifacts(void); -void schedIncrementWriteArtifacts(void); -void schedIncrementFrontArtifacts(void); -void schedUpdatePendingArtifacts(void); -void schedConsiderScreenshot(void); -void schedSetCrashedUnexpectedly(bool enable); +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 fb8a40ce3..44243e4c8 100644 --- a/src/include/lib/segments.h +++ b/src/include/lib/segments.h @@ -2,11 +2,11 @@ #define _IN_BOOT_SEGMENTS_H #include -void *segGetDataStart(void); -void *segGetDatazipRomStart(void); -void *segGetInflateRomStart(void); -void *segGetInflateRomStart2(void); -void *segGetGamezipsRomStart(void); -void segInflate(void *src, void *dst, void *scratch); +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 0b96846c3..f699780ca 100644 --- a/src/include/lib/snd.h +++ b/src/include/lib/snd.h @@ -4,43 +4,43 @@ #include "data.h" #include "types.h" -bool sndIsFiltered(s32 audioid); -bool sndIsPlayingMp3(void); +bool snd_is_filtered(s32 audioid); +bool snd_is_playing_mp3(void); u16 snd0000e9dc(void); -void sndSetSfxVolume(u16 volume); +void snd_set_sfx_volume(u16 volume); void snd0000ea80(u16 volume); -void sndResetCurMp3(void); -void sndLoadSfxCtl(void); -void sndIncrementAges(void); -ALEnvelope *sndLoadEnvelope(u32 offset, u16 index); -ALKeyMap *sndLoadKeymap(u32 offset, u16 index); -ALADPCMBook *sndLoadAdpcmBook(u32 offset, u16 index); -ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 index); -ALWaveTable *sndLoadWavetable(u32 offset, u16 index); -void sndSetSoundMode(s32 mode); -ALSound *sndLoadSound(s16 soundnum); -void seqInit(struct seqinstance *seq); -void sndInit(void); -bool sndIsMp3(s16 soundnum); -bool sndStopMp3(s16 arg0); -bool seqPlay(struct seqinstance *seq, s32 tracknum); -u16 seqGetVolume(struct seqinstance *seq); -void seqSetVolume(struct seqinstance *seq, u16 volume); -void sndHandleRetrace(void); +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); void snd0000fe50(void); -void sndTick(void); -bool sndIsDisabled(void); -void sndStartMp3ByFilenum(u32 filenum); -void sndAdjust(struct sndstate **handle, bool ismp3, s32 vol, s32 pan, s32 soundnum, f32 pitch, s32 fxbus, s32 fxmix, bool forcefxmix); +void snd_tick(void); +bool snd_is_disabled(void); +void snd_start_mp3_by_filenum(u32 filenum); +void snd_adjust(struct sndstate **handle, bool ismp3, s32 vol, s32 pan, s32 soundnum, f32 pitch, s32 fxbus, s32 fxmix, bool forcefxmix); struct sndstate *snd00010718(struct sndstate **handle, s32 flags, s32 volume, s32 pan, s32 soundnum, f32 pitch, s32 fxbus, s32 fxmix, bool forcefxmix); -struct sndstate *sndStart(s32 arg0, s16 sound, struct sndstate **handle, s32 volume, s32 pan, f32 pitch, s32 fxbus, s32 fxmix); -void sndStartMp3(s16 soundnum, s32 volume, s32 pan, s32 responseflags); -void sndPlayNosedive(s32 seconds); -void sndStopNosedive(void); -void sndTickNosedive(void); -void sndPlayUfo(s32 seconds); -void sndStopUfo(void); -void sndTickUfo(void); +struct sndstate *snd_start(s32 arg0, s16 sound, struct sndstate **handle, s32 volume, s32 pan, f32 pitch, s32 fxbus, s32 fxmix); +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/speaker.h b/src/include/lib/speaker.h index 725904813..b576cdaa8 100644 --- a/src/include/lib/speaker.h +++ b/src/include/lib/speaker.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void speakersSetMode(u8 mode); +void speakers_set_mode(u8 mode); void speaker00034104(s32 index, s32 arg1); #endif diff --git a/src/include/lib/tlb.h b/src/include/lib/tlb.h index a0835a530..569f2f7a3 100644 --- a/src/include/lib/tlb.h +++ b/src/include/lib/tlb.h @@ -2,10 +2,10 @@ #define _IN_LIB_TLB_H #include -void vmBoot(void); -void vmInitVars(void); -void vmInitVacant(void); -void vmHandleMiss(void); -void vmUnmapRange(u32 first, u32 last); +void vm_boot(void); +void vm_init_vars(void); +void vm_init_vacant(void); +void vm_handle_miss(void); +void vm_unmap_range(u32 first, u32 last); #endif diff --git a/src/include/lib/vars.h b/src/include/lib/vars.h index 66218e3f5..bacb7152e 100644 --- a/src/include/lib/vars.h +++ b/src/include/lib/vars.h @@ -4,8 +4,8 @@ #include "data.h" #include "types.h" -void varsInit(void); +void vars_init(void); -void varsReset(void); +void vars_reset(void); #endif diff --git a/src/include/lib/vi.h b/src/include/lib/vi.h index 90d2c3bc3..96e0dd942 100644 --- a/src/include/lib/vi.h +++ b/src/include/lib/vi.h @@ -4,20 +4,20 @@ #include "data.h" #include "types.h" -void viConfigureForLogos(void); -void viConfigureForCopyright(u16 *fb); -void viConfigureForLegal(void); -void viReset(s32 stagenum); -void viBlack(bool black); -void viHandleRetrace(void); -void viUpdateMode(void); -void viShake(f32 intensity); -void viSetMode(s32 mode); -void viSet16Bit(void); -u16 *viGetBackBuffer(void); -u16 *viGetFrontBuffer(void); -Vp *viGetCurrentPlayerViewport(void); -u16 viGetPerspScale(void); +void vi_configure_for_logos(void); +void vi_configure_for_copyright(u16 *fb); +void vi_configure_for_legal(void); +void vi_reset(s32 stagenum); +void vi_black(bool black); +void vi_handle_retrace(void); +void vi_update_mode(void); +void vi_shake(f32 intensity); +void vi_set_mode(s32 mode); +void vi_set_16bit(void); +u16 *vi_get_back_buffer(void); +u16 *vi_get_front_buffer(void); +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); @@ -25,31 +25,31 @@ Gfx *vi0000af00(Gfx *gdl, Vp *vp); Gfx *vi0000b0e8(Gfx *gdl, f32 fovy, f32 aspect); Gfx *vi0000b1a8(Gfx *gdl); Gfx *vi0000b1d0(Gfx *gdl); -Gfx *viPrepareZbuf(Gfx *gdl); -Gfx *viFillBuffer(Gfx *gdl); -Gfx *viRenderViewportEdges(Gfx *gdl); -void viSetBufSize(s16 width, s16 height); -s16 viGetBufWidth(void); -s16 viGetBufHeight(void); -void viSetSize(s16 width, s16 height); -s16 viGetWidth(void); -s16 viGetHeight(void); -void viSetViewSize(s16 width, s16 height); -s16 viGetViewWidth(void); -s16 viGetViewHeight(void); -void viSetViewPosition(s16 left, s16 top); -s16 viGetViewLeft(void); -s16 viGetViewTop(void); -void viSetUseZBuf(bool use); -void viSetFovY(f32 fovy); -void viSetAspect(f32 aspect); -f32 viGetAspect(void); -void viSetFovAspectAndSize(f32 fovy, f32 aspect, s16 width, s16 height); -f32 viGetFovY(void); -void viSetZRange(f32 arg0, f32 arg1); -void viGetZRange(struct zrange *zrange); -Gfx *viSetFillColour(Gfx *gdl, s32 r, s32 g, s32 b); -void viGrabJpg32(void); -void viGrabRgb32(void); +Gfx *vi_prepare_zbuf(Gfx *gdl); +Gfx *vi_fill_buffer(Gfx *gdl); +Gfx *vi_render_viewport_edges(Gfx *gdl); +void vi_set_buf_size(s16 width, s16 height); +s16 vi_get_buf_width(void); +s16 vi_get_buf_height(void); +void vi_set_size(s16 width, s16 height); +s16 vi_get_width(void); +s16 vi_get_height(void); +void vi_set_view_size(s16 width, s16 height); +s16 vi_get_view_width(void); +s16 vi_get_view_height(void); +void vi_set_view_position(s16 left, s16 top); +s16 vi_get_view_left(void); +s16 vi_get_view_top(void); +void vi_set_use_z_buf(bool use); +void vi_set_fov_y(f32 fovy); +void vi_set_aspect(f32 aspect); +f32 vi_get_aspect(void); +void vi_set_fov_aspect_and_size(f32 fovy, f32 aspect, s16 width, s16 height); +f32 vi_get_fov_y(void); +void vi_set_z_range(f32 arg0, f32 arg1); +void vi_get_z_range(struct zrange *zrange); +Gfx *vi_set_fill_colour(Gfx *gdl, s32 r, s32 g, s32 b); +void vi_grab_jpg32(void); +void vi_grab_rgb32(void); #endif diff --git a/src/include/lib/videbug.h b/src/include/lib/videbug.h index 3981f8cc3..c64bd0232 100644 --- a/src/include/lib/videbug.h +++ b/src/include/lib/videbug.h @@ -4,7 +4,7 @@ #include "data.h" #include "types.h" -void videbugCreate(void); -void videbugInit(void); +void videbug_create(void); +void videbug_init(void); #endif diff --git a/src/include/lib/vm.h b/src/include/lib/vm.h index 5baffc527..77155dc06 100644 --- a/src/include/lib/vm.h +++ b/src/include/lib/vm.h @@ -8,7 +8,7 @@ extern u8 g_VmShowStats; -void vmInit(void); +void vm_init(void); #endif #if VERSION >= VERSION_NTSC_1_0 diff --git a/src/include/types.h b/src/include/types.h index abad37671..0601ea7eb 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -848,7 +848,7 @@ struct geotilef { union { // The arrays are surely the correct type here, but they create // mismatches in code that has already been matched using individual - // properties (eg. cdCollectGeoForCylFromList). @TODO: Rematch them using the arrays. + // properties (eg. cd_collect_geo_for_cyl_from_list). @TODO: Rematch them using the arrays. struct { /*0x06*/ u8 min[3]; // These are indexes into vertices /*0x09*/ u8 max[3]; @@ -2872,7 +2872,7 @@ struct invaimsettings { }; struct gunviscmd { - // See related functions: bgunExecuteGunVisCommands and bgunTestGunVisCommand + // See related functions: bgun_execute_gun_vis_commands and bgun_test_gun_vis_command // unk00 - Some kind of condition field // 0 = terminator diff --git a/src/inflate/inflate.c b/src/inflate/inflate.c index b3e92ce57..befb20944 100644 --- a/src/inflate/inflate.c +++ b/src/inflate/inflate.c @@ -582,7 +582,7 @@ u32 inflate(void) { s32 e; /* last block flag */ s32 r; /* result code */ - u32 h; /* maximum struct huft's mempAlloc'ed */ + u32 h; /* maximum struct huft's memp_alloc'ed */ /* initialize window, bit buffer */ wp = 0; diff --git a/src/lib/ailist.c b/src/lib/ailist.c index 84529232d..ae1b03fdf 100644 --- a/src/lib/ailist.c +++ b/src/lib/ailist.c @@ -8,7 +8,7 @@ s32 g_NumGlobalAilists = 0; s32 g_NumLvAilists = 0; -u8 *ailistFindById(s32 ailistid) +u8 *ailist_find_by_id(s32 ailistid) { s32 lower; s32 upper; diff --git a/src/lib/anim.c b/src/lib/anim.c index 3873e966f..33725e29a 100644 --- a/src/lib/anim.c +++ b/src/lib/anim.c @@ -42,14 +42,14 @@ u8 *g_AnimHostSegment = NULL; extern u8 _animationsTableRomStart; extern u8 _animationsTableRomEnd; -void animsInit(void) +void anims_init(void) { s32 i; u32 *ptr; u32 tablelen = ALIGN64(&_animationsTableRomEnd - &_animationsTableRomStart); - ptr = mempAlloc(tablelen, MEMPOOL_PERMANENT); - dmaExec(ptr, (romptr_t) &_animationsTableRomStart, tablelen); + ptr = memp_alloc(tablelen, MEMPOOL_PERMANENT); + dma_exec(ptr, (romptr_t) &_animationsTableRomStart, tablelen); g_NumAnimations = g_NumRomAnimations = ptr[0]; g_Anims = g_RomAnims = (struct animtableentry *)&ptr[1]; @@ -70,25 +70,25 @@ void animsInit(void) g_AnimMaxHeaderLength = ALIGN16(g_AnimMaxHeaderLength + 34); g_AnimMaxBytesPerFrame = ALIGN16(g_AnimMaxBytesPerFrame + 34); - g_AnimToHeaderSlot = mempAlloc(ALIGN64(g_NumAnimations), MEMPOOL_PERMANENT); - var8005f014 = mempAlloc(ALIGN64(g_NumAnimations * sizeof(*var8005f014)), MEMPOOL_PERMANENT); - g_AnimFrameByteSlots = mempAlloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * g_AnimMaxBytesPerFrame), MEMPOOL_PERMANENT); - g_AnimFrameBytes = mempAlloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * sizeof(*g_AnimFrameBytes)), MEMPOOL_PERMANENT); - g_AnimFrameAnimNums = mempAlloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * sizeof(*g_AnimFrameAnimNums)), MEMPOOL_PERMANENT); - g_AnimFrameFrameNums = mempAlloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * sizeof(*g_AnimFrameFrameNums)), MEMPOOL_PERMANENT); - g_AnimFrameBirths = mempAlloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * sizeof(*g_AnimFrameBirths)), MEMPOOL_PERMANENT); - g_AnimHeaderByteSlots = mempAlloc(ALIGN64(ANIM_HEADER_CACHE_SIZE * g_AnimMaxHeaderLength), MEMPOOL_PERMANENT); - g_AnimHeaderBytes = mempAlloc(ALIGN64(ANIM_HEADER_CACHE_SIZE * sizeof(*g_AnimHeaderBytes)), MEMPOOL_PERMANENT); - g_AnimHeaderAnimNums = mempAlloc(ALIGN64(ANIM_HEADER_CACHE_SIZE * sizeof(*g_AnimHeaderAnimNums)), MEMPOOL_PERMANENT); - g_AnimHeaderBirths = mempAlloc(ALIGN64(ANIM_HEADER_CACHE_SIZE * sizeof(*g_AnimHeaderBirths)), MEMPOOL_PERMANENT); + g_AnimToHeaderSlot = memp_alloc(ALIGN64(g_NumAnimations), MEMPOOL_PERMANENT); + var8005f014 = memp_alloc(ALIGN64(g_NumAnimations * sizeof(*var8005f014)), MEMPOOL_PERMANENT); + g_AnimFrameByteSlots = memp_alloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * g_AnimMaxBytesPerFrame), MEMPOOL_PERMANENT); + g_AnimFrameBytes = memp_alloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * sizeof(*g_AnimFrameBytes)), MEMPOOL_PERMANENT); + g_AnimFrameAnimNums = memp_alloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * sizeof(*g_AnimFrameAnimNums)), MEMPOOL_PERMANENT); + g_AnimFrameFrameNums = memp_alloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * sizeof(*g_AnimFrameFrameNums)), MEMPOOL_PERMANENT); + g_AnimFrameBirths = memp_alloc(ALIGN64(ANIM_FRAME_CACHE_SIZE * sizeof(*g_AnimFrameBirths)), MEMPOOL_PERMANENT); + g_AnimHeaderByteSlots = memp_alloc(ALIGN64(ANIM_HEADER_CACHE_SIZE * g_AnimMaxHeaderLength), MEMPOOL_PERMANENT); + g_AnimHeaderBytes = memp_alloc(ALIGN64(ANIM_HEADER_CACHE_SIZE * sizeof(*g_AnimHeaderBytes)), MEMPOOL_PERMANENT); + g_AnimHeaderAnimNums = memp_alloc(ALIGN64(ANIM_HEADER_CACHE_SIZE * sizeof(*g_AnimHeaderAnimNums)), MEMPOOL_PERMANENT); + g_AnimHeaderBirths = memp_alloc(ALIGN64(ANIM_HEADER_CACHE_SIZE * sizeof(*g_AnimHeaderBirths)), MEMPOOL_PERMANENT); - animsInitTables(); + anims_init_tables(); g_AnimHostSegment = NULL; g_AnimHostEnabled = false; } -void animsInitTables(void) +void anims_init_tables(void) { s32 i; @@ -109,38 +109,38 @@ void animsInitTables(void) } } -void animsReset(void) +void anims_reset(void) { g_NumAnimations = g_NumRomAnimations; g_Anims = g_RomAnims; g_AnimHostEnabled = false; } -s32 animGetNumFrames(s16 animnum) +s32 anim_get_num_frames(s16 animnum) { return g_Anims[animnum].numframes; } -bool animHasFrames(s16 animnum) +bool anim_has_frames(s16 animnum) { return animnum < g_NumAnimations && g_Anims[animnum].numframes > 0; } -s32 animGetNumAnimations(void) +s32 anim_get_num_animations(void) { return g_NumAnimations; } extern u8 _animationsSegmentRomStart; -u8 *animDma(u8 *dst, u32 segoffset, u32 len) +u8 *anim_dma(u8 *dst, u32 segoffset, u32 len) { if (g_AnimHostEnabled) { bcopy(&g_AnimHostSegment[segoffset], dst, len); return dst; } - return dmaExecWithAutoAlign(dst, (romptr_t) &_animationsSegmentRomStart + segoffset, len); + return dma_exec_with_auto_align(dst, (romptr_t) &_animationsSegmentRomStart + segoffset, len); } /** @@ -162,7 +162,7 @@ u8 *animDma(u8 *dst, u32 segoffset, u32 len) * 56 -> 30 * 57 -> 31 */ -s32 animGetRemappedFrame(s16 animnum, s32 apparentframe) +s32 anim_get_remapped_frame(s16 animnum, s32 apparentframe) { u8 *ptr = (u8 *)(g_AnimHeaderBytes[g_AnimToHeaderSlot[animnum]] + g_Anims[animnum].headerlen - 2); s32 realframe = apparentframe; @@ -197,7 +197,7 @@ s32 animGetRemappedFrame(s16 animnum, s32 apparentframe) * - If the apparent frame is a repeat, write the original frame rather than -1. * - Return true if the frame is original or false if it's a repeat. */ -bool animRemapFrameForLoad(s16 animnum, s32 apparentframe, s32 *frameptr) +bool anim_remap_frame_for_load(s16 animnum, s32 apparentframe, s32 *frameptr) { u8 *ptr = (u8 *)(g_AnimHeaderBytes[g_AnimToHeaderSlot[animnum]] + g_Anims[animnum].headerlen - 2); s32 result = apparentframe; @@ -239,7 +239,7 @@ bool animRemapFrameForLoad(s16 animnum, s32 apparentframe, s32 *frameptr) * frame repeat data. The frame numbers are stored as a list of shorts. * The list is terminated on the left side with a negative value. */ -bool animIsFrameCutSkipped(s16 animnum, s32 frame) +bool anim_is_frame_cut_skipped(s16 animnum, s32 frame) { u8 *ptr = (u8 *)(g_AnimHeaderBytes[g_AnimToHeaderSlot[animnum]] + g_Anims[animnum].headerlen - 2); @@ -275,7 +275,7 @@ bool animIsFrameCutSkipped(s16 animnum, s32 frame) return false; } -u8 animLoadFrame(s16 animnum, s32 framenum) +u8 anim_load_frame(s16 animnum, s32 framenum) { s32 slot = -1; s32 i; @@ -300,12 +300,12 @@ u8 animLoadFrame(s16 animnum, s32 framenum) } if (g_Anims[animnum].flags & ANIMFLAG_HASREPEATFRAMES) { - animRemapFrameForLoad(animnum, framenum, &loadframenum); + anim_remap_frame_for_load(animnum, framenum, &loadframenum); } if (g_Anims[animnum].bytesperframe) { offset = g_Anims[animnum].bytesperframe * loadframenum + (g_Anims[animnum].data + g_Anims[animnum].headerlen); - g_AnimFrameBytes[slot] = animDma(&g_AnimFrameByteSlots[slot * g_AnimMaxBytesPerFrame], offset, g_Anims[animnum].bytesperframe); + g_AnimFrameBytes[slot] = anim_dma(&g_AnimFrameByteSlots[slot * g_AnimMaxBytesPerFrame], offset, g_Anims[animnum].bytesperframe); } else { g_AnimFrameBytes[slot] = &g_AnimFrameByteSlots[slot * g_AnimMaxBytesPerFrame]; } @@ -319,7 +319,7 @@ u8 animLoadFrame(s16 animnum, s32 framenum) return slot; } -void animForgetFrameBirths(void) +void anim_forget_frame_births(void) { s32 i; @@ -328,7 +328,7 @@ void animForgetFrameBirths(void) } } -void animLoadHeader(s16 animnum) +void anim_load_header(s16 animnum) { s32 i; @@ -355,7 +355,7 @@ void animLoadHeader(s16 animnum) tmp = g_Anims[animnum].headerlen; - g_AnimHeaderBytes[slot] = animDma(&g_AnimHeaderByteSlots[slot * g_AnimMaxHeaderLength], g_Anims[animnum].data, tmp); + g_AnimHeaderBytes[slot] = anim_dma(&g_AnimHeaderByteSlots[slot * g_AnimMaxHeaderLength], g_Anims[animnum].data, tmp); g_AnimToHeaderSlot[animnum] = slot; g_AnimHeaderAnimNums[slot] = animnum; g_AnimHeaderBirths[slot] = g_Vars.thisframestart240; @@ -369,7 +369,7 @@ void animLoadHeader(s16 animnum) * remainingbits in the number of bits to read. * bitoffset is the starting bit offset relative to ptr. */ -s32 animReadBits(u8 *ptr, u8 remainingbits, u32 bitoffset) +s32 anim_read_bits(u8 *ptr, u8 remainingbits, u32 bitoffset) { u32 result = 0; u32 mask; @@ -402,9 +402,9 @@ s32 animReadBits(u8 *ptr, u8 remainingbits, u32 bitoffset) return result; } -s32 animReadSignedShort(u8 *ptr, u8 readbitlen, s32 bitoffset) +s32 anim_read_signed_short(u8 *ptr, u8 readbitlen, s32 bitoffset) { - u16 result = animReadBits(ptr, readbitlen, bitoffset); + u16 result = anim_read_bits(ptr, readbitlen, bitoffset); if (readbitlen < 16 && (result & (1 << (readbitlen - 1)))) { result |= ((1 << (16 - readbitlen)) - 1) << readbitlen; @@ -419,7 +419,7 @@ s32 animReadSignedShort(u8 *ptr, u8 readbitlen, s32 bitoffset) * * Both the anim header and frame data must be loaded already. */ -void animGetRotTranslateScale(s32 part, bool flip, struct skeleton *skel, s16 animnum, u8 frameslot, struct coord *rot, struct coord *translate, struct coord *scale) +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) { s32 i; u16 introt[3]; @@ -478,29 +478,29 @@ void animGetRotTranslateScale(s32 part, bool flip, struct skeleton *skel, s16 an if (flags & ANIMFIELD_S16_TRANSLATE) { readbitlen = ptr[2]; - translate->x = (s16) (animReadSignedShort(framebytes, readbitlen, bitoffset) + (ptr[0] << 8) + ptr[1]); + translate->x = (s16) (anim_read_signed_short(framebytes, readbitlen, bitoffset) + (ptr[0] << 8) + ptr[1]); bitoffset += readbitlen; readbitlen = ptr[5]; - translate->y = (s16) (animReadSignedShort(framebytes, readbitlen, bitoffset) + (ptr[3] << 8) + ptr[4]); + translate->y = (s16) (anim_read_signed_short(framebytes, readbitlen, bitoffset) + (ptr[3] << 8) + ptr[4]); bitoffset += readbitlen; readbitlen = ptr[8]; - translate->z = (s16) (animReadSignedShort(framebytes, readbitlen, bitoffset) + (ptr[6] << 8) + ptr[7]); + translate->z = (s16) (anim_read_signed_short(framebytes, readbitlen, bitoffset) + (ptr[6] << 8) + ptr[7]); bitoffset += readbitlen; ptr += 9; } else if (flags & ANIMFIELD_S32_TRANSLATE) { readbitlen = ptr[0]; - translate->x = (animReadBits(framebytes, readbitlen, bitoffset) + ((ptr[1] << 24) + (ptr[2] << 16) + (ptr[3] << 8) + ptr[4])) * 0.001f; + translate->x = (anim_read_bits(framebytes, readbitlen, bitoffset) + ((ptr[1] << 24) + (ptr[2] << 16) + (ptr[3] << 8) + ptr[4])) * 0.001f; bitoffset += readbitlen; readbitlen = ptr[5]; - translate->y = (animReadBits(framebytes, readbitlen, bitoffset) + ((ptr[6] << 24) + (ptr[7] << 16) + (ptr[8] << 8) + ptr[9])) * 0.001f; + translate->y = (anim_read_bits(framebytes, readbitlen, bitoffset) + ((ptr[6] << 24) + (ptr[7] << 16) + (ptr[8] << 8) + ptr[9])) * 0.001f; bitoffset += readbitlen; readbitlen = ptr[10]; - translate->z = (animReadBits(framebytes, readbitlen, bitoffset) + ((ptr[11] << 24) + (ptr[12] << 16) + (ptr[13] << 8) + ptr[14])) * 0.001f; + translate->z = (anim_read_bits(framebytes, readbitlen, bitoffset) + ((ptr[11] << 24) + (ptr[12] << 16) + (ptr[13] << 8) + ptr[14])) * 0.001f; bitoffset += readbitlen; ptr += 15; @@ -515,19 +515,19 @@ void animGetRotTranslateScale(s32 part, bool flip, struct skeleton *skel, s16 an if (flags & ANIMFIELD_S16_ROTATE) { readbitlen = ptr[2]; - introt[0] = animReadBits(framebytes, readbitlen, bitoffset); + introt[0] = anim_read_bits(framebytes, readbitlen, bitoffset); introt[0] += (ptr[0] << 8) + ptr[1]; introt[0] <<= 16 - framelen; bitoffset += readbitlen; readbitlen = ptr[5]; - introt[1] = animReadBits(framebytes, readbitlen, bitoffset); + introt[1] = anim_read_bits(framebytes, readbitlen, bitoffset); introt[1] += (ptr[3] << 8) + ptr[4]; introt[1] <<= 16 - framelen; bitoffset += readbitlen; readbitlen = ptr[8]; - introt[2] = animReadBits(framebytes, readbitlen, bitoffset); + introt[2] = anim_read_bits(framebytes, readbitlen, bitoffset); introt[2] += (ptr[6] << 8) + ptr[7]; introt[2] <<= 16 - framelen; bitoffset += readbitlen; @@ -553,15 +553,15 @@ void animGetRotTranslateScale(s32 part, bool flip, struct skeleton *skel, s16 an } else if (flags & ANIMFIELD_F32_ROTATE) { s32 sp38; - sp38 = animReadBits(framebytes, 32, bitoffset); + sp38 = anim_read_bits(framebytes, 32, bitoffset); rot->x = *(f32 *)&sp38; bitoffset += 32; - sp38 = animReadBits(framebytes, 32, bitoffset); + sp38 = anim_read_bits(framebytes, 32, bitoffset); rot->y = *(f32 *)&sp38; bitoffset += 32; - sp38 = animReadBits(framebytes, 32, bitoffset); + sp38 = anim_read_bits(framebytes, 32, bitoffset); rot->z = *(f32 *)&sp38; bitoffset += 32; @@ -581,15 +581,15 @@ void animGetRotTranslateScale(s32 part, bool flip, struct skeleton *skel, s16 an if (flags & ANIMFIELD_F32_SCALE) { s32 word; - word = animReadBits(framebytes, 32, bitoffset); + word = anim_read_bits(framebytes, 32, bitoffset); scale->x = *(f32 *)&word; bitoffset += 32; - word = animReadBits(framebytes, 32, bitoffset); + word = anim_read_bits(framebytes, 32, bitoffset); scale->y = *(f32 *)&word; bitoffset += 32; - word = animReadBits(framebytes, 32, bitoffset); + word = anim_read_bits(framebytes, 32, bitoffset); scale->z = *(f32 *)&word; } else { scale->x = scale->y = scale->z = 1.0f; @@ -610,7 +610,7 @@ void animGetRotTranslateScale(s32 part, bool flip, struct skeleton *skel, s16 an * No data needs to be loaded by the caller - the function will ensure the * header and frame are loaded. */ -u16 animGetPosAngleAsInt(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, s16 inttranslate[3], bool arg6) +u16 anim_get_pos_angle_as_int(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, s16 inttranslate[3], bool arg6) { u16 result = 0; s32 bitoffset; @@ -625,9 +625,9 @@ u16 animGetPosAngleAsInt(s32 part, bool flip, struct skeleton *skel, s16 animnum inttranslate[1] = 0; inttranslate[2] = var8005f014[animnum]; } else { - animLoadHeader(animnum); - slot = animLoadFrame(animnum, framenum); - animForgetFrameBirths(); + anim_load_header(animnum); + slot = anim_load_frame(animnum, framenum); + anim_forget_frame_births(); framebytes = g_AnimFrameBytes[slot]; @@ -671,19 +671,19 @@ u16 animGetPosAngleAsInt(s32 part, bool flip, struct skeleton *skel, s16 animnum } readbitlen = ptr[3]; - inttranslate[0] = animReadSignedShort(framebytes, readbitlen, bitoffset) + ptr[1] * 256 + ptr[2]; + inttranslate[0] = anim_read_signed_short(framebytes, readbitlen, bitoffset) + ptr[1] * 256 + ptr[2]; bitoffset += readbitlen; readbitlen = ptr[6]; - inttranslate[1] = animReadSignedShort(framebytes, readbitlen, bitoffset) + ptr[4] * 256 + ptr[5]; + inttranslate[1] = anim_read_signed_short(framebytes, readbitlen, bitoffset) + ptr[4] * 256 + ptr[5]; bitoffset += readbitlen; readbitlen = ptr[9]; - inttranslate[2] = animReadSignedShort(framebytes, readbitlen, bitoffset) + ptr[7] * 256 + ptr[8]; + inttranslate[2] = anim_read_signed_short(framebytes, readbitlen, bitoffset) + ptr[7] * 256 + ptr[8]; bitoffset += readbitlen; readbitlen = ptr[12]; - result = animReadSignedShort(framebytes, readbitlen, bitoffset) + ptr[10] * 256 + ptr[11]; + result = anim_read_signed_short(framebytes, readbitlen, bitoffset) + ptr[10] * 256 + ptr[11]; if (flip) { inttranslate[0] = -inttranslate[0]; @@ -697,11 +697,11 @@ u16 animGetPosAngleAsInt(s32 part, bool flip, struct skeleton *skel, s16 animnum return result; } -f32 animGetTranslateAngle(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, struct coord *translate, bool arg6) +f32 anim_get_translate_angle(s32 part, bool flip, struct skeleton *skel, s16 animnum, s32 framenum, struct coord *translate, bool arg6) { s16 inttranslate[3]; - f32 angle = animGetPosAngleAsInt(part, flip, skel, animnum, framenum, inttranslate, arg6); + f32 angle = anim_get_pos_angle_as_int(part, flip, skel, animnum, framenum, inttranslate, arg6); translate->x = inttranslate[0]; translate->y = inttranslate[1]; @@ -719,7 +719,7 @@ f32 animGetTranslateAngle(s32 part, bool flip, struct skeleton *skel, s16 animnu * When part = 1, the returned value is the FOV Y. * When part = 2, the returned value is the blur frac. */ -f32 animGetCameraValue(s32 part, s16 animnum, u8 frameslot) +f32 anim_get_camera_value(s32 part, s16 animnum, u8 frameslot) { u32 stack[2]; u8 *framebytes = g_AnimFrameBytes[frameslot]; @@ -774,7 +774,7 @@ f32 animGetCameraValue(s32 part, s16 animnum, u8 frameslot) * The value in the frame data is an adjustment value that is added * to the base value. */ - s32 framevalue = animReadBits(framebytes, ptr[0], bitoffset); + s32 framevalue = anim_read_bits(framebytes, ptr[0], bitoffset); result = (framevalue + ptr[1] * 0x1000000 + ptr[2] * 0x10000 + ptr[3] * 0x100 + ptr[4]) * 0.001f; } } diff --git a/src/lib/args.c b/src/lib/args.c index cc9baf77b..6eb65f471 100644 --- a/src/lib/args.c +++ b/src/lib/args.c @@ -34,7 +34,7 @@ char *argv[17] = { /** * Split the given string into words and populate the argv array. */ -char *argParseString(char *str) +char *arg_parse_string(char *str) { argv[0] = ""; argc = 1; @@ -56,13 +56,13 @@ char *argParseString(char *str) return str; } -void argSetString(char *string) +void arg_set_string(char *string) { strcpy((char *) g_ArgBuffer, string); - argParseString((char *) g_ArgBuffer); + arg_parse_string((char *) g_ArgBuffer); } -bool argsParseDebugArgs(void) +bool args_parse_debug_args(void) { u32 devaddr; u32 stack; @@ -71,7 +71,7 @@ bool argsParseDebugArgs(void) devaddr = 0x1ffff00; - if (rmonIsDisabled()) { + if (rmon_is_disabled()) { g_ArgBuffer[0] = 0; } else { for (i = 0; i < ARRAYCOUNT(g_ArgBuffer); i++) { @@ -80,20 +80,20 @@ bool argsParseDebugArgs(void) } } - argParseString((char *) g_ArgBuffer); + arg_parse_string((char *) g_ArgBuffer); // I'm guessing the -d stands for debug. If set at boot, the main thread // stops itself immediately after creating the rmon thread. - if (argFindByPrefix(1, "-d")) { + if (arg_find_by_prefix(1, "-d")) { ret = true; } - if (argFindByPrefix(1, "-s")) { + if (arg_find_by_prefix(1, "-s")) { g_SndDisabled = true; } #if VERSION < VERSION_JPN_FINAL - if (argFindByPrefix(1, "-j")) { + if (arg_find_by_prefix(1, "-j")) { g_Jpn = true; } #endif @@ -108,7 +108,7 @@ bool argsParseDebugArgs(void) * Typically called with arguments such as 1, "-hard". In this example, if the * argument "-hard2" exists then it would return a pointer to "2". */ -char *argFindByPrefix(s32 occurrence, char *str) +char *arg_find_by_prefix(s32 occurrence, char *str) { s32 len = strlen(str); s32 i; @@ -126,9 +126,9 @@ char *argFindByPrefix(s32 occurrence, char *str) return NULL; } -void argGetLevel(s32 *stagenum) +void arg_get_level(s32 *stagenum) { - char *ptr = argFindByPrefix(1, "-level_"); + char *ptr = arg_find_by_prefix(1, "-level_"); if (ptr) { *stagenum = ptr[0] * 10 + ptr[1] - 528; diff --git a/src/lib/audiodma.c b/src/lib/audiodma.c index 53da7b133..1a5aac377 100644 --- a/src/lib/audiodma.c +++ b/src/lib/audiodma.c @@ -30,7 +30,7 @@ OSMesgQueue g_AdmaMesgQueue; OSMesg g_AdmaMesgs[ADMA_MAX_ITEMS]; u32 g_AdmaCurFrame; -void admaInit(void) +void adma_init(void) { osCreateMesgQueue(&g_AdmaMesgQueue, g_AdmaMesgs, ARRAYCOUNT(g_AdmaMesgs)); } @@ -44,9 +44,9 @@ void admaInit(void) * doesn't find the samples that it needs, it will initiate a DMA of the samples * that it needs. In either case, it updates the lastframe variable, to indicate * that this buffer was last used in this frame. This is important for the - * admaBeginFrame routine. + * adma_begin_frame routine. */ -s32 admaExec(s32 offset, s32 len, void *state) +s32 adma_exec(s32 offset, s32 len, void *state) { void *foundbuffer; s32 delta; @@ -127,7 +127,7 @@ s32 admaExec(s32 offset, s32 len, void *state) * will only really do any initialization the first time. After that we just * return the address to the DMA routine. */ -void *admaNew(struct admastate **state) +void *adma_new(struct admastate **state) { #if PAL s32 max = ADMA_MAX_ITEMS; @@ -149,14 +149,14 @@ void *admaNew(struct admastate **state) *state = &g_AdmaState; - return &admaExec; + return &adma_exec; } /** * Remove old items from the list, increment the * frame counter and reset the number of items to 0. */ -void admaBeginFrame(void) +void adma_begin_frame(void) { struct admaitem *item = g_AdmaState.firstused; @@ -200,7 +200,7 @@ void admaBeginFrame(void) * a message queue, and that means the messages have to be read off it at some * point. This is done here. */ -void admaReceiveAll(void) +void adma_receive_all(void) { s32 i; diff --git a/src/lib/audiomgr.c b/src/lib/audiomgr.c index 496adc4d0..d372e7eeb 100644 --- a/src/lib/audiomgr.c +++ b/src/lib/audiomgr.c @@ -43,26 +43,26 @@ void *g_AudioSp; u32 var8005cf90 = 0x00000000; u8 var8005cf94 = 1; -void amgrHandleDoneMsg(AudioInfo *info); -void amgrHandleFrameMsg(AudioInfo *info, AudioInfo *previnfo); -void amgrMain(void *arg); +void amgr_handle_done_msg(AudioInfo *info); +void amgr_handle_frame_msg(AudioInfo *info, AudioInfo *previnfo); +void amgr_main(void *arg); -void amgrInit(void) +void amgr_init(void) { - g_AudioSp = bootAllocateStack(THREAD_AUDIO, STACKSIZE_AUDIO); + g_AudioSp = boot_allocate_stack(THREAD_AUDIO, STACKSIZE_AUDIO); } #if VERSION >= VERSION_PAL_BETA -void amgrCreate(ALSynConfig *config, u32 *settings) +void amgr_create(ALSynConfig *config, u32 *settings) #else -void amgrCreate(ALSynConfig *config) +void amgr_create(ALSynConfig *config) #endif { f32 freqpertick; s32 i; config->outputRate = osAiSetFrequency(22020); - config->dmaproc = admaNew; + config->dmaproc = adma_new; #if VERSION >= VERSION_JPN_FINAL freqpertick = settings[1] * (f32)config->outputRate / 30.0f; @@ -91,7 +91,7 @@ void amgrCreate(ALSynConfig *config) var800918e4 = g_AmgrFreqPerTick + 80; var8005cf94 = 0; - admaInit(); + adma_init(); osCreateMesgQueue(&g_AudioManager.audioReplyMsgQ, g_AudioManager.audioReplyMsgBuf, ARRAYCOUNT(g_AudioManager.audioFrameMsgBuf)); osCreateMesgQueue(&g_AudioManager.audioFrameMsgQ, g_AudioManager.audioFrameMsgBuf, ARRAYCOUNT(g_AudioManager.audioFrameMsgBuf)); @@ -142,18 +142,18 @@ void amgrCreate(ALSynConfig *config) n_alInit(&g_AudioManager.g, config); func00030bfc(0, 60); - osCreateThread(&g_AudioManager.thread, THREAD_AUDIO, &amgrMain, 0, g_AudioSp, THREADPRI_AUDIO); + osCreateThread(&g_AudioManager.thread, THREAD_AUDIO, &amgr_main, 0, g_AudioSp, THREADPRI_AUDIO); } s8 g_AudioIsThreadRunning = false; -void amgrStartThread(void) +void amgr_start_thread(void) { osStartThread(&g_AudioManager.thread); g_AudioIsThreadRunning = true; } -OSMesgQueue *amgrGetFrameMesgQueue(void) +OSMesgQueue *amgr_get_frame_mesg_queue(void) { return &g_AudioManager.audioFrameMsgQ; } @@ -163,7 +163,7 @@ OSMesgQueue *amgrGetFrameMesgQueue(void) * this is only called when resetting the console, and when that happens the * variable is likely reset too. */ -void amgrStopThread(void) +void amgr_stop_thread(void) { if (g_AudioIsThreadRunning) { osStopThread(&g_AudioManager.thread); @@ -172,7 +172,7 @@ void amgrStopThread(void) extern u32 g_AdmaCurFrame; -void amgrMain(void *arg) +void amgr_main(void *arg) { s32 count = 0; bool done = false; @@ -196,12 +196,12 @@ void amgrMain(void *arg) switch (*msg) { case OS_SC_RSP_MSG: var80091588 = osGetTime(); - profileSetMarker(PROFILE_AUDIOFRAME_START); - amgrHandleFrameMsg(g_AudioManager.audioInfo[g_AdmaCurFrame % 3], info); - admaReceiveAll(); + profile_set_marker(PROFILE_AUDIOFRAME_START); + amgr_handle_frame_msg(g_AudioManager.audioInfo[g_AdmaCurFrame % 3], info); + adma_receive_all(); count++; - profileSetMarker(PROFILE_AUDIOFRAME_END); + profile_set_marker(PROFILE_AUDIOFRAME_END); var80091590 = osGetTime(); var80091570 = var80091590 - var80091588; @@ -222,7 +222,7 @@ void amgrMain(void *arg) } var8005d514 = 0; - amgrHandleDoneMsg(info); + amgr_handle_done_msg(info); break; case OS_SC_PRE_NMI_MSG: done = true; @@ -236,7 +236,7 @@ void amgrMain(void *arg) n_alClose(&g_AudioManager.g); } -void amgrHandleFrameMsg(AudioInfo *info, AudioInfo *previnfo) +void amgr_handle_frame_msg(AudioInfo *info, AudioInfo *previnfo) { u32 somevalue; s16 *outbuffer; @@ -249,10 +249,10 @@ void amgrHandleFrameMsg(AudioInfo *info, AudioInfo *previnfo) extern u8 aspDataStart; if (g_AmgrCurrentCmdList) { - schedSubmitTask(&g_Sched, g_AmgrCurrentCmdList); + sched_submit_task(&g_Sched, g_AmgrCurrentCmdList); } - admaBeginFrame(); + adma_begin_frame(); somevalue = IO_READ(OS_PHYSICAL_TO_K1(AI_LEN_REG)) / 4; datastart = g_AudioManager.ACMDList[var8005cf90]; @@ -297,7 +297,7 @@ void amgrHandleFrameMsg(AudioInfo *info, AudioInfo *previnfo) var8005cf90 ^= 1; } -void amgrHandleDoneMsg(AudioInfo *info) +void amgr_handle_done_msg(AudioInfo *info) { static bool firsttime = true; diff --git a/src/lib/base.c b/src/lib/base.c index 5842c0c71..c35a36d4f 100644 --- a/src/lib/base.c +++ b/src/lib/base.c @@ -7,7 +7,7 @@ const char lower[] = "0123456789abcdefghijklmnopqrstuvwxyz"; const char upper[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; -char *baseEncode(u64 value, char *buffer, u32 base, bool uppercase) +char *base_encode(u64 value, char *buffer, u32 base, bool uppercase) { const char *digits = uppercase ? upper : lower; char *ptr = buffer; diff --git a/src/lib/boot.c b/src/lib/boot.c index 05c03535b..32068f644 100644 --- a/src/lib/boot.c +++ b/src/lib/boot.c @@ -54,7 +54,7 @@ extern u8 *_inflateSegmentRomStart; extern u8 *_inflateSegmentRomEnd; #if VERSION >= VERSION_NTSC_1_0 -s32 bootGetMemSize(void) +s32 boot_get_mem_size(void) { return g_OsMemSize; } @@ -124,10 +124,10 @@ void boot(void) } // Inflate compressed part of lib - segInflate((void *) libzipram, (void *) libram, (void *) 0x80300000); + seg_inflate((void *) libzipram, (void *) libram, (void *) 0x80300000); // Inflate .data - segInflate((void *) datazipram, (void *) dataram, (void *) 0x80300000); + seg_inflate((void *) datazipram, (void *) dataram, (void *) 0x80300000); #if PIRACYCHECKS if (IO_READ(0xa00002e8) != 0xc86e2000) { @@ -135,7 +135,7 @@ void boot(void) } #endif - vmUnmapRange(1, NTLBENTRIES); + vm_unmap_range(1, NTLBENTRIES); // Clear the stack allocation pointers for (i = 0; i < ARRAYCOUNT(g_StackLeftAddrs); i++) { @@ -168,7 +168,7 @@ void boot(void) #endif // Create and start the main thread - osCreateThread(&g_MainThread, THREAD_MAIN, bootCreateThreads, NULL, bootAllocateStack(THREAD_MAIN, STACKSIZE_MAIN), THREADPRI_MAIN); + osCreateThread(&g_MainThread, THREAD_MAIN, boot_create_threads, NULL, boot_allocate_stack(THREAD_MAIN, STACKSIZE_MAIN), THREADPRI_MAIN); osStartThread(&g_MainThread); } @@ -187,7 +187,7 @@ void boot(void) * The stack is initialised with the thread's ID. This makes it easier to * identify in memory and detect when a stack overflow has occurred. */ -void *bootAllocateStack(s32 threadid, s32 size) +void *boot_allocate_stack(s32 threadid, s32 size) { u8 *ptr8; u32 *ptr32; @@ -221,7 +221,7 @@ void *bootAllocateStack(s32 threadid, s32 size) } #if VERSION < VERSION_NTSC_1_0 -u8 *bootGetStackPos(void) +u8 *boot_get_stack_pos(void) { return g_StackAllocatedPos; } @@ -240,50 +240,50 @@ void idleproc(void *data) while (true); } -void bootCreateIdleThread(void) +void boot_create_idle_thread(void) { - osCreateThread(&g_IdleThread, THREAD_IDLE, idleproc, NULL, bootAllocateStack(THREAD_IDLE, STACKSIZE_IDLE), THREADPRI_IDLE); + osCreateThread(&g_IdleThread, THREAD_IDLE, idleproc, NULL, boot_allocate_stack(THREAD_IDLE, STACKSIZE_IDLE), THREADPRI_IDLE); osStartThread(&g_IdleThread); } -void bootCreateRmonThread(void) +void boot_create_rmon_thread(void) { - osCreateThread(&g_RmonThread, THREAD_RMON, rmonproc, NULL, bootAllocateStack(THREAD_RMON, STACKSIZE_RMON), THREADPRI_RMON); + osCreateThread(&g_RmonThread, THREAD_RMON, rmonproc, NULL, boot_allocate_stack(THREAD_RMON, STACKSIZE_RMON), THREADPRI_RMON); osStartThread(&g_RmonThread); } -void bootCreateSchedThread(void) +void boot_create_sched_thread(void) { osCreateMesgQueue(&g_MainMesgQueue, g_MainMesgBuf, ARRAYCOUNT(g_MainMesgBuf)); if (osTvType == OS_TV_MPAL) { - osCreateScheduler(&g_Sched, &g_SchedThread, OS_VI_MPAL_LAN1, 1); + os_create_scheduler(&g_Sched, &g_SchedThread, OS_VI_MPAL_LAN1, 1); } else { - osCreateScheduler(&g_Sched, &g_SchedThread, OS_VI_NTSC_LAN1, 1); + os_create_scheduler(&g_Sched, &g_SchedThread, OS_VI_NTSC_LAN1, 1); } osScAddClient(&g_Sched, &g_MainSchedClient, &g_MainMesgQueue, false); g_SchedCmdQ = osScGetCmdQ(&g_Sched); } -void bootCreateThreads(void *arg) +void boot_create_threads(void *arg) { - bootCreateIdleThread(); - videbugCreate(); - pimgrCreate(); - bootCreateRmonThread(); + boot_create_idle_thread(); + videbug_create(); + pimgr_create(); + boot_create_rmon_thread(); - if (argsParseDebugArgs()) { + if (args_parse_debug_args()) { osStopThread(NULL); } osSetThreadPri(0, THREADPRI_MAIN); - bootCreateSchedThread(); - mainProc(); + boot_create_sched_thread(); + main_proc(); } #if VERSION < VERSION_NTSC_1_0 -void bootCountUnusedStack(void) +void boot_count_unused_stack(void) { s32 threadid; @@ -303,7 +303,7 @@ void bootCountUnusedStack(void) } } -void bootCheckStackOverflow(void) +void boot_check_stack_overflow(void) { s32 threadid; @@ -316,10 +316,10 @@ void bootCheckStackOverflow(void) if (*ptr != 0xdeadbabe) { char message[128]; - bootCountUnusedStack(); + boot_count_unused_stack(); sprintf(message, "Stack overflow thread %d", threadid); - crashSetMessage(message); + crash_set_message(message); CRASH(); } diff --git a/src/lib/collision.c b/src/lib/collision.c index f9eab66e8..6b09641bb 100644 --- a/src/lib/collision.c +++ b/src/lib/collision.c @@ -52,12 +52,12 @@ s32 var8005f030 = 0; bool g_CdHasSavedBlock = false; s32 var8005f038 = 0; -f32 cd00024e40(void) +f32 cd_00024e40(void) { return var8009a8f0; } -void cdGetEdge(struct coord *vtx1, struct coord *vtx2, u32 line, char *file) +void cd_get_edge(struct coord *vtx1, struct coord *vtx2, u32 line, char *file) { vtx1->x = g_CdEdgeVtx1.x; vtx1->y = g_CdEdgeVtx1.y; @@ -68,34 +68,34 @@ void cdGetEdge(struct coord *vtx1, struct coord *vtx2, u32 line, char *file) vtx2->z = g_CdEdgeVtx2.z; } -f32 cd00024e98(void) +f32 cd_00024e98(void) { return var8009a8b0; } -s32 cd00024ea4(void) +s32 cd_00024ea4(void) { return var8009a8ac; } -struct prop *cdGetObstacleProp(void) +struct prop *cd_get_obstacle_prop(void) { return g_CdObstacleProp; } -void cdGetPos(struct coord *pos, u32 line, char *file) +void cd_get_pos(struct coord *pos, u32 line, char *file) { pos->x = g_CdObstaclePos.x; pos->y = g_CdObstaclePos.y; pos->z = g_CdObstaclePos.z; } -void cdGetObstacleNormal(struct coord *normal) +void cd_get_obstacle_normal(struct coord *normal) { - cdGetGeoNormal(g_CdObstacleGeo, normal); + cd_get_geo_normal(g_CdObstacleGeo, normal); } -u32 cdGetGeoFlags(void) +u32 cd_get_geo_flags(void) { u32 flags = 0; @@ -117,7 +117,7 @@ u32 cdGetGeoFlags(void) return flags; } -void cdClearResults(void) +void cd_clear_results(void) { var8009a8b4 = 0; var8009a8ac = 0; @@ -129,7 +129,7 @@ void cdClearResults(void) var8005f038 = 0; } -void cdSetObstacleVtxProp(struct coord *vtx1, struct coord *vtx2, struct prop *prop) +void cd_set_obstacle_vtx_prop(struct coord *vtx1, struct coord *vtx2, struct prop *prop) { g_CdEdgeVtx1.x = vtx1->x; g_CdEdgeVtx1.y = vtx1->y; @@ -149,7 +149,7 @@ void cdSetObstacleVtxProp(struct coord *vtx1, struct coord *vtx2, struct prop *p var8005f038 = 0; } -void cdSetObstacleVtxPropFlt(struct coord *vtx1, struct coord *vtx2, struct prop *prop, f32 arg3) +void cd_set_obstacle_vtx_prop_flt(struct coord *vtx1, struct coord *vtx2, struct prop *prop, f32 arg3) { var8009a8b0 = arg3; @@ -171,7 +171,7 @@ void cdSetObstacleVtxPropFlt(struct coord *vtx1, struct coord *vtx2, struct prop var8005f038 = 0; } -void cd000250cc(struct coord *arg0, struct coord *arg1, f32 width) +void cd_000250cc(struct coord *arg0, struct coord *arg1, f32 width) { struct widthxz sp34; struct xz sp2c; @@ -195,7 +195,7 @@ void cd000250cc(struct coord *arg0, struct coord *arg1, f32 width) var8009a8ac = 1; } -void cdSetObstacleProp(struct prop *prop) +void cd_set_obstacle_prop(struct prop *prop) { var8009a8b4 = 0; var8009a8ac = 0; @@ -207,7 +207,7 @@ void cdSetObstacleProp(struct prop *prop) var8005f038 = 0; } -void cdSetObstacleVtxColProp(struct coord *vtxpos1, struct coord *vtxpos2, struct coord *collisionpos, struct prop *prop) +void cd_set_obstacle_vtx_col_prop(struct coord *vtxpos1, struct coord *vtxpos2, struct coord *collisionpos, struct prop *prop) { g_CdEdgeVtx1.x = vtxpos1->x; g_CdEdgeVtx1.y = vtxpos1->y; @@ -231,7 +231,7 @@ void cdSetObstacleVtxColProp(struct coord *vtxpos1, struct coord *vtxpos2, struc var8005f038 = 0; } -void cdSetObstacleVtxColPropFltGeo(struct coord *vtxpos1, struct coord *vtxpos2, struct coord *collisionpos, struct prop *prop, f32 arg4, struct geo *geo) +void cd_set_obstacle_vtx_col_prop_flt_geo(struct coord *vtxpos1, struct coord *vtxpos2, struct coord *collisionpos, struct prop *prop, f32 arg4, struct geo *geo) { g_CdEdgeVtx1.x = vtxpos1->x; g_CdEdgeVtx1.y = vtxpos1->y; @@ -257,7 +257,7 @@ void cdSetObstacleVtxColPropFltGeo(struct coord *vtxpos1, struct coord *vtxpos2, var8005f038 = 1; } -void cdSetSavedPos(struct coord *pos1, struct coord *pos2) +void cd_set_saved_pos(struct coord *pos1, struct coord *pos2) { g_CdPos1.x = pos1->x; g_CdPos1.y = pos1->y; @@ -270,7 +270,7 @@ void cdSetSavedPos(struct coord *pos1, struct coord *pos2) g_CdHasSavedPos = true; } -bool cdGetSavedPos(struct coord *pos1, struct coord *pos2) +bool cd_get_saved_pos(struct coord *pos1, struct coord *pos2) { if (g_CdHasSavedPos) { pos1->x = g_CdPos1.x; @@ -285,13 +285,13 @@ bool cdGetSavedPos(struct coord *pos1, struct coord *pos2) return g_CdHasSavedPos; } -void cdSetSavedBlock(struct geoblock *block) +void cd_set_saved_block(struct geoblock *block) { g_CdSavedBlock = *block; g_CdHasSavedBlock = true; } -s32 cd00025410(f32 arg0, f32 arg1, f32 arg2, f32 arg3) +s32 cd_00025410(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { f32 f0 = arg0 * arg3; f32 f2 = arg1 * arg2; @@ -315,7 +315,7 @@ s32 cd00025410(f32 arg0, f32 arg1, f32 arg2, f32 arg3) return 0; } -s32 cd000254d8(struct coord *arg0, struct coord *arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 *arg6) +s32 cd_000254d8(struct coord *arg0, struct coord *arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, s32 *arg6) { f32 sp54; f32 sp50; @@ -332,16 +332,16 @@ s32 cd000254d8(struct coord *arg0, struct coord *arg1, f32 arg2, f32 arg3, f32 a sp54 = arg0->x - arg2; sp50 = arg0->z - arg3; - sp3c = cd00025410(arg4 - arg2, arg5 - arg3, sp54, sp50); - sp44 = cd00025410(arg4 - arg2, arg5 - arg3, arg1->x - arg2, arg1->z - arg3); + sp3c = cd_00025410(arg4 - arg2, arg5 - arg3, sp54, sp50); + sp44 = cd_00025410(arg4 - arg2, arg5 - arg3, arg1->x - arg2, arg1->z - arg3); sp38 = sp3c * sp44; if (sp38 <= 0) { sp4c = arg1->x - arg0->x; sp48 = arg1->z - arg0->z; - sp34 = cd00025410(sp4c, sp48, -sp54, -sp50); - sp40 = cd00025410(sp4c, sp48, arg4 - arg0->x, arg5 - arg0->z); + sp34 = cd_00025410(sp4c, sp48, -sp54, -sp50); + sp40 = cd_00025410(sp4c, sp48, arg4 - arg0->x, arg5 - arg0->z); sp30 = sp34 * sp40; if (sp30 <= 0) { @@ -356,7 +356,7 @@ s32 cd000254d8(struct coord *arg0, struct coord *arg1, f32 arg2, f32 arg3, f32 a return result; } -f32 cd00025654(f32 x1, f32 z1, f32 x2, f32 z2, f32 x3, f32 z3) +f32 cd_00025654(f32 x1, f32 z1, f32 x2, f32 z2, f32 x3, f32 z3) { u32 stack[8]; f32 result; @@ -370,7 +370,7 @@ f32 cd00025654(f32 x1, f32 z1, f32 x2, f32 z2, f32 x3, f32 z3) return ((x3 - x1) * (z2 - z1) + -(x2 - x1) * (z3 - z1)) / result; } -f32 cd00025724(f32 x1, f32 z1, f32 x2, f32 z2) +f32 cd_00025724(f32 x1, f32 z1, f32 x2, f32 z2) { x2 -= x1; z2 -= z1; @@ -378,7 +378,7 @@ f32 cd00025724(f32 x1, f32 z1, f32 x2, f32 z2) return sqrtf(x2 * x2 + z2 * z2); } -bool cd00025774(f32 x1, f32 z1, f32 x2, f32 z2, f32 x3, f32 z3) +bool cd_00025774(f32 x1, f32 z1, f32 x2, f32 z2, f32 x3, f32 z3) { f32 f0; f32 f2; @@ -397,7 +397,7 @@ bool cd00025774(f32 x1, f32 z1, f32 x2, f32 z2, f32 x3, f32 z3) return (f18 < f16 && f16 < 0) || (f16 > 0 && f16 < f18); } -void cd00025848(f32 tilex, f32 tilez, f32 tilewidth, f32 posx, f32 posz, f32 *x1, f32 *z1, f32 *x2, f32 *z2) +void cd_00025848(f32 tilex, f32 tilez, f32 tilewidth, f32 posx, f32 posz, f32 *x1, f32 *z1, f32 *x2, f32 *z2) { posx -= tilex; posz -= tilez; @@ -418,7 +418,7 @@ void cd00025848(f32 tilex, f32 tilez, f32 tilewidth, f32 posx, f32 posz, f32 *x1 *z2 = tilez + posz + posx; } -void cdGetGeoNormal(struct geo *geo, struct coord *normal) +void cd_get_geo_normal(struct geo *geo, struct coord *normal) { if (geo->type == GEOTYPE_TILE_I) { struct geotilei *tile = (struct geotilei *) geo; @@ -468,7 +468,7 @@ void cdGetGeoNormal(struct geo *geo, struct coord *normal) } } -void cdGetFloorCol(struct geo *geo, u16 *floorcol) +void cd_get_floor_col(struct geo *geo, u16 *floorcol) { if (geo == NULL) { *floorcol = 0xfff; @@ -497,7 +497,7 @@ void cdGetFloorCol(struct geo *geo, u16 *floorcol) } } -void cdGetFloorType(struct geo *geo, u8 *floortype) +void cd_get_floor_type(struct geo *geo, u8 *floortype) { bool water = false; @@ -537,7 +537,7 @@ void cdGetFloorType(struct geo *geo, u8 *floortype) } } -f32 cdFindGroundInIntTileAtVertex(struct geotilei *tile, f32 x, f32 z, s32 vertexindex) +f32 cd_find_ground_in_int_tile_at_vertex(struct geotilei *tile, f32 x, f32 z, s32 vertexindex) { struct coord sp7c; struct coord sp70; @@ -590,13 +590,13 @@ f32 cdFindGroundInIntTileAtVertex(struct geotilei *tile, f32 x, f32 z, s32 verte } #if VERSION < VERSION_NTSC_1_0 -f32 cdFindGroundInTileType0AtVertex1(struct geotilei *tile, f32 x, f32 z) +f32 cd_find_ground_in_tile_type0_at_vertex1(struct geotilei *tile, f32 x, f32 z) { - return cdFindGroundInIntTileAtVertex(tile, x, z, 1); + return cd_find_ground_in_int_tile_at_vertex(tile, x, z, 1); } #endif -f32 cdFindGroundInIntTile(struct geotilei *tile, f32 x, f32 z) +f32 cd_find_ground_in_int_tile(struct geotilei *tile, f32 x, f32 z) { s32 i = 1; s32 ival = -1; @@ -626,10 +626,10 @@ f32 cdFindGroundInIntTile(struct geotilei *tile, f32 x, f32 z) } } - return cdFindGroundInIntTileAtVertex(tile, x, z, i); + return cd_find_ground_in_int_tile_at_vertex(tile, x, z, i); } -f32 cdFindGroundInFltTile(struct geotilef *tile, f32 x, f32 z) +f32 cd_find_ground_in_flt_tile(struct geotilef *tile, f32 x, f32 z) { struct coord sp24; struct coord sp18; @@ -668,7 +668,7 @@ f32 cdFindGroundInFltTile(struct geotilef *tile, f32 x, f32 z) return ground; } -bool cdIs2dPointInIntTile(struct geotilei *tile, f32 x, f32 z) +bool cd_is2d_point_in_int_tile(struct geotilei *tile, f32 x, f32 z) { s32 result = -1; s32 numvertices = tile->header.numvertices; @@ -702,7 +702,7 @@ bool cdIs2dPointInIntTile(struct geotilei *tile, f32 x, f32 z) return true; } -bool cdIs2dPointInFltTile(struct geotilef *tile, f32 x, f32 z) +bool cd_is2d_point_in_flt_tile(struct geotilef *tile, f32 x, f32 z) { s32 result = -1; s32 numvertices = tile->header.numvertices; @@ -736,7 +736,7 @@ bool cdIs2dPointInFltTile(struct geotilef *tile, f32 x, f32 z) return true; } -bool cdIs2dPointInBlock(struct geoblock *tile, f32 x, f32 z) +bool cd_is2d_point_in_block(struct geoblock *tile, f32 x, f32 z) { s32 result = -1; s32 numvertices = tile->header.numvertices; @@ -770,7 +770,7 @@ bool cdIs2dPointInBlock(struct geoblock *tile, f32 x, f32 z) return true; } -bool cdIs2dPointInCyl(struct geocyl *cyl, f32 x, f32 z) +bool cd_is2d_point_in_cyl(struct geocyl *cyl, f32 x, f32 z) { f32 xdiff = x - cyl->x; f32 zdiff = z - cyl->z; @@ -778,18 +778,18 @@ bool cdIs2dPointInCyl(struct geocyl *cyl, f32 x, f32 z) return xdiff * xdiff + zdiff * zdiff <= cyl->radius * cyl->radius; } -bool cd000266a4(f32 x, f32 z, struct geo *geo) +bool cd_000266a4(f32 x, f32 z, struct geo *geo) { if (geo == NULL) { return false; } if (geo->type == GEOTYPE_BLOCK) { - return cdIs2dPointInBlock((struct geoblock *) geo, x, z); + return cd_is2d_point_in_block((struct geoblock *) geo, x, z); } if (geo->type == GEOTYPE_CYL) { - return cdIs2dPointInCyl((struct geocyl *) geo, x, z); + return cd_is2d_point_in_cyl((struct geocyl *) geo, x, z); } return false; @@ -798,7 +798,7 @@ bool cd000266a4(f32 x, f32 z, struct geo *geo) /** * For a lift or escalator step, find the props which are riding on it. */ -void cdGetPropsOnPlatform(struct prop *platform, s16 *propnums, s32 maxlen) +void cd_get_props_on_platform(struct prop *platform, s16 *propnums, s32 maxlen) { u8 *start; u8 *end; @@ -808,8 +808,8 @@ void cdGetPropsOnPlatform(struct prop *platform, s16 *propnums, s32 maxlen) struct geo *geo; s32 len = 0; - if (propUpdateGeometry(platform, &start, &end)) { - roomGetProps(platform->rooms, roompropnums, 256); + if (prop_update_geometry(platform, &start, &end)) { + room_get_props(platform->rooms, roompropnums, 256); roompropnumptr = roompropnums; while (*roompropnumptr >= 0) { @@ -832,8 +832,8 @@ void cdGetPropsOnPlatform(struct prop *platform, s16 *propnums, s32 maxlen) && pos->z >= tile->vertices[tile->zmin].z && pos->z <= tile->vertices[tile->zmax].z && pos->y >= tile->vertices[tile->ymin].y - && cdIs2dPointInFltTile(tile, pos->x, pos->z) - && pos->y >= cdFindGroundInFltTile(tile, pos->x, pos->z)) { + && cd_is2d_point_in_flt_tile(tile, pos->x, pos->z) + && pos->y >= cd_find_ground_in_flt_tile(tile, pos->x, pos->z)) { break; } @@ -863,12 +863,12 @@ void cdGetPropsOnPlatform(struct prop *platform, s16 *propnums, s32 maxlen) } #if VERSION < VERSION_NTSC_1_0 -void cdSetPropYBounds(struct prop *prop, f32 ymax, f32 ymin) +void cd_set_prop_y_bounds(struct prop *prop, f32 ymax, f32 ymin) { u8 *start; u8 *end; - if (propUpdateGeometry(prop, &start, &end)) { + if (prop_update_geometry(prop, &start, &end)) { struct geo *geo = (struct geo *) start; while (geo < (struct geo *) end) { @@ -894,7 +894,7 @@ void cdSetPropYBounds(struct prop *prop, f32 ymax, f32 ymin) } #endif -bool cd00026a04(struct coord *pos, u8 *start, u8 *end, u16 geoflags, s32 room, struct geo **tileptr, s32 *roomptr, f32 *groundptr, bool ceiling) +bool cd_00026a04(struct coord *pos, u8 *start, u8 *end, u16 geoflags, s32 room, struct geo **tileptr, s32 *roomptr, f32 *groundptr, bool ceiling) { bool result = false; struct geo *geo = (struct geo *) start; @@ -912,8 +912,8 @@ bool cd00026a04(struct coord *pos, u8 *start, u8 *end, u16 geoflags, s32 room, s && pos->z <= *(s16 *)(tile->zmax + (uintptr_t)tile)) { if ((!ceiling && pos->y >= *(s16 *)(tile->ymin + (uintptr_t)tile)) || (ceiling && pos->y <= *(s16 *)(tile->ymax + (uintptr_t)tile))) { - if (cdIs2dPointInIntTile(tile, pos->x, pos->z)) { - f32 ground = cdFindGroundInIntTile(tile, pos->x, pos->z); + if (cd_is2d_point_in_int_tile(tile, pos->x, pos->z)) { + f32 ground = cd_find_ground_in_int_tile(tile, pos->x, pos->z); if ((!ceiling && ground <= pos->y && ground > *groundptr) || (ceiling && ground >= pos->y && ground < *groundptr)) { @@ -937,8 +937,8 @@ bool cd00026a04(struct coord *pos, u8 *start, u8 *end, u16 geoflags, s32 room, s && pos->z <= tile->vertices[tile->zmax].z) { if ((!ceiling && pos->y >= tile->vertices[tile->ymin].y) || (ceiling && pos->y <= tile->vertices[tile->ymax].y)) { - if (cdIs2dPointInFltTile(tile, pos->x, pos->z)) { - f32 ground = cdFindGroundInFltTile(tile, pos->x, pos->z); + if (cd_is2d_point_in_flt_tile(tile, pos->x, pos->z)) { + f32 ground = cd_find_ground_in_flt_tile(tile, pos->x, pos->z); if ((!ceiling && pos->y >= ground && ground > *groundptr) || (ceiling && pos->y <= ground && ground < *groundptr)) { @@ -962,7 +962,7 @@ bool cd00026a04(struct coord *pos, u8 *start, u8 *end, u16 geoflags, s32 room, s return result; } -void cdFindClosestVertical(struct coord *pos, RoomNum *rooms, u16 geoflags, struct geo **geoptr, RoomNum *roomptr, f32 *groundptr, struct prop **propptr, bool ceiling) +void cd_find_closest_vertical(struct coord *pos, RoomNum *rooms, u16 geoflags, struct geo **geoptr, RoomNum *roomptr, f32 *groundptr, struct prop **propptr, bool ceiling) { RoomNum *roomptr2; s32 roomnum; @@ -989,21 +989,21 @@ void cdFindClosestVertical(struct coord *pos, RoomNum *rooms, u16 geoflags, stru start = g_TileFileData.u8 + g_TileRooms[roomnum]; end = g_TileFileData.u8 + g_TileRooms[roomnum + 1]; - cd00026a04(pos, start, end, geoflags, roomnum, &geo, &room, &closesty, ceiling); + cd_00026a04(pos, start, end, geoflags, roomnum, &geo, &room, &closesty, ceiling); } roomptr2++; roomnum = *roomptr2; } - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { struct prop *prop = &g_Vars.props[*propnumptr]; - if (propUpdateGeometry(prop, &start, &end) - && cd00026a04(pos, start, end, geoflags, prop->rooms[0], &geo, &room, &closesty, ceiling)) { + if (prop_update_geometry(prop, &start, &end) + && cd_00026a04(pos, start, end, geoflags, prop->rooms[0], &geo, &room, &closesty, ceiling)) { bestprop = prop; } @@ -1019,11 +1019,11 @@ void cdFindClosestVertical(struct coord *pos, RoomNum *rooms, u16 geoflags, stru } } -bool cd0002709cIntTile(struct geotilei *tile, f32 x, f32 z, f32 radius, struct prop *prop, struct collision *collision) +bool cd_0002709c_int_tile(struct geotilei *tile, f32 x, f32 z, f32 radius, struct prop *prop, struct collision *collision) { bool result = false; - if (cdIs2dPointInIntTile(tile, x, z)) { + if (cd_is2d_point_in_int_tile(tile, x, z)) { collision->geo = &tile->header; collision->vertexindex = 0; collision->prop = prop; @@ -1034,16 +1034,16 @@ bool cd0002709cIntTile(struct geotilei *tile, f32 x, f32 z, f32 radius, struct p for (i = 0; i < numvertices; i++) { s32 next = (i + 1) % numvertices; - f32 value = cd00025654(tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], x, z); + f32 value = cd_00025654(tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], x, z); if (value < 0) { value = -value; } if (value <= radius - && (cd00025724(tile->vertices[i][0], tile->vertices[i][2], x, z) <= radius - || cd00025724(tile->vertices[next][0], tile->vertices[next][2], x, z) <= radius - || cd00025774(tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], x, z))) { + && (cd_00025724(tile->vertices[i][0], tile->vertices[i][2], x, z) <= radius + || cd_00025724(tile->vertices[next][0], tile->vertices[next][2], x, z) <= radius + || cd_00025774(tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], x, z))) { collision->geo = &tile->header; collision->vertexindex = i; collision->prop = prop; @@ -1056,11 +1056,11 @@ bool cd0002709cIntTile(struct geotilei *tile, f32 x, f32 z, f32 radius, struct p return result; } -bool cd000272f8FltTile(struct geotilef *tile, f32 x, f32 z, f32 radius, struct prop *prop, struct collision *collision) +bool cd_000272f8_flt_tile(struct geotilef *tile, f32 x, f32 z, f32 radius, struct prop *prop, struct collision *collision) { bool result = false; - if (cdIs2dPointInFltTile(tile, x, z)) { + if (cd_is2d_point_in_flt_tile(tile, x, z)) { collision->geo = &tile->header; collision->vertexindex = 0; collision->prop = prop; @@ -1071,16 +1071,16 @@ bool cd000272f8FltTile(struct geotilef *tile, f32 x, f32 z, f32 radius, struct p for (i = 0; i < numvertices; i++) { s32 next = (i + 1) % numvertices; - f32 value = cd00025654(tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, x, z); + f32 value = cd_00025654(tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, x, z); if (value < 0) { value = -value; } if (value <= radius - && (cd00025724(tile->vertices[i].x, tile->vertices[i].z, x, z) <= radius - || cd00025724(tile->vertices[next].x, tile->vertices[next].z, x, z) <= radius - || cd00025774(tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, x, z))) { + && (cd_00025724(tile->vertices[i].x, tile->vertices[i].z, x, z) <= radius + || cd_00025724(tile->vertices[next].x, tile->vertices[next].z, x, z) <= radius + || cd_00025774(tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, x, z))) { collision->geo = &tile->header; collision->vertexindex = i; collision->prop = prop; @@ -1093,11 +1093,11 @@ bool cd000272f8FltTile(struct geotilef *tile, f32 x, f32 z, f32 radius, struct p return result; } -s32 cd000274e0Block(struct geoblock *tile, f32 x, f32 z, f32 radius, struct prop *prop, struct collision *collision) +s32 cd_000274e0_block(struct geoblock *tile, f32 x, f32 z, f32 radius, struct prop *prop, struct collision *collision) { bool result = false; - if (cdIs2dPointInBlock(tile, x, z)) { + if (cd_is2d_point_in_block(tile, x, z)) { if (collision) { collision->geo = &tile->header; collision->vertexindex = 0; @@ -1111,7 +1111,7 @@ s32 cd000274e0Block(struct geoblock *tile, f32 x, f32 z, f32 radius, struct prop for (i = 0; i < numvertices; i++) { s32 next = (i + 1) % numvertices; - f32 value = cd00025654(tile->vertices[i][0], tile->vertices[i][1], + f32 value = cd_00025654(tile->vertices[i][0], tile->vertices[i][1], tile->vertices[next][0], tile->vertices[next][1], x, z); @@ -1120,9 +1120,9 @@ s32 cd000274e0Block(struct geoblock *tile, f32 x, f32 z, f32 radius, struct prop } if (value <= radius - && (cd00025724(tile->vertices[i][0], tile->vertices[i][1], x, z) <= radius - || cd00025724(tile->vertices[next][0], tile->vertices[next][1], x, z) <= radius - || cd00025774(tile->vertices[i][0], tile->vertices[i][1], tile->vertices[next][0], tile->vertices[next][1], x, z))) { + && (cd_00025724(tile->vertices[i][0], tile->vertices[i][1], x, z) <= radius + || cd_00025724(tile->vertices[next][0], tile->vertices[next][1], x, z) <= radius + || cd_00025774(tile->vertices[i][0], tile->vertices[i][1], tile->vertices[next][0], tile->vertices[next][1], x, z))) { if (collision) { collision->geo = &tile->header; collision->vertexindex = i; @@ -1138,7 +1138,7 @@ s32 cd000274e0Block(struct geoblock *tile, f32 x, f32 z, f32 radius, struct prop return result; } -bool cd000276c8Cyl(struct geocyl *cyl, f32 x, f32 z, f32 radius, struct prop *prop, struct collision *collision) +bool cd_000276c8_cyl(struct geocyl *cyl, f32 x, f32 z, f32 radius, struct prop *prop, struct collision *collision) { bool result = false; @@ -1159,9 +1159,9 @@ bool cd000276c8Cyl(struct geocyl *cyl, f32 x, f32 z, f32 radius, struct prop *pr return result; } -s32 cdTestRampWall(struct geotilei *tile, struct coord *pos, f32 width, f32 y1, f32 y2); +s32 cd_test_ramp_wall(struct geotilei *tile, struct coord *pos, f32 width, f32 y1, f32 y2); -void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *end, u16 geoflags, +void cd_collect_geo_for_cyl_from_list(struct coord *pos, f32 radius, u8 *start, u8 *end, u16 geoflags, bool checkvertical, f32 arg6, f32 arg7, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions, s32 roomnum) { @@ -1180,13 +1180,13 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en && (!checkvertical || (pos->y + arg6 >= *(s16 *)(tile->ymin + (uintptr_t)tile) && pos->y + arg7 <= *(s16 *)(tile->ymax + (uintptr_t)tile)))) { if (geo->flags & GEOFLAG_RAMPWALL) { - result = cdTestRampWall(tile, pos, radius, pos->y + arg7, pos->y + arg6); + result = cd_test_ramp_wall(tile, pos, radius, pos->y + arg7, pos->y + arg6); } else { result = 1; } if (result != 0) { - if (cd0002709cIntTile(tile, pos->x, pos->z, radius, prop, &collisions[*numcollisions])) { + if (cd_0002709c_int_tile(tile, pos->x, pos->z, radius, prop, &collisions[*numcollisions])) { collisions[*numcollisions].room = roomnum; *numcollisions = *numcollisions + 1; @@ -1209,7 +1209,7 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en && pos->z <= *(f32 *)((uintptr_t)tile + tile->zmax * 0xc + 0x18) + radius && (!checkvertical || (pos->y + arg6 >= *(f32*)((uintptr_t)tile + tile->ymin * 0xc + 0x14) && pos->y + arg7 <= *(f32 *)((uintptr_t)tile + tile->ymax * 0xc + 0x14)))) { - result = cd000272f8FltTile(tile, pos->x, pos->z, radius, prop, &collisions[*numcollisions]); + result = cd_000272f8_flt_tile(tile, pos->x, pos->z, radius, prop, &collisions[*numcollisions]); if (result != 0) { collisions[*numcollisions].room = roomnum; @@ -1227,7 +1227,7 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en if ((geoflags & (GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT)) && (!checkvertical || (pos->y + arg6 >= block->ymin && pos->y + arg7 <= block->ymax))) { - result = cd000274e0Block(block, pos->x, pos->z, radius, prop, &collisions[*numcollisions]); + result = cd_000274e0_block(block, pos->x, pos->z, radius, prop, &collisions[*numcollisions]); if (result) { collisions[*numcollisions].room = roomnum; @@ -1245,7 +1245,7 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en if ((geoflags & geo->flags) && (!checkvertical || (pos->y + arg6 >= cyl->ymin && pos->y + arg7 <= cyl->ymax))) { - result = cd000276c8Cyl(cyl, pos->x, pos->z, radius, prop, &collisions[*numcollisions]); + result = cd_000276c8_cyl(cyl, pos->x, pos->z, radius, prop, &collisions[*numcollisions]); if (result) { collisions[*numcollisions].room = roomnum; @@ -1262,7 +1262,7 @@ void cdCollectGeoForCylFromList(struct coord *pos, f32 radius, u8 *start, u8 *en } } -void cdCollectGeoForCyl(struct coord *pos, f32 radius, RoomNum *rooms, u32 types, u16 geoflags, bool checkvertical, f32 ymax, f32 ymin, struct collision *collisions, s32 maxcollisions) +void cd_collect_geo_for_cyl(struct coord *pos, f32 radius, RoomNum *rooms, u32 types, u16 geoflags, bool checkvertical, f32 ymax, f32 ymin, struct collision *collisions, s32 maxcollisions) { RoomNum *roomptr; s32 roomnum; @@ -1282,7 +1282,7 @@ void cdCollectGeoForCyl(struct coord *pos, f32 radius, RoomNum *rooms, u32 types start = g_TileFileData.u8 + g_TileRooms[roomnum]; end = g_TileFileData.u8 + g_TileRooms[roomnum + 1]; - cdCollectGeoForCylFromList(pos, radius, start, end, geoflags, checkvertical, ymax, ymin, NULL, collisions, maxcollisions, &numcollisions, roomnum); + cd_collect_geo_for_cyl_from_list(pos, radius, start, end, geoflags, checkvertical, ymax, ymin, NULL, collisions, maxcollisions, &numcollisions, roomnum); if (numcollisions >= maxcollisions) { goto end; @@ -1295,14 +1295,14 @@ void cdCollectGeoForCyl(struct coord *pos, f32 radius, RoomNum *rooms, u32 types } // Check props - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { struct prop *prop = &g_Vars.props[*propnumptr]; - if (propIsOfCdType(prop, types) && propUpdateGeometry(prop, &start, &end)) { - cdCollectGeoForCylFromList(pos, radius, start, end, geoflags, checkvertical, ymax, ymin, prop, collisions, maxcollisions, &numcollisions, prop->rooms[0]); + if (prop_is_of_cd_type(prop, types) && prop_update_geometry(prop, &start, &end)) { + cd_collect_geo_for_cyl_from_list(pos, radius, start, end, geoflags, checkvertical, ymax, ymin, prop, collisions, maxcollisions, &numcollisions, prop->rooms[0]); if (numcollisions >= maxcollisions) { break; @@ -1316,7 +1316,7 @@ end: collisions[numcollisions].geo = NULL; } -void cd00027f78(struct geotilei *tile, f32 arg1, f32 arg2, f32 arg3, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) +void cd_00027f78(struct geotilei *tile, f32 arg1, f32 arg2, f32 arg3, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) { s32 i; s32 numvertices = tile->header.numvertices; @@ -1325,16 +1325,16 @@ void cd00027f78(struct geotilei *tile, f32 arg1, f32 arg2, f32 arg3, struct prop s32 next = (i + 1) % numvertices; if (tile->vertices[i][0] != tile->vertices[next][0] || tile->vertices[i][2] != tile->vertices[next][2]) { - f32 f0 = cd00025654(tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], arg1, arg2); + f32 f0 = cd_00025654(tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], arg1, arg2); if (f0 < 0.0f) { f0 = -f0; } if (f0 <= arg3 - && (cd00025724(tile->vertices[i][0], tile->vertices[i][2], arg1, arg2) <= arg3 - || cd00025724(tile->vertices[next][0], tile->vertices[next][2], arg1, arg2) <= arg3 - || cd00025774(tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], arg1, arg2))) { + && (cd_00025724(tile->vertices[i][0], tile->vertices[i][2], arg1, arg2) <= arg3 + || cd_00025724(tile->vertices[next][0], tile->vertices[next][2], arg1, arg2) <= arg3 + || cd_00025774(tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], arg1, arg2))) { if (*numcollisions < maxcollisions) { collisions[*numcollisions].geo = &tile->header; collisions[*numcollisions].vertexindex = i; @@ -1358,7 +1358,7 @@ void cd00027f78(struct geotilei *tile, f32 arg1, f32 arg2, f32 arg3, struct prop * When collision checks are being done, tiles with this flag are passed to * this function which does a more extensive check. */ -s32 cdTestRampWall(struct geotilei *tile, struct coord *pos, f32 width, f32 y1, f32 y2) +s32 cd_test_ramp_wall(struct geotilei *tile, struct coord *pos, f32 width, f32 y1, f32 y2) { s32 count; s32 i; @@ -1442,7 +1442,7 @@ s32 cdTestRampWall(struct geotilei *tile, struct coord *pos, f32 width, f32 y1, return count; } -void cd0002840c(struct geotilef *tile, f32 arg1, f32 arg2, f32 arg3, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) +void cd_0002840c(struct geotilef *tile, f32 arg1, f32 arg2, f32 arg3, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) { s32 i; s32 numvertices = tile->header.numvertices; @@ -1451,16 +1451,16 @@ void cd0002840c(struct geotilef *tile, f32 arg1, f32 arg2, f32 arg3, struct prop s32 next = (i + 1) % numvertices; if (tile->vertices[i].x != tile->vertices[next].x || tile->vertices[i].z != tile->vertices[next].z) { - f32 f0 = cd00025654(tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, arg1, arg2); + f32 f0 = cd_00025654(tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, arg1, arg2); if (f0 < 0.0f) { f0 = -f0; } if (f0 <= arg3 - && (cd00025724(tile->vertices[i].x, tile->vertices[i].z, arg1, arg2) <= arg3 - || cd00025724(tile->vertices[next].x, tile->vertices[next].z, arg1, arg2) <= arg3 - || cd00025774(tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, arg1, arg2))) { + && (cd_00025724(tile->vertices[i].x, tile->vertices[i].z, arg1, arg2) <= arg3 + || cd_00025724(tile->vertices[next].x, tile->vertices[next].z, arg1, arg2) <= arg3 + || cd_00025774(tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, arg1, arg2))) { if (*numcollisions < maxcollisions) { collisions[*numcollisions].geo = &tile->header; collisions[*numcollisions].vertexindex = i; @@ -1474,7 +1474,7 @@ void cd0002840c(struct geotilef *tile, f32 arg1, f32 arg2, f32 arg3, struct prop } } -void cd00028638(struct geoblock *block, f32 arg1, f32 arg2, f32 arg3, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) +void cd_00028638(struct geoblock *block, f32 arg1, f32 arg2, f32 arg3, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) { s32 i; s32 numvertices = block->header.numvertices; @@ -1483,16 +1483,16 @@ void cd00028638(struct geoblock *block, f32 arg1, f32 arg2, f32 arg3, struct pro s32 next = (i + 1) % numvertices; if (block->vertices[i][0] != block->vertices[next][0] || block->vertices[i][1] != block->vertices[next][1]) { - f32 f0 = cd00025654(block->vertices[i][0], block->vertices[i][1], block->vertices[next][0], block->vertices[next][1], arg1, arg2); + f32 f0 = cd_00025654(block->vertices[i][0], block->vertices[i][1], block->vertices[next][0], block->vertices[next][1], arg1, arg2); if (f0 < 0.0f) { f0 = -f0; } if (f0 <= arg3 - && (cd00025724(block->vertices[i][0], block->vertices[i][1], arg1, arg2) <= arg3 - || cd00025724(block->vertices[next][0], block->vertices[next][1], arg1, arg2) <= arg3 - || cd00025774(block->vertices[i][0], block->vertices[i][1], block->vertices[next][0], block->vertices[next][1], arg1, arg2))) { + && (cd_00025724(block->vertices[i][0], block->vertices[i][1], arg1, arg2) <= arg3 + || cd_00025724(block->vertices[next][0], block->vertices[next][1], arg1, arg2) <= arg3 + || cd_00025774(block->vertices[i][0], block->vertices[i][1], block->vertices[next][0], block->vertices[next][1], arg1, arg2))) { if (*numcollisions < maxcollisions) { collisions[*numcollisions].geo = &block->header; collisions[*numcollisions].vertexindex = i; @@ -1506,7 +1506,7 @@ void cd00028638(struct geoblock *block, f32 arg1, f32 arg2, f32 arg3, struct pro } } -void cd0002885c(struct geocyl *cyl, f32 x, f32 z, f32 arg3, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) +void cd_0002885c(struct geocyl *cyl, f32 x, f32 z, f32 arg3, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) { f32 xdiff = x - cyl->x; f32 zdiff = z - cyl->z; @@ -1522,7 +1522,7 @@ void cd0002885c(struct geocyl *cyl, f32 x, f32 z, f32 arg3, struct prop *prop, s } } -void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 radius, u16 geoflags, +void cd_collect_geo_for_cyl_move_from_list(u8 *start, u8 *end, struct coord *pos, f32 radius, u16 geoflags, bool checkvertical, f32 arg6, f32 arg7, struct prop *prop, struct collision *collisions, s32 maxcollisions, s32 *numcollisions) { @@ -1542,13 +1542,13 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r bool pass; if (geo->flags & GEOFLAG_RAMPWALL) { - pass = cdTestRampWall(tile, pos, radius, pos->y + arg7, pos->y + arg6); + pass = cd_test_ramp_wall(tile, pos, radius, pos->y + arg7, pos->y + arg6); } else { pass = true; } if (pass) { - cd00027f78(tile, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); + cd_00027f78(tile, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); } } } @@ -1564,7 +1564,7 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r && pos->z <= tile->vertices[tile->zmax].z + radius && (!checkvertical || (pos->y + arg6 >= tile->vertices[tile->ymin].y && pos->y + arg7 <= tile->vertices[tile->ymax].y))) { - cd0002840c(tile, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); + cd_0002840c(tile, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); } geo = (struct geo *)((uintptr_t)geo + (uintptr_t)(tile->header.numvertices - 0x40) * 0xc + 0x310); @@ -1573,7 +1573,7 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r if ((geoflags & (GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT)) && (!checkvertical || (pos->y + arg6 >= block->ymin && pos->y + arg7 <= block->ymax))) { - cd00028638(block, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); + cd_00028638(block, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); } geo = (struct geo *)((uintptr_t)geo + sizeof(struct geoblock)); @@ -1582,7 +1582,7 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r if ((geoflags & geo->flags) && (!checkvertical || (pos->y + arg6 >= cyl->ymin && pos->y + arg7 <= cyl->ymax))) { - cd0002885c(cyl, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); + cd_0002885c(cyl, pos->x, pos->z, radius, prop, collisions, maxcollisions, numcollisions); } geo = (struct geo *)((uintptr_t)geo + sizeof(struct geocyl)); @@ -1590,7 +1590,7 @@ void cdCollectGeoForCylMoveFromList(u8 *start, u8 *end, struct coord *pos, f32 r } } -void cdCollectGeoForCylMove(struct coord *pos, f32 width, RoomNum *rooms, u32 types, u16 geoflags, bool checkvertical, f32 ymax, f32 ymin, struct collision *collisions, s32 maxcollisions) +void cd_collect_geo_for_cyl_move(struct coord *pos, f32 width, RoomNum *rooms, u32 types, u16 geoflags, bool checkvertical, f32 ymax, f32 ymin, struct collision *collisions, s32 maxcollisions) { RoomNum *roomptr; s32 roomnum; @@ -1610,7 +1610,7 @@ void cdCollectGeoForCylMove(struct coord *pos, f32 width, RoomNum *rooms, u32 ty start = g_TileFileData.u8 + g_TileRooms[roomnum]; end = g_TileFileData.u8 + g_TileRooms[roomnum + 1]; - cdCollectGeoForCylMoveFromList(start, end, pos, width, geoflags, checkvertical, ymax, ymin, NULL, collisions, maxcollisions, &numcollisions); + cd_collect_geo_for_cyl_move_from_list(start, end, pos, width, geoflags, checkvertical, ymax, ymin, NULL, collisions, maxcollisions, &numcollisions); } roomptr++; @@ -1619,14 +1619,14 @@ void cdCollectGeoForCylMove(struct coord *pos, f32 width, RoomNum *rooms, u32 ty } // Check props - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { struct prop *prop = &g_Vars.props[*propnumptr]; - if (propIsOfCdType(prop, types) && propUpdateGeometry(prop, &start, &end)) { - cdCollectGeoForCylMoveFromList(start, end, pos, width, geoflags, checkvertical, ymax, ymin, prop, collisions, maxcollisions, &numcollisions); + if (prop_is_of_cd_type(prop, types) && prop_update_geometry(prop, &start, &end)) { + cd_collect_geo_for_cyl_move_from_list(start, end, pos, width, geoflags, checkvertical, ymax, ymin, prop, collisions, maxcollisions, &numcollisions); } propnumptr++; @@ -1635,7 +1635,7 @@ void cdCollectGeoForCylMove(struct coord *pos, f32 width, RoomNum *rooms, u32 ty collisions[numcollisions].geo = NULL; } -void cd0002901c(struct coord *pos, struct coord *dist, f32 width, struct collision *collisions) +void cd_0002901c(struct coord *pos, struct coord *dist, f32 width, struct collision *collisions) { s32 i; struct widthxz spf8; @@ -1793,16 +1793,16 @@ void cd0002901c(struct coord *pos, struct coord *dist, f32 width, struct collisi } else if (collisions[bestindex].geo->type == GEOTYPE_CYL) { struct geocyl *cyl = (struct geocyl *) collisions[bestindex].geo; - cd00025848(cyl->x, cyl->z, cyl->radius, pos->x, pos->z, &vtx1.x, &vtx1.z, &vtx2.x, &vtx2.z); + cd_00025848(cyl->x, cyl->z, cyl->radius, pos->x, pos->z, &vtx1.x, &vtx1.z, &vtx2.x, &vtx2.z); vtx1.y = pos->y; vtx2.y = pos->y; } - cdSetObstacleVtxPropFlt(&vtx1, &vtx2, collisions[bestindex].prop, bestvalue); + cd_set_obstacle_vtx_prop_flt(&vtx1, &vtx2, collisions[bestindex].prop, bestvalue); } -f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct collision **collisionptr, f32 width) +f32 cd_find_ground_from_list(struct collision *collisions, struct coord *pos, struct collision **collisionptr, f32 width) { struct collision *collision; s32 i; @@ -1859,7 +1859,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct hasflag0100 = true; } - collision->intile = cdIs2dPointInIntTile(tile, pos->x, pos->z); + collision->intile = cd_is2d_point_in_int_tile(tile, pos->x, pos->z); if (collision->intile) { anyintile = true; @@ -1868,7 +1868,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct } else if (collision->geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) collision->geo; - collision->intile = cdIs2dPointInFltTile(tile, pos->x, pos->z); + collision->intile = cd_is2d_point_in_flt_tile(tile, pos->x, pos->z); if (collision->intile) { anyintile = true; @@ -1883,7 +1883,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct struct geotilei *tile = (struct geotilei *) collision->geo; if ((tile->header.flags & GEOFLAG_STEP) == 0) { - ground = cdFindGroundInIntTile((void *)collision->geo, pos->x, pos->z); + ground = cd_find_ground_in_int_tile((void *)collision->geo, pos->x, pos->z); if (ground >= curground && ground < pos->y) { curground = ground; @@ -1894,7 +1894,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct } else if (collision->geo->type == GEOTYPE_TILE_F) { struct geotilef *tile = (struct geotilef *) collision->geo; - ground = cdFindGroundInFltTile((void *)collision->geo, pos->x, pos->z); + ground = cd_find_ground_in_flt_tile((void *)collision->geo, pos->x, pos->z); if (ground >= curground && ground < pos->y) { curground = ground; @@ -1911,7 +1911,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct struct geotilei *tile = (struct geotilei *) collision->geo; if (tile->header.flags & GEOFLAG_STEP) { - ground = cdFindGroundInIntTile((void *)collision->geo, pos->x, pos->z); + ground = cd_find_ground_in_int_tile((void *)collision->geo, pos->x, pos->z); if (ground >= curground && (ground < pos->y || !hasground)) { curground = ground; @@ -1960,7 +1960,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct nextx = tile->vertices[next][0]; nextz = tile->vertices[next][2]; - spd4 = cd00025654(thisx, thisz, nextx, nextz, pos->x, pos->z); + spd4 = cd_00025654(thisx, thisz, nextx, nextz, pos->x, pos->z); f30 = spd4; if (f30 < 0.0f) { @@ -1973,14 +1973,14 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct if (f30 < spe4) #endif { - if (cd00025774(thisx, thisz, nextx, nextz, pos->x, pos->z)) { + if (cd_00025774(thisx, thisz, nextx, nextz, pos->x, pos->z)) { spb8 = nextx - thisx; spb4 = nextz - thisz; f14 = spd4 / sqrtf(spb8 * spb8 + spb4 * spb4); x = pos->x + f14 * -spb4; z = pos->z + f14 * spb8; - ground = cdFindGroundInIntTileAtVertex(tile, x, z, i); + ground = cd_find_ground_in_int_tile_at_vertex(tile, x, z, i); if (ground < pos->y || (collision->geo->flags & GEOFLAG_STEP)) { curground = ground; @@ -1992,8 +1992,8 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct #endif } } else { - thisvalue = cd00025724(thisx, thisz, pos->x, pos->z); - nextvalue = cd00025724(nextx, nextz, pos->x, pos->z); + thisvalue = cd_00025724(thisx, thisz, pos->x, pos->z); + nextvalue = cd_00025724(nextx, nextz, pos->x, pos->z); if (thisvalue < nextvalue) { #if VERSION >= VERSION_NTSC_1_0 @@ -2004,7 +2004,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct { x = tile->vertices[i][0]; z = tile->vertices[i][2]; - ground = cdFindGroundInIntTileAtVertex(tile, x, z, i); + ground = cd_find_ground_in_int_tile_at_vertex(tile, x, z, i); if (ground < pos->y || (collision->geo->flags & GEOFLAG_STEP)) { curground = ground; @@ -2025,7 +2025,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct { x = tile->vertices[next][0]; z = tile->vertices[next][2]; - ground = cdFindGroundInIntTileAtVertex(tile, x, z, i); + ground = cd_find_ground_in_int_tile_at_vertex(tile, x, z, i); if (ground < pos->y || (collision->geo->flags & GEOFLAG_STEP)) { curground = ground; @@ -2056,7 +2056,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct nextx = tile->vertices[next].x; nextz = tile->vertices[next].z; - sp94 = cd00025654(thisx, thisz, nextx, nextz, pos->x, pos->z); + sp94 = cd_00025654(thisx, thisz, nextx, nextz, pos->x, pos->z); f30 = sp94; if (f30 < 0.0f) { @@ -2064,14 +2064,14 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct } if (f30 < spe4) { - if (cd00025774(thisx, thisz, nextx, nextz, pos->x, pos->z)) { + if (cd_00025774(thisx, thisz, nextx, nextz, pos->x, pos->z)) { sp78 = nextx - thisx; sp74 = nextz - thisz; f14 = sp94 / sqrtf(sp78 * sp78 + sp74 * sp74); x = pos->x + f14 * -sp74; z = pos->z + f14 * sp78; - ground = cdFindGroundInFltTile(tile, x, z); + ground = cd_find_ground_in_flt_tile(tile, x, z); if (ground < pos->y) { curground = ground; @@ -2083,14 +2083,14 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct #endif } } else { - thisvalue = cd00025724(thisx, thisz, pos->x, pos->z); - nextvalue = cd00025724(nextx, nextz, pos->x, pos->z); + thisvalue = cd_00025724(thisx, thisz, pos->x, pos->z); + nextvalue = cd_00025724(nextx, nextz, pos->x, pos->z); if (thisvalue < nextvalue) { if (thisvalue < spe4) { x = tile->vertices[i].x; z = tile->vertices[i].z; - ground = cdFindGroundInFltTile(tile, x, z); + ground = cd_find_ground_in_flt_tile(tile, x, z); if (ground < pos->y) { curground = ground; @@ -2106,7 +2106,7 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct if (nextvalue < spe4) { x = tile->vertices[next].x; z = tile->vertices[next].z; - ground = cdFindGroundInFltTile(tile, x, z); + ground = cd_find_ground_in_flt_tile(tile, x, z); if (ground < pos->y) { curground = ground; @@ -2139,17 +2139,17 @@ f32 cdFindGroundFromList(struct collision *collisions, struct coord *pos, struct * There is nothing specific to ladders in this function, but it's only used * for finding ladders. */ -bool cdFindLadder(struct coord *pos, f32 width, f32 ymax, f32 ymin, RoomNum *rooms, u16 geoflags, struct coord *laddernormal) +bool cd_find_ladder(struct coord *pos, f32 width, f32 ymax, f32 ymin, RoomNum *rooms, u16 geoflags, struct coord *laddernormal) { struct collision collisions[2]; - cdCollectGeoForCyl(pos, width, rooms, CDTYPE_BG, geoflags, CHECKVERTICAL_YES, ymax, ymin, collisions, 1); + cd_collect_geo_for_cyl(pos, width, rooms, CDTYPE_BG, geoflags, CHECKVERTICAL_YES, ymax, ymin, collisions, 1); if (collisions[0].geo) { struct geotilei *tile = (struct geotilei *) collisions[0].geo; struct coord dist; - cdGetGeoNormal(collisions[0].geo, laddernormal); + cd_get_geo_normal(collisions[0].geo, laddernormal); dist.x = pos->x - tile->vertices[0][0]; dist.y = pos->y - tile->vertices[0][1]; @@ -2167,11 +2167,11 @@ bool cdFindLadder(struct coord *pos, f32 width, f32 ymax, f32 ymin, RoomNum *roo return false; } -bool cd0002a13c(struct coord *pos, f32 radius, f32 ymax, f32 ymin, RoomNum *rooms, u16 geoflags) +bool cd_0002a13c(struct coord *pos, f32 radius, f32 ymax, f32 ymin, RoomNum *rooms, u16 geoflags) { struct collision collisions[2]; - cdCollectGeoForCyl(pos, radius, rooms, CDTYPE_BG, geoflags, CHECKVERTICAL_YES, ymax, ymin, collisions, 1); + cd_collect_geo_for_cyl(pos, radius, rooms, CDTYPE_BG, geoflags, CHECKVERTICAL_YES, ymax, ymin, collisions, 1); if (collisions[0].geo) { return true; @@ -2180,7 +2180,7 @@ bool cd0002a13c(struct coord *pos, f32 radius, f32 ymax, f32 ymin, RoomNum *room return false; } -f32 cdFindGroundInfoAtCyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *floorcol, +f32 cd_find_ground_info_at_cyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *floorcol, u8 *floortype, u16 *floorflags, RoomNum *floorroom, s32 *inlift, struct prop **lift) { struct collision collisions[21]; @@ -2188,19 +2188,19 @@ f32 cdFindGroundInfoAtCyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *fl f32 ground; struct geo *geo = NULL; - cdCollectGeoForCyl(pos, radius, rooms, CDTYPE_ALL, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, CHECKVERTICAL_NO, 0, 0, collisions, 20); - ground = cdFindGroundFromList(collisions, pos, &sp72, radius); + cd_collect_geo_for_cyl(pos, radius, rooms, CDTYPE_ALL, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, CHECKVERTICAL_NO, 0, 0, collisions, 20); + ground = cd_find_ground_from_list(collisions, pos, &sp72, radius); if (sp72) { geo = sp72->geo; } if (floorcol) { - cdGetFloorCol(geo, floorcol); + cd_get_floor_col(geo, floorcol); } if (floortype) { - cdGetFloorType(geo, floortype); + cd_get_floor_type(geo, floortype); } if (floorflags && geo) { @@ -2233,75 +2233,75 @@ f32 cdFindGroundInfoAtCyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *fl } /** - * This function must come immediately after cdFindGroundInfoAtCyl. + * This function must come immediately after cd_find_ground_info_at_cyl. * * A piracy check looks for this function, then backtracks two instructions to - * nop the jr ra at the end of cdFindGroundInfoAtCyl, causing it to flow into this + * nop the jr ra at the end of cd_find_ground_info_at_cyl, causing it to flow into this * function and return 0. */ -f32 cdReturnZero(void) +f32 cd_return_zero(void) { return 0; } -f32 cdFindGroundAtCyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *floorcol, u8 *floortype) +f32 cd_find_ground_at_cyl(struct coord *pos, f32 radius, RoomNum *rooms, u16 *floorcol, u8 *floortype) { - return cdFindGroundInfoAtCyl(pos, radius, rooms, floorcol, floortype, NULL, NULL, NULL, NULL); + return cd_find_ground_info_at_cyl(pos, radius, rooms, floorcol, floortype, NULL, NULL, NULL, NULL); } -f32 cdFindFloorYColourTypeAtPos(struct coord *pos, RoomNum *rooms, u16 *floorcol, u8 *floortype) +f32 cd_find_floor_y_colour_type_at_pos(struct coord *pos, RoomNum *rooms, u16 *floorcol, u8 *floortype) { struct geo *geo; RoomNum sp30[2]; f32 sp2c; f32 result = -4294967296; - cdFindClosestVertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &sp30[1], &sp2c, NULL, SURFACE_FLOOR); + cd_find_closest_vertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &sp30[1], &sp2c, NULL, SURFACE_FLOOR); if (geo) { result = sp2c; } if (floorcol) { - cdGetFloorCol(geo, floorcol); + cd_get_floor_col(geo, floorcol); } if (floortype) { - cdGetFloorType(geo, floortype); + cd_get_floor_type(geo, floortype); } return result; } -s32 cdFindFloorRoomAtPos(struct coord *pos, RoomNum *nearrooms) +s32 cd_find_floor_room_at_pos(struct coord *pos, RoomNum *nearrooms) { struct geo *geo; RoomNum room; f32 sp2c; - cdFindClosestVertical(pos, nearrooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &room, &sp2c, 0, SURFACE_FLOOR); + cd_find_closest_vertical(pos, nearrooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &room, &sp2c, 0, SURFACE_FLOOR); return room; } #if VERSION >= VERSION_NTSC_1_0 -RoomNum cdFindFloorRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr) +RoomNum cd_find_floor_room_y_colour_flags_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr) #else -RoomNum cdFindFloorRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr) +RoomNum cd_find_floor_room_y_colour_flags_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr) #endif { struct geo *geo; RoomNum room; f32 sp2c; - cdFindClosestVertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &room, &sp2c, NULL, SURFACE_FLOOR); + cd_find_closest_vertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &room, &sp2c, NULL, SURFACE_FLOOR); if (geo != NULL) { *arg2 = sp2c; } if (floorcolptr != NULL) { - cdGetFloorCol(geo, floorcolptr); + cd_get_floor_col(geo, floorcolptr); } #if VERSION >= VERSION_NTSC_1_0 @@ -2314,23 +2314,23 @@ RoomNum cdFindFloorRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 } #if VERSION >= VERSION_NTSC_1_0 -RoomNum cdFindCeilingRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr) +RoomNum cd_find_ceiling_room_y_colour_flags_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr, u16 *flagsptr) #else -RoomNum cdFindCeilingRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr) +RoomNum cd_find_ceiling_room_y_colour_flags_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcolptr) #endif { struct geo *geo; RoomNum sp32; f32 sp2c; - cdFindClosestVertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &sp32, &sp2c, NULL, SURFACE_CEILING); + cd_find_closest_vertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &sp32, &sp2c, NULL, SURFACE_CEILING); if (geo != NULL) { *arg2 = sp2c; } if (floorcolptr != NULL) { - cdGetFloorCol(geo, floorcolptr); + cd_get_floor_col(geo, floorcolptr); } #if VERSION >= VERSION_NTSC_1_0 @@ -2342,41 +2342,41 @@ RoomNum cdFindCeilingRoomYColourFlagsAtPos(struct coord *pos, RoomNum *rooms, f3 return sp32; } -RoomNum cdFindFloorRoomYColourNormalPropAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcol, struct coord *normal, struct prop **propptr) +RoomNum cd_find_floor_room_y_colour_normal_prop_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcol, struct coord *normal, struct prop **propptr) { struct geo *geo; RoomNum room; f32 sp2c; - cdFindClosestVertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &room, &sp2c, propptr, SURFACE_FLOOR); + cd_find_closest_vertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &room, &sp2c, propptr, SURFACE_FLOOR); if (geo) { *arg2 = sp2c; - cdGetGeoNormal(geo, normal); + cd_get_geo_normal(geo, normal); } if (floorcol) { - cdGetFloorCol(geo, floorcol); + cd_get_floor_col(geo, floorcol); } return room; } -RoomNum cdFindCeilingRoomYColourFlagsNormalAtPos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcol, u16 *flagsptr, struct coord *normal) +RoomNum cd_find_ceiling_room_y_colour_flags_normal_at_pos(struct coord *pos, RoomNum *rooms, f32 *arg2, u16 *floorcol, u16 *flagsptr, struct coord *normal) { struct geo *geo; RoomNum sp32; f32 sp2c; - cdFindClosestVertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &sp32, &sp2c, NULL, SURFACE_CEILING); + cd_find_closest_vertical(pos, rooms, GEOFLAG_FLOOR1 | GEOFLAG_FLOOR2, &geo, &sp32, &sp2c, NULL, SURFACE_CEILING); if (geo) { *arg2 = sp2c; - cdGetGeoNormal(geo, normal); + cd_get_geo_normal(geo, normal); } if (floorcol) { - cdGetFloorCol(geo, floorcol); + cd_get_floor_col(geo, floorcol); } if (flagsptr != NULL && geo != NULL) { @@ -2389,22 +2389,22 @@ RoomNum cdFindCeilingRoomYColourFlagsNormalAtPos(struct coord *pos, RoomNum *roo /** * Tests if a cylinder volume fits in the given position. */ -s32 cdTestVolume(struct coord *pos, f32 width, RoomNum *rooms, s32 types, bool checkvertical, f32 ymax, f32 ymin) +s32 cd_test_volume(struct coord *pos, f32 width, RoomNum *rooms, s32 types, bool checkvertical, f32 ymax, f32 ymin) { struct collision collisions[2]; bool result = true; - cdCollectGeoForCyl(pos, width, rooms, types, GEOFLAG_WALL, checkvertical, ymax, ymin, collisions, 1); + cd_collect_geo_for_cyl(pos, width, rooms, types, GEOFLAG_WALL, checkvertical, ymax, ymin, collisions, 1); if (collisions[0].geo) { result = false; - cdSetObstacleProp(collisions[0].prop); + cd_set_obstacle_prop(collisions[0].prop); } return result; } -s32 cdExamCylMove01(struct coord *pos, struct coord *pos2, f32 radius, RoomNum *rooms, s32 types, bool checkvertical, f32 ymax, f32 ymin) +s32 cd_exam_cyl_move01(struct coord *pos, struct coord *pos2, f32 radius, RoomNum *rooms, s32 types, bool checkvertical, f32 ymax, f32 ymin) { struct collision collisions[2]; s32 cdresult; @@ -2413,7 +2413,7 @@ s32 cdExamCylMove01(struct coord *pos, struct coord *pos2, f32 radius, RoomNum * cdresult = CDRESULT_NOCOLLISION; - cdCollectGeoForCyl(pos2, radius, rooms, types, GEOFLAG_WALL, checkvertical, ymax, ymin, collisions, 1); + cd_collect_geo_for_cyl(pos2, radius, rooms, types, GEOFLAG_WALL, checkvertical, ymax, ymin, collisions, 1); if (collisions[0].geo != NULL) { cdresult = CDRESULT_COLLISION; @@ -2457,25 +2457,25 @@ s32 cdExamCylMove01(struct coord *pos, struct coord *pos2, f32 radius, RoomNum * } else if (collisions[0].geo->type == GEOTYPE_CYL) { struct geocyl *cyl = (struct geocyl *) collisions[0].geo; - cd00025848(cyl->x, cyl->z, cyl->radius, pos->x, pos->z, &sp70.x, &sp70.z, &sp64.x, &sp64.z); + cd_00025848(cyl->x, cyl->z, cyl->radius, pos->x, pos->z, &sp70.x, &sp70.z, &sp64.x, &sp64.z); sp70.y = pos->y; sp64.y = pos->y; } - cdSetObstacleVtxProp(&sp70, &sp64, collisions[0].prop); + cd_set_obstacle_vtx_prop(&sp70, &sp64, collisions[0].prop); } return cdresult; } -s32 cdExamCylMove02(struct coord *origpos, struct coord *dstpos, f32 width, RoomNum *dstrooms, s32 types, bool checkvertical, f32 ymax, f32 ymin) +s32 cd_exam_cyl_move02(struct coord *origpos, struct coord *dstpos, f32 width, RoomNum *dstrooms, s32 types, bool checkvertical, f32 ymax, f32 ymin) { struct collision collisions[21]; struct coord dist; s32 result = CDRESULT_NOCOLLISION; - cdCollectGeoForCylMove(dstpos, width, dstrooms, types, GEOFLAG_WALL, checkvertical, ymax, ymin, collisions, 20); + cd_collect_geo_for_cyl_move(dstpos, width, dstrooms, types, GEOFLAG_WALL, checkvertical, ymax, ymin, collisions, 20); if (collisions[0].geo) { result = CDRESULT_COLLISION; @@ -2484,13 +2484,13 @@ s32 cdExamCylMove02(struct coord *origpos, struct coord *dstpos, f32 width, Room dist.y = dstpos->y - origpos->y; dist.z = dstpos->z - origpos->z; - cd0002901c(origpos, &dist, width, collisions); + cd_0002901c(origpos, &dist, width, collisions); } return result; } -bool cd0002aac0IntTile(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geotilei *tile, struct coord *arg4, struct coord *arg5) +bool cd_0002aac0_int_tile(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geotilei *tile, struct coord *arg4, struct coord *arg5) { s32 i; u8 numvertices = tile->header.numvertices; @@ -2507,7 +2507,7 @@ bool cd0002aac0IntTile(struct coord *arg0, struct coord *arg1, struct coord *arg return false; } -bool cd0002ab98FltTile(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geotilef *tile, struct coord *arg4, struct coord *arg5) +bool cd_0002ab98_flt_tile(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geotilef *tile, struct coord *arg4, struct coord *arg5) { s32 i; u8 numvertices = tile->header.numvertices; @@ -2522,7 +2522,7 @@ bool cd0002ab98FltTile(struct coord *arg0, struct coord *arg1, struct coord *arg return false; } -bool cd0002ac70IntTile(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geotilei *tile, +bool cd_0002ac70_int_tile(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geotilei *tile, struct coord *arg4, struct coord *arg5, struct coord *arg6, bool arg7, f32 arg8, f32 arg9) { bool result = false; @@ -2548,7 +2548,7 @@ bool cd0002ac70IntTile(struct coord *arg0, struct coord *arg1, struct coord *arg for (i = 0; i < numvertices; i++) { next = (i + 1) % numvertices; - if (cd000254d8(arg0, arg1, tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], &spb8)) { + if (cd_000254d8(arg0, arg1, tile->vertices[i][0], tile->vertices[i][2], tile->vertices[next][0], tile->vertices[next][2], &spb8)) { spa0[0] = arg0->x; spa0[1] = arg0->z; sp98[0] = arg1->x; @@ -2612,7 +2612,7 @@ bool cd0002ac70IntTile(struct coord *arg0, struct coord *arg1, struct coord *arg return result; } -bool cd0002b128FltTile(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geotilef *tile, +bool cd_0002b128_flt_tile(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geotilef *tile, struct coord *arg4, struct coord *arg5, struct coord *arg6, bool arg7, f32 arg8, f32 arg9) { bool result = false; @@ -2638,7 +2638,7 @@ bool cd0002b128FltTile(struct coord *arg0, struct coord *arg1, struct coord *arg for (i = 0; i < numvertices; i++) { next = (i + 1) % numvertices; - if (cd000254d8(arg0, arg1, tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, &spb8)) { + if (cd_000254d8(arg0, arg1, tile->vertices[i].x, tile->vertices[i].z, tile->vertices[next].x, tile->vertices[next].z, &spb8)) { spa0[0] = arg0->x; spa0[1] = arg0->z; sp98[0] = arg1->x; @@ -2702,7 +2702,7 @@ bool cd0002b128FltTile(struct coord *arg0, struct coord *arg1, struct coord *arg return result; } -bool cd0002b560Block(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geoblock *block, +bool cd_0002b560_block(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geoblock *block, struct coord *arg4, struct coord *arg5, struct coord *arg6, bool arg7, f32 arg8, f32 arg9) { bool result = false; @@ -2726,7 +2726,7 @@ bool cd0002b560Block(struct coord *arg0, struct coord *arg1, struct coord *arg2, for (i = 0; i < numvertices; i++) { next = (i + 1) % numvertices; - if (cd000254d8(arg0, arg1, block->vertices[i][0], block->vertices[i][1], block->vertices[next][0], block->vertices[next][1], &spb8)) { + if (cd_000254d8(arg0, arg1, block->vertices[i][0], block->vertices[i][1], block->vertices[next][0], block->vertices[next][1], &spb8)) { spa0[0] = arg0->x; spa0[1] = arg0->z; sp98[0] = arg1->x; @@ -2790,7 +2790,7 @@ bool cd0002b560Block(struct coord *arg0, struct coord *arg1, struct coord *arg2, return result; } -bool cd0002b954Cyl(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geocyl *cyl, +bool cd_0002b954_cyl(struct coord *arg0, struct coord *arg1, struct coord *arg2, struct geocyl *cyl, struct coord *arg4, struct coord *arg5, struct coord *arg6, bool arg7, f32 arg8, f32 arg9) { bool result = false; @@ -2803,16 +2803,16 @@ bool cd0002b954Cyl(struct coord *arg0, struct coord *arg1, struct coord *arg2, s if (!arg7 || (arg0->y + arg8 >= cyl->ymin && arg1->y + arg9 <= cyl->ymax) || (arg0->y + arg9 <= cyl->ymax && arg1->y + arg8 >= cyl->ymin)) { - sp74 = cd00025654(arg0->x, arg0->z, arg1->x, arg1->z, x, z); + sp74 = cd_00025654(arg0->x, arg0->z, arg1->x, arg1->z, x, z); if (sp74 < 0.0f) { sp74 = -sp74; } if (sp74 < radius - && (cd00025724(arg0->x, arg0->z, x, z) < radius - || cd00025724(arg1->x, arg1->z, x, z) < radius - || cd00025774(arg0->x, arg0->z, arg1->x, arg1->z, x, z))) { + && (cd_00025724(arg0->x, arg0->z, x, z) < radius + || cd_00025724(arg1->x, arg1->z, x, z) < radius + || cd_00025774(arg0->x, arg0->z, arg1->x, arg1->z, x, z))) { f32 xdiff = arg1->x - arg0->x; f32 zdiff = arg1->z - arg0->z; f32 sqdist; @@ -2856,7 +2856,7 @@ bool cd0002b954Cyl(struct coord *arg0, struct coord *arg1, struct coord *arg2, s arg4->z = arg0->z + arg2->f[2] * mult; if (arg5 != NULL && arg6 != NULL) { - cd00025848(x, z, radius, arg0->x, arg0->z, &arg5->x, &arg5->z, &arg6->x, &arg6->z); + cd_00025848(x, z, radius, arg0->x, arg0->z, &arg5->x, &arg5->z, &arg6->x, &arg6->z); arg5->y = arg4->y; arg6->y = arg4->y; @@ -2869,7 +2869,7 @@ bool cd0002b954Cyl(struct coord *arg0, struct coord *arg1, struct coord *arg2, s return result; } -bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg3, struct coord *arg4, u16 geoflags, bool checkvertical, s32 arg7, f32 arg8, f32 arg9) +bool cd_test_a_to_b_geolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg3, struct coord *arg4, u16 geoflags, bool checkvertical, s32 arg7, f32 arg8, f32 arg9) { struct geo *geo = (struct geo *) start; @@ -2901,11 +2901,11 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg if ((!(arg2->y < min.y) || !(arg3->y < min.y)) && (!(arg2->y > max.y) || !(arg3->y > max.y)) - && bgTestLineIntersectsBbox(arg2, arg4, &min, &max) - && cd0002aac0IntTile(arg2, arg3, arg4, tile, &spc4, &spb8)) { + && bg_test_line_intersects_bbox(arg2, arg4, &min, &max) + && cd_0002aac0_int_tile(arg2, arg3, arg4, tile, &spc4, &spb8)) { return false; } - } else if (cd0002ac70IntTile(arg2, arg3, arg4, tile, &spc4, 0, 0, arg7, arg8, arg9)) { + } else if (cd_0002ac70_int_tile(arg2, arg3, arg4, tile, &spc4, 0, 0, arg7, arg8, arg9)) { return false; } } @@ -2938,11 +2938,11 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg if ((!(arg2->y < min.y) || !(arg3->y < min.y)) && (!(arg2->y > max.y) || !(arg3->y > max.y)) - && bgTestLineIntersectsBbox(arg2, arg4, &min, &max) - && cd0002ab98FltTile(arg2, arg3, arg4, tile, &sp90, &sp84)) { + && bg_test_line_intersects_bbox(arg2, arg4, &min, &max) + && cd_0002ab98_flt_tile(arg2, arg3, arg4, tile, &sp90, &sp84)) { return false; } - } else if (cd0002b128FltTile(arg2, arg3, arg4, tile, &sp90, 0, 0, arg7, arg8, arg9)) { + } else if (cd_0002b128_flt_tile(arg2, arg3, arg4, tile, &sp90, 0, 0, arg7, arg8, arg9)) { return false; } } @@ -2954,7 +2954,7 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg struct geoblock *block = (struct geoblock *) geo; if ((geoflags & (GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT)) - && cd0002b560Block(arg2, arg3, arg4, block, &sp78, 0, 0, arg7, arg8, arg9)) { + && cd_0002b560_block(arg2, arg3, arg4, block, &sp78, 0, 0, arg7, arg8, arg9)) { return false; } @@ -2964,7 +2964,7 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg struct geocyl *cyl = (struct geocyl *) geo; if ((geoflags & cyl->header.flags) - && cd0002b954Cyl(arg2, arg3, arg4, cyl, &sp68, 0, 0, arg7, arg8, arg9)) { + && cd_0002b954_cyl(arg2, arg3, arg4, cyl, &sp68, 0, 0, arg7, arg8, arg9)) { return false; } @@ -2975,7 +2975,7 @@ bool cdTestAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg return true; } -void cd0002c328IntTile(struct geotilei *tile, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4) +void cd_0002c328_int_tile(struct geotilei *tile, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4) { struct coord sp3c; u32 stack[2]; @@ -3029,7 +3029,7 @@ void cd0002c328IntTile(struct geotilei *tile, struct coord *arg1, struct coord * arg4->z = arg1->z + sp3c.f[2] * min; } -void cd0002c528FltTile(struct geotilef *tile, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4) +void cd_0002c528_flt_tile(struct geotilef *tile, struct coord *arg1, struct coord *arg2, struct coord *arg3, struct coord *arg4) { struct coord sp3c; u32 stack[2]; @@ -3083,7 +3083,7 @@ void cd0002c528FltTile(struct geotilef *tile, struct coord *arg1, struct coord * arg4->z = arg1->z + sp3c.f[2] * min; } -bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg3, struct coord *arg4, +bool cd_exam_a_to_b_geolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg3, struct coord *arg4, u16 geoflags, bool checkvertical, s32 arg7, f32 ymax, f32 ymin, f32 *arg10, struct coord *arg11, struct coord *arg12, struct coord *arg13, struct geo **geoptr, s32 roomnum) { @@ -3108,7 +3108,7 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg struct coord sp108; if (geo->flags & GEOFLAG_RAMPWALL) { - ok = cdTestRampWall(tile, arg2, 0, arg2->y + ymin, arg2->y + ymax); + ok = cd_test_ramp_wall(tile, arg2, 0, arg2->y + ymin, arg2->y + ymax); } else { ok = true; } @@ -3132,8 +3132,8 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg if ((!(arg2->y < min.y) || !(arg3->y < min.y)) && (!(arg2->y > max.y) || !(arg3->y > max.y)) - && bgTestLineIntersectsBbox(arg2, arg4, &min, &max) - && cd0002aac0IntTile(arg2, arg3, arg4, tile, &sp12c, &sp120)) { + && bg_test_line_intersects_bbox(arg2, arg4, &min, &max) + && cd_0002aac0_int_tile(arg2, arg3, arg4, tile, &sp12c, &sp120)) { x = sp12c.x - arg2->x; y = sp12c.y - arg2->y; z = sp12c.z - arg2->z; @@ -3148,12 +3148,12 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg arg11->y = sp12c.y; arg11->z = sp12c.z; - cd0002c328IntTile(tile, &sp12c, &sp120, arg12, arg13); + cd_0002c328_int_tile(tile, &sp12c, &sp120, arg12, arg13); *geoptr = geo; } } - } else if (cd0002ac70IntTile(arg2, arg3, arg4, tile, &sp12c, &sp114, &sp108, arg7, ymax, ymin)) { + } else if (cd_0002ac70_int_tile(arg2, arg3, arg4, tile, &sp12c, &sp114, &sp108, arg7, ymax, ymin)) { x = sp12c.x - arg2->x; y = sp12c.y - arg2->y; z = sp12c.z - arg2->z; @@ -3211,8 +3211,8 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg if ((!(arg2->y < min.y) || !(arg3->y < min.y)) && (!(arg2->y > max.y) || !(arg3->y > max.y)) - && bgTestLineIntersectsBbox(arg2, arg4, &min, &max) - && cd0002ab98FltTile(arg2, arg3, arg4, tile, &spe0, &spd4)) { + && bg_test_line_intersects_bbox(arg2, arg4, &min, &max) + && cd_0002ab98_flt_tile(arg2, arg3, arg4, tile, &spe0, &spd4)) { x = spe0.x - arg2->x; y = spe0.y - arg2->y; z = spe0.z - arg2->z; @@ -3227,12 +3227,12 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg arg11->y = spe0.y; arg11->z = spe0.z; - cd0002c528FltTile(tile, &spe0, &spd4, arg12, arg13); + cd_0002c528_flt_tile(tile, &spe0, &spd4, arg12, arg13); *geoptr = geo; } } - } else if (cd0002b128FltTile(arg2, arg3, arg4, tile, &spe0, &spc8, &spbc, arg7, ymax, ymin)) { + } else if (cd_0002b128_flt_tile(arg2, arg3, arg4, tile, &spe0, &spc8, &spbc, arg7, ymax, ymin)) { x = spe0.x - arg2->x; y = spe0.y - arg2->y; z = spe0.z - arg2->z; @@ -3268,7 +3268,7 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg struct coord sp98; if ((geoflags & (GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT)) - && (cd0002b560Block(arg2, arg3, arg4, (struct geoblock *)geo, &spb0, &spa4, &sp98, arg7, ymax, ymin))) { + && (cd_0002b560_block(arg2, arg3, arg4, (struct geoblock *)geo, &spb0, &spa4, &sp98, arg7, ymax, ymin))) { x = spb0.x - arg2->x; y = spb0.y - arg2->y; z = spb0.z - arg2->z; @@ -3303,7 +3303,7 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg struct coord sp70; if ((geoflags & geo->flags) - && cd0002b954Cyl(arg2, arg3, arg4, cyl, &sp88, &sp7c, &sp70, arg7, ymax, ymin)) { + && cd_0002b954_cyl(arg2, arg3, arg4, cyl, &sp88, &sp7c, &sp70, arg7, ymax, ymin)) { x = sp88.x - arg2->x; y = sp88.y - arg2->y; z = sp88.z - arg2->z; @@ -3337,7 +3337,7 @@ bool cdExamAToBGeolist(u8 *start, u8 *end, struct coord *arg2, struct coord *arg return !result; } -bool cdTestAToB(struct coord *pos, struct coord *coord2, RoomNum *rooms, u32 types, u16 geoflags, bool checkvertical, s32 arg6, f32 ymax, f32 ymin) +bool cd_test_a_to_b(struct coord *pos, struct coord *coord2, RoomNum *rooms, u32 types, u16 geoflags, bool checkvertical, s32 arg6, f32 ymax, f32 ymin) { s32 roomnum; RoomNum *roomptr; @@ -3360,8 +3360,8 @@ bool cdTestAToB(struct coord *pos, struct coord *coord2, RoomNum *rooms, u32 typ start = g_TileFileData.u8 + g_TileRooms[roomnum]; end = g_TileFileData.u8 + g_TileRooms[roomnum + 1]; - if (cdTestAToBGeolist(start, end, pos, coord2, &sp27c, geoflags, checkvertical, arg6, ymax, ymin) == 0) { - cdSetObstacleProp(NULL); + if (cd_test_a_to_b_geolist(start, end, pos, coord2, &sp27c, geoflags, checkvertical, arg6, ymax, ymin) == 0) { + cd_set_obstacle_prop(NULL); return false; } } @@ -3371,17 +3371,17 @@ bool cdTestAToB(struct coord *pos, struct coord *coord2, RoomNum *rooms, u32 typ } } - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { struct prop *prop = &g_Vars.props[*propnumptr]; - if (propIsOfCdType(prop, types) - && propUpdateGeometry(prop, &start, &end) - && cdTestAToBGeolist(start, end, pos, coord2, &sp27c, geoflags, checkvertical, arg6, ymax, ymin) == 0) { - cdSetObstacleProp(prop); + if (prop_is_of_cd_type(prop, types) + && prop_update_geometry(prop, &start, &end) + && cd_test_a_to_b_geolist(start, end, pos, coord2, &sp27c, geoflags, checkvertical, arg6, ymax, ymin) == 0) { + cd_set_obstacle_prop(prop); return false; } @@ -3391,7 +3391,7 @@ bool cdTestAToB(struct coord *pos, struct coord *coord2, RoomNum *rooms, u32 typ return true; } -s32 cdExamAToB(struct coord *arg0, struct coord *arg1, RoomNum *rooms, s32 types, u16 geoflags, bool checkvertical, s32 arg6, f32 ymax, f32 ymin) +s32 cd_exam_a_to_b(struct coord *arg0, struct coord *arg1, RoomNum *rooms, s32 types, u16 geoflags, bool checkvertical, s32 arg6, f32 ymax, f32 ymin) { s32 roomnum; RoomNum *roomptr; @@ -3421,9 +3421,9 @@ s32 cdExamAToB(struct coord *arg0, struct coord *arg1, RoomNum *rooms, s32 types start = g_TileFileData.u8 + ptr[0]; end = g_TileFileData.u8 + ptr[1]; - if (!cdExamAToBGeolist(start, end, arg0, arg1, &sp2c4, geoflags, checkvertical, arg6, ymax, ymin, &sp298, &sp2b4, &sp2a8, &sp29c, &sp294, roomnum)) { + if (!cd_exam_a_to_b_geolist(start, end, arg0, arg1, &sp2c4, geoflags, checkvertical, arg6, ymax, ymin, &sp298, &sp2b4, &sp2a8, &sp29c, &sp294, roomnum)) { sp2c0 = true; - cdSetObstacleVtxColPropFltGeo(&sp2a8, &sp29c, &sp2b4, NULL, sp298, sp294); + cd_set_obstacle_vtx_col_prop_flt_geo(&sp2a8, &sp29c, &sp2b4, NULL, sp298, sp294); } } @@ -3432,17 +3432,17 @@ s32 cdExamAToB(struct coord *arg0, struct coord *arg1, RoomNum *rooms, s32 types } } - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { struct prop *prop = &g_Vars.props[*propnumptr]; - if (propIsOfCdType(prop, types) - && propUpdateGeometry(prop, &start, &end) - && !cdExamAToBGeolist(start, end, arg0, arg1, &sp2c4, geoflags, checkvertical, arg6, ymax, ymin, &sp298, &sp2b4, &sp2a8, &sp29c, &sp294, -999)) { + if (prop_is_of_cd_type(prop, types) + && prop_update_geometry(prop, &start, &end) + && !cd_exam_a_to_b_geolist(start, end, arg0, arg1, &sp2c4, geoflags, checkvertical, arg6, ymax, ymin, &sp298, &sp2b4, &sp2a8, &sp29c, &sp294, -999)) { sp2c0 = true; - cdSetObstacleVtxColPropFltGeo(&sp2a8, &sp29c, &sp2b4, prop, sp298, sp294); + cd_set_obstacle_vtx_col_prop_flt_geo(&sp2a8, &sp29c, &sp2b4, prop, sp298, sp294); } propnumptr++; @@ -3451,17 +3451,17 @@ s32 cdExamAToB(struct coord *arg0, struct coord *arg1, RoomNum *rooms, s32 types return !sp2c0; } -bool cdTestCylMove01(struct coord *pos, RoomNum *rooms, struct coord *targetpos, u32 types, u32 arg4, f32 ymax, f32 ymin) +bool cd_test_cyl_move01(struct coord *pos, RoomNum *rooms, struct coord *targetpos, u32 types, u32 arg4, f32 ymax, f32 ymin) { RoomNum sp44[21]; RoomNum sp34[8]; portal00018148(pos, targetpos, rooms, sp34, sp44, 20); - return cdTestAToB(pos, targetpos, sp44, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg4, ymax, ymin); + return cd_test_a_to_b(pos, targetpos, sp44, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg4, ymax, ymin); } -s32 cdTestCylMove02(struct coord *pos, RoomNum *rooms, struct coord *coord2, RoomNum *rooms2, u32 types, s32 arg5, f32 ymax, f32 ymin) +s32 cd_test_cyl_move02(struct coord *pos, RoomNum *rooms, struct coord *coord2, RoomNum *rooms2, u32 types, s32 arg5, f32 ymax, f32 ymin) { s32 result; RoomNum sp44[20]; @@ -3469,8 +3469,8 @@ s32 cdTestCylMove02(struct coord *pos, RoomNum *rooms, struct coord *coord2, Roo func0f065d1c(pos, rooms, coord2, sp34, sp44, 20); - if (arrayIntersects(sp34, rooms2)) { - result = cdTestAToB(pos, coord2, sp44, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg5, ymax, ymin); + if (array_intersects(sp34, rooms2)) { + result = cd_test_a_to_b(pos, coord2, sp44, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg5, ymax, ymin); } else { result = CDRESULT_COLLISION; } @@ -3478,26 +3478,26 @@ s32 cdTestCylMove02(struct coord *pos, RoomNum *rooms, struct coord *coord2, Roo return result; } -s32 cdExamCylMove03(struct coord *pos, RoomNum *rooms, struct coord *arg2, u32 types, u32 arg4, f32 ymax, f32 ymin) +s32 cd_exam_cyl_move03(struct coord *pos, RoomNum *rooms, struct coord *arg2, u32 types, u32 arg4, f32 ymax, f32 ymin) { RoomNum sp44[21]; RoomNum sp34[8]; portal00018148(pos, arg2, rooms, sp34, sp44, 20); - return cdExamAToB(pos, arg2, sp44, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg4, ymax, ymin); + return cd_exam_a_to_b(pos, arg2, sp44, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg4, ymax, ymin); } -s32 cdTestCylMove04(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, s32 arg5, f32 ymax, f32 ymin) +s32 cd_test_cyl_move04(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, s32 arg5, f32 ymax, f32 ymin) { RoomNum rooms[21]; portal00018148(arg0, arg2, arg1, arg3, rooms, 20); - return cdTestAToB(arg0, arg2, rooms, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg5, ymax, ymin); + return cd_test_a_to_b(arg0, arg2, rooms, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg5, ymax, ymin); } -s32 cdExamCylMove05(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, s32 types, bool arg5, f32 ymax, f32 ymin) +s32 cd_exam_cyl_move05(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, s32 types, bool arg5, f32 ymax, f32 ymin) { RoomNum sp44[21]; RoomNum sp34[8]; @@ -3505,17 +3505,17 @@ s32 cdExamCylMove05(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomN func0f065d1c(pos, rooms, pos2, sp34, sp44, 20); - result = cdExamAToB(pos, pos2, sp44, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg5, ymax, ymin); + result = cd_exam_a_to_b(pos, pos2, sp44, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg5, ymax, ymin); - if (result != CDRESULT_COLLISION && !arrayIntersects(sp34, rooms2)) { - cdClearResults(); + if (result != CDRESULT_COLLISION && !array_intersects(sp34, rooms2)) { + cd_clear_results(); result = CDRESULT_ERROR; } return result; } -s32 cdExamCylMove06(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, f32 width, s32 types, s32 arg6, f32 ymax, f32 ymin) +s32 cd_exam_cyl_move06(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, f32 width, s32 types, s32 arg6, f32 ymax, f32 ymin) { RoomNum sp5c[21]; RoomNum sp4c[8]; @@ -3524,32 +3524,32 @@ s32 cdExamCylMove06(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomN func0f065d1c(arg0, arg1, arg2, sp4c, sp5c, 20); - result = cdExamAToB(arg0, arg2, sp5c, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg6, ymax, ymin); + result = cd_exam_a_to_b(arg0, arg2, sp5c, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg6, ymax, ymin); if (result == CDRESULT_COLLISION) { sp40.x = arg2->x - arg0->x; sp40.y = arg2->y - arg0->y; sp40.z = arg2->z - arg0->z; - cd000250cc(arg0, &sp40, width); - } else if (!arrayIntersects(sp4c, arg3)) { - cdClearResults(); + cd_000250cc(arg0, &sp40, width); + } else if (!array_intersects(sp4c, arg3)) { + cd_clear_results(); result = CDRESULT_ERROR; } return result; } -s32 cdExamCylMove07(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, s32 arg5, f32 ymax, f32 ymin) +s32 cd_exam_cyl_move07(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, s32 arg5, f32 ymax, f32 ymin) { RoomNum rooms[21]; portal00018148(arg0, arg2, arg1, arg3, rooms, 20); - return cdExamAToB(arg0, arg2, rooms, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg5, ymax, ymin); + return cd_exam_a_to_b(arg0, arg2, rooms, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg5, ymax, ymin); } -s32 cdExamCylMove08(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, f32 width, u32 types, s32 arg6, f32 ymax, f32 ymin) +s32 cd_exam_cyl_move08(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, f32 width, u32 types, s32 arg6, f32 ymax, f32 ymin) { RoomNum rooms[21]; struct coord sp40; @@ -3557,35 +3557,35 @@ s32 cdExamCylMove08(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomN portal00018148(arg0, arg2, arg1, arg3, rooms, 20); - result = cdExamAToB(arg0, arg2, rooms, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg6, ymax, ymin); + result = cd_exam_a_to_b(arg0, arg2, rooms, types, GEOFLAG_WALL, CHECKVERTICAL_NO, arg6, ymax, ymin); if (result == CDRESULT_COLLISION) { sp40.x = arg2->x - arg0->x; sp40.y = arg2->y - arg0->y; sp40.z = arg2->z - arg0->z; - cd000250cc(arg0, &sp40, width); + cd_000250cc(arg0, &sp40, width); } return result; } -bool cdTestLos03(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, u32 types, u16 geoflags) +bool cd_test_los03(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, u32 types, u16 geoflags) { RoomNum sp44[21]; RoomNum sp34[8]; portal00018148(viewpos, targetpos, rooms, sp34, sp44, 20); - return cdTestAToB(viewpos, targetpos, sp44, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); + return cd_test_a_to_b(viewpos, targetpos, sp44, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); } -bool cdTestLos04(struct coord *frompos, RoomNum *fromrooms, struct coord *topos, s32 types) +bool cd_test_los04(struct coord *frompos, RoomNum *fromrooms, struct coord *topos, s32 types) { - return cdTestLos03(frompos, fromrooms, topos, types, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); + return cd_test_los03(frompos, fromrooms, topos, types, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); } -bool cdTestLos05(struct coord *coord, RoomNum *rooms, struct coord *coord2, RoomNum *rooms2, s32 types, u16 geoflags) +bool cd_test_los05(struct coord *coord, RoomNum *rooms, struct coord *coord2, RoomNum *rooms2, s32 types, u16 geoflags) { bool result; RoomNum sp44[20]; @@ -3593,8 +3593,8 @@ bool cdTestLos05(struct coord *coord, RoomNum *rooms, struct coord *coord2, Room func0f065d1c(coord, rooms, coord2, sp34, sp44, 20); - if (arrayIntersects(sp34, rooms2)) { - result = cdTestAToB(coord, coord2, sp44, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); + if (array_intersects(sp34, rooms2)) { + result = cd_test_a_to_b(coord, coord2, sp44, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); } else { result = false; } @@ -3602,20 +3602,20 @@ bool cdTestLos05(struct coord *coord, RoomNum *rooms, struct coord *coord2, Room return result; } -bool cdTestLos06(struct coord *arg0, RoomNum *rooms1, struct coord *arg2, RoomNum *rooms2, u32 types) +bool cd_test_los06(struct coord *arg0, RoomNum *rooms1, struct coord *arg2, RoomNum *rooms2, u32 types) { - return cdTestLos05(arg0, rooms1, arg2, rooms2, types, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); + return cd_test_los05(arg0, rooms1, arg2, rooms2, types, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); } -bool cdTestLos07(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, RoomNum *rooms3, u32 types, u16 geoflags) +bool cd_test_los07(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum *rooms2, RoomNum *rooms3, u32 types, u16 geoflags) { bool result; RoomNum sp34[20]; func0f065d1c(pos, rooms, pos2, rooms3, sp34, 20); - if (arrayIntersects(rooms3, rooms2)) { - result = cdTestAToB(pos, pos2, sp34, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); + if (array_intersects(rooms3, rooms2)) { + result = cd_test_a_to_b(pos, pos2, sp34, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); } else { result = false; } @@ -3623,36 +3623,36 @@ bool cdTestLos07(struct coord *pos, RoomNum *rooms, struct coord *pos2, RoomNum return result; } -s32 cdExamLos08(struct coord *pos, RoomNum *rooms, struct coord *pos2, u32 types, u16 geoflags) +s32 cd_exam_los08(struct coord *pos, RoomNum *rooms, struct coord *pos2, u32 types, u16 geoflags) { RoomNum sp44[21]; RoomNum sp34[8]; portal00018148(pos, pos2, rooms, sp34, sp44, 20); - return cdExamAToB(pos, pos2, sp44, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); + return cd_exam_a_to_b(pos, pos2, sp44, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); } -s32 cdExamLos09(struct coord *pos, RoomNum *rooms, struct coord *pos2, u32 types) +s32 cd_exam_los09(struct coord *pos, RoomNum *rooms, struct coord *pos2, u32 types) { - return cdExamLos08(pos, rooms, pos2, types, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); + return cd_exam_los08(pos, rooms, pos2, types, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); } -s32 cdTestLos10(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, u16 geoflags) +s32 cd_test_los10(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types, u16 geoflags) { RoomNum rooms[21]; portal00018148(arg0, arg2, arg1, arg3, rooms, 20); - return cdTestAToB(arg0, arg2, rooms, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); + return cd_test_a_to_b(arg0, arg2, rooms, types, geoflags, CHECKVERTICAL_YES, 1, 0, 0); } -s32 cdTestLos11(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types) +s32 cd_test_los11(struct coord *arg0, RoomNum *arg1, struct coord *arg2, RoomNum *arg3, u32 types) { - return cdTestLos10(arg0, arg1, arg2, arg3, types, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); + return cd_test_los10(arg0, arg1, arg2, arg3, types, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT); } -bool cd0002ded8(struct coord *arg0, struct coord *arg1, struct prop *prop) +bool cd_0002ded8(struct coord *arg0, struct coord *arg1, struct prop *prop) { u8 *start; u8 *end; @@ -3668,12 +3668,12 @@ bool cd0002ded8(struct coord *arg0, struct coord *arg1, struct prop *prop) sp7c.y = arg1->y - arg0->y; sp7c.z = arg1->z - arg0->z; - if (propUpdateGeometry(prop, &start, &end)) { - if (!cdExamAToBGeolist(start, end, arg0, arg1, &sp7c, + if (prop_update_geometry(prop, &start, &end)) { + if (!cd_exam_a_to_b_geolist(start, end, arg0, arg1, &sp7c, GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT, CHECKVERTICAL_YES, 1, 0, 0, &sp50, &sp6c, &sp60, &sp54, &geo, -999)) { result = true; - cdSetObstacleVtxColPropFltGeo(&sp60, &sp54, &sp6c, prop, sp50, geo); + cd_set_obstacle_vtx_col_prop_flt_geo(&sp60, &sp54, &sp6c, prop, sp50, geo); } } @@ -3683,7 +3683,7 @@ bool cd0002ded8(struct coord *arg0, struct coord *arg1, struct prop *prop) /** * Return true if both blocks are not intersecting on the X/Z plane. */ -bool cdBlockExcludesBlockLaterally(struct geoblock *block1, struct geoblock *block2) +bool cd_block_excludes_block_laterally(struct geoblock *block1, struct geoblock *block2) { u32 stack[4]; f32 zero = 0.0f; @@ -3700,7 +3700,7 @@ bool cdBlockExcludesBlockLaterally(struct geoblock *block1, struct geoblock *blo diff2 = block1->vertices[i][0] - (f64)block1->vertices[next][0]; if (diff1 == zero && diff2 == zero) { - if (cdIs2dPointInBlock(block2, block1->vertices[i][0], block1->vertices[i][1])) { + if (cd_is2d_point_in_block(block2, block1->vertices[i][0], block1->vertices[i][1])) { return false; } } else { @@ -3744,7 +3744,7 @@ bool cdBlockExcludesBlockLaterally(struct geoblock *block1, struct geoblock *blo return false; } -s32 cdTestBlockOverlapsGeolist(u8 *start, u8 *end, struct geoblock *block, u16 geoflags) +s32 cd_test_block_overlaps_geolist(u8 *start, u8 *end, struct geoblock *block, u16 geoflags) { struct geo *geo = (struct geo *) start; @@ -3765,20 +3765,20 @@ s32 cdTestBlockOverlapsGeolist(u8 *start, u8 *end, struct geoblock *block, u16 g s32 i; for (i = 0; i < block->header.numvertices; i++) { - if (cdIs2dPointInBlock(thisblock, block->vertices[i][0], block->vertices[i][1])) { + if (cd_is2d_point_in_block(thisblock, block->vertices[i][0], block->vertices[i][1])) { return CDRESULT_COLLISION; } } for (i = 0; i < thisblock->header.numvertices; i++) { - if (cdIs2dPointInBlock(block, thisblock->vertices[i][0], thisblock->vertices[i][1])) { + if (cd_is2d_point_in_block(block, thisblock->vertices[i][0], thisblock->vertices[i][1])) { return CDRESULT_COLLISION; } } // This is a bit wasteful... // If A excludes B, there's no point checking if B excludes A. - if (!cdBlockExcludesBlockLaterally(block, thisblock) && !cdBlockExcludesBlockLaterally(thisblock, block)) { + if (!cd_block_excludes_block_laterally(block, thisblock) && !cd_block_excludes_block_laterally(thisblock, block)) { return CDRESULT_COLLISION; } } @@ -3790,7 +3790,7 @@ s32 cdTestBlockOverlapsGeolist(u8 *start, u8 *end, struct geoblock *block, u16 g if ((geoflags & geo->flags) && cyl->ymax >= block->ymin && cyl->ymin <= block->ymax - && cd000274e0Block(block, cyl->x, cyl->z, cyl->radius, NULL, NULL)) { + && cd_000274e0_block(block, cyl->x, cyl->z, cyl->radius, NULL, NULL)) { return CDRESULT_COLLISION; } @@ -3804,14 +3804,14 @@ s32 cdTestBlockOverlapsGeolist(u8 *start, u8 *end, struct geoblock *block, u16 g /** * Test if the given block overlaps any prop. Set the saved obstacle prop if so. * - * The BG tests are pointless and not used, as cdTestBlockOverlapsGeolist only + * The BG tests are pointless and not used, as cd_test_block_overlaps_geolist only * tests blocks and cylinders. * * The function is used to check if a door is being blocked by another prop, * and is also used in a sanity check to make sure a moved object hasn't moved * into the player's position. */ -s32 cdTestBlockOverlapsAnyProp(struct geoblock *geo, RoomNum *rooms, u32 types) +s32 cd_test_block_overlaps_any_prop(struct geoblock *geo, RoomNum *rooms, u32 types) { s32 result = CDRESULT_NOCOLLISION; s32 roomnum; @@ -3831,10 +3831,10 @@ s32 cdTestBlockOverlapsAnyProp(struct geoblock *geo, RoomNum *rooms, u32 types) start = g_TileFileData.u8 + g_TileRooms[roomnum]; end = g_TileFileData.u8 + g_TileRooms[roomnum + 1]; - result = cdTestBlockOverlapsGeolist(start, end, geo, GEOFLAG_WALL); + result = cd_test_block_overlaps_geolist(start, end, geo, GEOFLAG_WALL); if (result == CDRESULT_COLLISION) { - cdSetObstacleProp(NULL); + cd_set_obstacle_prop(NULL); break; } } @@ -3846,17 +3846,17 @@ s32 cdTestBlockOverlapsAnyProp(struct geoblock *geo, RoomNum *rooms, u32 types) // Check props if (result != CDRESULT_COLLISION) { - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { struct prop *prop = &g_Vars.props[*propnumptr]; - if (propIsOfCdType(prop, types) && propUpdateGeometry(prop, &start, &end)) { - result = cdTestBlockOverlapsGeolist(start, end, geo, GEOFLAG_WALL); + if (prop_is_of_cd_type(prop, types) && prop_update_geometry(prop, &start, &end)) { + result = cd_test_block_overlaps_geolist(start, end, geo, GEOFLAG_WALL); if (result == CDRESULT_COLLISION) { - cdSetObstacleProp(prop); + cd_set_obstacle_prop(prop); break; } } @@ -3868,7 +3868,7 @@ s32 cdTestBlockOverlapsAnyProp(struct geoblock *geo, RoomNum *rooms, u32 types) return result; } -bool cd0002e680IntTile(struct geotilei *tile, s32 numvertices, struct coord *verts, struct coord *diffs, struct prop *prop, struct geoblock *block) +bool cd_0002e680_int_tile(struct geotilei *tile, s32 numvertices, struct coord *verts, struct coord *diffs, struct prop *prop, struct geoblock *block) { bool result = false; s32 i; @@ -3888,13 +3888,13 @@ bool cd0002e680IntTile(struct geotilei *tile, s32 numvertices, struct coord *ver curr = i; } - if (cd0002ac70IntTile((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), + if (cd_0002ac70_int_tile((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord)), (struct coord *)((uintptr_t)diffs + curr * sizeof(struct coord)), tile, &sp6c, &sp84, &sp78, 0, 0.0f, 0.0f)) { - cdSetObstacleVtxColProp(&sp84, &sp78, &sp6c, prop); - cdSetSavedPos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); - cdSetSavedBlock(block); + cd_set_obstacle_vtx_col_prop(&sp84, &sp78, &sp6c, prop); + cd_set_saved_pos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); + cd_set_saved_block(block); result = true; break; } @@ -3903,7 +3903,7 @@ bool cd0002e680IntTile(struct geotilei *tile, s32 numvertices, struct coord *ver return result; } -bool cd0002e82cIntTile(struct geotilef *tile, s32 numvertices, struct coord *verts, struct coord *diffs, struct prop *prop, struct geoblock *block) +bool cd_0002e82c_int_tile(struct geotilef *tile, s32 numvertices, struct coord *verts, struct coord *diffs, struct prop *prop, struct geoblock *block) { bool result = false; s32 i; @@ -3923,13 +3923,13 @@ bool cd0002e82cIntTile(struct geotilef *tile, s32 numvertices, struct coord *ver curr = i; } - if (cd0002b128FltTile((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), + if (cd_0002b128_flt_tile((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord)), (struct coord *)((uintptr_t)diffs + curr * sizeof(struct coord)), tile, &sp6c, &sp84, &sp78, 0, 0.0f, 0.0f)) { - cdSetObstacleVtxColProp(&sp84, &sp78, &sp6c, prop); - cdSetSavedPos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); - cdSetSavedBlock(block); + cd_set_obstacle_vtx_col_prop(&sp84, &sp78, &sp6c, prop); + cd_set_saved_pos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); + cd_set_saved_block(block); result = true; break; } @@ -3938,7 +3938,7 @@ bool cd0002e82cIntTile(struct geotilef *tile, s32 numvertices, struct coord *ver return result; } -bool cd0002e9d8Block(struct geoblock *thisblock, s32 numvertices, struct coord *verts, struct coord *diffs, struct prop *prop, struct geoblock *block) +bool cd_0002e9d8_block(struct geoblock *thisblock, s32 numvertices, struct coord *verts, struct coord *diffs, struct prop *prop, struct geoblock *block) { bool result = false; s32 i; @@ -3958,13 +3958,13 @@ bool cd0002e9d8Block(struct geoblock *thisblock, s32 numvertices, struct coord * curr = i; } - if (cd0002b560Block((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), + if (cd_0002b560_block((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord)), (struct coord *)((uintptr_t)diffs + curr * sizeof(struct coord)), thisblock, &sp6c, &sp84, &sp78, 0, 0.0f, 0.0f)) { - cdSetObstacleVtxColProp(&sp84, &sp78, &sp6c, prop); - cdSetSavedPos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); - cdSetSavedBlock(block); + cd_set_obstacle_vtx_col_prop(&sp84, &sp78, &sp6c, prop); + cd_set_saved_pos((struct coord *)((uintptr_t)verts + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)verts + next * sizeof(struct coord))); + cd_set_saved_block(block); result = true; break; } @@ -3973,7 +3973,7 @@ bool cd0002e9d8Block(struct geoblock *thisblock, s32 numvertices, struct coord * return result; } -bool cd0002eb84Cyl(struct geocyl *cyl, s32 numvertices, struct coord *arg2, struct coord *arg3, struct prop *prop, struct geoblock *block) +bool cd_0002eb84_cyl(struct geocyl *cyl, s32 numvertices, struct coord *arg2, struct coord *arg3, struct prop *prop, struct geoblock *block) { bool result = false; s32 i; @@ -3993,13 +3993,13 @@ bool cd0002eb84Cyl(struct geocyl *cyl, s32 numvertices, struct coord *arg2, stru curr = i; } - if (cd0002b954Cyl((struct coord *)((uintptr_t)arg2 + curr * sizeof(struct coord)), + if (cd_0002b954_cyl((struct coord *)((uintptr_t)arg2 + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)arg2 + next * sizeof(struct coord)), (struct coord *)((uintptr_t)arg3 + curr * sizeof(struct coord)), cyl, &sp6c, &sp84, &sp78, 0, 0.0f, 0.0f)) { - cdSetObstacleVtxColProp(&sp84, &sp78, &sp6c, prop); - cdSetSavedPos((struct coord *)((uintptr_t)arg2 + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)arg2 + next * sizeof(struct coord))); - cdSetSavedBlock(block); + cd_set_obstacle_vtx_col_prop(&sp84, &sp78, &sp6c, prop); + cd_set_saved_pos((struct coord *)((uintptr_t)arg2 + curr * sizeof(struct coord)), (struct coord *)((uintptr_t)arg2 + next * sizeof(struct coord))); + cd_set_saved_block(block); result = true; break; } @@ -4008,7 +4008,7 @@ bool cd0002eb84Cyl(struct geocyl *cyl, s32 numvertices, struct coord *arg2, stru return result; } -bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, struct coord *verts, struct coord *diffs, u16 geoflags, struct prop *prop) +bool cd_0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, struct coord *verts, struct coord *diffs, u16 geoflags, struct prop *prop) { struct geo *geo = (struct geo *) start; @@ -4021,7 +4021,7 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str if ((geoflags & geo->flags) && *(s16 *)(tile->ymax + (uintptr_t)tile) >= block->ymin && *(s16 *)(tile->ymin + (uintptr_t)tile) <= block->ymax - && cd0002e680IntTile(tile, numvertices, verts, diffs, prop, block)) { + && cd_0002e680_int_tile(tile, numvertices, verts, diffs, prop, block)) { return false; } @@ -4032,7 +4032,7 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str if ((geoflags & geo->flags) && tile->vertices[tile->ymax].y >= block->ymin && tile->vertices[tile->ymin].y <= block->ymax - && cd0002e82cIntTile(tile, numvertices, verts, diffs, prop, block)) { + && cd_0002e82c_int_tile(tile, numvertices, verts, diffs, prop, block)) { return false; } @@ -4043,7 +4043,7 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str if ((geoflags & (GEOFLAG_WALL | GEOFLAG_BLOCK_SIGHT | GEOFLAG_BLOCK_SHOOT)) && block2->ymax >= block->ymin && block2->ymin <= block->ymax - && cd0002e9d8Block(block2, numvertices, verts, diffs, prop, block)) { + && cd_0002e9d8_block(block2, numvertices, verts, diffs, prop, block)) { return false; } @@ -4054,7 +4054,7 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str if ((geoflags & geo->flags) && cyl->ymax >= block->ymin && cyl->ymin <= block->ymax - && cd0002eb84Cyl(cyl, numvertices, verts, diffs, prop, block)) { + && cd_0002eb84_cyl(cyl, numvertices, verts, diffs, prop, block)) { return false; } @@ -4065,7 +4065,7 @@ bool cd0002ed30(u8 *start, u8 *end, struct geoblock *block, s32 numvertices, str return true; } -bool cd0002f02c(struct geoblock *block, RoomNum *rooms, s32 types) +bool cd_0002f02c(struct geoblock *block, RoomNum *rooms, s32 types) { s32 numvertices = block->header.numvertices; s32 i; @@ -4101,7 +4101,7 @@ bool cd0002f02c(struct geoblock *block, RoomNum *rooms, s32 types) start = g_TileFileData.u8 + g_TileRooms[roomnum]; end = g_TileFileData.u8 + g_TileRooms[roomnum + 1]; - result = cd0002ed30(start, end, block, numvertices, verts, diffs, GEOFLAG_WALL, NULL); + result = cd_0002ed30(start, end, block, numvertices, verts, diffs, GEOFLAG_WALL, NULL); if (!result) { break; @@ -4114,16 +4114,16 @@ bool cd0002f02c(struct geoblock *block, RoomNum *rooms, s32 types) } if (result) { - roomGetProps(rooms, propnums, 256); + room_get_props(rooms, propnums, 256); propnumptr = propnums; while (*propnumptr >= 0) { struct prop *prop = &g_Vars.props[*propnumptr]; - if (propIsOfCdType(prop, types)) { - if (propUpdateGeometry(prop, &start, &end)) { - result = cd0002ed30(start, end, block, numvertices, verts, diffs, GEOFLAG_WALL, prop); + if (prop_is_of_cd_type(prop, types)) { + if (prop_update_geometry(prop, &start, &end)) { + result = cd_0002ed30(start, end, block, numvertices, verts, diffs, GEOFLAG_WALL, prop); if (!result) { break; @@ -4139,7 +4139,7 @@ bool cd0002f02c(struct geoblock *block, RoomNum *rooms, s32 types) } #if VERSION < VERSION_NTSC_1_0 -struct debugtri *cdReadIntTileVertices(struct debugtri *ptr, s32 *remaining, struct geotilei *tile) +struct debugtri *cd_read_int_tile_vertices(struct debugtri *ptr, s32 *remaining, struct geotilei *tile) { if (tile->header.flags & (GEOFLAG_FLOOR1 | GEOFLAG_WALL)) { s32 i; @@ -4181,7 +4181,7 @@ struct debugtri *cdReadIntTileVertices(struct debugtri *ptr, s32 *remaining, str #endif #if VERSION < VERSION_NTSC_1_0 -struct debugtri *cdReadFltTileVertices(struct debugtri *ptr, s32 *remaining, struct geotilef *tile) +struct debugtri *cd_read_flt_tile_vertices(struct debugtri *ptr, s32 *remaining, struct geotilef *tile) { if (tile->header.flags & (GEOFLAG_FLOOR1 | GEOFLAG_WALL)) { s32 i; @@ -4222,24 +4222,24 @@ struct debugtri *cdReadFltTileVertices(struct debugtri *ptr, s32 *remaining, str } #endif -Gfx *cdRender(Gfx *gdl, u32 arg1, u32 arg2, u32 arg3) +Gfx *cd_render(Gfx *gdl, u32 arg1, u32 arg2, u32 arg3) { return gdl; } -void cd0002f2fc(u32 arg0, u32 arg1) +void cd_0002f2fc(u32 arg0, u32 arg1) { // empty } -bool cdIsNearlyInSightWithFlags(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, f32 distance, s32 types, u16 geoflags) +bool cd_is_nearly_in_sight_with_flags(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, f32 distance, s32 types, u16 geoflags) { struct coord diff; f32 x; f32 z; struct coord vector; - if (cdTestLos03(viewpos, rooms, targetpos, types, geoflags)) { + if (cd_test_los03(viewpos, rooms, targetpos, types, geoflags)) { return true; } @@ -4256,7 +4256,7 @@ bool cdIsNearlyInSightWithFlags(struct coord *viewpos, RoomNum *rooms, struct co diff.y = targetpos->y; diff.z = targetpos->z + x; - if (cdTestLos03(viewpos, rooms, &diff, types, geoflags)) { + if (cd_test_los03(viewpos, rooms, &diff, types, geoflags)) { return true; } @@ -4264,14 +4264,14 @@ bool cdIsNearlyInSightWithFlags(struct coord *viewpos, RoomNum *rooms, struct co diff.y = targetpos->y; diff.z = targetpos->z - x; - if (cdTestLos03(viewpos, rooms, &diff, types, geoflags)) { + if (cd_test_los03(viewpos, rooms, &diff, types, geoflags)) { return true; } return false; } -bool cdIsNearlyInSight(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, f32 distance, s32 types) +bool cd_is_nearly_in_sight(struct coord *viewpos, RoomNum *rooms, struct coord *targetpos, f32 distance, s32 types) { - return cdIsNearlyInSightWithFlags(viewpos, rooms, targetpos, distance, types, GEOFLAG_BLOCK_SIGHT); + return cd_is_nearly_in_sight_with_flags(viewpos, rooms, targetpos, distance, types, GEOFLAG_BLOCK_SIGHT); } diff --git a/src/lib/crash.c b/src/lib/crash.c index 5c0c7a9bc..6b49d1dab 100644 --- a/src/lib/crash.c +++ b/src/lib/crash.c @@ -175,18 +175,18 @@ extern u32 _libSegmentStart; extern u32 _libSegmentEnd; void faultproc(void *arg0); -u32 crashGenerate(OSThread *thread, u32 *callstack, s32 *tracelen); -void crashPrintDescription(u32 mask, char *label, struct crashdescription *descriptions); +u32 crash_generate(OSThread *thread, u32 *callstack, s32 *tracelen); +void crash_print_description(u32 mask, char *label, struct crashdescription *descriptions); #if VERSION < VERSION_NTSC_1_0 -void crashSetMessage(char *string) +void crash_set_message(char *string) { strncpy(g_CrashMessage, string, sizeof(g_CrashMessage)); g_CrashHasMessage = true; } #endif -void crashCreateThread(void) +void crash_create_thread(void) { osCreateMesgQueue(&g_FaultMesgQueue, &g_FaultMesg, 1); osCreateThread(&g_FaultThread, THREAD_FAULT, faultproc, NULL, &g_FaultStack[1024], THREADPRI_FAULT); @@ -225,8 +225,8 @@ void faultproc(void *arg0) #endif #ifdef DEBUG - crashGenerate(curr, callstack, &tracelen); - schedSetCrashedUnexpectedly(true); + crash_generate(curr, callstack, &tracelen); + sched_set_crashed_unexpectedly(true); #endif } } @@ -246,7 +246,7 @@ char var80097178nb[MAX_LINES + 1][71]; * Given a pointer to an instruction and a stack frame pointer, attempt to find * the calling function. Return the address of the caller's stack frame and * populate regs with stack addresses where that register was saved. This can be - * used to retrieve the RA value and invoke crashGetParentStackFrame again to + * used to retrieve the RA value and invoke crash_get_parent_stack_frame again to * build a backtrace. * * origptr is a pointer to an instruction. This should be either the value of @@ -267,7 +267,7 @@ char var80097178nb[MAX_LINES + 1][71]; * store $ra in the stack. It can also fail if the function being analysed uses * returns within branches. */ -u32 crashGetParentStackFrame(u32 *origptr, u32 *minaddr, u32 origsp, u32 *regs) +u32 crash_get_parent_stack_frame(u32 *origptr, u32 *minaddr, u32 origsp, u32 *regs) { u32 sp = origsp; u32 *ptr; @@ -355,10 +355,10 @@ u32 crashGetParentStackFrame(u32 *origptr, u32 *minaddr, u32 origsp, u32 *regs) return 0; } -bool crashIsReturnAddress(u32 *instruction) +bool crash_is_return_address(u32 *instruction) { if (((uintptr_t)instruction % 4) == 0 - && (uintptr_t)instruction >= (uintptr_t)vmBoot + && (uintptr_t)instruction >= (uintptr_t)vm_boot && (uintptr_t)instruction <= (uintptr_t)&_libSegmentEnd) { // This condition can never pass because 9 is masked out if ((instruction[-2] & 0xfc00003c) == 9) { @@ -375,7 +375,7 @@ bool crashIsReturnAddress(u32 *instruction) } #if VERSION < VERSION_NTSC_1_0 -s32 crashGetStrLen(char *str) +s32 crash_get_str_len(char *str) { s32 i = 0; char c = *str++; @@ -399,13 +399,13 @@ u32 crash0000c52cnb(u32 romaddr) { u32 addr; - dmaExec(var80097118nb, romaddr, 0x60); + dma_exec(var80097118nb, romaddr, 0x60); var8009710cnb = var80097118nb[0]; var80097110nb = (char *)&var80097118nb[1]; - var80097114nb = (char *)(crashGetStrLen(var80097110nb) + (uintptr_t)var80097110nb + 1); + var80097114nb = (char *)(crash_get_str_len(var80097110nb) + (uintptr_t)var80097110nb + 1); - addr = romaddr + crashGetStrLen(var80097110nb) + crashGetStrLen(var80097114nb) + 6; + addr = romaddr + crash_get_str_len(var80097110nb) + crash_get_str_len(var80097114nb) + 6; if (addr % 4) { addr = (addr | 3) + 1; @@ -465,9 +465,9 @@ void crash0000c694nb(void) } if (numvalid == 4) { - rmonPrintf("%.49s", var80097110nb); + rmon_printf("%.49s", var80097110nb); } else { - rmonPrintf("???"); + rmon_printf("???"); } } #endif @@ -485,9 +485,9 @@ void crash0000c714nb(void) } if (numvalid == 4) { - rmonPrintf("%.41s", var80097114nb); + rmon_printf("%.41s", var80097114nb); } else { - rmonPrintf("???"); + rmon_printf("???"); } } #endif @@ -495,7 +495,7 @@ void crash0000c714nb(void) #if VERSION < VERSION_NTSC_1_0 void crash0000c794nb(void) { - rmonPrintf("%08x", var8009710cnb); + rmon_printf("%08x", var8009710cnb); } #endif @@ -506,13 +506,13 @@ u32 crash0000c7c0nb(void) } #endif -u32 crashGetStackEnd(u32 sp, s32 tid) +u32 crash_get_stack_end(u32 sp, s32 tid) { u32 start; u32 end; if (tid <= 0 || tid > 6U) { - rmonPrintf("Bad tid\n"); + rmon_printf("Bad tid\n"); return 0; } @@ -526,12 +526,12 @@ u32 crashGetStackEnd(u32 sp, s32 tid) return (sp & 0xf0000000) | (end - start); } -u32 crashGetStackStart(u32 sp, s32 tid) +u32 crash_get_stack_start(u32 sp, s32 tid) { u32 start; if (tid <= 0 || tid > 6U) { - rmonPrintf("Bad tid\n"); + rmon_printf("Bad tid\n"); return 0; } @@ -544,7 +544,7 @@ u32 crashGetStackStart(u32 sp, s32 tid) return sp & 0xf0000000; } -bool crashIsDouble(f32 value) +bool crash_is_double(f32 value) { u32 bits = *(u32*)&value; u32 fraction = bits & 0x7fffff; @@ -553,38 +553,38 @@ bool crashIsDouble(f32 value) return fraction == 0 || (exponent != 0 && exponent != 0xff); } -void crashPrintFloat(s32 index, f32 value) +void crash_print_float(s32 index, f32 value) { - if (crashIsDouble(value)) { - rmonPrintf("%s%s%02d: % .7e ", "", "", index, (f64)value); + if (crash_is_double(value)) { + rmon_printf("%s%s%02d: % .7e ", "", "", index, (f64)value); } else { u32 bits = *(u32 *)&value; - rmonPrintf("%02d: I%d.%03d.%07d ", index, (bits & 0x80000000) >> 31, (bits & 0x7f800000) >> 23, bits & 0x7fffff); + rmon_printf("%02d: I%d.%03d.%07d ", index, (bits & 0x80000000) >> 31, (bits & 0x7f800000) >> 23, bits & 0x7fffff); } } -void crashPrint2Floats(s32 index, f32 value1, f32 value2) +void crash_print_2_floats(s32 index, f32 value1, f32 value2) { - crashPrintFloat(index, value1); - rmonPrintf(" "); + crash_print_float(index, value1); + rmon_printf(" "); - crashPrintFloat(index + 1, value2); - rmonPrintf("\n"); + crash_print_float(index + 1, value2); + rmon_printf("\n"); } -void crashPrint3Floats(s32 index, f32 value1, f32 value2, f32 value3) +void crash_print_3_floats(s32 index, f32 value1, f32 value2, f32 value3) { - crashPrintFloat(index, value1); - rmonPrintf(" "); + crash_print_float(index, value1); + rmon_printf(" "); - crashPrintFloat(index + 1, value2); - rmonPrintf(" "); + crash_print_float(index + 1, value2); + rmon_printf(" "); - crashPrintFloat(index + 2, value3); - rmonPrintf("\n"); + crash_print_float(index + 2, value3); + rmon_printf("\n"); } -u32 crashGenerate(OSThread *thread, u32 *callstack, s32 *tracelen) +u32 crash_generate(OSThread *thread, u32 *callstack, s32 *tracelen) { s32 i; u32 ptr; @@ -605,7 +605,7 @@ u32 crashGenerate(OSThread *thread, u32 *callstack, s32 *tracelen) s32 len; #endif - rmonPrintf("\n\nFAULT-\n"); + rmon_printf("\n\nFAULT-\n"); #if VERSION >= VERSION_NTSC_1_0 if (!g_Vars.fourmeg2player) @@ -614,25 +614,25 @@ u32 crashGenerate(OSThread *thread, u32 *callstack, s32 *tracelen) // Print a stack trace in a dodgy way. // It works by iterating through the stack allocation, looking for any // values which could potentially be a return address, and prints them. - u32 *stackend = (u32 *) crashGetStackEnd(ctx->sp, thread->id); - rmonPrintf("DodgyStackTrace: %08llx ", ctx->ra & 0xffffffff); + u32 *stackend = (u32 *) crash_get_stack_end(ctx->sp, thread->id); + rmon_printf("DodgyStackTrace: %08llx ", ctx->ra & 0xffffffff); tmpsp = (u32 *) ctx->sp; while (tmpsp < stackend) { - if (crashIsReturnAddress((u32 *)*tmpsp)) { - rmonPrintf("%08x ", *tmpsp); + if (crash_is_return_address((u32 *)*tmpsp)) { + rmon_printf("%08x ", *tmpsp); } tmpsp++; } - rmonPrintf(".\n"); + rmon_printf(".\n"); } #if VERSION >= VERSION_NTSC_1_0 - rmonPrintf("%H#@! Another Perfect Crash (tm)\n"); + rmon_printf("%H#@! Another Perfect Crash (tm)\n"); #else - rmonPrintf("\nPerfect Crash (tm)\n\n"); + rmon_printf("\nPerfect Crash (tm)\n\n"); #endif #if VERSION >= VERSION_NTSC_1_0 @@ -640,71 +640,71 @@ u32 crashGenerate(OSThread *thread, u32 *callstack, s32 *tracelen) #endif { // Print floating point registers - crashPrint2Floats(0, ctx->fp0.f.f_odd, ctx->fp0.f.f_even); - crashPrint3Floats(2, ctx->fp2.f.f_odd, ctx->fp2.f.f_even, ctx->fp4.f.f_odd); - crashPrint3Floats(5, ctx->fp4.f.f_even, ctx->fp6.f.f_odd, ctx->fp6.f.f_even); - crashPrint3Floats(8, ctx->fp8.f.f_odd, ctx->fp8.f.f_even, ctx->fp10.f.f_odd); - crashPrint3Floats(11, ctx->fp10.f.f_even, ctx->fp12.f.f_odd, ctx->fp12.f.f_even); - crashPrint3Floats(14, ctx->fp14.f.f_odd, ctx->fp14.f.f_even, ctx->fp16.f.f_odd); - crashPrint3Floats(17, ctx->fp16.f.f_even, ctx->fp18.f.f_odd, ctx->fp18.f.f_even); - crashPrint3Floats(20, ctx->fp20.f.f_odd, ctx->fp20.f.f_even, ctx->fp22.f.f_odd); - crashPrint3Floats(23, ctx->fp22.f.f_even, ctx->fp24.f.f_odd, ctx->fp24.f.f_even); - crashPrint3Floats(26, ctx->fp26.f.f_odd, ctx->fp26.f.f_even, ctx->fp28.f.f_odd); - crashPrint3Floats(29, ctx->fp28.f.f_even, ctx->fp30.f.f_odd, ctx->fp30.f.f_even); + crash_print_2_floats(0, ctx->fp0.f.f_odd, ctx->fp0.f.f_even); + crash_print_3_floats(2, ctx->fp2.f.f_odd, ctx->fp2.f.f_even, ctx->fp4.f.f_odd); + crash_print_3_floats(5, ctx->fp4.f.f_even, ctx->fp6.f.f_odd, ctx->fp6.f.f_even); + crash_print_3_floats(8, ctx->fp8.f.f_odd, ctx->fp8.f.f_even, ctx->fp10.f.f_odd); + crash_print_3_floats(11, ctx->fp10.f.f_even, ctx->fp12.f.f_odd, ctx->fp12.f.f_even); + crash_print_3_floats(14, ctx->fp14.f.f_odd, ctx->fp14.f.f_even, ctx->fp16.f.f_odd); + crash_print_3_floats(17, ctx->fp16.f.f_even, ctx->fp18.f.f_odd, ctx->fp18.f.f_even); + crash_print_3_floats(20, ctx->fp20.f.f_odd, ctx->fp20.f.f_even, ctx->fp22.f.f_odd); + crash_print_3_floats(23, ctx->fp22.f.f_even, ctx->fp24.f.f_odd, ctx->fp24.f.f_even); + crash_print_3_floats(26, ctx->fp26.f.f_odd, ctx->fp26.f.f_even, ctx->fp28.f.f_odd); + crash_print_3_floats(29, ctx->fp28.f.f_even, ctx->fp30.f.f_odd, ctx->fp30.f.f_even); } // Print integer registers - rmonPrintf("at 0x%016llx v0 0x%016llx v1 0x%016llx\n", ctx->at, ctx->v0, ctx->v1); - rmonPrintf("a0 0x%016llx a1 0x%016llx a2 0x%016llx\n", ctx->a0, ctx->a1, ctx->a2); - rmonPrintf("a3 0x%016llx t0 0x%016llx t1 0x%016llx\n", ctx->a3, ctx->t0, ctx->t1); - rmonPrintf("t2 0x%016llx t3 0x%016llx t4 0x%016llx\n", ctx->t2, ctx->t3, ctx->t4); - rmonPrintf("t5 0x%016llx t6 0x%016llx t7 0x%016llx\n", ctx->t5, ctx->t6, ctx->t7); - rmonPrintf("s0 0x%016llx s1 0x%016llx s2 0x%016llx\n", ctx->s0, ctx->s1, ctx->s2); - rmonPrintf("s3 0x%016llx s4 0x%016llx s5 0x%016llx\n", ctx->s3, ctx->s4, ctx->s5); - rmonPrintf("s6 0x%016llx s7 0x%016llx t8 0x%016llx\n", ctx->s6, ctx->s7, ctx->t8); - rmonPrintf("t9 0x%016llx gp 0x%016llx sp 0x%016llx\n", ctx->t9, ctx->gp, ctx->sp); - rmonPrintf("s8 0x%016llx ra 0x%016llx\n", ctx->s8, ctx->ra); + rmon_printf("at 0x%016llx v0 0x%016llx v1 0x%016llx\n", ctx->at, ctx->v0, ctx->v1); + rmon_printf("a0 0x%016llx a1 0x%016llx a2 0x%016llx\n", ctx->a0, ctx->a1, ctx->a2); + rmon_printf("a3 0x%016llx t0 0x%016llx t1 0x%016llx\n", ctx->a3, ctx->t0, ctx->t1); + rmon_printf("t2 0x%016llx t3 0x%016llx t4 0x%016llx\n", ctx->t2, ctx->t3, ctx->t4); + rmon_printf("t5 0x%016llx t6 0x%016llx t7 0x%016llx\n", ctx->t5, ctx->t6, ctx->t7); + rmon_printf("s0 0x%016llx s1 0x%016llx s2 0x%016llx\n", ctx->s0, ctx->s1, ctx->s2); + rmon_printf("s3 0x%016llx s4 0x%016llx s5 0x%016llx\n", ctx->s3, ctx->s4, ctx->s5); + rmon_printf("s6 0x%016llx s7 0x%016llx t8 0x%016llx\n", ctx->s6, ctx->s7, ctx->t8); + rmon_printf("t9 0x%016llx gp 0x%016llx sp 0x%016llx\n", ctx->t9, ctx->gp, ctx->sp); + rmon_printf("s8 0x%016llx ra 0x%016llx\n", ctx->s8, ctx->ra); #if VERSION >= VERSION_NTSC_1_0 - rmonPrintf("TID %d epc %08x caus %08x fp %08x badv %08x sr %08x\n", + rmon_printf("TID %d epc %08x caus %08x fp %08x badv %08x sr %08x\n", thread->id, ctx->pc, ctx->cause, ctx->fpcsr, ctx->badvaddr, ctx->sr); #else - rmonPrintf("TID %d epc %08x cause %08x fp %08x badv %08x sr %08x\n", + rmon_printf("TID %d epc %08x cause %08x fp %08x badv %08x sr %08x\n", thread->id, ctx->pc, ctx->cause, ctx->fpcsr, ctx->badvaddr, ctx->sr); #endif // Print the address of the faulted instruction, along with the instruction // itself and the next three - presumably to help the developer locate it. - rmonPrintf("dshex -a %08x %08x %08x %08x %08x\n", ctx->pc, + rmon_printf("dshex -a %08x %08x %08x %08x %08x\n", ctx->pc, ((u32 *)ctx->pc)[0], ((u32 *)ctx->pc)[1], ((u32 *)ctx->pc)[2], ((u32 *)ctx->pc)[3]); - crashPrintDescription(ctx->cause, "cause", g_CrashCauseDescriptions); - rmonPrintf(" : "); - crashPrintDescription(ctx->fpcsr, "fpcsr", g_CrashFpcsrDescriptions); - rmonPrintf("\n"); + crash_print_description(ctx->cause, "cause", g_CrashCauseDescriptions); + rmon_printf(" : "); + crash_print_description(ctx->fpcsr, "fpcsr", g_CrashFpcsrDescriptions); + rmon_printf("\n"); // Print a proper stack trace i = 0; done = false; sp = (u32 *)ctx->sp; - stackend = (u32 *) crashGetStackEnd((uintptr_t)sp, thread->id); - stackstart = (u32 *) crashGetStackStart((uintptr_t)sp, thread->id); + stackend = (u32 *) crash_get_stack_end((uintptr_t)sp, thread->id); + stackstart = (u32 *) crash_get_stack_start((uintptr_t)sp, thread->id); ptr = ctx->pc; *tracelen = 0; - rmonPrintf("nearl: "); + rmon_printf("nearl: "); while (!done) { - sp = (u32 *) crashGetParentStackFrame((u32 *) ptr, &_libSegmentStart, (uintptr_t)sp, regs); - rmonPrintf(" %08x ", ptr); + sp = (u32 *) crash_get_parent_stack_frame((u32 *) ptr, &_libSegmentStart, (uintptr_t)sp, regs); + rmon_printf(" %08x ", ptr); callstack[*tracelen] = ptr; *tracelen = *tracelen + 1; if (i == 4) { - rmonPrintf("\n "); + rmon_printf("\n "); } if (sp == NULL) { @@ -740,52 +740,52 @@ u32 crashGenerate(OSThread *thread, u32 *callstack, s32 *tracelen) g_CrashCurX = (71 - len) / 2; for (j = 0; j < len; j++) { - crashAppendChar(g_CrashMessage[j]); + crash_append_char(g_CrashMessage[j]); } } else { g_CrashCurX = 32; - crashAppendChar('C'); - crashAppendChar('R'); - crashAppendChar('A'); - crashAppendChar('S'); - crashAppendChar('H'); - crashAppendChar('E'); - crashAppendChar('D'); + crash_append_char('C'); + crash_append_char('R'); + crash_append_char('A'); + crash_append_char('S'); + crash_append_char('H'); + crash_append_char('E'); + crash_append_char('D'); } #endif - rmonPrintf("\n"); - rmonPrintf("\n"); + rmon_printf("\n"); + rmon_printf("\n"); return 0; } -void crashPrintDescription(u32 mask, char *label, struct crashdescription *description) +void crash_print_description(u32 mask, char *label, struct crashdescription *description) { bool first = true; s32 i; - rmonPrintf("%s <", label); + rmon_printf("%s <", label); while (description->mask != 0) { if ((description->mask & mask) == description->value) { if (first) { first = false; } else { - rmonPrintf(","); + rmon_printf(","); } - rmonPrintf("%s", description->text); + rmon_printf("%s", description->text); } description++; } - rmonPrintf(">"); + rmon_printf(">"); } -void crashPutChar(s32 x, s32 y, char c) +void crash_put_char(s32 x, s32 y, char c) { if (c == '\t' || c == '\n') { c = '\0'; @@ -800,7 +800,7 @@ void crashPutChar(s32 x, s32 y, char c) } } -void crashAppendChar(char c) +void crash_append_char(char c) { if (c == '\0') { return; @@ -808,7 +808,7 @@ void crashAppendChar(char c) if (c == '\t') { do { - crashAppendChar(' '); + crash_append_char(' '); } while (g_CrashCurX & 7); return; @@ -820,12 +820,12 @@ void crashAppendChar(char c) } if (g_CrashCurY >= MAX_LINES) { - crashScroll(g_CrashCurY - MAX_LINES + 1); + crash_scroll(g_CrashCurY - MAX_LINES + 1); g_CrashCurY = MAX_LINES - 1; } if (c != '\n') { - crashPutChar(g_CrashCurX, g_CrashCurY, c); + crash_put_char(g_CrashCurX, g_CrashCurY, c); g_CrashCurX++; if (g_CrashCurX >= 71) { @@ -835,7 +835,7 @@ void crashAppendChar(char c) } } -void crashScroll(s32 numlines) +void crash_scroll(s32 numlines) { s32 i; s32 y; @@ -857,7 +857,7 @@ void crashScroll(s32 numlines) /** * Render a character to the crash buffer. */ -void crashRenderChar(s32 x, s32 y, char c) +void crash_render_char(s32 x, s32 y, char c) { s32 i; s32 j; @@ -867,7 +867,7 @@ void crashRenderChar(s32 x, s32 y, char c) s32 tmp; u32 a2; - width = viGetWidth(); + width = vi_get_width(); if (c == '\0') { c = ' '; @@ -936,7 +936,7 @@ void crashRenderChar(s32 x, s32 y, char c) } } -void crashReset(void) +void crash_reset(void) { #ifdef DEBUG g_CrashCharBuffer = var80097178nb; @@ -957,7 +957,7 @@ void crashReset(void) } } -void crashRenderFrame(u16 *fb) +void crash_render_frame(u16 *fb) { s32 width; s32 height; @@ -966,13 +966,13 @@ void crashRenderFrame(u16 *fb) g_CrashFrameBuffer = (u16 *) PHYS_TO_K1(fb); - width = (viGetWidth() - 13) / CHAR_W; - height = (viGetHeight() - 10) / CHAR_H - 1; + width = (vi_get_width() - 13) / CHAR_W; + height = (vi_get_height() - 10) / CHAR_H - 1; if (g_CrashCharBuffer != NULL) { for (y = 0; y < height && y < MAX_LINES; y++) { for (x = 0; x < width - 5 && x < 71; x++) { - crashRenderChar(20 + x * CHAR_W, CHAR_H + y * CHAR_H, g_CrashCharBuffer[y][x]); + crash_render_char(20 + x * CHAR_W, CHAR_H + y * CHAR_H, g_CrashCharBuffer[y][x]); } } } diff --git a/src/lib/debughud.c b/src/lib/debughud.c index c2a225d32..b28c80e8b 100644 --- a/src/lib/debughud.c +++ b/src/lib/debughud.c @@ -112,7 +112,7 @@ void dhud00014000nb(void) } #endif -void dhudInit(void) +void dhud_init(void) { #ifdef DEBUG s32 i; @@ -142,17 +142,17 @@ void dhudInit(void) #endif } -void dhudReset(void) +void dhud_reset(void) { #ifdef DEBUG if (g_DHudInitialised) { - dhudClear(); + dhud_clear(); } #endif } #ifdef DEBUG -void dhudPutCharAt(s32 x, s32 y, char c) +void dhud_put_char_at(s32 x, s32 y, char c) { s32 i; @@ -180,7 +180,7 @@ havepalette: } #endif -void dhudResetPos(void) +void dhud_reset_pos(void) { #ifdef DEBUG if (g_DHudInitialised) { @@ -190,7 +190,7 @@ void dhudResetPos(void) #endif } -void dhudClear(void) +void dhud_clear(void) { #ifdef DEBUG s32 x; @@ -199,13 +199,13 @@ void dhudClear(void) if (g_DHudInitialised && g_DHudIsEmpty != true) { for (y = 0; y < NUM_ROWS; y++) { for (x = 0; x < NUM_COLS; x++) { - dhudPutCharAt(x, y, '\0'); + dhud_put_char_at(x, y, '\0'); } } g_DHudIsEmpty = true; - dhudResetPos(); + dhud_reset_pos(); dhud00014000nb(); g_DHudNextPaletteIndex = 0; @@ -213,15 +213,15 @@ void dhudClear(void) #endif } -void dhudSetPos(s32 x, s32 y) +void dhud_set_pos(s32 x, s32 y) { #ifdef DEBUG if (g_DHudInitialised) { x += g_DHudBaseX; y += g_DHudBaseY; - if (y >= (viGetHeight() - 10) / CHAR_H) { - y = (viGetHeight() - 10) / CHAR_H - 1; + if (y >= (vi_get_height() - 10) / CHAR_H) { + y = (vi_get_height() - 10) / CHAR_H - 1; } g_DHudPosX = x; @@ -230,7 +230,7 @@ void dhudSetPos(s32 x, s32 y) #endif } -void dhudSetFgColour(s32 r, s32 g, s32 b, s32 a) +void dhud_set_fg_colour(s32 r, s32 g, s32 b, s32 a) { #ifdef DEBUG if (g_DHudInitialised) { @@ -239,7 +239,7 @@ void dhudSetFgColour(s32 r, s32 g, s32 b, s32 a) #endif } -void dhudSetBgColour(s32 r, s32 g, s32 b, s32 a) +void dhud_set_bg_colour(s32 r, s32 g, s32 b, s32 a) { #ifdef DEBUG if (g_DHudInitialised) { @@ -248,15 +248,15 @@ void dhudSetBgColour(s32 r, s32 g, s32 b, s32 a) #endif } -void dhudPrintChar(u8 c) +void dhud_print_char(u8 c) { #ifdef DEBUG - s32 maxwidth = (viGetWidth() - 13) / CHAR_W; - s32 maxheight = (viGetHeight() - 10) / CHAR_H; + s32 maxwidth = (vi_get_width() - 13) / CHAR_W; + s32 maxheight = (vi_get_height() - 10) / CHAR_H; if (g_DHudInitialised) { if (c == '\0' || (c >= ' ' && c <= '~')) { - dhudPutCharAt(g_DHudPosX, g_DHudPosY, c); + dhud_put_char_at(g_DHudPosX, g_DHudPosY, c); } g_DHudPosX++; @@ -274,44 +274,44 @@ void dhudPrintChar(u8 c) } #if VERSION != VERSION_PAL_BETA -void dhudPrintCharAt(s32 x, s32 y, char c) +void dhud_print_char_at(s32 x, s32 y, char c) { #ifdef DEBUG if (g_DHudInitialised) { - dhudSetPos(x, y); - dhudPrintChar(c); + dhud_set_pos(x, y); + dhud_print_char(c); } #endif } #endif -void dhudPrintString(char *str) +void dhud_print_string(char *str) { #ifdef DEBUG if (g_DHudInitialised) { while (*str != '\0') { - dhudPrintChar(*str++); + dhud_print_char(*str++); } } #endif } #if VERSION != VERSION_PAL_BETA -void dhudPrintStringAt(s32 x, s32 y, char *str) +void dhud_print_string_at(s32 x, s32 y, char *str) { #ifdef DEBUG if (g_DHudInitialised) { - dhudSetPos(x, y); + dhud_set_pos(x, y); while (*str != '\0') { - dhudPrintChar(*str++); + dhud_print_char(*str++); } } #endif } #endif -Gfx *dhudRender(Gfx *gdl) +Gfx *dhud_render(Gfx *gdl) { #ifdef DEBUG if (!g_DHudInitialised) { @@ -353,7 +353,7 @@ Gfx *dhudRender(Gfx *gdl) } // Make sure there'll be a least 256 GBI commands free (2KB) - available = gfxGetFreeGfx(gdl) - 256 * sizeof(Gfx); + available = gfx_get_free_gfx(gdl) - 256 * sizeof(Gfx); needed = (uintptr_t) gdl2 - (uintptr_t) gdl; if (needed <= 0) { // shouldn't be possible @@ -402,7 +402,7 @@ Gfx *dhudRender(Gfx *gdl) if (1); - if (gfxGetFreeGfx(gdl) >= 1024) { + if (gfx_get_free_gfx(gdl) >= 1024) { gSPTextureRectangle(gdl++, // Screen coords to draw at x * CHAR_W * 4, diff --git a/src/lib/dma.c b/src/lib/dma.c index e21605c3a..746f5d3a6 100644 --- a/src/lib/dma.c +++ b/src/lib/dma.c @@ -15,7 +15,7 @@ OSMesgQueue g_DmaMesgQueue; u8 g_LoadType = 0; -void dmaInit(void) +void dma_init(void) { s32 i; @@ -28,7 +28,7 @@ void dmaInit(void) osCreateMesgQueue(&g_DmaMesgQueue, g_DmaMesgs, ARRAYCOUNT(g_DmaMesgs)); } -void dmaStart(void *memaddr, u32 romaddr, u32 len, bool priority) +void dma_start(void *memaddr, u32 romaddr, u32 len, bool priority) { u32 numiterations; u32 remainder; @@ -36,13 +36,13 @@ void dmaStart(void *memaddr, u32 romaddr, u32 len, bool priority) #if VERSION < VERSION_NTSC_1_0 if (romaddr >= ROM_SIZE * 1024 * 1024) { - crashSetMessage("DMA : Off the end of the rom"); + crash_set_message("DMA : Off the end of the rom"); CRASH(); } #endif if (g_DmaNumSlotsBusy) { - dmaWait(); + dma_wait(); } if (len < 0x4000 * ARRAYCOUNT(g_DmaIoMsgs)) { @@ -76,12 +76,12 @@ void dmaStart(void *memaddr, u32 romaddr, u32 len, bool priority) } #if VERSION >= VERSION_NTSC_1_0 -u32 xorDeadbeef(u32 value) +u32 xor_deadbeef(u32 value) { return value ^ 0xdeadbeef; } -u32 xorDeadbabe(u32 value) +u32 xor_deadbabe(u32 value) { return value ^ 0xdeadbabe; } @@ -91,11 +91,11 @@ u32 xorDeadbabe(u32 value) * 0x0330c820, then reads a value from the boot loader (0x340 in ROM) which * should be the same value, and xors the memory again with that value. */ -void dmaCheckPiracy(void *memaddr, u32 len) +void dma_check_piracy(void *memaddr, u32 len) { if (g_LoadType != LOADTYPE_NONE && len > 128) { #if PIRACYCHECKS - u32 value = xorDeadbeef((PAL ? 0x0109082b : 0x0330c820) ^ 0xdeadbeef); + u32 value = xor_deadbeef((PAL ? 0x0109082b : 0x0330c820) ^ 0xdeadbeef); u32 *ptr = (u32 *)memaddr; u32 data; u32 devaddr; @@ -105,7 +105,7 @@ void dmaCheckPiracy(void *memaddr, u32 len) ptr[i] ^= value; } - devaddr = xorDeadbabe((PAL ? 0xb0000454 : 0xb0000340) ^ 0xdeadbabe); + devaddr = xor_deadbabe((PAL ? 0xb0000454 : 0xb0000340) ^ 0xdeadbabe); osPiReadIo(devaddr, &data); @@ -119,7 +119,7 @@ void dmaCheckPiracy(void *memaddr, u32 len) } #endif -void dmaWait(void) +void dma_wait(void) { u32 stack; OSIoMesg *msg; @@ -139,21 +139,21 @@ void dmaWait(void) } } -void dmaExec(void *memaddr, u32 romaddr, u32 len) +void dma_exec(void *memaddr, u32 romaddr, u32 len) { - dmaStart(memaddr, romaddr, len, false); - dmaWait(); + dma_start(memaddr, romaddr, len, false); + dma_wait(); #if VERSION >= VERSION_NTSC_1_0 - dmaCheckPiracy(memaddr, len); + dma_check_piracy(memaddr, len); #endif } -void dmaExecHighPriority(void *memaddr, u32 romaddr, u32 len) +void dma_exec_high_priority(void *memaddr, u32 romaddr, u32 len) { - dmaStart(memaddr, romaddr, len, true); - dmaWait(); + dma_start(memaddr, romaddr, len, true); + dma_wait(); #if VERSION >= VERSION_NTSC_1_0 - dmaCheckPiracy(memaddr, len); + dma_check_piracy(memaddr, len); #endif } @@ -172,7 +172,7 @@ void dmaExecHighPriority(void *memaddr, u32 romaddr, u32 len) * If a length of zero is passed, no DMA is done. This can be used to retrieve * the memory address that would have been returned. */ -void *dmaExecWithAutoAlign(void *memaddr, u32 romaddr, u32 len) +void *dma_exec_with_auto_align(void *memaddr, u32 romaddr, u32 len) { u32 alignedrom = ALIGN2(romaddr); u32 alignedmem = ALIGN16((uintptr_t) memaddr); @@ -183,7 +183,7 @@ void *dmaExecWithAutoAlign(void *memaddr, u32 romaddr, u32 len) return (void *)(alignedmem + offset); } - dmaExec((void *)alignedmem, alignedrom, alignedlen); + dma_exec((void *)alignedmem, alignedrom, alignedlen); return (void *)(alignedmem + offset); } diff --git a/src/lib/fault.c b/src/lib/fault.c index 4478de9ad..76e1119b1 100644 --- a/src/lib/fault.c +++ b/src/lib/fault.c @@ -6,12 +6,12 @@ #include "data.h" #include "types.h" -void faultInit(void) +void fault_init(void) { - crashCreateThread(); + crash_create_thread(); } -void faultAssert(char *message, char *file, s32 line) +void fault_assert(char *message, char *file, s32 line) { - rmonPrintf("ASSERTION : %s, %d: (\"%s\")\n", file, line, message); + rmon_printf("ASSERTION : %s, %d: (\"%s\")\n", file, line, message); } diff --git a/src/lib/getra.s b/src/lib/getra.s index 564d64e2a..c57ca4436 100644 --- a/src/lib/getra.s +++ b/src/lib/getra.s @@ -7,10 +7,10 @@ * * For example, a C function could use: * - * osSyncPrintf("Called from %u\n", getReturnAddress()); + * osSyncPrintf("Called from %u\n", get_return_address()); * * It follows the current $ra to get to the function that called - * getReturnAddress, then steps backwards through that function's bytecode until + * get_return_address, then steps backwards through that function's bytecode until * it finds either `addiu $sp` or `sw $ra, 0xnn($sp)`. * * If it finds `addiu $sp` first then it's reached the top of the function and @@ -20,7 +20,7 @@ * If it finds `sw $ra, 0xnn($sp)` first then it reads the stack offset out of * the instruction, then reads the value out of the stack using that offset. */ -glabel getReturnAddress +glabel get_return_address move $a0, $ra li $v0, -1 .loop: diff --git a/src/lib/joy.c b/src/lib/joy.c index 4c212444f..3940469c1 100644 --- a/src/lib/joy.c +++ b/src/lib/joy.c @@ -113,34 +113,34 @@ u8 var800612ccnb = 0; #endif #if VERSION >= VERSION_NTSC_1_0 -void joyLockCyclicPolling(void) +void joy_lock_cyclic_polling(void) { if (g_JoyCyclicPollingLocked) { - joyDisableCyclicPolling(); + joy_disable_cyclic_polling(); g_JoyCyclicPollingLocked = false; } } -void joyUnlockCyclicPolling(void) +void joy_unlock_cyclic_polling(void) { if (!g_JoyCyclicPollingLocked) { - joyEnableCyclicPolling(); + joy_enable_cyclic_polling(); g_JoyCyclicPollingLocked = true; } } -void joySetPfsPollEnabled(bool enabled) +void joy_set_pfs_poll_enabled(bool enabled) { g_JoyPfsPollEnabled = enabled; } -bool joyIsPfsPollEnabled(void) +bool joy_is_pfs_poll_enabled(void) { return g_JoyPfsPollEnabled; } #endif -void joySetPfsPollInterval(s32 value) +void joy_set_pfs_poll_interval(s32 value) { #if VERSION >= VERSION_NTSC_1_0 g_JoyPfsPollTimeRemaining = g_JoyPfsPollInterval = value * 11000; @@ -149,16 +149,16 @@ void joySetPfsPollInterval(s32 value) #endif } -void joySetDefaultPfsPollInterval(void) +void joy_set_default_pfs_poll_interval(void) { - joySetPfsPollInterval(VERSION >= VERSION_NTSC_1_0 ? 10 : 30); + joy_set_pfs_poll_interval(VERSION >= VERSION_NTSC_1_0 ? 10 : 30); } /** * Remove an item from the beginning of the g_JoyPfsStates array, * shift the rest of the array back and return the removed item. */ -s32 joyShiftPfsStates(void) +s32 joy_shift_pfs_states(void) { #if VERSION >= VERSION_NTSC_1_0 s32 pfsstate = 0; @@ -183,10 +183,10 @@ s32 joyShiftPfsStates(void) } #if VERSION >= VERSION_NTSC_1_0 -void joyRecordPfsState(u8 pfsstate) +void joy_record_pfs_state(u8 pfsstate) { if (g_JoyNextPfsStateIndex + 1 >= ARRAYCOUNT(g_JoyPfsStates)) { - joyShiftPfsStates(); + joy_shift_pfs_states(); } if (g_JoyNextPfsStateIndex == 0 || pfsstate != g_JoyPfsStates[g_JoyNextPfsStateIndex - 1]) { @@ -204,7 +204,7 @@ void joyRecordPfsState(u8 pfsstate) * force 1 = poll based on the configured poll frequency even if disabled * force 2 = poll now */ -void joyPollPfs(s32 force) +void joy_poll_pfs(s32 force) { static u32 thiscount = 0; static u32 prevcount = 0; @@ -235,18 +235,18 @@ void joyPollPfs(s32 force) g_JoyPfsPollCount++; if (force) { - joyDisableCyclicPolling(); + joy_disable_cyclic_polling(); } osPfsIsPlug(&g_PiMesgQueue, &bitpattern); if (force) { - joyEnableCyclicPolling(); + joy_enable_cyclic_polling(); } bitpattern |= 0x10; // eeprom - joyRecordPfsState(bitpattern); + joy_record_pfs_state(bitpattern); g_JoyPfsPollTimeRemaining = g_JoyPfsPollInterval; } @@ -261,24 +261,24 @@ void joyPollPfs(s32 force) #endif /** - * "Temporarily" because the next time joyPollPfs runs, the true state will be + * "Temporarily" because the next time joy_poll_pfs runs, the true state will be * recorded. * * Note that var8005eed8 is always zero, so this record will suggest that this * pak is the only one connected. */ -void joySetPfsTemporarilyPlugged(s8 index) +void joy_set_pfs_temporarily_plugged(s8 index) { #if VERSION >= VERSION_NTSC_1_0 u8 bitpattern = var8005eed8 & ~(1 << index); - joyRecordPfsState(bitpattern); + joy_record_pfs_state(bitpattern); #else var8005eed8 &= ~(1 << index); #endif } -void joyInit(void) +void joy_init(void) { s32 i; s32 j; @@ -324,7 +324,7 @@ void joyInit(void) * progressing past endscreens if they are holding buttons when they are * started. */ -void joyDisableTemporarily(void) +void joy_disable_temporarily(void) { s32 i; @@ -333,7 +333,7 @@ void joyDisableTemporarily(void) } } -void joyReset(void) +void joy_reset(void) { OSMesg msg; @@ -364,7 +364,7 @@ void joy00013e84(void) g_JoyInitDone = true; for (i = 0; i < NUM_PADS; i++) { - joyStopRumble(i, false); + joy_stop_rumble(i, false); } } else { u32 slots = 0xf; @@ -397,7 +397,7 @@ void joy00013e84(void) } } -s8 contGetFreeSlot(void) +s8 cont_get_free_slot(void) { s32 i; @@ -414,7 +414,7 @@ s8 contGetFreeSlot(void) return NUM_PADS; } -u32 joyGetConnectedControllers(void) +u32 joy_get_connected_controllers(void) { return g_JoyConnectedControllers; } @@ -434,7 +434,7 @@ void func00014eb0nb(void *value) } #endif -void joyConsumeSamples(struct joydata *joydata) +void joy_consume_samples(struct joydata *joydata) { s8 i; s32 samplenum; @@ -512,63 +512,63 @@ void joy00014238(void) doingit = true; for (i = 0; i < NUM_PADS; i++) { - if (joyGetPakState2(i) == PAKSTATE_13) { - pakSetState(i, PAKSTATE_READY); + if (joy_get_pak_state2(i) == PAKSTATE_13) { + pak_set_state(i, PAKSTATE_READY); } } if (var8005eec4 == NULL) { - joysTickRumble(); + joys_tick_rumble(); } doingit = false; } } -void joyDebugJoy(void) +void joy_debug_joy(void) { #if VERSION >= VERSION_NTSC_1_0 static u32 var8005ef08 = 0; - mainOverrideVariable("debugjoy", &var8005ef08); + main_override_variable("debugjoy", &var8005ef08); #else - mainOverrideVariable("joyforce", &var800612c8nb); + main_override_variable("joyforce", &var800612c8nb); #endif #if VERSION >= VERSION_NTSC_1_0 if (g_Vars.paksneededformenu) { - joyPollPfs(1); + joy_poll_pfs(1); } #endif if (var8005eec4) { g_JoyData[1].nextlast = var8005eec4(g_JoyData[1].samples, g_JoyData[1].curlast); - joyConsumeSamples(&g_JoyData[1]); + joy_consume_samples(&g_JoyData[1]); } - joyConsumeSamples(&g_JoyData[0]); + joy_consume_samples(&g_JoyData[0]); if (var8005eec8) { var8005eec8(g_JoyData[0].samples, g_JoyData[0].curstart, g_JoyData[0].curlast); } - if (joyIsCyclicPollingEnabled() && var8005eec0 && joyGetNumSamples() <= 0) { + if (joy_is_cyclic_polling_enabled() && var8005eec0 && joy_get_num_samples() <= 0) { #if VERSION >= VERSION_NTSC_FINAL - joyDisableCyclicPolling(); + joy_disable_cyclic_polling(); joy00014238(); - joyEnableCyclicPolling(); - joyConsumeSamples(&g_JoyData[0]); + joy_enable_cyclic_polling(); + joy_consume_samples(&g_JoyData[0]); #elif VERSION >= VERSION_NTSC_1_0 - joyDisableCyclicPolling(); - joyEnableCyclicPolling(); - joyConsumeSamples(&g_JoyData[0]); + joy_disable_cyclic_polling(); + joy_enable_cyclic_polling(); + joy_consume_samples(&g_JoyData[0]); joy00014238(); #else - joyDisableCyclicPolling(500, "joy.c"); + joy_disable_cyclic_polling(500, "joy.c"); joy00014238(); joy0001509cnb(); - joyEnableCyclicPolling(507, "joy.c"); - joyConsumeSamples(&g_JoyData[0]); + joy_enable_cyclic_polling(507, "joy.c"); + joy_consume_samples(&g_JoyData[0]); #endif } } @@ -585,12 +585,12 @@ const char var70054168[] = "osContStartReadData -> Failed - CONT_OVERRUN_ERROR\n const char var7005419c[] = "joyTickRetrace:joy%derrno%d->%d\n"; const char var700541c0[] = "joyTickRetrace:joy%derrno%d->%d\n"; -s32 joyStartReadData(OSMesgQueue *mq) +s32 joy_start_read_data(OSMesgQueue *mq) { return osContStartReadData(mq); } -void joyReadData(void) +void joy_read_data(void) { s32 index = (g_JoyData[0].nextlast + 1) % NUM_SAMPLES; @@ -606,7 +606,7 @@ void joyReadData(void) g_JoyData[0].nextsecondlast = (g_JoyData[0].nextlast + NUM_SAMPLES - 1) % NUM_SAMPLES; } -void joysHandleRetrace(void) +void joys_handle_retrace(void) { OSMesg msg; s8 i; @@ -620,7 +620,7 @@ void joysHandleRetrace(void) osRecvMesg(&g_PiMesgQueue, &msg, OS_MESG_BLOCK); g_JoyBusy = false; - joyReadData(); + joy_read_data(); // Check if error state has changed for any controller for (i = 0; i < NUM_PADS; i++) { @@ -637,7 +637,7 @@ void joysHandleRetrace(void) var8005ee68++; #if VERSION >= VERSION_NTSC_1_0 - joyPollPfs(0); + joy_poll_pfs(0); #endif return; } @@ -646,7 +646,7 @@ void joysHandleRetrace(void) var8005ee68--; if (var8005ee68 == 0) { - joyStartReadData(&g_PiMesgQueue); + joy_start_read_data(&g_PiMesgQueue); g_JoyBusy = true; } @@ -663,7 +663,7 @@ void joysHandleRetrace(void) if (g_JoyInitDone) { #if VERSION >= VERSION_NTSC_1_0 if (var8005ee68) { - joyPollPfs(0); + joy_poll_pfs(0); return; } #endif @@ -672,7 +672,7 @@ void joysHandleRetrace(void) static s32 count = 0; g_JoyBusy = false; - joyReadData(); + joy_read_data(); // Check if error state has changed for any controller for (i = 0; i < NUM_PADS; i++) { @@ -686,12 +686,12 @@ void joysHandleRetrace(void) joy00014238(); #if VERSION >= VERSION_NTSC_1_0 - joyPollPfs(0); + joy_poll_pfs(0); #else joy0001509cnb(); #endif - joyStartReadData(&g_PiMesgQueue); + joy_start_read_data(&g_PiMesgQueue); g_JoyBusy = true; count++; @@ -719,12 +719,12 @@ void joy00014810(bool value) var8005eec0 = value; } -s32 joyGetNumSamples(void) +s32 joy_get_num_samples(void) { return (g_JoyDataPtr->curlast - g_JoyDataPtr->curstart + NUM_SAMPLES) % NUM_SAMPLES; } -s32 joyGetStickXOnSample(s32 samplenum, s8 contpadnum) +s32 joy_get_stick_x_on_sample(s32 samplenum, s8 contpadnum) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { g_JoyBadReadsStickX[contpadnum]++; @@ -738,7 +738,7 @@ s32 joyGetStickXOnSample(s32 samplenum, s8 contpadnum) return g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum + 1) % NUM_SAMPLES].pads[contpadnum].stick_x; } -s32 joyGetStickYOnSample(s32 samplenum, s8 contpadnum) +s32 joy_get_stick_y_on_sample(s32 samplenum, s8 contpadnum) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { g_JoyBadReadsStickY[contpadnum]++; @@ -752,7 +752,7 @@ s32 joyGetStickYOnSample(s32 samplenum, s8 contpadnum) return g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum + 1) % NUM_SAMPLES].pads[contpadnum].stick_y; } -s32 joyGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum) +s32 joy_get_stick_y_on_sample_index(s32 samplenum, s8 contpadnum) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { g_JoyBadReadsStickY[contpadnum]++; @@ -766,7 +766,7 @@ s32 joyGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum) return g_JoyDataPtr->samples[(g_JoyDataPtr->curstart + samplenum) % NUM_SAMPLES].pads[contpadnum].stick_y; } -u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask) +u16 joy_get_buttons_on_sample(s32 samplenum, s8 contpadnum, u16 mask) { u16 button; @@ -784,7 +784,7 @@ u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask) return button & mask; } -u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask) +u16 joy_get_buttons_pressed_on_sample(s32 samplenum, s8 contpadnum, u16 mask) { u16 button1; u16 button2; @@ -811,7 +811,7 @@ u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask) * For example, if checksamples[5] is nonzero and a button was pressed on * samplenum 5 which matches the mask, count is incremented. */ -s32 joyCountButtonsOnSpecificSamples(u32 *checksamples, s8 contpadnum, u16 mask) +s32 joy_count_buttons_on_specific_samples(u32 *checksamples, s8 contpadnum, u16 mask) { s32 count = 0; s32 index = 0; @@ -849,7 +849,7 @@ s32 joyCountButtonsOnSpecificSamples(u32 *checksamples, s8 contpadnum, u16 mask) return count; } -s8 joyGetStickX(s8 contpadnum) +s8 joy_get_stick_x(s8 contpadnum) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { g_JoyBadReadsStickX[contpadnum]++; @@ -863,7 +863,7 @@ s8 joyGetStickX(s8 contpadnum) return g_JoyDataPtr->samples[g_JoyDataPtr->curlast].pads[contpadnum].stick_x; } -s8 joyGetStickY(s8 contpadnum) +s8 joy_get_stick_y(s8 contpadnum) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { g_JoyBadReadsStickY[contpadnum]++; @@ -877,7 +877,7 @@ s8 joyGetStickY(s8 contpadnum) return g_JoyDataPtr->samples[g_JoyDataPtr->curlast].pads[contpadnum].stick_y; } -u16 joyGetButtons(s8 contpadnum, u16 mask) +u16 joy_get_buttons(s8 contpadnum, u16 mask) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { g_JoyBadReadsButtons[contpadnum]++; @@ -891,7 +891,7 @@ u16 joyGetButtons(s8 contpadnum, u16 mask) return g_JoyDataPtr->samples[g_JoyDataPtr->curlast].pads[contpadnum].button & mask; } -u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask) +u16 joy_get_buttons_pressed_this_frame(s8 contpadnum, u16 mask) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { g_JoyBadReadsButtonsPressed[contpadnum]++; @@ -906,7 +906,7 @@ u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask) } #if VERSION < VERSION_NTSC_1_0 -u16 joyGetButtonsReleasedThisFrame(s8 contpadnum, u16 mask) +u16 joy_get_buttons_released_this_frame(s8 contpadnum, u16 mask) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { g_JoyBadReadsButtonsPressed[contpadnum]++; @@ -921,7 +921,7 @@ u16 joyGetButtonsReleasedThisFrame(s8 contpadnum, u16 mask) } #endif -bool joyIsCyclicPollingEnabled(void) +bool joy_is_cyclic_polling_enabled(void) { return g_JoyCyclicPollDisableCount ? false : true; } @@ -933,7 +933,7 @@ bool joyIsCyclicPollingEnabled(void) * * If cyclic polling was already disabled, simply increase the disable count. */ -void joyDisableCyclicPolling( +void joy_disable_cyclic_polling( #if VERSION >= VERSION_NTSC_1_0 void #else @@ -955,7 +955,7 @@ void joyDisableCyclicPolling( * Indicate that the caller is done with cyclic polling being disabled, * and enable cyclic polling if there are no callers left who want it disabled. */ -void joyEnableCyclicPolling( +void joy_enable_cyclic_polling( #if VERSION >= VERSION_NTSC_1_0 void #else @@ -974,18 +974,18 @@ void joyEnableCyclicPolling( } #if VERSION < VERSION_NTSC_1_0 -void joySetDataIndex(s32 arg0) +void joy_set_data_index(s32 arg0) { g_JoyDataPtr = &g_JoyData[arg0]; } -s32 joyGetDataIndex(void) +s32 joy_get_data_index(void) { return g_JoyDataPtr - g_JoyData; } #endif -void joyDestroy(void) +void joy_destroy(void) { s32 i; @@ -1002,7 +1002,7 @@ void joyDestroy(void) } #if VERSION >= VERSION_NTSC_1_0 -void joyGetContpadNumsForPlayer(s8 playernum, s32 *pad1, s32 *pad2) +void joy_get_contpad_nums_for_player(s8 playernum, s32 *pad1, s32 *pad2) { if (g_Vars.normmplayerisrunning) { *pad1 = g_Vars.playerstats[playernum].mpindex; @@ -1021,7 +1021,7 @@ void joyGetContpadNumsForPlayer(s8 playernum, s32 *pad1, s32 *pad2) } #endif -void joyStopRumble(s8 arg0, bool disablepolling) +void joy_stop_rumble(s8 arg0, bool disablepolling) { if (arg0 != SAVEDEVICE_GAMEPAK) { #if VERSION >= VERSION_NTSC_1_0 @@ -1033,9 +1033,9 @@ void joyStopRumble(s8 arg0, bool disablepolling) if (g_Paks[device].type != PAKTYPE_MEMORY && g_Paks[device].type != PAKTYPE_GAMEBOY) { if (disablepolling) { #if VERSION >= VERSION_NTSC_1_0 - joyDisableCyclicPolling(); + joy_disable_cyclic_polling(); #else - joyDisableCyclicPolling(1054, "joy.c"); + joy_disable_cyclic_polling(1054, "joy.c"); #endif } @@ -1047,9 +1047,9 @@ void joyStopRumble(s8 arg0, bool disablepolling) if (disablepolling) { #if VERSION >= VERSION_NTSC_1_0 - joyEnableCyclicPolling(); + joy_enable_cyclic_polling(); #else - joyEnableCyclicPolling(1066, "joy.c"); + joy_enable_cyclic_polling(1066, "joy.c"); #endif } @@ -1063,17 +1063,17 @@ void joyStopRumble(s8 arg0, bool disablepolling) } } -s32 joyGetPakState(s8 device) +s32 joy_get_pak_state(s8 device) { return g_Paks[device].state; } -s32 joyGetPakState2(s8 device) +s32 joy_get_pak_state2(s8 device) { - return joyGetPakState(device); + return joy_get_pak_state(device); } -void joysTickRumble(void) +void joys_tick_rumble(void) { s32 i; diff --git a/src/lib/lib_17ce0.c b/src/lib/lib_17ce0.c index e319ec44f..19f5d088f 100644 --- a/src/lib/lib_17ce0.c +++ b/src/lib/lib_17ce0.c @@ -12,7 +12,7 @@ u8 var8005ef20 = 254; u8 var8009a4e0[456][2]; -void portalGetAvgVertexPos(s32 portalnum, struct coord *avg) +void portal_get_avg_vertex_pos(s32 portalnum, struct coord *avg) { struct portalvertices *pvertices = (struct portalvertices *)((uintptr_t)g_BgPortals + g_BgPortals[portalnum].verticesoffset); f32 f0; @@ -86,7 +86,7 @@ void portal00017dc4(RoomNum *rooms, RoomNum roomnum) * * The portal's normal vector is the front. */ -s32 portalCalculateIntersection(s32 portalnum, struct coord *pos1, struct coord *pos2) +s32 portal_calculate_intersection(s32 portalnum, struct coord *pos1, struct coord *pos2) { s32 i; struct coord sp60; @@ -212,7 +212,7 @@ void portal00018148(struct coord *pos1, struct coord *pos2, RoomNum *rooms1, Roo if (s1[0] != var8005ef20) { s1[0] = var8005ef20; - s1[1] = portalCalculateIntersection(portalnum, pos1, pos2); + s1[1] = portal_calculate_intersection(portalnum, pos1, pos2); } if (s1[1] != PORTALINTERSECTION_NONE) { diff --git a/src/lib/main.c b/src/lib/main.c index 91f21573b..57c04d9ab 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -70,9 +70,9 @@ #include "data.h" #include "types.h" -// mainLoop calls rngSetSeed with a u32 argument, +// main_loop calls rng_set_seed with a u32 argument, // but the function takes a u64 so an incorrect declaration is needed. -void rngSetSeed(u32 seed); +void rng_set_seed(u32 seed); bool var8005d9b0 = false; s32 g_StageNum = STAGE_TITLE; @@ -315,7 +315,7 @@ extern u8 _bssSegmentEnd; * Initialise various subsystems, display the copyright or accessing pak texture, * then initialise more subsystems. */ -void mainInit(void) +void main_init(void) { s32 x; s32 dsty; @@ -330,16 +330,16 @@ void mainInit(void) u32 addr; u8 *start; - faultInit(); - dmaInit(); - amgrInit(); - varsInit(); - mempInit(); - memaInit(); - videbugInit(); - viConfigureForLogos(); - var8005d9b0 = rmonIsDisabled(); - joyInit(); + fault_init(); + dma_init(); + amgr_init(); + vars_init(); + memp_init(); + mema_init(); + videbug_init(); + vi_configure_for_logos(); + var8005d9b0 = rmon_is_disabled(); + joy_init(); osCreateMesgQueue(&queue, &msg, 1); // Wait a bit, reset the controllers and wait a bit more @@ -348,9 +348,9 @@ void mainInit(void) osRecvMesg(&queue, &msg, OS_MESG_BLOCK); if (i == 1) { - joyReset(); + joy_reset(); } else if (i >= 2) { - joyDebugJoy(); + joy_debug_joy(); } #if VERSION >= VERSION_NTSC_1_0 @@ -359,16 +359,16 @@ void mainInit(void) #endif } - if (argFindByPrefix(1, "-level_") == NULL) { + if (arg_find_by_prefix(1, "-level_") == NULL) { var8005d9b0 = true; } #if VERSION >= VERSION_NTSC_1_0 // If holding start on any controller, open boot pak menu - if (joyGetButtons(0, START_BUTTON) == 0 - && joyGetButtons(1, START_BUTTON) == 0 - && joyGetButtons(2, START_BUTTON) == 0 - && joyGetButtons(3, START_BUTTON) == 0) { + if (joy_get_buttons(0, START_BUTTON) == 0 + && joy_get_buttons(1, START_BUTTON) == 0 + && joy_get_buttons(2, START_BUTTON) == 0 + && joy_get_buttons(3, START_BUTTON) == 0) { g_DoBootPakMenu = false; } else { g_DoBootPakMenu = true; @@ -380,10 +380,10 @@ void mainInit(void) // and the crash screen will be shown if the game crashes. #define BUTTON_MASK (U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS) - if (joyGetButtons(0, BUTTON_MASK) == BUTTON_MASK - || joyGetButtons(1, BUTTON_MASK) == BUTTON_MASK - || joyGetButtons(2, BUTTON_MASK) == BUTTON_MASK - || joyGetButtons(3, BUTTON_MASK) == BUTTON_MASK) { + if (joy_get_buttons(0, BUTTON_MASK) == BUTTON_MASK + || joy_get_buttons(1, BUTTON_MASK) == BUTTON_MASK + || joy_get_buttons(2, BUTTON_MASK) == BUTTON_MASK + || joy_get_buttons(3, BUTTON_MASK) == BUTTON_MASK) { g_CrashEnabled = true; } #endif @@ -401,7 +401,7 @@ void mainInit(void) // In 4MB mode, place it close to the end of memory, // but before the thread stacks and VM system. // In 8MB mode, put it at the end of the expansion pak. - if (bootGetMemSize() <= 4 * 1024 * 1024) { + if (boot_get_mem_size() <= 4 * 1024 * 1024) { addr = K0BASE + 4 * 1024 * 1024; addr -= STACKSIZE_MAIN; addr -= STACKSIZE_IDLE; @@ -429,9 +429,9 @@ void mainInit(void) // DMA the compressed texture from the ROM to the framebuffer. // It's using the framebuffer as a temporary data buffer. if (g_DoBootPakMenu) { - dmaExec(fb, (romptr_t) &_accessingpakSegmentRomStart, &_accessingpakSegmentRomEnd - &_accessingpakSegmentRomStart); + dma_exec(fb, (romptr_t) &_accessingpakSegmentRomStart, &_accessingpakSegmentRomEnd - &_accessingpakSegmentRomStart); } else { - dmaExec(fb, (romptr_t) &_copyrightSegmentRomStart, &_copyrightSegmentRomEnd - &_copyrightSegmentRomStart); + dma_exec(fb, (romptr_t) &_copyrightSegmentRomStart, &_copyrightSegmentRomEnd - &_copyrightSegmentRomStart); } // This is required for a match @@ -439,7 +439,7 @@ void mainInit(void) if ((f64) numpages && (f64) numpages); // Unzip the compressed texture from fb to texture - rzipInflate(fb, texture, scratch); + rzip_inflate(fb, texture, scratch); // Clear the framebuffer except for the bottom 48 rows, // because that's where the texture will go. @@ -472,8 +472,8 @@ void mainInit(void) } } - viSetMode(VIMODE_HI); - viConfigureForCopyright(fb); + vi_set_mode(VIMODE_HI); + vi_configure_for_copyright(fb); g_RdpOutBufferStart = texture; g_RdpOutBufferEnd = texture + 0x400; // 0x800 bytes, because texture is u16 @@ -488,8 +488,8 @@ void mainInit(void) osRecvMesg(&g_MainMesgQueue, &receivedmsg, OS_MESG_BLOCK); if (*(s16 *) receivedmsg == OS_SC_RETRACE_MSG) { - viUpdateMode(); - rdpCreateTask(var8005dcc8, var8005dcc8 + ARRAYCOUNT(var8005dcc8), 0, (s32) &scdonemsg); + vi_update_mode(); + rdp_create_task(var8005dcc8, var8005dcc8 + ARRAYCOUNT(var8005dcc8), 0, (s32) &scdonemsg); j++; } } @@ -524,10 +524,10 @@ void mainInit(void) while (1); } - if (joyGetButtons(0, START_BUTTON) == 0 - && joyGetButtons(1, START_BUTTON) == 0 - && joyGetButtons(2, START_BUTTON) == 0 - && joyGetButtons(3, START_BUTTON) == 0) { + if (joy_get_buttons(0, START_BUTTON) == 0 + && joy_get_buttons(1, START_BUTTON) == 0 + && joy_get_buttons(2, START_BUTTON) == 0 + && joy_get_buttons(3, START_BUTTON) == 0) { s32 numpages; OSMesg receivedmsg = NULL; OSScMsg scdonemsg = { OS_SC_DONE_MSG }; @@ -565,13 +565,13 @@ void mainInit(void) // DMA the compressed texture from the ROM to the framebuffer. // It's using the framebuffer as a temporary data buffer. - dmaExec(fb, (romptr_t) &_copyrightSegmentRomStart, &_copyrightSegmentRomEnd - &_copyrightSegmentRomStart); + dma_exec(fb, (romptr_t) &_copyrightSegmentRomStart, &_copyrightSegmentRomEnd - &_copyrightSegmentRomStart); numpages = g_VmNumPages; if ((f64) numpages && (f64) numpages); // Unzip the compressed texture from fb to texture - rzipInflate(fb, texture, scratch); + rzip_inflate(fb, texture, scratch); // Clear the framebuffer except for the bottom 48 rows, // because that's where the texture will go. @@ -596,8 +596,8 @@ void mainInit(void) dsty += 576; } - viSetMode(VIMODE_HI); - viConfigureForCopyright(fb); + vi_set_mode(VIMODE_HI); + vi_configure_for_copyright(fb); g_RdpOutBufferStart = texture; g_RdpOutBufferEnd = texture + 0x400; // 0x800 bytes, because texture is u16 @@ -610,8 +610,8 @@ void mainInit(void) osRecvMesg(&g_MainMesgQueue, &receivedmsg, OS_MESG_BLOCK); if (*(s16 *) receivedmsg == OS_SC_RETRACE_MSG) { - viUpdateMode(); - rdpCreateTask(var8005dcc8, var8005dcc8 + ARRAYCOUNT(var8005dcc8), 0, (s32) &scdonemsg); + vi_update_mode(); + rdp_create_task(var8005dcc8, var8005dcc8 + ARRAYCOUNT(var8005dcc8), 0, (s32) &scdonemsg); i++; } } @@ -620,57 +620,57 @@ void mainInit(void) } #endif - vmInit(); + vm_init(); func0f1a78b0(); - filesInit(); + files_init(); stub0f175f50(); func0f175f90(); if (var8005d9b0) { - argSetString(" -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400"); + arg_set_string(" -ml0 -me0 -mgfx100 -mvtx50 -mt700 -ma400"); } start = (u8 *) PHYS_TO_K0(osVirtualToPhysical(&_bssSegmentEnd)); if (g_VmMarker); - mempSetHeap(start, g_VmMarker - start); + memp_set_heap(start, g_VmMarker - start); - mempResetPool(MEMPOOL_8); - mempResetPool(MEMPOOL_PERMANENT); - crashReset(); - challengesInit(); - utilsInit(); + memp_reset_pool(MEMPOOL_8); + memp_reset_pool(MEMPOOL_PERMANENT); + crash_reset(); + challenges_init(); + utils_init(); func000034d0(); - texInit(); - langInit(); - lvInit(); - cheatsInit(); + tex_init(); + lang_init(); + lv_init(); + cheats_init(); func0000e9c0(); - textInit(); - dhudInit(); - playermgrInit(); - frametimeInit(); + text_init(); + dhud_init(); + playermgr_init(); + frametime_init(); stub0f00b200(); - profileInit(); + profile_init(); stub0f000870(); - smokesInit(); + smokes_init(); stub0f0008e0(); stub0f0008f0(); stub0f000900(); stub0f00b180(); stub0f000910(); stub0f000840(); - mpInit(); - pheadInit(); - paksInit(); - pheadInit2(); - animsInit(); - racesInit(); - bodiesInit(); + mp_init(); + phead_init(); + paks_init(); + phead_init2(); + anims_init(); + races_init(); + bodies_init(); stub0f000850(); stub0f000860(); - titleInit(); - viConfigureForLegal(); - viBlack(true); + title_init(); + vi_configure_for_legal(); + vi_black(true); g_MainIsBooting = 0; @@ -702,14 +702,14 @@ void main000e010nb(void) } #endif -void mainProc(void) +void main_proc(void) { - mainInit(); - rdpInit(); - sndInit(); + main_init(); + rdp_init(); + snd_init(); while (true) { - mainLoop(); + main_loop(); } } @@ -722,7 +722,7 @@ void mainProc(void) * then this function would have looked up the given variable name in the table * and written the new value to the variable's address. */ -void mainOverrideVariable(char *name, void *value) +void main_override_variable(char *name, void *value) { // empty } @@ -730,14 +730,14 @@ void mainOverrideVariable(char *name, void *value) /** * This function enters an infinite loop which iterates once per stage load. * Within this loop is an inner loop which runs very frequently and decides - * whether to run mainTick on each iteration. + * whether to run main_tick on each iteration. * * NTSC beta checks two shorts at an offset 64MB into the development board * and refuses to continue if they are not any of the allowed values. * Decomp patches these reads in its build system so it can be played * without the development board. */ -void mainLoop(void) +void main_loop(void) { s32 ending = false; OSScMsg msg2 = {OS_SC_DONE_MSG}; @@ -764,7 +764,7 @@ void mainLoop(void) func0f175f98(); var8005d9c4 = 0; - argGetLevel(&g_StageNum); + arg_get_level(&g_StageNum); if (g_DoBootPakMenu) { #if VERSION >= VERSION_NTSC_1_0 @@ -774,13 +774,13 @@ void mainLoop(void) } if (g_StageNum != STAGE_TITLE) { - titleSetNextStage(g_StageNum); + title_set_next_stage(g_StageNum); if (g_StageNum < STAGE_TITLE) { func0f01b148(0); - if (argFindByPrefix(1, "-hard")) { - lvSetDifficulty(argFindByPrefix(1, "-hard")[0] - '0'); + if (arg_find_by_prefix(1, "-hard")) { + lv_set_difficulty(arg_find_by_prefix(1, "-hard")[0] - '0'); } } } @@ -789,7 +789,7 @@ void mainLoop(void) g_StageNum = STAGE_4MBMENU; } - rngSetSeed(osGetCount()); + rng_set_seed(osGetCount()); // Outer loop - this is infinite because ending is never changed while (!ending) { @@ -802,7 +802,7 @@ void mainLoop(void) index = -1; if (IS4MB()) { - if (g_StageNum < STAGE_TITLE && getNumPlayers() >= 2) { + if (g_StageNum < STAGE_TITLE && get_num_players() >= 2) { index = 0; \ while (g_StageAllocations4Mb[index].stagenum) { \ if (g_StageAllocations4Mb[index].stagenum == g_StageNum + 400) { \ @@ -829,10 +829,10 @@ void mainLoop(void) } } - argSetString(g_StageAllocations4Mb[index].string); + arg_set_string(g_StageAllocations4Mb[index].string); } else { // 8MB - if (g_StageNum < STAGE_TITLE && getNumPlayers() >= 2) { + if (g_StageNum < STAGE_TITLE && get_num_players() >= 2) { index = 0; \ while (g_StageAllocations8Mb[index].stagenum) { \ if (g_StageNum + 400 == g_StageAllocations8Mb[index].stagenum) { \ @@ -858,35 +858,35 @@ void mainLoop(void) } } - argSetString(g_StageAllocations8Mb[index].string); + arg_set_string(g_StageAllocations8Mb[index].string); } } var8005d9c4 = 0; - mempResetPool(MEMPOOL_7); - mempResetPool(MEMPOOL_STAGE); - filesStop(4); + memp_reset_pool(MEMPOOL_7); + memp_reset_pool(MEMPOOL_STAGE); + files_stop(4); - if (argFindByPrefix(1, "-ma")) { - g_MainMemaHeapSize = strtol(argFindByPrefix(1, "-ma"), NULL, 0) * 1024; + if (arg_find_by_prefix(1, "-ma")) { + g_MainMemaHeapSize = strtol(arg_find_by_prefix(1, "-ma"), NULL, 0) * 1024; } - memaReset(mempAlloc(g_MainMemaHeapSize, MEMPOOL_STAGE), g_MainMemaHeapSize); - langReset(g_StageNum); - playermgrReset(); + mema_reset(memp_alloc(g_MainMemaHeapSize, MEMPOOL_STAGE), g_MainMemaHeapSize); + lang_reset(g_StageNum); + playermgr_reset(); if (g_StageNum >= STAGE_TITLE) { numplayers = 0; } else { - if (argFindByPrefix(1, "-play")) { - numplayers = strtol(argFindByPrefix(1, "-play"), NULL, 0); + if (arg_find_by_prefix(1, "-play")) { + numplayers = strtol(arg_find_by_prefix(1, "-play"), NULL, 0); } else { numplayers = 1; } - if (getNumPlayers() >= 2) { - numplayers = getNumPlayers(); + if (get_num_players() >= 2) { + numplayers = get_num_players(); } } @@ -894,29 +894,29 @@ void mainLoop(void) g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = -1; - } else if (argFindByPrefix(1, "-coop")) { + } else if (arg_find_by_prefix(1, "-coop")) { g_Vars.bondplayernum = 0; g_Vars.coopplayernum = 1; g_Vars.antiplayernum = -1; - } else if (argFindByPrefix(1, "-anti")) { + } else if (arg_find_by_prefix(1, "-anti")) { g_Vars.bondplayernum = 0; g_Vars.coopplayernum = -1; g_Vars.antiplayernum = 1; } - playermgrAllocatePlayers(numplayers); + playermgr_allocate_players(numplayers); - if (argFindByPrefix(1, "-mpbots")) { + if (arg_find_by_prefix(1, "-mpbots")) { g_Vars.lvmpbotlevel = 1; } if (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) { g_MpSetup.chrslots = 0x03; - mpReset(); + mp_reset(); } else if (g_Vars.perfectbuddynum) { - mpReset(); + mp_reset(); } else if (g_Vars.mplayerisrunning == false - && (numplayers >= 2 || g_Vars.lvmpbotlevel || argFindByPrefix(1, "-play"))) { + && (numplayers >= 2 || g_Vars.lvmpbotlevel || arg_find_by_prefix(1, "-play"))) { g_MpSetup.chrslots = 1; if (numplayers >= 2) { @@ -932,17 +932,17 @@ void mainLoop(void) } g_MpSetup.stagenum = g_StageNum; - mpReset(); + mp_reset(); } - gfxReset(); - joyReset(); - dhudReset(); - zbufReset(g_StageNum); - lvReset(g_StageNum); - viReset(g_StageNum); - frametimeCalculate(); - profileReset(); + gfx_reset(); + joy_reset(); + dhud_reset(); + zbuf_reset(g_StageNum); + lv_reset(g_StageNum); + vi_reset(g_StageNum); + frametime_calculate(); + profile_reset(); while (osRecvMesg(&g_MainMesgQueue, &msg, OS_MESG_NOBLOCK) != -1) { // empty @@ -954,7 +954,7 @@ void mainLoop(void) osRecvMesg(&g_MainMesgQueue, &msg, OS_MESG_BLOCK); #if VERSION < VERSION_NTSC_1_0 - bootCheckStackOverflow(); + boot_check_stack_overflow(); #endif switch (*(s16 *) msg) { @@ -962,7 +962,7 @@ void mainLoop(void) cycles = osGetCount() - g_Vars.thisframestartt; if (cycles >= g_Vars.mininc60 * CYCLES_PER_FRAME - CYCLES_PER_FRAME / 2) { - mainTick(); + main_tick(); } break; case OS_SC_DONE_MSG: @@ -979,7 +979,7 @@ void mainLoop(void) char message[80]; u32 stack2; sprintf(message, "boss.c default: %08x type %d\n", (s32) msg, *(s16 *) msg); - crashSetMessage(message); + crash_set_message(message); CRASH(); } break; @@ -987,11 +987,11 @@ void mainLoop(void) } } - lvStop(); - mempDisablePool(MEMPOOL_STAGE); - mempDisablePool(MEMPOOL_7); - filesStop(4); - viBlack(true); + lv_stop(); + memp_disable_pool(MEMPOOL_STAGE); + memp_disable_pool(MEMPOOL_7); + files_stop(4); + vi_black(true); #if VERSION >= VERSION_NTSC_1_0 pak0f116994(); #endif @@ -1004,7 +1004,7 @@ void mainLoop(void) func0f175fc8(); } -void mainTick(void) +void main_tick(void) { Gfx *gdl; Gfx *gdlstart; @@ -1012,74 +1012,74 @@ void mainTick(void) s32 i; if (g_MainChangeToStageNum < 0 && g_MainNumGfxTasks < NUM_GFXTASKS) { - frametimeCalculate(); + frametime_calculate(); profile00009a98(); - profileReset(); - profileSetMarker(PROFILE_MAINTICK_START); + profile_reset(); + profile_set_marker(PROFILE_MAINTICK_START); func000034d8(); - joyDebugJoy(); - schedSetCrashEnable2(false); + joy_debug_joy(); + sched_set_crash_enable2(false); if (g_MainGameLogicEnabled) { - gdl = gdlstart = gfxGetMasterDisplayList(); + gdl = gdlstart = gfx_get_master_display_list(); gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); gDPSetTile(gdl++, G_IM_FMT_RGBA, G_IM_SIZ_4b, 0, 0x0100, 6, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD); #ifdef DEBUG - if (g_MainIsDebugMenuOpen || joyGetButtons(0, U_CBUTTONS | D_CBUTTONS) == (U_CBUTTONS | D_CBUTTONS)) { - g_MainIsDebugMenuOpen = debugProcessInput(joyGetStickX(0), joyGetStickY(0), joyGetButtons(0, 0xffff), joyGetButtonsPressedThisFrame(0, 0xffff)); - } else if (joyGetButtons(0, START_BUTTON) == 0) { + if (g_MainIsDebugMenuOpen || joy_get_buttons(0, U_CBUTTONS | D_CBUTTONS) == (U_CBUTTONS | D_CBUTTONS)) { + g_MainIsDebugMenuOpen = debug_process_input(joy_get_stick_x(0), joy_get_stick_y(0), joy_get_buttons(0, 0xffff), joy_get_buttons_pressed_this_frame(0, 0xffff)); + } else if (joy_get_buttons(0, START_BUTTON) == 0) { var80075d68 = var800786f4nb; } else { - g_MainIsDebugMenuOpen = debugProcessInput(joyGetStickX(0), joyGetStickY(0), joyGetButtons(0, 0xffff), joyGetButtonsPressedThisFrame(0, 0xffff)); + g_MainIsDebugMenuOpen = debug_process_input(joy_get_stick_x(0), joy_get_stick_y(0), joy_get_buttons(0, 0xffff), joy_get_buttons_pressed_this_frame(0, 0xffff)); } #endif - lvTick(); - playermgrShuffle(); + lv_tick(); + playermgr_shuffle(); if (g_StageNum < STAGE_TITLE) { for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(playermgrGetPlayerAtOrder(i)); + set_current_player_num(playermgr_get_player_at_order(i)); - if (g_StageNum != STAGE_TEST_OLD || !titleIsKeepingMode()) { - viSetViewPosition(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); - viSetFovAspectAndSize( + if (g_StageNum != STAGE_TEST_OLD || !title_is_keeping_mode()) { + vi_set_view_position(g_Vars.currentplayer->viewleft, g_Vars.currentplayer->viewtop); + vi_set_fov_aspect_and_size( g_Vars.currentplayer->fovy, g_Vars.currentplayer->aspect, g_Vars.currentplayer->viewwidth, g_Vars.currentplayer->viewheight); } - lvTickPlayer(); + lv_tick_player(); } } - gdl = lvRender(gdl); + gdl = lv_render(gdl); func000034e0(&gdl); #ifdef DEBUG - if (debugIsLineModeEnabled()) { + if (debug_is_line_mode_enabled()) { gDPPipeSync(gdl++); gDPSetCycleType(gdl++, G_CYC_1CYCLE); gDPSetBlendColor(gdl++, 0xff, 0xff, 0xff, 0xff); gDPSetPrimDepth(gdl++, 0xffff, 0xffff); gDPSetDepthSource(gdl++, G_ZS_PRIM); gDPSetRenderMode(gdl++, G_RM_VISCVG, G_RM_VISCVG2); - gDPFillRectangle(gdl++, 0, 0, viGetWidth() - 1, viGetHeight() - 1); + gDPFillRectangle(gdl++, 0, 0, vi_get_width() - 1, vi_get_height() - 1); } - gdl = dhudRender(gdl); - dhudClear(); + gdl = dhud_render(gdl); + dhud_clear(); #endif - if (debugGetProfileMode() >= 2) { - gdl = profileRender(gdl); + if (debug_get_profile_mode() >= 2) { + gdl = profile_render(gdl); } #ifdef DEBUG if (g_MainIsDebugMenuOpen) { - debugUpdateMenu(); - gdl = dmenuRender(gdl); + debug_update_menu(); + gdl = dmenu_render(gdl); } #endif @@ -1088,15 +1088,15 @@ void mainTick(void) } if (g_MainGameLogicEnabled) { - gfxSwapBuffers(); - viUpdateMode(); + gfx_swap_buffers(); + vi_update_mode(); } - rdpCreateTask(gdlstart, gdl, 0, (s32) &msg); + rdp_create_task(gdlstart, gdl, 0, (s32) &msg); g_MainNumGfxTasks++; - memaPrint(); + mema_print(); func0f16cf94(); - profileSetMarker(PROFILE_MAINTICK_END); + profile_set_marker(PROFILE_MAINTICK_END); #if VERSION == VERSION_PAL_BETA #ifdef DEBUG @@ -1106,43 +1106,43 @@ void mainTick(void) } } -void mainEndStage(void) +void main_end_stage(void) { - sndStopNosedive(); + snd_stop_nosedive(); if (!g_MainIsEndscreen) { #if VERSION >= VERSION_NTSC_1_0 pak0f11c6d0(); #endif - joyDisableTemporarily(); + joy_disable_temporarily(); if (g_Vars.coopplayernum >= 0) { s32 prevplayernum = g_Vars.currentplayernum; s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); - endscreenPushCoop(); + set_current_player_num(i); + endscreen_push_coop(); } - setCurrentPlayerNum(prevplayernum); - musicStartMenu(); + set_current_player_num(prevplayernum); + music_start_menu(); } else if (g_Vars.antiplayernum >= 0) { s32 prevplayernum = g_Vars.currentplayernum; s32 i; for (i = 0; i < PLAYERCOUNT(); i++) { - setCurrentPlayerNum(i); - endscreenPushAnti(); + set_current_player_num(i); + endscreen_push_anti(); } - setCurrentPlayerNum(prevplayernum); - musicStartMenu(); + set_current_player_num(prevplayernum); + music_start_menu(); } else if (g_Vars.normmplayerisrunning) { - mpEndMatch(); + mp_end_match(); } else { - endscreenPrepare(); - musicStartMenu(); + endscreen_prepare(); + music_start_menu(); } } @@ -1152,7 +1152,7 @@ void mainEndStage(void) /** * Change to the given stage at the end of the current frame. */ -void mainChangeToStage(s32 stagenum) +void main_change_to_stage(s32 stagenum) { #if VERSION >= VERSION_NTSC_1_0 pak0f11c6d0(); @@ -1161,16 +1161,16 @@ void mainChangeToStage(s32 stagenum) g_MainChangeToStageNum = stagenum; } -s32 mainGetStageNum(void) +s32 main_get_stage_num(void) { return g_StageNum; } void func0000e990(void) { - objectivesCheckAll(); - objectivesDisableChecking(); - mainEndStage(); + objectives_check_all(); + objectives_disable_checking(); + main_end_stage(); } void func0000e9c0(void) diff --git a/src/lib/mema.c b/src/lib/mema.c index 2cab707df..bffe91f2f 100644 --- a/src/lib/mema.c +++ b/src/lib/mema.c @@ -63,7 +63,7 @@ struct memaheap g_MemaHeap; u32 g_MemaLeastEverFree = 1000000; #endif -void memaSwap(struct memaspace *a, struct memaspace *b) +void mema_swap(struct memaspace *a, struct memaspace *b) { u32 tempaddr = a->addr; u32 tempsize = a->size; @@ -73,14 +73,14 @@ void memaSwap(struct memaspace *a, struct memaspace *b) b->size = tempsize; } -void memaMerge(struct memaspace *a, struct memaspace *b) +void mema_merge(struct memaspace *a, struct memaspace *b) { a->size += b->size; b->addr = 0; b->size = 0; } -bool memaDefragPass(struct memaheap *heap) +bool mema_defrag_pass(struct memaheap *heap) { bool merged = false; struct memaspace *prev = &heap->start; @@ -91,11 +91,11 @@ bool memaDefragPass(struct memaheap *heap) while (curr <= last) { if (curr->size != 0) { if (curr->addr < addr) { - memaSwap(curr, prev); + mema_swap(curr, prev); } if (prev->size + addr == curr->addr) { - memaMerge(prev, curr); + mema_merge(prev, curr); curr = prev; merged = true; } @@ -110,9 +110,9 @@ bool memaDefragPass(struct memaheap *heap) return merged; } -void memaDefrag(void) +void mema_defrag(void) { - while (memaDefragPass(&g_MemaHeap)); + while (mema_defrag_pass(&g_MemaHeap)); } /** @@ -121,7 +121,7 @@ void memaDefrag(void) * If none can be found, return the smallest run of free space so it can be * overwritten by the caller. */ -struct memaspace *memaMakeSlot(struct memaheap *heap) +struct memaspace *mema_make_slot(struct memaheap *heap) { struct memaspace *curr = &heap->spaces[0]; struct memaspace *best; @@ -139,7 +139,7 @@ struct memaspace *memaMakeSlot(struct memaheap *heap) } if ((uintptr_t) curr[1].addr < (uintptr_t) curr[0].addr) { - memaSwap(&curr[0], &curr[1]); + mema_swap(&curr[0], &curr[1]); } if (curr[1].addr == curr[0].size + curr[0].addr) { @@ -177,7 +177,7 @@ struct memaspace *memaMakeSlot(struct memaheap *heap) return best; } -void _memaFree(s32 addr, s32 size) +void _mema_free(s32 addr, s32 size) { // Choose an index in the spaces array which we'll mark a space as free, // based on how far into the heap the allocation is. This is a rough @@ -201,7 +201,7 @@ void _memaFree(s32 addr, s32 size) } if (curr->addr == 0) { - curr = memaMakeSlot(&g_MemaHeap); + curr = mema_make_slot(&g_MemaHeap); } } @@ -210,12 +210,12 @@ void _memaFree(s32 addr, s32 size) curr->size = size; } -void memaInit(void) +void mema_init(void) { // empty } -void memaReset(void *heapaddr, u32 heapsize) +void mema_reset(void *heapaddr, u32 heapsize) { struct memaspace *space; @@ -279,7 +279,7 @@ void memaReset(void *heapaddr, u32 heapsize) * the permanent allocations are done during startup. This pool fits entirely * in onboard memory, so the expansion size is 0. */ -void memaPrint(void) +void mema_print(void) { s32 onboard; s32 expansion; @@ -287,68 +287,68 @@ void memaPrint(void) s32 over; char buffer[124]; - memaDefragPass(&g_MemaHeap); + mema_defrag_pass(&g_MemaHeap); #ifdef DEBUG #if VERSION == VERSION_PAL_BETA - if (debugIsMemInfoEnabled()) { - dhudSetFgColour(0xff, 0xff, 0xff, 0xff); - dhudSetBgColour(0, 0, 0, 0xff); + if (debug_is_mem_info_enabled()) { + dhud_set_fg_colour(0xff, 0xff, 0xff, 0xff); + dhud_set_bg_colour(0, 0, 0, 0xff); - sprintf(buffer, "Lev0: %d", mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_ONBOARD)); + sprintf(buffer, "Lev0: %d", memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_ONBOARD)); - dhudSetPos(31, line); - dhudPrintString(buffer); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; - sprintf(buffer, "Lev1: %d", mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_EXPANSION)); + sprintf(buffer, "Lev1: %d", memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_EXPANSION)); - dhudSetPos(31, line); - dhudPrintString(buffer); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; - if (memaGetLongestFree() < g_MemaLeastEverFree) { - g_MemaLeastEverFree = memaGetLongestFree(); + if (mema_get_longest_free() < g_MemaLeastEverFree) { + g_MemaLeastEverFree = mema_get_longest_free(); } - sprintf(buffer, "mema: %d (%d)", memaGetLongestFree(), g_MemaLeastEverFree); + sprintf(buffer, "mema: %d (%d)", mema_get_longest_free(), g_MemaLeastEverFree); - dhudSetPos(31, line); - dhudPrintString(buffer); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; } #endif #if VERSION == VERSION_NTSC_BETA - if (debugIsMemInfoEnabled()) { - dhudSetFgColour(0xff, 0xff, 0xff, 0xff); - dhudSetBgColour(0, 0, 0, 0xff); + if (debug_is_mem_info_enabled()) { + dhud_set_fg_colour(0xff, 0xff, 0xff, 0xff); + dhud_set_bg_colour(0, 0, 0, 0xff); - dhudSetPos(30, line); - dhudPrintString("Mem Info"); + dhud_set_pos(30, line); + dhud_print_string("Mem Info"); line++; - dhudSetPos(30, line); - dhudPrintString("memp: MP_LF_LEV"); + dhud_set_pos(30, line); + dhud_print_string("memp: MP_LF_LEV"); line++; - onboard = mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_ONBOARD); - expansion = mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_EXPANSION); + onboard = memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_ONBOARD); + expansion = memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_EXPANSION); sprintf(buffer, "F: %d %d", onboard, expansion); - dhudSetPos(31, line); - dhudPrintString(buffer); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; - onboard = mempGetPoolSize(MEMPOOL_STAGE, MEMBANK_ONBOARD); - expansion = mempGetPoolSize(MEMPOOL_STAGE, MEMBANK_EXPANSION); + onboard = memp_get_pool_size(MEMPOOL_STAGE, MEMBANK_ONBOARD); + expansion = memp_get_pool_size(MEMPOOL_STAGE, MEMBANK_EXPANSION); sprintf(buffer, "S: %d %d", onboard, expansion); - dhudSetPos(31, line); - dhudPrintString(buffer); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; - over = mempGetPoolSize(MEMPOOL_STAGE, MEMBANK_EXPANSION) - - mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_EXPANSION) - - mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_ONBOARD); + over = memp_get_pool_size(MEMPOOL_STAGE, MEMBANK_EXPANSION) + - memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_EXPANSION) + - memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_ONBOARD); if (over >= 0) { sprintf(buffer, "Over: %d", over); @@ -356,47 +356,47 @@ void memaPrint(void) sprintf(buffer, "Free: %d", -over); } - dhudSetPos(31, line); - dhudPrintString(buffer); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; - dhudSetPos(30, line); - dhudPrintString("memp: MP_LF_ETER"); + dhud_set_pos(30, line); + dhud_print_string("memp: MP_LF_ETER"); line++; - onboard = mempGetPoolFree(MEMPOOL_PERMANENT, MEMBANK_ONBOARD); - expansion = mempGetPoolFree(MEMPOOL_PERMANENT, MEMBANK_EXPANSION); + onboard = memp_get_pool_free(MEMPOOL_PERMANENT, MEMBANK_ONBOARD); + expansion = memp_get_pool_free(MEMPOOL_PERMANENT, MEMBANK_EXPANSION); sprintf(buffer, "F: %d %d", onboard, expansion); - dhudSetPos(31, line); - dhudPrintString(buffer); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; - onboard = mempGetPoolSize(MEMPOOL_PERMANENT, MEMBANK_ONBOARD); - expansion = mempGetPoolSize(MEMPOOL_PERMANENT, MEMBANK_EXPANSION); + onboard = memp_get_pool_size(MEMPOOL_PERMANENT, MEMBANK_ONBOARD); + expansion = memp_get_pool_size(MEMPOOL_PERMANENT, MEMBANK_EXPANSION); sprintf(buffer, "S: %d %d", onboard, expansion); - dhudSetPos(31, line); - dhudPrintString(buffer); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; - dhudSetPos(30, line); - dhudPrintString("mema:"); + dhud_set_pos(30, line); + dhud_print_string("mema:"); line++; - sprintf(buffer, "LF: %d", memaGetLongestFree()); - dhudSetPos(31, line); - dhudPrintString(buffer); + sprintf(buffer, "LF: %d", mema_get_longest_free()); + dhud_set_pos(31, line); + dhud_print_string(buffer); line++; sprintf(buffer, "Audio Free: %d", g_SndHeap.base + (g_SndHeap.len - (uintptr_t) g_SndHeap.cur)); - dhudSetPos(30, line); - dhudPrintString(buffer); + dhud_set_pos(30, line); + dhud_print_string(buffer); line++; } #endif #endif } -void *memaAlloc(u32 size) +void *mema_alloc(u32 size) { u32 addr; u32 diff; @@ -454,7 +454,7 @@ void *memaAlloc(u32 size) // There was no space, so attempt to free up some space // by doing several defrag passes for (i = 0; i < 8; i++) { - memaDefragPass(&g_MemaHeap); + mema_defrag_pass(&g_MemaHeap); } curr = &g_MemaHeap.spaces[0]; @@ -485,7 +485,7 @@ void *memaAlloc(u32 size) /** * Grow the allocation which currently *ends at* the given address. */ -s32 memaGrow(s32 addr, u32 amount) +s32 mema_grow(s32 addr, u32 amount) { struct memaspace *curr = &g_MemaHeap.spaces[0]; @@ -510,9 +510,9 @@ found: return addr; } -void memaFree(void *addr, s32 size) +void mema_free(void *addr, s32 size) { - _memaFree((uintptr_t) addr, size); + _mema_free((uintptr_t) addr, size); } void mema00012cd4(void) @@ -524,12 +524,12 @@ void mema00012cd4(void) * Find and return the largest amount of contiguous free space in the pool. * ie. the biggest allocation that mema can currently make. */ -s32 memaGetLongestFree(void) +s32 mema_get_longest_free(void) { struct memaspace *curr; s32 biggest = 0; - memaDefrag(); + mema_defrag(); curr = &g_MemaHeap.spaces[0]; @@ -548,20 +548,20 @@ s32 memaGetLongestFree(void) return 0; } -bool memaRealloc(s32 addr, u32 oldsize, u32 newsize) +bool mema_realloc(s32 addr, u32 oldsize, u32 newsize) { if (newsize > oldsize) { - if (!memaGrow(addr + oldsize, newsize - oldsize)) { + if (!mema_grow(addr + oldsize, newsize - oldsize)) { return false; } } else if (oldsize > newsize) { - memaFree((void *)(addr + newsize), oldsize - newsize); + mema_free((void *)(addr + newsize), oldsize - newsize); } return true; } -u32 memaGetSize(void) +u32 mema_get_size(void) { return g_MemaHeapSize; } diff --git a/src/lib/memp.c b/src/lib/memp.c index 2340c1859..3dd8ee694 100644 --- a/src/lib/memp.c +++ b/src/lib/memp.c @@ -54,7 +54,7 @@ struct memorypool { struct memorypool g_MempOnboardPools[9]; struct memorypool g_MempExpansionPools[9]; -void mempInit(void) +void memp_init(void) { // empty } @@ -65,7 +65,7 @@ void mempInit(void) * The arguments passed are the onboard start and length that can be used. * If the expansion pak is present, the entire pak is used for the second bank. */ -void mempSetHeap(u8 *heapstart, u32 heaplen) +void memp_set_heap(u8 *heapstart, u32 heaplen) { s32 i; u8 *extraend; @@ -91,13 +91,13 @@ void mempSetHeap(u8 *heapstart, u32 heaplen) // If 8MB, reserve the entire expansion pak for the stage pool #if VERSION >= VERSION_NTSC_1_0 - extraend = (u8 *) K0BASE + bootGetMemSize(); + extraend = (u8 *) K0BASE + boot_get_mem_size(); #else extraend = (u8 *) K0BASE + osGetMemSize(); #endif #if VERSION >= VERSION_NTSC_1_0 - if (bootGetMemSize() > 4 * 1024 * 1024) + if (boot_get_mem_size() > 4 * 1024 * 1024) #else if (osGetMemSize() > 4 * 1024 * 1024) #endif @@ -118,7 +118,7 @@ void mempSetHeap(u8 *heapstart, u32 heaplen) * If using the expansion pak, it's assumed that the onboard pool is full * so only the expansion pool is checked. */ -u32 mempGetStageFree(void) +u32 memp_get_stage_free(void) { u32 free; @@ -131,7 +131,7 @@ u32 mempGetStageFree(void) return free; } -void *mempGetNextStageAllocation(void) +void *memp_get_next_stage_allocation(void) { void *next; @@ -144,7 +144,7 @@ void *mempGetNextStageAllocation(void) return next; } -void *mempAllocFromBank(struct memorypool *pool, u32 size, u8 poolnum) +void *memp_alloc_from_bank(struct memorypool *pool, u32 size, u8 poolnum) { u8 *allocation; @@ -172,15 +172,15 @@ void *mempAllocFromBank(struct memorypool *pool, u32 size, u8 poolnum) return (void *)allocation; } -void *mempAlloc(u32 len, u8 pool) +void *memp_alloc(u32 len, u8 pool) { - void *allocation = mempAllocFromBank(g_MempOnboardPools, len, pool); + void *allocation = memp_alloc_from_bank(g_MempOnboardPools, len, pool); if (allocation) { return allocation; } - allocation = mempAllocFromBank(g_MempExpansionPools, len, pool); + allocation = memp_alloc_from_bank(g_MempExpansionPools, len, pool); if (allocation) { return allocation; @@ -195,16 +195,16 @@ void *mempAlloc(u32 len, u8 pool) u32 free; if (pool == MEMPOOL_STAGE) { - free = mempGetPoolFree(MEMPOOL_STAGE, MEMBANK_ONBOARD); - size = mempGetPoolSize(MEMPOOL_STAGE, MEMBANK_ONBOARD); + free = memp_get_pool_free(MEMPOOL_STAGE, MEMBANK_ONBOARD); + size = memp_get_pool_size(MEMPOOL_STAGE, MEMBANK_ONBOARD); sprintf(buffer, "Out of mem - LEV: %d f %d s %d", len, free, size); } else { - free = mempGetPoolFree(MEMPOOL_PERMANENT, MEMBANK_ONBOARD); - size = mempGetPoolSize(MEMPOOL_PERMANENT, MEMBANK_ONBOARD); + free = memp_get_pool_free(MEMPOOL_PERMANENT, MEMBANK_ONBOARD); + size = memp_get_pool_size(MEMPOOL_PERMANENT, MEMBANK_ONBOARD); sprintf(buffer, "Out of mem - ETR: %d f %d s %d", len, free, size); } - crashSetMessage(buffer); + crash_set_message(buffer); CRASH(); } #endif @@ -222,7 +222,7 @@ void *mempAlloc(u32 len, u8 pool) * @dangerous: This function does not check the limits of the memory pool. * If it allocates past the rightpos of the pool it could lead to memory corruption. */ -s32 mempRealloc(void *allocation, s32 newsize, u8 poolnum) +s32 memp_realloc(void *allocation, s32 newsize, u8 poolnum) { struct memorypool *pool = &g_MempOnboardPools[poolnum]; s32 origsize; @@ -257,7 +257,7 @@ void memp000124cc(void) /** * Return the amount of free space in the given pool and bank. */ -u32 mempGetPoolFree(u8 poolnum, u32 bank) +u32 memp_get_pool_free(u8 poolnum, u32 bank) { struct memorypool *pool; @@ -271,7 +271,7 @@ u32 mempGetPoolFree(u8 poolnum, u32 bank) } #ifdef DEBUG -u32 mempGetPoolSize(u8 poolnum, u32 bank) +u32 memp_get_pool_size(u8 poolnum, u32 bank) { struct memorypool *pool; @@ -286,9 +286,9 @@ u32 mempGetPoolSize(u8 poolnum, u32 bank) #endif #if VERSION < VERSION_NTSC_1_0 -void *mempAllocFromPackedWord(u32 word) +void *memp_alloc_from_packed_word(u32 word) { - return mempAlloc(word >> 4, word & 0x0f); + return memp_alloc(word >> 4, word & 0x0f); } #endif @@ -301,7 +301,7 @@ void *mempAllocFromPackedWord(u32 word) * * Note the right side is not reset here. */ -void mempResetPool(u8 pool) +void memp_reset_pool(u8 pool) { if (pool == MEMPOOL_STAGE) { g_MempOnboardPools[MEMPOOL_STAGE].start = g_MempOnboardPools[MEMPOOL_PERMANENT].leftpos; @@ -321,9 +321,9 @@ void mempResetPool(u8 pool) * * Setting rightpos to the end means it's resetting the right side and making * that available for allocations. It would have made more sense to do this in - * mempResetPool instead. + * memp_reset_pool instead. */ -void mempDisablePool(u8 pool) +void memp_disable_pool(u8 pool) { g_MempOnboardPools[pool].leftpos = 0; g_MempExpansionPools[pool].leftpos = 0; @@ -331,7 +331,7 @@ void mempDisablePool(u8 pool) g_MempExpansionPools[pool].rightpos = g_MempExpansionPools[pool].end; } -void *mempAllocFromBankRight(struct memorypool *pool, u32 size, u8 poolnum) +void *memp_alloc_from_bank_right(struct memorypool *pool, u32 size, u8 poolnum) { u8 *allocation; @@ -356,15 +356,15 @@ void *mempAllocFromBankRight(struct memorypool *pool, u32 size, u8 poolnum) return (void *)pool->rightpos; } -void *mempAllocFromRight(u32 len, u8 pool) +void *memp_alloc_from_right(u32 len, u8 pool) { - void *allocation = mempAllocFromBankRight(g_MempOnboardPools, len, pool); + void *allocation = memp_alloc_from_bank_right(g_MempOnboardPools, len, pool); if (allocation) { return allocation; } - allocation = mempAllocFromBankRight(g_MempExpansionPools, len, pool); + allocation = memp_alloc_from_bank_right(g_MempExpansionPools, len, pool); if (allocation) { return allocation; diff --git a/src/lib/model.c b/src/lib/model.c index f9a2a42ef..b133756c9 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -98,17 +98,17 @@ bool var8005efd8_2 = false; Vtx *(*g_ModelVtxAllocatorFunc)(s32 numvertices) = NULL; void (*g_ModelJointPositionedFunc)(s32 mtxindex, Mtxf *mtx) = NULL; -void modelSetDistanceChecksDisabled(bool disabled) +void model_set_distance_checks_disabled(bool disabled) { g_ModelDistanceDisabled = disabled; } -void modelSetDistanceScale(f32 scale) +void model_set_distance_scale(f32 scale) { g_ModelDistanceScale = scale; } -void modelSetVtxAllocatorFunc(Vtx *(*fn)(s32 numvertices)) +void model_set_vtx_allocator_func(Vtx *(*fn)(s32 numvertices)) { g_ModelVtxAllocatorFunc = fn; } @@ -120,7 +120,7 @@ void modelSetVtxAllocatorFunc(Vtx *(*fn)(s32 numvertices)) * Position nodes support up to 3 matrices. In this case the desired one can be * specified with arg1. */ -s32 modelFindNodeMtxIndex(struct modelnode *node, s32 arg1) +s32 model_find_node_mtx_index(struct modelnode *node, s32 arg1) { s32 index; union modelrodata *rodata1; @@ -146,9 +146,9 @@ s32 modelFindNodeMtxIndex(struct modelnode *node, s32 arg1) return -1; } -Mtxf *modelFindNodeMtx(struct model *model, struct modelnode *node, s32 arg2) +Mtxf *model_find_node_mtx(struct model *model, struct modelnode *node, s32 arg2) { - s32 index = modelFindNodeMtxIndex(node, arg2); + s32 index = model_find_node_mtx_index(node, arg2); if (index >= 0) { return &model->matrices[index]; @@ -157,12 +157,12 @@ Mtxf *modelFindNodeMtx(struct model *model, struct modelnode *node, s32 arg2) return NULL; } -Mtxf *modelGetRootMtx(struct model *model) +Mtxf *model_get_root_mtx(struct model *model) { - return modelFindNodeMtx(model, model->definition->rootnode, 0); + return model_find_node_mtx(model, model->definition->rootnode, 0); } -struct modelnode *modelFindNodeByMtxIndex(struct model *model, s32 mtxindex) +struct modelnode *model_find_node_by_mtx_index(struct model *model, s32 mtxindex) { struct modelnode *node = model->definition->rootnode; union modelrodata *rodata1; @@ -210,7 +210,7 @@ struct modelnode *modelFindNodeByMtxIndex(struct model *model, s32 mtxindex) return NULL; } -struct modelnode *modelNodeFindMtxNode(struct modelnode *node) +struct modelnode *model_node_find_mtx_node(struct modelnode *node) { while (node) { u32 type = node->type & 0xff; @@ -227,7 +227,7 @@ struct modelnode *modelNodeFindMtxNode(struct modelnode *node) return node; } -struct modelnode *modelNodeFindParentMtxNode(struct modelnode *node) +struct modelnode *model_node_find_parent_mtx_node(struct modelnode *node) { while ((node = node->parent)) { u32 type = node->type & 0xff; @@ -242,7 +242,7 @@ struct modelnode *modelNodeFindParentMtxNode(struct modelnode *node) return node; } -struct modelnode *modelNodeFindChildMtxNode(struct modelnode *basenode) +struct modelnode *model_node_find_child_mtx_node(struct modelnode *basenode) { struct modelnode *node = basenode->child; @@ -277,7 +277,7 @@ struct modelnode *modelNodeFindChildMtxNode(struct modelnode *basenode) return node; } -struct modelnode *modelNodeFindChildOrParentMtxNode(struct modelnode *basenode) +struct modelnode *model_node_find_child_or_parent_mtx_node(struct modelnode *basenode) { struct modelnode *node = basenode; struct modelnode *next; @@ -324,7 +324,7 @@ struct modelnode *modelNodeFindChildOrParentMtxNode(struct modelnode *basenode) return node; } -struct modelnode *modelGetPart(struct modeldef *modeldef, s32 partnum) +struct modelnode *model_get_part(struct modeldef *modeldef, s32 partnum) { s32 upper; s32 lower; @@ -356,9 +356,9 @@ struct modelnode *modelGetPart(struct modeldef *modeldef, s32 partnum) return NULL; } -void *modelGetPartRodata(struct modeldef *modeldef, s32 partnum) +void *model_get_part_rodata(struct modeldef *modeldef, s32 partnum) { - struct modelnode *node = modelGetPart(modeldef, partnum); + struct modelnode *node = model_get_part(modeldef, partnum); if (node) { return node->rodata; @@ -367,9 +367,9 @@ void *modelGetPartRodata(struct modeldef *modeldef, s32 partnum) return NULL; } -f32 modelGetScreenDistance(struct model *model) +f32 model_get_screen_distance(struct model *model) { - Mtxf *mtx = modelGetRootMtx(model); + Mtxf *mtx = model_get_root_mtx(model); if (mtx) { return -mtx->m[3][2]; @@ -380,7 +380,7 @@ f32 modelGetScreenDistance(struct model *model) #if VERSION >= VERSION_NTSC_1_0 // ntsc-beta has this function in another file -void *modelGetNodeRwData(struct model *model, struct modelnode *node) +void *model_get_node_rw_data(struct model *model, struct modelnode *node) { u32 index = 0; u32 *rwdatas = model->rwdatas; @@ -416,7 +416,7 @@ void *modelGetNodeRwData(struct model *model, struct modelnode *node) node = node->parent; if ((node->type & 0xff) == MODELNODETYPE_HEADSPOT) { - struct modelrwdata_headspot *tmp = modelGetNodeRwData(model, node); + struct modelrwdata_headspot *tmp = model_get_node_rw_data(model, node); rwdatas = tmp->rwdatas; break; } @@ -426,12 +426,12 @@ void *modelGetNodeRwData(struct model *model, struct modelnode *node) } #endif -void modelNodeGetPosition(struct model *model, struct modelnode *node, struct coord *pos) +void model_node_get_position(struct model *model, struct modelnode *node, struct coord *pos) { switch (node->type & 0xff) { case MODELNODETYPE_CHRINFO: { - struct modelrwdata_chrinfo *rwdata = modelGetNodeRwData(model, node); + struct modelrwdata_chrinfo *rwdata = model_get_node_rw_data(model, node); pos->x = rwdata->pos.x; pos->y = rwdata->pos.y; pos->z = rwdata->pos.z; @@ -461,12 +461,12 @@ void modelNodeGetPosition(struct model *model, struct modelnode *node, struct co } } -void modelNodeSetPosition(struct model *model, struct modelnode *node, struct coord *pos) +void model_node_set_position(struct model *model, struct modelnode *node, struct coord *pos) { switch (node->type & 0xff) { case MODELNODETYPE_CHRINFO: { - struct modelrwdata_chrinfo *rwdata = modelGetNodeRwData(model, node); + struct modelrwdata_chrinfo *rwdata = model_get_node_rw_data(model, node); struct coord diff[1]; diff[0].x = pos->x - rwdata->pos.x; @@ -501,17 +501,17 @@ void modelNodeSetPosition(struct model *model, struct modelnode *node, struct co } } -void modelGetRootPosition(struct model *model, struct coord *pos) +void model_get_root_position(struct model *model, struct coord *pos) { - modelNodeGetPosition(model, model->definition->rootnode, pos); + model_node_get_position(model, model->definition->rootnode, pos); } -void modelSetRootPosition(struct model *model, struct coord *pos) +void model_set_root_position(struct model *model, struct coord *pos) { - modelNodeSetPosition(model, model->definition->rootnode, pos); + model_node_set_position(model, model->definition->rootnode, pos); } -void modelNodeGetModelRelativePosition(struct model *model, struct modelnode *node, struct coord *pos) +void model_node_get_model_relative_position(struct model *model, struct modelnode *node, struct coord *pos) { pos->x = 0; pos->y = 0; @@ -524,7 +524,7 @@ void modelNodeGetModelRelativePosition(struct model *model, struct modelnode *no if (type == MODELNODETYPE_CHRINFO || type == MODELNODETYPE_POSITION || type == MODELNODETYPE_POSITIONHELD) { - modelNodeGetPosition(model, node, &nodepos); + model_node_get_position(model, node, &nodepos); pos->x += nodepos.x; pos->y += nodepos.y; pos->z += nodepos.z; @@ -534,20 +534,20 @@ void modelNodeGetModelRelativePosition(struct model *model, struct modelnode *no } } -f32 modelGetChrRotY(struct model *model) +f32 model_get_chr_rot_y(struct model *model) { if ((model->definition->rootnode->type & 0xff) == MODELNODETYPE_CHRINFO) { - union modelrwdata *rwdata = modelGetNodeRwData(model, model->definition->rootnode); + union modelrwdata *rwdata = model_get_node_rw_data(model, model->definition->rootnode); return rwdata->chrinfo.yrot; } return 0; } -void modelSetChrRotY(struct model *model, f32 angle) +void model_set_chr_rot_y(struct model *model, f32 angle) { if ((model->definition->rootnode->type & 0xff) == MODELNODETYPE_CHRINFO) { - struct modelrwdata_chrinfo *rwdata = modelGetNodeRwData(model, model->definition->rootnode); + struct modelrwdata_chrinfo *rwdata = model_get_node_rw_data(model, model->definition->rootnode); f32 diff = angle - rwdata->yrot; if (diff < 0) { @@ -570,31 +570,31 @@ void modelSetChrRotY(struct model *model, f32 angle) } } -void modelSetScale(struct model *model, f32 scale) +void model_set_scale(struct model *model, f32 scale) { model->scale = scale; } -void modelSetAnimScale(struct model *model, f32 scale) +void model_set_anim_scale(struct model *model, f32 scale) { if (model->anim) { model->anim->animscale = scale; } } -f32 modelGetEffectiveScale(struct model *model) +f32 model_get_effective_scale(struct model *model) { return model->definition->scale * model->scale; } -void modelTweenPos(struct coord *curpos, struct coord *goalpos, f32 frac) +void model_tween_pos(struct coord *curpos, struct coord *goalpos, f32 frac) { curpos->x += (goalpos->x - curpos->x) * frac; curpos->y += (goalpos->y - curpos->y) * frac; curpos->z += (goalpos->z - curpos->z) * frac; } -f32 modelTweenRotAxis(f32 curangle, f32 goalangle, f32 mult) +f32 model_tween_rot_axis(f32 curangle, f32 goalangle, f32 mult) { f32 diff = goalangle - curangle; @@ -619,14 +619,14 @@ f32 modelTweenRotAxis(f32 curangle, f32 goalangle, f32 mult) return curangle; } -void modelTweenRot(struct coord *currot, struct coord *goalrot, f32 mult) +void model_tween_rot(struct coord *currot, struct coord *goalrot, f32 mult) { - currot->x = modelTweenRotAxis(currot->x, goalrot->x, mult); - currot->y = modelTweenRotAxis(currot->y, goalrot->y, mult); - currot->z = modelTweenRotAxis(currot->z, goalrot->z, mult); + currot->x = model_tween_rot_axis(currot->x, goalrot->x, mult); + currot->y = model_tween_rot_axis(currot->y, goalrot->y, mult); + currot->z = model_tween_rot_axis(currot->z, goalrot->z, mult); } -void modelUpdateChrInfo(struct model *model, struct modelnode *node) +void model_update_chr_info(struct model *model, struct modelnode *node) { union modelrwdata *rwdata; struct anim *anim = model->anim; @@ -638,7 +638,7 @@ void modelUpdateChrInfo(struct model *model, struct modelnode *node) return; } - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); if (rwdata->chrinfo.unk00) { return; @@ -661,9 +661,9 @@ void modelUpdateChrInfo(struct model *model, struct modelnode *node) } if (frac != 0.0f && rwdata->chrinfo.unk01) { - modelTweenPos(&sp34, &rwdata->chrinfo.unk24, frac); + model_tween_pos(&sp34, &rwdata->chrinfo.unk24, frac); - rwdata->chrinfo.yrot = modelTweenRotAxis(rwdata->chrinfo.unk30, rwdata->chrinfo.unk20, frac); + rwdata->chrinfo.yrot = model_tween_rot_axis(rwdata->chrinfo.unk30, rwdata->chrinfo.unk20, frac); } if (anim->animnum2 || anim->fracmerge) { @@ -714,20 +714,20 @@ void modelUpdateChrInfo(struct model *model, struct modelnode *node) } } -void modelUpdateInfo(struct model *model) +void model_update_info(struct model *model) { struct modelnode *node = model->definition->rootnode; if (node && (node->type & 0xff) == MODELNODETYPE_CHRINFO) { - modelUpdateChrInfo(model, node); + model_update_chr_info(model, node); } } -void modelUpdateChrNodeMtx(struct modelrenderdata *arg0, struct model *model, struct modelnode *node) +void model_update_chr_node_mtx(struct modelrenderdata *arg0, struct model *model, struct modelnode *node) { struct anim *anim = model->anim; union modelrodata *rodata = node->rodata; - union modelrwdata *rwdata = modelGetNodeRwData(model, node); + union modelrwdata *rwdata = model_get_node_rw_data(model, node); f32 scale = model->scale; struct coord *sp254 = &rwdata->chrinfo.pos; f32 sp250 = rwdata->chrinfo.yrot; @@ -761,12 +761,12 @@ void modelUpdateChrNodeMtx(struct modelrenderdata *arg0, struct model *model, st if (rodata->chrinfo.mtxindex); if (node->parent) { - sp24c = modelFindNodeMtx(model, node->parent, 0); + sp24c = model_find_node_mtx(model, node->parent, 0); } else { sp24c = arg0->unk00; } - animGetRotTranslateScale(animpart, anim->flip, skel, anim->animnum, anim->frameslot1, &rot1, &translate1, &scale1); + anim_get_rot_translate_scale(animpart, anim->flip, skel, anim->animnum, anim->frameslot1, &rot1, &translate1, &scale1); if (g_Vars.in_cutscene && anim->speed > 0) { #if VERSION >= VERSION_PAL_BETA @@ -779,21 +779,21 @@ void modelUpdateChrNodeMtx(struct modelrenderdata *arg0, struct model *model, st } if (sp154 != 0.0f) { - animGetRotTranslateScale(animpart, anim->flip, skel, anim->animnum, anim->frameslot2, &rot2, &translate2, &scale2); - modelTweenRot(&rot1, &rot2, sp154); + anim_get_rot_translate_scale(animpart, anim->flip, skel, anim->animnum, anim->frameslot2, &rot2, &translate2, &scale2); + model_tween_rot(&rot1, &rot2, sp154); } if (anim->fracmerge != 0.0f) { - animGetRotTranslateScale(animpart, anim->flip2, skel, anim->animnum2, anim->frameslot3, &rot3, &translate3, &scale3); + anim_get_rot_translate_scale(animpart, anim->flip2, skel, anim->animnum2, anim->frameslot3, &rot3, &translate3, &scale3); if (anim->frac2 != 0.0f) { - animGetRotTranslateScale(animpart, anim->flip2, skel, anim->animnum2, anim->frameslot4, &rot4, &translate4, &scale4); - modelTweenRot(&rot3, &rot4, anim->frac2); + anim_get_rot_translate_scale(animpart, anim->flip2, skel, anim->animnum2, anim->frameslot4, &rot4, &translate4, &scale4); + model_tween_rot(&rot3, &rot4, anim->frac2); } if ((g_Anims[anim->animnum].flags & ANIMFLAG_ABSOLUTETRANSLATION) && (g_Anims[anim->animnum2].flags & ANIMFLAG_ABSOLUTETRANSLATION) == 0) { - mtx4LoadYRotation(rwdata->chrinfo.yrot, &sp78); - mtx4LoadRotation(&rot3, &sp38); + mtx4_load_y_rotation(rwdata->chrinfo.yrot, &sp78); + mtx4_load_rotation(&rot3, &sp38); mtx00015be0(&sp78, &sp38); quaternion0f097044(&sp38, spec); } else { @@ -802,20 +802,20 @@ void modelUpdateChrNodeMtx(struct modelrenderdata *arg0, struct model *model, st quaternion0f096ca0(&rot1, spfc); quaternion0f0976c0(spfc, spec); - quaternionSlerp(spfc, spec, anim->fracmerge, spdc); - quaternionToMtx(spdc, &sp1d8); + quaternion_slerp(spfc, spec, anim->fracmerge, spdc); + quaternion_to_mtx(spdc, &sp1d8); } else { - mtx4LoadRotation(&rot1, &sp1d8); + mtx4_load_rotation(&rot1, &sp1d8); } if (g_Anims[anim->animnum].flags & ANIMFLAG_ABSOLUTETRANSLATION) { - mtx4LoadTranslation(sp254, &sp198); + mtx4_load_translation(sp254, &sp198); } else { if (rwdata->chrinfo.unk18 != 0.0f) { - sp250 = modelTweenRotAxis(sp250, rwdata->chrinfo.unk1c, rwdata->chrinfo.unk18); + sp250 = model_tween_rot_axis(sp250, rwdata->chrinfo.unk1c, rwdata->chrinfo.unk18); } - mtx4LoadYRotationWithTranslation(sp254, sp250, &sp198); + mtx4_load_y_rotation_with_translation(sp254, sp250, &sp198); } mtx00015be4(&sp198, &sp1d8, &sp158); @@ -827,11 +827,11 @@ void modelUpdateChrNodeMtx(struct modelrenderdata *arg0, struct model *model, st if (sp24c) { mtx00015be4(sp24c, &sp158, mtx); } else { - mtx4Copy(&sp158, mtx); + mtx4_copy(&sp158, mtx); } } -void modelPositionJointUsingVecRot(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_vec_rot(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node, struct coord *rot, struct coord *pos, bool allowscale, struct coord *arg6) { s32 nodetype = node->type; struct modelrodata_position *rodata = &node->rodata->position; @@ -844,7 +844,7 @@ void modelPositionJointUsingVecRot(struct modelrenderdata *renderdata, struct mo Mtxf *matrices = model->matrices; if (node->parent != NULL) { - rendermtx = modelFindNodeMtx(model, node->parent, 0); + rendermtx = model_find_node_mtx(model, node->parent, 0); } else { rendermtx = renderdata->unk00; } @@ -852,7 +852,7 @@ void modelPositionJointUsingVecRot(struct modelrenderdata *renderdata, struct mo if (rendermtx != NULL) { Mtxf *nodemtx = &matrices[mtxindex0]; - mtx4LoadRotationAndTranslation(pos, rot, &mtx68); + mtx4_load_rotation_and_translation(pos, rot, &mtx68); if (allowscale && model->scale != 1.0f) { mtx00015f04(model->scale, &mtx68); @@ -878,7 +878,7 @@ void modelPositionJointUsingVecRot(struct modelrenderdata *renderdata, struct mo } else { Mtxf *nodemtx = &matrices[mtxindex0]; - mtx4LoadRotationAndTranslation(pos, rot, nodemtx); + mtx4_load_rotation_and_translation(pos, rot, nodemtx); if (allowscale && model->scale != 1.0f) { mtx00015f04(model->scale, nodemtx); @@ -906,10 +906,10 @@ void modelPositionJointUsingVecRot(struct modelrenderdata *renderdata, struct mo quaternion0f097518(sp3c, 0.5f, sp2c); if (rendermtx != NULL) { - quaternionToTransformMtx(pos, sp2c, &mtx68); + quaternion_to_transform_mtx(pos, sp2c, &mtx68); mtx00015be4(rendermtx, &mtx68, nodemtx); } else { - quaternionToTransformMtx(pos, sp2c, nodemtx); + quaternion_to_transform_mtx(pos, sp2c, nodemtx); } } @@ -923,7 +923,7 @@ void modelPositionJointUsingVecRot(struct modelrenderdata *renderdata, struct mo roty = M_BADTAU - (M_BADTAU - roty) * 0.5f; } - mtx4LoadYRotation(roty, finalmtx); + mtx4_load_y_rotation(roty, finalmtx); if (roty >= M_PI) { roty = M_BADTAU - roty; @@ -936,7 +936,7 @@ void modelPositionJointUsingVecRot(struct modelrenderdata *renderdata, struct mo } mtx00015edc(roty, finalmtx); - mtx4SetTranslation(pos, finalmtx); + mtx4_set_translation(pos, finalmtx); if (rendermtx != NULL) { Mtxf *nodemtx = &matrices[mtxindex2]; @@ -945,7 +945,7 @@ void modelPositionJointUsingVecRot(struct modelrenderdata *renderdata, struct mo } } -void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node, f32 rot[4], struct coord *pos, struct coord *arg5) +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) { s32 nodetype = node->type; struct modelrodata_position *rodata = &node->rodata->position; @@ -958,7 +958,7 @@ void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct m Mtxf *matrices = model->matrices; if (node->parent != NULL) { - rendermtx = modelFindNodeMtx(model, node->parent, 0); + rendermtx = model_find_node_mtx(model, node->parent, 0); } else { rendermtx = renderdata->unk00; } @@ -966,7 +966,7 @@ void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct m if (rendermtx != NULL) { Mtxf *nodemtx = &matrices[mtxindex0]; - quaternionToTransformMtx(pos, rot, &mtx58); + quaternion_to_transform_mtx(pos, rot, &mtx58); if (arg5->x != 1.0f) { mtx00015df0(arg5->x, &mtx58); @@ -988,7 +988,7 @@ void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct m } else { Mtxf *nodemtx = &matrices[mtxindex0]; - quaternionToTransformMtx(pos, rot, nodemtx); + quaternion_to_transform_mtx(pos, rot, nodemtx); if (arg5->x != 1.0f) { mtx00015df0(arg5->x, nodemtx); @@ -1010,10 +1010,10 @@ void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct m quaternion0f097518(rot, 0.5f, sp2c); if (rendermtx != NULL) { - quaternionToTransformMtx(pos, sp2c, &mtx58); + quaternion_to_transform_mtx(pos, sp2c, &mtx58); mtx00015be4(rendermtx, &mtx58, nodemtx); } else { - quaternionToTransformMtx(pos, sp2c, nodemtx); + quaternion_to_transform_mtx(pos, sp2c, nodemtx); } } @@ -1027,7 +1027,7 @@ void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct m roty = M_BADTAU - (M_BADTAU - roty) * 0.5f; } - mtx4LoadYRotation(roty, finalmtx); + mtx4_load_y_rotation(roty, finalmtx); if (roty >= M_PI) { roty = M_BADTAU - roty; @@ -1040,7 +1040,7 @@ void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct m } mtx00015edc(roty, finalmtx); - mtx4SetTranslation(pos, finalmtx); + mtx4_set_translation(pos, finalmtx); if (rendermtx != NULL) { Mtxf *nodemtx = &matrices[mtxindex2]; @@ -1049,7 +1049,7 @@ void modelPositionJointUsingQuatRot(struct modelrenderdata *renderdata, struct m } } -void modelUpdatePositionNodeMtx(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node) +void model_update_position_node_mtx(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node) { struct anim *anim; struct modelrodata_position *rodata = &node->rodata->position; @@ -1084,7 +1084,7 @@ void modelUpdatePositionNodeMtx(struct modelrenderdata *renderdata, struct model if (anim->animnum != 0) { sp128 = (g_Anims[anim->animnum].flags & ANIMFLAG_ABSOLUTETRANSLATION) && node == model->definition->rootnode; - animGetRotTranslateScale(animpart, anim->flip, skel, anim->animnum, anim->frameslot1, &rot1, &translate1, &scale1); + anim_get_rot_translate_scale(animpart, anim->flip, skel, anim->animnum, anim->frameslot1, &rot1, &translate1, &scale1); if (g_Vars.in_cutscene && anim->speed > 0.0f) { #if VERSION >= VERSION_PAL_BETA @@ -1097,8 +1097,8 @@ void modelUpdatePositionNodeMtx(struct modelrenderdata *renderdata, struct model } if (spe0 != 0.0f) { - animGetRotTranslateScale(animpart, anim->flip, skel, anim->animnum, anim->frameslot2, &rot2, &translate2, &scale2); - modelTweenRot(&rot1, &rot2, spe0); + anim_get_rot_translate_scale(animpart, anim->flip, skel, anim->animnum, anim->frameslot2, &rot2, &translate2, &scale2); + model_tween_rot(&rot1, &rot2, spe0); #if VERSION >= VERSION_PAL_BETA if (sp128 || var8005efd8_2) @@ -1106,7 +1106,7 @@ void modelUpdatePositionNodeMtx(struct modelrenderdata *renderdata, struct model if (sp128) #endif { - modelTweenPos(&translate1, &translate2, spe0); + model_tween_pos(&translate1, &translate2, spe0); } } } else { @@ -1118,17 +1118,17 @@ void modelUpdatePositionNodeMtx(struct modelrenderdata *renderdata, struct model } if (anim->fracmerge != 0.0f) { - animGetRotTranslateScale(animpart, anim->flip2, skel, anim->animnum2, anim->frameslot3, &rot3, &translate3, &scale3); + anim_get_rot_translate_scale(animpart, anim->flip2, skel, anim->animnum2, anim->frameslot3, &rot3, &translate3, &scale3); if (anim->frac2 != 0.0f) { - animGetRotTranslateScale(animpart, anim->flip2, skel, anim->animnum2, anim->frameslot4, &rot4, &translate4, &scale4); - modelTweenRot(&rot3, &rot4, anim->frac2); + anim_get_rot_translate_scale(animpart, anim->flip2, skel, anim->animnum2, anim->frameslot4, &rot4, &translate4, &scale4); + model_tween_rot(&rot3, &rot4, anim->frac2); } quaternion0f096ca0(&rot1, sp88); quaternion0f096ca0(&rot3, sp78); quaternion0f0976c0(sp88, sp78); - quaternionSlerp(sp88, sp78, anim->fracmerge, sp68); + quaternion_slerp(sp88, sp78, anim->fracmerge, sp68); if (translate1.f[0] != 0.0f || translate1.f[1] != 0.0f || translate1.f[2] != 0.0f) { translate1.x *= anim->animscale; @@ -1141,20 +1141,20 @@ void modelUpdatePositionNodeMtx(struct modelrenderdata *renderdata, struct model translate1.z += rodata->pos.z; } - modelPositionJointUsingQuatRot(renderdata, model, node, sp68, &translate1, &scale1); + model_position_joint_using_quat_rot(renderdata, model, node, sp68, &translate1, &scale1); } else if (node != model->definition->rootnode) { - modelPositionJointUsingQuatRot(renderdata, model, node, sp68, &rodata->pos, &scale1); + model_position_joint_using_quat_rot(renderdata, model, node, sp68, &rodata->pos, &scale1); } else { - modelPositionJointUsingQuatRot(renderdata, model, node, sp68, &translate1, &scale1); + model_position_joint_using_quat_rot(renderdata, model, node, sp68, &translate1, &scale1); } } else if (sp128) { - f32 mult = bgGetStageTranslationThing(); + f32 mult = bg_get_stage_translation_thing(); translate1.x *= mult; translate1.y *= mult; translate1.z *= mult; - modelPositionJointUsingVecRot(renderdata, model, node, &rot1, &translate1, true, &scale1); + model_position_joint_using_vec_rot(renderdata, model, node, &rot1, &translate1, true, &scale1); } else if (translate1.f[0] != 0.0f || translate1.f[1] != 0.0f || translate1.f[2] != 0.0f) { translate1.x *= anim->animscale; translate1.y *= anim->animscale; @@ -1166,29 +1166,29 @@ void modelUpdatePositionNodeMtx(struct modelrenderdata *renderdata, struct model translate1.z += rodata->pos.z; } - modelPositionJointUsingVecRot(renderdata, model, node, &rot1, &translate1, false, &scale1); + model_position_joint_using_vec_rot(renderdata, model, node, &rot1, &translate1, false, &scale1); } else if (node != model->definition->rootnode) { - modelPositionJointUsingVecRot(renderdata, model, node, &rot1, &rodata->pos, false, &scale1); + model_position_joint_using_vec_rot(renderdata, model, node, &rot1, &rodata->pos, false, &scale1); } else { - modelPositionJointUsingVecRot(renderdata, model, node, &rot1, &translate1, false, &scale1); + model_position_joint_using_vec_rot(renderdata, model, node, &rot1, &translate1, false, &scale1); } } else { if (node->parent) { - mtx = modelFindNodeMtx(model, node->parent, 0); + mtx = model_find_node_mtx(model, node->parent, 0); } else { mtx = renderdata->unk00; } if (mtx) { - mtx4LoadTranslation(&rodata->pos, &spe8); + mtx4_load_translation(&rodata->pos, &spe8); mtx00015be4(mtx, &spe8, &model->matrices[rodata->mtxindex0]); } else { - mtx4LoadTranslation(&rodata->pos, &model->matrices[rodata->mtxindex0]); + mtx4_load_translation(&rodata->pos, &model->matrices[rodata->mtxindex0]); } } } -void modelUpdatePositionHeldNodeMtx(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) { union modelrodata *rodata = node->rodata; Mtxf *sp68; @@ -1197,33 +1197,33 @@ void modelUpdatePositionHeldNodeMtx(struct modelrenderdata *arg0, struct model * Mtxf *matrices = model->matrices; if (node->parent) { - sp68 = modelFindNodeMtx(model, node->parent, 0); + sp68 = model_find_node_mtx(model, node->parent, 0); } else { sp68 = arg0->unk00; } if (sp68) { - mtx4LoadTranslation(&rodata->positionheld.pos, &sp28); + mtx4_load_translation(&rodata->positionheld.pos, &sp28); mtx00015be4(sp68, &sp28, &matrices[mtxindex]); } else { - mtx4LoadTranslation(&rodata->positionheld.pos, &matrices[mtxindex]); + mtx4_load_translation(&rodata->positionheld.pos, &matrices[mtxindex]); } } /** * For a distance node, set its target to visible based on distance. */ -void modelUpdateDistanceRelations(struct model *model, struct modelnode *node) +void model_update_distance_relations(struct model *model, struct modelnode *node) { union modelrodata *rodata = node->rodata; - union modelrwdata *rwdata = modelGetNodeRwData(model, node); - Mtxf *mtx = modelFindNodeMtx(model, node, 0); + union modelrwdata *rwdata = model_get_node_rw_data(model, node); + Mtxf *mtx = model_find_node_mtx(model, node, 0); f32 distance; if (g_ModelDistanceDisabled || !mtx) { distance = 0; } else { - distance = -mtx->m[3][2] * camGetLodScaleZ(); + distance = -mtx->m[3][2] * cam_get_lod_scale_z(); if (g_ModelDistanceScale != 1) { distance *= g_ModelDistanceScale; @@ -1242,10 +1242,10 @@ void modelUpdateDistanceRelations(struct model *model, struct modelnode *node) node->child = NULL; } -void modelApplyDistanceRelations(struct model *model, struct modelnode *node) +void model_apply_distance_relations(struct model *model, struct modelnode *node) { struct modelrodata_distance *rodata = &node->rodata->distance; - struct modelrwdata_distance *rwdata = modelGetNodeRwData(model, node); + struct modelrwdata_distance *rwdata = model_get_node_rw_data(model, node); if (rwdata->visible) { node->child = rodata->target; @@ -1254,10 +1254,10 @@ void modelApplyDistanceRelations(struct model *model, struct modelnode *node) } } -void modelApplyToggleRelations(struct model *model, struct modelnode *node) +void model_apply_toggle_relations(struct model *model, struct modelnode *node) { struct modelrodata_toggle *rodata = &node->rodata->toggle; - struct modelrwdata_toggle *rwdata = modelGetNodeRwData(model, node); + struct modelrwdata_toggle *rwdata = model_get_node_rw_data(model, node); if (rwdata->visible) { node->child = rodata->target; @@ -1271,9 +1271,9 @@ void modelApplyToggleRelations(struct model *model, struct modelnode *node) * * The given modelnode is assumed to be of type MODELNODETYPE_HEADSPOT. */ -void modelApplyHeadRelations(struct model *model, struct modelnode *bodynode) +void model_apply_head_relations(struct model *model, struct modelnode *bodynode) { - struct modelrwdata_headspot *rwdata = modelGetNodeRwData(model, bodynode); + struct modelrwdata_headspot *rwdata = model_get_node_rw_data(model, bodynode); if (rwdata->headmodeldef) { struct modelnode *headnode = rwdata->headmodeldef->rootnode; @@ -1287,7 +1287,7 @@ void modelApplyHeadRelations(struct model *model, struct modelnode *bodynode) } } -void modelApplyReorderRelationsByArg(struct modelnode *basenode, bool reverse) +void model_apply_reorder_relations_by_arg(struct modelnode *basenode, bool reverse) { union modelrodata *rodata = basenode->rodata; struct modelnode *node1; @@ -1341,18 +1341,18 @@ void modelApplyReorderRelationsByArg(struct modelnode *basenode, bool reverse) } } -void modelApplyReorderRelations(struct model *model, struct modelnode *node) +void model_apply_reorder_relations(struct model *model, struct modelnode *node) { - union modelrwdata *rwdata = modelGetNodeRwData(model, node); + union modelrwdata *rwdata = model_get_node_rw_data(model, node); - modelApplyReorderRelationsByArg(node, rwdata->reorder.reverse); + model_apply_reorder_relations_by_arg(node, rwdata->reorder.reverse); } -void modelUpdateReorderRelations(struct model *model, struct modelnode *node) +void model_update_reorder_relations(struct model *model, struct modelnode *node) { union modelrodata *rodata = node->rodata; - union modelrwdata *rwdata = modelGetNodeRwData(model, node); - Mtxf *mtx = modelFindNodeMtx(model, node, 0); + union modelrwdata *rwdata = model_get_node_rw_data(model, node); + Mtxf *mtx = model_find_node_mtx(model, node, 0); struct coord sp38; struct coord sp2c; f32 tmp; @@ -1361,7 +1361,7 @@ void modelUpdateReorderRelations(struct model *model, struct modelnode *node) sp38.x = rodata->reorder.unk0c[0]; sp38.y = rodata->reorder.unk0c[1]; sp38.z = rodata->reorder.unk0c[2]; - mtx4RotateVecInPlace(mtx, &sp38); + mtx4_rotate_vec_in_place(mtx, &sp38); } else if (rodata->reorder.side == 2) { sp38.x = mtx->m[1][0] * rodata->reorder.unk0c[1]; sp38.y = mtx->m[1][1] * rodata->reorder.unk0c[1]; @@ -1380,7 +1380,7 @@ void modelUpdateReorderRelations(struct model *model, struct modelnode *node) sp2c.y = rodata->reorder.unk04; sp2c.z = rodata->reorder.unk08; - mtx4TransformVecInPlace(mtx, &sp2c); + mtx4_transform_vec_in_place(mtx, &sp2c); tmp = sp38.f[0] * sp2c.f[0] + sp38.f[1] * sp2c.f[1] + sp38.f[2] * sp2c.f[2]; @@ -1390,7 +1390,7 @@ void modelUpdateReorderRelations(struct model *model, struct modelnode *node) rwdata->reorder.reverse = false; } - modelApplyReorderRelations(model, node); + model_apply_reorder_relations(model, node); } /** @@ -1400,7 +1400,7 @@ void modelUpdateReorderRelations(struct model *model, struct modelnode *node) * However, several node types are not descended into, and toggle nodes are not * applied to the model definition. */ -void modelUpdateRelationsQuick(struct model *model, struct modelnode *parent) +void model_update_relations_quick(struct model *model, struct modelnode *parent) { struct modelnode *node = parent->child; @@ -1422,13 +1422,13 @@ void modelUpdateRelationsQuick(struct model *model, struct modelnode *parent) dochildren = false; break; case MODELNODETYPE_DISTANCE: - modelUpdateDistanceRelations(model, node); + model_update_distance_relations(model, node); break; case MODELNODETYPE_REORDER: - modelUpdateReorderRelations(model, node); + model_update_reorder_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; case MODELNODETYPE_DL: break; @@ -1458,7 +1458,7 @@ void modelUpdateRelationsQuick(struct model *model, struct modelnode *parent) * Update a model definition's node relations based on the rwdata from the given * model instance, recalculating the rwdata where possible. */ -void modelUpdateRelations(struct model *model) +void model_update_relations(struct model *model) { struct modelnode *node = model->definition->rootnode; @@ -1467,16 +1467,16 @@ void modelUpdateRelations(struct model *model) switch (type) { case MODELNODETYPE_DISTANCE: - modelUpdateDistanceRelations(model, node); + model_update_distance_relations(model, node); break; case MODELNODETYPE_REORDER: - modelUpdateReorderRelations(model, node); + model_update_reorder_relations(model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, node); + model_apply_toggle_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; case MODELNODETYPE_CHRINFO: case MODELNODETYPE_DL: @@ -1499,7 +1499,7 @@ void modelUpdateRelations(struct model *model) } } -void modelUpdateMatrices(struct modelrenderdata *arg0, struct model *model) +void model_update_matrices(struct modelrenderdata *arg0, struct model *model) { struct modelnode *node = model->definition->rootnode; @@ -1508,25 +1508,25 @@ void modelUpdateMatrices(struct modelrenderdata *arg0, struct model *model) switch (type) { case MODELNODETYPE_CHRINFO: - modelUpdateChrNodeMtx(arg0, model, node); + model_update_chr_node_mtx(arg0, model, node); break; case MODELNODETYPE_POSITION: - modelUpdatePositionNodeMtx(arg0, model, node); + model_update_position_node_mtx(arg0, model, node); break; case MODELNODETYPE_POSITIONHELD: - modelUpdatePositionHeldNodeMtx(arg0, model, node); + model_update_position_held_node_mtx(arg0, model, node); break; case MODELNODETYPE_DISTANCE: - modelUpdateDistanceRelations(model, node); + model_update_distance_relations(model, node); break; case MODELNODETYPE_REORDER: - modelUpdateReorderRelations(model, node); + model_update_reorder_relations(model, node); break; case MODELNODETYPE_TOGGLE: - modelApplyToggleRelations(model, node); + model_apply_toggle_relations(model, node); break; case MODELNODETYPE_HEADSPOT: - modelApplyHeadRelations(model, node); + model_apply_head_relations(model, node); break; case MODELNODETYPE_DL: default: @@ -1548,7 +1548,7 @@ void modelUpdateMatrices(struct modelrenderdata *arg0, struct model *model) } } -void modelSetMatrices(struct modelrenderdata *renderdata, struct model *model) +void model_set_matrices(struct modelrenderdata *renderdata, struct model *model) { model->matrices = renderdata->unk10; @@ -1556,16 +1556,16 @@ void modelSetMatrices(struct modelrenderdata *renderdata, struct model *model) #if VERSION >= VERSION_PAL_BETA if (var8005efb0_2 || !modelasm00018680(renderdata, model)) { - modelUpdateMatrices(renderdata, model); + model_update_matrices(renderdata, model); } #else if (!modelasm00018680(renderdata, model)) { - modelUpdateMatrices(renderdata, model); + model_update_matrices(renderdata, model); } #endif } -void modelSetMatricesWithAnim(struct modelrenderdata *renderdata, struct model *model) +void model_set_matrices_with_anim(struct modelrenderdata *renderdata, struct model *model) { struct anim *anim = model->anim; f32 speed; @@ -1588,26 +1588,26 @@ void modelSetMatricesWithAnim(struct modelrenderdata *renderdata, struct model * } } - animLoadHeader(anim->animnum); - anim->frameslot1 = animLoadFrame(anim->animnum, anim->framea); + anim_load_header(anim->animnum); + anim->frameslot1 = anim_load_frame(anim->animnum, anim->framea); if (anim->frac != 0) { - anim->frameslot2 = animLoadFrame(anim->animnum, anim->frameb); + anim->frameslot2 = anim_load_frame(anim->animnum, anim->frameb); } if (anim->animnum2) { - animLoadHeader(anim->animnum2); - anim->frameslot3 = animLoadFrame(anim->animnum2, anim->frame2a); + anim_load_header(anim->animnum2); + anim->frameslot3 = anim_load_frame(anim->animnum2, anim->frame2a); if (anim->frac2 != 0) { - anim->frameslot4 = animLoadFrame(anim->animnum2, anim->frame2b); + anim->frameslot4 = anim_load_frame(anim->animnum2, anim->frame2b); } } - animForgetFrameBirths(); + anim_forget_frame_births(); } - modelSetMatrices(renderdata, model); + model_set_matrices(renderdata, model); if (PLAYERCOUNT() >= 2 && anim && anim->animnum) { anim->frac = frac; @@ -1615,7 +1615,7 @@ void modelSetMatricesWithAnim(struct modelrenderdata *renderdata, struct model * } } -s16 modelGetAnimNum(struct model *model) +s16 model_get_anim_num(struct model *model) { if (model->anim) { return model->anim->animnum; @@ -1624,7 +1624,7 @@ s16 modelGetAnimNum(struct model *model) return 0; } -bool modelIsFlipped(struct model *model) +bool model_is_flipped(struct model *model) { if (model->anim) { return model->anim->flip; @@ -1633,7 +1633,7 @@ bool modelIsFlipped(struct model *model) return false; } -f32 modelGetCurAnimFrame(struct model *model) +f32 model_get_cur_anim_frame(struct model *model) { if (model->anim) { return model->anim->frame; @@ -1642,7 +1642,7 @@ f32 modelGetCurAnimFrame(struct model *model) return 0; } -f32 modelGetAnimEndFrame(struct model *model) +f32 model_get_anim_end_frame(struct model *model) { struct anim *anim = model->anim; @@ -1652,7 +1652,7 @@ f32 modelGetAnimEndFrame(struct model *model) } if (anim->animnum) { - return animGetNumFrames(anim->animnum) - 1; + return anim_get_num_frames(anim->animnum) - 1; } else { return 0; } @@ -1661,16 +1661,16 @@ f32 modelGetAnimEndFrame(struct model *model) return 0; } -s32 modelGetNumAnimFrames(struct model *model) +s32 model_get_num_anim_frames(struct model *model) { if (model->anim) { - return animGetNumFrames(modelGetAnimNum(model)); + return anim_get_num_frames(model_get_anim_num(model)); } return 0; } -f32 modelGetAnimSpeed(struct model *model) +f32 model_get_anim_speed(struct model *model) { if (model->anim) { return model->anim->speed; @@ -1679,7 +1679,7 @@ f32 modelGetAnimSpeed(struct model *model) return 1; } -f32 modelGetAbsAnimSpeed(struct model *model) +f32 model_get_abs_anim_speed(struct model *model) { f32 speed; @@ -1696,10 +1696,10 @@ f32 modelGetAbsAnimSpeed(struct model *model) return 1; } -f32 modelGetEffectiveAnimSpeed(struct model *model) +f32 model_get_effective_anim_speed(struct model *model) { if (model->anim) { - return modelGetAnimSpeed(model) * model->anim->playspeed; + return model_get_anim_speed(model) * model->anim->playspeed; } return 1; @@ -1709,28 +1709,28 @@ f32 modelGetEffectiveAnimSpeed(struct model *model) * Constrain the given frame number to the bounds of the animation, unless the * animation is looping in which case wrap it to the other side. */ -s32 modelConstrainOrWrapAnimFrame(s32 frame, s16 animnum, f32 endframe) +s32 model_constrain_or_wrap_anim_frame(s32 frame, s16 animnum, f32 endframe) { if (frame < 0) { if (var8005efbc || (g_Anims[animnum].flags & ANIMFLAG_LOOP)) { - frame = animGetNumFrames(animnum) - (-frame % animGetNumFrames(animnum)); + frame = anim_get_num_frames(animnum) - (-frame % anim_get_num_frames(animnum)); } else { frame = 0; } } else if (endframe >= 0 && frame > (s32)endframe) { frame = ceil(endframe); - } else if (frame >= animGetNumFrames(animnum)) { + } else if (frame >= anim_get_num_frames(animnum)) { if (var8005efbc || (g_Anims[animnum].flags & ANIMFLAG_LOOP)) { - frame = frame % animGetNumFrames(animnum); + frame = frame % anim_get_num_frames(animnum); } else { - frame = animGetNumFrames(animnum) - 1; + frame = anim_get_num_frames(animnum) - 1; } } return frame; } -void modelCopyAnimForMerge(struct model *model, f32 merge) +void model_copy_anim_for_merge(struct model *model, f32 merge) { struct anim *anim = model->anim; struct modelnode *node; @@ -1759,7 +1759,7 @@ void modelCopyAnimForMerge(struct model *model, f32 merge) anim->endframe2 = anim->endframe; if (nodetype == MODELNODETYPE_CHRINFO) { - struct modelrwdata_chrinfo *rwdata = modelGetNodeRwData(model, node); + struct modelrwdata_chrinfo *rwdata = model_get_node_rw_data(model, node); rwdata->unk02 = 1; rwdata->unk4c.x = rwdata->unk34.x; rwdata->unk4c.y = rwdata->unk34.y; @@ -1774,7 +1774,7 @@ void modelCopyAnimForMerge(struct model *model, f32 merge) } } -void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge) +void model_set_animation2(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge) { struct anim *anim = model->anim; @@ -1797,7 +1797,7 @@ void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartfr anim->speed = speed; anim->timespeed = 0; - modelSetAnimFrame(model, fstartframe); + model_set_anim_frame(model, fstartframe); anim->looping = false; @@ -1806,7 +1806,7 @@ void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartfr if (type == MODELNODETYPE_CHRINFO) { u32 stack; struct modelrodata_chrinfo *rodata = &model->definition->rootnode->rodata->chrinfo; - struct modelrwdata_chrinfo *rwdata = (struct modelrwdata_chrinfo *) modelGetNodeRwData(model, model->definition->rootnode); + struct modelrwdata_chrinfo *rwdata = (struct modelrwdata_chrinfo *) model_get_node_rw_data(model, model->definition->rootnode); s32 animpart = rodata->animpart; struct skeleton *skel = model->definition->skel; f32 scale; @@ -1826,11 +1826,11 @@ void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartfr f32 z; if (g_Anims[anim->animnum].flags & ANIMFLAG_ABSOLUTETRANSLATION) { - sp64 = bgGetStageTranslationThing(); - animLoadHeader(anim->animnum); - frameslot = animLoadFrame(anim->animnum, anim->framea); - animForgetFrameBirths(); - animGetRotTranslateScale(animpart, anim->flip, skel, anim->animnum, frameslot, &rot1, &translate, &scale1); + sp64 = bg_get_stage_translation_thing(); + anim_load_header(anim->animnum); + frameslot = anim_load_frame(anim->animnum, anim->framea); + anim_forget_frame_births(); + anim_get_rot_translate_scale(animpart, anim->flip, skel, anim->animnum, frameslot, &rot1, &translate, &scale1); rwdata->unk34.x = translate.x * sp64; rwdata->unk34.y = translate.y * sp64; @@ -1840,10 +1840,10 @@ void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartfr if (anim->frac == 0) { rwdata->unk01 = 0; } else { - animLoadHeader(anim->animnum); - frameslot = animLoadFrame(anim->animnum, anim->frameb); - animForgetFrameBirths(); - animGetRotTranslateScale(animpart, anim->flip, skel, anim->animnum, frameslot, &rot1, &translate, &scale1); + anim_load_header(anim->animnum); + frameslot = anim_load_frame(anim->animnum, anim->frameb); + anim_forget_frame_births(); + anim_get_rot_translate_scale(animpart, anim->flip, skel, anim->animnum, frameslot, &rot1, &translate, &scale1); rwdata->unk24.x = translate.x * sp64; rwdata->unk24.y = translate.y * sp64; @@ -1853,7 +1853,7 @@ void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartfr rwdata->unk01 = 1; } } else { - sp84 = animGetTranslateAngle(animpart, anim->flip, skel, anim->animnum, anim->frameb, &translate, anim->average); + sp84 = anim_get_translate_angle(animpart, anim->flip, skel, anim->animnum, anim->frameb, &translate, anim->average); scale = model->scale * anim->animscale; if (scale != 1) { @@ -1916,7 +1916,7 @@ void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartfr angle += M_BADTAU; } - rwdata->unk30 = modelTweenRotAxis(rwdata->yrot, angle, anim->frac); + rwdata->unk30 = model_tween_rot_axis(rwdata->yrot, angle, anim->frac); if (rwdata->unk18 == 0) { rwdata->unk20 = rwdata->unk30 + sp84; @@ -1937,7 +1937,7 @@ void modelSetAnimation2(struct model *model, s16 animnum, s32 flip, f32 fstartfr } } -bool modelIsAnimMerging(struct model *model) +bool model_is_anim_merging(struct model *model) { if (model && model->anim && model->anim->animnum2 && model->anim->fracmerge != 0 && model->anim->fracmerge != 1) { @@ -1947,7 +1947,7 @@ bool modelIsAnimMerging(struct model *model) return false; } -void modelSetAnimationWithMerge(struct model *model, s16 animnum, u32 flip, f32 startframe, f32 speed, f32 timemerge, bool domerge) +void model_set_animation_with_merge(struct model *model, s16 animnum, u32 flip, f32 startframe, f32 speed, f32 timemerge, bool domerge) { if (model) { if (model->anim && model->anim->animnum @@ -1957,14 +1957,14 @@ void modelSetAnimationWithMerge(struct model *model, s16 animnum, u32 flip, f32 } if (domerge) { - modelCopyAnimForMerge(model, timemerge); + model_copy_anim_for_merge(model, timemerge); } - modelSetAnimation2(model, animnum, flip, startframe, speed, timemerge); + model_set_animation2(model, animnum, flip, startframe, speed, timemerge); } } -void modelSetAnimation(struct model *model, s16 animnum, s32 flip, f32 startframe, f32 speed, f32 merge) +void model_set_animation(struct model *model, s16 animnum, s32 flip, f32 startframe, f32 speed, f32 merge) { if (model) { if (model->anim && model->anim->animnum @@ -1973,19 +1973,19 @@ void modelSetAnimation(struct model *model, s16 animnum, s32 flip, f32 startfram merge = 0; } - modelCopyAnimForMerge(model, merge); - modelSetAnimation2(model, animnum, flip, startframe, speed, merge); + model_copy_anim_for_merge(model, merge); + model_set_animation2(model, animnum, flip, startframe, speed, merge); } } -void modelCopyAnimData(struct model *src, struct model *dst) +void model_copy_anim_data(struct model *src, struct model *dst) { if (src->anim && dst->anim) { *dst->anim = *src->anim; } } -void modelSetAnimLooping(struct model *model, f32 loopframe, f32 loopmerge) +void model_set_anim_looping(struct model *model, f32 loopframe, f32 loopmerge) { if (model->anim) { model->anim->looping = true; @@ -1994,12 +1994,12 @@ void modelSetAnimLooping(struct model *model, f32 loopframe, f32 loopmerge) } } -void modelSetAnimEndFrame(struct model *model, f32 endframe) +void model_set_anim_end_frame(struct model *model, f32 endframe) { struct anim *anim = model->anim; if (anim) { - if (anim->animnum && endframe < animGetNumFrames(anim->animnum) - 1) { + if (anim->animnum && endframe < anim_get_num_frames(anim->animnum) - 1) { anim->endframe = endframe; } else { anim->endframe = -1; @@ -2007,7 +2007,7 @@ void modelSetAnimEndFrame(struct model *model, f32 endframe) } } -void modelSetAnimFlipFunction(struct model *model, void *callback) +void model_set_anim_flip_function(struct model *model, void *callback) { if (model->anim) { model->anim->flipfunc = callback; @@ -2015,7 +2015,7 @@ void modelSetAnimFlipFunction(struct model *model, void *callback) } #if VERSION < VERSION_NTSC_1_0 -void modelSetAnimUnk6c(struct model *model, s32 value) +void model_set_anim_unk6c(struct model *model, s32 value) { if (model->anim) { model->anim->unk6c = value; @@ -2023,7 +2023,7 @@ void modelSetAnimUnk6c(struct model *model, s32 value) } #endif -void modelSetAnimSpeed(struct model *model, f32 speed, f32 startframe) +void model_set_anim_speed(struct model *model, f32 speed, f32 startframe) { struct anim *anim = model->anim; @@ -2040,7 +2040,7 @@ void modelSetAnimSpeed(struct model *model, f32 speed, f32 startframe) } } -void modelSetAnimSpeedAuto(struct model *model, f32 arg1, f32 startframe) +void model_set_anim_speed_auto(struct model *model, f32 arg1, f32 startframe) { struct anim *anim = model->anim; f32 tmp; @@ -2050,16 +2050,16 @@ void modelSetAnimSpeedAuto(struct model *model, f32 arg1, f32 startframe) if (anim->frame <= arg1) { tmp = arg1 - anim->frame; } else { - tmp = animGetNumFrames(anim->animnum) - anim->frame + arg1; + tmp = anim_get_num_frames(anim->animnum) - anim->frame + arg1; } speed = anim->speed + (tmp + tmp) / startframe; - modelSetAnimSpeed(model, speed, startframe); + model_set_anim_speed(model, speed, startframe); } } -void modelSetAnimPlaySpeed(struct model *model, f32 speed, f32 startframe) +void model_set_anim_play_speed(struct model *model, f32 speed, f32 startframe) { struct anim *anim = model->anim; @@ -2076,14 +2076,14 @@ void modelSetAnimPlaySpeed(struct model *model, f32 speed, f32 startframe) } } -void modelSetAnim70(struct model *model, void *callback) +void model_set_anim70(struct model *model, void *callback) { if (model->anim) { model->anim->unk70 = callback; } } -void modelSetAnimFrame(struct model *model, f32 frame) +void model_set_anim_frame(struct model *model, f32 frame) { s32 framea; s32 frameb; @@ -2096,8 +2096,8 @@ void modelSetAnimFrame(struct model *model, f32 frame) frameb = (forwards ? framea + 1 : framea - 1); - anim->framea = modelConstrainOrWrapAnimFrame(framea, anim->animnum, anim->endframe); - anim->frameb = modelConstrainOrWrapAnimFrame(frameb, anim->animnum, anim->endframe); + anim->framea = model_constrain_or_wrap_anim_frame(framea, anim->animnum, anim->endframe); + anim->frameb = model_constrain_or_wrap_anim_frame(frameb, anim->animnum, anim->endframe); if (anim->framea == anim->frameb) { anim->frac = 0; @@ -2112,12 +2112,12 @@ void modelSetAnimFrame(struct model *model, f32 frame) } } -void modelSetAnimFrame2(struct model *model, f32 frame1, f32 frame2) +void model_set_anim_frame2(struct model *model, f32 frame1, f32 frame2) { struct anim *anim = model->anim; if (anim) { - modelSetAnimFrame(model, frame1); + model_set_anim_frame(model, frame1); if (anim->animnum2) { s32 framea = floor(frame2); @@ -2126,8 +2126,8 @@ void modelSetAnimFrame2(struct model *model, f32 frame1, f32 frame2) frameb = (forwards ? framea + 1 : framea - 1); - anim->frame2a = modelConstrainOrWrapAnimFrame(framea, anim->animnum2, anim->endframe2); - anim->frame2b = modelConstrainOrWrapAnimFrame(frameb, anim->animnum2, anim->endframe2); + anim->frame2a = model_constrain_or_wrap_anim_frame(framea, anim->animnum2, anim->endframe2); + anim->frame2b = model_constrain_or_wrap_anim_frame(frameb, anim->animnum2, anim->endframe2); if (anim->frame2a == anim->frame2b) { anim->frac2 = 0; @@ -2145,17 +2145,17 @@ void modelSetAnimFrame2(struct model *model, f32 frame1, f32 frame2) bool g_ModelAnimMergingEnabled = true; -void modelSetAnimMergingEnabled(bool value) +void model_set_anim_merging_enabled(bool value) { g_ModelAnimMergingEnabled = value; } -bool modelIsAnimMergingEnabled(void) +bool model_is_anim_merging_enabled(void) { return g_ModelAnimMergingEnabled; } -void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endframe, f32 curframe2, f32 endframe2) +void model_set_anim_frame2_with_chr_stuff(struct model *model, f32 curframe, f32 endframe, f32 curframe2, f32 endframe2) { struct anim *anim = model->anim; @@ -2165,7 +2165,7 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr if ((nodetype & 0xff) == MODELNODETYPE_CHRINFO) { struct modelrodata_chrinfo *rodata = &rootnode->rodata->chrinfo; - struct modelrwdata_chrinfo *rwdata = modelGetNodeRwData(model, rootnode); + struct modelrwdata_chrinfo *rwdata = model_get_node_rw_data(model, rootnode); if (rwdata->unk00 == 0) { s32 animpart = rodata->animpart; @@ -2233,10 +2233,10 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr } if (g_Anims[anim->animnum].flags & ANIMFLAG_ABSOLUTETRANSLATION) { - f20 = bgGetStageTranslationThing(); + f20 = bg_get_stage_translation_thing(); if (floorend != anim->framea) { - s0frame = modelConstrainOrWrapAnimFrame(floorend, anim->animnum, anim->endframe); + s0frame = model_constrain_or_wrap_anim_frame(floorend, anim->animnum, anim->endframe); anim->framea = s0frame; @@ -2245,10 +2245,10 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr spe0.y = spd0.y; spe0.z = spd0.z; } else { - animLoadHeader(anim->animnum); - frameslot = animLoadFrame(anim->animnum, s0frame); - animForgetFrameBirths(); - animGetRotTranslateScale(animpart, anim->flip, skel, anim->animnum, frameslot, &rot1, &translate, &scale1); + anim_load_header(anim->animnum); + frameslot = anim_load_frame(anim->animnum, s0frame); + anim_forget_frame_births(); + anim_get_rot_translate_scale(animpart, anim->flip, skel, anim->animnum, frameslot, &rot1, &translate, &scale1); spe0.x = translate.x * f20; spe0.y = translate.y * f20; @@ -2263,14 +2263,14 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr floorcur--; } - s0frame = modelConstrainOrWrapAnimFrame(floorcur, anim->animnum, anim->endframe); + s0frame = model_constrain_or_wrap_anim_frame(floorcur, anim->animnum, anim->endframe); anim->frameb = s0frame; - animLoadHeader(anim->animnum); - frameslot = animLoadFrame(anim->animnum, s0frame); + anim_load_header(anim->animnum); + frameslot = anim_load_frame(anim->animnum, s0frame); - animForgetFrameBirths(); - animGetRotTranslateScale(animpart, anim->flip, skel, anim->animnum, frameslot, &rot1, &translate, &scale1); + anim_forget_frame_births(); + anim_get_rot_translate_scale(animpart, anim->flip, skel, anim->animnum, frameslot, &rot1, &translate, &scale1); spc8 = true; @@ -2290,7 +2290,7 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr } } - s0frame = modelConstrainOrWrapAnimFrame(floorcur, anim->animnum, anim->endframe); + s0frame = model_constrain_or_wrap_anim_frame(floorcur, anim->animnum, anim->endframe); anim->framea = s0frame; @@ -2303,7 +2303,7 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr f30 = spcc; } } else { - f22 = animGetTranslateAngle(animpart, anim->flip, skel, anim->animnum, s0frame, &translate, anim->average); + f22 = anim_get_translate_angle(animpart, anim->flip, skel, anim->animnum, s0frame, &translate, anim->average); if (scale != 1.0f) { translate.x *= scale; @@ -2346,11 +2346,11 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr floorcur--; } - s0frame = modelConstrainOrWrapAnimFrame(floorcur, anim->animnum, anim->endframe); + s0frame = model_constrain_or_wrap_anim_frame(floorcur, anim->animnum, anim->endframe); anim->frameb = s0frame; if (anim->frameb != anim->framea) { - f22 = animGetTranslateAngle(animpart, anim->flip, skel, anim->animnum, s0frame, &translate, anim->average); + f22 = anim_get_translate_angle(animpart, anim->flip, skel, anim->animnum, s0frame, &translate, anim->average); spc8 = true; @@ -2474,12 +2474,12 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr rwdata->unk4c.f[1] = rwdata->unk34.f[1]; } - anim->frame2a = modelConstrainOrWrapAnimFrame(floorend2, anim->animnum2, anim->endframe2); + anim->frame2a = model_constrain_or_wrap_anim_frame(floorend2, anim->animnum2, anim->endframe2); - s0frame = modelConstrainOrWrapAnimFrame(floorend2 + 1, anim->animnum2, anim->endframe2); + s0frame = model_constrain_or_wrap_anim_frame(floorend2 + 1, anim->animnum2, anim->endframe2); anim->frame2b = s0frame; - animGetTranslateAngle(animpart, anim->flip2, skel, anim->animnum2, s0frame, &translate, anim->average); + anim_get_translate_angle(animpart, anim->flip2, skel, anim->animnum2, s0frame, &translate, anim->average); if (scale != 1.0f) { translate.y *= scale; @@ -2504,15 +2504,15 @@ void modelSetAnimFrame2WithChrStuff(struct model *model, f32 curframe, f32 endfr rwdata->unk02 = 0; } } else { - modelSetAnimFrame2(model, endframe, endframe2); + model_set_anim_frame2(model, endframe, endframe2); } } else { - modelSetAnimFrame2(model, endframe, endframe2); + model_set_anim_frame2(model, endframe, endframe2); } } } -void modelTickAnimQuarterSpeed(struct model *model, s32 lvupdate240, bool arg2) +void model_tick_anim_quarter_speed(struct model *model, s32 lvupdate240, bool arg2) { f32 frame; f32 frame2; @@ -2589,7 +2589,7 @@ void modelTickAnimQuarterSpeed(struct model *model, s32 lvupdate240, bool arg2) realendframe = anim->endframe; if (speed >= 0) { - endframe = animGetNumFrames(anim->animnum) - 1; + endframe = anim_get_num_frames(anim->animnum) - 1; startframe = anim->loopframe; if (realendframe >= 0 && endframe > realendframe) { @@ -2597,7 +2597,7 @@ void modelTickAnimQuarterSpeed(struct model *model, s32 lvupdate240, bool arg2) } } else { endframe = anim->loopframe; - startframe = animGetNumFrames(anim->animnum) - 1; + startframe = anim_get_num_frames(anim->animnum) - 1; if (realendframe >= 0 && startframe > realendframe) { startframe = realendframe; @@ -2611,12 +2611,12 @@ void modelTickAnimQuarterSpeed(struct model *model, s32 lvupdate240, bool arg2) f32 prevelapsespeed = anim->elapsespeed; if (arg2) { - modelSetAnimFrame2WithChrStuff(model, anim->frame, endframe, 0, 0); + model_set_anim_frame2_with_chr_stuff(model, anim->frame, endframe, 0, 0); } else { - modelSetAnimFrame2(model, endframe, 0); + model_set_anim_frame2(model, endframe, 0); } - modelSetAnimation(model, anim->animnum, anim->flip, startframe, anim->speed, anim->loopmerge); + model_set_animation(model, anim->animnum, anim->flip, startframe, anim->speed, anim->loopmerge); anim->looping = true; anim->endframe = realendframe; @@ -2638,15 +2638,15 @@ void modelTickAnimQuarterSpeed(struct model *model, s32 lvupdate240, bool arg2) if (arg2) { if (anim->animnum2) { - modelSetAnimFrame2WithChrStuff(model, anim->frame, frame, anim->frame2, frame2); + model_set_anim_frame2_with_chr_stuff(model, anim->frame, frame, anim->frame2, frame2); } else { - modelSetAnimFrame2WithChrStuff(model, anim->frame, frame, 0, 0); + model_set_anim_frame2_with_chr_stuff(model, anim->frame, frame, 0, 0); } } else { if (anim->animnum2) { - modelSetAnimFrame2(model, frame, frame2); + model_set_anim_frame2(model, frame, frame2); } else { - modelSetAnimFrame2(model, frame, 0); + model_set_anim_frame2(model, frame, 0); } } } @@ -2656,7 +2656,7 @@ void modelTickAnimQuarterSpeed(struct model *model, s32 lvupdate240, bool arg2) /** * This is identical to the above function but removes the 0.25f multipliers. */ -void modelTickAnim(struct model *model, s32 lvupdate240, bool arg2) +void model_tick_anim(struct model *model, s32 lvupdate240, bool arg2) { f32 frame; f32 frame2; @@ -2733,7 +2733,7 @@ void modelTickAnim(struct model *model, s32 lvupdate240, bool arg2) realendframe = anim->endframe; if (speed >= 0) { - endframe = animGetNumFrames(anim->animnum) - 1; + endframe = anim_get_num_frames(anim->animnum) - 1; startframe = anim->loopframe; if (realendframe >= 0 && endframe > realendframe) { @@ -2741,7 +2741,7 @@ void modelTickAnim(struct model *model, s32 lvupdate240, bool arg2) } } else { endframe = anim->loopframe; - startframe = animGetNumFrames(anim->animnum) - 1; + startframe = anim_get_num_frames(anim->animnum) - 1; if (realendframe >= 0 && startframe > realendframe) { startframe = realendframe; @@ -2755,12 +2755,12 @@ void modelTickAnim(struct model *model, s32 lvupdate240, bool arg2) f32 prevelapsespeed = anim->elapsespeed; if (arg2) { - modelSetAnimFrame2WithChrStuff(model, anim->frame, endframe, 0, 0); + model_set_anim_frame2_with_chr_stuff(model, anim->frame, endframe, 0, 0); } else { - modelSetAnimFrame2(model, endframe, 0); + model_set_anim_frame2(model, endframe, 0); } - modelSetAnimation(model, anim->animnum, anim->flip, startframe, anim->speed, anim->loopmerge); + model_set_animation(model, anim->animnum, anim->flip, startframe, anim->speed, anim->loopmerge); anim->looping = true; anim->endframe = realendframe; @@ -2782,22 +2782,22 @@ void modelTickAnim(struct model *model, s32 lvupdate240, bool arg2) if (arg2) { if (anim->animnum2) { - modelSetAnimFrame2WithChrStuff(model, anim->frame, frame, anim->frame2, frame2); + model_set_anim_frame2_with_chr_stuff(model, anim->frame, frame, anim->frame2, frame2); } else { - modelSetAnimFrame2WithChrStuff(model, anim->frame, frame, 0, 0); + model_set_anim_frame2_with_chr_stuff(model, anim->frame, frame, 0, 0); } } else { if (anim->animnum2) { - modelSetAnimFrame2(model, frame, frame2); + model_set_anim_frame2(model, frame, frame2); } else { - modelSetAnimFrame2(model, frame, 0); + model_set_anim_frame2(model, frame, 0); } } } } #endif -void modelApplyRenderModeType1(struct modelrenderdata *renderdata) +void model_apply_render_mode_type1(struct modelrenderdata *renderdata) { gDPPipeSync(renderdata->gdl++); gDPSetCycleType(renderdata->gdl++, G_CYC_1CYCLE); @@ -2811,7 +2811,7 @@ void modelApplyRenderModeType1(struct modelrenderdata *renderdata) gDPSetCombineMode(renderdata->gdl++, G_CC_MODULATEIA, G_CC_MODULATEIA); } -void modelApplyRenderModeType3(struct modelrenderdata *renderdata, bool arg1) +void model_apply_render_mode_type3(struct modelrenderdata *renderdata, bool arg1) { if (renderdata->unk30 == 7) { if (arg1) { @@ -2969,7 +2969,7 @@ void modelApplyRenderModeType3(struct modelrenderdata *renderdata, bool arg1) } } -void modelApplyRenderModeType4(struct modelrenderdata *renderdata, bool arg1) +void model_apply_render_mode_type4(struct modelrenderdata *renderdata, bool arg1) { if (renderdata->unk30 == 7) { gDPPipeSync(renderdata->gdl++); @@ -3124,7 +3124,7 @@ void modelApplyRenderModeType4(struct modelrenderdata *renderdata, bool arg1) } } -void modelApplyRenderModeType2(struct modelrenderdata *renderdata) +void model_apply_render_mode_type2(struct modelrenderdata *renderdata) { gDPPipeSync(renderdata->gdl++); gDPSetCycleType(renderdata->gdl++, G_CYC_2CYCLE); @@ -3138,7 +3138,7 @@ void modelApplyRenderModeType2(struct modelrenderdata *renderdata) gDPSetCombineMode(renderdata->gdl++, G_CC_TRILERP, G_CC_MODULATEIA2); } -void modelApplyCullMode(struct modelrenderdata *renderdata) +void model_apply_cull_mode(struct modelrenderdata *renderdata) { if (renderdata->cullmode == CULLMODE_NONE) { gSPClearGeometryMode(renderdata->gdl++, G_CULL_BOTH); @@ -3149,7 +3149,7 @@ void modelApplyCullMode(struct modelrenderdata *renderdata) } } -void modelRenderNodeGundl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node) +void model_render_node_gundl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node) { struct modelrodata_gundl *rodata = &node->rodata->gundl; @@ -3161,28 +3161,28 @@ void modelRenderNodeGundl(struct modelrenderdata *renderdata, struct model *mode gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_COL1, osVirtualToPhysical(rodata->baseaddr)); if (renderdata->cullmode) { - modelApplyCullMode(renderdata); + model_apply_cull_mode(renderdata); } switch (rodata->unk12) { case 1: - modelApplyRenderModeType1(renderdata); + model_apply_render_mode_type1(renderdata); break; case 3: - modelApplyRenderModeType3(renderdata, true); + model_apply_render_mode_type3(renderdata, true); break; case 4: - modelApplyRenderModeType4(renderdata, true); + model_apply_render_mode_type4(renderdata, true); break; case 2: - modelApplyRenderModeType2(renderdata); + model_apply_render_mode_type2(renderdata); break; } gSPDisplayList(renderdata->gdl++, rodata->opagdl); if (rodata->unk12 == 3 && rodata->xlugdl) { - modelApplyRenderModeType3(renderdata, false); + model_apply_render_mode_type3(renderdata, false); gSPDisplayList(renderdata->gdl++, rodata->xlugdl); } @@ -3192,16 +3192,16 @@ void modelRenderNodeGundl(struct modelrenderdata *renderdata, struct model *mode gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_COL1, osVirtualToPhysical(rodata->baseaddr)); if (renderdata->cullmode) { - modelApplyCullMode(renderdata); + model_apply_cull_mode(renderdata); } - modelApplyRenderModeType4(renderdata, false); + model_apply_render_mode_type4(renderdata, false); gSPDisplayList(renderdata->gdl++, rodata->xlugdl); } } -void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node) +void model_render_node_dl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node) { union modelrodata *rodata = node->rodata; @@ -3210,27 +3210,27 @@ void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model, } if (renderdata->flags & MODELRENDERFLAG_OPA) { - union modelrwdata *rwdata = modelGetNodeRwData(model, node); + union modelrwdata *rwdata = model_get_node_rw_data(model, node); if (rwdata->dl.gdl) { gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_COL1, osVirtualToPhysical(rodata->dl.colours)); if (renderdata->cullmode) { - modelApplyCullMode(renderdata); + model_apply_cull_mode(renderdata); } switch (rodata->dl.mcount) { case 1: - modelApplyRenderModeType1(renderdata); + model_apply_render_mode_type1(renderdata); break; case 3: - modelApplyRenderModeType3(renderdata, true); + model_apply_render_mode_type3(renderdata, true); break; case 4: - modelApplyRenderModeType4(renderdata, true); + model_apply_render_mode_type4(renderdata, true); break; case 2: - modelApplyRenderModeType2(renderdata); + model_apply_render_mode_type2(renderdata); break; } @@ -3240,7 +3240,7 @@ void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model, gSPDisplayList(renderdata->gdl++, rwdata->dl.gdl); if (rodata->dl.mcount == 3 && rodata->dl.xlugdl) { - modelApplyRenderModeType3(renderdata, false); + model_apply_render_mode_type3(renderdata, false); gSPDisplayList(renderdata->gdl++, rodata->dl.xlugdl); } @@ -3248,19 +3248,19 @@ void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model, } if (renderdata->flags & MODELRENDERFLAG_XLU) { - union modelrwdata *rwdata = modelGetNodeRwData(model, node); + union modelrwdata *rwdata = model_get_node_rw_data(model, node); if (rwdata->dl.gdl && rodata->dl.mcount == 4 && rodata->dl.xlugdl) { gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_COL1, osVirtualToPhysical(rodata->dl.colours)); if (renderdata->cullmode) { - modelApplyCullMode(renderdata); + model_apply_cull_mode(renderdata); } gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_VTX, osVirtualToPhysical(rwdata->dl.vertices)); gSPSegment(renderdata->gdl++, SPSEGMENT_MODEL_COL2, osVirtualToPhysical(rwdata->dl.colours)); - modelApplyRenderModeType4(renderdata, false); + model_apply_render_mode_type4(renderdata, false); gSPDisplayList(renderdata->gdl++, rodata->dl.xlugdl); } @@ -3278,7 +3278,7 @@ void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model, * writes them to a newly allocated vertices table and queues the node's * displaylist to the renderdata's DL. */ -void modelRenderNodeStarGunfire(struct modelrenderdata *renderdata, struct modelnode *node) +void model_render_node_star_gunfire(struct modelrenderdata *renderdata, struct modelnode *node) { if (renderdata->flags & MODELRENDERFLAG_XLU) { struct modelrodata_stargunfire *rodata = &node->rodata->stargunfire; @@ -3342,17 +3342,17 @@ void modelRenderNodeStarGunfire(struct modelrenderdata *renderdata, struct model } } -void modelSelectTexture(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2) +void model_select_texture(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2) { - texSelect(&renderdata->gdl, tconfig, arg2, renderdata->zbufferenabled, 2, 1, NULL); + tex_select(&renderdata->gdl, tconfig, arg2, renderdata->zbufferenabled, 2, 1, NULL); } -void modelRenderNodeChrGunfire(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node) +void model_render_node_chr_gunfire(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node) { u32 stack[3]; f32 negspc0; struct modelrodata_chrgunfire *rodata = &node->rodata->chrgunfire; - union modelrwdata *rwdata = modelGetNodeRwData(model, node); + union modelrwdata *rwdata = model_get_node_rw_data(model, node); Vtx *vertices; f32 spf0; f32 spec; @@ -3380,7 +3380,7 @@ void modelRenderNodeChrGunfire(struct modelrenderdata *renderdata, struct model f32 distance; if ((renderdata->flags & MODELRENDERFLAG_XLU) && rwdata->chrgunfire.visible) { - s32 index = modelFindNodeMtxIndex(node, 0); + s32 index = model_find_node_mtx_index(node, 0); mtx = &model->matrices[index]; spe0.x = -(rodata->pos.f[0] * mtx->m[0][0] + rodata->pos.f[1] * mtx->m[1][0] + rodata->pos.f[2] * mtx->m[2][0] + mtx->m[3][0]); @@ -3437,7 +3437,7 @@ void modelRenderNodeChrGunfire(struct modelrenderdata *renderdata, struct model vertices = g_ModelVtxAllocatorFunc(4); - colours = (Col *) gfxAllocateColours(1); + colours = (Col *) gfx_allocate_colours(1); vertices[0] = vtxtemplate; vertices[1] = vtxtemplate; @@ -3484,9 +3484,9 @@ void modelRenderNodeChrGunfire(struct modelrenderdata *renderdata, struct model vertices[3].s = centre - sp58; vertices[3].t = centre + sp5c; - modelSelectTexture(renderdata, tconfig, 4); + model_select_texture(renderdata, tconfig, 4); } else { - modelSelectTexture(renderdata, NULL, 1); + model_select_texture(renderdata, NULL, 1); } gSPSetGeometryMode(renderdata->gdl++, G_CULL_BACK); @@ -3497,7 +3497,7 @@ void modelRenderNodeChrGunfire(struct modelrenderdata *renderdata, struct model } } -void modelRender(struct modelrenderdata *renderdata, struct model *model) +void model_render(struct modelrenderdata *renderdata, struct model *model) { union modelrodata *rodata; union modelrwdata *rwdata; @@ -3513,7 +3513,7 @@ void modelRender(struct modelrenderdata *renderdata, struct model *model) case MODELNODETYPE_DISTANCE: case MODELNODETYPE_TOGGLE: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); switch (type) { case MODELNODETYPE_DISTANCE: @@ -3525,7 +3525,7 @@ void modelRender(struct modelrenderdata *renderdata, struct model *model) } break; case MODELNODETYPE_HEADSPOT: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); if (rwdata->headspot.headmodeldef) { struct modelnode *loopnode = rwdata->headspot.headmodeldef->rootnode; @@ -3538,19 +3538,19 @@ void modelRender(struct modelrenderdata *renderdata, struct model *model) } break; case MODELNODETYPE_REORDER: - modelApplyReorderRelations(model, node); + model_apply_reorder_relations(model, node); break; case MODELNODETYPE_CHRGUNFIRE: - modelRenderNodeChrGunfire(renderdata, model, node); + model_render_node_chr_gunfire(renderdata, model, node); break; case MODELNODETYPE_GUNDL: - modelRenderNodeGundl(renderdata, model, node); + model_render_node_gundl(renderdata, model, node); break; case MODELNODETYPE_DL: - modelRenderNodeDl(renderdata, model, node); + model_render_node_dl(renderdata, model, node); break; case MODELNODETYPE_STARGUNFIRE: - modelRenderNodeStarGunfire(renderdata, node); + model_render_node_star_gunfire(renderdata, node); break; case MODELNODETYPE_CHRINFO: default: @@ -3572,7 +3572,7 @@ void modelRender(struct modelrenderdata *renderdata, struct model *model) } } -bool modelTestBboxNodeForHit(struct modelrodata_bbox *bbox, Mtxf *mtx, struct coord *arg2, struct coord *arg3) +bool model_test_bbox_node_for_hit(struct modelrodata_bbox *bbox, Mtxf *mtx, struct coord *arg2, struct coord *arg3) { f32 xthingx; f32 xthingy; @@ -3764,7 +3764,7 @@ bool modelTestBboxNodeForHit(struct modelrodata_bbox *bbox, Mtxf *mtx, struct co * This is okay for most objects as well as shielded chrs. * For non-shielded chrs, an accurate polygon test is done elsewhere. */ -s32 modelTestForHit(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode) +s32 model_test_for_hit(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode) { struct modelnode *node; bool dochildren = true; @@ -3806,9 +3806,9 @@ s32 modelTestForHit(struct model *model, struct coord *arg1, struct coord *arg2, switch (type) { case MODELNODETYPE_BBOX: rodata = node->rodata; - mtx = modelFindNodeMtx(model, node, 0); + mtx = model_find_node_mtx(model, node, 0); - if (modelTestBboxNodeForHit(&rodata->bbox, mtx, arg1, arg2)) { + if (model_test_bbox_node_for_hit(&rodata->bbox, mtx, arg1, arg2)) { *startnode = node; return rodata->bbox.hitpart; } @@ -3817,16 +3817,16 @@ s32 modelTestForHit(struct model *model, struct coord *arg1, struct coord *arg2, break; case MODELNODETYPE_DISTANCE: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); node->child = rwdata->distance.visible ? rodata->distance.target : NULL; break; case MODELNODETYPE_TOGGLE: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); node->child = rwdata->toggle.visible ? rodata->toggle.target : NULL; break; case MODELNODETYPE_HEADSPOT: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); if (rwdata->headspot.headmodeldef) { struct modelnode *loopnode = rwdata->headspot.headmodeldef->rootnode; @@ -3853,7 +3853,7 @@ s32 modelTestForHit(struct model *model, struct coord *arg1, struct coord *arg2, if (var) \ var = (void *)((uintptr_t)var + diff) -void modelPromoteNodeOffsetsToPointers(struct modelnode *node, u32 vma, u32 fileramaddr) +void model_promote_node_offsets_to_pointers(struct modelnode *node, u32 vma, u32 fileramaddr) { union modelrodata *rodata; s32 diff = fileramaddr - vma; @@ -3947,7 +3947,7 @@ void modelPromoteNodeOffsetsToPointers(struct modelnode *node, u32 vma, u32 file * Offsets in model files are based from virtual memory address 0x0f000000. * This vma address is specified as an argument to the function. */ -void modelPromoteOffsetsToPointers(struct modeldef *modeldef, u32 vma, uintptr_t fileramaddr) +void model_promote_offsets_to_pointers(struct modeldef *modeldef, u32 vma, uintptr_t fileramaddr) { s32 diff = fileramaddr - vma; s32 i; @@ -3961,7 +3961,7 @@ void modelPromoteOffsetsToPointers(struct modeldef *modeldef, u32 vma, uintptr_t PROMOTE(modeldef->parts[i]); } - modelPromoteNodeOffsetsToPointers(modeldef->rootnode, vma, fileramaddr); + model_promote_node_offsets_to_pointers(modeldef->rootnode, vma, fileramaddr); // Sort parts by part number so they can be bisected during lookup partnums = (s16 *)&modeldef->parts[modeldef->numparts]; @@ -3991,7 +3991,7 @@ void modelPromoteOffsetsToPointers(struct modeldef *modeldef, u32 vma, uintptr_t } } -s32 modelCalculateRwDataIndexes(struct modelnode *basenode) +s32 model_calculate_rw_data_indexes(struct modelnode *basenode) { u16 len = 0; struct modelnode *node = basenode; @@ -4028,7 +4028,7 @@ s32 modelCalculateRwDataIndexes(struct modelnode *basenode) rodata = node->rodata; rodata->reorder.rwdataindex = len; len += sizeof(struct modelrwdata_reorder) / 4; - modelApplyReorderRelationsByArg(node, false); + model_apply_reorder_relations_by_arg(node, false); break; case MODELNODETYPE_0B: rodata = node->rodata; @@ -4071,12 +4071,12 @@ s32 modelCalculateRwDataIndexes(struct modelnode *basenode) return len; } -void modelAllocateRwData(struct modeldef *modeldef) +void model_allocate_rw_data(struct modeldef *modeldef) { - modeldef->rwdatalen = modelCalculateRwDataIndexes(modeldef->rootnode); + modeldef->rwdatalen = model_calculate_rw_data_indexes(modeldef->rootnode); } -void modelInitRwData(struct model *model, struct modelnode *startnode) +void model_init_rw_data(struct model *model, struct modelnode *startnode) { struct modelnode *node = startnode; union modelrodata *rodata; @@ -4087,7 +4087,7 @@ void modelInitRwData(struct model *model, struct modelnode *startnode) switch (type) { case MODELNODETYPE_CHRINFO: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->chrinfo.unk00 = 0; rwdata->chrinfo.ground = 0; @@ -4119,37 +4119,37 @@ void modelInitRwData(struct model *model, struct modelnode *startnode) break; case MODELNODETYPE_DISTANCE: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->distance.visible = false; node->child = rodata->distance.target; break; case MODELNODETYPE_TOGGLE: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->toggle.visible = true; node->child = rodata->toggle.target; break; case MODELNODETYPE_HEADSPOT: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->headspot.headmodeldef = NULL; rwdata->headspot.rwdatas = NULL; break; case MODELNODETYPE_REORDER: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->reorder.reverse = false; - modelApplyReorderRelations(model, node); + model_apply_reorder_relations(model, node); break; case MODELNODETYPE_0B: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->type0b.unk00 = 0; break; case MODELNODETYPE_CHRGUNFIRE: - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->chrgunfire.visible = false; break; case MODELNODETYPE_DL: rodata = node->rodata; - rwdata = modelGetNodeRwData(model, node); + rwdata = model_get_node_rw_data(model, node); rwdata->dl.vertices = rodata->dl.vertices; rwdata->dl.gdl = rodata->dl.opagdl; rwdata->dl.colours = (void *) ALIGN8((uintptr_t)(rodata->dl.vertices + rodata->dl.numvertices)); @@ -4181,7 +4181,7 @@ void modelInitRwData(struct model *model, struct modelnode *startnode) } } -void modelInit(struct model *model, struct modeldef *modeldef, u32 *rwdatas, bool resetanim) +void model_init(struct model *model, struct modeldef *modeldef, u32 *rwdatas, bool resetanim) { struct modelnode *node; @@ -4222,7 +4222,7 @@ void modelInit(struct model *model, struct modeldef *modeldef, u32 *rwdatas, boo } if (rwdatas != NULL) { - modelInitRwData(model, modeldef->rootnode); + model_init_rw_data(model, modeldef->rootnode); } if (resetanim) { @@ -4230,7 +4230,7 @@ void modelInit(struct model *model, struct modeldef *modeldef, u32 *rwdatas, boo } } -void animInit(struct anim *anim) +void anim_init(struct anim *anim) { anim->animnum = 0; anim->animnum2 = 0; @@ -4254,9 +4254,9 @@ void animInit(struct anim *anim) anim->animscale = 1; } -void modelAttachHead(struct model *bodymode, struct modeldef *bodymodeldef, struct modelnode *headspotnode, struct modeldef *headmodeldef) +void model_attach_head(struct model *bodymode, struct modeldef *bodymodeldef, struct modelnode *headspotnode, struct modeldef *headmodeldef) { - struct modelrwdata_headspot *rwdata = modelGetNodeRwData(bodymode, headspotnode); + struct modelrwdata_headspot *rwdata = model_get_node_rw_data(bodymode, headspotnode); struct modelnode *node; rwdata->headmodeldef = headmodeldef; @@ -4271,7 +4271,7 @@ void modelAttachHead(struct model *bodymode, struct modeldef *bodymodeldef, stru node = node->next; } - bodymodeldef->rwdatalen += modelCalculateRwDataIndexes(headspotnode->child); + bodymodeldef->rwdatalen += model_calculate_rw_data_indexes(headspotnode->child); } /** @@ -4286,7 +4286,7 @@ void modelAttachHead(struct model *bodymode, struct modeldef *bodymodeldef, stru * Note that some node types support multiple display lists, so the function * may return the same node while it iterates the display lists for that node. */ -void modelIterateDisplayLists(struct modeldef *modeldef, struct modelnode **nodeptr, Gfx **gdlptr) +void model_iterate_display_lists(struct modeldef *modeldef, struct modelnode **nodeptr, Gfx **gdlptr) { struct modelnode *node = *nodeptr; union modelrodata *rodata; @@ -4334,7 +4334,7 @@ void modelIterateDisplayLists(struct modeldef *modeldef, struct modelnode **node node->child = rodata->toggle.target; break; case MODELNODETYPE_REORDER: - modelApplyReorderRelationsByArg(node, true); + model_apply_reorder_relations_by_arg(node, true); break; } @@ -4360,7 +4360,7 @@ void modelIterateDisplayLists(struct modeldef *modeldef, struct modelnode **node *nodeptr = node; } -void modelNodeReplaceGdl(struct modeldef *modeldef, struct modelnode *node, Gfx *find, Gfx *replacement) +void model_node_replace_gdl(struct modeldef *modeldef, struct modelnode *node, Gfx *find, Gfx *replacement) { union modelrodata *rodata; u32 type = node->type & 0xff; diff --git a/src/lib/modelasm.s b/src/lib/modelasm.s index e6649100c..f379c80c2 100644 --- a/src/lib/modelasm.s +++ b/src/lib/modelasm.s @@ -28,10 +28,10 @@ glabel var8005ef7c .word 0x00000000 glabel var8005ef80 -.word modelasmReadFrameData+0x84 -.word modelasmReadFrameData+0x90 -.word modelasmReadFrameData+0xa8 -.word modelasmReadFrameData+0xcc +.word modelasm_read_frame_data+0x84 +.word modelasm_read_frame_data+0x90 +.word modelasm_read_frame_data+0xa8 +.word modelasm_read_frame_data+0xcc glabel var8005ef90 .word 0xff08ffff @@ -194,7 +194,7 @@ glabel modelasm00018680 sll $t6, $t6, 0x2 add $t6, $t5, $t6 lw $t6, 0x0($t6) - jal modelasmIterateThings1 + jal modelasm_iterate_things1 addi $gp, $zero, 0x0 mtc1 $zero, $f1 lwc1 $f0, 0x10($a2) @@ -247,7 +247,7 @@ glabel modelasm00018680 sll $t6, $t6, 0x2 add $t6, $t5, $t6 lw $t6, 0x0($t6) - jal modelasmIterateThings2 + jal modelasm_iterate_things2 addi $gp, $zero, 0x0 .L00018874: mtc1 $zero, $f1 @@ -289,7 +289,7 @@ glabel modelasm00018680 sll $t6, $t6, 0x2 add $t6, $t5, $t6 lw $t6, 0x0($t6) - jal modelasmIterateThings1 + jal modelasm_iterate_things1 addi $gp, $zero, 0x0 mtc1 $zero, $f1 lwc1 $f0, 0x34($a2) @@ -334,7 +334,7 @@ glabel modelasm00018680 sll $t6, $t6, 0x2 add $t6, $t5, $t6 lw $t6, 0x0($t6) - jal modelasmIterateThings2 + jal modelasm_iterate_things2 addi $gp, $zero, 0x0 .L000189cc: lw $a3, 0x8($a1) @@ -438,9 +438,9 @@ glabel modelasm00018680 lhu $s3, 0x3c4($t0) lhu $s4, 0x3c6($t0) .L00018b3c: - jal modelasmPrepareRotMtx360 + jal modelasm_prepare_rot_mtx360 sw $t0, 0x7e8($sp) - jal modelasmMathPain2 + jal modelasm_math_pain2 nop mov.s $f16, $f0 mov.s $f17, $f1 @@ -448,11 +448,11 @@ glabel modelasm00018680 mov.s $f19, $f3 move $t2, $s2 move $t3, $s3 - jal modelasmPrepareRotMtx360 + jal modelasm_prepare_rot_mtx360 move $t4, $s4 - jal modelasmMathPain2 + jal modelasm_math_pain2 nop - jal modelasmMathPain1 + jal modelasm_math_pain1 lwc1 $f30, 0x7e0($sp) li $t0, 0x1 sw $t0, 0x7e4($sp) @@ -461,7 +461,7 @@ glabel modelasm00018680 swc1 $f1, 0x7ec($sp) swc1 $f2, 0x7f0($sp) swc1 $f3, 0x7f4($sp) - jal modelasmMathPain4 + jal modelasm_math_pain4 nop j .L00018c6c nop @@ -516,9 +516,9 @@ glabel modelasm00018680 add $s0, $zero, $t2 add $s1, $zero, $t3 add $s2, $zero, $t4 - jal modelasmPrepareRotMtx180 + jal modelasm_prepare_rot_mtx180 add $s3, $zero, $t0 - jal modelasmMathPain3 + jal modelasm_math_pain3 add $t0, $zero, $s3 .L00018c6c: andi $t2, $s8, 0x2 @@ -576,7 +576,7 @@ glabel modelasm00018680 lw $t0, 0x8($gp) beqz $t0, .L00018d48 nop - jal modelasmFindNodeMtx + jal modelasm_find_node_mtx nop b .L00018d4c nop @@ -587,7 +587,7 @@ glabel modelasm00018680 lhu $t2, 0xe($t1) sll $t2, $t2, 0x6 lw $t1, 0xc($a1) - jal modelasmMtxMultiply + jal modelasm_mtx_multiply add $t1, $t1, $t2 lui $t3, %hi(g_ModelJointPositionedFunc) addiu $t3, $t3, %lo(g_ModelJointPositionedFunc) @@ -677,9 +677,9 @@ glabel modelasm00018680 add $t2, $zero, $s0 add $t3, $zero, $s1 add $t4, $zero, $s2 - jal modelasmPrepareRotMtx360 + jal modelasm_prepare_rot_mtx360 add $s0, $zero, $t0 - jal modelasmMathPain2 + jal modelasm_math_pain2 add $t0, $zero, $s0 .L00018ecc: lui $at, 0x3f00 @@ -714,7 +714,7 @@ glabel modelasm00018680 c.le.s $f6, $f7 bc1f .L00018f8c nop - jal modelasmAcosOrAsin + jal modelasm_acos_or_asin nop mov.s $f17, $f0 mul.s $f12, $f6, $f8 @@ -744,12 +744,12 @@ glabel modelasm00018680 mul.s $f3, $f3, $f8 add.s $f0, $f0, $f4 .L00018fb4: - jal modelasmMathPain4 + jal modelasm_math_pain4 lw $t1, 0x4($gp) lhu $t2, 0x10($t1) sll $t2, $t2, 0x6 lw $t1, 0xc($a1) - jal modelasmMtxMultiply + jal modelasm_mtx_multiply add $t1, $t1, $t2 j .L00019574 nop @@ -769,11 +769,11 @@ glabel modelasm00018680 lhu $s8, 0x0($t0) .L0001900c: syscall - jal modelasmFindNodeMtx + jal modelasm_find_node_mtx add $t0, $zero, $gp lui $t2, %hi(g_ModelDistanceDisabled) addiu $t2, $t2, %lo(g_ModelDistanceDisabled) - jal modelasmGetNodeRwData + jal modelasm_get_node_rw_data lw $t1, 0x4($gp) lw $t2, 0x0($t2) bnez $t2, .L00019068 @@ -895,9 +895,9 @@ glabel modelasm00018680 lhu $s3, 0x3c4($t0) lhu $s4, 0x3c6($t0) .L000191cc: - jal modelasmPrepareRotMtx360 + jal modelasm_prepare_rot_mtx360 sw $t0, 0x7e8($sp) - jal modelasmMathPain2 + jal modelasm_math_pain2 nop mov.s $f16, $f0 mov.s $f17, $f1 @@ -905,14 +905,14 @@ glabel modelasm00018680 mov.s $f19, $f3 move $t2, $s2 move $t3, $s3 - jal modelasmPrepareRotMtx360 + jal modelasm_prepare_rot_mtx360 move $t4, $s4 - jal modelasmMathPain2 + jal modelasm_math_pain2 nop - jal modelasmMathPain1 + jal modelasm_math_pain1 lwc1 $f30, 0x7e0($sp) lw $t0, 0x7e8($sp) - jal modelasmMathPain4 + jal modelasm_math_pain4 nop j .L000192a8 nop @@ -940,7 +940,7 @@ glabel modelasm00018680 .L0001926c: andi $t3, $t3, 0xffff andi $t4, $t4, 0xffff - jal modelasmPrepareRotMtx180 + jal modelasm_prepare_rot_mtx180 lhu $t2, 0x2($t0) b .L000192a0 nop @@ -950,13 +950,13 @@ glabel modelasm00018680 lhu $s8, 0x0($t0) lhu $t4, 0x6($t0) lhu $t3, 0x4($t0) - jal modelasmPrepareRotMtx180 + jal modelasm_prepare_rot_mtx180 lhu $t2, 0x2($t0) .L000192a0: - jal modelasmMathPain3 + jal modelasm_math_pain3 nop .L000192a8: - jal modelasmGetNodeRwData + jal modelasm_get_node_rw_data mtc1 $zero, $f0 mov.s $f27, $f12 mov.s $f28, $f13 @@ -1070,7 +1070,7 @@ glabel modelasm00018680 lhu $t2, 0x2($t1) sll $t2, $t2, 0x6 lw $t1, 0xc($a1) - jal modelasmMtxMultiply + jal modelasm_mtx_multiply add $t1, $t1, $t2 j .L00019574 nop @@ -1090,7 +1090,7 @@ glabel modelasm00018680 lhu $s8, 0x0($t0) .L000194a0: syscall - jal modelasmGetNodeRwData + jal modelasm_get_node_rw_data nop lw $t1, 0x0($v0) beqz $t1, .L00019574 @@ -1112,7 +1112,7 @@ glabel modelasm00018680 j .L000194fc lw $t0, 0x0($a0) .L000194f4: - jal modelasmFindNodeMtx + jal modelasm_find_node_mtx nop .L000194fc: lw $t1, 0x4($gp) @@ -1131,13 +1131,13 @@ glabel modelasm00018680 lhu $t2, 0xc($t1) sll $t2, $t2, 0x6 lw $t1, 0xc($a1) - jal modelasmMtxMultiply + jal modelasm_mtx_multiply add $t1, $t1, $t2 j .L00019574 nop j .L00019574 nop - jal modelasmGetNodeRwData + jal modelasm_get_node_rw_data lw $t0, 0x4($gp) lw $t1, 0x0($v0) beqz $t1, .L00019570 @@ -1200,7 +1200,7 @@ glabel modelasm00018680 addiu $sp, $sp, 0x800 syscall -glabel modelasmIterateThings1 +glabel modelasm_iterate_things1 sw $ra, 0x7ac($sp) .L00019638: lbu $t7, 0x0($t2) @@ -1242,7 +1242,7 @@ glabel modelasmIterateThings1 j .L00019808 addi $t2, $t2, 0xc .L000196cc: - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x2($t2) add $s0, $zero, $v0 lbu $v1, 0x2($t2) @@ -1268,7 +1268,7 @@ glabel modelasmIterateThings1 addu $s3, $s3, $s4 addu $s0, $s0, $s3 andi $s0, $s0, 0xffff - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x5($t2) add $s1, $zero, $v0 lbu $v1, 0x5($t2) @@ -1294,7 +1294,7 @@ glabel modelasmIterateThings1 addu $s3, $s3, $s4 addu $s1, $s1, $s3 andi $s1, $s1, 0xffff - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x8($t2) add $s2, $zero, $v0 lbu $v1, 0x8($t2) @@ -1332,7 +1332,7 @@ glabel modelasmIterateThings1 j .L000198b4 addi $s2, $zero, 0x0 .L00019820: - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x2($t2) add $s0, $zero, $v0 lbu $v1, 0x0($t2) @@ -1344,7 +1344,7 @@ glabel modelasmIterateThings1 sub $v0, $v0, $t4 sllv $s0, $s0, $v0 andi $s0, $s0, 0xffff - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x5($t2) add $s1, $zero, $v0 lbu $v1, 0x3($t2) @@ -1356,7 +1356,7 @@ glabel modelasmIterateThings1 sub $v0, $v0, $t4 sllv $s1, $s1, $v0 andi $s1, $s1, 0xffff - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x8($t2) add $s2, $zero, $v0 lbu $v1, 0x6($t2) @@ -1381,7 +1381,7 @@ glabel modelasmIterateThings1 jr $ra nop -glabel modelasmIterateThings2 +glabel modelasm_iterate_things2 sw $ra, 0x7ac($sp) .L000198e0: lbu $t7, 0x0($t2) @@ -1449,7 +1449,7 @@ glabel modelasmIterateThings2 j .L00019a64 addi $s2, $zero, 0x0 .L000199d0: - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x2($t2) add $s0, $zero, $v0 lbu $v1, 0x0($t2) @@ -1461,7 +1461,7 @@ glabel modelasmIterateThings2 sub $v0, $v0, $t4 sllv $s0, $s0, $v0 andi $s0, $s0, 0xffff - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x5($t2) add $s1, $zero, $v0 lbu $v1, 0x3($t2) @@ -1473,7 +1473,7 @@ glabel modelasmIterateThings2 sub $v0, $v0, $t4 sllv $s1, $s1, $v0 andi $s1, $s1, 0xffff - jal modelasmReadFrameData + jal modelasm_read_frame_data lbu $v1, 0x8($t2) add $s2, $zero, $v0 lbu $v1, 0x6($t2) @@ -1592,7 +1592,7 @@ glabel modelasmIterateThings2 jr $ra nop -glabel modelasmReadFrameData +glabel modelasm_read_frame_data beqz $v1, .L00019d14 addi $v0, $zero, 0x0 .L00019be8: @@ -1679,7 +1679,7 @@ glabel modelasmReadFrameData jr $ra nop -glabel modelasmGetNodeRwData +glabel modelasm_get_node_rw_data addiu $sp, $sp, -32 sw $gp, 0x0($sp) sw $t0, 0x4($sp) @@ -1716,7 +1716,7 @@ glabel modelasmGetNodeRwData li $at, 0x17 bne $t1, $at, .L00019d84 nop - jal modelasmGetNodeRwData + jal modelasm_get_node_rw_data nop lw $t3, 0x4($v0) .L00019db0: @@ -1737,7 +1737,7 @@ glabel modelasmGetNodeRwData * NTSC beta uses a simple version of this function, implemented here in ASM. * NTSC 1.0 and newer reimplements the function in C and adds more to it. */ -glabel modelGetNodeRwData +glabel model_get_node_rw_data addiu $sp, $sp, -16 sw $t0, 0x0($sp) sw $t1, 0x4($sp) @@ -1771,7 +1771,7 @@ glabel modelGetNodeRwData li $at, 0x17 bne $t1, $at, .NB0001af08 sll $zero, $zero, 0x0 - jal modelGetNodeRwData + jal model_get_node_rw_data sll $zero, $zero, 0x0 lw $t3, 0x4($v0) .NB0001af34: @@ -1785,7 +1785,7 @@ glabel modelGetNodeRwData addiu $sp, $sp, 0x10 #endif -glabel modelasmMathPain1 +glabel modelasm_math_pain1 sw $ra, 0x7ac($sp) .L00019de0: mul.s $f5, $f16, $f0 @@ -1835,7 +1835,7 @@ glabel modelasmMathPain1 c.le.s $f6, $f7 bc1f .L00019f20 nop - jal modelasmAcosOrAsin + jal modelasm_acos_or_asin nop mov.s $f20, $f0 jal sinf @@ -1876,7 +1876,7 @@ glabel modelasmMathPain1 j .L00019ed8 sub.s $f5, $f5, $f30 -glabel modelasmMathPain2 +glabel modelasm_math_pain2 mul.s $f6, $f0, $f2 nop mul.s $f7, $f0, $f3 @@ -1905,7 +1905,7 @@ glabel modelasmMathPain2 jr $ra sub.s $f3, $f26, $f10 -glabel modelasmPrepareRotMtx180 +glabel modelasm_prepare_rot_mtx180 add $t5, $zero, $ra lui $at, %hi(var7005422c) lwc1 $f29, %lo(var7005422c)($at) @@ -1942,7 +1942,7 @@ glabel modelasmPrepareRotMtx180 jr $ra nop -glabel modelasmPrepareRotMtx360 +glabel modelasm_prepare_rot_mtx360 add $t5, $zero, $ra lui $at, %hi(var70054234) lwc1 $f29, %lo(var70054234)($at) @@ -1978,7 +1978,7 @@ glabel modelasmPrepareRotMtx360 jr $ra nop -glabel modelasmMathPain3 +glabel modelasm_math_pain3 mul.s $f6, $f1, $f5 nop mul.s $f7, $f0, $f5 @@ -2005,7 +2005,7 @@ glabel modelasmMathPain3 jr $ra sub.s $f19, $f19, $f8 -glabel modelasmMathPain4 +glabel modelasm_math_pain4 mul.s $f4, $f0, $f0 nop mul.s $f5, $f1, $f1 @@ -2051,7 +2051,7 @@ glabel modelasmMathPain4 jr $ra sub.s $f20, $f20, $f26 -glabel modelasmMtxMultiply +glabel modelasm_mtx_multiply li $t2, 0x3 .L0001a1c4: lwc1 $f0, 0x0($t0) @@ -2093,7 +2093,7 @@ glabel modelasmMtxMultiply jr $ra swc1 $f31, 0x30($t1) -glabel modelasmFindNodeMtx +glabel modelasm_find_node_mtx .L0001a25c: lh $t1, 0x0($t0) andi $t1, $t1, 0xff @@ -2131,7 +2131,7 @@ glabel modelasmFindNodeMtx jr $ra add $t0, $zero, $zero -glabel modelasmAcosOrAsin +glabel modelasm_acos_or_asin lui $at, %hi(var7005423c) lwc1 $f7, %lo(var7005423c)($at) mul.s $f7, $f6, $f7 diff --git a/src/lib/modelasm_c.c b/src/lib/modelasm_c.c index 610e51a99..7fc53fc35 100644 --- a/src/lib/modelasm_c.c +++ b/src/lib/modelasm_c.c @@ -50,19 +50,19 @@ f32 f23; s32 gp; -static bool modelasmIterateThings1(void); -static bool modelasmIterateThings2(void); -static u32 modelasmReadFrameData(void); -static union modelrwdata *modelasmGetNodeRwData(struct model *model, struct modelnode *node, bool is_head); -static void modelasmMathPain1(f32 f30); -static void modelasmMathPain2(void); -static void modelasmPrepareRotMtx180(s32 t2, s32 t3, s32 t4); -static void modelasmPrepareRotMtx360(s32 t2, s32 t3, s32 t4); -static void modelasmMathPain3(void); -static void modelasmMathPain4(void); -static void modelasmMtxMultiply(Mtxf *src, Mtxf *dst); -static Mtxf *modelasmFindNodeMtx(struct model *model, struct modelnode *node); -static f32 modelasmAcosOrAsin(f32 f6); +static bool modelasm_iterate_things1(void); +static bool modelasm_iterate_things2(void); +static u32 modelasm_read_frame_data(void); +static union modelrwdata *modelasm_get_node_rw_data(struct model *model, struct modelnode *node, bool is_head); +static void modelasm_math_pain1(f32 f30); +static void modelasm_math_pain2(void); +static void modelasm_prepare_rot_mtx180(s32 t2, s32 t3, s32 t4); +static void modelasm_prepare_rot_mtx360(s32 t2, s32 t3, s32 t4); +static void modelasm_math_pain3(void); +static void modelasm_math_pain4(void); +static void modelasm_mtx_multiply(Mtxf *src, Mtxf *dst); +static Mtxf *modelasm_find_node_mtx(struct model *model, struct modelnode *node); +static f32 modelasm_acos_or_asin(f32 f6); /** * Reads animation data for the given model and applies matrix transformations @@ -118,7 +118,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) if (t2ptr8 != t3ptr8) { t6ptr8 = g_AnimFrameBytes[anim->frameslot1]; - if (!modelasmIterateThings1()) { + if (!modelasm_iterate_things1()) { return false; } @@ -137,7 +137,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) if (t2ptr8 != t3ptr8) { t6ptr8 = g_AnimFrameBytes[anim->frameslot2]; - if (!modelasmIterateThings2()) { + if (!modelasm_iterate_things2()) { return false; } } @@ -155,7 +155,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) if (t2ptr8 != t3ptr8) { t6ptr8 = g_AnimFrameBytes[anim->frameslot3]; - if (!modelasmIterateThings1()) { + if (!modelasm_iterate_things1()) { return false; } @@ -169,7 +169,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) if (t2ptr8 != t3ptr8) { t6ptr8 = g_AnimFrameBytes[anim->frameslot4]; - if (!modelasmIterateThings2()) { + if (!modelasm_iterate_things2()) { return false; } } @@ -242,8 +242,8 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) } sp7e8slot = t0slot; - modelasmPrepareRotMtx360(t2, t3, t4); - modelasmMathPain2(); + modelasm_prepare_rot_mtx360(t2, t3, t4); + modelasm_math_pain2(); f16 = f0; f17 = f1; @@ -254,9 +254,9 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) t3 = s3; t4 = s4; - modelasmPrepareRotMtx360(t2, t3, t4); - modelasmMathPain2(); - modelasmMathPain1(f30); + modelasm_prepare_rot_mtx360(t2, t3, t4); + modelasm_math_pain2(); + modelasm_math_pain1(f30); sp7e4 = true; t0slot = sp7e8slot; @@ -266,7 +266,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) sp7f0 = f2; sp7f4 = f3; - modelasmMathPain4(); + modelasm_math_pain4(); } else { if (anim->flip) { t2ptr8 = skeleton->things[t1]; @@ -312,8 +312,8 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) s1 = t3; s2 = t4; - modelasmPrepareRotMtx180(t2, t3, t4); - modelasmMathPain3(); + modelasm_prepare_rot_mtx180(t2, t3, t4); + modelasm_math_pain3(); } } } else { @@ -363,10 +363,10 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) } } - t0mtx = node->parent ? modelasmFindNodeMtx(model, node->parent) : renderdata->unk00; + t0mtx = node->parent ? modelasm_find_node_mtx(model, node->parent) : renderdata->unk00; t1mtx = &model->matrices[node->rodata->position.mtxindex0]; - modelasmMtxMultiply(t0mtx, t1mtx); + modelasm_mtx_multiply(t0mtx, t1mtx); if (g_ModelJointPositionedFunc) { g_ModelJointPositionedFunc(node->rodata->position.mtxindex0, &model->matrices[node->rodata->position.mtxindex0]); @@ -382,8 +382,8 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) t2 = s0; t3 = s1; t4 = s2; - modelasmPrepareRotMtx360(t2, t3, t4); - modelasmMathPain2(); + modelasm_prepare_rot_mtx360(t2, t3, t4); + modelasm_math_pain2(); } f4 = 0; @@ -410,7 +410,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) f4 = f5 * 0.5f; f0 += f4; } else { - f7 = modelasmAcosOrAsin(f6); + f7 = modelasm_acos_or_asin(f6); f17 = f0; f12 = f6 * 0.5f; s1 = t1; @@ -424,16 +424,16 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) f0 += f5; } - modelasmMathPain4(); + modelasm_math_pain4(); t1mtx = &model->matrices[node->rodata->position.mtxindex1]; - modelasmMtxMultiply(t0mtx, t1mtx); + modelasm_mtx_multiply(t0mtx, t1mtx); } } break; case MODELNODETYPE_DISTANCE: - t0mtx = modelasmFindNodeMtx(model, node); + t0mtx = modelasm_find_node_mtx(model, node); - rwdata = modelasmGetNodeRwData(model, node, sp7f8); + rwdata = modelasm_get_node_rw_data(model, node, sp7f8); f0 = 0; if (!g_ModelDistanceDisabled && t0mtx) { @@ -510,8 +510,8 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) } sp7e8slot = t0slot; - modelasmPrepareRotMtx360(t2, t3, t4); - modelasmMathPain2(); + modelasm_prepare_rot_mtx360(t2, t3, t4); + modelasm_math_pain2(); f16 = f0; f17 = f1; @@ -522,11 +522,11 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) t3 = s3; t4 = s4; - modelasmPrepareRotMtx360(t2, t3, t4); - modelasmMathPain2(); - modelasmMathPain1(f30); + modelasm_prepare_rot_mtx360(t2, t3, t4); + modelasm_math_pain2(); + modelasm_math_pain1(f30); t0slot = sp7e8slot; - modelasmMathPain4(); + modelasm_math_pain4(); } else { if (anim->flip) { t2ptr8 = skeleton->things[t1]; @@ -545,7 +545,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) t3 = (0x10000 - t3) & 0xffff; } - modelasmPrepareRotMtx180(t2, t3, t4); + modelasm_prepare_rot_mtx180(t2, t3, t4); } else { t0slot = &sp00[t1]; @@ -554,10 +554,10 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) t3 = t0slot->unk04; t2 = t0slot->unk02; - modelasmPrepareRotMtx180(t2, t3, t4); + modelasm_prepare_rot_mtx180(t2, t3, t4); } - modelasmMathPain3(); + modelasm_math_pain3(); } } else { f12 = 1; @@ -578,7 +578,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) f0 = 0; - rwdata = modelasmGetNodeRwData(model, node, sp7f8); + rwdata = modelasm_get_node_rw_data(model, node, sp7f8); yrot = rwdata->chrinfo.yrot; @@ -653,11 +653,11 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) t0mtx = renderdata->unk00; t1mtx = &model->matrices[node->rodata->chrinfo.mtxindex]; - modelasmMtxMultiply(t0mtx, t1mtx); + modelasm_mtx_multiply(t0mtx, t1mtx); } break; case MODELNODETYPE_HEADSPOT: - rwdata = modelasmGetNodeRwData(model, node, sp7f8); + rwdata = modelasm_get_node_rw_data(model, node, sp7f8); if (rwdata->headspot.headmodeldef) { struct modelnode *iternode = rwdata->headspot.headmodeldef->rootnode; @@ -671,7 +671,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) } break; case MODELNODETYPE_POSITIONHELD: - t0mtx = node->parent ? modelasmFindNodeMtx(model, node->parent) : renderdata->unk00; + t0mtx = node->parent ? modelasm_find_node_mtx(model, node->parent) : renderdata->unk00; f12 = 1; f13 = 0; @@ -691,12 +691,12 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) t1mtx = &model->matrices[node->rodata->positionheld.mtxindex]; - modelasmMtxMultiply(t0mtx, t1mtx); + modelasm_mtx_multiply(t0mtx, t1mtx); break; case MODELNODETYPE_REORDER: break; case MODELNODETYPE_TOGGLE: - rwdata = modelasmGetNodeRwData(model, node, sp7f8); + rwdata = modelasm_get_node_rw_data(model, node, sp7f8); node->child = rwdata->toggle.visible ? node->rodata->toggle.target : NULL; break; @@ -716,7 +716,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) if ((node->type & 0xff) == MODELNODETYPE_HEADSPOT) { // @bug: // sp7f8 tracks whether we are under the head node - // which allows modelasmGetNodeRwData to avoid + // which allows modelasm_get_node_rw_data to avoid // searching for the head node if we're already // above it. The code here is ascending back out of // the head node, so it should be setting it to @@ -741,7 +741,7 @@ bool modelasm00018680(struct modelrenderdata *renderdata, struct model *model) * t3 = pointer to end of anim header * t6 = pointer to anim frame bytes */ -static bool modelasmIterateThings1(void) +static bool modelasm_iterate_things1(void) { s32 t7; s32 t8; @@ -761,7 +761,7 @@ static bool modelasmIterateThings1(void) if (t7 & 2) { // 0, 1, 2 v1 = t2ptr8[2]; - s0 = modelasmReadFrameData(); + s0 = modelasm_read_frame_data(); v1 = t2ptr8[2]; s3 = 1; @@ -786,7 +786,7 @@ static bool modelasmIterateThings1(void) // 3, 4, 5 v1 = t2ptr8[5]; - s1 = modelasmReadFrameData(); + s1 = modelasm_read_frame_data(); v1 = t2ptr8[5]; s3 = 1; @@ -811,7 +811,7 @@ static bool modelasmIterateThings1(void) // 6, 7, 8 v1 = t2ptr8[8]; - s2 = modelasmReadFrameData(); + s2 = modelasm_read_frame_data(); v1 = t2ptr8[8]; s3 = 1; @@ -867,19 +867,19 @@ static bool modelasmIterateThings1(void) if (t7 & 1) { v1 = t2ptr8[2]; - s0 = modelasmReadFrameData(); + s0 = modelasm_read_frame_data(); s0 += (t2ptr8[0] << 8) + t2ptr8[1]; v0 = 16 - t4; s0 = (s0 << v0) & 0xffff; v1 = t2ptr8[5]; - s1 = modelasmReadFrameData(); + s1 = modelasm_read_frame_data(); s1 += (t2ptr8[3] << 8) + t2ptr8[4]; v0 = 16 - t4; s1 = (s1 << v0) & 0xffff; v1 = t2ptr8[8]; - s2 = modelasmReadFrameData(); + s2 = modelasm_read_frame_data(); s2 += (t2ptr8[6] << 8) + t2ptr8[7]; v0 = 16 - t4; s2 = (s2 << v0) & 0xffff; @@ -909,7 +909,7 @@ static bool modelasmIterateThings1(void) * t6 = pointer to anim frame bytes * f0 containing an integer */ -static bool modelasmIterateThings2(void) +static bool modelasm_iterate_things2(void) { s32 t7; s32 t8; @@ -978,19 +978,19 @@ static bool modelasmIterateThings2(void) s2 = 0; } else { v1 = t2ptr8[2]; - s0 = modelasmReadFrameData(); + s0 = modelasm_read_frame_data(); s0 += (t2ptr8[0] << 8) + t2ptr8[1]; v0 = 16 - t4; s0 = (s0 << v0) & 0xffff; v1 = t2ptr8[5]; - s1 = modelasmReadFrameData(); + s1 = modelasm_read_frame_data(); s1 += (t2ptr8[3] << 8) + t2ptr8[4]; v0 = 16 - t4; s1 = (s1 << v0) & 0xffff; v1 = t2ptr8[8]; - s2 = modelasmReadFrameData(); + s2 = modelasm_read_frame_data(); s2 += (t2ptr8[6] << 8) + t2ptr8[7]; v0 = 16 - t4; s2 = (s2 << v0) & 0xffff; @@ -1094,7 +1094,7 @@ static bool modelasmIterateThings2(void) /** * Expects: t3 t6 v1 gp s8 */ -static u32 modelasmReadFrameData(void) +static u32 modelasm_read_frame_data(void) { u32 v0 = 0; s32 s6; @@ -1168,7 +1168,7 @@ u8 var8005ef90[] = { 0x14, 0x00, }; -static union modelrwdata *modelasmGetNodeRwData(struct model *model, struct modelnode *node, bool is_head) +static union modelrwdata *modelasm_get_node_rw_data(struct model *model, struct modelnode *node, bool is_head) { u32 index = 0; u32 *rwdatas = model->rwdatas; @@ -1185,7 +1185,7 @@ static union modelrwdata *modelasmGetNodeRwData(struct model *model, struct mode node = node->parent; if ((node->type & 0xff) == MODELNODETYPE_HEADSPOT) { - union modelrwdata *tmp = modelasmGetNodeRwData(model, node, false); + union modelrwdata *tmp = modelasm_get_node_rw_data(model, node, false); rwdatas = tmp->headspot.rwdatas; break; } @@ -1196,7 +1196,7 @@ static union modelrwdata *modelasmGetNodeRwData(struct model *model, struct mode } #if VERSION < VERSION_NTSC_1_0 -void *modelGetNodeRwData(struct model *model, struct modelnode *node) +void *model_get_node_rw_data(struct model *model, struct modelnode *node) { u32 index = 0; u32 *rwdatas = model->rwdatas; @@ -1213,7 +1213,7 @@ void *modelGetNodeRwData(struct model *model, struct modelnode *node) node = node->parent; if ((node->type & 0xff) == MODELNODETYPE_HEADSPOT) { - struct modelrwdata_headspot *tmp = modelGetNodeRwData(model, node); + struct modelrwdata_headspot *tmp = model_get_node_rw_data(model, node); rwdatas = tmp->rwdatas; break; } @@ -1227,7 +1227,7 @@ void *modelGetNodeRwData(struct model *model, struct modelnode *node) /** * Expects: f0-f3, f16-f22 */ -static void modelasmMathPain1(f32 f30) +static void modelasm_math_pain1(f32 f30) { f32 f6; f32 f7; @@ -1273,7 +1273,7 @@ static void modelasmMathPain1(f32 f30) } if (f6 <= 0.99994999170303f) { - f7 = modelasmAcosOrAsin(f6); + f7 = modelasm_acos_or_asin(f6); f20 = f0; f21 = sinf(f7); f22 = sinf((1.0f - f30) * f7); @@ -1303,7 +1303,7 @@ static void modelasmMathPain1(f32 f30) /** * Expects: f0 f1 f2 f3 f4 f5 */ -static void modelasmMathPain2(void) +static void modelasm_math_pain2(void) { f32 f6; f32 f7; @@ -1332,7 +1332,7 @@ static void modelasmMathPain2(void) f3 = f26 - f10; } -static void modelasmPrepareRotMtx180(s32 t2, s32 t3, s32 t4) +static void modelasm_prepare_rot_mtx180(s32 t2, s32 t3, s32 t4) { // Very close to: 1.0f / (180 * 180 / M_PI) f32 f8 = t4 * 0.000095873801910784f; @@ -1347,7 +1347,7 @@ static void modelasmPrepareRotMtx180(s32 t2, s32 t3, s32 t4) f0 = sinf(f6 + RAD(90, 1.570796251297f)); } -static void modelasmPrepareRotMtx360(s32 t2, s32 t3, s32 t4) +static void modelasm_prepare_rot_mtx360(s32 t2, s32 t3, s32 t4) { // Very close to: 1.0f / (360 * 180 / M_PI) f32 f8 = t4 * 0.000047936900955392f; @@ -1365,7 +1365,7 @@ static void modelasmPrepareRotMtx360(s32 t2, s32 t3, s32 t4) /** * Expects: f0 f1 f2 f3 f4 f5 */ -static void modelasmMathPain3(void) +static void modelasm_math_pain3(void) { f32 f6 = f1 * f5; f32 f7 = f0 * f5; @@ -1388,7 +1388,7 @@ static void modelasmMathPain3(void) /** * Expects: f0 f1 f2 f3 */ -static void modelasmMathPain4(void) +static void modelasm_math_pain4(void) { f32 f6; f32 f7; @@ -1439,7 +1439,7 @@ static void modelasmMathPain4(void) /** * Expects: f12-f23 */ -static void modelasmMtxMultiply(Mtxf *src, Mtxf *dst) +static void modelasm_mtx_multiply(Mtxf *src, Mtxf *dst) { f32 f0; f32 f1; @@ -1491,7 +1491,7 @@ static void modelasmMtxMultiply(Mtxf *src, Mtxf *dst) dst->m[3][3] = 1; } -static Mtxf *modelasmFindNodeMtx(struct model *model, struct modelnode *node) +static Mtxf *modelasm_find_node_mtx(struct model *model, struct modelnode *node) { do { u8 type = node->type & 0xff; @@ -1517,7 +1517,7 @@ static Mtxf *modelasmFindNodeMtx(struct model *model, struct modelnode *node) /** * See similar function func0f096890. */ -static f32 modelasmAcosOrAsin(f32 f6) +static f32 modelasm_acos_or_asin(f32 f6) { s32 t2; s32 t3; diff --git a/src/lib/mp3.c b/src/lib/mp3.c index 325993d76..ab0adf9af 100644 --- a/src/lib/mp3.c +++ b/src/lib/mp3.c @@ -35,12 +35,12 @@ extern f32 *var8009c6dc; extern struct mp3decfourbytes *var8009c640; extern f32 *var8009c644; -void mp3Init(ALHeap *heap) +void mp3_init(ALHeap *heap) { bzero(&g_Mp3Vars, sizeof(struct mp3vars)); #if VERSION < VERSION_NTSC_1_0 - rmonPrintf("MPEG : RWI -> Allocating %d bytes for ASISTREAM from audio heap\n", sizeof(struct asistream)); + rmon_printf("MPEG : RWI -> Allocating %d bytes for ASISTREAM from audio heap\n", sizeof(struct asistream)); #endif g_AsiStream = alHeapAlloc(heap, sizeof(struct asistream), 1); @@ -52,7 +52,7 @@ void mp3Init(ALHeap *heap) var8009c640 = alHeapAlloc(heap, 10500 * sizeof(struct mp3decfourbytes), 1); var8009c644 = alHeapAlloc(heap, 8192 * sizeof(var8009c644[0]), 1); - mp3mainInit(); + mp3main_init(); g_Mp3Vars.var8009c398 = alHeapAlloc(heap, 1, ALIGN16(sizeof(ALEnvMixer))); g_Mp3Vars.var8009c3d4[0] = alHeapAlloc(heap, 1, 0x440); @@ -77,7 +77,7 @@ void mp3Init(ALHeap *heap) func00038b90(func00038ba8); } -void mp3PlayFile(s32 romaddr, s32 filesize) +void mp3_play_file(s32 romaddr, s32 filesize) { if (g_Mp3Vars.var8009c3dc == NULL) { return; @@ -90,7 +90,7 @@ void mp3PlayFile(s32 romaddr, s32 filesize) g_Mp3Vars.var8009c3e4 = 0x7fff; g_Mp3Vars.var8009c3f0 = 5; - mp3Dma(); + mp3_dma(); g_Mp3Vars.var8009c3e0 = 4; } @@ -186,7 +186,7 @@ s32 func00037fc0(s32 arg0, Acmd **cmd) } if (g_Mp3Vars.var8009c3e0 == 4) { - mp3Dma(); + mp3_dma(); if (g_Mp3Vars.var8009c3f0 == 0) { g_Mp3Vars.var8009c394 = mp3main00044460(0, g_Mp3Vars.var8009c3dc, g_Mp3Vars.filesize); @@ -210,7 +210,7 @@ s32 func00037fc0(s32 arg0, Acmd **cmd) } if (g_Mp3Vars.var8009c3e0 == 5) { - mp3Dma(); + mp3_dma(); if (g_Mp3Vars.var8009c3f0 == 0) { g_Mp3Vars.var8009c3e0 = 1; @@ -249,7 +249,7 @@ s32 func00037fc0(s32 arg0, Acmd **cmd) } } - mp3Dma(); + mp3_dma(); if (g_Mp3Vars.var8009c3f1 == 0) { sp4c = 0; @@ -390,7 +390,7 @@ s32 func00038ba8(s32 arg0, u8 *arg1, s32 arg2, s32 arg3) return arg2; } -void mp3Dma(void) +void mp3_dma(void) { u32 state; ALDMAproc proc; diff --git a/src/lib/mp3/decoder.c b/src/lib/mp3/decoder.c index 7b3946a45..fd8ce4748 100644 --- a/src/lib/mp3/decoder.c +++ b/src/lib/mp3/decoder.c @@ -2078,7 +2078,7 @@ extern struct mp3decfourbytes *var8009c650[]; extern f32 *var8009c6d8; extern f32 *var8009c6dc; -bool mp3decInit(void) +bool mp3dec_init(void) { s32 i; s32 sp268; @@ -2382,7 +2382,7 @@ bool mp3dec00040164(struct asistream *stream, u32 gr, u32 ch) return true; } -bool mp3decUnpackScaleFac(struct asistream *stream, u32 gr, u32 ch) +bool mp3dec_unpack_scale_fac(struct asistream *stream, u32 gr, u32 ch) { s32 i; s32 sfb; @@ -2393,7 +2393,7 @@ bool mp3decUnpackScaleFac(struct asistream *stream, u32 gr, u32 ch) for (sfb = 0; sfb < 8; sfb++) { stream->scalefac[gr][ch].l[sfb] = var70057b7c[0][stream->scalefac_compress[gr][ch]] - ? mp3utilGetBits(stream->unk1c, &stream->unk2020, var70057b7c[0][stream->scalefac_compress[gr][ch]]) + ? mp3util_get_bits(stream->unk1c, &stream->unk2020, var70057b7c[0][stream->scalefac_compress[gr][ch]]) : 0; } @@ -2401,7 +2401,7 @@ bool mp3decUnpackScaleFac(struct asistream *stream, u32 gr, u32 ch) for (window = 0; window < 3; window++) { stream->scalefac[gr][ch].s[window][sfb] = var70057b7c[0][stream->scalefac_compress[gr][ch]] - ? mp3utilGetBits(stream->unk1c, &stream->unk2020, var70057b7c[0][stream->scalefac_compress[gr][ch]]) + ? mp3util_get_bits(stream->unk1c, &stream->unk2020, var70057b7c[0][stream->scalefac_compress[gr][ch]]) : 0; } } @@ -2410,7 +2410,7 @@ bool mp3decUnpackScaleFac(struct asistream *stream, u32 gr, u32 ch) for (window = 0; window < 3; window++) { stream->scalefac[gr][ch].s[window][sfb] = var70057b7c[1][stream->scalefac_compress[gr][ch]] - ? mp3utilGetBits(stream->unk1c, &stream->unk2020, var70057b7c[1][stream->scalefac_compress[gr][ch]]) + ? mp3util_get_bits(stream->unk1c, &stream->unk2020, var70057b7c[1][stream->scalefac_compress[gr][ch]]) : 0; } } @@ -2420,7 +2420,7 @@ bool mp3decUnpackScaleFac(struct asistream *stream, u32 gr, u32 ch) for (window = 0; window < 3; window++) { stream->scalefac[gr][ch].s[window][sfb] = var70057b7c[i][stream->scalefac_compress[gr][ch]] - ? mp3utilGetBits(stream->unk1c, &stream->unk2020, var70057b7c[i][stream->scalefac_compress[gr][ch]]) + ? mp3util_get_bits(stream->unk1c, &stream->unk2020, var70057b7c[i][stream->scalefac_compress[gr][ch]]) : 0; } } @@ -2436,7 +2436,7 @@ bool mp3decUnpackScaleFac(struct asistream *stream, u32 gr, u32 ch) for (sfb = var70057b74[i]; sfb < var70057b74[i + 1]; sfb++) { stream->scalefac[gr][ch].l[sfb] = var70057b7c[i < 2 ? 0 : 1][stream->scalefac_compress[gr][ch]] - ? mp3utilGetBits(stream->unk1c, &stream->unk2020, var70057b7c[i < 2 ? 0 : 1][stream->scalefac_compress[gr][ch]]) + ? mp3util_get_bits(stream->unk1c, &stream->unk2020, var70057b7c[i < 2 ? 0 : 1][stream->scalefac_compress[gr][ch]]) : 0; } } else { @@ -2560,7 +2560,7 @@ bool mp3dec00041600(struct asistream *stream, u32 gr, u32 ch) sp1c = (1 << sp20) - 1; for (j = 0; j < sp28[i]; j++) { - stream->scalefac[0][ch].l[sfb] = sp20 ? mp3utilGetBits(stream->unk1c, &stream->unk2020, sp20) : 0; + stream->scalefac[0][ch].l[sfb] = sp20 ? mp3util_get_bits(stream->unk1c, &stream->unk2020, sp20) : 0; if (ch != 0) { stream->unk3efc[sfb] = sp1c; @@ -2576,9 +2576,9 @@ bool mp3dec00041600(struct asistream *stream, u32 gr, u32 ch) sp1c = (1 << sp20) - 1; for (j = 0; j < sp28[i]; j += 3) { - stream->scalefac[0][ch].s[0][sfb] = sp20 ? mp3utilGetBits(stream->unk1c, &stream->unk2020, sp20) : 0; - stream->scalefac[0][ch].s[1][sfb] = sp20 ? mp3utilGetBits(stream->unk1c, &stream->unk2020, sp20) : 0; - stream->scalefac[0][ch].s[2][sfb] = sp20 ? mp3utilGetBits(stream->unk1c, &stream->unk2020, sp20) : 0; + stream->scalefac[0][ch].s[0][sfb] = sp20 ? mp3util_get_bits(stream->unk1c, &stream->unk2020, sp20) : 0; + stream->scalefac[0][ch].s[1][sfb] = sp20 ? mp3util_get_bits(stream->unk1c, &stream->unk2020, sp20) : 0; + stream->scalefac[0][ch].s[2][sfb] = sp20 ? mp3util_get_bits(stream->unk1c, &stream->unk2020, sp20) : 0; if (ch != 0) { stream->unk3f14[sfb] = sp1c; @@ -2592,7 +2592,7 @@ bool mp3dec00041600(struct asistream *stream, u32 gr, u32 ch) sp1c = (1 << sp20) - 1; for (j = 0; j < 6; j++) { - stream->scalefac[0][ch].l[sfb] = sp20 ? mp3utilGetBits(stream->unk1c, &stream->unk2020, sp20) : 0; + stream->scalefac[0][ch].l[sfb] = sp20 ? mp3util_get_bits(stream->unk1c, &stream->unk2020, sp20) : 0; if (ch != 0) { stream->unk3efc[sfb] = sp1c; @@ -2609,9 +2609,9 @@ bool mp3dec00041600(struct asistream *stream, u32 gr, u32 ch) sp1c = (1 << sp20) - 1; for (j = 0; j < sp28[i]; j += 3) { - stream->scalefac[0][ch].s[0][sfb] = sp20 ? mp3utilGetBits(stream->unk1c, &stream->unk2020, sp20) : 0; - stream->scalefac[0][ch].s[1][sfb] = sp20 ? mp3utilGetBits(stream->unk1c, &stream->unk2020, sp20) : 0; - stream->scalefac[0][ch].s[2][sfb] = sp20 ? mp3utilGetBits(stream->unk1c, &stream->unk2020, sp20) : 0; + stream->scalefac[0][ch].s[0][sfb] = sp20 ? mp3util_get_bits(stream->unk1c, &stream->unk2020, sp20) : 0; + stream->scalefac[0][ch].s[1][sfb] = sp20 ? mp3util_get_bits(stream->unk1c, &stream->unk2020, sp20) : 0; + stream->scalefac[0][ch].s[2][sfb] = sp20 ? mp3util_get_bits(stream->unk1c, &stream->unk2020, sp20) : 0; if (ch != 0) { stream->unk3f14[sfb] = sp1c; @@ -2644,7 +2644,7 @@ bool mp3dec00042238(struct asistream *stream, u32 gr, u32 ch) s32 sp28; if (stream->version != VERSION_2) { - mp3decUnpackScaleFac(stream, gr, ch); + mp3dec_unpack_scale_fac(stream, gr, ch); } else { mp3dec00041600(stream, gr, ch); } @@ -2749,7 +2749,7 @@ bool mp3dec000427d8(struct asistream *stream, u32 gr) return true; } -bool mp3decReduceAliases(struct asistream *stream, u32 gr, u32 ch) +bool mp3dec_reduce_aliases(struct asistream *stream, u32 gr, u32 ch) { s32 i; @@ -2806,7 +2806,7 @@ bool mp3decReduceAliases(struct asistream *stream, u32 gr, u32 ch) return true; } -bool mp3decSetSideInfo(struct asistream *stream) +bool mp3dec_set_side_info(struct asistream *stream) { s32 sp34; s32 ch; @@ -2834,24 +2834,24 @@ bool mp3decSetSideInfo(struct asistream *stream) stream->numgranules = stream->version != VERSION_2 ? 2 : 1; if (stream->version != VERSION_2) { - stream->main_data_begin = mp3utilGetBits(stream->buffer, &stream->count, 9); + stream->main_data_begin = mp3util_get_bits(stream->buffer, &stream->count, 9); // skip private bits stream->numchannels == 1 - ? mp3utilGetBits(stream->buffer, &stream->count, 5) - : mp3utilGetBits(stream->buffer, &stream->count, 3); + ? mp3util_get_bits(stream->buffer, &stream->count, 5) + : mp3util_get_bits(stream->buffer, &stream->count, 3); } else { - stream->main_data_begin = mp3utilGetBits(stream->buffer, &stream->count, 8); + stream->main_data_begin = mp3util_get_bits(stream->buffer, &stream->count, 8); stream->numchannels == 1 - ? mp3utilGetBits(stream->buffer, &stream->count, 1) - : mp3utilGetBits(stream->buffer, &stream->count, 2); + ? mp3util_get_bits(stream->buffer, &stream->count, 1) + : mp3util_get_bits(stream->buffer, &stream->count, 2); } if (stream->version != VERSION_2) { for (ch = 0; ch < stream->numchannels; ch++) { for (scfsi_band = 0; scfsi_band < 4; scfsi_band++) { - stream->scfsi[ch][scfsi_band] = mp3utilGetBits(stream->buffer, &stream->count, 1); + stream->scfsi[ch][scfsi_band] = mp3util_get_bits(stream->buffer, &stream->count, 1); } } } @@ -2864,43 +2864,43 @@ bool mp3decSetSideInfo(struct asistream *stream) for (gr = 0; gr < stream->numgranules; gr++) { for (ch = 0; ch < stream->numchannels; ch++) { - stream->part2_3_length[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 12); - stream->big_value[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 9); - stream->global_gain[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 8); - stream->scalefac_compress[gr][ch] = sp28 ? mp3utilGetBits(stream->buffer, &stream->count, sp28) : 0; - stream->window_switching[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 1); + stream->part2_3_length[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 12); + stream->big_value[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 9); + stream->global_gain[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 8); + stream->scalefac_compress[gr][ch] = sp28 ? mp3util_get_bits(stream->buffer, &stream->count, sp28) : 0; + stream->window_switching[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 1); if (stream->window_switching[gr][ch]) { - stream->block_type[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 2); - stream->mixed_block_flag[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 1); + stream->block_type[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 2); + stream->mixed_block_flag[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 1); for (region = 0; region < 2; region++) { - stream->table_select[gr][ch][region] = mp3utilGetBits(stream->buffer, &stream->count, 5); + stream->table_select[gr][ch][region] = mp3util_get_bits(stream->buffer, &stream->count, 5); } stream->table_select[gr][ch][2] = 0; for (window = 0; window < 3; window++) { - stream->subblock_gain[gr][ch][window] = mp3utilGetBits(stream->buffer, &stream->count, 3); + stream->subblock_gain[gr][ch][window] = mp3util_get_bits(stream->buffer, &stream->count, 3); } } else { stream->block_type[gr][ch] = 0; stream->mixed_block_flag[gr][ch] = false; for (region = 0; region < 3; region++) { - stream->table_select[gr][ch][region] = mp3utilGetBits(stream->buffer, &stream->count, 5); + stream->table_select[gr][ch][region] = mp3util_get_bits(stream->buffer, &stream->count, 5); } - stream->region0_count[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 4); - stream->region1_count[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 3); + stream->region0_count[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 4); + stream->region1_count[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 3); } if (stream->version != VERSION_2) { - stream->preflag[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 1); + stream->preflag[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 1); } - stream->scalefac_scale[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 1); - stream->count1table_select[gr][ch] = mp3utilGetBits(stream->buffer, &stream->count, 1); + stream->scalefac_scale[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 1); + stream->count1table_select[gr][ch] = mp3util_get_bits(stream->buffer, &stream->count, 1); } } @@ -2918,7 +2918,7 @@ bool mp3decSetSideInfo(struct asistream *stream) return true; } -bool mp3decDecodeFrame(struct asistream *stream) +bool mp3dec_decode_frame(struct asistream *stream) { s32 sp954; s32 gr = 0; @@ -2964,7 +2964,7 @@ bool mp3decDecodeFrame(struct asistream *stream) } for (ch = 0; ch < stream->numchannels; ch++) { - mp3decReduceAliases(stream, gr, ch); + mp3dec_reduce_aliases(stream, gr, ch); if (stream->window_switching[gr][ch] != 0 && stream->block_type[gr][ch] == 2 diff --git a/src/lib/mp3/internal.h b/src/lib/mp3/internal.h index 7a2d87be1..e39769487 100644 --- a/src/lib/mp3/internal.h +++ b/src/lib/mp3/internal.h @@ -3,15 +3,15 @@ #include #include "mp3.h" -bool mp3decInit(void); -bool mp3decSetSideInfo(struct asistream *stream); -bool mp3decDecodeFrame(struct asistream *stream); +bool mp3dec_init(void); +bool mp3dec_set_side_info(struct asistream *stream); +bool mp3dec_decode_frame(struct asistream *stream); s32 mp3main00043dd0(struct asistream *stream); f32 func00045ed0(f32 arg0, f32 arg1); -s32 mp3utilGetBits(u8 *buffer, s32 *count, s32 numbits); +s32 mp3util_get_bits(u8 *buffer, s32 *count, s32 numbits); s32 mp3util000462f8(u8 *arg0, s32 *arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s16 **arg6, u8 **arg7); s32 mp3util000464a8(u8 *arg0, s32 *arg1, s32 arg2, s32 arg3, s32 arg4, s16 **arg5, u8 **arg6); diff --git a/src/lib/mp3/main.c b/src/lib/mp3/main.c index 479087509..1552192f2 100644 --- a/src/lib/mp3/main.c +++ b/src/lib/mp3/main.c @@ -91,19 +91,19 @@ bool mp3main00043ef8(struct asistream *stream, s32 arg1) stream->unk18 += 2; stream->count = 12; - stream->version = mp3utilGetBits(stream->buffer, &stream->count, 1); - stream->layer = mp3utilGetBits(stream->buffer, &stream->count, 2); - stream->crctype = mp3utilGetBits(stream->buffer, &stream->count, 1); - stream->bitrateindex = mp3utilGetBits(stream->buffer, &stream->count, 4); - stream->samplerateindex = mp3utilGetBits(stream->buffer, &stream->count, 2); - stream->haspadding = mp3utilGetBits(stream->buffer, &stream->count, 1); - stream->privatebit = mp3utilGetBits(stream->buffer, &stream->count, 1); - stream->channelmode = mp3utilGetBits(stream->buffer, &stream->count, 2); + stream->version = mp3util_get_bits(stream->buffer, &stream->count, 1); + stream->layer = mp3util_get_bits(stream->buffer, &stream->count, 2); + stream->crctype = mp3util_get_bits(stream->buffer, &stream->count, 1); + stream->bitrateindex = mp3util_get_bits(stream->buffer, &stream->count, 4); + stream->samplerateindex = mp3util_get_bits(stream->buffer, &stream->count, 2); + stream->haspadding = mp3util_get_bits(stream->buffer, &stream->count, 1); + stream->privatebit = mp3util_get_bits(stream->buffer, &stream->count, 1); + stream->channelmode = mp3util_get_bits(stream->buffer, &stream->count, 2); - stream->unk3bc4 = mp3utilGetBits(stream->buffer, &stream->count, 2); - stream->unk3bc8 = mp3utilGetBits(stream->buffer, &stream->count, 1); - stream->unk3bcc = mp3utilGetBits(stream->buffer, &stream->count, 1); - stream->unk3bd0 = mp3utilGetBits(stream->buffer, &stream->count, 2); + stream->unk3bc4 = mp3util_get_bits(stream->buffer, &stream->count, 2); + stream->unk3bc8 = mp3util_get_bits(stream->buffer, &stream->count, 1); + stream->unk3bcc = mp3util_get_bits(stream->buffer, &stream->count, 1); + stream->unk3bd0 = mp3util_get_bits(stream->buffer, &stream->count, 2); if (stream->bitrateindex == 15 || stream->samplerateindex == 3) { return mp3main00043ef8(stream, -1); @@ -143,8 +143,8 @@ bool mp3main00043ef8(struct asistream *stream, s32 arg1) } if (stream->layer == LAYER_3) { - stream->unk8478 = mp3decDecodeFrame; - stream->unk847c = mp3decSetSideInfo; + stream->unk8478 = mp3dec_decode_frame; + stream->unk847c = mp3dec_set_side_info; } else if (stream->layer == LAYER_2) { return false; } else if (stream->layer == LAYER_1) { @@ -158,13 +158,13 @@ bool mp3main00043ef8(struct asistream *stream, s32 arg1) return true; } -u32 mp3mainInit(void) +u32 mp3main_init(void) { if (var8005f704++) { return 2; } - mp3decInit(); + mp3dec_init(); return 0; } diff --git a/src/lib/mp3/mp3.h b/src/lib/mp3/mp3.h index 14ac2c6f6..d527429d2 100644 --- a/src/lib/mp3/mp3.h +++ b/src/lib/mp3/mp3.h @@ -96,7 +96,7 @@ struct asistream { /*0x847c*/ bool (*unk847c)(struct asistream *stream); }; -u32 mp3mainInit(void); +u32 mp3main_init(void); struct asistream *mp3main00044460(s32 arg0, void *arg1, s32 arg2); s32 mp3main0004453c(struct asistream *stream, struct mp3thing **arg1, s32 *arg2); diff --git a/src/lib/mp3/util.s b/src/lib/mp3/util.s index e7ecff7d4..c385d3d4b 100644 --- a/src/lib/mp3/util.s +++ b/src/lib/mp3/util.s @@ -77,7 +77,7 @@ glabel mp3util00046290 jr $ra add $t0, $t0, $s1 -glabel mp3utilGetBits +glabel mp3util_get_bits lw $t0, 0x0($a1) srl $t1, $t0, 0x3 add $a0, $a0, $t1 diff --git a/src/lib/mtx.c b/src/lib/mtx.c index ec99dad30..154bce19c 100644 --- a/src/lib/mtx.c +++ b/src/lib/mtx.c @@ -12,7 +12,7 @@ void mtx00016110(f32 mtx1[3][3], f32 mtx2[3][3]) f32 mtx3[3][3]; mtx00016140(mtx1, mtx2, mtx3); - mtx3Copy(mtx3, mtx2); + mtx3_copy(mtx3, mtx2); } void mtx00016140(f32 mtx1[3][3], f32 mtx2[3][3], f32 dst[3][3]) @@ -47,7 +47,7 @@ void mtx00016208(f32 mtx[3][3], struct coord *coord) coord->z = tmp[2]; } -void mtx4LoadYRotationWithTranslation(struct coord *coord, f32 angle, Mtxf *mtx) +void mtx4_load_y_rotation_with_translation(struct coord *coord, f32 angle, Mtxf *mtx) { f32 cos = cosf(angle); f32 sin = sinf(angle); @@ -74,7 +74,7 @@ void mtx4LoadYRotationWithTranslation(struct coord *coord, f32 angle, Mtxf *mtx) } #if VERSION < VERSION_NTSC_1_0 -void mtx4LoadXRotationWithTranslation(struct coord *coord, f32 angle, Mtxf *mtx) +void mtx4_load_x_rotation_with_translation(struct coord *coord, f32 angle, Mtxf *mtx) { f32 cos = cosf(angle); f32 sin = sinf(angle); @@ -101,7 +101,7 @@ void mtx4LoadXRotationWithTranslation(struct coord *coord, f32 angle, Mtxf *mtx) } #endif -void mtx4LoadXRotation(f32 angle, Mtxf *mtx) +void mtx4_load_x_rotation(f32 angle, Mtxf *mtx) { f32 cos = cosf(angle); f32 sin = sinf(angle); @@ -127,7 +127,7 @@ void mtx4LoadXRotation(f32 angle, Mtxf *mtx) mtx->m[3][3] = 1; } -void mtx4LoadYRotation(f32 angle, Mtxf *mtx) +void mtx4_load_y_rotation(f32 angle, Mtxf *mtx) { f32 cos = cosf(angle); f32 sin = sinf(angle); @@ -153,7 +153,7 @@ void mtx4LoadYRotation(f32 angle, Mtxf *mtx) mtx->m[3][3] = 1; } -void mtx4LoadZRotation(f32 angle, Mtxf *mtx) +void mtx4_load_z_rotation(f32 angle, Mtxf *mtx) { f32 cos = cosf(angle); f32 sin = sinf(angle); @@ -179,7 +179,7 @@ void mtx4LoadZRotation(f32 angle, Mtxf *mtx) mtx->m[3][3] = 1; } -void mtx4LoadRotation(struct coord *src, Mtxf *dest) +void mtx4_load_rotation(struct coord *src, Mtxf *dest) { f32 xcos = cosf(src->x); f32 xsin = sinf(src->x); @@ -215,7 +215,7 @@ void mtx4LoadRotation(struct coord *src, Mtxf *dest) #define EPSILON 0.0000019073486f -void mtx4GetRotation(f32 mtx[4][4], struct coord *dst) +void mtx4_get_rotation(f32 mtx[4][4], struct coord *dst) { f32 norm; f32 sin_x_cos_y = mtx[1][2]; @@ -234,16 +234,16 @@ void mtx4GetRotation(f32 mtx[4][4], struct coord *dst) } } -void mtx4LoadRotationAndTranslation(struct coord *pos, struct coord *rot, Mtxf *mtx) +void mtx4_load_rotation_and_translation(struct coord *pos, struct coord *rot, Mtxf *mtx) { - mtx4LoadRotation(rot, mtx); - mtx4SetTranslation(pos, mtx); + mtx4_load_rotation(rot, mtx); + mtx4_set_translation(pos, mtx); } -void mtx4LoadTranslation(struct coord *pos, Mtxf *mtx) +void mtx4_load_translation(struct coord *pos, Mtxf *mtx) { - mtx4LoadIdentity(mtx); - mtx4SetTranslation(pos, mtx); + mtx4_load_identity(mtx); + mtx4_set_translation(pos, mtx); } void mtx00016710(f32 mult, f32 mtx[4][4]) @@ -479,34 +479,34 @@ void mtx00016e98(f32 mtx[4][4], f32 angle, f32 x, f32 y, f32 z) return; } - mtx4LoadIdentity((Mtxf *)mtx); + mtx4_load_identity((Mtxf *)mtx); } -void mtx4Align(f32 mtx[4][4], f32 angle, f32 x, f32 y, f32 z) +void mtx4_align(f32 mtx[4][4], f32 angle, f32 x, f32 y, f32 z) { angle = RAD2DEG(angle); guAlignF(mtx, angle, x, y, z); } #if VERSION < VERSION_NTSC_1_0 -void mtx4Print(f32 mtx[4][4]) +void mtx4_print(f32 mtx[4][4]) { s32 i; s32 j; for (i = 0; i < 4; i++) { - rmonPrintf("("); + rmon_printf("("); for (j = 0; j < 4; j++) { - rmonPrintf("%s%s %9f", "", "", mtx[i][j]); + rmon_printf("%s%s %9f", "", "", mtx[i][j]); } - rmonPrintf(" )\n"); + rmon_printf(" )\n"); } } #endif -void mtx4LoadRotationFrom(f32 src[4][4], f32 dst[4][4]) +void mtx4_load_rotation_from(f32 src[4][4], f32 dst[4][4]) { dst[0][0] = src[0][0]; dst[0][1] = src[1][0]; diff --git a/src/lib/mtx_c.c b/src/lib/mtx_c.c index f2d0435c1..6b96baeb9 100644 --- a/src/lib/mtx_c.c +++ b/src/lib/mtx_c.c @@ -7,7 +7,7 @@ f32 var8005ef10[] = {65536, 65536}; -void mtx4LoadIdentity(Mtxf *mtx) +void mtx4_load_identity(Mtxf *mtx) { mtx->m[0][0] = 1; mtx->m[0][1] = 0; @@ -30,12 +30,12 @@ void mtx4LoadIdentity(Mtxf *mtx) mtx->m[3][3] = 1; } -void mtx4MultMtx4InPlace(Mtxf *multmtx, Mtxf *subject) +void mtx4_mult_mtx4_in_place(Mtxf *multmtx, Mtxf *subject) { - mtx4MultMtx4(multmtx, subject, subject); + mtx4_mult_mtx4(multmtx, subject, subject); } -void mtx4MultMtx4(Mtxf *mtx1, Mtxf *mtx2, Mtxf *dst) +void mtx4_mult_mtx4(Mtxf *mtx1, Mtxf *mtx2, Mtxf *dst) { s32 i; f32 m00 = mtx2->m[0][0]; @@ -63,12 +63,12 @@ void mtx4MultMtx4(Mtxf *mtx1, Mtxf *mtx2, Mtxf *dst) } } -void mtx4RotateVecInPlace(Mtxf *mtx, struct coord *vec) +void mtx4_rotate_vec_in_place(Mtxf *mtx, struct coord *vec) { - mtx4RotateVec(mtx, vec, vec); + mtx4_rotate_vec(mtx, vec, vec); } -void mtx4RotateVec(Mtxf *mtx, struct coord *vec, struct coord *dst) +void mtx4_rotate_vec(Mtxf *mtx, struct coord *vec, struct coord *dst) { f32 x = vec->x; f32 y = vec->y; @@ -79,12 +79,12 @@ void mtx4RotateVec(Mtxf *mtx, struct coord *vec, struct coord *dst) dst->z = mtx->m[0][2] * x + mtx->m[1][2] * y + mtx->m[2][2] * z; } -void mtx4TransformVecInPlace(Mtxf *mtx, struct coord *vec) +void mtx4_transform_vec_in_place(Mtxf *mtx, struct coord *vec) { - mtx4TransformVec(mtx, vec, vec); + mtx4_transform_vec(mtx, vec, vec); } -void mtx4TransformVec(Mtxf *mtx, struct coord *vec, struct coord *dst) +void mtx4_transform_vec(Mtxf *mtx, struct coord *vec, struct coord *dst) { f32 x = vec->x; f32 y = vec->y; @@ -144,7 +144,7 @@ void mtx00015be4(Mtxf *arg0, Mtxf *arg1, Mtxf *dst) dst->m[3][3] = 1; } -void mtx3Copy(f32 src[3][3], f32 dst[3][3]) +void mtx3_copy(f32 src[3][3], f32 dst[3][3]) { dst[0][0] = src[0][0]; dst[0][1] = src[0][1]; @@ -159,12 +159,12 @@ void mtx3Copy(f32 src[3][3], f32 dst[3][3]) dst[2][2] = src[2][2]; } -void mtx4Copy(Mtxf *src, Mtxf *dst) +void mtx4_copy(Mtxf *src, Mtxf *dst) { *dst = *src; } -void mtx3ToMtx4(f32 src[3][3], Mtxf *dst) +void mtx3_to_mtx4(f32 src[3][3], Mtxf *dst) { dst->m[0][0] = src[0][0]; dst->m[0][1] = src[0][1]; @@ -187,7 +187,7 @@ void mtx3ToMtx4(f32 src[3][3], Mtxf *dst) dst->m[3][3] = 1; } -void mtx4ToMtx3(Mtxf *src, f32 dst[3][3]) +void mtx4_to_mtx3(Mtxf *src, f32 dst[3][3]) { dst[0][0] = src->m[0][0]; dst[0][1] = src->m[0][1]; @@ -202,7 +202,7 @@ void mtx4ToMtx3(Mtxf *src, f32 dst[3][3]) dst[2][2] = src->m[2][2]; } -void mtx4SetTranslation(struct coord *pos, Mtxf *mtx) +void mtx4_set_translation(struct coord *pos, Mtxf *mtx) { mtx->m[3][0] = pos->x; mtx->m[3][1] = pos->y; @@ -306,7 +306,7 @@ void mtx00015f88(f32 mult, Mtxf *mtx) mtx->m[3][2] *= mult; } -u32 mtxGetObfuscatedRomBase(void) +u32 mtx_get_obfuscated_rom_base(void) { u32 value; @@ -324,7 +324,7 @@ u32 mtxGetObfuscatedRomBase(void) return value; } -void mtxF2L(Mtxf *src, Mtxf *dst) +void mtx_f2l(Mtxf *src, Mtxf *dst) { u32 src00 = (s32) (src->m[0][0] * var8005ef10[0]); u32 src01 = (s32) (src->m[0][1] * var8005ef10[0]); diff --git a/src/lib/mtxasm.s b/src/lib/mtxasm.s index 81cbb4611..b8463994e 100644 --- a/src/lib/mtxasm.s +++ b/src/lib/mtxasm.s @@ -11,7 +11,7 @@ glabel var8005ef10 .text -glabel mtx4LoadIdentity +glabel mtx4_load_identity lui $at, 0x3f80 mtc1 $at, $f0 sw $zero, 0x4($a0) @@ -32,10 +32,10 @@ glabel mtx4LoadIdentity jr $ra swc1 $f0, 0x3c($a0) -glabel mtx4MultMtx4InPlace +glabel mtx4_mult_mtx4_in_place add $a2, $a1, $zero -glabel mtx4MultMtx4 +glabel mtx4_mult_mtx4 mfc1 $t1, $f20 mfc1 $t2, $f21 mfc1 $t3, $f22 @@ -106,10 +106,10 @@ glabel mtx4MultMtx4 jr $ra mtc1 $t5, $f24 -glabel mtx4RotateVecInPlace +glabel mtx4_rotate_vec_in_place add $a2, $a1, $zero -glabel mtx4RotateVec +glabel mtx4_rotate_vec lwc1 $f0, 0x0($a1) lwc1 $f1, 0x4($a1) lwc1 $f2, 0x8($a1) @@ -132,10 +132,10 @@ glabel mtx4RotateVec jr $ra nop -glabel mtx4TransformVecInPlace +glabel mtx4_transform_vec_in_place add $a2, $a1, $zero -glabel mtx4TransformVec +glabel mtx4_transform_vec lwc1 $f0, 0x0($a1) lwc1 $f1, 0x4($a1) lwc1 $f2, 0x8($a1) @@ -235,7 +235,7 @@ glabel mtx00015be4 jr $ra mtc1 $t4, $f23 -glabel mtx3Copy +glabel mtx3_copy li $t0, 0x2 .L00015cdc: lw $t1, 0x0($a0) @@ -254,7 +254,7 @@ glabel mtx3Copy jr $ra sw $t0, 0x0($a1) -glabel mtx4Copy +glabel mtx4_copy li $t0, 0x4 .L00015d1c: lw $t1, 0x0($a0) @@ -272,7 +272,7 @@ glabel mtx4Copy jr $ra nop -glabel mtx3ToMtx4 +glabel mtx3_to_mtx4 li $t0, 0x3 lui $at, 0x3f80 mtc1 $at, $f4 @@ -294,7 +294,7 @@ glabel mtx3ToMtx4 jr $ra swc1 $f4, 0xc($a1) -glabel mtx4ToMtx3 +glabel mtx4_to_mtx3 li $t0, 0x3 .L00015da4: lw $t1, 0x0($a0) @@ -310,7 +310,7 @@ glabel mtx4ToMtx3 jr $ra nop -glabel mtx4SetTranslation +glabel mtx4_set_translation lw $t0, 0x0($a0) lw $t1, 0x4($a0) lw $t2, 0x8($a0) @@ -464,7 +464,7 @@ glabel mtx00015f88 * Wait for the PI to be idle, then read the osRomBase variable, use it to read * the word at ROM offset 0xa5c and return it. */ -glabel mtxGetObfuscatedRomBase +glabel mtx_get_obfuscated_rom_base addiu $sp, $sp, -0x20 sw $ra, 0x14($sp) lui $a0, %hi(__osPiAccessQueue) @@ -500,7 +500,7 @@ glabel mtxGetObfuscatedRomBase jr $ra addiu $sp, $sp, 0x20 -glabel mtxF2L +glabel mtx_f2l lui $t2, %hi(var8005ef10) addiu $t2, $t2, %lo(var8005ef10) li $t0, 0x4 diff --git a/src/lib/music.c b/src/lib/music.c index 7e7a6035b..70d6003da 100644 --- a/src/lib/music.c +++ b/src/lib/music.c @@ -19,7 +19,7 @@ const u8 var70053ca0[] = {0, 0, 0, 0, 0, 5}; s32 g_MusicNextAmbientTick240 = -1; -s32 musicHandlePlayEvent(struct musicevent *event, s32 result) +s32 music_handle_play_event(struct musicevent *event, s32 result) { s32 i; u8 value; @@ -85,13 +85,13 @@ s32 musicHandlePlayEvent(struct musicevent *event, s32 result) * main theme does not resume. * * For GCC, it's more likely to occur, so we introduce a new state: - * AL_STARTING. This is assigned to the sequence player in seqPlay. + * AL_STARTING. This is assigned to the sequence player in seq_play. */ if (n_alCSPGetState(g_SeqInstances[i].seqp) == AL_STOPPED) { osSyncPrintf("MUSIC(Play) : Starting, Guid=%u, Midi=%d, Tune=%d\n", event->id, 0, event->tracktype); - if (seqPlay(&g_SeqInstances[i], event->tracknum)) { - seqSetVolume(&g_SeqInstances[i], event->volume); + if (seq_play(&g_SeqInstances[i], event->tracknum)) { + seq_set_volume(&g_SeqInstances[i], event->volume); g_SeqChannels[i].tracktype = event->tracktype; g_SeqChannels[i].inuse = true; @@ -161,7 +161,7 @@ const char var70053f38[] = "MUSIC : Tick -> Channel %d (State=%d) has faded to s const char var70053f7c[] = "MUSIC : WARNING -> Force fade termination\n"; const char var70053fa8[] = "MUSIC TICK : Job Guid = %u\n"; -s32 musicHandleStopEvent(struct musicevent *event, s32 result) +s32 music_handle_stop_event(struct musicevent *event, s32 result) { s32 i; @@ -181,7 +181,7 @@ s32 musicHandleStopEvent(struct musicevent *event, s32 result) return RESULT_OK_NEXT; } -s32 musicHandleFadeEvent(struct musicevent *event, s32 result) +s32 music_handle_fade_event(struct musicevent *event, s32 result) { s32 i; s32 j; @@ -201,7 +201,7 @@ s32 musicHandleFadeEvent(struct musicevent *event, s32 result) return RESULT_OK_NEXT; } -s32 musicHandleStopAllEvent(s32 result) +s32 music_handle_stop_all_event(s32 result) { s32 i; @@ -218,7 +218,7 @@ s32 musicHandleStopAllEvent(s32 result) } #if VERSION >= VERSION_NTSC_1_0 -s32 musicHandleSetIntervalEvent(struct musicevent *event, s32 result) +s32 music_handle_set_interval_event(struct musicevent *event, s32 result) { g_MusicInterval240 = event->timer240; return RESULT_OK_NEXT; @@ -228,18 +228,18 @@ s32 musicHandleSetIntervalEvent(struct musicevent *event, s32 result) #if MATCHING #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel musicTickEvents +glabel music_tick_events .late_rodata glabel var70053fdc -.word musicTickEvents+0x324 +.word music_tick_events+0x324 glabel var70053fe0 -.word musicTickEvents+0x338 +.word music_tick_events+0x338 glabel var70053fe4 -.word musicTickEvents+0x34c +.word music_tick_events+0x34c glabel var70053fe8 -.word musicTickEvents+0x360 +.word music_tick_events+0x360 glabel var70053fec -.word musicTickEvents+0x370 +.word music_tick_events+0x370 .text /* 1190c: 27bdffb8 */ addiu $sp,$sp,-72 /* 11910: 3c0e8006 */ lui $t6,%hi(g_SndDisabled) @@ -465,26 +465,26 @@ glabel var70053fec /* 11c28: 03000008 */ jr $t8 /* 11c2c: 00000000 */ nop /* 11c30: 02402025 */ or $a0,$s2,$zero -/* 11c34: 0c004508 */ jal musicHandlePlayEvent +/* 11c34: 0c004508 */ jal music_handle_play_event /* 11c38: 00002825 */ or $a1,$zero,$zero /* 11c3c: 10000013 */ b .L00011c8c /* 11c40: 00402025 */ or $a0,$v0,$zero /* 11c44: 02402025 */ or $a0,$s2,$zero -/* 11c48: 0c0045c0 */ jal musicHandleStopEvent +/* 11c48: 0c0045c0 */ jal music_handle_stop_event /* 11c4c: 00002825 */ or $a1,$zero,$zero /* 11c50: 1000000e */ b .L00011c8c /* 11c54: 00402025 */ or $a0,$v0,$zero /* 11c58: 02402025 */ or $a0,$s2,$zero -/* 11c5c: 0c0045e0 */ jal musicHandleFadeEvent +/* 11c5c: 0c0045e0 */ jal music_handle_fade_event /* 11c60: 00002825 */ or $a1,$zero,$zero /* 11c64: 10000009 */ b .L00011c8c /* 11c68: 00402025 */ or $a0,$v0,$zero -/* 11c6c: 0c004621 */ jal musicHandleStopAllEvent +/* 11c6c: 0c004621 */ jal music_handle_stop_all_event /* 11c70: 00002025 */ or $a0,$zero,$zero /* 11c74: 10000005 */ b .L00011c8c /* 11c78: 00402025 */ or $a0,$v0,$zero /* 11c7c: 02402025 */ or $a0,$s2,$zero -/* 11c80: 0c00463d */ jal musicHandleSetIntervalEvent +/* 11c80: 0c00463d */ jal music_handle_set_interval_event /* 11c84: 00002825 */ or $a1,$zero,$zero /* 11c88: 00402025 */ or $a0,$v0,$zero .L00011c8c: @@ -560,7 +560,7 @@ glabel var70053fec ); #else GLOBAL_ASM( -glabel musicTickEvents +glabel music_tick_events /* 11cb4: 27bdffa8 */ addiu $sp,$sp,-88 /* 11cb8: 3c0e8006 */ lui $t6,%hi(g_SndDisabled) /* 11cbc: 8dcef6c0 */ lw $t6,%lo(g_SndDisabled)($t6) @@ -786,22 +786,22 @@ glabel musicTickEvents /* 11fd8: 10000010 */ beqz $zero,.NB0001201c /* 11fdc: 00000000 */ sll $zero,$zero,0x0 .NB00011fe0: -/* 11fe0: 0c0045f8 */ jal musicHandlePlayEvent +/* 11fe0: 0c0045f8 */ jal music_handle_play_event /* 11fe4: 02a02025 */ or $a0,$s5,$zero /* 11fe8: 1000000c */ beqz $zero,.NB0001201c /* 11fec: 00402025 */ or $a0,$v0,$zero .NB00011ff0: -/* 11ff0: 0c0046b0 */ jal musicHandleStopEvent +/* 11ff0: 0c0046b0 */ jal music_handle_stop_event /* 11ff4: 02a02025 */ or $a0,$s5,$zero /* 11ff8: 10000008 */ beqz $zero,.NB0001201c /* 11ffc: 00402025 */ or $a0,$v0,$zero .NB00012000: -/* 12000: 0c0046d0 */ jal musicHandleFadeEvent +/* 12000: 0c0046d0 */ jal music_handle_fade_event /* 12004: 02a02025 */ or $a0,$s5,$zero /* 12008: 10000004 */ beqz $zero,.NB0001201c /* 1200c: 00402025 */ or $a0,$v0,$zero .NB00012010: -/* 12010: 0c004711 */ jal musicHandleStopAllEvent +/* 12010: 0c004711 */ jal music_handle_stop_all_event /* 12014: 00002025 */ or $a0,$zero,$zero /* 12018: 00402025 */ or $a0,$v0,$zero .NB0001201c: @@ -884,7 +884,7 @@ glabel musicTickEvents // g_MusicEventQueueLength if the if statement passed. Suspect there's some code // being optimised out that overwrites a1 or wrote to g_MusicEventQueueLength. // The code below uses += 0 to get the mismatch down to one instruction, -void musicTickEvents(void) +void music_tick_events(void) { s32 i; s32 j; @@ -999,20 +999,20 @@ void musicTickEvents(void) switch (event->eventtype) { case MUSICEVENTTYPE_PLAY: - result = musicHandlePlayEvent(event, result); + result = music_handle_play_event(event, result); break; case MUSICEVENTTYPE_STOP: - result = musicHandleStopEvent(event, result); + result = music_handle_stop_event(event, result); break; case MUSICEVENTTYPE_FADE: - result = musicHandleFadeEvent(event, result); + result = music_handle_fade_event(event, result); break; case MUSICEVENTTYPE_STOPALL: - result = musicHandleStopAllEvent(result); + result = music_handle_stop_all_event(result); break; #if VERSION >= VERSION_NTSC_1_0 case MUSICEVENTTYPE_SETINTERVAL: - result = musicHandleSetIntervalEvent(event, result); + result = music_handle_set_interval_event(event, result); break; #endif } @@ -1047,7 +1047,7 @@ void musicTickEvents(void) } #endif -void musicTick(void) +void music_tick(void) { s32 i; bool playnrg = false; @@ -1062,22 +1062,22 @@ void musicTick(void) g_MusicDeathTimer240 -= g_Vars.lvupdate240; if (g_MusicDeathTimer240 <= 0) { - musicEndDeath(); + music_end_death(); // The death is complete. Are we due to start a new track? if (g_MpEnableMusicSwitching && g_Vars.normmplayerisrunning && g_MusicLife60 < g_MusicAge60) { g_MusicAge60 = 0; - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicQueueStopEvent(TRACKTYPE_PRIMARY); - musicQueueStartEvent(TRACKTYPE_PRIMARY, stageGetPrimaryTrack(g_MusicStageNum), 0, musicGetVolume()); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_queue_stop_event(TRACKTYPE_PRIMARY); + music_queue_start_event(TRACKTYPE_PRIMARY, stage_get_primary_track(g_MusicStageNum), 0, music_get_volume()); } } } else if (g_MpEnableMusicSwitching && g_Vars.normmplayerisrunning && g_MusicLife60 < g_MusicAge60) { // Due to start a new track. Fade out the old one, // then start a 2 second timer before starting the new one. g_MusicAge60 = 0; - musicQueueFadeEvent(TRACKTYPE_PRIMARY, 2, true); + music_queue_fade_event(TRACKTYPE_PRIMARY, 2, true); g_MusicSilenceTimer60 = TICKS(120); } @@ -1091,10 +1091,10 @@ void musicTick(void) g_MusicSilenceTimer60 -= g_Vars.diffframe60; if (g_MusicSilenceTimer60 <= 0) { - musicQueueStopEvent(TRACKTYPE_MENU); - musicQueueStopEvent(TRACKTYPE_DEATH); - musicQueueStopEvent(TRACKTYPE_PRIMARY); - musicQueueStartEvent(TRACKTYPE_PRIMARY, stageGetPrimaryTrack(g_MusicStageNum), 0, musicGetVolume()); + music_queue_stop_event(TRACKTYPE_MENU); + music_queue_stop_event(TRACKTYPE_DEATH); + music_queue_stop_event(TRACKTYPE_PRIMARY); + music_queue_start_event(TRACKTYPE_PRIMARY, stage_get_primary_track(g_MusicStageNum), 0, music_get_volume()); } } } @@ -1130,23 +1130,23 @@ void musicTick(void) if (g_Vars.lvupdate240 != 0) { if (g_MusicNrgIsActive) { if (!playnrg) { - musicDeactivateNrg(); + music_deactivate_nrg(); } } else { if (playnrg && !g_Vars.dontplaynrg) { - musicActivateNrg(); + music_activate_nrg(); } } } #else if (g_Vars.lvupdate240 != 0) { - if (musicIsTrackState(TRACKTYPE_NRG, AL_PLAYING)) { + if (music_is_track_state(TRACKTYPE_NRG, AL_PLAYING)) { if (!playnrg) { - musicDeactivateNrg(); + music_deactivate_nrg(); } } else { if (playnrg && !g_Vars.dontplaynrg) { - musicActivateNrg(); + music_activate_nrg(); } } } @@ -1154,17 +1154,17 @@ void musicTick(void) // Check if the player is in an ambient room every 0.25 seconds if (g_Vars.lvupdate240 > g_MusicNextAmbientTick240) { - musicTickAmbient(); + music_tick_ambient(); g_MusicNextAmbientTick240 = TICKS(60); } else { g_MusicNextAmbientTick240 -= g_Vars.lvupdate240; } - musicTickEvents(); + music_tick_events(); } } -bool musicIsTrackTypePlaying(s32 tracktype) +bool music_is_track_type_playing(s32 tracktype) { s32 i; @@ -1178,25 +1178,25 @@ bool musicIsTrackTypePlaying(s32 tracktype) } #if VERSION < VERSION_NTSC_1_0 -bool musicAreTracksPlaying(u8 bits) +bool music_are_tracks_playing(u8 bits) { - if ((bits & 0x01) && !musicIsTrackTypePlaying(TRACKTYPE_PRIMARY)) { + if ((bits & 0x01) && !music_is_track_type_playing(TRACKTYPE_PRIMARY)) { return false; } - if ((bits & 0x02) && !musicIsTrackTypePlaying(TRACKTYPE_NRG)) { + if ((bits & 0x02) && !music_is_track_type_playing(TRACKTYPE_NRG)) { return false; } - if ((bits & 0x04) && !musicIsTrackTypePlaying(TRACKTYPE_MENU)) { + if ((bits & 0x04) && !music_is_track_type_playing(TRACKTYPE_MENU)) { return false; } - if ((bits & 0x08) && !musicIsTrackTypePlaying(TRACKTYPE_DEATH)) { + if ((bits & 0x08) && !music_is_track_type_playing(TRACKTYPE_DEATH)) { return false; } - if ((bits & 0x10) && !musicIsTrackTypePlaying(TRACKTYPE_AMBIENT)) { + if ((bits & 0x10) && !music_is_track_type_playing(TRACKTYPE_AMBIENT)) { return false; } diff --git a/src/lib/naudio/n_csplayer.c b/src/lib/naudio/n_csplayer.c index f8e849c86..0739fe77f 100644 --- a/src/lib/naudio/n_csplayer.c +++ b/src/lib/naudio/n_csplayer.c @@ -489,7 +489,7 @@ void func00034fb8(N_ALCSPlayer *seqp, u8 channel) } } -void sndStartMp3ByFilenum(u8 arg0); +void snd_start_mp3_by_filenum(u8 arg0); f32 _depth2Cents(u8 arg0); void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) @@ -970,7 +970,7 @@ void __n_CSPHandleMIDIMsg(N_ALCSPlayer *seqp, N_ALEvent *event) } break; case (AL_MIDI_FX_CTRL_6): - sndStartMp3ByFilenum(byte2); + snd_start_mp3_by_filenum(byte2); break; case (0x20): seqp->chanState[chan].unk32 = byte2; diff --git a/src/lib/naudio/n_sndplayer.c b/src/lib/naudio/n_sndplayer.c index 9c3e4e8ae..ede40194f 100644 --- a/src/lib/naudio/n_sndplayer.c +++ b/src/lib/naudio/n_sndplayer.c @@ -701,13 +701,13 @@ struct sndstate *func00033820(s32 arg0, s16 soundnum, u16 vol, ALPan pan, f32 pi N_ALEvent evt; N_ALEvent evt2; - if (sndIsDisabled()) { + if (snd_is_disabled()) { return NULL; } if (soundnum != 0) { do { - sound = sndLoadSound(soundnum); + sound = snd_load_sound(soundnum); state = func00033390(arg0, sound); if (state != NULL) { diff --git a/src/lib/path.c b/src/lib/path.c index 6a120374d..49bbb330f 100644 --- a/src/lib/path.c +++ b/src/lib/path.c @@ -5,7 +5,7 @@ #include "game/padhalllv.h" #include "types.h" -void objSetBlockedPathUnblocked(struct defaultobj *blocker, bool unblocked) +void obj_set_blocked_path_unblocked(struct defaultobj *blocker, bool unblocked) { if (blocker->hidden & OBJHFLAG_BLOCKEDPATH) { struct blockedpathobj *bp = g_BlockedPaths; @@ -13,10 +13,10 @@ void objSetBlockedPathUnblocked(struct defaultobj *blocker, bool unblocked) while (bp) { if (bp->blocker == blocker) { if (unblocked) { - navEnableSegment(&g_StageSetup.waypoints[bp->waypoint1], &g_StageSetup.waypoints[bp->waypoint2]); + nav_enable_segment(&g_StageSetup.waypoints[bp->waypoint1], &g_StageSetup.waypoints[bp->waypoint2]); break; } else { - navDisableSegment(&g_StageSetup.waypoints[bp->waypoint1], &g_StageSetup.waypoints[bp->waypoint2]); + nav_disable_segment(&g_StageSetup.waypoints[bp->waypoint1], &g_StageSetup.waypoints[bp->waypoint2]); break; } } diff --git a/src/lib/pimgr.c b/src/lib/pimgr.c index 242fd2737..bfc21311f 100644 --- a/src/lib/pimgr.c +++ b/src/lib/pimgr.c @@ -8,7 +8,7 @@ OSMesg var80099900[64]; OSMesgQueue g_PimgrMesgQueue; -void pimgrCreate(void) +void pimgr_create(void) { osCreatePiManager(150, &g_PimgrMesgQueue, var80099900, 64); } diff --git a/src/lib/profile.c b/src/lib/profile.c index 27dfd3fc0..933787295 100644 --- a/src/lib/profile.c +++ b/src/lib/profile.c @@ -4,17 +4,17 @@ #include "data.h" #include "types.h" -void profileInit(void) +void profile_init(void) { // empty } -void profileTick(void) +void profile_tick(void) { // empty } -void profileReset(void) +void profile_reset(void) { // empty } @@ -24,12 +24,12 @@ void profile00009a98(void) // empty } -void profileSetMarker(u32 value) +void profile_set_marker(u32 value) { // empty } -Gfx *profileRender(Gfx *gdl) +Gfx *profile_render(Gfx *gdl) { return gdl; } diff --git a/src/lib/rdp.c b/src/lib/rdp.c index bebdd8585..94b60a048 100644 --- a/src/lib/rdp.c +++ b/src/lib/rdp.c @@ -63,7 +63,7 @@ struct rdptask *g_RdpCurTask = &g_RdpTaskA; extern u8 gspTextStart; extern u8 gspDataStart; -void rdpInit(void) +void rdp_init(void) { s32 size = 0x10000; @@ -71,11 +71,11 @@ void rdpInit(void) size = 0x8000; } - g_RdpOutBufferStart = mempAlloc(size, MEMPOOL_PERMANENT); + g_RdpOutBufferStart = memp_alloc(size, MEMPOOL_PERMANENT); g_RdpOutBufferEnd = (u16 *) ((uintptr_t) g_RdpOutBufferStart + size); } -void rdpCreateTask(Gfx *gdlstart, Gfx *gdlend, u32 arg2, s32 msg) +void rdp_create_task(Gfx *gdlstart, Gfx *gdlend, u32 arg2, s32 msg) { OSScTask *sctask; OSTask *task; @@ -104,7 +104,7 @@ void rdpCreateTask(Gfx *gdlstart, Gfx *gdlend, u32 arg2, s32 msg) sctask->framebuffer = g_RdpCurTask->framebuffer; osWritebackDCacheAll(); - schedSubmitTask(&g_Sched, sctask); + sched_submit_task(&g_Sched, sctask); // Swap g_RdpCurTask g_RdpCurTask = (struct rdptask *)((uintptr_t) g_RdpCurTask ^ (uintptr_t) &g_RdpTaskA ^ (uintptr_t) &g_RdpTaskB); diff --git a/src/lib/reset.c b/src/lib/reset.c index 7a520125a..f234938e4 100644 --- a/src/lib/reset.c +++ b/src/lib/reset.c @@ -39,7 +39,7 @@ void resetproc(void *data) g_Resetting = true; // Stop the audio and main threads and ensure the reset thread's priority is set correctly - amgrStopThread(); + amgr_stop_thread(); osStopThread(&g_MainThread); osSetThreadPri(0, THREADPRI_RESET); @@ -70,13 +70,13 @@ void resetproc(void *data) } // Stop controller rumbles if active - joyDestroy(); + joy_destroy(); // Wait for the system to reset while (1); } -void resetThreadCreate(void) +void reset_thread_create(void) { osCreateMesgQueue(&g_ResetMesgQueue, g_ResetMesgs, ARRAYCOUNT(g_ResetMesgs)); osSetEventMesg(OS_EVENT_PRENMI, &g_ResetMesgQueue, (OSMesg) 669); diff --git a/src/lib/rmon.c b/src/lib/rmon.c index 0d149bd24..e2a45961c 100644 --- a/src/lib/rmon.c +++ b/src/lib/rmon.c @@ -12,7 +12,7 @@ void rmonproc() // empty } -bool rmonIsDisabled(void) +bool rmon_is_disabled(void) { return true; } @@ -53,21 +53,21 @@ void rmon0002fa40(void) // empty } -char *rmonProut(char *dst, const char *src, size_t count) +char *rmon_prout(char *dst, const char *src, size_t count) { s32 i = 0; while (i != count) { - crashAppendChar(src[i++]); + crash_append_char(src[i++]); } return (char *) 1; } -void rmonPrintf(const char *format, ...) +void rmon_printf(const char *format, ...) { va_list ap; va_start(ap, format); - _Printf(rmonProut, NULL, format, ap); + _Printf(rmon_prout, NULL, format, ap); } diff --git a/src/lib/rng.s b/src/lib/rng.s index 30f97bed0..42bd092dd 100644 --- a/src/lib/rng.s +++ b/src/lib/rng.s @@ -36,11 +36,11 @@ glabel random dsra32 $v0, $v0, 0 /** - * void rngSetSeed(u64 seed) + * void rng_set_seed(u64 seed) * * Set the given seed as the RNG seed. Add 1 to make sure it isn't 0. */ -glabel rngSetSeed +glabel rng_set_seed daddiu $a0, $a0, 1 lui $at, %hi(g_RngSeed) sd $a0, %lo(g_RngSeed)($at) @@ -48,14 +48,14 @@ glabel rngSetSeed li $a0, 0 /** - * u32 rngRotateSeed(u64 *value); + * u32 rng_rotate_seed(u64 *value); * * Rotate the given seed using the same algorithm as random(). * * Store the new 64-bit seed at the pointed address and return the same seed * cast as a u32. */ -glabel rngRotateSeed +glabel rng_rotate_seed ld $a3, 0($a0) dsll32 $a2, $a3, 31 dsll $a1, $a3, 31 diff --git a/src/lib/rng_c.c b/src/lib/rng_c.c index 6bee7e7f3..8014e0251 100644 --- a/src/lib/rng_c.c +++ b/src/lib/rng_c.c @@ -21,7 +21,7 @@ u32 random(void) /** * Set the given seed as the RNG seed. Add 1 to make sure it isn't 0. */ -void rngSetSeed(u64 seed) +void rng_set_seed(u64 seed) { g_RngSeed = seed + 1; } @@ -32,7 +32,7 @@ void rngSetSeed(u64 seed) * Store the new 64-bit seed at the pointed address and return the same seed * cast as a u32. */ -u32 rngRotateSeed(u64 *seed) +u32 rng_rotate_seed(u64 *seed) { *seed = ((*seed << 63) >> 31 | (*seed << 31) >> 32) ^ (*seed << 44) >> 32; *seed = ((*seed >> 20) & 0xfff) ^ *seed; diff --git a/src/lib/rzip.s b/src/lib/rzip.s index 5e7dd4c07..6c3aa9a16 100644 --- a/src/lib/rzip.s +++ b/src/lib/rzip.s @@ -4,7 +4,7 @@ * There are two inflate implementations in this codebase: * * 1. src/inflate/inflate.c: - * - Is pretty much regular zlib but with some mempAlloc functions changed to use + * - Is pretty much regular zlib but with some memp_alloc functions changed to use * stack or data. * - Being C, is more readable than this file. * - Is stored uncompressed in the ROM and is used to decompress the lib and @@ -220,7 +220,7 @@ glabel errstr_unrecognised .text /** - * u32 rzipInflate(void *src, void *dst, void *scratch); + * u32 rzip_inflate(void *src, void *dst, void *scratch); * * Inflate a 1172 (GE) or 1173 (PD) compressed stream. * @@ -230,7 +230,7 @@ glabel errstr_unrecognised * * The scratch argument must be a pointer to a 5KB allocation (5120 bytes). */ -glabel rzipInflate +glabel rzip_inflate addiu $sp, $sp, -0xa88 sw $s0, 0xa48($sp) sw $s1, 0xa4c($sp) @@ -279,7 +279,7 @@ glabel rzipInflate sw $sp, 0x74($sp) sw $s8, 0x78($sp) addiu $sp, $sp, -0x18 - jal rmonPrintf + jal rmon_printf addiu $a0, $a0, %lo(errstr_unrecognised) addiu $sp, $sp, 0x18 lw $ra, 0x0($sp) @@ -352,7 +352,7 @@ glabel rzipInflate sw $sp, 0x74($sp) sw $s8, 0x78($sp) addiu $sp, $sp, -0x18 - jal rmonPrintf + jal rmon_printf addiu $a0, $a0, %lo(errstr_unrecognised) addiu $sp, $sp, 0x18 lw $ra, 0x0($sp) @@ -413,7 +413,7 @@ glabel rzipInflate move $t2, $t0 .L000077ac: mtc1 $t2, $f18 - jal rzipInflateBody + jal rzip_inflate_body nop bnez $v0, .failed mfc1 $v0, $f17 @@ -466,7 +466,7 @@ glabel rzipInflate sw $v0, 0x4($sp) lui $a0, %hi(errstr_inflatefailed) addiu $a0, $a0, %lo(errstr_inflatefailed) - jal rmonPrintf + jal rmon_printf lw $a1, 0x4($sp) addiu $sp, $sp, 0x18 lw $ra, 0x0($sp) @@ -505,14 +505,14 @@ glabel rzipInflate /** * Return 0 on success. */ -glabel rzipInflateBody +glabel rzip_inflate_body sw $ra, 0xa6c($sp) mtc1 $zero, $f17 li $gp, 0 li $s8, 0 .L00007918: mtc1 $zero, $f19 - jal rzipInflateBlock + jal rzip_inflate_block addiu $a0, $sp, 0xa70 bnez $v0, .L00007960 lw $t3, 0xa70($sp) @@ -536,7 +536,7 @@ glabel rzipInflateBody jr $ra nop -glabel rzipInflateBlock +glabel rzip_inflate_block sw $ra, 0xa68($sp) slti $at, $s8, 0x3 beqz $at, .L0000799c @@ -560,21 +560,21 @@ glabel rzipInflateBlock li $at, 2 bne $t3, $at, .L000079d0 nop - jal rzipInflateDynamic + jal rzip_inflate_dynamic nop j .L00007a04 nop .L000079d0: bnez $t3, .L000079e8 li $at, 1 - jal rzipInflateStored + jal rzip_inflate_stored nop j .L00007a04 nop .L000079e8: bne $t3, $at, .L00007a00 nop - jal rzipInflateFixed + jal rzip_inflate_fixed nop j .L00007a04 nop @@ -585,7 +585,7 @@ glabel rzipInflateBlock jr $ra nop -glabel rzipInflateDynamic +glabel rzip_inflate_dynamic sw $ra, 0xa44($sp) lui $t5, %hi(border) addiu $t5, $t5, %lo(border) @@ -666,7 +666,7 @@ glabel rzipInflateDynamic li $a3, 0 li $t7, 0 addiu $t8, $sp, 0xa38 - jal rzipBuildHufts + jal rzip_build_hufts addiu $t9, $sp, 0xa3c mfc1 $t2, $f0 mfc1 $t3, $f1 @@ -832,7 +832,7 @@ glabel rzipInflateDynamic lui $t7, %hi(cplext) addiu $t7, $t7, %lo(cplext) addiu $t8, $sp, 0xa38 - jal rzipBuildHufts + jal rzip_build_hufts addiu $t9, $sp, 0xa3c mfc1 $t2, $f0 mfc1 $t3, $f1 @@ -849,7 +849,7 @@ glabel rzipInflateDynamic lui $t7, %hi(cpdext) addiu $t7, $t7, %lo(cpdext) addiu $t8, $sp, 0xa3a - jal rzipBuildHufts + jal rzip_build_hufts addiu $t9, $sp, 0xa40 bnez $v0, .L00007f10 lhu $a0, 0xa38($sp) @@ -859,7 +859,7 @@ glabel rzipInflateDynamic sll $a1, $a1, 0x2 addu $a1, $a1, $s6 lw $a2, 0xa3c($sp) - jal rzipInflateCodes + jal rzip_inflate_codes lw $a3, 0xa40($sp) bnez $v0, .L00007f10 nop @@ -898,7 +898,7 @@ glabel rzipInflateDynamic sw $sp, 0x74($sp) sw $s8, 0x78($sp) addiu $sp, $sp, -24 - jal rmonPrintf + jal rmon_printf addiu $a0, $a0, %lo(errstr_badlen) addiu $sp, $sp, 0x18 lw $ra, 0x0($sp) @@ -938,7 +938,7 @@ glabel rzipInflateDynamic jr $ra nop -glabel rzipInflateStored +glabel rzip_inflate_stored mfc1 $t2, $f17 mfc1 $t6, $f18 mfc1 $t7, $f16 @@ -1014,7 +1014,7 @@ glabel rzipInflateStored jr $ra li $v0, 1 -glabel rzipInflateFixed +glabel rzip_inflate_fixed sw $ra, 0xa44($sp) sw $s6, 0xa74($sp) lui $s6, %hi(var80090b10) @@ -1025,14 +1025,14 @@ glabel rzipInflateFixed addiu $a1, $a1, %lo(var800914d8) li $a2, 7 li $a3, 5 - jal rzipInflateCodes + jal rzip_inflate_codes nop lw $s6, 0xa74($sp) lw $ra, 0xa44($sp) jr $ra li $v0, 0 -glabel rzipBuildHufts +glabel rzip_build_hufts beqz $a1, .L000084e8 mtc1 $s0, $f2 mtc1 $s1, $f3 @@ -1402,7 +1402,7 @@ glabel rzipBuildHufts sw $s3, 0x4($sp) lui $a0, %hi(errstr_huftsoverflow) addiu $a0, $a0, %lo(errstr_huftsoverflow) - jal rmonPrintf + jal rmon_printf lw $a1, 0x4($sp) addiu $sp, $sp, 0x18 lw $ra, 0x0($sp) @@ -1437,7 +1437,7 @@ glabel rzipBuildHufts j .L0000833c addiu $sp, $sp, 0x80 -glabel rzipInflateCodes +glabel rzip_inflate_codes mfc1 $t3, $f16 mfc1 $t5, $f18 mfc1 $s4, $f17 @@ -1630,7 +1630,7 @@ glabel rzipInflateCodes jr $ra li $v0, 4 -glabel rzipInit +glabel rzip_init addiu $sp, $sp, -2696 sw $s0, 0xa48($sp) sw $s1, 0xa4c($sp) @@ -1679,7 +1679,7 @@ glabel rzipInit lui $t7, %hi(cplext) addiu $t7, $t7, %lo(cplext) addiu $t8, $sp, 0x9c8 - jal rzipBuildHufts + jal rzip_build_hufts addiu $t9, $sp, 0x9cc addiu $t0, $sp, 0x548 li $t1, 5 @@ -1698,7 +1698,7 @@ glabel rzipInit lui $t7, %hi(cpdext) addiu $t7, $t7, %lo(cpdext) addiu $t8, $sp, 0x9d0 - jal rzipBuildHufts + jal rzip_build_hufts addiu $t9, $sp, 0x9d4 lw $s0, 0xa48($sp) lw $s1, 0xa4c($sp) @@ -1712,7 +1712,7 @@ glabel rzipInit jr $ra addiu $sp, $sp, 0xa88 -glabel rzipIs1173 +glabel rzip_is_1173 li $t1, 0x11 lbu $t0, 0x0($a0) bne $t0, $t1, .L00008a00 @@ -1726,7 +1726,7 @@ glabel rzipIs1173 jr $ra li $v0, 0 -glabel rzipGetSomething +glabel rzip_get_something lui $v0, %hi(var80091558) addiu $v0, $v0, %lo(var80091558) jr $ra diff --git a/src/lib/sched.c b/src/lib/sched.c index 266e4cb68..a8f4f495f 100644 --- a/src/lib/sched.c +++ b/src/lib/sched.c @@ -94,50 +94,50 @@ u32 var8005cea4 = 0; OSScMsg g_SchedRspMsg = {OS_SC_RSP_MSG}; bool g_SchedIsFirstTask = true; -void schedSetCrashEnable1(bool enable) +void sched_set_crash_enable1(bool enable) { g_SchedCrashEnable1 = enable; } -void schedSetCrashedUnexpectedly(bool enable) +void sched_set_crashed_unexpectedly(bool enable) { g_SchedCrashedUnexpectedly = enable; } -void schedSetCrashEnable2(bool enable) +void sched_set_crash_enable2(bool enable) { g_SchedCrashEnable2 = enable; } -void schedSetCrashRenderInterval(u32 cycles) +void sched_set_crash_render_interval(u32 cycles) { g_SchedCrashRenderInterval = cycles; } -void schedRenderCrashOnBuffer(void *framebuffer) +void sched_render_crash_on_buffer(void *framebuffer) { if ((g_SchedCrashEnable2 && g_SchedCrashEnable1) || g_SchedCrashedUnexpectedly) { - crashRenderFrame(framebuffer); + crash_render_frame(framebuffer); g_SchedCrashLastRendered = osGetCount(); } } -void schedRenderCrashPeriodically(u32 framecount) +void sched_render_crash_periodically(u32 framecount) { if ((framecount & 0xf) == 0 && ((g_SchedCrashEnable2 && g_SchedCrashEnable1) || g_SchedCrashedUnexpectedly)) { if (osGetCount() - g_SchedCrashLastRendered > g_SchedCrashRenderInterval) { - crashRenderFrame(g_FrameBuffers[0]); - crashRenderFrame(g_FrameBuffers[1]); + crash_render_frame(g_FrameBuffers[0]); + crash_render_frame(g_FrameBuffers[1]); } } } -void schedInitCrashLastRendered(void) +void sched_init_crash_last_rendered(void) { g_SchedCrashLastRendered = osGetCount(); } -void osCreateScheduler(OSSched *sc, OSThread *thread, u8 mode, u32 numFields) +void os_create_scheduler(OSSched *sc, OSThread *thread, u8 mode, u32 numFields) { sc->curRSPTask = 0; sc->curRDPTask = 0; @@ -151,7 +151,7 @@ void osCreateScheduler(OSSched *sc, OSThread *thread, u8 mode, u32 numFields) sc->prenmiMsg.type = OS_SC_PRE_NMI_MSG; sc->thread = thread; - resetThreadCreate(); + reset_thread_create(); osCreateMesgQueue(&sc->interruptQ, sc->intBuf, OS_SC_MAX_MESGS); osCreateMesgQueue(&sc->cmdQ, sc->cmdMsgBuf, OS_SC_MAX_MESGS); @@ -172,8 +172,8 @@ void osCreateScheduler(OSSched *sc, OSThread *thread, u8 mode, u32 numFields) osSetEventMesg(OS_EVENT_DP, &sc->interruptQ, (OSMesg)RDP_DONE_MSG); osViSetEvent(&sc->interruptQ, (OSMesg)VIDEO_MSG, numFields); - schedInitCrashLastRendered(); - osCreateThread(sc->thread, THREAD_SCHED, &__scMain, sc, bootAllocateStack(THREAD_SCHED, STACKSIZE_SCHED), THREADPRI_SCHED); + sched_init_crash_last_rendered(); + osCreateThread(sc->thread, THREAD_SCHED, &__scMain, sc, boot_allocate_stack(THREAD_SCHED, STACKSIZE_SCHED), THREADPRI_SCHED); osStartThread(sc->thread); } @@ -236,7 +236,7 @@ void __scMain(void *arg) OSSched *sc = (OSSched *)arg; int done = 0; - schedInitArtifacts(); + sched_init_artifacts(); while (!done) { osRecvMesg(&sc->interruptQ, (OSMesg *)&msg, OS_MESG_BLOCK); @@ -282,7 +282,7 @@ void __scMain(void *arg) * scheduler, adds the task to the linked list directly and attempts to execute * it. This is faster than the queue method because it avoids switching threads. */ -void schedSubmitTask(OSSched *sc, OSScTask *t) +void sched_submit_task(OSSched *sc, OSScTask *t) { s32 state; OSScTask *sp = 0; @@ -334,22 +334,22 @@ void __scHandleRetrace(OSSched *sc) #if PAL if (!g_Resetting && (sc->frameCount & 1)) { osStopTimer(&g_SchedRspTimer); - osSetTimer(&g_SchedRspTimer, 280000, 0, amgrGetFrameMesgQueue(), &g_SchedRspMsg); + osSetTimer(&g_SchedRspTimer, 280000, 0, amgr_get_frame_mesg_queue(), &g_SchedRspMsg); } #else if (!g_Resetting && ((sc->frameCount & 1) || IS4MB())) { osStopTimer(&g_SchedRspTimer); - osSetTimer(&g_SchedRspTimer, 280000, 0, amgrGetFrameMesgQueue(), &g_SchedRspMsg); + osSetTimer(&g_SchedRspTimer, 280000, 0, amgr_get_frame_mesg_queue(), &g_SchedRspMsg); } #endif if (!g_Resetting) { - viHandleRetrace(); + vi_handle_retrace(); } - joysHandleRetrace(); - sndHandleRetrace(); - schedRenderCrashPeriodically(sc->frameCount); + joys_handle_retrace(); + snd_handle_retrace(); + sched_render_crash_periodically(sc->frameCount); } extern u8 g_SndCache; @@ -365,11 +365,11 @@ void __scHandleTasks(OSSched *sc) OSScTask *sp = 0; OSScTask *dp = 0; - profileTick(); + profile_tick(); /** * This is default scheduler code. In PD, clients pass tasks to the - * scheduler using schedSubmitTask. Nothing writes to the cmdQ in PD + * scheduler using sched_submit_task. Nothing writes to the cmdQ in PD * so the condition in this loop never passes. */ while (osRecvMesg(&sc->cmdQ, (OSMesg*)&rspTask, OS_MESG_NOBLOCK) != -1) { @@ -401,7 +401,7 @@ void __scHandleTasks(OSSched *sc) #if PIRACYCHECKS { u32 checksum = 0; - s32 *end = (s32 *)&bootAllocateStack; + s32 *end = (s32 *)&boot_allocate_stack; s32 *ptr = (s32 *)&boot; s32 i; @@ -434,7 +434,7 @@ void __scHandleRSP(OSSched *sc) t = sc->curRSPTask; sc->curRSPTask = 0; - profileSetMarker(PROFILE_RSP_END); + profile_set_marker(PROFILE_RSP_END); if ((t->state & OS_SC_YIELD) && osSpTaskYielded(&t->list)) { t->state |= OS_SC_YIELDED; @@ -461,12 +461,12 @@ void __scHandleRSP(OSSched *sc) } } -u32 *schedGetDpCounters(void) +u32 *sched_get_dp_counters(void) { return g_SchedDpCounters; } -void schedInitArtifacts(void) +void sched_init_artifacts(void) { s32 i; s32 j; @@ -484,7 +484,7 @@ void schedInitArtifacts(void) * The write list is an artifact list that is not currently being displayed on * the screen. Update logic can write here to put artifacts on the next frame. */ -struct artifact *schedGetWriteArtifacts(void) +struct artifact *sched_get_write_artifacts(void) { return g_ArtifactLists[g_SchedWriteArtifactsIndex]; } @@ -494,7 +494,7 @@ struct artifact *schedGetWriteArtifacts(void) * screen. Rendering logic reads this list. The list may be re-used for multiple * frames in a row during lag. */ -struct artifact *schedGetFrontArtifacts(void) +struct artifact *sched_get_front_artifacts(void) { return g_ArtifactLists[g_SchedFrontArtifactsIndex]; } @@ -504,36 +504,36 @@ struct artifact *schedGetFrontArtifacts(void) * * @TODO: Investigate. */ -struct artifact *schedGetPendingArtifacts(void) +struct artifact *sched_get_pending_artifacts(void) { return g_ArtifactLists[g_SchedPendingArtifactsIndex]; } -void schedIncrementWriteArtifacts(void) +void sched_increment_write_artifacts(void) { g_SchedWriteArtifactsIndex = (g_SchedWriteArtifactsIndex + 1) % 3; } -void schedIncrementFrontArtifacts(void) +void sched_increment_front_artifacts(void) { g_SchedFrontArtifactsIndex = (g_SchedFrontArtifactsIndex + 1) % 3; } -void schedIncrementPendingArtifacts(void) +void sched_increment_pending_artifacts(void) { g_SchedPendingArtifactsIndex = (g_SchedPendingArtifactsIndex + 1) % 3; } -void schedResetArtifacts(void) +void sched_reset_artifacts(void) { g_SchedWriteArtifactsIndex = 0; g_SchedFrontArtifactsIndex = 1; g_SchedPendingArtifactsIndex = 0; } -void schedUpdatePendingArtifacts(void) +void sched_update_pending_artifacts(void) { - struct artifact *artifacts = schedGetPendingArtifacts(); + struct artifact *artifacts = sched_get_pending_artifacts(); s32 i; for (i = 0; i < MAX_ARTIFACTS; i++) { @@ -560,7 +560,7 @@ void schedUpdatePendingArtifacts(void) g_SchedSpecialArtifactIndexes[g_SchedPendingArtifactsIndex] = 0; - schedIncrementPendingArtifacts(); + sched_increment_pending_artifacts(); } /** @@ -572,13 +572,13 @@ void __scHandleRDP(OSSched *sc) s32 state; if (sc->curRDPTask != NULL) { - schedUpdatePendingArtifacts(); + sched_update_pending_artifacts(); if (g_MainIsBooting == 0) { - schedConsiderScreenshot(); + sched_consider_screenshot(); } - profileSetMarker(PROFILE_RDP_END); + profile_set_marker(PROFILE_RDP_END); osDpGetCounters(g_SchedDpCounters); t = sc->curRDPTask; @@ -665,7 +665,7 @@ s32 __scTaskComplete(OSSched *sc, OSScTask *t) g_ViUnblackTimer--; } - schedRenderCrashOnBuffer(t->framebuffer); + sched_render_crash_on_buffer(t->framebuffer); osViSwapBuffer(t->framebuffer); } @@ -727,10 +727,10 @@ void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp) } if (sp->list.t.type == M_AUDTASK) { - profileSetMarker(PROFILE_RSP_START); + profile_set_marker(PROFILE_RSP_START); } else { - profileSetMarker(PROFILE_RDP_START1); - profileSetMarker(PROFILE_RDP_START2); + profile_set_marker(PROFILE_RDP_START1); + profile_set_marker(PROFILE_RDP_START2); } sp->state &= ~(OS_SC_YIELD | OS_SC_YIELDED); @@ -747,7 +747,7 @@ void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp) } #if VERSION < VERSION_NTSC_1_0 -bool schedIsCurTaskAudio(OSSched *sc) +bool sched_is_cur_task_audio(OSSched *sc) { if (sc->curRSPTask) { return sc->curRSPTask->list.t.type == M_AUDTASK; @@ -862,11 +862,11 @@ s32 __scSchedule(OSSched *sc, OSScTask **sp, OSScTask **dp, s32 availRCP) return avail; } -void schedConsiderScreenshot(void) +void sched_consider_screenshot(void) { if (g_MenuData.screenshottimer == 1) { if (IS8MB()) { - menugfxCreateBlur(); + menugfx_create_blur(); } g_MenuData.screenshottimer = 0; diff --git a/src/lib/segments.s b/src/lib/segments.s index 1eaeb0f8c..4c1d8e404 100644 --- a/src/lib/segments.s +++ b/src/lib/segments.s @@ -4,32 +4,32 @@ .section .text -glabel segGetDataStart +glabel seg_get_data_start lui $v0, %hi(_dataSegmentStart) jr $ra addiu $v0, $v0, %lo(_dataSegmentStart) -glabel segGetDatazipRomStart +glabel seg_get_datazip_rom_start lui $v0, %hi(_datazipSegmentRomStart) jr $ra addiu $v0, $v0, %lo(_datazipSegmentRomStart) -glabel segGetInflateRomStart +glabel seg_get_inflate_rom_start lui $v0, %hi(_inflateSegmentRomStart) jr $ra addiu $v0, $v0, %lo(_inflateSegmentRomStart) -glabel segGetInflateRomStart2 +glabel seg_get_inflate_rom_start2 lui $v0, %hi(_inflateSegmentRomStart) jr $ra addiu $v0, $v0, %lo(_inflateSegmentRomStart) -glabel segGetGamezipsRomStart +glabel seg_get_gamezips_rom_start lui $v0, %hi(_gamezipSegmentRomStart) jr $ra addiu $v0, $v0, %lo(_gamezipSegmentRomStart) -glabel segInflate +glabel seg_inflate lui $a3, %hi(inflate1173) addiu $a3, $a3, %lo(inflate1173) jr $a3 diff --git a/src/lib/snd.c b/src/lib/snd.c index 3d085c6b2..c49d0e777 100644 --- a/src/lib/snd.c +++ b/src/lib/snd.c @@ -868,7 +868,7 @@ extern u8 _seqctlSegmentRomEnd; extern u8 _seqtblSegmentRomStart; extern u8 _sequencesSegmentRomStart; -bool sndIsPlayingMp3(void) +bool snd_is_playing_mp3(void) { return g_SndCurMp3.playing; } @@ -890,7 +890,7 @@ u16 snd0000e9dc(void) #endif } -void sndSetSfxVolume(u16 volume) +void snd_set_sfx_volume(u16 volume) { u8 i; @@ -922,7 +922,7 @@ void snd0000ea80(u16 volume) } } -void sndResetCurMp3(void) +void snd_reset_cur_mp3(void) { g_SndCurMp3.sfxref.id = 0; g_SndCurMp3.sfxref.mp3priority = 0; @@ -936,7 +936,7 @@ void sndResetCurMp3(void) g_SndCurMp3.prevgreeting = -1; } -void sndLoadSfxCtl(void) +void snd_load_sfx_ctl(void) { s32 i; u8 unalignedbuffer[256 + 16]; @@ -951,21 +951,21 @@ void sndLoadSfxCtl(void) // Load the first 256 bytes of the ctl file. size = 256; - dmaExec(buffer, (romptr_t) &_sfxctlSegmentRomStart, size); + dma_exec(buffer, (romptr_t) &_sfxctlSegmentRomStart, size); // Get the ROM address of the first (and only) bank, // then load the first 256 bytes of the bank. file = (ALBankFile *) buffer; romaddr = (romptr_t)&_sfxctlSegmentRomStart; romaddr += (u32)file->bankArray[0]; - dmaExec(buffer, romaddr, size); + dma_exec(buffer, romaddr, size); // Get the ROM address of the first (and only) instrument, // then load the first 256 bytes of the instrument. bank = (ALBank *) buffer; romaddr = (romptr_t)&_sfxctlSegmentRomStart; romaddr += (u32)bank->instArray[0]; - dmaExec(buffer, romaddr, size); + dma_exec(buffer, romaddr, size); // Get the soundCount (spoiler: there's 1545+1). // The final one might be a null terminator? @@ -978,7 +978,7 @@ void sndLoadSfxCtl(void) size = g_NumSounds * 4 + 20; size = ALIGN16(size); g_ALSoundRomOffsets = alHeapAlloc(&g_SndHeap, 1, size); - dmaExec(g_ALSoundRomOffsets, romaddr, size); + dma_exec(g_ALSoundRomOffsets, romaddr, size); *(u32 *)&g_ALSoundRomOffsets += 0x10; @@ -1006,7 +1006,7 @@ void sndLoadSfxCtl(void) } #if VERSION >= VERSION_NTSC_1_0 -void sndIncrementAges(void) +void snd_increment_ages(void) { s32 i; @@ -1018,7 +1018,7 @@ void sndIncrementAges(void) } #endif -ALEnvelope *sndLoadEnvelope(u32 offset, u16 cacheindex) +ALEnvelope *snd_load_envelope(u32 offset, u16 cacheindex) { #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x50]; @@ -1032,14 +1032,14 @@ ALEnvelope *sndLoadEnvelope(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; do { - dmaExecHighPriority(s2, offset, 0x40); + dma_exec_high_priority(s2, offset, 0x40); sum1 = 0; for (i = 0; i < 16U; i++) { sum1 += ((u32 *)s2)[i]; } - dmaExecHighPriority(s1, offset, 0x40); + dma_exec_high_priority(s1, offset, 0x40); sum2 = 0; for (i = 0; i < 16U; i++) { @@ -1054,7 +1054,7 @@ ALEnvelope *sndLoadEnvelope(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; - dmaExecHighPriority(s1, offset, 0x40); + dma_exec_high_priority(s1, offset, 0x40); #endif g_SndCache.envelopes[cacheindex] = *s1; @@ -1065,7 +1065,7 @@ ALEnvelope *sndLoadEnvelope(u32 offset, u16 cacheindex) return s1; } -ALKeyMap *sndLoadKeymap(u32 offset, u16 cacheindex) +ALKeyMap *snd_load_keymap(u32 offset, u16 cacheindex) { #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x50]; @@ -1079,14 +1079,14 @@ ALKeyMap *sndLoadKeymap(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; do { - dmaExecHighPriority(s2, offset, 0x40); + dma_exec_high_priority(s2, offset, 0x40); sum1 = 0; for (i = 0; i < 16U; i++) { sum1 += ((u32 *)s2)[i]; } - dmaExecHighPriority(s1, offset, 0x40); + dma_exec_high_priority(s1, offset, 0x40); sum2 = 0; for (i = 0; i < 16U; i++) { @@ -1101,7 +1101,7 @@ ALKeyMap *sndLoadKeymap(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; - dmaExecHighPriority(s1, offset, 0x40); + dma_exec_high_priority(s1, offset, 0x40); #endif g_SndCache.keymaps[cacheindex] = *s1; @@ -1112,7 +1112,7 @@ ALKeyMap *sndLoadKeymap(u32 offset, u16 cacheindex) return s1; } -ALADPCMBook *sndLoadAdpcmBook(u32 offset, u16 cacheindex) +ALADPCMBook *snd_load_adpcm_book(u32 offset, u16 cacheindex) { #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x150]; @@ -1126,14 +1126,14 @@ ALADPCMBook *sndLoadAdpcmBook(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; do { - dmaExecHighPriority(s2, offset, 0x140); + dma_exec_high_priority(s2, offset, 0x140); sum1 = 0; for (i = 0; i < 80U; i++) { sum1 += ((u32 *)s2)[i]; } - dmaExecHighPriority(s1, offset, 0x140); + dma_exec_high_priority(s1, offset, 0x140); sum2 = 0; for (i = 0; i < 80U; i++) { @@ -1148,7 +1148,7 @@ ALADPCMBook *sndLoadAdpcmBook(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; - dmaExecHighPriority(s1, offset, 0x140); + dma_exec_high_priority(s1, offset, 0x140); #endif g_SndCache.books[cacheindex] = *s1; @@ -1159,7 +1159,7 @@ ALADPCMBook *sndLoadAdpcmBook(u32 offset, u16 cacheindex) return s1; } -ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 cacheindex) +ALADPCMloop *snd_load_adpcm_loop(u32 offset, u16 cacheindex) { #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x50]; @@ -1177,14 +1177,14 @@ ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; do { - dmaExecHighPriority(s2, offset, 0x40); + dma_exec_high_priority(s2, offset, 0x40); sum1 = 0; for (i = 0; i < 16U; i++) { sum1 += ((u32 *)s2)[i]; } - dmaExecHighPriority(s1, offset, 0x40); + dma_exec_high_priority(s1, offset, 0x40); sum2 = 0; for (i = 0; i < 16U; i++) { @@ -1203,7 +1203,7 @@ ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; - dmaExecHighPriority(s1, offset, 0x40); + dma_exec_high_priority(s1, offset, 0x40); #endif g_SndCache.loops[cacheindex] = *s1; @@ -1214,7 +1214,7 @@ ALADPCMloop *sndLoadAdpcmLoop(u32 offset, u16 cacheindex) return s1; } -ALWaveTable *sndLoadWavetable(u32 offset, u16 cacheindex) +ALWaveTable *snd_load_wavetable(u32 offset, u16 cacheindex) { #if VERSION >= VERSION_NTSC_1_0 u8 spaf[0x50]; @@ -1229,14 +1229,14 @@ ALWaveTable *sndLoadWavetable(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; do { - dmaExecHighPriority(s2, offset, 0x40); + dma_exec_high_priority(s2, offset, 0x40); sum1 = 0; for (i = 0; i < 16U; i++) { sum1 += ((u32 *)s2)[i]; } - dmaExecHighPriority(s1, offset, 0x40); + dma_exec_high_priority(s1, offset, 0x40); sum2 = 0; for (i = 0; i < 16U; i++) { @@ -1252,7 +1252,7 @@ ALWaveTable *sndLoadWavetable(u32 offset, u16 cacheindex) offset += (romptr_t)&_sfxctlSegmentRomStart; - dmaExecHighPriority(s1, offset, 0x40); + dma_exec_high_priority(s1, offset, 0x40); #endif tmp = &g_SndCache.wavetables[cacheindex]; @@ -1262,14 +1262,14 @@ ALWaveTable *sndLoadWavetable(u32 offset, u16 cacheindex) tmp->base += (romptr_t)&_sfxtblSegmentRomStart; if (tmp->type == AL_ADPCM_WAVE) { - tmp->waveInfo.adpcmWave.book = sndLoadAdpcmBook((uintptr_t)tmp->waveInfo.adpcmWave.book, cacheindex); - tmp->waveInfo.adpcmWave.loop = sndLoadAdpcmLoop((uintptr_t)tmp->waveInfo.adpcmWave.loop, cacheindex); + tmp->waveInfo.adpcmWave.book = snd_load_adpcm_book((uintptr_t)tmp->waveInfo.adpcmWave.book, cacheindex); + tmp->waveInfo.adpcmWave.loop = snd_load_adpcm_loop((uintptr_t)tmp->waveInfo.adpcmWave.loop, cacheindex); } return tmp; } -void sndSetSoundMode(s32 mode) +void snd_set_sound_mode(s32 mode) { s32 i; @@ -1277,16 +1277,16 @@ void sndSetSoundMode(s32 mode) switch (mode) { case SOUNDMODE_MONO: - speakersSetMode(SPEAKERMODE_MONO); + speakers_set_mode(SPEAKERMODE_MONO); break; case SOUNDMODE_STEREO: - speakersSetMode(SPEAKERMODE_STEREO); + speakers_set_mode(SPEAKERMODE_STEREO); break; case SOUNDMODE_HEADPHONE: - speakersSetMode(SPEAKERMODE_HEADPHONE); + speakers_set_mode(SPEAKERMODE_HEADPHONE); break; case SOUNDMODE_SURROUND: - speakersSetMode(SPEAKERMODE_SURROUND); + speakers_set_mode(SPEAKERMODE_SURROUND); break; } @@ -1303,7 +1303,7 @@ void sndSetSoundMode(s32 mode) } } -ALSound *sndLoadSound(s16 soundnum) +ALSound *snd_load_sound(s16 soundnum) { union soundnumhack tmp; u16 cacheindex; @@ -1320,7 +1320,7 @@ ALSound *sndLoadSound(s16 soundnum) tmp.packed = soundnum; sfxnum = tmp.id; - if (sndIsMp3(tmp.packed)) { + if (snd_is_mp3(tmp.packed)) { return NULL; } @@ -1364,12 +1364,12 @@ ALSound *sndLoadSound(s16 soundnum) } // DMA the ALSound data - dmaExecHighPriority(sound, g_ALSoundRomOffsets[sfxnum - 1], 0x40); + dma_exec_high_priority(sound, g_ALSoundRomOffsets[sfxnum - 1], 0x40); // Promote segment offsets to pointers and load their child data - sound->envelope = sndLoadEnvelope((uintptr_t)sound->envelope, cacheindex); - sound->wavetable = sndLoadWavetable((uintptr_t)sound->wavetable, cacheindex); - sound->keyMap = sndLoadKeymap((uintptr_t)sound->keyMap, cacheindex); + sound->envelope = snd_load_envelope((uintptr_t)sound->envelope, cacheindex); + sound->wavetable = snd_load_wavetable((uintptr_t)sound->wavetable, cacheindex); + sound->keyMap = snd_load_keymap((uintptr_t)sound->keyMap, cacheindex); // Save the ALSound into the cache g_SndCache.sounds[cacheindex] = *sound; @@ -1387,7 +1387,7 @@ ALSound *sndLoadSound(s16 soundnum) return &g_SndCache.sounds[cacheindex]; } -void seqInit(struct seqinstance *seq) +void seq_init(struct seqinstance *seq) { u32 stack; ALSeqpConfig config; @@ -1414,7 +1414,7 @@ void seqInit(struct seqinstance *seq) n_alCSPSetBank(seq->seqp, var80095204); } -void sndAddRef(ALSound *sound) +void snd_add_ref(ALSound *sound) { if (sound >= &g_SndCache.sounds[0] && sound <= &g_SndCache.sounds[NUM_CACHE_SLOTS - 1]) { s32 cacheindex = sound - g_SndCache.sounds; @@ -1422,7 +1422,7 @@ void sndAddRef(ALSound *sound) } } -void sndRemoveRef(ALSound *sound) +void snd_remove_ref(ALSound *sound) { if (sound >= &g_SndCache.sounds[0] && sound <= &g_SndCache.sounds[NUM_CACHE_SLOTS - 1]) { s32 cacheindex = sound - g_SndCache.sounds; @@ -1430,7 +1430,7 @@ void sndRemoveRef(ALSound *sound) } } -void sndInit(void) +void snd_init(void) { ALSndpConfig sndpconfig; ALSynConfig synconfig; @@ -1463,7 +1463,7 @@ void sndInit(void) g_SndMp3Enabled = true; g_SndMaxFxBusses = 2; - if (argFindByPrefix(1, "-nomp3")) { + if (arg_find_by_prefix(1, "-nomp3")) { g_SndMp3Enabled = false; } } @@ -1472,7 +1472,7 @@ void sndInit(void) // Allocate memory for the audio heap, // clear it and give it to the audio library u32 len = &_seqctlSegmentRomEnd - &_seqctlSegmentRomStart; - u8 *ptr = mempAlloc(heaplen, MEMPOOL_PERMANENT); + u8 *ptr = memp_alloc(heaplen, MEMPOOL_PERMANENT); s32 i; u8 *heapstart = ptr; u8 *end = heapstart + heaplen; @@ -1491,12 +1491,12 @@ void sndInit(void) strcpy(g_SndGuardStringPtr, g_SndGuardString); // Load sfx.ctl - sndLoadSfxCtl(); + snd_load_sfx_ctl(); // Load seq.ctl var80095200 = 0xffffffff; bankfile = alHeapAlloc(&g_SndHeap, 1, len); - dmaExec(bankfile, (romptr_t) &_seqctlSegmentRomStart, len); + dma_exec(bankfile, (romptr_t) &_seqctlSegmentRomStart, len); // Load seq.tbl alBnkfNew(bankfile, &_seqtblSegmentRomStart); @@ -1506,11 +1506,11 @@ void sndInit(void) // enough space for the table and load it. var80095204 = bankfile->bankArray[0]; g_SeqTable = alHeapDBAlloc(0, 0, &g_SndHeap, 1, 0x10); - dmaExec(g_SeqTable, (romptr_t) &_sequencesSegmentRomStart, 0x10); + dma_exec(g_SeqTable, (romptr_t) &_sequencesSegmentRomStart, 0x10); len = g_SeqTable->count * sizeof(struct seqtableentry) + 4; g_SeqTable = alHeapDBAlloc(0, 0, &g_SndHeap, 1, len); - dmaExec(g_SeqTable, (romptr_t) &_sequencesSegmentRomStart, (len + 0xf) & ~0xf); + dma_exec(g_SeqTable, (romptr_t) &_sequencesSegmentRomStart, (len + 0xf) & ~0xf); // Promote segment-relative offsets to ROM addresses for (i = 0; i < g_SeqTable->count; i++) { @@ -1540,15 +1540,15 @@ void sndInit(void) settings[1] = 1; settings[2] = 2000; - amgrCreate(&synconfig, settings); + amgr_create(&synconfig, settings); #else - amgrCreate(&synconfig); + amgr_create(&synconfig); #endif if (g_SndMp3Enabled) { osSyncPrintf("RWI : Initialising the new and improved MP3 player\n"); - mp3Init(&g_SndHeap); + mp3_init(&g_SndHeap); func00037f08(0x7fff, 1); func00037f5c(0, true); @@ -1556,7 +1556,7 @@ void sndInit(void) } for (i = 0; i < ARRAYCOUNT(g_SeqInstances); i++) { - seqInit(&g_SeqInstances[i]); + seq_init(&g_SeqInstances[i]); } osSyncPrintf("gsSndpNew\n"); @@ -1565,16 +1565,16 @@ void sndInit(void) osSyncPrintf("Set the sample callbacks\n"); - sndpSetAddRefCallback(sndAddRef); - sndpSetRemoveRefCallback(sndRemoveRef); + sndpSetAddRefCallback(snd_add_ref); + sndpSetRemoveRefCallback(snd_remove_ref); - amgrStartThread(); + amgr_start_thread(); - sndSetSoundMode(g_SoundMode); + snd_set_sound_mode(g_SoundMode); } } -bool sndIsMp3(s16 soundnum) +bool snd_is_mp3(s16 soundnum) { union soundnumhack tmp; tmp.packed = soundnum; @@ -1582,7 +1582,7 @@ bool sndIsMp3(s16 soundnum) return tmp.mp3priority != 0; } -bool sndStopMp3(s16 arg0) +bool snd_stop_mp3(s16 arg0) { if (!g_SndDisabled && g_SndMp3Enabled) { if (func00037ea4() && g_SndCurMp3.unk08 != 0) { @@ -1603,7 +1603,7 @@ void snd0000fc40(s32 arg0) // empty } -bool seqPlay(struct seqinstance *seq, s32 tracknum) +bool seq_play(struct seqinstance *seq, s32 tracknum) { u32 stack; s32 binlen; @@ -1643,9 +1643,9 @@ bool seqPlay(struct seqinstance *seq, s32 tracknum) binstart = seq->data; zipstart = binstart + binlen - ziplen; - dmaExec(zipstart, g_SeqTable->entries[seq->tracknum].romaddr, ziplen); + dma_exec(zipstart, g_SeqTable->entries[seq->tracknum].romaddr, ziplen); - ziplen = rzipInflate(zipstart, binstart, scratch); + ziplen = rzip_inflate(zipstart, binstart, scratch); #if VERSION < VERSION_NTSC_1_0 if (ziplen == 0) { @@ -1656,7 +1656,7 @@ bool seqPlay(struct seqinstance *seq, s32 tracknum) zipstart[4], zipstart[5], zipstart[6], zipstart[7], zipstart[8], zipstart[9], zipstart[10], zipstart[11], zipstart[12], zipstart[13], zipstart[14], zipstart[15]); - crashSetMessage(message); + crash_set_message(message); CRASH(); } #endif @@ -1671,18 +1671,18 @@ bool seqPlay(struct seqinstance *seq, s32 tracknum) n_alCSeqNew(&seq->seq, seq->data); n_alCSPSetSeq(seq->seqp, &seq->seq); - seqSetVolume(seq, seqGetVolume(seq)); + seq_set_volume(seq, seq_get_volume(seq)); n_alCSPPlay(seq->seqp); return true; } -u16 seqGetVolume(struct seqinstance *seq) +u16 seq_get_volume(struct seqinstance *seq) { return g_SndDisabled ? AL_VOL_FULL : seq->volume; } -void seqSetVolume(struct seqinstance *seq, u16 volume) +void seq_set_volume(struct seqinstance *seq, u16 volume) { if (!g_SndDisabled) { u32 tmp = var8005ecf8[seq->tracknum] * volume; @@ -1698,7 +1698,7 @@ void seqSetVolume(struct seqinstance *seq, u16 volume) } } -void sndHandleRetrace(void) +void snd_handle_retrace(void) { // empty } @@ -1722,7 +1722,7 @@ void snd0000fe80(void) // empty } -void sndTick(void) +void snd_tick(void) { #if VERSION >= VERSION_NTSC_1_0 struct sndstate *stateptrs[64]; @@ -1740,7 +1740,7 @@ void sndTick(void) #if VERSION >= VERSION_NTSC_1_0 static s32 g_SndMostEverPlaying2 = -1; - sndIncrementAges(); + snd_increment_ages(); prevpri = osGetThreadPri(NULL); osSetThreadPri(0, osGetThreadPri(&g_AudioManager.thread) + 1); @@ -1783,13 +1783,13 @@ void sndTick(void) if (!g_SndDisabled && g_SndMp3Enabled) { if (g_Vars.stagenum == STAGE_AIRFORCEONE) { - sndTickNosedive(); + snd_tick_nosedive(); } else if (g_Vars.stagenum == STAGE_ESCAPE) { - sndTickUfo(); + snd_tick_ufo(); } if (g_Vars.tickmode == TICKMODE_CUTSCENE) { - s0 = musicGetVolume() > g_SfxVolume ? musicGetVolume() : g_SfxVolume; + s0 = music_get_volume() > g_SfxVolume ? music_get_volume() : g_SfxVolume; if (s0 != snd0000e9dc()) { snd0000ea80(s0); @@ -1803,7 +1803,7 @@ void sndTick(void) if (g_SndGuardStringPtr != NULL) { if (strcmp(g_SndGuardStringPtr, g_SndGuardString) != 0) { #if VERSION < VERSION_NTSC_1_0 - crashSetMessage("Snd Heap Check FAILED"); + crash_set_message("Snd Heap Check FAILED"); CRASH(); #endif } @@ -1811,7 +1811,7 @@ void sndTick(void) if (func00037ea4() == 0 && g_SndCurMp3.playing) { if (g_SndCurMp3.unk08) { - mp3PlayFile(g_SndCurMp3.romaddr, g_SndCurMp3.romsize); + mp3_play_file(g_SndCurMp3.romaddr, g_SndCurMp3.romsize); return; } @@ -1875,7 +1875,7 @@ void sndTick(void) } g_SndCurMp3.responsetimer240 = -1; - sndStart(0, sp50.packed, 0, -1, -1, -1.0f, -1, -1); + snd_start(0, sp50.packed, 0, -1, -1, -1.0f, -1, -1); } } } @@ -1893,12 +1893,12 @@ s16 snd0001034c(s16 sfxnum) return sfxnum; } -bool sndIsDisabled(void) +bool snd_is_disabled(void) { return g_SndDisabled; } -void sndStartMp3ByFilenum(u32 filenum) +void snd_start_mp3_by_filenum(u32 filenum) { union soundnumhack sfxref; @@ -1908,7 +1908,7 @@ void sndStartMp3ByFilenum(u32 filenum) sfxref.mp3priority = 1; // high priority sfxref.id = filenum; - sndStart(0, sfxref.packed, NULL, -1, -1, -1, -1, -1); + snd_start(0, sfxref.packed, NULL, -1, -1, -1, -1, -1); } } @@ -1916,7 +1916,7 @@ void sndStartMp3ByFilenum(u32 filenum) * Return true if the player has the language filter enabled * and the given audio ID is one that should be filtered out. */ -bool sndIsFiltered(s32 audio_id) +bool snd_is_filtered(s32 audio_id) { if (g_Vars.langfilteron) { union soundnumhack sfxref; @@ -1946,7 +1946,7 @@ bool sndIsFiltered(s32 audio_id) return false; } -void sndAdjust(struct sndstate **handle, bool ismp3, s32 vol, s32 pan, s32 soundnum, f32 pitch, s32 fxbus, s32 fxmixarg, bool forcefxmix) +void snd_adjust(struct sndstate **handle, bool ismp3, s32 vol, s32 pan, s32 soundnum, f32 pitch, s32 fxbus, s32 fxmixarg, bool forcefxmix) { s32 fxmix = -1; union soundnumhack sp20; @@ -2084,14 +2084,14 @@ struct sndstate *snd00010718(struct sndstate **handle, s32 flags, s32 volume, s3 } } - state = sndStart(var80095200, soundnum, handle, volume, pan, pitch, fxbus, fxmix); + state = snd_start(var80095200, soundnum, handle, volume, pan, pitch, fxbus, fxmix); osSetThreadPri(0, prevpri); return state; } -struct sndstate *sndStart(s32 arg0, s16 sound, struct sndstate **handle, s32 volumearg, s32 panarg, f32 pitcharg, s32 fxbusarg, s32 fxmixarg) +struct sndstate *snd_start(s32 arg0, s16 sound, struct sndstate **handle, s32 volumearg, s32 panarg, f32 pitcharg, s32 fxbusarg, s32 fxmixarg) { union soundnumhack sp44; union soundnumhack sp40; @@ -2119,8 +2119,8 @@ struct sndstate *sndStart(s32 arg0, s16 sound, struct sndstate **handle, s32 vol return NULL; } - if (sndIsMp3(sp40.packed)) { - sndStartMp3(sp40.packed, volume, pan, 0); + if (snd_is_mp3(sp40.packed)) { + snd_start_mp3(sp40.packed, volume, pan, 0); if (handle != NULL) { *handle = NULL; @@ -2150,7 +2150,7 @@ const char var70053c10[] = "Snd_Play_Mpeg : SYSTEM IS DISABLED\n"; const char var70053c34[] = "Snd_Play_Mpeg : Lib called -> Adr=%x\n"; const char var70053c5c[] = "Snd_Play_Mpeg : Chunk size -> Adr=%x\n"; -void sndStartMp3(s16 soundnum, s32 volume, s32 pan, s32 responseflags) +void snd_start_mp3(s16 soundnum, s32 volume, s32 pan, s32 responseflags) { union soundnumhack sp24; union soundnumhack sp20; @@ -2189,13 +2189,13 @@ void sndStartMp3(s16 soundnum, s32 volume, s32 pan, s32 responseflags) volume = volume * snd0000e9dc() / AL_VOL_FULL; - g_SndCurMp3.romaddr = fileGetRomAddress(sp20.id); - g_SndCurMp3.romsize = fileGetRomSize(sp20.id); + g_SndCurMp3.romaddr = file_get_rom_address(sp20.id); + g_SndCurMp3.romsize = file_get_rom_size(sp20.id); func00037f08(volume, true); func00037f5c(pan, true); - mp3PlayFile(g_SndCurMp3.romaddr, g_SndCurMp3.romsize); + mp3_play_file(g_SndCurMp3.romaddr, g_SndCurMp3.romsize); func00037f08(volume, true); func00037f5c(pan, true); @@ -2218,7 +2218,7 @@ void sndStartMp3(s16 soundnum, s32 volume, s32 pan, s32 responseflags) } } -void sndPlayNosedive(s32 seconds) +void snd_play_nosedive(s32 seconds) { g_SndNosediveDuration240 = seconds * TICKS(240); g_SndNosediveAge240 = 0; @@ -2226,14 +2226,14 @@ void sndPlayNosedive(s32 seconds) g_SndNosediveHandle = NULL; } -void sndStopNosedive(void) +void snd_stop_nosedive(void) { if (g_SndNosediveAge240 != -1) { g_SndNosediveAge240 = g_SndNosediveDuration240 + 1; } } -void sndTickNosedive(void) +void snd_tick_nosedive(void) { f32 percentage; @@ -2245,7 +2245,7 @@ void sndTickNosedive(void) if (percentage < 1.0f) { // less than 100% complete percentage += 0.44f; - if (lvIsPaused()) { + if (lv_is_paused()) { // Fade out volume during pause instead of stopping abruptly if (g_SndNosediveVolume > 0) { g_SndNosediveVolume -= g_Vars.diffframe240 * PALUP(80); @@ -2256,7 +2256,7 @@ void sndTickNosedive(void) } if (g_SndNosediveVolume) { - sndAdjust(&g_SndNosediveHandle, 0, g_SndNosediveVolume, AL_PAN_CENTER, -1, percentage, 0, -1, 1); + snd_adjust(&g_SndNosediveHandle, 0, g_SndNosediveVolume, AL_PAN_CENTER, -1, percentage, 0, -1, 1); } else if (g_SndNosediveHandle != NULL) { audioStop(g_SndNosediveHandle); g_SndNosediveHandle = NULL; @@ -2264,7 +2264,7 @@ void sndTickNosedive(void) } else { // Not paused if (g_SndNosediveHandle == NULL) { - sndStart(var80095200, SFX_NOSEDIVE, &g_SndNosediveHandle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_NOSEDIVE, &g_SndNosediveHandle, -1, -1, -1, -1, -1); } // Fade in over about 2 seconds @@ -2276,7 +2276,7 @@ void sndTickNosedive(void) } } - sndAdjust(&g_SndNosediveHandle, 0, g_SndNosediveVolume, AL_PAN_CENTER, -1, percentage, 0, -1, 1); + snd_adjust(&g_SndNosediveHandle, 0, g_SndNosediveVolume, AL_PAN_CENTER, -1, percentage, 0, -1, 1); } } else { // Reached the configured fade out point @@ -2289,7 +2289,7 @@ void sndTickNosedive(void) } if (g_SndNosediveVolume) { - sndAdjust(&g_SndNosediveHandle, 0, g_SndNosediveVolume, AL_PAN_CENTER, -1, -1, 0, -1, 1); + snd_adjust(&g_SndNosediveHandle, 0, g_SndNosediveVolume, AL_PAN_CENTER, -1, -1, 0, -1, 1); } else if (g_SndNosediveHandle != NULL) { audioStop(g_SndNosediveHandle); g_SndNosediveHandle = NULL; @@ -2298,7 +2298,7 @@ void sndTickNosedive(void) } } -void sndPlayUfo(s32 seconds) +void snd_play_ufo(s32 seconds) { g_SndUfoDuration240 = seconds * TICKS(240); g_SndUfoAge240 = 0; @@ -2306,14 +2306,14 @@ void sndPlayUfo(s32 seconds) g_SndUfoHandle = NULL; } -void sndStopUfo(void) +void snd_stop_ufo(void) { if (g_SndUfoAge240 != -1) { g_SndUfoAge240 = g_SndUfoDuration240 + 1; } } -void sndTickUfo(void) +void snd_tick_ufo(void) { f32 percentage; @@ -2329,7 +2329,7 @@ void sndTickUfo(void) percentage = (percentage - 0.65f) / 0.35f * 0.8f + 1.0f; } - if (lvIsPaused()) { + if (lv_is_paused()) { // Fade out volume during pause instead of stopping abruptly if (g_SndUfoVolume > 0) { g_SndUfoVolume -= g_Vars.diffframe240 * PALUP(120); @@ -2340,7 +2340,7 @@ void sndTickUfo(void) } if (g_SndUfoVolume) { - sndAdjust(&g_SndUfoHandle, 0, g_SndUfoVolume, AL_PAN_CENTER, -1, percentage, 0, -1, 1); + snd_adjust(&g_SndUfoHandle, 0, g_SndUfoVolume, AL_PAN_CENTER, -1, percentage, 0, -1, 1); } else if (g_SndUfoHandle != NULL) { audioStop(g_SndUfoHandle); g_SndUfoHandle = NULL; @@ -2348,7 +2348,7 @@ void sndTickUfo(void) } else { // Not paused if (g_SndUfoHandle == NULL) { - sndStart(var80095200, SFX_UFOHUM, &g_SndUfoHandle, -1, -1, -1, -1, -1); + snd_start(var80095200, SFX_UFOHUM, &g_SndUfoHandle, -1, -1, -1, -1, -1); } // Fade in over about 2.4 seconds @@ -2360,7 +2360,7 @@ void sndTickUfo(void) } } - sndAdjust(&g_SndUfoHandle, 0, g_SndUfoVolume, AL_PAN_CENTER, -1, percentage, 0, -1, 1); + snd_adjust(&g_SndUfoHandle, 0, g_SndUfoVolume, AL_PAN_CENTER, -1, percentage, 0, -1, 1); } } else { // Reached the configured fade out point @@ -2373,7 +2373,7 @@ void sndTickUfo(void) } if (g_SndUfoVolume) { - sndAdjust(&g_SndUfoHandle, 0, g_SndUfoVolume, AL_PAN_CENTER, -1, -1, 0, -1, 1); + snd_adjust(&g_SndUfoHandle, 0, g_SndUfoVolume, AL_PAN_CENTER, -1, -1, 0, -1, 1); } else if (g_SndUfoHandle != NULL) { audioStop(g_SndUfoHandle); g_SndUfoHandle = NULL; diff --git a/src/lib/speaker.c b/src/lib/speaker.c index bbf3103ef..5d9700214 100644 --- a/src/lib/speaker.c +++ b/src/lib/speaker.c @@ -17,7 +17,7 @@ u8 var8009c344[2]; u8 var8009c346[2]; u8 var8009c348[4]; -void speakersSetMode(u8 mode) +void speakers_set_mode(u8 mode) { s32 i; diff --git a/src/lib/str.c b/src/lib/str.c index 9944019a3..e4997e8ed 100644 --- a/src/lib/str.c +++ b/src/lib/str.c @@ -7,11 +7,11 @@ char *strcpy(char *dst, const char *src) char c; if (dst == NULL) { - faultAssert("s1", "str.c", 44); + fault_assert("s1", "str.c", 44); } if (src == NULL) { - faultAssert("s2", "str.c", 45); + fault_assert("s2", "str.c", 45); } *ptr = c = *src; diff --git a/src/lib/ultra/io/pfsinitpak.c b/src/lib/ultra/io/pfsinitpak.c index ff8343c86..f72266f2f 100644 --- a/src/lib/ultra/io/pfsinitpak.c +++ b/src/lib/ultra/io/pfsinitpak.c @@ -94,7 +94,7 @@ s32 osPfsInitPak(OSMesgQueue *queue, OSPfs *pfs, s32 channel) return ret; } - rmonPrintf("pfsinitpak.c -> ret = %d\n", ret); + rmon_printf("pfsinitpak.c -> ret = %d\n", ret); ret = osPfsChecker(pfs); pfs->status |= PFS_INITIALIZED; #endif diff --git a/src/lib/ultra/os/exceptasm.s b/src/lib/ultra/os/exceptasm.s index d13a215a6..9e9cf55cf 100644 --- a/src/lib/ultra/os/exceptasm.s +++ b/src/lib/ultra/os/exceptasm.s @@ -436,7 +436,7 @@ glabel __osException and $s0, $s0, $at .handle_rmiss: - jal vmHandleMiss + jal vm_handle_miss nop b .dispatch_thread nop diff --git a/src/lib/varsinit.c b/src/lib/varsinit.c index 0d7925fe7..508b15a7d 100644 --- a/src/lib/varsinit.c +++ b/src/lib/varsinit.c @@ -10,7 +10,7 @@ u32 var8009e6b0[4]; struct g_vars g_Vars; -void varsInit(void) +void vars_init(void) { g_Vars.diffframe60f = 1; g_Vars.lvframe60 = 0; diff --git a/src/lib/vi.c b/src/lib/vi.c index 77124383b..a44e69718 100644 --- a/src/lib/vi.c +++ b/src/lib/vi.c @@ -64,7 +64,7 @@ bool g_ViIs16Bit = true; bool g_ViReconfigured = false; s32 g_ViSlot = 0; -void viConfigureForLogos(void) +void vi_configure_for_logos(void) { g_ViFrontIndex = 0; g_ViBackIndex = 1; @@ -111,7 +111,7 @@ void viConfigureForLogos(void) * * Both textures are 507 x 48, but the framebuffer width is 576. */ -void viConfigureForCopyright(u16 *texturedata) +void vi_configure_for_copyright(u16 *texturedata) { s32 i; @@ -140,7 +140,7 @@ void viConfigureForCopyright(u16 *texturedata) * It's also used for the "check controllers" message * if controller 1 is not connected. */ -void viConfigureForLegal(void) +void vi_configure_for_legal(void) { s32 i; @@ -157,7 +157,7 @@ void viConfigureForLegal(void) g_Vars.fourmeg2player = false; #if PAL - playerResetLoResIf4Mb(); + player_reset_lo_res_if_4mb(); #endif } @@ -174,7 +174,7 @@ const s16 g_ViModeHeights[] = {FBALLOC_HEIGHT_LO, FBALLOC_HEIGHT_LO, (PAL ? 252 * * The same is probably true for wide and cinema modes. */ -void viReset(s32 stagenum) +void vi_reset(s32 stagenum) { s32 i; s32 fbsize; @@ -186,14 +186,14 @@ void viReset(s32 stagenum) if (stagenum == STAGE_TITLE || stagenum == STAGE_TEST_OLD) { if (IS4MB()) { - viSetMode(VIMODE_HI); + vi_set_mode(VIMODE_HI); fbsize = (FBALLOC_WIDTH_LO * 2) * (FBALLOC_HEIGHT_LO * 2) * NUM_FRAMEBUFFERS; } else { - viSetMode(VIMODE_HI); + vi_set_mode(VIMODE_HI); fbsize = g_ViModeWidths[2] * g_ViModeHeights[2] * NUM_FRAMEBUFFERS; } } else { - viSetMode(VIMODE_LO); + vi_set_mode(VIMODE_LO); if (1); @@ -215,7 +215,7 @@ void viReset(s32 stagenum) } } - ptr = mempAlloc(fbsize * sizeof(u16) + 0x40, MEMPOOL_STAGE); + ptr = memp_alloc(fbsize * sizeof(u16) + 0x40, MEMPOOL_STAGE); ptr = (u8 *)(((uintptr_t) ptr + 0x3f) & 0xffffffc0); @@ -243,13 +243,13 @@ void viReset(s32 stagenum) * The g_ViUnblackTimer value only ticks down when it's 2 or less, * so passing true to this function makes it not tick. */ -void viBlack(bool black) +void vi_black(bool black) { black += NUM_FRAMEBUFFERS; g_ViUnblackTimer = black; } -void viHandleRetrace(void) +void vi_handle_retrace(void) { s32 prevmask; s32 offset; @@ -287,7 +287,7 @@ void viHandleRetrace(void) osViSetSpecialFeatures(OS_VI_GAMMA_OFF | OS_VI_DITHER_FILTER_ON); } -void viUpdateMode(void) +void vi_update_mode(void) { struct rend_vidat *prevdata; f32 x; @@ -446,11 +446,11 @@ void viUpdateMode(void) if (g_ViReconfigured) { g_ViReconfigured = false; - viBlack(false); + vi_black(false); } } -void viShake(f32 intensity) +void vi_shake(f32 intensity) { if (intensity > 14) { intensity = 14; @@ -464,7 +464,7 @@ void viShake(f32 intensity) g_ViShakeTimer = 10; } -void viSetMode(s32 mode) +void vi_set_mode(s32 mode) { g_ViBackData->mode = mode; @@ -472,37 +472,37 @@ void viSetMode(s32 mode) g_ViBackData->y = g_ViBackData->bufy = g_ViModeHeights[mode]; } -void viSet16Bit(void) +void vi_set_16bit(void) { g_ViIs16Bit = true; } -void viSet32Bit(void) +void vi_set_32bit(void) { g_ViIs16Bit = false; } -u16 *viGetBackBuffer(void) +u16 *vi_get_back_buffer(void) { return g_ViBackData->fb; } -u16 *viGetFrontBuffer(void) +u16 *vi_get_front_buffer(void) { return g_ViFrontData->fb; } -void viSetBackBuffer(u16 *fb) +void vi_set_back_buffer(u16 *fb) { g_ViBackData->fb = fb; } -Vp *viGetCurrentPlayerViewport(void) +Vp *vi_get_current_player_viewport(void) { return &g_Vars.currentplayer->viewport[g_ViBackIndex]; } -u16 viGetPerspScale(void) +u16 vi_get_persp_scale(void) { return g_ViPerspScale; } @@ -518,18 +518,18 @@ Gfx *vi0000ab78(Gfx *gdl) u16 sp46; guPerspectiveF(sp110.m, &sp46, g_ViBackData->fovy, g_ViBackData->aspect, g_ViBackData->znear, g_ViBackData->zfar + g_ViBackData->zfar, 1); - mtx4Copy(camGetWorldToScreenMtxf(), &sp90); + mtx4_copy(cam_get_world_to_screen_mtxf(), &sp90); sp90.m[3][0] = 0; sp90.m[3][1] = 0; sp90.m[3][2] = 0; - mtx4MultMtx4(&sp110, &sp90, &spd0); - sp4c = gfxAllocateMatrix(); + mtx4_mult_mtx4(&sp110, &sp90, &spd0); + sp4c = gfx_allocate_matrix(); guMtxF2L(spd0.m, sp4c); - mtx4LoadIdentity(&sp50); - sp48 = gfxAllocateMatrix(); + mtx4_load_identity(&sp50); + sp48 = gfx_allocate_matrix(); guMtxF2L(sp50.m, sp48); gSPMatrix(gdl++, OS_K0_TO_PHYSICAL(sp4c), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); @@ -543,7 +543,7 @@ Gfx *vi0000aca4(Gfx *gdl, f32 znear, f32 zfar) { u16 scale; Mtxf tmp; - Mtx *mtx = gfxAllocateMatrix(); + Mtx *mtx = gfx_allocate_matrix(); guPerspectiveF(tmp.m, &scale, g_ViBackData->fovy, g_ViBackData->aspect, znear, zfar, 1); guMtxF2L(tmp.m, mtx); @@ -564,15 +564,15 @@ Gfx *vi0000ad5c(Gfx *gdl, Vp *vp) gSPViewport(gdl++, OS_K0_TO_PHYSICAL(&vp[g_ViBackIndex])); - var80092870 = gfxAllocateMatrix(); + var80092870 = gfx_allocate_matrix(); guPerspectiveF(var80092830.m, &g_ViPerspScale, g_ViBackData->fovy, g_ViBackData->aspect, g_ViBackData->znear, g_ViBackData->zfar, 1); guMtxF2L(var80092830.m, var80092870); gSPMatrix(gdl++, OS_K0_TO_PHYSICAL(var80092870), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPPerspNormalize(gdl++, g_ViPerspScale); - camSetPerspectiveMtxL(var80092870); - camSetMtxF1754(&var80092830); + cam_set_perspective_mtxl(var80092870); + cam_set_mtxf1754(&var80092830); return gdl; } @@ -593,15 +593,15 @@ Gfx *vi0000af00(Gfx *gdl, Vp *vp) gSPViewport(gdl++, OS_K0_TO_PHYSICAL(&vp[g_ViBackIndex])); - var80092870 = gfxAllocateMatrix(); + var80092870 = gfx_allocate_matrix(); guPerspectiveF(var80092830.m, &g_ViPerspScale, g_ViBackData->fovy, g_ViBackData->aspect, g_ViBackData->znear, g_ViBackData->zfar, 1); guMtxF2L(var80092830.m, var80092870); gSPMatrix(gdl++, OS_K0_TO_PHYSICAL(var80092870), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPPerspNormalize(gdl++, g_ViPerspScale); - camSetPerspectiveMtxL(var80092870); - camSetMtxF1754(&var80092830); + cam_set_perspective_mtxl(var80092870); + cam_set_mtxf1754(&var80092830); return gdl; } @@ -609,7 +609,7 @@ Gfx *vi0000af00(Gfx *gdl, Vp *vp) Gfx *vi0000b0e8(Gfx *gdl, f32 fovy, f32 aspect) { Mtxf tmp; - Mtx *mtx = gfxAllocateMatrix(); + Mtx *mtx = gfx_allocate_matrix(); guPerspectiveF(tmp.m, &g_ViPerspScale, fovy, aspect, g_ViBackData->znear, g_ViBackData->zfar, 1); guMtxF2L(tmp.m, mtx); @@ -638,17 +638,17 @@ Gfx *vi0000b1d0(Gfx *gdl) return gdl; } -Gfx *viPrepareZbuf(Gfx *gdl) +Gfx *vi_prepare_zbuf(Gfx *gdl) { if (g_ViBackData->usezbuf) { - gdl = zbufConfigureRdp(gdl); - gdl = zbufClear(gdl); + gdl = zbuf_configure_rdp(gdl); + gdl = zbuf_clear(gdl); } return gdl; } -Gfx *viFillBuffer(Gfx *gdl) +Gfx *vi_fill_buffer(Gfx *gdl) { gDPSetCycleType(gdl++, G_CYC_FILL); gDPFillRectangle(gdl++, 0, 0, g_ViBackData->bufx - 1, g_ViBackData->bufy - 1); @@ -657,36 +657,36 @@ Gfx *viFillBuffer(Gfx *gdl) return gdl; } -Gfx *viRenderViewportEdges(Gfx *gdl) +Gfx *vi_render_viewport_edges(Gfx *gdl) { gDPSetCycleType(gdl++, G_CYC_FILL); - gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, viGetWidth(), viGetHeight()); + gDPSetScissor(gdl++, G_SC_NON_INTERLACE, 0, 0, vi_get_width(), vi_get_height()); gDPSetFillColor(gdl++, GPACK_RGBA5551(0, 0, 0, 1) << 16 | GPACK_RGBA5551(0, 0, 0, 1)); #if VERSION >= VERSION_NTSC_1_0 if (PLAYERCOUNT() == 1 || ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) - && playerHasSharedViewport() && g_Vars.currentplayernum == 0)) + && player_has_shared_viewport() && g_Vars.currentplayernum == 0)) #else if (PLAYERCOUNT() == 1 || ((g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0) && ( - (g_InCutscene && !g_MainIsEndscreen) || menuGetRoot() == MENUROOT_COOPCONTINUE + (g_InCutscene && !g_MainIsEndscreen) || menu_get_root() == MENUROOT_COOPCONTINUE ) && g_Vars.currentplayernum == 0)) #endif { // Single viewport - if (viGetViewTop() > 0) { + if (vi_get_view_top() > 0) { // Fill above - gDPFillRectangle(gdl++, 0, 0, viGetWidth() - 1, viGetViewTop() - 1); + gDPFillRectangle(gdl++, 0, 0, vi_get_width() - 1, vi_get_view_top() - 1); gDPPipeSync(gdl++); } - if (viGetViewTop() + viGetViewHeight() < viGetHeight()) { + if (vi_get_view_top() + vi_get_view_height() < vi_get_height()) { // Fill below gDPFillRectangle(gdl++, - 0, viGetViewTop() + viGetViewHeight(), - viGetWidth() - 1, viGetHeight() - 1); + 0, vi_get_view_top() + vi_get_view_height(), + vi_get_width() - 1, vi_get_height() - 1); gDPPipeSync(gdl++); } } else { @@ -705,26 +705,26 @@ Gfx *viRenderViewportEdges(Gfx *gdl) if (g_Vars.players[topplayernum]->viewtop > 0) { // Fill above all viewports - full width - gDPFillRectangle(gdl++, 0, 0, viGetWidth() - 1, g_Vars.players[topplayernum]->viewtop - 1); + gDPFillRectangle(gdl++, 0, 0, vi_get_width() - 1, g_Vars.players[topplayernum]->viewtop - 1); gDPPipeSync(gdl++); } - if (g_Vars.players[bottomplayernum]->viewtop + g_Vars.players[bottomplayernum]->viewheight < viGetHeight()) { + if (g_Vars.players[bottomplayernum]->viewtop + g_Vars.players[bottomplayernum]->viewheight < vi_get_height()) { // Fill below all viewports - full width gDPFillRectangle(gdl++, 0, g_Vars.players[bottomplayernum]->viewtop + g_Vars.players[bottomplayernum]->viewheight, - viGetWidth() - 1, viGetHeight() - 1); + vi_get_width() - 1, vi_get_height() - 1); gDPPipeSync(gdl++); } // Horizontal middle line gDPFillRectangle(gdl++, 0, g_Vars.players[tmpplayernum]->viewtop - 1, - viGetWidth() - 1, g_Vars.players[tmpplayernum]->viewtop - 1); + vi_get_width() - 1, g_Vars.players[tmpplayernum]->viewtop - 1); gDPPipeSync(gdl++); if (PLAYERCOUNT() >= 3 || - (PLAYERCOUNT() == 2 && (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player))) { + (PLAYERCOUNT() == 2 && (options_get_screen_split() == SCREENSPLIT_VERTICAL || g_Vars.fourmeg2player))) { if (PLAYERCOUNT() == 2) { tmpplayernum = 0; } @@ -732,7 +732,7 @@ Gfx *viRenderViewportEdges(Gfx *gdl) // Vertical middle line gDPFillRectangle(gdl++, g_Vars.players[tmpplayernum]->viewleft + g_Vars.players[tmpplayernum]->viewwidth, 0, - g_Vars.players[tmpplayernum]->viewleft + g_Vars.players[tmpplayernum]->viewwidth, viGetHeight() - 1); + g_Vars.players[tmpplayernum]->viewleft + g_Vars.players[tmpplayernum]->viewwidth, vi_get_height() - 1); gDPPipeSync(gdl++); } @@ -740,7 +740,7 @@ Gfx *viRenderViewportEdges(Gfx *gdl) // Blank square in P4 spot gDPFillRectangle(gdl++, g_Vars.players[tmpplayernum]->viewleft + g_Vars.players[tmpplayernum]->viewwidth + 1, g_Vars.players[tmpplayernum]->viewtop, - viGetWidth() - 1, viGetHeight() - 1); + vi_get_width() - 1, vi_get_height() - 1); gDPPipeSync(gdl++); } } @@ -750,155 +750,155 @@ Gfx *viRenderViewportEdges(Gfx *gdl) } #if VERSION < VERSION_NTSC_1_0 -void viSetVStart(s32 vstart) +void vi_set_v_start(s32 vstart) { g_ViTargetVStart = vstart; } -s32 viGetVStart(void) +s32 vi_get_v_start(void) { return g_ViTargetVStart; } -void viSetHStart(s32 hstart) +void vi_set_h_start(s32 hstart) { g_ViTargetHStart = hstart; } -s32 viGetHStart(void) +s32 vi_get_h_start(void) { return g_ViTargetHStart; } #endif -void viSetBufSize(s16 width, s16 height) +void vi_set_buf_size(s16 width, s16 height) { g_ViBackData->bufx = width; g_ViBackData->bufy = height; } -s16 viGetBufWidth(void) +s16 vi_get_buf_width(void) { return g_ViBackData->bufx; } -s16 viGetBufHeight(void) +s16 vi_get_buf_height(void) { return g_ViBackData->bufy; } -void viSetSize(s16 width, s16 height) +void vi_set_size(s16 width, s16 height) { g_ViBackData->x = width; g_ViBackData->y = height; } -s16 viGetWidth(void) +s16 vi_get_width(void) { return g_ViBackData->x; } -s16 viGetHeight(void) +s16 vi_get_height(void) { return g_ViBackData->y; } -void viSetViewSize(s16 width, s16 height) +void vi_set_view_size(s16 width, s16 height) { g_ViBackData->viewx = width; g_ViBackData->viewy = height; - camSetScreenSize(g_ViBackData->viewx, g_ViBackData->viewy); - camSetScale(); + cam_set_screen_size(g_ViBackData->viewx, g_ViBackData->viewy); + cam_set_scale(); } -s16 viGetViewWidth(void) +s16 vi_get_view_width(void) { return g_ViBackData->viewx; } -s16 viGetViewHeight(void) +s16 vi_get_view_height(void) { return g_ViBackData->viewy; } -void viSetViewPosition(s16 left, s16 top) +void vi_set_view_position(s16 left, s16 top) { g_ViBackData->viewleft = left; g_ViBackData->viewtop = top; - camSetScreenPosition(g_ViBackData->viewleft, g_ViBackData->viewtop); + cam_set_screen_position(g_ViBackData->viewleft, g_ViBackData->viewtop); } -s16 viGetViewLeft(void) +s16 vi_get_view_left(void) { return g_ViBackData->viewleft; } -s16 viGetViewTop(void) +s16 vi_get_view_top(void) { return g_ViBackData->viewtop; } -void viSetUseZBuf(bool use) +void vi_set_use_z_buf(bool use) { g_ViBackData->usezbuf = use; } -void viSetFovY(f32 fovy) +void vi_set_fov_y(f32 fovy) { g_ViBackData->fovy = fovy; - camSetPerspective(g_ViBackData->znear, g_ViBackData->fovy, g_ViBackData->aspect); - camSetScale(); + cam_set_perspective(g_ViBackData->znear, g_ViBackData->fovy, g_ViBackData->aspect); + cam_set_scale(); } -void viSetAspect(f32 aspect) +void vi_set_aspect(f32 aspect) { g_ViBackData->aspect = aspect; - camSetPerspective(g_ViBackData->znear, g_ViBackData->fovy, g_ViBackData->aspect); - camSetScale(); + cam_set_perspective(g_ViBackData->znear, g_ViBackData->fovy, g_ViBackData->aspect); + cam_set_scale(); } -f32 viGetAspect(void) +f32 vi_get_aspect(void) { return g_ViBackData->aspect; } -void viSetFovAspectAndSize(f32 fovy, f32 aspect, s16 width, s16 height) +void vi_set_fov_aspect_and_size(f32 fovy, f32 aspect, s16 width, s16 height) { g_ViBackData->fovy = fovy; g_ViBackData->aspect = aspect; g_ViBackData->viewx = width; g_ViBackData->viewy = height; - camSetScreenSize(g_ViBackData->viewx, g_ViBackData->viewy); - camSetPerspective(g_ViBackData->znear, g_ViBackData->fovy, g_ViBackData->aspect); - camSetScale(); + cam_set_screen_size(g_ViBackData->viewx, g_ViBackData->viewy); + cam_set_perspective(g_ViBackData->znear, g_ViBackData->fovy, g_ViBackData->aspect); + cam_set_scale(); } -f32 viGetFovY(void) +f32 vi_get_fov_y(void) { return g_ViBackData->fovy; } -void viSetZRange(f32 near, f32 far) +void vi_set_z_range(f32 near, f32 far) { g_ViBackData->znear = near; g_ViBackData->zfar = far; - camSetPerspective(g_ViBackData->znear, g_ViBackData->fovy, g_ViBackData->aspect); - camSetScale(); + cam_set_perspective(g_ViBackData->znear, g_ViBackData->fovy, g_ViBackData->aspect); + cam_set_scale(); } -void viGetZRange(struct zrange *zrange) +void vi_get_z_range(struct zrange *zrange) { zrange->near = g_ViBackData->znear; zrange->far = g_ViBackData->zfar; } -Gfx *viSetFillColour(Gfx *gdl, s32 r, s32 g, s32 b) +Gfx *vi_set_fill_colour(Gfx *gdl, s32 r, s32 g, s32 b) { if (g_ViIs16Bit) { gDPSetFillColor(gdl++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); @@ -909,22 +909,22 @@ Gfx *viSetFillColour(Gfx *gdl, s32 r, s32 g, s32 b) return gdl; } -void viGrabJpg16(void) +void vi_grab_jpg16(void) { // empty } -void viGrabJpg32(void) +void vi_grab_jpg32(void) { // empty } -void viGrabRgb16(void) +void vi_grab_rgb16(void) { // empty } -void viGrabRgb32(void) +void vi_grab_rgb32(void) { // empty } diff --git a/src/lib/videbug.c b/src/lib/videbug.c index 4e9e42634..9dff379ae 100644 --- a/src/lib/videbug.c +++ b/src/lib/videbug.c @@ -8,12 +8,12 @@ OSMesg g_ViDebugMesgs[8]; OSMesgQueue g_ViDebugMesgQueue; -void videbugCreate(void) +void videbug_create(void) { // empty } -void videbugInit(void) +void videbug_init(void) { osCreateMesgQueue(&g_ViDebugMesgQueue, g_ViDebugMesgs, ARRAYCOUNT(g_ViDebugMesgs)); } diff --git a/src/lib/vm.s b/src/lib/vm.s index 41052c046..f5593e865 100644 --- a/src/lib/vm.s +++ b/src/lib/vm.s @@ -58,7 +58,7 @@ glabel g_VmZipTable glabel g_VmTempStack .space 0x1000 -# A scratch area that can be used by rzipInflate. +# A scratch area that can be used by rzip_inflate. glabel g_VmScratch .space 0x1400 @@ -99,7 +99,7 @@ glabel g_VmSlotsPhysicalAddr /** * Sets up TLB index 0 (0x70000000), then calls boot. */ -glabel vmBoot +glabel vm_boot li $t0, OS_PM_4M mtc0 $t0, C0_PAGEMASK li $t0, 0x70000000 @@ -119,7 +119,7 @@ glabel vmBoot jr $t0 nop -glabel vmInitVars +glabel vm_init_vars addiu $sp, $sp, -8 sw $ra, 0x0($sp) @@ -164,7 +164,7 @@ glabel vmInitVars jr $ra nop -glabel vmInitVacant +glabel vm_init_vacant # Fill array with 0xff (ie. all vacant) li $t0, 0xff lw $v0, g_VmVacantFirstByte @@ -187,15 +187,15 @@ glabel vmInitVacant nop /** - * vmHandleMiss is called from the exception handler when a request is made to + * vm_handle_miss is called from the exception handler when a request is made to * access a virtual memory address that isn't currently mapped in the TLB. - * vmHandleMiss must load the page from ROM if not already loaded, then map it + * vm_handle_miss must load the page from ROM if not already loaded, then map it * in the TLB. * * In NTSC Final, there are 443 virtual pages, 268 slots where these can be loaded, * and 30 of these can be mapped in the TLB at the same time. */ -glabel vmHandleMiss +glabel vm_handle_miss # C0_CONTEXT must be the 512-byte chunk index that was requested? # Convert it to a virtual address mfc0 $t0, C0_CONTEXT @@ -378,7 +378,7 @@ glabel vmHandleMiss sw $sp, 0x0($a0) addiu $sp, $a0, 0 - # Prepare arguments for rzipInflate + # Prepare arguments for rzip_inflate lw $a0, g_VmZipBuffer addiu $a0, $a0, 2 # Move past the 2-byte checksum li $t0, K0BASE @@ -418,7 +418,7 @@ glabel vmHandleMiss sw $s8, 0x78($sp) # Unzip the zip - jal rzipInflate + jal rzip_inflate nop # Reload registers from the stack @@ -599,7 +599,7 @@ glabel vmHandleMiss j handle_fault nop -glabel vmUnmapRange +glabel vm_unmap_range mfc0 $t0, C0_ENTRYHI li $t2, K0BASE mtc0 $t2, C0_ENTRYHI @@ -618,7 +618,7 @@ glabel vmUnmapRange nop #if VERSION < VERSION_NTSC_1_0 -glabel vmInvalidateFirst8Kb +glabel vm_invalidate_first_8kb li $t0, K0BASE addiu $t1, $t0, 0x1ff0 .invalidate_dcache_loop4: diff --git a/src/lib/vminit.c b/src/lib/vminit.c index 86269d6b0..2cbb0d0fb 100644 --- a/src/lib/vminit.c +++ b/src/lib/vminit.c @@ -113,7 +113,7 @@ extern u32 *g_VmZipTable; * * -- For 4MB systems -- * - * vmInit allocates space in memory for the TLB to be able to load zips in its + * vm_init allocates space in memory for the TLB to be able to load zips in its * exception handler. It initialises the zip table then leaves it to the TLB to * load the game zips as needed. * @@ -128,14 +128,14 @@ extern u32 *g_VmZipTable; * before unzipping it. * zip table - is the ROM offset table where each zip can be found, which is * used by the TLB's exception handler. - * state table - is cleared by vmInit then left to the TLB's exception handler + * state table - is cleared by vm_init then left to the TLB's exception handler * for it to populate as zips are loaded and paged out. - * stack - is reserved stack space for different threads, which vmInit must not + * stack - is reserved stack space for different threads, which vm_init must not * write into. * * -- For 8MB systems -- * - * vmInit loads all game zips into memory and sets TLB entries to map it to + * vm_init loads all game zips into memory and sets TLB entries to map it to * virtual address space. The page swapping feature is not used as the TLB * never encounters a page miss. * @@ -149,12 +149,12 @@ extern u32 *g_VmZipTable; * hold any zip. * zip table: is the ROM offset table where each zip can be found. * game seg: is where the entire game segment is unzipped to. - * stack: is reserved stack space for different threads, which vmInit must not + * stack: is reserved stack space for different threads, which vm_init must not * write into. * * -- Both systems -- * - * Regardless of the amount of memory being used, it is critical that vmInit + * Regardless of the amount of memory being used, it is critical that vm_init * sets the g_VmMarker global variable correctly. This marks the point in memory * where memory must be preserved. The main thread uses this variable as the end * address of memp's heap. @@ -165,7 +165,7 @@ extern u32 *g_VmZipTable; * In 8MB, the zip buffer and zip table are no longer needed, so g_VmMarker is * set to the start of the unzipped game segment. */ -void vmInit(void) +void vm_init(void) { s32 s1; u32 *romaddrs; @@ -197,10 +197,10 @@ void vmInit(void) g_VmInitialised = true; - rzipInit(); + rzip_init(); #if VERSION >= VERSION_NTSC_1_0 - if (bootGetMemSize() <= 0x400000) + if (boot_get_mem_size() <= 0x400000) #else if (osGetMemSize() <= 0x400000) #endif @@ -220,7 +220,7 @@ void vmInit(void) g_VmZipTable = (u32 *) ((uintptr_t) ((u32 *) gameseg - (numentries + 4)) & ~0xf); // Load gamezips pointer list - dmaExec(g_VmZipTable, (romptr_t) &_gamezipSegmentRomStart, ALIGN16((numentries + 1) << 2)); + dma_exec(g_VmZipTable, (romptr_t) &_gamezipSegmentRomStart, ALIGN16((numentries + 1) << 2)); // Make pointers absolute instead of relative to their segment for (pagenum = 0; pagenum < numentries; pagenum++) { @@ -247,7 +247,7 @@ void vmInit(void) g_VmPhysicalSlots = (uintptr_t) gameseg; g_VmMarker = gameseg; - vmInitVars(); + vm_init_vars(); // Clear the state table ptr = g_VmVirtualToPhysicalTable; @@ -257,7 +257,7 @@ void vmInit(void) ptr[s1] = 0; } - vmInitVacant(); + vm_init_vacant(); } else { // Expansion pak is being used g_Is4Mb = numentries * false; @@ -278,7 +278,7 @@ void vmInit(void) numentries2 = numentries; // Load gamezips pointer list - dmaExec(romaddrs, (romptr_t) &_gamezipSegmentRomStart, ALIGN16((numentries2 + 1) << 2)); + dma_exec(romaddrs, (romptr_t) &_gamezipSegmentRomStart, ALIGN16((numentries2 + 1) << 2)); if (pagenum); @@ -299,12 +299,12 @@ void vmInit(void) zip = chunkbuffer + 2; for (ITER = 0; ITER < numentries2 - 1;) { - dmaExec(chunkbuffer, romaddrs[ITER], ALIGN16(romaddrs[ITER + 1] - romaddrs[ITER])); + dma_exec(chunkbuffer, romaddrs[ITER], ALIGN16(romaddrs[ITER + 1] - romaddrs[ITER])); #if VERSION >= VERSION_NTSC_1_0 - s2 += rzipInflate(zip, s2, sp68); + s2 += rzip_inflate(zip, s2, sp68); #else - len = rzipInflate(zip, s2, sp68); + len = rzip_inflate(zip, s2, sp68); if (len == 0) { sprintf(message, "DMA-Crash %s %d Ram: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", @@ -313,7 +313,7 @@ void vmInit(void) chunkbuffer[4], chunkbuffer[5], chunkbuffer[6], chunkbuffer[7], chunkbuffer[8], chunkbuffer[9], chunkbuffer[10], chunkbuffer[11], chunkbuffer[12], chunkbuffer[13], chunkbuffer[14], chunkbuffer[15]); - crashSetMessage(message); + crash_set_message(message); CRASH(); } diff --git a/src/preamble/preamble.s b/src/preamble/preamble.s index d7d2f9404..1bfbefde8 100644 --- a/src/preamble/preamble.s +++ b/src/preamble/preamble.s @@ -7,7 +7,7 @@ /** * This function is generated automatically by makerom. It clears the BSS - * segment, sets the stack pointer to 0x80000f10 and then calls vmBoot. + * segment, sets the stack pointer to 0x80000f10 and then calls vm_boot. */ glabel preamble lui $t0, %hi(_bssSegmentStart) @@ -21,8 +21,8 @@ glabel preamble bnez $t1, .bss_loop addi $t0, $t0, 8 - lui $t2, %hi(vmBootFromPreamble) + lui $t2, %hi(vm_boot_from_preamble) li $sp, K0BASE - addiu $t2, $t2, %lo(vmBootFromPreamble) + addiu $t2, $t2, %lo(vm_boot_from_preamble) jr $t2 addiu $sp, $sp, 0xf10 diff --git a/tools/mkrom/piracy.c b/tools/mkrom/piracy.c index 269cd2ec2..c58c3d854 100644 --- a/tools/mkrom/piracy.c +++ b/tools/mkrom/piracy.c @@ -164,21 +164,21 @@ void piracy_patch_checksums(void) { // algorithm, patch function, sum function patch(algo01, "__scHandleTasks", "boot"); - patch(algo02, "cheatMenuHandleDialog", "__scHandleTasks"); - patch(algo03, "botPickupProp", "doorFinishClose"); - patch(algo04, "chrUncloak", "botPickupProp"); - patch(algo05, "chrsCheckForNoise", "__scHandleRetrace"); - patch(algo06, "lvReset", "lvGetSlowMotionType"); - patch(algo07, "bodyAllocateEyespy", "lvReset"); - patch(algo08, "chrConsiderGrenadeThrow", "bgReset"); - patch(algo09, "bgunTickGunLoad", "tagsReset"); - patch(algo10, "explosionAlertChrs", "glassDestroy"); - patch(algo11, "menuTickTimers", "mtxGetObfuscatedRomBase"); - patch(algo12, "bgTickCounter", "menuTickTimers"); + patch(algo02, "cheat_menu_handle_dialog", "__scHandleTasks"); + patch(algo03, "bot_pickup_prop", "door_finish_close"); + patch(algo04, "chr_uncloak", "bot_pickup_prop"); + patch(algo05, "chrs_check_for_noise", "__scHandleRetrace"); + patch(algo06, "lv_reset", "lv_get_slow_motion_type"); + patch(algo07, "body_allocate_eyespy", "lv_reset"); + patch(algo08, "chr_consider_grenade_throw", "bg_reset"); + patch(algo09, "bgun_tick_gun_load", "tags_reset"); + patch(algo10, "explosion_alert_chrs", "glass_destroy"); + patch(algo11, "menu_tick_timers", "mtx_get_obfuscated_rom_base"); + patch(algo12, "bg_tick_counter", "menu_tick_timers"); } /** - * NTSC Beta's original mainLoop function reads from a hardware device and + * NTSC Beta's original main_loop function reads from a hardware device and * refuses to run if it doesn't exist. Because of this, the reads must be * patched to allow a ROM to work without this hardware. * @@ -191,7 +191,7 @@ void piracy_patch_mainloop(void) uint32_t offset; bool done_first = false; - if (!map_get_function_rompos("mainLoop", &start, &end)) { + if (!map_get_function_rompos("main_loop", &start, &end)) { return; }