From 7597ee4ea8610b514eb092b34eca9d379f11a428 Mon Sep 17 00:00:00 2001
From: coco875 <59367621+coco875@users.noreply.github.com>
Date: Mon, 25 Dec 2023 16:57:38 +0100
Subject: [PATCH] add bss variable to camera.c (#514)

* add bss variable to camera.c

* Rename bss_8001C4D0.s to bss_80164AB0.s
---
 asm/{bss_8001C4D0.s => bss_80164AB0.s} | 50 -----------------------
 include/variables.h                    |  1 -
 mk64.ld                                |  3 +-
 src/camera.c                           | 38 ++++++++++--------
 src/camera.h                           |  1 +
 src/player_controller.c                |  2 +-
 src/render_player.c                    | 16 ++++----
 src/render_player.h                    |  1 -
 tools/doxygen_syms.md                  | 55 +++-----------------------
 9 files changed, 38 insertions(+), 129 deletions(-)
 rename asm/{bss_8001C4D0.s => bss_80164AB0.s} (97%)

diff --git a/asm/bss_8001C4D0.s b/asm/bss_80164AB0.s
similarity index 97%
rename from asm/bss_8001C4D0.s
rename to asm/bss_80164AB0.s
index 274af5734..d359be30c 100644
--- a/asm/bss_8001C4D0.s
+++ b/asm/bss_80164AB0.s
@@ -2,56 +2,6 @@
 
 .section .bss
 
-.skip 8 #padding
-
-glabel D_801649D8
-.skip 16
-
-glabel D_801649E8
-.skip 16
-
-glabel D_801649F8
-.skip 16
-
-glabel D_80164A08
-.skip 16
-
-glabel D_80164A18
-.skip 16
-
-glabel D_80164A28
-.skip 4
-
-glabel D_80164A2C
-.skip 4
-
-glabel D_80164A30
-.skip 8
-
-glabel D_80164A38
-.skip 16
-
-glabel D_80164A48
-.skip 48
-
-glabel D_80164A78
-.skip 16
-
-glabel D_80164A88
-.skip 1
-
-glabel D_80164A89
-.skip 7
-
-glabel D_80164A90
-.skip 16
-
-glabel D_80164AA0
-.skip 14
-
-glabel D_80164AAE
-.skip 2
-
 glabel D_80164AB0
 .skip 14
 
diff --git a/include/variables.h b/include/variables.h
index 9e3e8c251..180f0bbfd 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -24,7 +24,6 @@ extern struct_D_8018CE10 D_8018CE10[];
 extern Vec3f D_80165070[];
 
 extern f32  D_80164510[];
-extern s32  D_80164A28;
 extern s16  gMatrixEffectCount;
 
 extern s16  D_80165020[];
diff --git a/mk64.ld b/mk64.ld
index fa0cf21b3..f39e046d5 100644
--- a/mk64.ld
+++ b/mk64.ld
@@ -310,7 +310,8 @@ SECTIONS
       BUILD_DIR/asm/bss_80005FD0.o(.bss);
       BUILD_DIR/asm/bss_MainSeg.o(.bss);
       BUILD_DIR/src/camera.o(.bss);
-      BUILD_DIR/asm/bss_8001C4D0.o(.bss);
+      BUILD_DIR/src/render_player.o(.bss);
+      BUILD_DIR/asm/bss_80164AB0.o(.bss);
       BUILD_DIR/src/code_80091750.jp.o(.bss);
       BUILD_DIR/src/code_800AF9B0.o(.bss);
       BUILD_DIR/src/menus.o(.bss);
diff --git a/src/camera.c b/src/camera.c
index d69b8926d..b194de0f9 100644
--- a/src/camera.c
+++ b/src/camera.c
@@ -18,31 +18,35 @@
 
 f32 D_800DDB30[] = { 0.4f, 0.6f, 0.275f, 0.3f };
 
-// Future BSS section, replaces unknown amount of stuff in bss_8001C4D0.s
-// f32 D_80164A30;
-// s32 D_80164A2C;
-// f32 D_8016524C; <- could maybe, maybe be part of spawn_players' bss stuff?
-
 Camera cameras[4];
 Camera *camera1 = &cameras[0];
 Camera *camera2 = &cameras[1];
 Camera *camera3 = &cameras[2];
 Camera *camera4 = &cameras[3];
 
+UNUSED s32 D_801649D0[2];
+
+f32 D_801649D8[4];
+f32 D_801649E8[4];
+f32 D_801649F8[4];
+s32 D_80164A08[4];
+s32 D_80164A18[4];
+s32 D_80164A28;
+s32 D_80164A2C;
+f32 D_80164A30;
+UNUSED f32 D_80164A34;
+f32 D_80164A38[4];
+f32 D_80164A48[4];
+UNUSED s32 D_80164A58[8];
+f32 D_80164A78[4];
+s8 D_80164A88;
+s8 D_80164A89;
+// UNUSED s8 D_80164A8C[3];
+f32 D_80164A90[4];
+f32 D_80164AA0[4];
+
 extern f32 D_80164498[];
 extern s16 D_80164678[];
-extern f32 D_801649D8[]; // f32[4]
-extern f32 D_801649E8[]; // f32[4]
-extern f32 D_801649F8[]; // f32[4]
-extern s32 D_80164A08[];
-extern s32 D_80164A18[];
-extern s32 D_80164A2C;
-extern f32 D_80164A30;
-extern f32 D_80164A38[4];
-extern f32 D_80164A48[4];
-extern f32 D_80164A78[];
-extern s8 D_80164A88;
-extern s8 D_80164A89;
 
 void camera_init(f32 posX, f32 posY, f32 posZ, UNUSED s16 rot, u32 arg4, s32 cameraId) {
     Player *player = gPlayerOne;
diff --git a/src/camera.h b/src/camera.h
index c9ae4fcbc..7a2452dc7 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -86,6 +86,7 @@ extern s8 D_80164A89;
 
 extern s32 D_80164A08[4];
 
+extern s32 D_80164A28;
 extern s32 D_80164A2C;
 extern f32 D_80164A30;
 extern f32 D_80164A90[];
diff --git a/src/player_controller.c b/src/player_controller.c
index a0985f118..7308f3b25 100644
--- a/src/player_controller.c
+++ b/src/player_controller.c
@@ -16,8 +16,8 @@
 #include "audio/external.h"
 #include "code_8003DC40.h"
 #include "main.h"
+#include "camera.h"
 
-extern s8 D_80164A89;
 extern s16 D_801633F8;
 extern s32 D_8018D168;
 
diff --git a/src/render_player.c b/src/render_player.c
index a07eeec6b..d07d914aa 100644
--- a/src/render_player.c
+++ b/src/render_player.c
@@ -243,8 +243,8 @@ void func_80020524(void) {
             osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
     }
 
-    mio0decode(D_802DFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]]][D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]].unk_00,
-               D_802BFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]]][D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]].pixel_index_array);
+    mio0decode(D_802DFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]].unk_00,
+               D_802BFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]].pixel_index_array);
 }
 
 void func_8002088C(void) {
@@ -268,8 +268,8 @@ void func_8002088C(void) {
                    D_802BFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]].pixel_index_array);
         osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
     }
