diff --git a/include/common_structs.h b/include/common_structs.h
index 8412b9e50d..2a1baeda09 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -4,51 +4,51 @@
 #include "ultra64.h"
 #include "types.h"
 
-typedef struct vec3f {
+typedef struct Vec3f {
     /* 0x00 */ f32 x;
     /* 0x04 */ f32 y;
     /* 0x08 */ f32 z;
-} vec3f; // size = 0x0C
+} Vec3f; // size = 0x0C
 
-typedef struct matrix4f {
+typedef struct Matrix4f {
     /* 0x00 */ f32 mtx[4][4];
-} matrix4f; // size = 0x40
+} Matrix4f; // size = 0x40
 
-typedef struct matrix4s {
+typedef struct Matrix4s {
     /* 0x00 */ s16 whole[4][4];
     /* 0x20 */ s16 frac[4][4];
-} matrix4s; // size = 0x40
+} Matrix4s; // size = 0x40
 
-typedef struct cam_pos_settings {
+typedef struct CamPosSettings {
     /* 0x00 */ f32 boomYaw;
     /* 0x04 */ f32 boomLength;
     /* 0x08 */ f32 boomPitch;
     /* 0x0C */ f32 viewPitch;
-    /* 0x10 */ struct vec3f position;
-} cam_pos_settings; // size = 0x1C
+    /* 0x10 */ struct Vec3f position;
+} CamPosSettings; // size = 0x1C
 
-typedef struct partner_data {
+typedef struct PartnerData {
     /* 0x00 */ u8 enabled;
     /* 0x01 */ u8 level;
     /* 0x02 */ s16 unk_02[3];
-} partner_data; // size = 0x08
+} PartnerData; // size = 0x08
 
-typedef struct heap_node {
+typedef struct HeapNode {
     /* 0x00 */ UNK_PTR next;
     /* 0x04 */ s32 length;
     /* 0x08 */ s16 allocated;
     /* 0x0A */ s16 entryID;
     /* 0x0C */ s32 capacity;
-} heap_node; // size = 0x10
+} HeapNode; // size = 0x10
 
-typedef struct npc_blur_data {
+typedef struct NpcBlurData {
     /* 0x00 */ char unk_00[4];
     /* 0x04 */ f32 xpos[20];
     /* 0x54 */ f32 ypos[20];
     /* 0xA4 */ f32 zpos[20];
-} npc_blur_data; // size = 0xF4
+} NpcBlurData; // size = 0xF4
 