-    mio0decode(D_802DFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]]][D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]].unk_00,
-               D_802BFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]]][D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]].pixel_index_array);
+    mio0decode(D_802DFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]].unk_00,
+               D_802BFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]].pixel_index_array);
 }
 
 void func_80020BF4(void) {
@@ -287,8 +287,8 @@ void func_80020BF4(void) {
                    D_802BFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1] - 2][D_80164AB0[var_s0 - 1] + 4].pixel_index_array);
         osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
     }
-    mio0decode(D_802DFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]]][D_80164ABE[gPlayersToRenderCount] - 2][D_80164AAE[gPlayersToRenderCount] + 4].unk_00,
-               D_802BFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]]][D_80164ABE[gPlayersToRenderCount] - 2][D_80164AAE[gPlayersToRenderCount] + 4].pixel_index_array);
+    mio0decode(D_802DFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164ABE[gPlayersToRenderCount] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].unk_00,
+               D_802BFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164ABE[gPlayersToRenderCount] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].pixel_index_array);
 }
 
 void func_80020F1C(void) {
@@ -306,8 +306,8 @@ void func_80020F1C(void) {
                    D_802BFB80[D_801651D0[D_80164AC0[var_s0 - 1]][D_80164AB0[var_s0 - 1]]][D_80164AC0[var_s0 - 1] - 2][D_80164AB0[var_s0 - 1] + 4].pixel_index_array);
         osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
     }
-    mio0decode(D_802DFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]]][D_80164ABE[gPlayersToRenderCount] - 2][D_80164AAE[gPlayersToRenderCount] + 4].unk_00,
-               D_802BFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AAE[gPlayersToRenderCount]]][D_80164ABE[gPlayersToRenderCount] - 2][D_80164AAE[gPlayersToRenderCount] + 4].pixel_index_array);
+    mio0decode(D_802DFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164ABE[gPlayersToRenderCount] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].unk_00,
+               D_802BFB80[D_801651D0[D_80164ABE[gPlayersToRenderCount]][D_80164AB0[gPlayersToRenderCount-1]]][D_80164ABE[gPlayersToRenderCount] - 2][D_80164AB0[gPlayersToRenderCount-1] + 4].pixel_index_array);
 }
 
 void try_render_player(Player *player, s8 playerId, s8 arg2) {
diff --git a/src/render_player.h b/src/render_player.h
index a83dc4d47..5a7ad0f30 100644
--- a/src/render_player.h
+++ b/src/render_player.h
@@ -72,7 +72,6 @@ extern u8 *D_80164B08;
 extern u8 *D_80164B0C;
 
 extern s32 D_80164A28;
-extern s16 D_80164AAE[];
 extern s16 D_80164AB0[];
 extern s16 D_80164ABE[];
 extern s16 D_80164AC0[];
diff --git a/tools/doxygen_syms.md b/tools/doxygen_syms.md
index 5bf1c244a..1270ddb66 100644
--- a/tools/doxygen_syms.md
+++ b/tools/doxygen_syms.md
@@ -3453,7 +3453,6 @@ Variable Name | Memory Address
 [D_800E7AC8](@ref D_800E7AC8) | 0x800E7AC8
 [D_800E7AE8](@ref D_800E7AE8) | 0x800E7AE8
 [D_800E7AF8](@ref D_800E7AF8) | 0x800E7AF8
-[D_800E7CA8](@ref D_800E7CA8) | 0x800E7CA8
 [D_800E7D0C](@ref D_800E7D0C) | 0x800E7D0C
 [D_800E7D34](@ref D_800E7D34) | 0x800E7D34
 [D_800E7D4C](@ref D_800E7D4C) | 0x800E7D4C
@@ -3478,6 +3477,7 @@ Variable Name | Memory Address
 [D_800E8294](@ref D_800E8294) | 0x800E8294
 [D_800E82B4](@ref D_800E82B4) | 0x800E82B4
 [D_800E82C8](@ref D_800E82C8) | 0x800E82C8
+[D_800E82F4](@ref D_800E82F4) | 0x800E82F4
 [D_800E8320](@ref D_800E8320) | 0x800E8320
 [D_800E8340](@ref D_800E8340) | 0x800E8340
 [D_800E8360](@ref D_800E8360) | 0x800E8360
@@ -3807,7 +3807,6 @@ Variable Name | Memory Address
 [D_800ECFFC](@ref D_800ECFFC) | 0x800ECFFC
 [D_800ED000](@ref D_800ED000) | 0x800ED000
 [D_800ED004](@ref D_800ED004) | 0x800ED004
-[jpt_800ED008](@ref jpt_800ED008) | 0x800ED008
 [D_800ED01C](@ref D_800ED01C) | 0x800ED01C
 [D_800ED020](@ref D_800ED020) | 0x800ED020
 [D_800ED024](@ref D_800ED024) | 0x800ED024
@@ -3816,10 +3815,8 @@ Variable Name | Memory Address
 [D_800ED034](@ref D_800ED034) | 0x800ED034
 [D_800ED038](@ref D_800ED038) | 0x800ED038
 [D_800ED03C](@ref D_800ED03C) | 0x800ED03C
-[jpt_800ED080](@ref jpt_800ED080) | 0x800ED080
 [D_800ED0AC](@ref D_800ED0AC) | 0x800ED0AC
 [D_800ED0B0](@ref D_800ED0B0) | 0x800ED0B0
-[jpt_800ED0B4](@ref jpt_800ED0B4) | 0x800ED0B4
 [D_800ED1B0](@ref D_800ED1B0) | 0x800ED1B0
 [D_800ED230](@ref D_800ED230) | 0x800ED230
 [D_800ED238](@ref D_800ED238) | 0x800ED238
@@ -3850,15 +3847,7 @@ Variable Name | Memory Address
 [D_800ED2F8](@ref D_800ED2F8) | 0x800ED2F8
 [D_800ED300](@ref D_800ED300) | 0x800ED300
 [D_800ED308](@ref D_800ED308) | 0x800ED308
-[jpt_800ED404](@ref jpt_800ED404) | 0x800ED404
 [D_800ED498](@ref D_800ED498) | 0x800ED498
-[jpt_800ED4A0](@ref jpt_800ED4A0) | 0x800ED4A0
-[jpt_800EE52C](@ref jpt_800EE52C) | 0x800EE52C
-[jpt_800EE864](@ref jpt_800EE864) | 0x800EE864
-[jpt_800EE890](@ref jpt_800EE890) | 0x800EE890
-[jpt_800EE8B4](@ref jpt_800EE8B4) | 0x800EE8B4
-[jpt_800EE8D0](@ref jpt_800EE8D0) | 0x800EE8D0
-[jpt_800EE950](@ref jpt_800EE950) | 0x800EE950
 [D_800EE9A0](@ref D_800EE9A0) | 0x800EE9A0
 [D_800EE9A4](@ref D_800EE9A4) | 0x800EE9A4
 [D_800EE9A8](@ref D_800EE9A8) | 0x800EE9A8
@@ -3882,7 +3871,6 @@ Variable Name | Memory Address
 [D_800EF0B8](@ref D_800EF0B8) | 0x800EF0B8
 [D_800EF0C0](@ref D_800EF0C0) | 0x800EF0C0
 [D_800EF1BC](@ref D_800EF1BC) | 0x800EF1BC
-[jpt_800EF474](@ref jpt_800EF474) | 0x800EF474
 [D_800EF494](@ref D_800EF494) | 0x800EF494
 [gGlyphDisplayWidth](@ref gGlyphDisplayWidth) | 0x800EF690
 [gPerCupIndexByCourseId](@ref gPerCupIndexByCourseId) | 0x800EFD50
@@ -3892,12 +3880,8 @@ Variable Name | Memory Address
 [D_800F0B28](@ref D_800F0B28) | 0x800F0B28
 [D_800F0B50](@ref D_800F0B50) | 0x800F0B50
 [D_800F0B54](@ref D_800F0B54) | 0x800F0B54
-[D_800F0BCC](@ref D_800F0BCC) | 0x800F0BCC
-[D_800F0BEC](@ref D_800F0BEC) | 0x800F0BEC
 [D_800F0C14](@ref D_800F0C14) | 0x800F0C14
 [D_800F0C18](@ref D_800F0C18) | 0x800F0C18
-[D_800F0C4C](@ref D_800F0C4C) | 0x800F0C4C
-[D_800F0C50](@ref D_800F0C50) | 0x800F0C50
 [D_800F0C54](@ref D_800F0C54) | 0x800F0C54
 [D_800F0C58](@ref D_800F0C58) | 0x800F0C58
 [D_800F0C6C](@ref D_800F0C6C) | 0x800F0C6C
@@ -3910,33 +3894,16 @@ Variable Name | Memory Address
 [D_800F0CC0](@ref D_800F0CC0) | 0x800F0CC0
 [D_800F0CC8](@ref D_800F0CC8) | 0x800F0CC8
 [D_800F0CD0](@ref D_800F0CD0) | 0x800F0CD0
-[jpt_800F1060](@ref jpt_800F1060) | 0x800F1060
-[D_800F1074](@ref D_800F1074) | 0x800F1074
-[jpt_800F1078](@ref jpt_800F1078) | 0x800F1078
-[jpt_800F109C](@ref jpt_800F109C) | 0x800F109C
-[jpt_800F1120](@ref jpt_800F1120) | 0x800F1120
-[jpt_800F1134](@ref jpt_800F1134) | 0x800F1134
-[jpt_800F1148](@ref jpt_800F1148) | 0x800F1148
-[jpt_800F1160](@ref jpt_800F1160) | 0x800F1160
-[jpt_800F125C](@ref jpt_800F125C) | 0x800F125C
-[jpt_800F1504](@ref jpt_800F1504) | 0x800F1504
 [D_800F15E0](@ref D_800F15E0) | 0x800F15E0
-[jpt_800F15E4](@ref jpt_800F15E4) | 0x800F15E4
-[jpt_800F16E0](@ref jpt_800F16E0) | 0x800F16E0
-[jpt_800F16F8](@ref jpt_800F16F8) | 0x800F16F8
-[jpt_800F19EC](@ref jpt_800F19EC) | 0x800F19EC
 [D_800F1AC8](@ref D_800F1AC8) | 0x800F1AC8
 [D_800F1ACC](@ref D_800F1ACC) | 0x800F1ACC
-[jpt_800F1AD0](@ref jpt_800F1AD0) | 0x800F1AD0
 [D_800F1AF0](@ref D_800F1AF0) | 0x800F1AF0
 [D_800F1AF4](@ref D_800F1AF4) | 0x800F1AF4
 [D_800F1AF8](@ref D_800F1AF8) | 0x800F1AF8
 [D_800F1AFC](@ref D_800F1AFC) | 0x800F1AFC
-[jpt_800F1B00](@ref jpt_800F1B00) | 0x800F1B00
 [D_800F1B14](@ref D_800F1B14) | 0x800F1B14
 [D_800F1B54](@ref D_800F1B54) | 0x800F1B54
 [D_800F1B58](@ref D_800F1B58) | 0x800F1B58
-[jpt_800F1B5C](@ref jpt_800F1B5C) | 0x800F1B5C
 [D_800F1C28](@ref D_800F1C28) | 0x800F1C28
 [D_800F1C2C](@ref D_800F1C2C) | 0x800F1C2C
 [D_800F1C30](@ref D_800F1C30) | 0x800F1C30
@@ -3945,19 +3912,14 @@ Variable Name | Memory Address
 [D_800F1C3C](@ref D_800F1C3C) | 0x800F1C3C
 [D_800F1C40](@ref D_800F1C40) | 0x800F1C40
 [D_800F1C44](@ref D_800F1C44) | 0x800F1C44
-[jpt_800F1C48](@ref jpt_800F1C48) | 0x800F1C48
 [D_800F1CCC](@ref D_800F1CCC) | 0x800F1CCC
-[jpt_800F1CD0](@ref jpt_800F1CD0) | 0x800F1CD0
 [D_800F1D48](@ref D_800F1D48) | 0x800F1D48
 [D_800F1D4C](@ref D_800F1D4C) | 0x800F1D4C
 [D_800F1D50](@ref D_800F1D50) | 0x800F1D50
 [D_800F1D54](@ref D_800F1D54) | 0x800F1D54
 [D_800F1D58](@ref D_800F1D58) | 0x800F1D58
-[jpt_800F1D5C](@ref jpt_800F1D5C) | 0x800F1D5C
-[D_800F1DC4](@ref D_800F1DC4) | 0x800F1DC4
 [D_800F1DC8](@ref D_800F1DC8) | 0x800F1DC8
 [D_800F1DD8](@ref D_800F1DD8) | 0x800F1DD8
-[jpt_800F1DDC](@ref jpt_800F1DDC) | 0x800F1DDC
 [D_800F1E80](@ref D_800F1E80) | 0x800F1E80
 [D_800F1E84](@ref D_800F1E84) | 0x800F1E84
 [D_800F1E88](@ref D_800F1E88) | 0x800F1E88
@@ -3965,14 +3927,10 @@ Variable Name | Memory Address
 [D_800F1E90](@ref D_800F1E90) | 0x800F1E90
 [D_800F1E94](@ref D_800F1E94) | 0x800F1E94
 [D_800F1E98](@ref D_800F1E98) | 0x800F1E98
-[jpt_800F1E9C](@ref jpt_800F1E9C) | 0x800F1E9C
 [D_800F1F18](@ref D_800F1F18) | 0x800F1F18
 [D_800F1F20](@ref D_800F1F20) | 0x800F1F20
 [D_800F24A0](@ref D_800F24A0) | 0x800F24A0
 [D_800F24A4](@ref D_800F24A4) | 0x800F24A4
-[jpt_800F25E0](@ref jpt_800F25E0) | 0x800F25E0
-[jpt_800F2688](@ref jpt_800F2688) | 0x800F2688
-[jpt_800F2728](@ref jpt_800F2728) | 0x800F2728
 [D_800F2B38](@ref D_800F2B38) | 0x800F2B38
 [D_800F2B40](@ref D_800F2B40) | 0x800F2B40
 [D_800F2B44](@ref D_800F2B44) | 0x800F2B44
@@ -3984,7 +3942,6 @@ Variable Name | Memory Address
 [gCupCourseOrder](@ref gCupCourseOrder) | 0x800F2BB4
 [D_800F2BDC](@ref D_800F2BDC) | 0x800F2BDC
 [D_800F2BE4](@ref D_800F2BE4) | 0x800F2BE4
-[jpt_800F2DFC](@ref jpt_800F2DFC) | 0x800F2DFC
 [D_800F2E60](@ref D_800F2E60) | 0x800F2E60
 [gGameName](@ref gGameName) | 0x800F2E64
 [gExtCode](@ref gExtCode) | 0x800F2E74
@@ -3992,13 +3949,10 @@ Variable Name | Memory Address
 [D_800F2EA4](@ref D_800F2EA4) | 0x800F2EA4
 [D_800F2EA8](@ref D_800F2EA8) | 0x800F2EA8
 [D_800F35C0](@ref D_800F35C0) | 0x800F35C0
-[jpt_800F35EC](@ref jpt_800F35EC) | 0x800F35EC
-[jpt_800F362C](@ref jpt_800F362C) | 0x800F362C
 [D_800F3664](@ref D_800F3664) | 0x800F3664
 [D_800F366C](@ref D_800F366C) | 0x800F366C
 [D_800F3670](@ref D_800F3670) | 0x800F3670
 [D_800F3A00](@ref D_800F3A00) | 0x800F3A00
-[jpt_800F3A20](@ref jpt_800F3A20) | 0x800F3A20
 [length_str](@ref length_str) | 0x800F3B10
 [flags_str](@ref flags_str) | 0x800F3B14
 [flags_arr](@ref flags_arr) | 0x800F3B1C
@@ -4433,6 +4387,7 @@ Variable Name | Memory Address
 [D_801646CC](@ref D_801646CC) | 0x801646CC
 [D_801646D0](@ref D_801646D0) | 0x801646D0
 [cameras](@ref cameras) | 0x801646F0
+[D_801649D0](@ref D_801649D0) | 0x801649D0
 [D_801649D8](@ref D_801649D8) | 0x801649D8
 [D_801649E8](@ref D_801649E8) | 0x801649E8
 [D_801649F8](@ref D_801649F8) | 0x801649F8
@@ -4441,14 +4396,15 @@ Variable Name | Memory Address
 [D_80164A28](@ref D_80164A28) | 0x80164A28
 [D_80164A2C](@ref D_80164A2C) | 0x80164A2C
 [D_80164A30](@ref D_80164A30) | 0x80164A30
+[D_80164A34](@ref D_80164A34) | 0x80164A34
 [D_80164A38](@ref D_80164A38) | 0x80164A38
 [D_80164A48](@ref D_80164A48) | 0x80164A48
+[D_80164A58](@ref D_80164A58) | 0x80164A58
 [D_80164A78](@ref D_80164A78) | 0x80164A78
 [D_80164A88](@ref D_80164A88) | 0x80164A88
 [D_80164A89](@ref D_80164A89) | 0x80164A89
 [D_80164A90](@ref D_80164A90) | 0x80164A90
 [D_80164AA0](@ref D_80164AA0) | 0x80164AA0
-[D_80164AAE](@ref D_80164AAE) | 0x80164AAE
 [D_80164AB0](@ref D_80164AB0) | 0x80164AB0
 [D_80164ABE](@ref D_80164ABE) | 0x80164ABE
 [D_80164AC0](@ref D_80164AC0) | 0x80164AC0
@@ -4675,7 +4631,7 @@ Variable Name | Memory Address
 [D_8018C830](@ref D_8018C830) | 0x8018C830
 [D_8018C870](@ref D_8018C870) | 0x8018C870
 [D_8018C970](@ref D_8018C970) | 0x8018C970
-[playerHUD](@ref playerHUD) | 0xplayerHUD
+[playerHUD](@ref playerHUD) | 0x8018CA70
 [D_8018CA74](@ref D_8018CA74) | 0x8018CA74
 [D_8018CA78](@ref D_8018CA78) | 0x8018CA78
 [D_8018CA90](@ref D_8018CA90) | 0x8018CA90
@@ -4972,7 +4928,6 @@ Variable Name | Memory Address
 [gCycleFlashMenu](@ref gCycleFlashMenu) | 0x8018E7A8
 [D_8018E7AC](@ref D_8018E7AC) | 0x8018E7AC
 [D_8018E7B0](@ref D_8018E7B0) | 0x8018E7B0
-[D_8018E7B1](@ref D_8018E7B1) | 0x8018E7B1
 [D_8018E7B8](@ref D_8018E7B8) | 0x8018E7B8
 [D_8018E7C8](@ref D_8018E7C8) | 0x8018E7C8
 [D_8018E7D0](@ref D_8018E7D0) | 0x8018E7D0