-typedef struct npc {
+typedef struct Npc {
     /* 0x000 */ s32 flags;
     /* 0x004 */ UNK_PTR onUpdate; /* run before anything else for this npc in the npc update step */
     /* 0x008 */ UNK_PTR onRender; /* run after the display list for this npc is built */
@@ -57,16 +57,16 @@ typedef struct npc {
     /* 0x014 */ f32 jumpScale; /* also used for speech, temp1? */
     /* 0x018 */ f32 moveSpeed;
     /* 0x01C */ f32 jumpVelocity;
-    /* 0x020 */ struct npc_blur_data* blurData; /* related to movement somehow... */
+    /* 0x020 */ struct NpcBlurData* blurData; /* related to movement somehow... */
     /* 0x024 */ char unk_24[4];
     /* 0x028 */ u32 currentAnim;
     /* 0x02C */ char unk_2C[12];
-    /* 0x038 */ struct vec3f pos;
-    /* 0x044 */ struct vec3f rotation;
+    /* 0x038 */ struct Vec3f pos;
+    /* 0x044 */ struct Vec3f rotation;
     /* 0x050 */ char unk_50[4];
-    /* 0x054 */ struct vec3f scale;
-    /* 0x060 */ struct vec3f moveToPos;
-    /* 0x06C */ struct vec3f colliderPos; /* used during collision with player */
+    /* 0x054 */ struct Vec3f scale;
+    /* 0x060 */ struct Vec3f moveToPos;
+    /* 0x06C */ struct Vec3f colliderPos; /* used during collision with player */
     /* 0x078 */ s32 shadowIndex;
     /* 0x07C */ f32 shadowScale;
     /* 0x080 */ char unk_80[8];
@@ -82,9 +82,9 @@ typedef struct npc {
     /* 0x0A8 */ s16 collisionHeight;
     /* 0x0AA */ u8 renderMode;
     /* 0x0AB */ char unk_AB[661];
-} npc; // size = 0x340
+} Npc; // size = 0x340
 
-typedef struct player_data {
+typedef struct PlayerData {
     /* 0x000 */ u8 bootsLevel;
     /* 0x001 */ s8 hammerLevel;
     /* 0x002 */ s8 curHP;
@@ -104,7 +104,7 @@ typedef struct player_data {
     /* 0x011 */ char unk_11;
     /* 0x012 */ u8 currentPartner;
     /* 0x013 */ char unk_13;
-    /* 0x014 */ struct partner_data partners[12];
+    /* 0x014 */ struct PartnerData partners[12];
     /* 0x074 */ s16 keyItems[32];
     /* 0x0B4 */ s16 badges[128];
     /* 0x1B4 */ s16 invItems[10];
@@ -148,9 +148,9 @@ typedef struct player_data {
     /* 0x338 */ s32 smashGameTotal; /* all-time winnings, max = 99999 */
     /* 0x33C */ s16 smashGameRecord;
     /* 0x33E */ char unk_33E[2];
-} player_data; // size = 0x340
+} PlayerData; // size = 0x340
 
-typedef struct trigger {
+typedef struct Trigger {
     /* 0x00 */ s16 genericFlagIndex;
     /* 0x02 */ char unk_02[2];
     /* 0x04 */ s16 crateFlagIndex;
@@ -158,14 +158,14 @@ typedef struct trigger {
     /* 0x08 */ s32 colliderID;
     /* 0x0C */ UNK_FUN_PTR(functionHandler);
     /* 0x10 */ bytecode* scriptStart;
-    /* 0x14 */ struct script_context* runningScript;
+    /* 0x14 */ struct Script* runningScript;
     /* 0x18 */ s32 priority;
     /* 0x1C */ s32 scriptVars[3];
     /* 0x28 */ char unk_28[12];
     /* 0x34 */ s32 runningScriptID;
-} trigger; // size = 0x38
+} Trigger; // size = 0x38
 
-typedef struct enemy {
+typedef struct Enemy {
     /* 0x00 */ s32 flags;
     /* 0x04 */ u8 encounterIndex;
     /* 0x05 */ s8 encountered;
@@ -174,19 +174,19 @@ typedef struct enemy {
     /* 0x08 */ s16 npcID;
     /* 0x0A */ s16 spawnPos[3];
     /* 0x10 */ char unk_10[8];
-    /* 0x18 */ struct static_npc_settings* npcSettings;
+    /* 0x18 */ struct StaticNpcSettings* npcSettings;
     /* 0x1C */ bytecode* initBytecode;
     /* 0x20 */ bytecode* interactBytecode;
     /* 0x24 */ bytecode* aiBytecode;
     /* 0x28 */ bytecode* hitBytecode;
     /* 0x2C */ bytecode* auxBytecode;
     /* 0x30 */ bytecode* defeatBytecode;
-    /* 0x34 */ struct script_context* initScript;
-    /* 0x38 */ struct script_context* interactScript;
-    /* 0x3C */ struct script_context* aiScript;
-    /* 0x40 */ struct script_context* hitScript;
-    /* 0x44 */ struct script_context* auxScript;
-    /* 0x48 */ struct script_context* defeatScript;
+    /* 0x34 */ struct Script* initScript;
+    /* 0x38 */ struct Script* interactScript;
+    /* 0x3C */ struct Script* aiScript;
+    /* 0x40 */ struct Script* hitScript;
+    /* 0x44 */ struct Script* auxScript;
+    /* 0x48 */ struct Script* defeatScript;
     /* 0x4C */ s32 initScriptID;
     /* 0x50 */ s32 interactScriptID;
     /* 0x54 */ s32 aiScriptID;
@@ -203,9 +203,9 @@ typedef struct enemy {
     /* 0xD4 */ UNK_PTR dropTables;
     /* 0xD8 */ u32 tattleString;
     /* 0xDC */ char unk_DC[20];
-} enemy; // size = 0xF0
+} Enemy; // size = 0xF0
 
-typedef struct static_npc_settings {
+typedef struct StaticNpcSettings {
     /* 0x00 */ char unk_00[4];
     /* 0x04 */ s16 height;
     /* 0x06 */ s16 radius;
@@ -219,9 +219,9 @@ typedef struct static_npc_settings {
     /* 0x24 */ char unk_24[4];
     /* 0x28 */ s16 level;
     /* 0x2A */ s16 unkFlags;
-} static_npc_settings; // size = 0x2C
+} StaticNpcSettings; // size = 0x2C
 
-typedef struct script_context {
+typedef struct Script {
     /* 0x000 */ u8 state;
     /* 0x001 */ u8 currentArgc;
     /* 0x002 */ u8 currentOpcode;
@@ -235,9 +235,9 @@ typedef struct script_context {
     /* 0x010 */ u8 labelIndices[16];
     /* 0x020 */ UNK_PTR labelPositions[16];
     /* 0x060 */ s32 deleted; /* set to zero in KillScript when malloc'd */
-    /* 0x064 */ struct script_context* blockingParent; /* parent? */
-    /* 0x068 */ struct script_context* childScript;
-    /* 0x06C */ struct script_context* parentScript; /* brother? */
+    /* 0x064 */ struct Script* blockingParent; /* parent? */
+    /* 0x068 */ struct Script* childScript;
+    /* 0x06C */ struct Script* parentScript; /* brother? */
     /* 0x070 */ s32 functionTemp[4];
     /* 0x080 */ UNK_PTR callFunction;
     /* 0x084 */ s32 varTable[16];
@@ -250,7 +250,7 @@ typedef struct script_context {
     /* 0x13C */ UNK_PTR array;
     /* 0x140 */ UNK_PTR flagArray;
     /* 0x144 */ s32 uniqueID;
-    /* 0x148 */ struct enemy* ownerActorID; /* controller*, battle ID, trigger* */
+    /* 0x148 */ struct Enemy* ownerActorID; /* controller*, battle ID, trigger* */
     /* 0x14C */ u32 ownerID; /* can be an npcID, a triggerID, a trigger ptr */
     /* 0x150 */ f32 timeScale;
     /* 0x154 */ f32 frameCounter;
@@ -258,9 +258,9 @@ typedef struct script_context {
     /* 0x15C */ bytecode* ptrFirstLine;
     /* 0x160 */ bytecode* ptrSavedPosition;
     /* 0x164 */ bytecode* ptrCurrentLine;
-} script_context; // size = 0x168
+} Script; // size = 0x168
 
-typedef struct entity {
+typedef struct Entity {
     /* 0x00 */ s32 flags;
     /* 0x04 */ char unk_04[7];
     /* 0x0B */ u8 alpha; /* reported by rain */
@@ -270,21 +270,21 @@ typedef struct entity {
     /* 0x18 */ char unk_18[16];
     /* 0x28 */ bytecode* boundScript;
     /* 0x2C */ char unk_2C[12];
-    /* 0x38 */ struct static_entity_data* static_data;
+    /* 0x38 */ struct StaticEntityData* static_data;
     /* 0x3C */ char unk_3C[4];
-    /* 0x40 */ struct trigger* trigger;
+    /* 0x40 */ struct Trigger* trigger;
     /* 0x44 */ s32* vertexData;
     /* 0x48 */ f32 position[3];
     /* 0x54 */ f32 scale[3];
     /* 0x60 */ f32 rotation[3];
     /* 0x6C */ char unk_6C[4];
-    /* 0x70 */ struct matrix4f* inverseTransformMatrix; /* world-to-local */
+    /* 0x70 */ struct Matrix4f* inverseTransformMatrix; /* world-to-local */
     /* 0x74 */ char unk_74[60];
     /* 0xB0 */ u8 radius; /* Created by retype action */
     /* 0xB1 */ char unk_B1[71];
-} entity; // size = 0xF8
+} Entity; // size = 0xF8
 
-typedef struct static_entity_data {
+typedef struct StaticEntityData {
     /* 0x00 */ s16 flags;
     /* 0x02 */ s16 argSize;
     /* 0x04 */ char unk_04[8];
@@ -294,9 +294,9 @@ typedef struct static_entity_data {
     /* 0x18 */ s32 dmaStart;
     /* 0x1C */ s32 dmaEnd;
     /* 0x20 */ char unk_20[4];
-} static_entity_data; // size = 0x24
+} StaticEntityData; // size = 0x24
 
-typedef struct music_player {
+typedef struct MusicPlayer {
     /* 0x00 */ s16 unkFlags;
     /* 0x02 */ char unk_02[2];
     /* 0x04 */ s32 fadeOutTime;
@@ -305,9 +305,9 @@ typedef struct music_player {
     /* 0x10 */ s32 songID;
     /* 0x14 */ s32 variation;
     /* 0x18 */ char unk_18[24];
-} music_player; // size = 0x30
+} MusicPlayer; // size = 0x30
 
-typedef struct StaticNPC {
+typedef struct StaticNpc {
     /* 0x000 */ s32 ID;
     /* 0x004 */ struct StaticNpcSettings* npcSettings;
     /* 0x008 */ s32 spawnPos[3];
@@ -326,7 +326,7 @@ typedef struct StaticNPC {
     /* 0x1E0 */ char unk_1E0[8];
     /* 0x1E8 */ UNK_PTR extraAnimations;
     /* 0x1EC */ s32 tattle;
-} StaticNPC; // size = 0x1F0
+} StaticNpc; // size = 0x1F0
 
 typedef struct MenuIcon {
     /* 0x00 */ u32 flags;
@@ -350,7 +350,7 @@ typedef struct MenuIcon {
     /* 0x4A */ char unk_4A[10];
 } MenuIcon; // size = 0x54
 
-typedef struct ui_status {
+typedef struct UiStatus {
     /* 0x00 */ s32 hpIconIndexes[2];
     /* 0x08 */ s32 fpIconIndexes[2];
     /* 0x10 */ s32 coinIconIndex;
@@ -397,21 +397,21 @@ typedef struct ui_status {
     /* 0x64 */ s32 iconIndex12;
     /* 0x68 */ s32 iconIndex13;
     /* 0x6C */ s8 unk_6C[4];
-} ui_status; // size = 0x70
+} UiStatus; // size = 0x70
 
-typedef struct collider {
+typedef struct Collider {
     /* 0x00 */ s32 flags;
     /* 0x04 */ s16 nextSibling;
     /* 0x06 */ s16 firstChild;
     /* 0x08 */ s16 parentModelIndex;
     /* 0x0A */ s16 numTriangles;
-    /* 0x0C */ struct collider_triangle* triangleTable;
-    /* 0x10 */ struct collider_aabb* aabb;
+    /* 0x0C */ struct ColliderTriangle* triangleTable;
+    /* 0x10 */ struct ColliderBoundingBox* aabb;
     /* 0x14 */ char unk_14[4];
     /* 0x18 */ f32* vertexTable[3];
-} collider; // size = 0x1C
+} Collider; // size = 0x1C
 
-typedef struct camera {
+typedef struct Camera {
     /* 0x000 */ s16 flags;
     /* 0x002 */ s16 moveFlags;
     /* 0x004 */ s16 mode;
@@ -433,7 +433,7 @@ typedef struct camera {
     /* 0x03C */ f32 lookAt_eye[3];
     /* 0x048 */ f32 lookAt_obj[3];
     /* 0x054 */ char unk_54[12];
-    /* 0x060 */ struct vec3f targetPos;
+    /* 0x060 */ struct Vec3f targetPos;
     /* 0x06C */ f32 currentYaw;
     /* 0x070 */ char unk_70[4];
     /* 0x074 */ f32 currentBoomYaw;
@@ -444,29 +444,29 @@ typedef struct camera {
     /* 0x090 */ f32 currentBlendedYawNegated;
     /* 0x094 */ f32 currentPitch;
     /* 0x098 */ char unk_98[60];
-    /* 0x0D4 */ struct matrix4f perspectiveMatrix;
-    /* 0x114 */ struct matrix4f viewMtxPlayer; /* centers on player */
-    /* 0x154 */ struct matrix4f viewMtxLeading; /* leads player slightly */
-    /* 0x194 */ struct matrix4f viewMtxShaking; /* used while ShakeCam is active */
+    /* 0x0D4 */ struct Matrix4f perspectiveMatrix;
+    /* 0x114 */ struct Matrix4f viewMtxPlayer; /* centers on player */
+    /* 0x154 */ struct Matrix4f viewMtxLeading; /* leads player slightly */
+    /* 0x194 */ struct Matrix4f viewMtxShaking; /* used while ShakeCam is active */
     /* 0x1D4 */ char unk_1D4[48];
-    /* 0x204 */ struct matrix4s* unkMatrix;
+    /* 0x204 */ struct Matrix4s* unkMatrix;
     /* 0x208 */ char unk_208[572];
-    /* 0x444 */ struct zone* prevZone;
-    /* 0x448 */ struct zone* currentZone;
-    /* 0x44C */ struct cam_pos_settings initialSettings; /* for start of blend between zones */
-    /* 0x468 */ struct cam_pos_settings targetSettings; /* goal for blend between zones */
+    /* 0x444 */ struct Zone* prevZone;
+    /* 0x448 */ struct Zone* currentZone;
+    /* 0x44C */ struct CamPosSettings initialSettings; /* for start of blend between zones */
+    /* 0x468 */ struct CamPosSettings targetSettings; /* goal for blend between zones */
     /* 0x484 */ f32 sinInterpAlpha;
     /* 0x488 */ f32 linearInterp;
     /* 0x48C */ f32 linearInterpScale; /* 3.0? */
     /* 0x490 */ f32 moveSpeed;
     /* 0x494 */ char unk_494[28];
-    /* 0x4B0 */ struct vec3f movePos;
+    /* 0x4B0 */ struct Vec3f movePos;
     /* 0x4BC */ char unk_4BC[28];
     /* 0x4D8 */ s32 controllerType;
     /* 0x4DC */ f32 controllerBoomLen;
     /* 0x4E0 */ f32 controllerBoomPitch;
-    /* 0x4E4 */ struct vec3f posA;
-    /* 0x4F0 */ struct vec3f posB;
+    /* 0x4E4 */ struct Vec3f posA;
+    /* 0x4F0 */ struct Vec3f posB;
     /* 0x4FC */ f32 controllerViewPitch;
     /* 0x500 */ char unk_500[4];
     /* 0x504 */ s16 boolTargetPlayer;
@@ -474,11 +474,11 @@ typedef struct camera {
     /* 0x508 */ s32 panPhase;
     /* 0x50C */ f32 leadAmount;
     /* 0x510 */ char unk_510[36];
-    /* 0x534 */ struct collider_aabb* aabbForZoneBelow;
+    /* 0x534 */ struct ColliderBoundingBox* aabbForZoneBelow;
     /* 0x538 */ char unk_538[32];
-} camera; // size = 0x558
+} Camera; // size = 0x558
 
-typedef struct battle_status {
+typedef struct BattleStatus {
     /* 0x000 */ s32 flags1;
     /* 0x004 */ s32 flags2;
     /* 0x008 */ s32 varTable[16];
@@ -521,9 +521,9 @@ typedef struct battle_status {
     /* 0x0B1 */ char unk_B1[3];
     /* 0x0B4 */ UNK_FUN_PTR(preUpdateCallback);
     /* 0x0B8 */ char unk_B8[4];
-    /* 0x0BC */ struct script_context* controlScript; /* control handed over to this when changing partners, maybe general? */
+    /* 0x0BC */ struct Script* controlScript; /* control handed over to this when changing partners, maybe general? */
     /* 0x0C0 */ s32 controlScriptID;
-    /* 0x0C4 */ struct script_context* camMovementScript;
+    /* 0x0C4 */ struct Script* camMovementScript;
     /* 0x0C8 */ s32 camMovementScriptID;
     /* 0x0CC */ char unk_CC[12];
     /* 0x0D8 */ struct Actor* playerActor;
@@ -586,9 +586,9 @@ typedef struct battle_status {
     /* 0x470 */ char unk_470[10];
     /* 0x47A */ u8 currentBattleSection;
     /* 0x47B */ char unk_47B[21];
-} battle_status; // size = 0x490
+} BattleStatus; // size = 0x490
 
-typedef struct texture_header {
+typedef struct TextureHeader {
     /* 0x00 */ s8 name[32];
     /* 0x20 */ s16 auxW;
     /* 0x22 */ s16 mainW;
@@ -602,7 +602,7 @@ typedef struct texture_header {
     /* 0x2D */ u8 wrapH;
     /* 0x2E */ u8 wrapV;
     /* 0x2F */ u8 filtering;
-} texture_header; // size = 0x30
+} TextureHeader; // size = 0x30
 
 typedef struct StaticActorData {
     /* 0x00 */ s32 flags;
@@ -629,7 +629,7 @@ typedef struct StaticActorData {
     /* 0x26 */ u8 statusMessageOffset[2];
 } StaticActorData; // size = 0x28
 
-typedef struct move_table_entry {
+typedef struct Move {
     /* 0x00 */ s32 moveNameID;
     /* 0x04 */ s32 flags;
     /* 0x08 */ s32 worldDescID;
@@ -638,15 +638,15 @@ typedef struct move_table_entry {
     /* 0x11 */ u8 costFP;
     /* 0x12 */ u8 costBP;
     /* 0x13 */ u8 actionCommandID;
-} move_table_entry; // size = 0x14
+} Move; // size = 0x14
 
-typedef struct collision_data {
+typedef struct CollisionData {
     /* 0x00 */ f32* vertices[3];
-    /* 0x04 */ struct collider* collider_list;
-    /* 0x08 */ struct collider_aabb** aabbs;
+    /* 0x04 */ struct Collider* collider_list;
+    /* 0x08 */ struct ColliderBoundingBox** aabbs;
     /* 0x0C */ s16 numColliders;
     /* 0x0E */ char unk_0E[2];
-} collision_data; // size = 0x10
+} CollisionData; // size = 0x10
 
 typedef struct StaticNpcSettings {
     /* 0x00 */ char unk_00[4];
@@ -664,16 +664,16 @@ typedef struct StaticNpcSettings {
     /* 0x2A */ s16 unkFlags;
 } StaticNpcSettings; // size = 0x2C
 
-typedef struct model {
+typedef struct Model {
     /* 0x00 */ s16 flags;
     /* 0x02 */ s16 modelID;
     /* 0x04 */ char unk_04[4];
     /* 0x08 */ s32* modelNode;
-    /* 0x0C */ struct model_group_data* groupData;
+    /* 0x0C */ struct ModelGroupData* groupData;
     /* 0x10 */ s32* currentSpecialMatrix;
     /* 0x14 */ char unk_14[4];
-    /* 0x18 */ struct matrix4s specialMatrix;
-    /* 0x58 */ struct matrix4f transformMatrix;
+    /* 0x18 */ struct Matrix4s specialMatrix;
+    /* 0x58 */ struct Matrix4f transformMatrix;
     /* 0x98 */ f32 center[3]; /* Created by retype action */
     /* 0xA4 */ u8 texPannerID;
     /* 0xA5 */ u8 specialDisplayListID;
@@ -681,28 +681,28 @@ typedef struct model {
     /* 0xA7 */ char unk_A7;
     /* 0xA8 */ u8 textureID;
     /* 0xA9 */ char unk_A9[7];
-} model; // size = 0xB0
+} Model; // size = 0xB0
 
-typedef struct animated_mesh {
+typedef struct AnimatedMesh {
     /* 0x000 */ s32 flags;
     /* 0x004 */ u8 renderMode;
     /* 0x005 */ char unk_05[3];
     /* 0x008 */ u32* animation1;
     /* 0x00C */ u32* animation2;
     /* 0x010 */ char unk_10[136];
-    /* 0x098 */ struct matrix4s mtx;
+    /* 0x098 */ struct Matrix4s mtx;
     /* 0x0D8 */ char unk_D8[500];
     /* 0x2CC */ s32 time;
     /* 0x2D0 */ char unk_2D0[16];
-} animated_mesh; // size = 0x2E0
+} AnimatedMesh; // size = 0x2E0
 
-typedef struct print_handle {
+typedef struct PrintHandle {
     /* 0x000 */ char unk_00[16];
     /* 0x010 */ s8* printbuf; /* Created by retype action */
     /* 0x014 */ char unk_14[1344];
-} print_handle; // size = 0x554
+} PrintHandle; // size = 0x554
 
-typedef struct other_print {
+typedef struct OtherPrint {
     /* 0x00 */ char unk_00[16];
     /* 0x10 */ f32 stringScaleH;
     /* 0x14 */ f32 stringScaleW;
@@ -711,15 +711,15 @@ typedef struct other_print {
     /* 0x20 */ char unk_20[32];
     /* 0x40 */ s32 currentPosX;
     /* 0x44 */ char unk_44[16];
-} other_print; // size = 0x54
+} OtherPrint; // size = 0x54
 
-typedef struct collider_aabb {
+typedef struct ColliderBoundingBox {
     /* 0x00 */ f32 min[3];
     /* 0x0C */ f32 max[3];
     /* 0x18 */ s32 flagsForCollider;
-} collider_aabb; // size = 0x1C
+} ColliderBoundingBox; // size = 0x1C
 
-typedef struct item_table_entry {
+typedef struct Item {
     /* 0x00 */ s32 nameString;
     /* 0x04 */ s16 iconID;
     /* 0x06 */ s16 badgeSortPriority;
@@ -733,18 +733,18 @@ typedef struct item_table_entry {
     /* 0x1B */ u8 potencyA;
     /* 0x1C */ u8 potencyB;
     /* 0x1D */ char unk_1D[3];
-} item_table_entry; // size = 0x20
+} Item; // size = 0x20
 
-typedef struct effect {
+typedef struct Effect {
     /* 0x00 */ char unk_00[32];
-} effect; // size = 0x20
+} Effect; // size = 0x20
 
-typedef struct item_entity {
+typedef struct ItemEntity {
     /* 0x00 */ s32 flags;
     /* 0x04 */ s16 boundVar; /* see make_item_entity */
     /* 0x06 */ char unk_06[2];
-    /* 0x08 */ struct vec3f position;
-    /* 0x14 */ struct item_entity_physics_data* physicsData;
+    /* 0x08 */ struct Vec3f position;
+    /* 0x14 */ struct ItemEntityPhysicsData* physicsData;
     /* 0x18 */ s16 itemID; /* into item table, also worldIconID */
     /* 0x1A */ u8 state;
     /* 0x1B */ u8 type;
@@ -760,36 +760,36 @@ typedef struct item_entity {
     /* 0x2F */ char unk_2F;
     /* 0x30 */ f32 scale;
     /* 0x34 */ char unk_34[40];
-} item_entity; // size = 0x5C
+} ItemEntity; // size = 0x5C
 
-typedef struct model_node {
+typedef struct ModelNode {
     /* 0x00 */ s32 type; /* 2 = model */
     /* 0x04 */ UNK_PTR displayList;
     /* 0x08 */ s32 numProperties;
     /* 0x0C */ UNK_PTR propertyList;
-    /* 0x10 */ struct model_group_data* groupData;
-} model_node; // size = 0x14
+    /* 0x10 */ struct ModelGroupData* groupData;
+} ModelNode; // size = 0x14
 
-typedef struct static_shadow_data {
+typedef struct StaticShadowData {
     /* 0x00 */ s16 flags;
     /* 0x02 */ char unk_02[34];
-} static_shadow_data; // size = 0x24
+} StaticShadowData; // size = 0x24
 
-typedef struct sprite_component {
+typedef struct SpriteComponent {
     /* 0x00 */ char unk_00[8];
     /* 0x08 */ s16** readPos;
     /* 0x0C */ f32 waitTime;
     /* 0x10 */ s32 loopCounter;
     /* 0x14 */ s32 currentRaster;
     /* 0x18 */ s32 currentPalette;
-    /* 0x1C */ struct vec3f posOffset;
-    /* 0x28 */ struct vec3f compPos;
-    /* 0x34 */ struct vec3f rotation;
-    /* 0x40 */ struct vec3f scale;
+    /* 0x1C */ struct Vec3f posOffset;
+    /* 0x28 */ struct Vec3f compPos;
+    /* 0x34 */ struct Vec3f rotation;
+    /* 0x40 */ struct Vec3f scale;
     /* 0x4C */ char unk_4C[4];
-} sprite_component; // size = 0x50
+} SpriteComponent; // size = 0x50
 
-typedef struct print_context {
+typedef struct PrintContext {
     /* 0x000 */ s8* string;
     /* 0x004 */ s16 bufPos;
     /* 0x006 */ char unk_06[2];
@@ -819,9 +819,9 @@ typedef struct print_context {
     /* 0x536 */ s16 height;
     /* 0x538 */ s16 width;
     /* 0x53A */ char unk_53A[30];
-} print_context; // size = 0x558
+} PrintContext; // size = 0x558
 
-typedef struct game_status {
+typedef struct GameStatus {
     /* 0x000 */ u32 currentButtons;
     /* 0x004 */ u32 altCurrentButtons; /* input used for batte when flag 80000 set */
     /* 0x008 */ char unk_08[8];
@@ -862,7 +862,7 @@ typedef struct game_status {
     /* 0x08E */ s16 entryID;
     /* 0x090 */ char unk_90[4];
     /* 0x094 */ f32 exitAngle;
-    /* 0x098 */ struct vec3f playerPos;
+    /* 0x098 */ struct Vec3f playerPos;
     /* 0x0A4 */ f32 playerYaw;
     /* 0x0A8 */ char unk_A8[4];
     /* 0x0AC */ s8 loadMenuState;
@@ -879,7 +879,7 @@ typedef struct game_status {
     /* 0x138 */ s32 nextRNG;
     /* 0x13C */ char unk_13C[4];
     /* 0x140 */ UNK_PTR shopItemData;
-    /* 0x144 */ struct shop* mapShop;
+    /* 0x144 */ struct Shop* mapShop;
     /* 0x148 */ s16 enableBackground; /* (bit 2 is also used for something) */
     /* 0x14A */ s16 backgroundMinW;
     /* 0x14C */ s16 backgroundMinH;
@@ -895,21 +895,21 @@ typedef struct game_status {
     /* 0x167 */ u8 loadType; /* (0 = from map, 1 = from main menu) */
     /* 0x168 */ s32 saveCount;
     /* 0x16C */ char unk_16C[12];
-} game_status; // size = 0x178
+} GameStatus; // size = 0x178
 
-typedef struct partner_anim_set {
+typedef struct PartnerAnimations {
     /* 0x00 */ char unk_00[36];
-} partner_anim_set; // size = 0x24
+} PartnerAnimations; // size = 0x24
 
-typedef struct shadow {
+typedef struct Shadow {
     /* 0x00 */ s32 flags;
     /* 0x04 */ char unk_04[12];
-    /* 0x10 */ struct vec3f position;
-    /* 0x1C */ struct vec3f scale;
+    /* 0x10 */ struct Vec3f position;
+    /* 0x1C */ struct Vec3f scale;
     /* 0x28 */ char unk_28[80];
-} shadow; // size = 0x78
+} Shadow; // size = 0x78
 
-typedef struct push_block_grid {
+typedef struct PushBlockGrid {
     /* 0x00 */ s8* cells;
     /* 0x04 */ u8 numCellsX;
     /* 0x05 */ u8 numCellsZ;
@@ -917,9 +917,9 @@ typedef struct push_block_grid {
     /* 0x08 */ s32 centerPos[3];
     /* 0x14 */ UNK_FUN_PTR(dropCallback);
     /* 0x18 */ char unk_18[4];
-} push_block_grid; // size = 0x1C
+} PushBlockGrid; // size = 0x1C
 
-typedef struct item_entity_physics_data {
+typedef struct ItemEntityPhysicsData {
     /* 0x00 */ f32 verticalVelocity;
     /* 0x04 */ f32 gravity; /* 2 = normal, 1 = low gravity, higher values never 'settle' */
     /* 0x08 */ char unk_08[4];
@@ -928,16 +928,16 @@ typedef struct item_entity_physics_data {
     /* 0x14 */ f32 velz;
     /* 0x18 */ f32 moveAngle;
     /* 0x1C */ char unk_1C[8];
-} item_entity_physics_data; // size = 0x24
+} ItemEntityPhysicsData; // size = 0x24
 
-typedef struct render_task {
+typedef struct RenderTask {
     /* 0x00 */ s32 renderMode;
     /* 0x04 */ s32 dist; /* value between 0 and -10k */
-    /* 0x08 */ struct model* model;
+    /* 0x08 */ struct Model* model;
     /* 0x0C */ UNK_FUN_PTR(fpBuildDL); /* function for making display list for model */
-} render_task; // size = 0x10
+} RenderTask; // size = 0x10
 
-typedef struct selectable_target {
+typedef struct SelectableTarget {
     /* 0x00 */ s16 actorID;
     /* 0x02 */ s16 partID; /* sometimes loaded as byte from 0x3 */
     /* 0x04 */ s16 pos[3];
@@ -945,9 +945,9 @@ typedef struct selectable_target {
     /* 0x11 */ u8 homeCol; /* from xpos --> 0-3 */
     /* 0x12 */ u8 homeRow; /* from ypos --> 0-3 */
     /* 0x13 */ u8 layer; /* from zpos? --> 0-1 */
-} selectable_target; // size = 0x14
+} SelectableTarget; // size = 0x14
 
-typedef struct actor_part_movement {
+typedef struct ActorPartMovement {
     /* 0x00 */ char unk_00[12];
     /* 0x0C */ f32 goalPos[3];
     /* 0x18 */ char unk_18[12];
@@ -955,23 +955,23 @@ typedef struct actor_part_movement {
     /* 0x28 */ f32 moveSpeed;
     /* 0x2C */ char unk_2C[32];
     /* 0x4C */ s32 varTable[16];
-} actor_part_movement; // size = 0x8C
+} ActorPartMovement; // size = 0x8C
 
 typedef struct ActorPart {
     /* 0x00 */ s32 flags;
     /* 0x04 */ s32 targetFlags; /* initialized to 0 */
     /* 0x08 */ struct StaticActorPart* staticData;
     /* 0x0C */ struct ActorPart* nextPart;
-    /* 0x10 */ struct actor_part_movement* movement;
+    /* 0x10 */ struct ActorPartMovement* movement;
     /* 0x14 */ s16 partOffset[3];
     /* 0x1A */ s16 visualOffset[3];
-    /* 0x20 */ struct vec3f partOffsetFloat;
-    /* 0x2C */ struct vec3f absolutePosition;
-    /* 0x38 */ struct vec3f rotation;
+    /* 0x20 */ struct Vec3f partOffsetFloat;
+    /* 0x2C */ struct Vec3f absolutePosition;
+    /* 0x38 */ struct Vec3f rotation;
     /* 0x44 */ s16 rotationPivotOffset[3];
     /* 0x4A */ char unk_4A[2];
     /* 0x4C */ f32 scale[3];
-    /* 0x58 */ struct vec3f currentPos;
+    /* 0x58 */ struct Vec3f currentPos;
     /* 0x64 */ f32 yaw;
     /* 0x68 */ s16 unkOffset[2];
     /* 0x6C */ s16 targetOffset[2];
@@ -989,14 +989,14 @@ typedef struct ActorPart {
     /* 0x94 */ u32* idleAnimations;
     /* 0x98 */ s16 opacity;
     /* 0x9A */ char unk_9A[2];
-    /* 0x9C */ struct shadow* shadow;
+    /* 0x9C */ struct Shadow* shadow;
     /* 0xA0 */ f32 shadowScale;
     /* 0xA4 */ s32 partTypeData[6];
     /* 0xBC */ s16 actorTypeData2b[2];
-    /* 0xC0 */ struct decoration_table* decorationTable; /* initialized to 0 */
+    /* 0xC0 */ struct DecorationTable* decorationTable; /* initialized to 0 */
 } ActorPart; // size = 0xC4
 
-typedef struct collider_triangle {
+typedef struct ColliderTriangle {
     /* 0x00 */ f32* v1[3]; /* note: the order of v1,2,3 is reversed from the ijk in the hit file */
     /* 0x04 */ f32* v2[3];
     /* 0x08 */ f32* v3[3];
@@ -1006,9 +1006,9 @@ typedef struct collider_triangle {
     /* 0x30 */ f32 normal[3];
     /* 0x3C */ s16 oneSided; /* 1 = yes, 0 = no */
     /* 0x3E */ char unk_3E[2];
-} collider_triangle; // size = 0x40
+} ColliderTriangle; // size = 0x40
 
-typedef struct partner_table_entry {
+typedef struct Partner {
     /* 0x00 */ s32 dmaStart;
     /* 0x04 */ s32 dmaEnd;
     /* 0x08 */ s32 dmaDest;
@@ -1025,15 +1025,15 @@ typedef struct partner_table_entry {
     /* 0x34 */ UNK_FUN_PTR(fpFuncD);
     /* 0x38 */ UNK_FUN_PTR(fpFuncE);
     /* 0x3C */ bytecode* spScriptX;
-} partner_table_entry; // size = 0x40
+} Partner; // size = 0x40
 
-typedef struct font_raster_set {
+typedef struct FontRasterSet {
     /* 0x00 */ u8 sizeX;
     /* 0x01 */ u8 sizeY;
     /* 0x02 */ char unk_02[10];
-} font_raster_set; // size = 0x0C
+} FontRasterSet; // size = 0x0C
 
-typedef struct trigger_bp {
+typedef struct TriggerBp {
     /* 0x00 */ s32 flags;
     /* 0x04 */ s16 colliderIndex;
     /* 0x06 */ char unk_06[2];
@@ -1042,9 +1042,9 @@ typedef struct trigger_bp {
     /* 0x10 */ char unk_10[8];
     /* 0x18 */ s32 inputArg3;
     /* 0x1C */ char unk_1C[4];
-} trigger_bp; // size = 0x20
+} TriggerBp; // size = 0x20
 
-typedef struct collision_status {
+typedef struct CollisionStatus {
     /* 0x00 */ s16 pushingAgainstWall; /* FFFF = none for all below VVV */
     /* 0x02 */ s16 currentFloor; /* valid on touch */
     /* 0x04 */ s16 lastTouchedFloor; /* valid after jump */
@@ -1057,9 +1057,9 @@ typedef struct collision_status {
     /* 0x18 */ s16 bombetteExploded; /* 0 = yes, FFFF = no */
     /* 0x1A */ char unk_1A[2];
     /* 0x1C */ f32 bombetteExplositionPos[3];
-} collision_status; // size = 0x28
+} CollisionStatus; // size = 0x28
 
-typedef struct decoration_table {
+typedef struct DecorationTable {
     /* 0x000 */ char unk_00[2012];
     /* 0x7DC */ s16 scale[16];
     /* 0x7FC */ s16 posX[16];
@@ -1074,47 +1074,43 @@ typedef struct decoration_table {
     /* 0x8AD */ char unk_8AD[11];
     /* 0x8B8 */ u8 decorationType[2];
     /* 0x8BA */ char unk_8BA[46];
-} decoration_table; // size = 0x8E8
+} DecorationTable; // size = 0x8E8
 
-typedef struct render_task_entry {
-    /* 0x00 */ char unk_00[16];
-} render_task_entry; // size = 0x10
-
-typedef struct shop {
+typedef struct Shop {
     /* 0x000 */ char unk_00[20];
     /* 0x014 */ UNK_PTR staticItemPositions;
     /* 0x018 */ UNK_PTR staticInventory;
     /* 0x01C */ UNK_PTR staticPriceList;
     /* 0x020 */ char unk_20[828];
-} shop; // size = 0x35C
+} Shop; // size = 0x35C
 
-typedef struct encounter {
+typedef struct Encounter {
     /* 0x00 */ s32 count;
-    /* 0x04 */ struct enemy* enemy[16];
+    /* 0x04 */ struct Enemy* enemy[16];
     /* 0x08 */ char unk_08[60];
     /* 0x44 */ s16 battle;
     /* 0x46 */ s16 stage;
     /* 0x48 */ s16 encounterID;
     /* 0x4A */ char unk_4A[2];
-} encounter; // size = 0x4C
+} Encounter; // size = 0x4C
 
-typedef struct player_path_element {
+typedef struct PlayerPathElement {
     /* 0x00 */ char unk_00[4];
-    /* 0x04 */ struct vec3f pos;
-} player_path_element; // size = 0x10
+    /* 0x04 */ struct Vec3f pos;
+} PlayerPathElement; // size = 0x10
 
-typedef struct animated_model {
+typedef struct AnimatedModel {
     /* 0x00 */ s32 animModelID;
-    /* 0x04 */ struct vec3f pos; /* Created by retype action */
-    /* 0x10 */ struct vec3f rot;
-    /* 0x1C */ struct vec3f scale;
-    /* 0x28 */ struct matrix4s* mtx;
+    /* 0x04 */ struct Vec3f pos; /* Created by retype action */
+    /* 0x10 */ struct Vec3f rot;
+    /* 0x1C */ struct Vec3f scale;
+    /* 0x28 */ struct Matrix4s* mtx;
     /* 0x2C */ char unk_2C[60];
     /* 0x68 */ u32 currentAnimData;
     /* 0x6C */ char unk_6C[4];
-} animated_model; // size = 0x70
+} AnimatedModel; // size = 0x70
 
-typedef struct collision_header {
+typedef struct CollisionHeader {
     /* 0x00 */ s16 numColliders;
     /* 0x02 */ char unk_02[2];
     /* 0x04 */ s32 treeOffset;
@@ -1125,24 +1121,24 @@ typedef struct collision_header {
     /* 0x12 */ char unk_12[2];
     /* 0x14 */ s32 bbTableOffset;
     /* 0x18 */ char unk_18[8];
-} collision_header; // size = 0x20
+} CollisionHeader; // size = 0x20
 
-typedef struct zone {
+typedef struct Zone {
     /* 0x00 */ s32 type;
     /* 0x04 */ f32 boomLength;
     /* 0x08 */ f32 boomPitch;
     /* 0x0C */ f32 pos[6];
     /* 0x24 */ f32 viewPitch;
     /* 0x28 */ s32 flag;
-} zone; // size = 0x2C
+} Zone; // size = 0x2C
 
 typedef struct Actor {
     /* 0x000 */ s32 flags;
     /* 0x004 */ char unk_04[4];
     /* 0x008 */ struct StaticActorData* staticActorData;
-    /* 0x00C */ struct vec3f moveCurrentPos;
-    /* 0x018 */ struct vec3f moveGoalPos;
-    /* 0x024 */ struct vec3f moveEndPos; /* where other actors should target this one at. saved before partner switching */
+    /* 0x00C */ struct Vec3f moveCurrentPos;
+    /* 0x018 */ struct Vec3f moveGoalPos;
+    /* 0x024 */ struct Vec3f moveEndPos; /* where other actors should target this one at. saved before partner switching */
     /* 0x030 */ char unk_30[24];
     /* 0x048 */ f32 jumpAccel;
     /* 0x04C */ f32 moveSpeed;
@@ -1160,9 +1156,9 @@ typedef struct Actor {
     /* 0x077 */ u8 jumpPartIndex;
     /* 0x078 */ char unk_78[16];
     /* 0x088 */ s32 varTable[16];
-    /* 0x0C8 */ struct vec3f flyCurrentPos;
-    /* 0x0D4 */ struct vec3f flyGoalPos;
-    /* 0x0E0 */ struct vec3f flyTempPos; /* used for start in fly functions, end in flyrun functions */
+    /* 0x0C8 */ struct Vec3f flyCurrentPos;
+    /* 0x0D4 */ struct Vec3f flyGoalPos;
+    /* 0x0E0 */ struct Vec3f flyTempPos; /* used for start in fly functions, end in flyrun functions */
     /* 0x0EC */ char unk_EC[24];
     /* 0x104 */ f32 flyJumpAccel;
     /* 0x108 */ f32 flySpeed;
@@ -1177,8 +1173,8 @@ typedef struct Actor {
     /* 0x135 */ u8 footStepCounter;
     /* 0x136 */ u8 actorType;
     /* 0x137 */ char unk_137;
-    /* 0x138 */ struct vec3f homePos;
-    /* 0x144 */ struct vec3f currentPos;
+    /* 0x138 */ struct Vec3f homePos;
+    /* 0x144 */ struct Vec3f currentPos;
     /* 0x150 */ s16 otherPosheadOffset[3];
     /* 0x156 */ s16 healthBarPosition[3];
     /* 0x15C */ f32 rotation[3];
@@ -1202,10 +1198,10 @@ typedef struct Actor {
     /* 0x1C4 */ bytecode* takeTurnCode;
     /* 0x1C8 */ bytecode* onHitCode;
     /* 0x1CC */ bytecode* onTurnChangeCode;
-    /* 0x1D0 */ struct script_context* idleScript;
-    /* 0x1D4 */ struct script_context* takeTurnScript;
-    /* 0x1D8 */ struct script_context* onHitScript;
-    /* 0x1DC */ struct script_context* onTurnChangeScript;
+    /* 0x1D0 */ struct Script* idleScript;
+    /* 0x1D4 */ struct Script* takeTurnScript;
+    /* 0x1D8 */ struct Script* onHitScript;
+    /* 0x1DC */ struct Script* onTurnChangeScript;
     /* 0x1E0 */ s32 idleScriptID;
     /* 0x1E4 */ s32 takeTurnID;
     /* 0x1E8 */ s32 onHitID;
@@ -1241,7 +1237,7 @@ typedef struct Actor {
     /* 0x223 */ u8 chillOutAmount; /* attack reduction */
     /* 0x224 */ u8 chillOutTurns;
     /* 0x225 */ char unk_225[7];
-    /* 0x22C */ struct selectable_target targetData[24];
+    /* 0x22C */ struct SelectableTarget targetData[24];
     /* 0x40C */ u8 targetListLength;
     /* 0x40D */ u8 targetIndexList[24]; /* into targetData */
     /* 0x425 */ u8 selectedTargetIndex; /* into target index list */
@@ -1249,7 +1245,7 @@ typedef struct Actor {
     /* 0x427 */ char unk_427;
     /* 0x428 */ s16 targetActorID;
     /* 0x42A */ char unk_42A[2];
-    /* 0x42C */ struct shadow* shadow; /* might be shadow ID */
+    /* 0x42C */ struct Shadow* shadow; /* might be shadow ID */
     /* 0x430 */ f32 shadowScale; /* = actor size / 24.0 */
     /* 0x434 */ s16 renderMode; /* initially 0xD, set to 0x22 if any part is transparent */
     /* 0x436 */ char unk_436[2];
@@ -1270,7 +1266,7 @@ typedef struct StaticActorPart {
     /* 0x1C */ char unk_1C[8];
 } StaticActorPart; // size = 0x24
 
-typedef struct tile_descriptor {
+typedef struct TileDescriptor {
     /* 0x00 */ s8 name[32];
     /* 0x20 */ s16 auxW;
     /* 0x22 */ s16 mainW;
@@ -1284,30 +1280,30 @@ typedef struct tile_descriptor {
     /* 0x2D */ u8 wrapH;
     /* 0x2E */ u8 wrapV;
     /* 0x2F */ u8 filtering;
-} tile_descriptor; // size = 0x30
+} TileDescriptor; // size = 0x30
 
-typedef struct {
+typedef struct BackgroundHeader {
     /* 0x00 */ u32 raster;
     /* 0x04 */ u32 palette;
     /* 0x08 */ u16 startX;
     /* 0x0A */ u16 startY;
     /* 0x0C */ u16 width;
     /* 0x0E */ u16 height;
-} bg_header; // size = 0x10
+} BackgroundHeader; // size = 0x10
 
-typedef struct model_group_data {
+typedef struct ModelGroupData {
     /* 0x00 */ UNK_PTR transformMatrix;
     /* 0x04 */ UNK_PTR lightingGroup;
     /* 0x08 */ s32 numLights;
     /* 0x0C */ s32 numChildren;
-    /* 0x10 */ struct model_node** childList;
-} model_group_data; // size = 0x14
+    /* 0x10 */ struct ModelNode** childList;
+} ModelGroupData; // size = 0x14
 
-typedef struct font_data {
+typedef struct FontData {
     /* 0x00 */ char unk_00[24];
-} font_data; // size = 0x18
+} FontData; // size = 0x18
 
-typedef struct crash {
+typedef struct Crash {
     /* 0x000 */ char unk_00[20];
     /* 0x014 */ s32 threadID;
     /* 0x018 */ char unk_18[12];
@@ -1326,9 +1322,9 @@ typedef struct crash {
     /* 0x120 */ s32 interrupt;
     /* 0x124 */ s32 VA; /* Created by retype action */
     /* 0x128 */ char unk_128[208];
-} crash; // size = 0x1F8
+} Crash; // size = 0x1F8
 
-typedef struct player_status {
+typedef struct PlayerStatus {
     /* 0x000 */ s32 flags;
     /* 0x004 */ u32 animFlags;
     /* 0x008 */ s16 framesOnGround; /* Number of frames since last jump landed */
@@ -1339,8 +1335,8 @@ typedef struct player_status {
     /* 0x014 */ u8 enableCollisionOverlapsCheck;
     /* 0x015 */ u8 statusMenuCounterinputEnabledCounter; /* whether the C-up menu can appear */
     /* 0x016 */ s16 lastGoodPosition[3];
-    /* 0x01C */ struct vec3f extraVelocity;
-    /* 0x028 */ struct vec3f position;
+    /* 0x01C */ struct Vec3f extraVelocity;
+    /* 0x028 */ struct Vec3f position;
     /* 0x034 */ char unk_34[16];
     /* 0x044 */ f32 decorationPos[2];
     /* 0x04C */ char unk_4C[4];
@@ -1384,18 +1380,15 @@ typedef struct player_status {
     /* 0x190 */ f32 stickYBuffer[10];
     /* 0x1B8 */ s32 inputBufPos;
     /* 0x1BC */ char unk_1BC[204];
-} player_status; // size = 0x288
+} PlayerStatus; // size = 0x288
 
-typedef struct character_set {
-} character_set; // size = 0x00
-
-typedef struct anim_model_node {
+typedef struct AnimatedModelNode {
     /* 0x00 */ u32* displayList;
     /* 0x04 */ s16 rot[3]; /* range = -180,180 */
     /* 0x0A */ char unk_0A[34];
-} anim_model_node; // size = 0x2C
+} AnimatedModelNode; // size = 0x2C
 
-typedef struct encounter_status {
+typedef struct EncounterStatus {
     /* 0x00 */ s32 flags;
     /* 0x04 */ u8 eFirstStrike; /* 0 = none, 1 = player, 2 = enemy */
     /* 0x05 */ u8 hitType; /* 1 = none/enemy, 2 = jump */
@@ -1418,11 +1411,11 @@ typedef struct encounter_status {
     /* 0x20 */ u8 mapID;
     /* 0x21 */ char unk_21[3];
     /* 0x24 */ s32* npcGroupList;
-    /* 0x28 */ struct encounter* enounterList[24];
+    /* 0x28 */ struct Encounter* enounterList[24];
     /* 0x2C */ char unk_2C[92];
-    /* 0x88 */ struct encounter* currentEncounter;
-    /* 0x8C */ struct enemy* currentEnemy;
+    /* 0x88 */ struct Encounter* currentEncounter;
+    /* 0x8C */ struct Enemy* currentEnemy;
     /* 0x90 */ char unk_90[4];
-} encounter_status; // size = 0x94
+} EncounterStatus; // size = 0x94
 
 #endif
diff --git a/include/functions.h b/include/functions.h
index 90b5f223be..65fffc1e8b 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -9,11 +9,11 @@ void osCleanupThread(void);
 
 void clone_model(u16 srcModelID, u16 newModelID);
 void update_collider_transform(s16 colliderID);
-s32 get_variable(script_context* script, bytecode var);
-s32 set_variable(script_context* script, bytecode var, s32 value);
-f32 get_float_variable(script_context* script, bytecode var);
-f32 set_float_variable(script_context* script, bytecode var, f32 value);
-void set_script_timescale(script_context* script, f32 timescale);
+s32 get_variable(Script* script, bytecode var);
+s32 set_variable(Script* script, bytecode var, s32 value);
+f32 get_float_variable(Script* script, bytecode var);
+f32 set_float_variable(Script* script, bytecode var, f32 value);
+void set_script_timescale(Script* script, f32 timescale);
 f32 sin_deg(f32 x);
 f32 cos_deg(f32 x);
 f32 atan2(f32 startX, f32 startZ, f32 endX, f32 endZ);
@@ -32,9 +32,9 @@ void sort_items(void);
 s32 is_ability_active(s32 arg0);
 f32 update_lerp(EASING easing, f32 start, f32 end, s32 elapsed, s32 duration);
 
-npc* get_npc_safe(s32 npcID);
-npc* get_npc_unsafe(s32 npcID);
-npc* resolve_npc(script_context* script, NPC npcID);
+Npc* get_npc_safe(s32 npcID);
+Npc* get_npc_unsafe(s32 npcID);
+Npc* resolve_npc(Script* script, NPC npcID);
 
 f32 dist2D(f32 ax, f32 ay, f32 bx, f32 by);
 f32 dist3D(f32 ax, f32 ay, f32 az, f32 bx, f32 by, f32 bz);
diff --git a/include/variables.h b/include/variables.h
index 02b45e7539..b01d171dda 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -5,15 +5,15 @@
 #include "common_structs.h"
 #include "types.h"
 
-extern ui_status gUIStatus;
-extern player_data gPlayerData;
-extern player_status gPlayerStatus;
-extern game_status* gGameStatusPtr[1];
-extern item_table_entry gItemTable[364];
+extern UiStatus gUIStatus;
+extern PlayerData gPlayerData;
+extern PlayerStatus gPlayerStatus;
+extern GameStatus* gGameStatusPtr[1];
+extern Item gItemTable[364];
 
-extern script_context* gWorldScriptList[128];
-extern script_context* gBattleScriptList[128];
-extern script_context** gCurrentScriptListPtr[128];
+extern Script* gWorldScriptList[128];
+extern Script* gBattleScriptList[128];
+extern Script** gCurrentScriptListPtr[128];
 
 extern f32 gGlobalTimeSpace;
 
@@ -24,17 +24,17 @@ extern s16 D_8010CD12;
 extern s32 D_801595A0;
 extern char gCloudyFlowerFieldsBg[]; // "fla_bg"
 extern char gSunnyFlowerFieldsBg[]; // "flb_bg"
-extern bg_header gBackgroundImage;
+extern BackgroundHeader gBackgroundImage;
 extern s8 D_8014F12F;
 
-extern print_context* gCurrentPrintContext;
-extern print_context* D_802DB268;
+extern PrintContext* gCurrentPrintContext;
+extern PrintContext* D_802DB268;
 
 // Triggers
 /* 0x80151334 */ extern s16 gTriggerCount;
-/* 0x80159190 */ extern trigger gTriggerList1[64];
-/* 0x80159290 */ extern trigger gTriggerList2[64];
-/* 0x80159390 */ extern trigger** gCurrentTriggerListPtr[64];
+/* 0x80159190 */ extern Trigger gTriggerList1[64];
+/* 0x80159290 */ extern Trigger gTriggerList2[64];
+/* 0x80159390 */ extern Trigger** gCurrentTriggerListPtr[64];
 
 extern u16 gMapTransitionAlpha;
 extern u16 D_800A0942;
diff --git a/src/code_111f0_len_860.c b/src/code_111f0_len_860.c
index ac9fe471b2..83a6597846 100644
--- a/src/code_111f0_len_860.c
+++ b/src/code_111f0_len_860.c
@@ -14,7 +14,7 @@ INCLUDE_ASM(code_111f0_len_860, func_80035E54);
 INCLUDE_ASM(code_111f0_len_860, func_80035EEC);
 
 void func_800360FC(void) {
-    game_status* gameStatus = *gGameStatusPtr;
+    GameStatus* gameStatus = *gGameStatusPtr;
 
     if (gameStatus->loadMenuState == 2) {
         func_800E973C();
@@ -22,7 +22,7 @@ void func_800360FC(void) {
 }
 
 void func_80036130(void) {
-    game_status* gameStatus = *gGameStatusPtr;
+    GameStatus* gameStatus = *gGameStatusPtr;
 
     gMapTransitionAlpha = 0x00;
     D_800A0942 = 0x14;
@@ -48,7 +48,7 @@ s32 func_800363FC(void) {
 }
 
 s32 func_80036430(void) {
-    player_status* pPlayerStatus = &gPlayerStatus;
+    PlayerStatus* pPlayerStatus = &gPlayerStatus;
 
     gMapTransitionAlpha = 0xFF;
     D_800A0942 = 0x14;
diff --git a/src/code_13870_len_6980.c b/src/code_13870_len_6980.c
index ce55a7beae..57de1fa6e5 100644
--- a/src/code_13870_len_6980.c
+++ b/src/code_13870_len_6980.c
@@ -42,9 +42,9 @@ INCLUDE_ASM(code_13870_len_6980, render_npcs);
 
 INCLUDE_ASM(code_13870_len_6980, npc_move_heading);
 
-npc* INCLUDE_ASM(code_13870_len_6980, get_npc_unsafe, s32 npcID);
+Npc* INCLUDE_ASM(code_13870_len_6980, get_npc_unsafe, s32 npcID);
 
-npc* INCLUDE_ASM(code_13870_len_6980, get_npc_safe, s32 npcID);
+Npc* INCLUDE_ASM(code_13870_len_6980, get_npc_safe, s32 npcID);
 
 INCLUDE_ASM(code_13870_len_6980, enable_npc_shadow);
 
diff --git a/src/code_1f580_len_1940.c b/src/code_1f580_len_1940.c
index 1cfc8aeb3d..0c9c0ac567 100644
--- a/src/code_1f580_len_1940.c
+++ b/src/code_1f580_len_1940.c
@@ -2,13 +2,13 @@
 
 INCLUDE_ASM(code_1f580_len_1940, SetEncounterStatusFlags);
 
-s32 LoadDemoBattle(script_context* script) {
+s32 LoadDemoBattle(Script* script) {
     load_demo_battle(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
 // ???
-s32 func_80044290(script_context* script) {
+s32 func_80044290(Script* script) {
     return 2;
 }
 
@@ -20,7 +20,7 @@ INCLUDE_ASM(code_1f580_len_1940, RemoveEncounter);
 
 INCLUDE_ASM(code_1f580_len_1940, GetBattleOutcome);
 
-s32 GetOwnerEncountered(script_context* script) {
+s32 GetOwnerEncountered(Script* script) {
     set_variable(script, *script->ptrReadPos, script->ownerActorID->encountered);
     return 2;
 }
@@ -29,12 +29,12 @@ INCLUDE_ASM(code_1f580_len_1940, DoNpcDefeat);
 
 INCLUDE_ASM(code_1f580_len_1940, start_battle);
 
-s32 StartBattle(script_context* script) {
+s32 StartBattle(Script* script) {
     start_battle(script, -1);
     return 1;
 }
 
-s32 StartBattleWith(script_context* script) {
+s32 StartBattleWith(Script* script) {
     start_battle(script, get_variable(script, *script->ptrReadPos));
     return 1;
 }
@@ -75,14 +75,14 @@ INCLUDE_ASM(code_1f580_len_1940, GetNpcVar);
 
 INCLUDE_ASM(code_1f580_len_1940, SetSelfRotation);
 
-s32 SetSelfEnemyFlags(script_context* script) {
+s32 SetSelfEnemyFlags(Script* script) {
     script->ownerActorID->flags = *script->ptrReadPos;
     return 2;
 }
 
 INCLUDE_ASM(code_1f580_len_1940, SetSelfEnemyFlagBits);
 
-s32 GetSelfNpcID(script_context* script) {
+s32 GetSelfNpcID(Script* script) {
     set_variable(script, *script->ptrReadPos, script->ownerActorID->npcID);
     return 2;
 }
diff --git a/src/code_80850_len_3060.c b/src/code_80850_len_3060.c
index 3de3730467..974f82a509 100644
--- a/src/code_80850_len_3060.c
+++ b/src/code_80850_len_3060.c
@@ -1,7 +1,7 @@
 #include "common.h"
 
 void clear_player_data(void) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i;
 
     D_8010CD10 = 0;
@@ -95,12 +95,12 @@ void clear_player_data(void) {
     playerData->smashGameRecord = 0;
 }
 
-player_data* get_player_data(void) {
+PlayerData* get_player_data(void) {
     return &gPlayerData;
 }
 
 s32 add_item(s32 itemID) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i;
 
     sort_items();
@@ -120,7 +120,7 @@ s32 add_item(s32 itemID) {
 }
 
 s32 get_item_count(void) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i = 0;
     s32 sum = 0;
 
@@ -138,8 +138,8 @@ s32 get_item_empty_count(void) {
 }
 
 s32 find_item(s32 itemID) {
-    player_data* playerData = &gPlayerData;
-    item_table_entry* item = &gItemTable[itemID];
+    PlayerData* playerData = &gPlayerData;
+    Item* item = &gItemTable[itemID];
     s32 i;
 
     if ((item->typeFlags & 8) != 0) {
@@ -170,7 +170,7 @@ s32 find_item(s32 itemID) {
 }
 
 void sort_items(void) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     int j;
     int i;
 
@@ -189,8 +189,8 @@ void sort_items(void) {
 }
 
 s32 add_badge(s32 itemID) {
-    player_data* playerData = &gPlayerData;
-    item_table_entry* item = &gItemTable[itemID];
+    PlayerData* playerData = &gPlayerData;
+    Item* item = &gItemTable[itemID];
     s32 i;
 
     if ((item->typeFlags & 0x40) == 0) {
@@ -212,7 +212,7 @@ s32 add_badge(s32 itemID) {
 }
 
 s32 store_item(s32 itemID) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gPlayerData.storedItems); i++) {
@@ -231,7 +231,7 @@ s32 store_item(s32 itemID) {
 }
 
 s32 get_stored_count(void) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i = 0;
     s32 sum = 0;
 
@@ -249,8 +249,8 @@ s32 get_stored_empty_count(void) {
 }
 
 void enforce_hpfp_limits(void) {
-    player_data* playerData = &gPlayerData;
-    player_data* playerData2 = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
+    PlayerData* playerData2 = &gPlayerData;
 
     playerData->curMaxHP = playerData->hardMaxHP + (is_ability_active(4) * 5);
     if (playerData->curMaxHP > 75) {
@@ -278,7 +278,7 @@ INCLUDE_ASM(code_80850_len_3060, status_menu_draw_stat);
 INCLUDE_ASM(code_80850_len_3060, update_status_menu);
 
 void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
     s32 iconIndex;
 
     if ((gPlayerData.coins != uiStatus->displayCoins) && (((*gGameStatusPtr)->frameCounter % 3) == 0)) {
@@ -297,8 +297,8 @@ void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) {
 }
 
 void update_coin_counter(void) {
-    ui_status* uiStatus = &gUIStatus;
-    player_data* playerData = &gPlayerData;
+    UiStatus* uiStatus = &gUIStatus;
+    PlayerData* playerData = &gPlayerData;
 
     do {} while(0); // Needed to match
 
@@ -337,7 +337,7 @@ void update_coin_counter(void) {
 }
 
 void show_coin_counter(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
     s16* coinCounterUnk = &D_8010CD10;
     s32 index;
 
@@ -378,7 +378,7 @@ void show_coin_counter(void) {
 }
 
 void hide_coin_counter(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0]== 0)) {
         uiStatus->unk_6C[0] = 60;
@@ -386,14 +386,14 @@ void hide_coin_counter(void) {
 }
 
 void func_800E96C8(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if ((D_8010CD10 != 0) && (uiStatus->unk_6C[0]== 0)) {
         uiStatus->unk_6C[0]= 1;
     }
 }
 
-s32 ShowCoinCounter(script_context* script) {
+s32 ShowCoinCounter(Script* script) {
     if (get_variable(script, *script->ptrReadPos)) {
         show_coin_counter();
     } else {
@@ -408,7 +408,7 @@ void func_800E973C(void) {
 }
 
 void open_status_menu_long(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->hidden) {
         uiStatus->showTimer = 210;
@@ -418,7 +418,7 @@ void open_status_menu_long(void) {
 }
 
 void open_status_menu_short(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->hidden) {
         uiStatus->showTimer = 105;
@@ -428,7 +428,7 @@ void open_status_menu_short(void) {
 }
 
 void func_800E97B8(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->hidden != 1) {
         uiStatus->hidden = 1;
@@ -438,7 +438,7 @@ void func_800E97B8(void) {
 }
 
 void func_800E97E4(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     uiStatus->drawPosY = -100;
     uiStatus->ignoreChanges = 0;
@@ -449,7 +449,7 @@ void func_800E97E4(void) {
 }
 
 void func_800E9810(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     uiStatus->showTimer = 210;
     uiStatus->drawPosY = 0;
@@ -468,8 +468,8 @@ void func_800E984C(void) {
 }
 
 s32 func_800E9860(void) {
-    ui_status* uiStatus = &gUIStatus;
-    ui_status* uiStatus2 = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
+    UiStatus* uiStatus2 = &gUIStatus;
     s32 ret = 1 - uiStatus->unk_45[0];
 
     if (uiStatus->unk_45[1] != 0) {
@@ -486,7 +486,7 @@ void status_menu_enable_ignore_changes(void) {
 }
 
 void func_800E98A8(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     uiStatus->ignoreChanges = 1;
     uiStatus->drawPosY = 18;
@@ -497,7 +497,7 @@ void status_menu_disable_ignore_changes(void) {
 }
 
 s32 func_800E98D4(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     return uiStatus->unk_45[1] + uiStatus->ignoreChanges;
 }
@@ -515,9 +515,9 @@ s32 is_status_menu_visible(void) {
 }
 
 void status_menu_start_blinking_hp(void) {
-    game_status* gameStatus = (*gGameStatusPtr);
-    ui_status* uiStatus = &gUIStatus;
-    ui_status* uiStatus2 = &gUIStatus;
+    GameStatus* gameStatus = (*gGameStatusPtr);
+    UiStatus* uiStatus = &gUIStatus;
+    UiStatus* uiStatus2 = &gUIStatus;
 
     if (gameStatus->isBattle == 0) {
         uiStatus->hpBlinkTimer = 120;
@@ -530,7 +530,7 @@ void status_menu_start_blinking_hp(void) {
 }
 
 void status_menu_stop_blinking_hp(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->hpBlinking != 0) {
         uiStatus->hpBlinking = 0;
@@ -540,9 +540,9 @@ void status_menu_stop_blinking_hp(void) {
 }
 
 void status_menu_start_blinking_fp(void) {
-    game_status* gameStatus = (*gGameStatusPtr);
-    ui_status* uiStatus = &gUIStatus;
-    ui_status* uiStatus2 = &gUIStatus;
+    GameStatus* gameStatus = (*gGameStatusPtr);
+    UiStatus* uiStatus = &gUIStatus;
+    UiStatus* uiStatus2 = &gUIStatus;
 
     if (gameStatus->isBattle == 0) {
         uiStatus->fpBlinkTimer = 120;
@@ -555,7 +555,7 @@ void status_menu_start_blinking_fp(void) {
 }
 
 void status_menu_stop_blinking_fp(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->fpBlinking != 0) {
         uiStatus->fpBlinking = 0;
@@ -564,9 +564,9 @@ void status_menu_stop_blinking_fp(void) {
 }
 
 void status_menu_start_blinking_coins(void) {
-    game_status* gameStatus = (*gGameStatusPtr);
-    ui_status* uiStatus = &gUIStatus;
-    ui_status* uiStatus2 = &gUIStatus;
+    GameStatus* gameStatus = (*gGameStatusPtr);
+    UiStatus* uiStatus = &gUIStatus;
+    UiStatus* uiStatus2 = &gUIStatus;
 
     if (gameStatus->isBattle == 0) {
         uiStatus->coinsBlinkTimer = 120;
@@ -579,7 +579,7 @@ void status_menu_start_blinking_coins(void) {
 }
 
 void status_menu_stop_blinking_coins(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->coinsBlinking != 0) {
         uiStatus->coinsBlinking = 0;
@@ -589,8 +589,8 @@ void status_menu_stop_blinking_coins(void) {
 }
 
 void status_menu_start_blinking_sp(void) {
-    player_data* playerData = &gPlayerData;
-    ui_status* uiStatus = &gUIStatus;
+    PlayerData* playerData = &gPlayerData;
+    UiStatus* uiStatus = &gUIStatus;
 
     uiStatus->spBarsToBlink = playerData->maxStarPower;
     if (uiStatus->spBlinking != 1) {
@@ -600,7 +600,7 @@ void status_menu_start_blinking_sp(void) {
 }
 
 void status_menu_stop_blinking_sp(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->spBlinking != 0) {
         uiStatus->spBlinking = 0;
@@ -609,7 +609,7 @@ void status_menu_stop_blinking_sp(void) {
 }
 
 void status_menu_start_blinking_sp_bars(s8 numBarsToBlink) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     uiStatus->spBarsToBlink = numBarsToBlink;
     if (uiStatus->spBlinking != 1) {
@@ -619,7 +619,7 @@ void status_menu_start_blinking_sp_bars(s8 numBarsToBlink) {
 }
 
 void status_menu_start_blinking_starpoints(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->starpointsBlinking != 1) {
         uiStatus->starpointsBlinking = 1;
@@ -628,7 +628,7 @@ void status_menu_start_blinking_starpoints(void) {
 }
 
 void status_menu_stop_blinking_starpoints(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->starpointsBlinking != 0) {
         uiStatus->starpointsBlinking = 0;
@@ -637,7 +637,7 @@ void status_menu_stop_blinking_starpoints(void) {
 }
 
 void decrement_status_menu_disabled(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     if (uiStatus->disabled > 0) {
         uiStatus->disabled--;
@@ -645,14 +645,14 @@ void decrement_status_menu_disabled(void) {
 }
 
 void increment_status_menu_disabled(void) {
-    ui_status* uiStatus = &gUIStatus;
+    UiStatus* uiStatus = &gUIStatus;
 
     uiStatus->disabled++;
 }
 
 void sync_status_menu(void) {
-    player_data* playerData = &gPlayerData;
-    ui_status* uiStatus = &gUIStatus;
+    PlayerData* playerData = &gPlayerData;
+    UiStatus* uiStatus = &gUIStatus;
 
     uiStatus->displayHP = playerData->curHP;
     uiStatus->displayFP = playerData->curFP;
@@ -662,8 +662,8 @@ void sync_status_menu(void) {
 }
 
 void reset_status_menu(void) {
-    player_data* playerData = &gPlayerData;
-    ui_status* uiStatus = &gUIStatus;
+    PlayerData* playerData = &gPlayerData;
+    UiStatus* uiStatus = &gUIStatus;
     s32 i;
 
     uiStatus->drawPosX = 12;
@@ -703,7 +703,7 @@ void reset_status_menu(void) {
     for (i = 0; i < 2; i++) {
         func_801452B4(uiStatus->fpIconIndexes[i], uiStatus->fpIconIndexes[i]);
     }
-    
+
     func_801452B4(uiStatus->coinIconIndex, uiStatus->coinIconIndex);
     func_801452B4(uiStatus->coinIconIndex2, uiStatus->coinIconIndex2);
     func_801452B4(uiStatus->starpointsIconIndex, uiStatus->starpointsIconIndex);
@@ -971,7 +971,7 @@ s32 is_partner_ability_active(void) {
 }
 
 s16 add_coins(s32 amt) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s16 newCoins = playerData->coins + amt;
 
     playerData->coins = newCoins;
@@ -992,8 +992,8 @@ s16 add_coins(s32 amt) {
 }
 
 s8 add_star_points(s32 amt) {
-    player_data* playerData = &gPlayerData;
-    player_data* playerData2 = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
+    PlayerData* playerData2 = &gPlayerData;
     s8 newSP = playerData->starPoints + amt;
 
     // TODO: probably a macro!
@@ -1011,8 +1011,8 @@ s8 add_star_points(s32 amt) {
 }
 
 u8 add_star_pieces(s32 amt) {
-    player_data* playerData = &gPlayerData;
-    player_data* playerData2 = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
+    PlayerData* playerData2 = &gPlayerData;
     s32 newSP = playerData->starPieces;
 
     newSP += amt;
@@ -1032,24 +1032,24 @@ u8 add_star_pieces(s32 amt) {
 }
 
 void increment_max_SP() {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
 
     playerData->maxStarPower++;
     playerData->specialBarsFilled = playerData->maxStarPower * 256;
 }
 
 void set_max_SP(s8 newMaxSP) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
 
     playerData->maxStarPower = newMaxSP;
     playerData->specialBarsFilled = newMaxSP * 256;
 }
 
 void add_SP(s32 amt) {
-    player_data* playerData = &gPlayerData;
-    player_data* playerData2 = &gPlayerData;
-    ui_status* uiStatus = &gUIStatus;
-    ui_status* uiStatus2 = &gUIStatus;
+    PlayerData* playerData = &gPlayerData;
+    PlayerData* playerData2 = &gPlayerData;
+    UiStatus* uiStatus = &gUIStatus;
+    UiStatus* uiStatus2 = &gUIStatus;
     s32 phi_v1;
     s32 blah;
 
@@ -1073,7 +1073,7 @@ void add_SP(s32 amt) {
 }
 
 s32 recover_fp(s32 amt) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 newFP = playerData->curFP;
     s32 ret;
 
@@ -1095,7 +1095,7 @@ s32 recover_fp(s32 amt) {
 }
 
 s32 recover_hp(s32 amt) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 newHP = playerData->curHP;
     s32 ret;
 
@@ -1117,7 +1117,7 @@ s32 recover_hp(s32 amt) {
 }
 
 void subtract_hp(s32 amt) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 newHP = playerData->curHP;
 
     if (amt > 0) {
@@ -1130,27 +1130,27 @@ void subtract_hp(s32 amt) {
 }
 
 s8 has_full_hp(void) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
 
     return playerData->curMaxHP == playerData->curHP;
 }
 
 s8 has_full_fp(void) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
 
     return playerData->curMaxFP == playerData->curFP;
 }
 
 s8 add_fortress_keys(s32 amt) {
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
 
     playerData->fortressKeyCount += amt;
     return playerData->fortressKeyCount;
 }
 
 s8 subtract_fortress_keys(s8 amt) {
-    player_data* playerData = &gPlayerData;
-    player_data* playerData2 = &gPlayerData; // required to match
+    PlayerData* playerData = &gPlayerData;
+    PlayerData* playerData2 = &gPlayerData; // required to match
 
     playerData->fortressKeyCount -= amt;
     if (playerData->fortressKeyCount < 0) {
diff --git a/src/code_dbd70_len_700.c b/src/code_dbd70_len_700.c
index cd72a4a5a5..611869fbc6 100644
--- a/src/code_dbd70_len_700.c
+++ b/src/code_dbd70_len_700.c
@@ -23,7 +23,7 @@ INCLUDE_ASM(code_dbd70_len_700, create_trigger);
 INCLUDE_ASM(code_dbd70_len_700, update_triggers);
 
 
-void delete_trigger(trigger* toDelete) {
+void delete_trigger(Trigger* toDelete) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentTriggerListPtr); i++) {
@@ -41,7 +41,7 @@ void delete_trigger(trigger* toDelete) {
 INCLUDE_ASM(code_dbd70_len_700, is_trigger_bound);
 
 //INCLUDE_ASM(code_dbd70_len_700, get_trigger_by_id);
-trigger* get_trigger_by_id(s32 triggerID) {
+Trigger* get_trigger_by_id(s32 triggerID) {
     return (*gCurrentTriggerListPtr)[triggerID];
 }
 
@@ -55,7 +55,7 @@ INCLUDE_ASM(code_dbd70_len_700, func_80145CE8);
     }
 
     for (i = 0; i < ARRAY_COUNT(gCurrentTriggerListPtr); i++) {
-        if (((*gCurrentTriggerListPtr)[i] == NULL) || 
+        if (((*gCurrentTriggerListPtr)[i] == NULL) ||
             ((*gCurrentTriggerListPtr)[i]->unk_30 == 0) ||
             ((*gCurrentTriggerListPtr)[i]->colliderID != arg0) ||
             ((*gCurrentTriggerListPtr)[i]->genericFlagIndex & 0x100) == 0) {
diff --git a/src/code_dc470_len_14c0.c b/src/code_dc470_len_14c0.c
index d1c4fe95de..e5aa5608d6 100644
--- a/src/code_dc470_len_14c0.c
+++ b/src/code_dc470_len_14c0.c
@@ -23,16 +23,16 @@ void load_map_bg(char* optAssetName) {
 }
 
 void func_80145DF8(void) {
-    game_status* gameStatus = *gGameStatusPtr;
+    GameStatus* gameStatus = *gGameStatusPtr;
     D_801595A0 = 0;
     D_8014F12F = 0;
-    
+
     gameStatus->unk_15C = 0xB4;
     gameStatus->enableBackground &= 0xF0;
 }
 
-void read_background_size(bg_header *bg) {
-    game_status* gameStatus = *gGameStatusPtr;
+void read_background_size(BackgroundHeader *bg) {
+    GameStatus* gameStatus = *gGameStatusPtr;
 
     gameStatus->backgroundMaxW = bg->width;
     gameStatus->backgroundMaxH = bg->height;
@@ -44,7 +44,7 @@ void read_background_size(bg_header *bg) {
 }
 
 void set_background_size(s16 startX, s16 startY, s16 sizeX, s16 sizeY) {
-    game_status* gameStatus = *gGameStatusPtr;
+    GameStatus* gameStatus = *gGameStatusPtr;
 
     gameStatus->enableBackground &= ~1;
     gameStatus->backgroundMaxW = startX;
diff --git a/src/code_e79b0_len_1920.c b/src/code_e79b0_len_1920.c
index 3381f98ad5..854a4725c4 100644
--- a/src/code_e79b0_len_1920.c
+++ b/src/code_e79b0_len_1920.c
@@ -50,7 +50,7 @@ INCLUDE_ASM(code_e79b0_len_1920, kill_script);
 
 void* kill_script_by_ID(s32 id) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -62,7 +62,7 @@ void* kill_script_by_ID(s32 id) {
 
 s32 kill_all_scripts(void) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -75,7 +75,7 @@ s32 kill_all_scripts(void) {
 
 s32 does_script_exist(s32 id) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -86,7 +86,7 @@ s32 does_script_exist(s32 id) {
     return 0;
 }
 
-s32 does_script_exist_by_ref(script_context* script) {
+s32 does_script_exist_by_ref(Script* script) {
     s32 i;
 
     for(i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
@@ -97,11 +97,11 @@ s32 does_script_exist_by_ref(script_context* script) {
     return 0;
 }
 
-void set_script_priority(script_context* script, s8 priority) {
+void set_script_priority(Script* script, s8 priority) {
     script->priority = priority;
 }
 
-void set_script_timescale(script_context* script, f32 timeScale) {
+void set_script_timescale(Script* script, f32 timeScale) {
     script->timeScale = timeScale * gGlobalTimeSpace;
 }
 
@@ -122,7 +122,7 @@ f32 get_global_timespace(void) {
 }
 */
 
-void set_script_group(script_context* script, s8 groupFlags) {
+void set_script_group(Script* script, s8 groupFlags) {
     script->groupFlags = groupFlags;
 }
 
@@ -130,10 +130,10 @@ INCLUDE_ASM(code_e79b0_len_1920, bind_trigger);
 
 INCLUDE_ASM(code_e79b0_len_1920, bind_trigger_1);
 
-void suspend_group_script(script_context* script, s32 groupFlags) {
+void suspend_group_script(Script* script, s32 groupFlags) {
     int i;
-    script_context* scriptContextPtr;
-    script_context* childScript = script->childScript;
+    Script* scriptContextPtr;
+    Script* childScript = script->childScript;
 
     if (childScript != NULL) {
         suspend_group_script(childScript, groupFlags);
@@ -151,10 +151,10 @@ void suspend_group_script(script_context* script, s32 groupFlags) {
     }
 }
 
-void resume_group_script(script_context* script, s32 groupFlags) {
+void resume_group_script(Script* script, s32 groupFlags) {
     int i;
-    script_context* scriptContextPtr;
-    script_context* childScript = script->childScript;
+    Script* scriptContextPtr;
+    Script* childScript = script->childScript;
 
     if (childScript != NULL) {
         resume_group_script(childScript, groupFlags);
@@ -174,7 +174,7 @@ void resume_group_script(script_context* script, s32 groupFlags) {
 
 s32 suspend_all_script(s32 id) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -186,7 +186,7 @@ s32 suspend_all_script(s32 id) {
 
 s32 resume_all_script(s32 id) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -198,7 +198,7 @@ s32 resume_all_script(s32 id) {
 
 void suspend_group_script_index(s32 id, s32 groupFlags) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -210,7 +210,7 @@ void suspend_group_script_index(s32 id, s32 groupFlags) {
 
 void resume_group_script_index(s32 id, s32 groupFlags) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -222,7 +222,7 @@ void resume_group_script_index(s32 id, s32 groupFlags) {
 
 s32 suspend_all_group(s32 groupFlags) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -234,7 +234,7 @@ s32 suspend_all_group(s32 groupFlags) {
 
 s32 resume_all_group(s32 groupFlags) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -247,7 +247,7 @@ s32 resume_all_group(s32 groupFlags) {
 
 void suspend_group_others(s32 script, s32 groupFlags) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -259,7 +259,7 @@ void suspend_group_others(s32 script, s32 groupFlags) {
 
 void resume_group_others(s32 script, s32 groupFlags) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         scriptContextPtr = (*gCurrentScriptListPtr)[i];
@@ -269,13 +269,13 @@ void resume_group_others(s32 script, s32 groupFlags) {
     }
 }
 
-script_context* get_script_by_index(s32 index) {
+Script* get_script_by_index(s32 index) {
     return (*gCurrentScriptListPtr)[index];
 }
 
-script_context* get_script_by_id(s32 id) {
+Script* get_script_by_id(s32 id) {
     s32 i;
-    script_context* scriptContextPtr;
+    Script* scriptContextPtr;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
         if ((*gCurrentScriptListPtr)[i] != NULL) {
@@ -288,10 +288,10 @@ script_context* get_script_by_id(s32 id) {
     return 0;
 }
 
-void set_script_flags(script_context* script, s32 flags) {
+void set_script_flags(Script* script, s32 flags) {
     int i;
-    script_context* scriptContextPtr;
-    script_context* childScript = script->childScript;
+    Script* scriptContextPtr;
+    Script* childScript = script->childScript;
 
     script->state |= flags;
     if (childScript != NULL) {
diff --git a/src/code_e92d0_len_5da0.c b/src/code_e92d0_len_5da0.c
index be7d124206..3deadd96d1 100644
--- a/src/code_e92d0_len_5da0.c
+++ b/src/code_e92d0_len_5da0.c
@@ -13,16 +13,16 @@ INCLUDE_ASM(code_e92d0_len_5da0, float_to_fixed_var);
     return (s32)(arg0 * (f32)1024.0f) + -230000000;
 }*/
 
-s32 si_handle_return(script_context* script) {
+s32 si_handle_return(Script* script) {
     kill_script(script);
     return 255;
 }
 
-s32 si_handle_label(script_context* script) {
+s32 si_handle_label(Script* script) {
     return 2;
 }
 
-s32 si_handle_goto(script_context* script) {
+s32 si_handle_goto(Script* script) {
     script->ptrNextLine = si_goto_label(script, get_variable(script, *script->ptrReadPos));
     return 2;
 }
@@ -31,7 +31,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_Loop);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_loop);
 
-s32 si_handle_break_loop(script_context* script) {
+s32 si_handle_break_loop(Script* script) {
     if (script->loopDepth < 0) {
         while (1) {}; // todo INF_LOOP
     }
@@ -56,7 +56,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_less_equal);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_greater_equal);
 
-s32 si_handle_if_AND(script_context* script) {
+s32 si_handle_if_AND(Script* script) {
     s32 var1;
     s32 *ptrReadPos = script->ptrReadPos;
 
@@ -71,7 +71,7 @@ s32 si_handle_if_AND(script_context* script) {
 }
 
 //INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_not_AND);
-s32 si_handle_if_not_AND(script_context* script) {
+s32 si_handle_if_not_AND(Script* script) {
     s32 var1;
     s32 *ptrReadPos = script->ptrReadPos;
 
@@ -85,12 +85,12 @@ s32 si_handle_if_not_AND(script_context* script) {
     return 2;
 }
 
-s32 si_handle_else(script_context* script) {
+s32 si_handle_else(Script* script) {
     script->ptrNextLine = si_skip_else(script);
     return 2;
 }
 
-s32 si_handle_end_if(script_context* script) {
+s32 si_handle_end_if(Script* script) {
     return 2;
 }
 
@@ -100,7 +100,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_switch_const);
 /*s32 si_handle_switch_const(script_context* script) {
     s32 ptrReadPos = *script->ptrReadPos;
     s8 switchDepth = script->switchDepth + 1;
-    
+
     if (switchDepth >= 8) {
         inf_loop: goto inf_loop; //todo
     }
@@ -133,7 +133,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_case_equal_AND);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end_case_group);
 
-s32 si_handle_break_case(script_context* script) {
+s32 si_handle_break_case(Script* script) {
     if (script->switchDepth < 0) {
         while (1) {}; //todo INF_LOOP
     }
@@ -141,9 +141,9 @@ s32 si_handle_break_case(script_context* script) {
     return 2;
 }
 
-s32 si_handle_end_switch(script_context* script) {
+s32 si_handle_end_switch(Script* script) {
     s32 switchDepth = script->switchDepth;
-    
+
     if (switchDepth < 0) {
         inf_loop: goto inf_loop; // todo macro? how to do without label
     }
@@ -154,7 +154,7 @@ s32 si_handle_end_switch(script_context* script) {
 
 }
 
-s32 si_handle_set_var(script_context* script) {
+s32 si_handle_set_var(Script* script) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 curPtrReadPos = ptrReadPos[0];
 
@@ -162,12 +162,12 @@ s32 si_handle_set_var(script_context* script) {
     return 2;
 }
 
-s32 si_handle_set_const(script_context* script) {
+s32 si_handle_set_const(Script* script) {
     set_variable(script, *script->ptrReadPos, script->ptrReadPos[1]);
     return 2;
 }
 
-s32 si_handle_set_float(script_context* script) {
+s32 si_handle_set_float(Script* script) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 curPtrReadPos = ptrReadPos[0];
 
@@ -193,17 +193,17 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_multiplyF);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_divideF);
 
-s32 si_handle_set_int_buffer_ptr(script_context* script) {
+s32 si_handle_set_int_buffer_ptr(Script* script) {
     script->buffer = get_variable(script, *script->ptrReadPos);
     return 2;
 }
 
-s32 si_handle_set_float_buffer_ptr(script_context* script) {
+s32 si_handle_set_float_buffer_ptr(Script* script) {
     script->buffer = get_variable(script, *script->ptrReadPos);
     return 2;
 }
 
-s32 si_handle_get_1_word(script_context* script) {
+s32 si_handle_get_1_word(Script* script) {
     s32 ptrReadPos = *script->ptrReadPos;
     s32 buffer = *script->buffer++;
 
@@ -217,7 +217,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_3_word);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_word);
 
-s32 si_handle_get_Nth_word(script_context* script) {
+s32 si_handle_get_Nth_word(Script* script) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 curPtrReadPos = ptrReadPos[0];
 
@@ -235,12 +235,12 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_4_float);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_get_Nth_float);
 
-s32 si_handle_set_array(script_context* script) {
+s32 si_handle_set_array(Script* script) {
     script->array = get_variable(script, *script->ptrReadPos);
     return 2;
 }
 
-s32 si_handle_set_flag_array(script_context* script) {
+s32 si_handle_set_flag_array(Script* script) {
     script->flagArray = get_variable(script, *script->ptrReadPos);
     return 2;
 }
@@ -250,7 +250,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_allocate_array);
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND);
 
 //INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND_const);
-s32 si_handle_AND_const(script_context* script) {
+s32 si_handle_AND_const(Script* script) {
     s32* ptrReadPos = script->ptrReadPos;
     // todo ???
     s32 temp_s0 = ptrReadPos[0];
@@ -265,7 +265,7 @@ s32 si_handle_AND_const(script_context* script) {
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR);
 
 //INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR_const);
-s32 si_handle_OR_const(script_context* script) {
+s32 si_handle_OR_const(Script* script) {
     s32* ptrReadPos = script->ptrReadPos;
     // todo ???
     s32 temp_s0 = ptrReadPos[0];
@@ -283,13 +283,13 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_exec1);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_exec2);
 
-s32 si_handle_exec_wait(script_context* script) {
+s32 si_handle_exec_wait(Script* script) {
     start_child_script(script, get_variable(script, *script->ptrReadPos), 0);
     script->currentOpcode = 0;
     return 0xFF;
 }
 
-s32 si_handle_jump(script_context* script) {
+s32 si_handle_jump(Script* script) {
     script->ptrFirstLine = get_variable(script, *script->ptrReadPos);
     restart_script(script);
     return 2;
@@ -299,62 +299,62 @@ INCLUDE_ASM(code_e92d0_len_5da0, _bound_script_trigger_handler);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_bind);
 
-s32 DeleteTrigger(script_context* script) {
+s32 DeleteTrigger(Script* script) {
     delete_trigger(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_unbind(script_context* script) {
+s32 si_handle_unbind(Script* script) {
     delete_trigger(script->ownerID);
     return 2;
 }
 
-s32 si_handle_kill(script_context* script) {
+s32 si_handle_kill(Script* script) {
     kill_script_by_ID(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_set_priority(script_context* script) {
+s32 si_handle_set_priority(Script* script) {
     set_script_priority(script, get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_set_timescale(script_context* script) {
+s32 si_handle_set_timescale(Script* script) {
     set_script_timescale(script, get_float_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_set_group(script_context* script) {
+s32 si_handle_set_group(Script* script) {
     set_script_group(script, get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_suspend_all(script_context* script) {
+s32 si_handle_suspend_all(Script* script) {
     suspend_all_group(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_resume_all(script_context* script) {
+s32 si_handle_resume_all(Script* script) {
     resume_all_group(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_suspend_others(script_context* script) {
+s32 si_handle_suspend_others(Script* script) {
     suspend_group_others(script, get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_resume_others(script_context* script) {
+s32 si_handle_resume_others(Script* script) {
     resume_group_others(script, get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_suspend(script_context* script) {
+s32 si_handle_suspend(Script* script) {
     suspend_all_script(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 si_handle_resume(script_context* script) {
+s32 si_handle_resume(Script* script) {
     resume_all_script(get_variable(script, *script->ptrReadPos));
     return 2;
 }
@@ -365,34 +365,34 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_bind_lock);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_thread);
 
-s32 si_handle_end_thread(script_context* script) {
+s32 si_handle_end_thread(Script* script) {
     kill_script(script);
     return 255;
 }
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_child_thread);
 
-s32 si_handle_end_child_thread(script_context* script) {
+s32 si_handle_end_child_thread(Script* script) {
     kill_script(script);
     return 0;
 }
 
-s32 func_802C6E14(script_context* script) {
+s32 func_802C6E14(Script* script) {
     return 2;
 }
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_print_debug_var);
 
-s32 func_802C739C(script_context* script) {
+s32 func_802C739C(Script* script) {
     script->ptrSavedPosition = *script->ptrReadPos;
     return 2;
 }
 
-s32 func_802C73B0(script_context* script) {
+s32 func_802C73B0(Script* script) {
     return 2;
 }
 
-s32 func_802C73B8(script_context* script) {
+s32 func_802C73B8(Script* script) {
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(gCurrentScriptListPtr); i++) {
@@ -407,17 +407,17 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_execute_next_command);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_handle_end);
 
-s32 INCLUDE_ASM(code_e92d0_len_5da0, get_variable, script_context* script, bytecode var);
+s32 INCLUDE_ASM(code_e92d0_len_5da0, get_variable, Script* script, bytecode var);
 
 INCLUDE_ASM(code_e92d0_len_5da0, get_variable_index);
 
 INCLUDE_ASM(code_e92d0_len_5da0, get_variable_index_alt);
 
-s32 INCLUDE_ASM(code_e92d0_len_5da0, set_variable, script_context* script, bytecode var, s32 value);
+s32 INCLUDE_ASM(code_e92d0_len_5da0, set_variable, Script* script, bytecode var, s32 value);
 
-f32 INCLUDE_ASM(code_e92d0_len_5da0, get_float_variable, script_context* script, bytecode var);
+f32 INCLUDE_ASM(code_e92d0_len_5da0, get_float_variable, Script* script, bytecode var);
 
-f32 INCLUDE_ASM(code_e92d0_len_5da0, set_float_variable, script_context* script, bytecode var, f32 value);
+f32 INCLUDE_ASM(code_e92d0_len_5da0, set_float_variable, Script* script, bytecode var, f32 value);
 
 INCLUDE_ASM(code_e92d0_len_5da0, si_goto_label);
 
@@ -439,7 +439,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, ScaleModel);
 
 INCLUDE_ASM(code_e92d0_len_5da0, GetModelIndex);
 
-s32 CloneModel(script_context* script) {
+s32 CloneModel(Script* script) {
     s32* thisPos = script->ptrReadPos;
     s32 srcModelID = get_variable(script, *thisPos++);
     s32 newModelID = get_variable(script, *thisPos++);
@@ -484,7 +484,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, GetColliderCenter);
 
 INCLUDE_ASM(code_e92d0_len_5da0, ParentColliderToModel);
 
-s32 UpdateColliderTransform(script_context* script) {
+s32 UpdateColliderTransform(Script* script) {
     update_collider_transform(get_variable(script, *script->ptrReadPos));
     return 2;
 }
@@ -493,32 +493,32 @@ INCLUDE_ASM(code_e92d0_len_5da0, func_802CA1B8);
 
 INCLUDE_ASM(code_e92d0_len_5da0, goto_map);
 
-s32 GotoMap(script_context* script) {
+s32 GotoMap(Script* script) {
     goto_map(script, 0);
     return 1;
 }
 
-s32 GotoMapSpecial(script_context* script) {
+s32 GotoMapSpecial(Script* script) {
     goto_map(script, 1);
     return 1;
 }
 
-s32 GotoMapByID(script_context* script) {
+s32 GotoMapByID(Script* script) {
     goto_map(script, 2);
     return 1;
 }
 
-s32 GetEntryID(script_context* script) {
+s32 GetEntryID(Script* script) {
     set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->entryID);
     return 2;
 }
 
-s32 GetMapID(script_context* script, s32 initialCall) {
+s32 GetMapID(Script* script, s32 initialCall) {
     set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->mapID);
     return 2;
 }
 
-s32 GetLoadType(script_context* script, s32 initialCall) {
+s32 GetLoadType(Script* script, s32 initialCall) {
     set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->loadType != 0);
     return 2;
 }
diff --git a/src/code_ebd0_len_6a0.c b/src/code_ebd0_len_6a0.c
index 2de74dc149..36b348f471 100644
--- a/src/code_ebd0_len_6a0.c
+++ b/src/code_ebd0_len_6a0.c
@@ -1,13 +1,13 @@
 #include "common.h"
 
 void func_800337D0(s16 new_alpha) {
-    game_status* gameStatus = *gGameStatusPtr;
+    GameStatus* gameStatus = *gGameStatusPtr;
 
     gameStatus->bootAlpha = new_alpha;
 }
 
 void func_800337E0(s16 arg0) {
-    game_status* gameStatus = *gGameStatusPtr;
+    GameStatus* gameStatus = *gGameStatusPtr;
 
     gameStatus->bootRed = arg0;
     gameStatus->bootGreen = arg0;
@@ -15,7 +15,7 @@ void func_800337E0(s16 arg0) {
 }
 
 s16 func_800337F8(subtract_val) {
-    game_status* gameStatus = *gGameStatusPtr;
+    GameStatus* gameStatus = *gGameStatusPtr;
 
     if (gameStatus->bootAlpha != 0) {
         gameStatus->bootAlpha -= subtract_val;
@@ -29,7 +29,7 @@ s16 func_800337F8(subtract_val) {
 }
 
 s16 func_80033830(add_val) {
-    game_status* gameStatus = *gGameStatusPtr;
+    GameStatus* gameStatus = *gGameStatusPtr;
 
     if (gameStatus->bootAlpha != 0xFF) {
         gameStatus->bootAlpha += add_val;
diff --git a/src/code_f2470_len_27f0.c b/src/code_f2470_len_27f0.c
index 263567dedf..9c466e56bb 100644
--- a/src/code_f2470_len_27f0.c
+++ b/src/code_f2470_len_27f0.c
@@ -1,20 +1,20 @@
 #include "common.h"
 
-npc* resolve_npc(script_context* script, NPC npcID) {
+Npc* resolve_npc(Script* script, NPC npcID) {
     if (npcID == NPC_SELF) {
         return get_npc_safe(script->ownerID);
     } else if (npcID >= -270000000) {
         return get_npc_safe(npcID);
     } else {
-        return (npc*) npcID;
+        return (Npc*) npcID;
     }
 }
 
 INCLUDE_ASM(code_f2470_len_27f0, set_npc_animation);
 
-s32 DeleteNpc(script_context* script, s32 initialCall) {
+s32 DeleteNpc(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
-    npc* npcPtr = get_npc_unsafe(get_variable(script, *ptrReadPos++));
+    Npc* npcPtr = get_npc_unsafe(get_variable(script, *ptrReadPos++));
 
     if (npcPtr) {
         free_npc(npcPtr);
@@ -23,7 +23,7 @@ s32 DeleteNpc(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 GetNpcPointer(script_context* script, s32 initialCall) {
+s32 GetNpcPointer(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
     bytecode npcID = get_variable(script, *ptrReadPos++);
     bytecode varNPC = *ptrReadPos++;
diff --git a/src/code_f4c60_len_4300.c b/src/code_f4c60_len_4300.c
index 238927c01b..1e7fc44de4 100644
--- a/src/code_f4c60_len_4300.c
+++ b/src/code_f4c60_len_4300.c
@@ -1,18 +1,18 @@
 #include "common.h"
 
-s32 SpeakToPlayer(script_context* script, s32 initialCall) {
+s32 SpeakToPlayer(Script* script, s32 initialCall) {
     return _show_message(script, initialCall, 0);
 }
 
-s32 EndSpeech(script_context* script, s32 initialCall) {
+s32 EndSpeech(Script* script, s32 initialCall) {
     return _show_message(script, initialCall, 1);
 }
 
-s32 ContinueSpeech(script_context* script, s32 initialCall) {
+s32 ContinueSpeech(Script* script, s32 initialCall) {
     return _show_message(script, initialCall, 2);
 }
 
-s32 SpeakToNpc(script_context* script, s32 initialCall) {
+s32 SpeakToNpc(Script* script, s32 initialCall) {
     return _show_message(script, initialCall, 3);
 }
 
@@ -28,27 +28,27 @@ INCLUDE_ASM(code_f4c60_len_4300, SwitchMessage);
 
 INCLUDE_ASM(code_f4c60_len_4300, ShowChoice);
 
-s32 CloseChoice(script_context* script, s32 initialCall) {
+s32 CloseChoice(Script* script, s32 initialCall) {
     close_message(D_802DB268);
     return 1;
 }
 
-s32 CancelMessage(script_context* script, s32 initialCall) {
+s32 CancelMessage(Script* script, s32 initialCall) {
     cancel_message(gCurrentPrintContext);
     return 2;
 }
 
-s32 CancelMessageAndBlock(script_context* script, s32 initialCall) {
+s32 CancelMessageAndBlock(Script* script, s32 initialCall) {
     cancel_message(gCurrentPrintContext);
     return 0;
 }
 
-s32 SetMessageImages(script_context* script, s32 initialCall) {
+s32 SetMessageImages(Script* script, s32 initialCall) {
     set_message_images(*script->ptrReadPos);
     return 2;
 }
 
-s32 func_802D0C94(script_context* script, s32 initialCall) {
+s32 func_802D0C94(Script* script, s32 initialCall) {
     if (get_variable(script, *script->ptrReadPos) == 0) {
         D_8009A650[0] |= 0x10;
     } else {
@@ -57,7 +57,7 @@ s32 func_802D0C94(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 SetMessageString(script_context* script, s32 initialCall) {
+s32 SetMessageString(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
     bytecode string = get_variable(script, *ptrReadPos++);
     bytecode index = get_variable(script, *ptrReadPos++);
diff --git a/src/code_f8f60_len_1560.c b/src/code_f8f60_len_1560.c
index 3c471d9d1f..6d0905474f 100644
--- a/src/code_f8f60_len_1560.c
+++ b/src/code_f8f60_len_1560.c
@@ -1,6 +1,6 @@
 #include "common.h"
 
-s32 MakeLerp(script_context* script, s32 initialCall) {
+s32 MakeLerp(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
 
     script->varTable[0xC] = get_variable(script, *ptrReadPos++); // start
@@ -12,7 +12,7 @@ s32 MakeLerp(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 UpdateLerp(script_context* script, s32 initialCall) {
+s32 UpdateLerp(Script* script, s32 initialCall) {
     script->varTable[0x0] = (s32) update_lerp(
         script->varTable[0xB],
         script->varTable[0xC],
@@ -31,7 +31,7 @@ s32 UpdateLerp(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 RandInt(script_context* script, s32 initialCall) {
+s32 RandInt(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
 
     s32 max = get_variable(script, *ptrReadPos++);
@@ -42,49 +42,49 @@ s32 RandInt(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 GetAngleBetweenNPCs(script_context* script, s32 initialCall) {
+s32 GetAngleBetweenNPCs(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
 
     NPC aID = get_variable(script, *ptrReadPos++);
     NPC bID = get_variable(script, *ptrReadPos++);
     bytecode outVar = *ptrReadPos++;
 
-    npc* a = resolve_npc(script, aID);
-    npc* b = resolve_npc(script, bID);
+    Npc* a = resolve_npc(script, aID);
+    Npc* b = resolve_npc(script, bID);
     set_variable(script, outVar, atan2(a->pos.x, a->pos.z, b->pos.x, b->pos.z));
 
     return 2;
 }
 
-s32 GetAngleToNPC(script_context* script, s32 initialCall) {
-    player_status* playerStatus = &gPlayerStatus;
+s32 GetAngleToNPC(Script* script, s32 initialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
     bytecode* ptrReadPos = script->ptrReadPos;
 
     NPC npcID = get_variable(script, *ptrReadPos++);
     bytecode outVar = *ptrReadPos++;
 
-    npc* npc = resolve_npc(script, npcID);
+    Npc* npc = resolve_npc(script, npcID);
     set_variable(script, outVar, atan2(playerStatus->position.x, playerStatus->position.z, npc->pos.x, npc->pos.z));
 
     return 2;
 }
 
-s32 GetAngleToPlayer(script_context* script, s32 initialCall) {
-    player_status* playerStatus = &gPlayerStatus;
+s32 GetAngleToPlayer(Script* script, s32 initialCall) {
+    PlayerStatus* playerStatus = &gPlayerStatus;
     bytecode* ptrReadPos = script->ptrReadPos;
 
     NPC npcID = get_variable(script, *ptrReadPos++);
     bytecode outVar = *ptrReadPos++;
 
-    npc* npc = resolve_npc(script, npcID);
+    Npc* npc = resolve_npc(script, npcID);
     set_variable(script, outVar, atan2(npc->pos.x, npc->pos.z, playerStatus->position.x, playerStatus->position.z));
 
     return 2;
 }
 
-s32 AwaitPlayerApproach(script_context* script, s32 initialCall) {
+s32 AwaitPlayerApproach(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
-    player_status* playerStatus = &gPlayerStatus;
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
     s32* targetX = &script->functionTemp[0];
     s32* targetZ = &script->functionTemp[1];
@@ -110,9 +110,9 @@ s32 AwaitPlayerApproach(script_context* script, s32 initialCall) {
     }
 }
 
-s32 IsPlayerWithin(script_context* script, s32 initialCall) {
+s32 IsPlayerWithin(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
-    player_status* playerStatus = &gPlayerStatus;
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
     s32* targetX = &script->functionTemp[0];
     s32* targetZ = &script->functionTemp[1];
@@ -141,9 +141,9 @@ s32 IsPlayerWithin(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 AwaitPlayerLeave(script_context* script, s32 initialCall) {
+s32 AwaitPlayerLeave(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
-    player_status* playerStatus = &gPlayerStatus;
+    PlayerStatus* playerStatus = &gPlayerStatus;
 
     s32* targetX = &script->functionTemp[0];
     s32* targetZ = &script->functionTemp[1];
@@ -169,7 +169,7 @@ s32 AwaitPlayerLeave(script_context* script, s32 initialCall) {
     }
 }
 
-s32 AddVectorPolar(script_context* script, s32 initialCall) {
+s32 AddVectorPolar(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
 
     bytecode xVar = *ptrReadPos++;
@@ -236,7 +236,7 @@ s32 func_802D4CC4(script_context* script, s32 initialCall) {
 }
 */
 
-s32 func_802D4D18(script_context* script, s32 initialCall) {
+s32 func_802D4D18(Script* script, s32 initialCall) {
     s32 value = get_float_variable(script, *script->ptrReadPos);
 
     func_80137E4C(0, 0, 0xC, 0x14);
@@ -246,7 +246,7 @@ s32 func_802D4D18(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 func_802D4D88(script_context* script, s32 initialCall) {
+s32 func_802D4D88(Script* script, s32 initialCall) {
     func_80137D88(0xC, 0);
     return 2;
 }
@@ -259,7 +259,7 @@ INCLUDE_ASM(code_f8f60_len_1560, LoadPath);
 
 INCLUDE_ASM(code_f8f60_len_1560, GetNextPathPos);
 
-s32 GetDist2D(script_context* script, s32 initialCall) {
+s32 GetDist2D(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
 
     bytecode outVar = *ptrReadPos++;
@@ -273,12 +273,12 @@ s32 GetDist2D(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 func_802D5830(script_context* script, s32 initialCall) {
+s32 func_802D5830(Script* script, s32 initialCall) {
     func_80027088(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 func_802D585C(script_context* script, s32 initialCall) {
+s32 func_802D585C(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
     s32 setMode = get_variable(script,  *ptrReadPos++);
     s32 flags = get_variable(script, *ptrReadPos++);
@@ -294,7 +294,7 @@ s32 func_802D585C(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 SetValueByRef(script_context* script, s32 initialCall) {
+s32 SetValueByRef(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
 
     s32 dest = get_variable(script, *ptrReadPos++); /* Reference */
@@ -304,7 +304,7 @@ s32 SetValueByRef(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 GetValueByRef(script_context* script, s32 initialCall) {
+s32 GetValueByRef(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
 
     s32 src = get_variable(script, *ptrReadPos++); /* Reference */
@@ -315,7 +315,7 @@ s32 GetValueByRef(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 EnableStatusMenu(script_context* script, s32 initialCall) {
+s32 EnableStatusMenu(Script* script, s32 initialCall) {
     if (get_variable(script, *script->ptrReadPos) != 0) {
         decrement_status_menu_disabled();
     } else {
@@ -325,7 +325,7 @@ s32 EnableStatusMenu(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 ShowStatusMenu(script_context* script, s32 initialCall) {
+s32 ShowStatusMenu(Script* script, s32 initialCall) {
     if (get_variable(script, *script->ptrReadPos) != 0) {
         status_menu_enable_ignore_changes();
         func_800E97B8();
@@ -336,7 +336,7 @@ s32 ShowStatusMenu(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 SetGameMode(script_context* script, s32 initialCall) {
+s32 SetGameMode(Script* script, s32 initialCall) {
     set_game_mode(
         // Clear upper half
         (get_variable(script, *script->ptrReadPos) << 0x10) >> 0x10
@@ -344,7 +344,7 @@ s32 SetGameMode(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 ClampAngleInt(script_context* script, s32 initialCall) {
+s32 ClampAngleInt(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
 
     set_variable(script, *ptrReadPos, clamp_angle(get_variable(script, *ptrReadPos)));
@@ -352,7 +352,7 @@ s32 ClampAngleInt(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 ClampAngleFloat(script_context* script, s32 initialCall) {
+s32 ClampAngleFloat(Script* script, s32 initialCall) {
     bytecode* ptrReadPos = script->ptrReadPos;
 
     set_float_variable(script, *ptrReadPos, clamp_angle(get_float_variable(script, *ptrReadPos)));
diff --git a/src/code_fa4c0_len_3bf0.c b/src/code_fa4c0_len_3bf0.c
index d401358064..690e015f8a 100644
--- a/src/code_fa4c0_len_3bf0.c
+++ b/src/code_fa4c0_len_3bf0.c
@@ -2,7 +2,7 @@
 
 INCLUDE_ASM(code_fa4c0_len_3bf0, func_802D5B10);
 
-s32 FadeOutMusic(script_context* script, s32 initialCall) {
+s32 FadeOutMusic(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 itemID = get_variable(script, *ptrReadPos++);
     s32* ptrNextPos = ptrReadPos++;
@@ -10,7 +10,7 @@ s32 FadeOutMusic(script_context* script, s32 initialCall) {
     return (set_music_track(itemID, -1, 0, get_variable(script, *ptrNextPos++), 8) != 0) * 2;
 }
 
-s32 SetMusicTrack(script_context* script, s32 initialCall) {
+s32 SetMusicTrack(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 musicPlayer = get_variable(script, *ptrReadPos++);
     s32 songID = get_variable(script, *ptrReadPos++);
@@ -22,14 +22,14 @@ s32 SetMusicTrack(script_context* script, s32 initialCall) {
 
 INCLUDE_ASM(code_fa4c0_len_3bf0, FadeInMusic);
 
-s32 PlayAmbientSounds(script_context* script, s32 initialCall) {
+s32 PlayAmbientSounds(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 soundID = get_variable(script, *ptrReadPos++);
 
     return (play_ambient_sounds(soundID, 0xFA) != 0) * 2;
 }
 
-s32 PlaySound(script_context* script, s32 initialCall) {
+s32 PlaySound(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 soundID = get_variable(script, *ptrReadPos++);
 
@@ -37,7 +37,7 @@ s32 PlaySound(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 func_802D617C(script_context* script, s32 initialCall) {
+s32 func_802D617C(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 soundID = get_variable(script, *ptrReadPos++);
     s32 value2 = get_variable(script, *ptrReadPos++);
@@ -46,7 +46,7 @@ s32 func_802D617C(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 PlaySoundAt(script_context* script, s32 initialCall) {
+s32 PlaySoundAt(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 soundID = get_variable(script, *ptrReadPos++);
     s32 value2 = get_variable(script, *ptrReadPos++);
@@ -58,28 +58,28 @@ s32 PlaySoundAt(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 StopSound(script_context* script, s32 initialCall) {
+s32 StopSound(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
 
     stop_sound(get_variable(script, *ptrReadPos++));
     return 2;
 }
 
-s32 func_802D62E4(script_context* script, s32 initialCall) {
+s32 func_802D62E4(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
 
     func_80149A6C(get_variable(script, *ptrReadPos++), 1);
     return 2;
 }
 
-s32 UseDoorSounds(script_context* script, s32 initialCall) {
+s32 UseDoorSounds(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
 
     gCurrentDoorSoundsSet = get_variable(script, *ptrReadPos++);
     return 2;
 }
 
-s32 func_802D6340(script_context* script, s32 initialCall) {
+s32 func_802D6340(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
 
     D_80151308 = get_variable(script, *ptrReadPos++);
@@ -88,7 +88,7 @@ s32 func_802D6340(script_context* script, s32 initialCall) {
 
 INCLUDE_ASM(code_fa4c0_len_3bf0, PlaySoundAtF);
 
-s32 RemoveKeyItemAt(script_context* script, s32 initialCall) {
+s32 RemoveKeyItemAt(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 index = get_variable(script, *ptrReadPos++);
     s16* ptrKeyItems = (s16 *) &gPlayerData.keyItems;
@@ -97,20 +97,20 @@ s32 RemoveKeyItemAt(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 RemoveItemAt(script_context* script, s32 initialCall) {
+s32 RemoveItemAt(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 index = get_variable(script, *ptrReadPos++);
     s16* ptrInvItems = (s16 *) &gPlayerData.invItems;
-    
+
     ptrInvItems[index] = 0;
     sort_items();
     return 2;
 }
 
-s32 AddKeyItem(script_context* script, s32 initialCall) {
+s32 AddKeyItem(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 value = *ptrReadPos++;
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 itemID = get_variable(script, value);
     s32 i;
 
@@ -139,13 +139,13 @@ s32 func_802D6954(void) {
     return 2;
 }
 
-s32 HasKeyItem(script_context* script, s32 initialCall) {
+s32 HasKeyItem(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 itemID = get_variable(script, *ptrReadPos++);
     s32 value = *ptrReadPos++;
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i;
-    
+
     for(i = 0; i < ARRAY_COUNT(playerData->keyItems); i++) {
         if (playerData->keyItems[i] == itemID) {
             break;
@@ -155,11 +155,11 @@ s32 HasKeyItem(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 FindKeyItem(script_context* script, s32 initialCall) {
+s32 FindKeyItem(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 itemID = get_variable(script, *ptrReadPos++);
     s32 value = *ptrReadPos++;
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i;
     s32 itemIndex;
 
@@ -178,7 +178,7 @@ s32 FindKeyItem(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 AddItem(script_context* script, s32 initialCall) {
+s32 AddItem(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 itemID = get_variable(script, *ptrReadPos++);
     s32* ptrNextPos = (s32 *) *ptrReadPos++;
@@ -187,16 +187,16 @@ s32 AddItem(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 func_802D6AF0(script_context* script, s32 initialCall) {
+s32 func_802D6AF0(Script* script, s32 initialCall) {
     set_variable(script, *script->ptrReadPos, 0);
     return 2;
 }
 
-s32 FindItem(script_context* script, s32 initialCall) {
+s32 FindItem(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 itemID = get_variable(script, *ptrReadPos++);
     s32 value = *ptrReadPos++;
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i;
     s32 itemIndex;
 
@@ -215,11 +215,11 @@ s32 FindItem(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 RemoveItem(script_context* script, s32 initialCall) {
+s32 RemoveItem(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
     s32 itemID = get_variable(script, *ptrReadPos++);
     s32 value = *ptrReadPos++;
-    player_data* playerData = &gPlayerData;
+    PlayerData* playerData = &gPlayerData;
     s32 i;
     s32 itemIndex;
 
@@ -245,14 +245,14 @@ s32 RemoveItem(script_context* script, s32 initialCall) {
     return 2;
 }
 
-s32 CountFortressKeys(script_context* script, s32 initialCall) {
+s32 CountFortressKeys(Script* script, s32 initialCall) {
     s32 outVar = *script->ptrReadPos;
 
     set_variable(script, outVar, get_fortress_key_count());
     return 2;
 }
 
-s32 RemoveFortressKeys(script_context* script, s32 initialCall) {
+s32 RemoveFortressKeys(Script* script, s32 initialCall) {
     s32 num = get_variable(script, *script->ptrReadPos);
 
     subtract_fortress_keys(num);
@@ -281,7 +281,7 @@ s32 DropItemEntityB(script_context* script, s32 initialCall) {
 }
 */
 
-s32 RemoveItemEntity(script_context* script, s32 initialCall) {
+s32 RemoveItemEntity(Script* script, s32 initialCall) {
   s32* ptrReadPos = script->ptrReadPos;
   s32 itemEntityIndex = get_variable(script, *ptrReadPos++);
 
@@ -289,7 +289,7 @@ s32 RemoveItemEntity(script_context* script, s32 initialCall) {
   return 2;
 }
 
-s32 AddBadge(script_context* script, s32 initialCall) {
+s32 AddBadge(Script* script, s32 initialCall) {
   s32* ptrReadPos = script->ptrReadPos;
   s32 itemID = get_variable(script, *ptrReadPos++);
   s32* ptrNextPos = (s32 *) *ptrReadPos++;
@@ -300,9 +300,9 @@ s32 AddBadge(script_context* script, s32 initialCall) {
 
 INCLUDE_ASM(code_fa4c0_len_3bf0, RemoveBadge);
 
-s32 SetItemPos(script_context* script, s32 initialCall) {
+s32 SetItemPos(Script* script, s32 initialCall) {
     s32* ptrReadPos = script->ptrReadPos;
-    item_entity* ptrItemEntity;
+    ItemEntity* ptrItemEntity;
     s32 itemEntityIndex;
     s32 x, y, z;
 
@@ -311,7 +311,7 @@ s32 SetItemPos(script_context* script, s32 initialCall) {
     y = get_variable(script, *ptrReadPos++);
     z = get_variable(script, *ptrReadPos++);
 
-    ptrItemEntity = (item_entity *) get_item_entity(itemEntityIndex);
+    ptrItemEntity = (ItemEntity *) get_item_entity(itemEntityIndex);
     ptrItemEntity->position.x = x;
     ptrItemEntity->position.y = y;
     ptrItemEntity->position.z = z;
@@ -320,17 +320,17 @@ s32 SetItemPos(script_context* script, s32 initialCall) {
 
 INCLUDE_ASM(code_fa4c0_len_3bf0, SetItemFlags);
 
-s32 AddCoin(script_context* script, s32 initialCall) {
+s32 AddCoin(Script* script, s32 initialCall) {
     script->varTable[0] = add_coins(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 AddStarPoints(script_context* script, s32 initialCall) {
+s32 AddStarPoints(Script* script, s32 initialCall) {
     script->varTable[0] = add_star_points(get_variable(script, *script->ptrReadPos));
     return 2;
 }
 
-s32 AddStarPieces(script_context* script, s32 initialCall) {
+s32 AddStarPieces(Script* script, s32 initialCall) {
     script->varTable[0] = add_star_pieces(get_variable(script, *script->ptrReadPos));
     return 2;
 }
@@ -343,8 +343,8 @@ s32 GetItemPower(script_context* script, s32 initialCall) {
     s32 itemID = get_variable(script, *ptrReadPos++);
     s32* ptrNextPos = ptrReadPos++;
     item_table_entry* item = &gItemTable[itemID];
-    
-    
+
+
     set_variable(script, ptrNextPos++, item->potencyA);
     set_variable(script, ptrNextPos++, item->potencyB);
     return 2;
diff --git a/src/code_fe0b0_len_5a0.c b/src/code_fe0b0_len_5a0.c
index 64ced8f3ca..9b2ee0dc45 100644
--- a/src/code_fe0b0_len_5a0.c
+++ b/src/code_fe0b0_len_5a0.c
@@ -2,7 +2,7 @@
 
 INCLUDE_ASM(code_fe0b0_len_5a0, SetSpriteShading);
 
-s32 EnableSpriteShading(script_context* script) {
+s32 EnableSpriteShading(Script* script) {
     if (get_variable(script, *script->ptrReadPos) != 0) {
         *D_80151328 |= 1;
     } else {
@@ -11,27 +11,27 @@ s32 EnableSpriteShading(script_context* script) {
     return 2;
 }
 
-s32 getDemoState(script_context* script) {
+s32 getDemoState(Script* script) {
     set_variable(script, *script->ptrReadPos, (*gGameStatusPtr)->demoState);
     return 2;
 }
 
-s32 DemoPressButton(script_context* script) {
+s32 DemoPressButton(Script* script) {
     (*gGameStatusPtr)->demoButtonInput |= get_variable(script, *script->ptrReadPos);
     return 2;
 }
 
-s32 DemoReleaseButton(script_context* script) {
+s32 DemoReleaseButton(Script* script) {
     (*gGameStatusPtr)->demoButtonInput &= ~get_variable(script, *script->ptrReadPos);
     return 2;
 }
 
-s32 DemoSetButtons(script_context* script) {
+s32 DemoSetButtons(Script* script) {
     (*gGameStatusPtr)->demoButtonInput = get_variable(script, *script->ptrReadPos);
     return 2;
 }
 
-s32 DemoJoystickRadial(script_context* script) {
+s32 DemoJoystickRadial(Script* script) {
     f32 a;
     f32 b;
     s32* thisPos = script->ptrReadPos;
@@ -45,7 +45,7 @@ s32 DemoJoystickRadial(script_context* script) {
     return 2;
 }
 
-s32 DemoJoystickXY(script_context* script) {
+s32 DemoJoystickXY(Script* script) {
     f32 x;
     f32 y;
     s32* thisPos = script->ptrReadPos;