Snibblets, Tidbits, and Morsels (#188)

* fixing segment

* redoing subtree

* git subrepo clone https://github.com/ethteck/splat.git tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "99cf514297"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "99cf514297"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* fix symbol_addrs

* sweet victory

* reformat collision_main_lateral.s

* Lots of matches, fixed diff.py issue, improved coverage.py

* some more

* update symbol_addrs

* git subrepo pull tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "c46026725a"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "c46026725a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* update symbol_addrs

* fix disasm

* 2 mo

* Jenkinsfile

* PR comments

.github/workflows/coverage.yaml

@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: ./coverage.py --fail-matched-undeleted --fail-unincluded --skip-sizes
+      - run: ./coverage.py --fail-undeleted

Jenkinsfile

@@ -13,7 +13,7 @@ pipeline {
     stages {
         stage('Setup') {
             steps {
-                sh './configure.py --baserom /usr/local/etc/roms/baserom_pm.z64'
+                sh './configure.py --baserom /usr/local/etc/roms/papermario.us.z64'
             }
         }
         stage('Build') {

asm/data/code_9DA58.data.s

@@ -0,0 +1,6 @@
+.include "macro.inc"
+
+.section .data
+
+glabel D_801045A8
+.word 0xDF000000, 0x00000000

asm/data/code_A5100.rodata.s

@@ -0,0 +1,144 @@
+.include "macro.inc"
+
+.section .rodata
+
+glabel D_8010BC50
+.double 0.1, 0.0
+
+glabel jtbl_8010BC60
+.word L800E08F8_79DA8, L800E08F8_79DA8, L800E08F8_79DA8, L800E08F8_79DA8, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E08F8_79DA8, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E09C0_79E70, L800E08F8_79DA8, L800E08F8_79DA8, 0, 0, 0
+
+glabel D_8010BD30
+.double 180.0
+
+glabel jtbl_8010BD38
+.word L800E25A4_7BA54, L800E25A4_7BA54, L800E2594_7BA44, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2594_7BA44, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2630_7BAE0, L800E2620_7BAD0, 0
+
+glabel D_8010BD80
+.double -0.47
+
+glabel D_8010BD88
+.double 0.001
+
+glabel D_8010BD90
+.double -1.2
+
+glabel jtbl_8010BD98
+.word L800E2D8C_7C23C, L800E2DFC_7C2AC, L800E2D6C_7C21C, L800E2D7C_7C22C, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2E68_7C318, L800E2F4C_7C3FC, L800E2E68_7C318, L800E2F4C_7C3FC
+
+glabel jtbl_8010BDE8
+.word L800E2FD0_7C480, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2F98_7C448, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2FD0_7C480, L800E2FD0_7C480, L800E2FD0_7C480, L800E2FD0_7C480, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E3064_7C514, L800E2FD0_7C480, L800E3064_7C514, L800E2FD0_7C480, 0
+
+glabel jtbl_8010BE40
+.word L800E31B0_7C660, L800E3200_7C6B0, L800E31C0_7C670, L800E31B0_7C660, L800E31B0_7C660, 0
+
+glabel jtbl_8010BE58
+.word L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790, L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3824_7CCD4, L800E42E0_7D790, L800E3824_7CCD4, L800E42E0_7D790, L800E3940_7CDF0, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E42E0_7D790, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3750_7CC00, L800E36FC_7CBAC, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E3B18_7CFC8, L800E42E0_7D790
+
+glabel D_8010BED8
+.double 35.0
+
+glabel D_8010BEE0
+.double 180.0
+
+glabel D_8010BEE8
+.double 180.0
+
+glabel D_8010BEF0
+.double 90.0
+
+glabel D_8010BEF8
+.double 180.0
+
+glabel jtbl_8010BF00
+.word L800E583C_7ECEC, L800E55A8_7EA58, L800E568C_7EB3C, L800E55F0_7EAA0, L800E5604_7EAB4, L800E56E8_7EB98, L800E5840_7ECF0, L800E5618_7EAC8, L800E5654_7EB04, L800E5840_7ECF0, L800E574C_7EBFC, L800E57B0_7EC60
+
+glabel jtbl_8010BF30
+.word L800E6DD8_80288, L800E6F14_803C4, L800E6FC8_80478, L800E7044_804F4, L800E7090_80540, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E726C_8071C, L800E7208_806B8, 0
+
+glabel D_8010BF60
+.word 0x800E9DEC, 0x800EA07C, 0x800E9DF4, 0x800E9DFC, 0x800E9E04, 0x800E9E0C, 0x800E9E14, 0x800E9E34, 0x800E9E3C, 0x800E9E44, 0x800E9E4C, 0x800E9E54, 0x800E9E5C, 0x800E9E64, 0x800E9E6C, 0x800E9E74, 0x800E9F38, 0x800E9F40, 0x800E9F48, 0x800E9F50, 0x800E9F58, 0x800E9F60, 0x800E9F68, 0x800E9F70, 0x800E9F78, 0x800E9F80, 0x800EA008, 0x800E9F88, 0x800E9F90, 0x800E9F98, 0x800E9FA0, 0x800E9FA8, 0x800E9FB0, 0x800E9FB8, 0x800E9FC0, 0x800E9FC8, 0x800E9FD0, 0x800E9FD8, 0x800E9FE0, 0x800E9FE8, 0x800E9FF0, 0x800E9FF8, 0x800EA000, 0x800EA010, 0x800EA018, 0x800EA020, 0x800EA028, 0x800EA030, 0x800EA038, 0x800EA040, 0x800EA048, 0x800EA050, 0x800EA058, 0x800EA060, 0x800EA068, 0x800EA070
+
+glabel D_8010C040
+.word 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA500, 0x800EA500, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8, 0x800EA4F8
+
+glabel jtbl_8010C118
+.word L800EB14C_845FC, L800EB124_845D4, L800EAA48_83EF8, L800EA83C_83CEC, L800EAB90_84040, L800EAC30_840E0, L800EAC7C_8412C, L800EADC0_84270, L800EAEF4_843A4, L800EAFD0_84480, L800EB0E0_84590, 0
+
+glabel jtbl_8010C148
+.word L800EBD18_851C8, L800EC148_855F8, L800EC45C_8590C, L800ED2E4_86794, L800ED2E4_86794, L800EC6FC_85BAC, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ECCC0_86170, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED0B0_86560, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED0C4_86574, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, L800ED2E4_86794, 0
+
+glabel jtbl_8010C218
+.word L800EDA5C_86F0C, L800EDDEC_8729C, L800EE078_87528, L800EDDEC_8729C, L800EE968_87E18, L800EE18C_8763C, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE56C_87A1C, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE930_87DE0, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE944_87DF4, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, L800EE968_87E18, 0
+
+glabel jtbl_8010C2E8
+.word L800EFDFC_892AC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFE0C_892BC, L800EFDBC_8926C, L800EFDCC_8927C, L800EFDDC_8928C, L800EFDEC_8929C, 0
+
+glabel D_8010C310
+.double 0.1
+
+glabel D_8010C318
+.double 0.92
+
+glabel D_8010C320
+.double 0.04, 0.0
+
+glabel jtbl_8010C330
+.word L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F13F8_8A8A8, L800F1414_8A8C4, L800F1414_8A8C4, L800F13F8_8A8A8, L800F1414_8A8C4
+
+glabel jtbl_8010C368
+.word L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F145C_8A90C, L800F1470_8A920, L800F1470_8A920, L800F145C_8A90C, L800F1470_8A920
+
+glabel jtbl_8010C3A0
+.word L800F1718_8ABC8, L800F1734_8ABE4, L800F1718_8ABC8, L800F1718_8ABC8, L800F1734_8ABE4, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1718_8ABC8, L800F1768_8AC18, L800F1768_8AC18, L800F1718_8ABC8, L800F1768_8AC18
+
+glabel jtbl_8010C3D8
+.word L800F17C0_8AC70, L800F17D4_8AC84, L800F17C0_8AC70, L800F17C0_8AC70, L800F17D4_8AC84, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17C0_8AC70, L800F17E8_8AC98, L800F17E8_8AC98, L800F17C0_8AC70, L800F17E8_8AC98
+
+glabel jtbl_8010C410
+.word L800F2F5C_8C40C, L800F2F44_8C3F4, L800F2F5C_8C40C, L800F2F18_8C3C8, L800F2E84_8C334, L800F2E64_8C314, L800F2CC0_8C170, L800F1A54_8AF04, L800F2860_8BD10, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F2F74_8C424, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F2FB8_8C468, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3010_8C4C0, L800F3034_8C4E4, L800F30EC_8C59C, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3654_8CB04, L800F3184_8C634, L800F341C_8C8CC, L800F345C_8C90C, L800F3464_8C914, 0
+
+glabel jtbl_8010C5D0
+.word L800F1E3C_8B2EC, L800F1EFC_8B3AC, L800F1E3C_8B2EC, L800F1F54_8B404, L800F1FF4_8B4A4, L800F204C_8B4FC, L800F1E3C_8B2EC, L800F1E3C_8B2EC, L800F20EC_8B59C, L800F218C_8B63C, L800F222C_8B6DC, L800F22CC_8B77C, L800F1E3C_8B2EC, L800F236C_8B81C
+
+glabel jtbl_8010C608
+.word L800F264C_8BAFC, L800F2658_8BB08, L800F2658_8BB08, L800F2668_8BB18, L800F2678_8BB28, L800F2698_8BB48, L800F264C_8BAFC, L800F264C_8BAFC, L800F2688_8BB38, L800F264C_8BAFC, L800F2668_8BB18, L800F2668_8BB18, L800F264C_8BAFC, L800F2658_8BB08
+
+glabel jtbl_8010C640
+.word L800F2708_8BBB8, L800F271C_8BBCC, L800F2708_8BBB8, L800F2708_8BBB8, L800F271C_8BBCC, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2708_8BBB8, L800F2730_8BBE0, L800F2730_8BBE0, L800F2708_8BBB8, L800F2730_8BBE0
+
+glabel jtbl_8010C678
+.word L800F2764_8BC14, L800F2780_8BC30, L800F2764_8BC14, L800F2764_8BC14, L800F2780_8BC30, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F2764_8BC14, L800F27B4_8BC64, L800F27B4_8BC64, L800F2764_8BC14, L800F27B4_8BC64
+
+glabel jtbl_8010C6B0
+.word L800F2BBC_8C06C, L800F2BD4_8C084, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BD4_8C084, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BBC_8C06C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BEC_8C09C, L800F2BBC_8C06C, L800F2BEC_8C09C
+
+glabel jtbl_8010C6E8
+.word L800F2EB0_8C360, L800F2EC4_8C374, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EC4_8C374, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2EB0_8C360, L800F2ED8_8C388, L800F2ED8_8C388, L800F2EB0_8C360, L800F2ED8_8C388
+
+glabel jtbl_8010C720
+.word L800F3328_8C7D8, L800F333C_8C7EC, L800F3328_8C7D8, L800F3328_8C7D8, L800F333C_8C7EC, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3328_8C7D8, L800F3350_8C800, L800F3350_8C800, L800F3328_8C7D8, L800F3350_8C800
+
+glabel jtbl_8010C758
+.word L800F3608_8CAB8, L800F361C_8CACC, L800F3608_8CAB8, L800F3608_8CAB8, L800F361C_8CACC, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3608_8CAB8, L800F3630_8CAE0, L800F3630_8CAE0, L800F3608_8CAB8, L800F3630_8CAE0
+
+glabel jtbl_8010C790
+.word L800F3878_8CD28, L800F38C8_8CD78, L800F3918_8CDC8, L800F3878_8CD28, L800F38C8_8CD78, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28, L800F3878_8CD28
+
+glabel jtbl_8010C7C8
+.word L800F3C8C_8D13C, L800F3CC0_8D170, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3CC0_8D170, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3C8C_8D13C, L800F3CF4_8D1A4, L800F3C8C_8D13C, L800F3D38_8D1E8, L800F3D94_8D244, L800F3C8C_8D13C, L800F3C8C_8D13C
+
+glabel jtbl_8010C800
+.word L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F4000_8D4B0, L800F40E8_8D598, L800F41D0_8D680, L800F4000_8D4B0, L800F4000_8D4B0
+
+glabel jtbl_8010C838
+.word L800F4398_8D848, L800F43E8_8D898, L800F4398_8D848, L800F4398_8D848, L800F43E8_8D898, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848, L800F4398_8D848
+
+glabel jtbl_8010C870
+.word L800F44EC_8D99C, L800F44F4_8D9A4, L800F453C_8D9EC, L800F44F4_8D9A4, L800F4500_8D9B0, L800F4508_8D9B8, L800F4514_8D9C4, L800F4514_8D9C4, L800F4514_8D9C4, L800F4528_8D9D8, L800F4530_8D9E0, L800F451C_8D9CC, L800F453C_8D9EC, 0
+
+glabel jtbl_8010C8A8
+.word L800F4694_8DB44, L800F48A4_8DD54, L800F4694_8DB44, L800F47E4_8DC94, L800F48A4_8DD54, L800F4694_8DB44, L800F4694_8DB44, L800F4694_8DB44, L800F4804_8DCB4, L800F4824_8DCD4, L800F4844_8DCF4, L800F4864_8DD14, L800F4884_8DD34, L800F48A4_8DD54
+
+glabel jtbl_8010C8E0
+.word L800F4994_8DE44, L800F49B0_8DE60, L800F49E4_8DE94, L800F4A18_8DEC8, L800F4A4C_8DEFC, L800F4A80_8DF30, L800F4AA0_8DF50, L800F4ABC_8DF6C, L800F4B0C_8DFBC, L800F4B40_8DFF0, L800F4B5C_8E00C, L800F4B90_8E040, L800F4BC4_8E074, L800F4AD8_8DF88, 0, 0

asm/nonmatchings/battle/item/dizzy_dial_727910/func_802A1270_727B80.s

@@ -6,8 +6,8 @@ glabel func_802A1270_727B80
 /* 727B84 802A1274 AFB00018 */  sw        $s0, 0x18($sp)
 /* 727B88 802A1278 0080802D */  daddu     $s0, $a0, $zero
 /* 727B8C 802A127C AFB1001C */  sw        $s1, 0x1c($sp)
-/* 727B90 802A1280 3C11800B */  lui       $s1, %hi(D_800B22D8)
+/* 727B90 802A1280 3C11800B */  lui       $s1, %hi(gCameras+0x558)
-/* 727B94 802A1284 263122D8 */  addiu     $s1, $s1, %lo(D_800B22D8)
+/* 727B94 802A1284 263122D8 */  addiu     $s1, $s1, %lo(gCameras+0x558)
 /* 727B98 802A1288 10A00002 */  beqz      $a1, .L802A1294
 /* 727B9C 802A128C AFBF0020 */   sw       $ra, 0x20($sp)
 /* 727BA0 802A1290 AE000070 */  sw        $zero, 0x70($s0)

asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238BCC_6F1CAC.s

@@ -121,9 +121,9 @@ glabel func_80238BCC_6F1CAC
 /* 6F1E6C 80238D8C AE020090 */  sw        $v0, 0x90($s0)
 /* 6F1E70 80238D90 90820136 */  lbu       $v0, 0x136($a0)
 /* 6F1E74 80238D94 00021080 */  sll       $v0, $v0, 2
-/* 6F1E78 80238D98 3C038028 */  lui       $v1, %hi(bActorCamOffsets)
+/* 6F1E78 80238D98 3C038028 */  lui       $v1, %hi(bActorOffsets)
 /* 6F1E7C 80238D9C 00621821 */  addu      $v1, $v1, $v0
-/* 6F1E80 80238DA0 80632EE8 */  lb        $v1, %lo(bActorCamOffsets)($v1)
+/* 6F1E80 80238DA0 80632EE8 */  lb        $v1, %lo(bActorOffsets)($v1)
 /* 6F1E84 80238DA4 8E020084 */  lw        $v0, 0x84($s0)
 /* 6F1E88 80238DA8 00431021 */  addu      $v0, $v0, $v1
 /* 6F1E8C 80238DAC AE020084 */  sw        $v0, 0x84($s0)

asm/nonmatchings/code_107830_len_e70/func_802E6574.s

@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_802E6574
-/* 107DF4 802E6574 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 107DF4 802E6574 3C01800B */  lui       $at, %hi(gCameras+0x6C)
-/* 107DF8 802E6578 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 107DF8 802E6578 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 107DFC 802E657C 3C014234 */  lui       $at, 0x4234
 /* 107E00 802E6580 44816000 */  mtc1      $at, $f12
 /* 107E04 802E6584 27BDFFC8 */  addiu     $sp, $sp, -0x38

asm/nonmatchings/code_16c8e0/initialize_battle.s

@@ -7,8 +7,8 @@ glabel initialize_battle
 /* 16CA18 8023E138 3C138011 */  lui       $s3, %hi(gPlayerData)
 /* 16CA1C 8023E13C 2673F290 */  addiu     $s3, $s3, %lo(gPlayerData)
 /* 16CA20 8023E140 AFB40020 */  sw        $s4, 0x20($sp)
-/* 16CA24 8023E144 3C14800B */  lui       $s4, %hi(D_800B2830)
+/* 16CA24 8023E144 3C14800B */  lui       $s4, %hi(gCameras+0xAB0)
-/* 16CA28 8023E148 26942830 */  addiu     $s4, $s4, %lo(D_800B2830)
+/* 16CA28 8023E148 26942830 */  addiu     $s4, $s4, %lo(gCameras+0xAB0)
 /* 16CA2C 8023E14C AFB10014 */  sw        $s1, 0x14($sp)
 /* 16CA30 8023E150 2411000F */  addiu     $s1, $zero, 0xf
 /* 16CA34 8023E154 3C06800E */  lui       $a2, %hi(gBattleStatus)

asm/nonmatchings/code_1776B0/func_80248DE4.s

@@ -6,8 +6,8 @@ glabel func_80248DE4
 /* 1776C8 80248DE8 AFB1003C */  sw        $s1, 0x3c($sp)
 /* 1776CC 80248DEC 00A0882D */  daddu     $s1, $a1, $zero
 /* 1776D0 80248DF0 AFB00038 */  sw        $s0, 0x38($sp)
-/* 1776D4 80248DF4 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 1776D4 80248DF4 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 1776D8 80248DF8 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 1776D8 80248DF8 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 1776DC 80248DFC 3C02802A */  lui       $v0, %hi(D_8029F27C)
 /* 1776E0 80248E00 9442F27C */  lhu       $v0, %lo(D_8029F27C)($v0)
 /* 1776E4 80248E04 3C04800E */  lui       $a0, %hi(gBattleStatus)

asm/nonmatchings/code_1776B0/func_80249804.s

@@ -6,8 +6,8 @@ glabel func_80249804
 /* 1780E8 80249808 AFB1003C */  sw        $s1, 0x3c($sp)
 /* 1780EC 8024980C 00A0882D */  daddu     $s1, $a1, $zero
 /* 1780F0 80249810 AFB00038 */  sw        $s0, 0x38($sp)
-/* 1780F4 80249814 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 1780F4 80249814 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 1780F8 80249818 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 1780F8 80249818 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 1780FC 8024981C 3C02802A */  lui       $v0, %hi(D_8029F27C)
 /* 178100 80249820 9442F27C */  lhu       $v0, %lo(D_8029F27C)($v0)
 /* 178104 80249824 3C04800E */  lui       $a0, %hi(gBattleStatus)

asm/nonmatchings/code_1776B0/func_8024A214.s

@@ -6,8 +6,8 @@ glabel func_8024A214
 /* 178AF8 8024A218 AFB20028 */  sw        $s2, 0x28($sp)
 /* 178AFC 8024A21C 00A0902D */  daddu     $s2, $a1, $zero
 /* 178B00 8024A220 AFB10024 */  sw        $s1, 0x24($sp)
-/* 178B04 8024A224 3C11800B */  lui       $s1, %hi(D_800B22D8)
+/* 178B04 8024A224 3C11800B */  lui       $s1, %hi(gCameras+0x558)
-/* 178B08 8024A228 263122D8 */  addiu     $s1, $s1, %lo(D_800B22D8)
+/* 178B08 8024A228 263122D8 */  addiu     $s1, $s1, %lo(gCameras+0x558)
 /* 178B0C 8024A22C 3C02802A */  lui       $v0, %hi(D_8029F27C)
 /* 178B10 8024A230 9442F27C */  lhu       $v0, %lo(D_8029F27C)($v0)
 /* 178B14 8024A234 3C04800E */  lui       $a0, %hi(gBattleStatus)

asm/nonmatchings/code_1776B0/func_8024A990.s

@@ -4,8 +4,8 @@
 glabel func_8024A990
 /* 179270 8024A990 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 179274 8024A994 AFB00020 */  sw        $s0, 0x20($sp)
-/* 179278 8024A998 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 179278 8024A998 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 17927C 8024A99C 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 17927C 8024A99C 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 179280 8024A9A0 3C02802A */  lui       $v0, %hi(D_8029F27C)
 /* 179284 8024A9A4 9442F27C */  lhu       $v0, %lo(D_8029F27C)($v0)
 /* 179288 8024A9A8 3C04800E */  lui       $a0, %hi(gBattleStatus)

asm/nonmatchings/code_1776B0/func_8024AFE4.s

@@ -4,8 +4,8 @@
 glabel func_8024AFE4
 /* 1798C4 8024AFE4 27BDFFA8 */  addiu     $sp, $sp, -0x58
 /* 1798C8 8024AFE8 AFB00020 */  sw        $s0, 0x20($sp)
-/* 1798CC 8024AFEC 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 1798CC 8024AFEC 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 1798D0 8024AFF0 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 1798D0 8024AFF0 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 1798D4 8024AFF4 3C02802A */  lui       $v0, %hi(D_8029F27C)
 /* 1798D8 8024AFF8 9442F27C */  lhu       $v0, %lo(D_8029F27C)($v0)
 /* 1798DC 8024AFFC 3C04800E */  lui       $a0, %hi(gBattleStatus)

asm/nonmatchings/code_1776B0/func_8024B5FC.s

@@ -13,8 +13,8 @@ glabel func_8024B5FC
 /* 179EFC 8024B61C 3C01802A */  lui       $at, %hi(D_8029F278)
 /* 179F00 8024B620 C43EF278 */  lwc1      $f30, %lo(D_8029F278)($at)
 /* 179F04 8024B624 AFB00018 */  sw        $s0, 0x18($sp)
-/* 179F08 8024B628 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 179F08 8024B628 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 179F0C 8024B62C 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 179F0C 8024B62C 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 179F10 8024B630 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 179F14 8024B634 F7B80030 */  sdc1      $f24, 0x30($sp)
 /* 179F18 8024B638 F7B60028 */  sdc1      $f22, 0x28($sp)

asm/nonmatchings/code_1776B0/func_8024B9A0.s

@@ -4,8 +4,8 @@
 glabel func_8024B9A0
 /* 17A280 8024B9A0 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 17A284 8024B9A4 AFB00018 */  sw        $s0, 0x18($sp)
-/* 17A288 8024B9A8 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 17A288 8024B9A8 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 17A28C 8024B9AC 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 17A28C 8024B9AC 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 17A290 8024B9B0 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 17A294 8024B9B4 F7BE0048 */  sdc1      $f30, 0x48($sp)
 /* 17A298 8024B9B8 F7BC0040 */  sdc1      $f28, 0x40($sp)

asm/nonmatchings/code_1776B0/func_8024BDA4.s

@@ -4,8 +4,8 @@
 glabel func_8024BDA4
 /* 17A684 8024BDA4 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 17A688 8024BDA8 AFB00018 */  sw        $s0, 0x18($sp)
-/* 17A68C 8024BDAC 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 17A68C 8024BDAC 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 17A690 8024BDB0 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 17A690 8024BDB0 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 17A694 8024BDB4 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 17A698 8024BDB8 F7BE0048 */  sdc1      $f30, 0x48($sp)
 /* 17A69C 8024BDBC F7BC0040 */  sdc1      $f28, 0x40($sp)

asm/nonmatchings/code_1776B0/func_8024C180.s

@@ -4,8 +4,8 @@
 glabel func_8024C180
 /* 17AA60 8024C180 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 17AA64 8024C184 AFB00018 */  sw        $s0, 0x18($sp)
-/* 17AA68 8024C188 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 17AA68 8024C188 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 17AA6C 8024C18C 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 17AA6C 8024C18C 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 17AA70 8024C190 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 17AA74 8024C194 F7BE0048 */  sdc1      $f30, 0x48($sp)
 /* 17AA78 8024C198 F7BC0040 */  sdc1      $f28, 0x40($sp)

asm/nonmatchings/code_1776B0/func_8024C570.s

@@ -4,8 +4,8 @@
 glabel func_8024C570
 /* 17AE50 8024C570 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 17AE54 8024C574 AFB00018 */  sw        $s0, 0x18($sp)
-/* 17AE58 8024C578 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 17AE58 8024C578 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 17AE5C 8024C57C 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 17AE5C 8024C57C 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 17AE60 8024C580 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 17AE64 8024C584 F7BE0048 */  sdc1      $f30, 0x48($sp)
 /* 17AE68 8024C588 F7BC0040 */  sdc1      $f28, 0x40($sp)

asm/nonmatchings/code_1776B0/func_8024C944.s

@@ -4,8 +4,8 @@
 glabel func_8024C944
 /* 17B224 8024C944 27BDFFC0 */  addiu     $sp, $sp, -0x40
 /* 17B228 8024C948 AFB00030 */  sw        $s0, 0x30($sp)
-/* 17B22C 8024C94C 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 17B22C 8024C94C 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 17B230 8024C950 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 17B230 8024C950 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 17B234 8024C954 3C06800E */  lui       $a2, %hi(gBattleStatus)
 /* 17B238 8024C958 24C6C070 */  addiu     $a2, $a2, %lo(gBattleStatus)
 /* 17B23C 8024C95C AFBF0034 */  sw        $ra, 0x34($sp)

asm/nonmatchings/code_1776B0/func_8024CB68.s

@@ -4,8 +4,8 @@
 glabel func_8024CB68
 /* 17B448 8024CB68 27BDFFB0 */  addiu     $sp, $sp, -0x50
 /* 17B44C 8024CB6C AFB00030 */  sw        $s0, 0x30($sp)
-/* 17B450 8024CB70 3C10800B */  lui       $s0, %hi(D_800B22D8)
+/* 17B450 8024CB70 3C10800B */  lui       $s0, %hi(gCameras+0x558)
-/* 17B454 8024CB74 261022D8 */  addiu     $s0, $s0, %lo(D_800B22D8)
+/* 17B454 8024CB74 261022D8 */  addiu     $s0, $s0, %lo(gCameras+0x558)
 /* 17B458 8024CB78 3C02802A */  lui       $v0, %hi(D_8029F27C)
 /* 17B45C 8024CB7C 9442F27C */  lhu       $v0, %lo(D_8029F27C)($v0)
 /* 17B460 8024CB80 3C04800E */  lui       $a0, %hi(gBattleStatus)

asm/nonmatchings/code_1776B0/func_8024CE9C.s

@@ -5,8 +5,8 @@ glabel func_8024CE9C
 /* 17B77C 8024CE9C 24020008 */  addiu     $v0, $zero, 8
 /* 17B780 8024CEA0 3C01802A */  lui       $at, %hi(D_8029F284)
 /* 17B784 8024CEA4 A422F284 */  sh        $v0, %lo(D_8029F284)($at)
-/* 17B788 8024CEA8 3C02800B */  lui       $v0, %hi(D_800B22D8)
+/* 17B788 8024CEA8 3C02800B */  lui       $v0, %hi(gCameras+0x558)
-/* 17B78C 8024CEAC 244222D8 */  addiu     $v0, $v0, %lo(D_800B22D8)
+/* 17B78C 8024CEAC 244222D8 */  addiu     $v0, $v0, %lo(gCameras+0x558)
 /* 17B790 8024CEB0 8443001C */  lh        $v1, 0x1c($v0)
 /* 17B794 8024CEB4 8444001E */  lh        $a0, 0x1e($v0)
 /* 17B798 8024CEB8 A4400024 */  sh        $zero, 0x24($v0)

asm/nonmatchings/code_1776B0/func_8024E484.s

@@ -4,8 +4,8 @@
 glabel func_8024E484
 /* 17CD64 8024E484 3C028028 */  lui       $v0, %hi(D_80280CE0)
 /* 17CD68 8024E488 80420CE0 */  lb        $v0, %lo(D_80280CE0)($v0)
-/* 17CD6C 8024E48C 3C03800B */  lui       $v1, %hi(D_800B22D8)
+/* 17CD6C 8024E48C 3C03800B */  lui       $v1, %hi(gCameras+0x558)
-/* 17CD70 8024E490 246322D8 */  addiu     $v1, $v1, %lo(D_800B22D8)
+/* 17CD70 8024E490 246322D8 */  addiu     $v1, $v1, %lo(gCameras+0x558)
 /* 17CD74 8024E494 1440000E */  bnez      $v0, .L8024E4D0
 /* 17CD78 8024E498 00000000 */   nop
 /* 17CD7C 8024E49C A464001C */  sh        $a0, 0x1c($v1)

asm/nonmatchings/code_1776B0/func_8024E554.s

@@ -2,8 +2,8 @@
 .set noreorder # don't insert nops after branches
 
 glabel func_8024E554
-/* 17CE34 8024E554 3C03800B */  lui       $v1, %hi(D_800B22D8)
+/* 17CE34 8024E554 3C03800B */  lui       $v1, %hi(gCameras+0x558)
-/* 17CE38 8024E558 246322D8 */  addiu     $v1, $v1, %lo(D_800B22D8)
+/* 17CE38 8024E558 246322D8 */  addiu     $v1, $v1, %lo(gCameras+0x558)
 /* 17CE3C 8024E55C 3C028028 */  lui       $v0, %hi(D_80280CE0)
 /* 17CE40 8024E560 80420CE0 */  lb        $v0, %lo(D_80280CE0)($v0)
 /* 17CE44 8024E564 44860000 */  mtc1      $a2, $f0

asm/nonmatchings/code_1776B0/func_8024E748.s

@@ -8,8 +8,8 @@ glabel func_8024E748
 /* 17D034 8024E754 AFB20018 */  sw        $s2, 0x18($sp)
 /* 17D038 8024E758 0080902D */  daddu     $s2, $a0, $zero
 /* 17D03C 8024E75C AFB10014 */  sw        $s1, 0x14($sp)
-/* 17D040 8024E760 3C11800B */  lui       $s1, %hi(D_800B22D8)
+/* 17D040 8024E760 3C11800B */  lui       $s1, %hi(gCameras+0x558)
-/* 17D044 8024E764 263122D8 */  addiu     $s1, $s1, %lo(D_800B22D8)
+/* 17D044 8024E764 263122D8 */  addiu     $s1, $s1, %lo(gCameras+0x558)
 /* 17D048 8024E768 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 17D04C 8024E76C AFB00010 */  sw        $s0, 0x10($sp)
 /* 17D050 8024E770 8E50000C */  lw        $s0, 0xc($s2)

asm/nonmatchings/code_1776B0/func_8024E820.s

@@ -8,8 +8,8 @@ glabel func_8024E820
 /* 17D10C 8024E82C AFB10014 */  sw        $s1, 0x14($sp)
 /* 17D110 8024E830 0080882D */  daddu     $s1, $a0, $zero
 /* 17D114 8024E834 AFB20018 */  sw        $s2, 0x18($sp)
-/* 17D118 8024E838 3C12800B */  lui       $s2, %hi(D_800B22D8)
+/* 17D118 8024E838 3C12800B */  lui       $s2, %hi(gCameras+0x558)
-/* 17D11C 8024E83C 265222D8 */  addiu     $s2, $s2, %lo(D_800B22D8)
+/* 17D11C 8024E83C 265222D8 */  addiu     $s2, $s2, %lo(gCameras+0x558)
 /* 17D120 8024E840 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 17D124 8024E844 AFB00010 */  sw        $s0, 0x10($sp)
 /* 17D128 8024E848 8E30000C */  lw        $s0, 0xc($s1)

asm/nonmatchings/code_1776B0/func_8024E9B0.s

@@ -8,8 +8,8 @@ glabel func_8024E9B0
 /* 17D29C 8024E9BC AFB10014 */  sw        $s1, 0x14($sp)
 /* 17D2A0 8024E9C0 0080882D */  daddu     $s1, $a0, $zero
 /* 17D2A4 8024E9C4 AFB20018 */  sw        $s2, 0x18($sp)
-/* 17D2A8 8024E9C8 3C12800B */  lui       $s2, %hi(D_800B22D8)
+/* 17D2A8 8024E9C8 3C12800B */  lui       $s2, %hi(gCameras+0x558)
-/* 17D2AC 8024E9CC 265222D8 */  addiu     $s2, $s2, %lo(D_800B22D8)
+/* 17D2AC 8024E9CC 265222D8 */  addiu     $s2, $s2, %lo(gCameras+0x558)
 /* 17D2B0 8024E9D0 AFBF001C */  sw        $ra, 0x1c($sp)
 /* 17D2B4 8024E9D4 AFB00010 */  sw        $s0, 0x10($sp)
 /* 17D2B8 8024E9D8 8E30000C */  lw        $s0, 0xc($s1)

asm/nonmatchings/code_17D6A0/func_8024EFE0.s

@@ -209,8 +209,8 @@ glabel func_8024EFE0
 /* 17DBCC 8024F2EC AE00FFE0 */  sw        $zero, -0x20($s0)
 /* 17DBD0 8024F2F0 E600FFE4 */  swc1      $f0, -0x1c($s0)
 /* 17DBD4 8024F2F4 E602FFEC */  swc1      $f2, -0x14($s0)
-/* 17DBD8 8024F2F8 3C01800B */  lui       $at, %hi(D_800B2344)
+/* 17DBD8 8024F2F8 3C01800B */  lui       $at, %hi(gCameras+0x5C4)
-/* 17DBDC 8024F2FC C4202344 */  lwc1      $f0, %lo(D_800B2344)($at)
+/* 17DBDC 8024F2FC C4202344 */  lwc1      $f0, %lo(gCameras+0x5C4)($at)
 /* 17DBE0 8024F300 0C00A6C9 */  jal       clamp_angle
 /* 17DBE4 8024F304 46006301 */   sub.s    $f12, $f12, $f0
 /* 17DBE8 8024F308 2402000E */  addiu     $v0, $zero, 0xe

asm/nonmatchings/code_17D6A0/func_8024F394.s

@@ -59,8 +59,8 @@ glabel func_8024F394
 /* 17DD40 8024F460 E604FFF8 */  swc1      $f4, -8($s0)
 /* 17DD44 8024F464 E602FFFC */  swc1      $f2, -4($s0)
 .L8024F468:
-/* 17DD48 8024F468 3C01800B */  lui       $at, %hi(D_800B2344)
+/* 17DD48 8024F468 3C01800B */  lui       $at, %hi(gCameras+0x5C4)
-/* 17DD4C 8024F46C C4202344 */  lwc1      $f0, %lo(D_800B2344)($at)
+/* 17DD4C 8024F46C C4202344 */  lwc1      $f0, %lo(gCameras+0x5C4)($at)
 /* 17DD50 8024F470 3C014334 */  lui       $at, 0x4334
 /* 17DD54 8024F474 44816000 */  mtc1      $at, $f12
 /* 17DD58 8024F478 0C00A6C9 */  jal       clamp_angle

asm/nonmatchings/code_182B30/update_actor_shadow.s

@@ -7,8 +7,8 @@ glabel update_actor_shadow
 /* 1842A4 802559C4 AFB20030 */  sw        $s2, 0x30($sp)
 /* 1842A8 802559C8 00A0902D */  daddu     $s2, $a1, $zero
 /* 1842AC 802559CC AFB5003C */  sw        $s5, 0x3c($sp)
-/* 1842B0 802559D0 3C15800B */  lui       $s5, %hi(D_800B22D8)
+/* 1842B0 802559D0 3C15800B */  lui       $s5, %hi(gCameras+0x558)
-/* 1842B4 802559D4 26B522D8 */  addiu     $s5, $s5, %lo(D_800B22D8)
+/* 1842B4 802559D4 26B522D8 */  addiu     $s5, $s5, %lo(gCameras+0x558)
 /* 1842B8 802559D8 AFBF0040 */  sw        $ra, 0x40($sp)
 /* 1842BC 802559DC AFB40038 */  sw        $s4, 0x38($sp)
 /* 1842C0 802559E0 AFB30034 */  sw        $s3, 0x34($sp)
@@ -347,9 +347,9 @@ glabel update_actor_shadow
 /* 1847A0 80255EC0 E6220014 */  swc1      $f2, 0x14($s1)
 /* 1847A4 80255EC4 92420136 */  lbu       $v0, 0x136($s2)
 /* 1847A8 80255EC8 00021080 */  sll       $v0, $v0, 2
-/* 1847AC 80255ECC 3C018028 */  lui       $at, %hi(bActorCamOffsets+0x3)
+/* 1847AC 80255ECC 3C018028 */  lui       $at, %hi(bActorOffsets+0x3)
 /* 1847B0 80255ED0 00220821 */  addu      $at, $at, $v0
-/* 1847B4 80255ED4 80222EEB */  lb        $v0, %lo(bActorCamOffsets+0x3)($at)
+/* 1847B4 80255ED4 80222EEB */  lb        $v0, %lo(bActorOffsets+0x3)($at)
 /* 1847B8 80255ED8 C7A00020 */  lwc1      $f0, 0x20($sp)
 /* 1847BC 80255EDC 44821000 */  mtc1      $v0, $f2
 /* 1847C0 80255EE0 00000000 */  nop

asm/nonmatchings/code_182B30/update_player_actor_shadow.s

@@ -93,8 +93,8 @@ glabel update_player_actor_shadow
 /* 1865E0 80257D00 C7A00018 */  lwc1      $f0, 0x18($sp)
 /* 1865E4 80257D04 C7A2001C */  lwc1      $f2, 0x1c($sp)
 /* 1865E8 80257D08 C7A40020 */  lwc1      $f4, 0x20($sp)
-/* 1865EC 80257D0C 3C02800B */  lui       $v0, %hi(D_800B22D8)
+/* 1865EC 80257D0C 3C02800B */  lui       $v0, %hi(gCameras+0x558)
-/* 1865F0 80257D10 244222D8 */  addiu     $v0, $v0, %lo(D_800B22D8)
+/* 1865F0 80257D10 244222D8 */  addiu     $v0, $v0, %lo(gCameras+0x558)
 /* 1865F4 80257D14 E6200010 */  swc1      $f0, 0x10($s1)
 /* 1865F8 80257D18 E6220014 */  swc1      $f2, 0x14($s1)
 /* 1865FC 80257D1C E6240018 */  swc1      $f4, 0x18($s1)

asm/nonmatchings/code_3278F0/func_E0002300.s

@@ -48,9 +48,9 @@ glabel func_E0002300
 /* 327C9C E00023AC 000218C0 */  sll       $v1, $v0, 3
 /* 327CA0 E00023B0 00431021 */  addu      $v0, $v0, $v1
 /* 327CA4 E00023B4 000210C0 */  sll       $v0, $v0, 3
-/* 327CA8 E00023B8 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 327CA8 E00023B8 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 327CAC E00023BC 00220821 */  addu      $at, $at, $v0
-/* 327CB0 E00023C0 C4221DEC */  lwc1      $f2, %lo(D_800B1DEC)($at)
+/* 327CB0 E00023C0 C4221DEC */  lwc1      $f2, %lo(gCameras+0x6C)($at)
 /* 327CB4 E00023C4 E7A00010 */  swc1      $f0, 0x10($sp)
 /* 327CB8 E00023C8 C680000C */  lwc1      $f0, 0xc($s4)
 /* 327CBC E00023CC 27A40020 */  addiu     $a0, $sp, 0x20

asm/nonmatchings/code_328110/func_E000C798.s

@@ -73,9 +73,9 @@ glabel func_E000C798
 /* 3289B8 E000C8A8 00431021 */  addu      $v0, $v0, $v1
 /* 3289BC E000C8AC 000210C0 */  sll       $v0, $v0, 3
 /* 3289C0 E000C8B0 44060000 */  mfc1      $a2, $f0
-/* 3289C4 E000C8B4 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 3289C4 E000C8B4 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 3289C8 E000C8B8 00220821 */  addu      $at, $at, $v0
-/* 3289CC E000C8BC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 3289CC E000C8BC C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 3289D0 E000C8C0 3C073F80 */  lui       $a3, 0x3f80
 /* 3289D4 E000C8C4 46000007 */  neg.s     $f0, $f0
 /* 3289D8 E000C8C8 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_330910/func_E001C30C.s

@@ -64,9 +64,9 @@ glabel func_E001C30C
 /* 330D08 E001C3F8 00431021 */  addu      $v0, $v0, $v1
 /* 330D0C E001C3FC 000210C0 */  sll       $v0, $v0, 3
 /* 330D10 E001C400 4406A000 */  mfc1      $a2, $f20
-/* 330D14 E001C404 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 330D14 E001C404 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 330D18 E001C408 00220821 */  addu      $at, $at, $v0
-/* 330D1C E001C40C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 330D1C E001C40C C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 330D20 E001C410 4407B000 */  mfc1      $a3, $f22
 /* 330D24 E001C414 46000007 */  neg.s     $f0, $f0
 /* 330D28 E001C418 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_331940/func_E001E000.s

@@ -126,9 +126,9 @@ glabel func_E001E000
 /* 331B10 E001E1D0 E6200010 */  swc1      $f0, 0x10($s1)
 /* 331B14 E001E1D4 E6220014 */  swc1      $f2, 0x14($s1)
 /* 331B18 E001E1D8 E6240018 */  swc1      $f4, 0x18($s1)
-/* 331B1C E001E1DC 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 331B1C E001E1DC 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 331B20 E001E1E0 00220821 */  addu      $at, $at, $v0
-/* 331B24 E001E1E4 C4341DEC */  lwc1      $f20, %lo(D_800B1DEC)($at)
+/* 331B24 E001E1E4 C4341DEC */  lwc1      $f20, %lo(gCameras+0x6C)($at)
 /* 331B28 E001E1E8 0C080144 */  jal       func_E0200510
 /* 331B2C E001E1EC 4600A306 */   mov.s    $f12, $f20
 /* 331B30 E001E1F0 4600A306 */  mov.s     $f12, $f20

asm/nonmatchings/code_331940/func_E001E730.s

@@ -50,9 +50,9 @@ glabel func_E001E730
 /* 332124 E001E7E4 000218C0 */  sll       $v1, $v0, 3
 /* 332128 E001E7E8 00431021 */  addu      $v0, $v0, $v1
 /* 33212C E001E7EC 000210C0 */  sll       $v0, $v0, 3
-/* 332130 E001E7F0 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 332130 E001E7F0 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 332134 E001E7F4 00220821 */  addu      $at, $at, $v0
-/* 332138 E001E7F8 C4221DEC */  lwc1      $f2, %lo(D_800B1DEC)($at)
+/* 332138 E001E7F8 C4221DEC */  lwc1      $f2, %lo(gCameras+0x6C)($at)
 /* 33213C E001E7FC E7B80010 */  swc1      $f24, 0x10($sp)
 /* 332140 E001E800 C6C00004 */  lwc1      $f0, 4($s6)
 /* 332144 E001E804 AEE60000 */  sw        $a2, ($s7)
@@ -205,9 +205,9 @@ glabel func_E001E730
 /* 33237C E001EA3C 000210C0 */  sll       $v0, $v0, 3
 /* 332380 E001EA40 4405A000 */  mfc1      $a1, $f20
 /* 332384 E001EA44 4407A000 */  mfc1      $a3, $f20
-/* 332388 E001EA48 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 332388 E001EA48 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 33238C E001EA4C 00220821 */  addu      $at, $at, $v0
-/* 332390 E001EA50 C4221DEC */  lwc1      $f2, %lo(D_800B1DEC)($at)
+/* 332390 E001EA50 C4221DEC */  lwc1      $f2, %lo(gCameras+0x6C)($at)
 /* 332394 E001EA54 001110C0 */  sll       $v0, $s1, 3
 /* 332398 E001EA58 E7B80010 */  swc1      $f24, 0x10($sp)
 /* 33239C E001EA5C C6C00004 */  lwc1      $f0, 4($s6)

asm/nonmatchings/code_333EC0/func_E0020000.s

@@ -24,9 +24,9 @@ glabel func_E0020000
 /* 333F0C E002004C 000218C0 */  sll       $v1, $v0, 3
 /* 333F10 E0020050 00431021 */  addu      $v0, $v0, $v1
 /* 333F14 E0020054 000210C0 */  sll       $v0, $v0, 3
-/* 333F18 E0020058 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 333F18 E0020058 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 333F1C E002005C 00220821 */  addu      $at, $at, $v0
-/* 333F20 E0020060 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
+/* 333F20 E0020060 C42C1DEC */  lwc1      $f12, %lo(gCameras+0x6C)($at)
 /* 333F24 E0020064 8E32003C */  lw        $s2, 0x3c($s1)
 /* 333F28 E0020068 0C080140 */  jal       func_E0200500
 /* 333F2C E002006C 00A0982D */   daddu    $s3, $a1, $zero
@@ -38,9 +38,9 @@ glabel func_E0020000
 /* 333F44 E0020084 000218C0 */  sll       $v1, $v0, 3
 /* 333F48 E0020088 00431021 */  addu      $v0, $v0, $v1
 /* 333F4C E002008C 000210C0 */  sll       $v0, $v0, 3
-/* 333F50 E0020090 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 333F50 E0020090 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 333F54 E0020094 00220821 */  addu      $at, $at, $v0
-/* 333F58 E0020098 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
+/* 333F58 E0020098 C42C1DEC */  lwc1      $f12, %lo(gCameras+0x6C)($at)
 /* 333F5C E002009C 0C080144 */  jal       func_E0200510
 /* 333F60 E00200A0 46000506 */   mov.s    $f20, $f0
 /* 333F64 E00200A4 00131080 */  sll       $v0, $s3, 2

asm/nonmatchings/code_333EC0/func_E00205D0.s

@@ -59,9 +59,9 @@ glabel func_E00205D0
 /* 334568 E00206A8 00431021 */  addu      $v0, $v0, $v1
 /* 33456C E00206AC 000210C0 */  sll       $v0, $v0, 3
 /* 334570 E00206B0 4406B000 */  mfc1      $a2, $f22
-/* 334574 E00206B4 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 334574 E00206B4 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 334578 E00206B8 00220821 */  addu      $at, $at, $v0
-/* 33457C E00206BC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 33457C E00206BC C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 334580 E00206C0 4407A000 */  mfc1      $a3, $f20
 /* 334584 E00206C4 46000007 */  neg.s     $f0, $f0
 /* 334588 E00206C8 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_337240/func_E0022998.s

@@ -63,9 +63,9 @@ glabel func_E0022998
 /* 337CC0 E0022A80 00431021 */  addu      $v0, $v0, $v1
 /* 337CC4 E0022A84 000210C0 */  sll       $v0, $v0, 3
 /* 337CC8 E0022A88 44060000 */  mfc1      $a2, $f0
-/* 337CCC E0022A8C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 337CCC E0022A8C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 337CD0 E0022A90 00220821 */  addu      $at, $at, $v0
-/* 337CD4 E0022A94 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 337CD4 E0022A94 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 337CD8 E0022A98 3C073F80 */  lui       $a3, 0x3f80
 /* 337CDC E0022A9C 46000007 */  neg.s     $f0, $f0
 /* 337CE0 E0022AA0 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_339250/func_E0024454.s

@@ -80,9 +80,9 @@ glabel func_E0024454
 /* 3397D0 E0024580 000218C0 */  sll       $v1, $v0, 3
 /* 3397D4 E0024584 00431021 */  addu      $v0, $v0, $v1
 /* 3397D8 E0024588 000210C0 */  sll       $v0, $v0, 3
-/* 3397DC E002458C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 3397DC E002458C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 3397E0 E0024590 00220821 */  addu      $at, $at, $v0
-/* 3397E4 E0024594 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 3397E4 E0024594 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 3397E8 E0024598 3C014110 */  lui       $at, 0x4110
 /* 3397EC E002459C 4481C000 */  mtc1      $at, $f24
 /* 3397F0 E00245A0 08009176 */  j         .LE00245D8
@@ -421,9 +421,9 @@ glabel func_E0024454
 /* 339CFC E0024AAC 000218C0 */  sll       $v1, $v0, 3
 /* 339D00 E0024AB0 00431021 */  addu      $v0, $v0, $v1
 /* 339D04 E0024AB4 000210C0 */  sll       $v0, $v0, 3
-/* 339D08 E0024AB8 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 339D08 E0024AB8 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 339D0C E0024ABC 00220821 */  addu      $at, $at, $v0
-/* 339D10 E0024AC0 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 339D10 E0024AC0 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 339D14 E0024AC4 46000787 */  neg.s     $f30, $f0
 .LE0024AC8:
 /* 339D18 E0024AC8 4480A000 */  mtc1      $zero, $f20

asm/nonmatchings/code_33B180/func_E002618C.s

@@ -136,8 +136,8 @@ glabel func_E002618C
 /* 33B500 E0026380 000410C0 */  sll       $v0, $a0, 3
 /* 33B504 E0026384 00822021 */  addu      $a0, $a0, $v0
 /* 33B508 E0026388 000420C0 */  sll       $a0, $a0, 3
-/* 33B50C E002638C 3C02800B */  lui       $v0, %hi(D_800B1E54)
+/* 33B50C E002638C 3C02800B */  lui       $v0, %hi(gCameras+0xD4)
-/* 33B510 E0026390 24421E54 */  addiu     $v0, $v0, %lo(D_800B1E54)
+/* 33B510 E0026390 24421E54 */  addiu     $v0, $v0, %lo(gCameras+0xD4)
 /* 33B514 E0026394 E7B40010 */  swc1      $f20, 0x10($sp)
 /* 33B518 E0026398 8E050004 */  lw        $a1, 4($s0)
 /* 33B51C E002639C 8E060008 */  lw        $a2, 8($s0)

asm/nonmatchings/code_33CDF0/func_E002852C.s

@@ -66,9 +66,9 @@ glabel func_E002852C
 /* 33D410 E0028620 00431021 */  addu      $v0, $v0, $v1
 /* 33D414 E0028624 000210C0 */  sll       $v0, $v0, 3
 /* 33D418 E0028628 4406A000 */  mfc1      $a2, $f20
-/* 33D41C E002862C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 33D41C E002862C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 33D420 E0028630 00220821 */  addu      $at, $at, $v0
-/* 33D424 E0028634 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 33D424 E0028634 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 33D428 E0028638 4407B000 */  mfc1      $a3, $f22
 /* 33D42C E002863C 46000007 */  neg.s     $f0, $f0
 /* 33D430 E0028640 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_33E8C0/func_E002A3C4.s

@@ -87,9 +87,9 @@ glabel func_E002A3C4
 /* 33EDC8 E002A508 00431021 */  addu      $v0, $v0, $v1
 /* 33EDCC E002A50C 000210C0 */  sll       $v0, $v0, 3
 /* 33EDD0 E002A510 44060000 */  mfc1      $a2, $f0
-/* 33EDD4 E002A514 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 33EDD4 E002A514 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 33EDD8 E002A518 00220821 */  addu      $at, $at, $v0
-/* 33EDDC E002A51C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 33EDDC E002A51C C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 33EDE0 E002A520 3C073F80 */  lui       $a3, 0x3f80
 /* 33EDE4 E002A524 46000007 */  neg.s     $f0, $f0
 /* 33EDE8 E002A528 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_33FE80/func_E002C414.s

@@ -74,9 +74,9 @@ glabel func_E002C414
 /* 3403A8 E002C528 00431021 */  addu      $v0, $v0, $v1
 /* 3403AC E002C52C 000210C0 */  sll       $v0, $v0, 3
 /* 3403B0 E002C530 4406A000 */  mfc1      $a2, $f20
-/* 3403B4 E002C534 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 3403B4 E002C534 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 3403B8 E002C538 00220821 */  addu      $at, $at, $v0
-/* 3403BC E002C53C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 3403BC E002C53C C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 3403C0 E002C540 4407B000 */  mfc1      $a3, $f22
 /* 3403C4 E002C544 46000007 */  neg.s     $f0, $f0
 /* 3403C8 E002C548 44050000 */  mfc1      $a1, $f0
@@ -199,9 +199,9 @@ glabel func_E002C414
 /* 340598 E002C718 00431021 */  addu      $v0, $v0, $v1
 /* 34059C E002C71C 000210C0 */  sll       $v0, $v0, 3
 /* 3405A0 E002C720 4406B000 */  mfc1      $a2, $f22
-/* 3405A4 E002C724 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 3405A4 E002C724 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 3405A8 E002C728 00220821 */  addu      $at, $at, $v0
-/* 3405AC E002C72C C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 3405AC E002C72C C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 3405B0 E002C730 4407A000 */  mfc1      $a3, $f20
 /* 3405B4 E002C734 46000007 */  neg.s     $f0, $f0
 /* 3405B8 E002C738 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_3419E0/func_E002E368.s

@@ -73,9 +73,9 @@ glabel func_E002E368
 /* 341E54 E002E474 00431021 */  addu      $v0, $v0, $v1
 /* 341E58 E002E478 000210C0 */  sll       $v0, $v0, 3
 /* 341E5C E002E47C 44060000 */  mfc1      $a2, $f0
-/* 341E60 E002E480 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 341E60 E002E480 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 341E64 E002E484 00220821 */  addu      $at, $at, $v0
-/* 341E68 E002E488 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 341E68 E002E488 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 341E6C E002E48C 3C073F80 */  lui       $a3, 0x3f80
 /* 341E70 E002E490 46000007 */  neg.s     $f0, $f0
 /* 341E74 E002E494 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_343680/func_E003245C.s

@@ -58,9 +58,9 @@ glabel func_E003245C
 /* 343BB0 E0032530 00431021 */  addu      $v0, $v0, $v1
 /* 343BB4 E0032534 000210C0 */  sll       $v0, $v0, 3
 /* 343BB8 E0032538 4406B000 */  mfc1      $a2, $f22
-/* 343BBC E003253C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 343BBC E003253C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 343BC0 E0032540 00220821 */  addu      $at, $at, $v0
-/* 343BC4 E0032544 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 343BC4 E0032544 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 343BC8 E0032548 4407A000 */  mfc1      $a3, $f20
 /* 343BCC E003254C 46000007 */  neg.s     $f0, $f0
 /* 343BD0 E0032550 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_344A10/func_E0034310.s

@@ -65,9 +65,9 @@ glabel func_E0034310
 /* 344E10 E0034400 00431021 */  addu      $v0, $v0, $v1
 /* 344E14 E0034404 000210C0 */  sll       $v0, $v0, 3
 /* 344E18 E0034408 4406A000 */  mfc1      $a2, $f20
-/* 344E1C E003440C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 344E1C E003440C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 344E20 E0034410 00220821 */  addu      $at, $at, $v0
-/* 344E24 E0034414 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 344E24 E0034414 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 344E28 E0034418 4407B000 */  mfc1      $a3, $f22
 /* 344E2C E003441C 46000007 */  neg.s     $f0, $f0
 /* 344E30 E0034420 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_3454E0/func_E0036224.s

@@ -99,9 +99,9 @@ glabel func_E0036224
 /* 345874 E0036394 00431021 */  addu      $v0, $v0, $v1
 /* 345878 E0036398 000210C0 */  sll       $v0, $v0, 3
 /* 34587C E003639C 4406A000 */  mfc1      $a2, $f20
-/* 345880 E00363A0 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 345880 E00363A0 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 345884 E00363A4 00220821 */  addu      $at, $at, $v0
-/* 345888 E00363A8 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 345888 E00363A8 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 34588C E00363AC 4407B000 */  mfc1      $a3, $f22
 /* 345890 E00363B0 46000007 */  neg.s     $f0, $f0
 /* 345894 E00363B4 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_34EC80/func_E003A354.s

@@ -84,9 +84,9 @@ glabel func_E003A354
 /* 34F110 E003A490 00431021 */  addu      $v0, $v0, $v1
 /* 34F114 E003A494 000210C0 */  sll       $v0, $v0, 3
 /* 34F118 E003A498 44060000 */  mfc1      $a2, $f0
-/* 34F11C E003A49C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 34F11C E003A49C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 34F120 E003A4A0 00220821 */  addu      $at, $at, $v0
-/* 34F124 E003A4A4 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 34F124 E003A4A4 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 34F128 E003A4A8 3C073F80 */  lui       $a3, 0x3f80
 /* 34F12C E003A4AC 46000007 */  neg.s     $f0, $f0
 /* 34F130 E003A4B0 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_34F4C0/func_E003C498.s

@@ -59,9 +59,9 @@ glabel func_E003C498
 /* 34FA30 E003C570 00431021 */  addu      $v0, $v0, $v1
 /* 34FA34 E003C574 000210C0 */  sll       $v0, $v0, 3
 /* 34FA38 E003C578 44060000 */  mfc1      $a2, $f0
-/* 34FA3C E003C57C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 34FA3C E003C57C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 34FA40 E003C580 00220821 */  addu      $at, $at, $v0
-/* 34FA44 E003C584 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 34FA44 E003C584 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 34FA48 E003C588 3C073F80 */  lui       $a3, 0x3f80
 /* 34FA4C E003C58C 46000007 */  neg.s     $f0, $f0
 /* 34FA50 E003C590 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_353300/func_E0040210.s

@@ -27,8 +27,8 @@ glabel func_E0040210
 /* 353568 E0040268 000410C0 */  sll       $v0, $a0, 3
 /* 35356C E004026C 00822021 */  addu      $a0, $a0, $v0
 /* 353570 E0040270 000420C0 */  sll       $a0, $a0, 3
-/* 353574 E0040274 3C02800B */  lui       $v0, %hi(D_800B1E54)
+/* 353574 E0040274 3C02800B */  lui       $v0, %hi(gCameras+0xD4)
-/* 353578 E0040278 24421E54 */  addiu     $v0, $v0, %lo(D_800B1E54)
+/* 353578 E0040278 24421E54 */  addiu     $v0, $v0, %lo(gCameras+0xD4)
 /* 35357C E004027C E7A00010 */  swc1      $f0, 0x10($sp)
 /* 353580 E0040280 8CE50004 */  lw        $a1, 4($a3)
 /* 353584 E0040284 8CE60008 */  lw        $a2, 8($a3)

asm/nonmatchings/code_354F60/func_E004491C.s

@@ -67,9 +67,9 @@ glabel func_E004491C
 /* 355974 E0044A14 00431021 */  addu      $v0, $v0, $v1
 /* 355978 E0044A18 000210C0 */  sll       $v0, $v0, 3
 /* 35597C E0044A1C 44060000 */  mfc1      $a2, $f0
-/* 355980 E0044A20 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 355980 E0044A20 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 355984 E0044A24 00220821 */  addu      $at, $at, $v0
-/* 355988 E0044A28 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 355988 E0044A28 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 35598C E0044A2C 3C073F80 */  lui       $a3, 0x3f80
 /* 355990 E0044A30 46000007 */  neg.s     $f0, $f0
 /* 355994 E0044A34 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_355EE0/func_E00462C0.s

@@ -120,9 +120,9 @@ glabel func_E00462C0
 /* 356368 E0046488 000218C0 */  sll       $v1, $v0, 3
 /* 35636C E004648C 00431021 */  addu      $v0, $v0, $v1
 /* 356370 E0046490 000210C0 */  sll       $v0, $v0, 3
-/* 356374 E0046494 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 356374 E0046494 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 356378 E0046498 00220821 */  addu      $at, $at, $v0
-/* 35637C E004649C C4221DEC */  lwc1      $f2, %lo(D_800B1DEC)($at)
+/* 35637C E004649C C4221DEC */  lwc1      $f2, %lo(gCameras+0x6C)($at)
 /* 356380 E00464A0 C6600010 */  lwc1      $f0, 0x10($s3)
 /* 356384 E00464A4 46001087 */  neg.s     $f2, $f2
 /* 356388 E00464A8 E7A00010 */  swc1      $f0, 0x10($sp)

asm/nonmatchings/code_356980/func_E0048218.s

@@ -72,9 +72,9 @@ glabel func_E0048218
 /* 356CA4 E0048324 00431021 */  addu      $v0, $v0, $v1
 /* 356CA8 E0048328 000210C0 */  sll       $v0, $v0, 3
 /* 356CAC E004832C AD060004 */  sw        $a2, 4($t0)
-/* 356CB0 E0048330 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 356CB0 E0048330 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 356CB4 E0048334 00220821 */  addu      $at, $at, $v0
-/* 356CB8 E0048338 C4281DEC */  lwc1      $f8, %lo(D_800B1DEC)($at)
+/* 356CB8 E0048338 C4281DEC */  lwc1      $f8, %lo(gCameras+0x6C)($at)
 /* 356CBC E004833C C6800010 */  lwc1      $f0, 0x10($s4)
 /* 356CC0 E0048340 25020008 */  addiu     $v0, $t0, 8
 /* 356CC4 E0048344 AEA80000 */  sw        $t0, ($s5)

asm/nonmatchings/code_3584C0/func_E004A78C.s

@@ -103,9 +103,9 @@ glabel func_E004A78C
 /* 358DD0 E004A910 00431021 */  addu      $v0, $v0, $v1
 /* 358DD4 E004A914 000210C0 */  sll       $v0, $v0, 3
 /* 358DD8 E004A918 AD060004 */  sw        $a2, 4($t0)
-/* 358DDC E004A91C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 358DDC E004A91C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 358DE0 E004A920 00220821 */  addu      $at, $at, $v0
-/* 358DE4 E004A924 C4221DEC */  lwc1      $f2, %lo(D_800B1DEC)($at)
+/* 358DE4 E004A924 C4221DEC */  lwc1      $f2, %lo(gCameras+0x6C)($at)
 /* 358DE8 E004A928 3C100001 */  lui       $s0, 1
 /* 358DEC E004A92C AE680000 */  sw        $t0, ($s3)
 /* 358DF0 E004A930 E7B80010 */  swc1      $f24, 0x10($sp)

asm/nonmatchings/code_359F20/func_E004C3A8.s

@@ -95,9 +95,9 @@ glabel func_E004C3A8
 /* 35A430 E004C510 000218C0 */  sll       $v1, $v0, 3
 /* 35A434 E004C514 00431021 */  addu      $v0, $v0, $v1
 /* 35A438 E004C518 000210C0 */  sll       $v0, $v0, 3
-/* 35A43C E004C51C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 35A43C E004C51C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 35A440 E004C520 00220821 */  addu      $at, $at, $v0
-/* 35A444 E004C524 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 35A444 E004C524 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 35A448 E004C528 3C073F80 */  lui       $a3, 0x3f80
 /* 35A44C E004C52C 46000007 */  neg.s     $f0, $f0
 /* 35A450 E004C530 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_35B9D0/func_E004E214.s

@@ -69,9 +69,9 @@ glabel func_E004E214
 /* 35BCE4 E004E314 00431021 */  addu      $v0, $v0, $v1
 /* 35BCE8 E004E318 000210C0 */  sll       $v0, $v0, 3
 /* 35BCEC E004E31C AD060004 */  sw        $a2, 4($t0)
-/* 35BCF0 E004E320 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 35BCF0 E004E320 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 35BCF4 E004E324 00220821 */  addu      $at, $at, $v0
-/* 35BCF8 E004E328 C4281DEC */  lwc1      $f8, %lo(D_800B1DEC)($at)
+/* 35BCF8 E004E328 C4281DEC */  lwc1      $f8, %lo(gCameras+0x6C)($at)
 /* 35BCFC E004E32C C6200010 */  lwc1      $f0, 0x10($s1)
 /* 35BD00 E004E330 25020008 */  addiu     $v0, $t0, 8
 /* 35BD04 E004E334 AEE80000 */  sw        $t0, ($s7)

asm/nonmatchings/code_35BFD0/func_E0050000.s

@@ -55,9 +55,9 @@ glabel func_E0050000
 /* 35C090 E00500C0 000218C0 */  sll       $v1, $v0, 3
 /* 35C094 E00500C4 00431021 */  addu      $v0, $v0, $v1
 /* 35C098 E00500C8 000210C0 */  sll       $v0, $v0, 3
-/* 35C09C E00500CC 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 35C09C E00500CC 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 35C0A0 E00500D0 00220821 */  addu      $at, $at, $v0
-/* 35C0A4 E00500D4 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
+/* 35C0A4 E00500D4 C42C1DEC */  lwc1      $f12, %lo(gCameras+0x6C)($at)
 /* 35C0A8 E00500D8 0C080140 */  jal       func_E0200500
 /* 35C0AC E00500DC 00000000 */   nop
 /* 35C0B0 E00500E0 8E030000 */  lw        $v1, ($s0)
@@ -68,9 +68,9 @@ glabel func_E0050000
 /* 35C0C4 E00500F4 000218C0 */  sll       $v1, $v0, 3
 /* 35C0C8 E00500F8 00431021 */  addu      $v0, $v0, $v1
 /* 35C0CC E00500FC 000210C0 */  sll       $v0, $v0, 3
-/* 35C0D0 E0050100 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 35C0D0 E0050100 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 35C0D4 E0050104 00220821 */  addu      $at, $at, $v0
-/* 35C0D8 E0050108 C42C1DEC */  lwc1      $f12, %lo(D_800B1DEC)($at)
+/* 35C0D8 E0050108 C42C1DEC */  lwc1      $f12, %lo(gCameras+0x6C)($at)
 /* 35C0DC E005010C 0C080144 */  jal       func_E0200510
 /* 35C0E0 E0050110 46000506 */   mov.s    $f20, $f0
 /* 35C0E4 E0050114 27A40030 */  addiu     $a0, $sp, 0x30

asm/nonmatchings/code_35BFD0/func_E0050308.s

@@ -53,9 +53,9 @@ glabel func_E0050308
 /* 35C398 E00503C8 00431021 */  addu      $v0, $v0, $v1
 /* 35C39C E00503CC 000210C0 */  sll       $v0, $v0, 3
 /* 35C3A0 E00503D0 4406A000 */  mfc1      $a2, $f20
-/* 35C3A4 E00503D4 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 35C3A4 E00503D4 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 35C3A8 E00503D8 00220821 */  addu      $at, $at, $v0
-/* 35C3AC E00503DC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 35C3AC E00503DC C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 35C3B0 E00503E0 4407B000 */  mfc1      $a3, $f22
 /* 35C3B4 E00503E4 46000007 */  neg.s     $f0, $f0
 /* 35C3B8 E00503E8 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_35CA80/func_E0052460.s

@@ -158,9 +158,9 @@ glabel func_E0052460
 /* 35D138 E00526B8 000218C0 */  sll       $v1, $v0, 3
 /* 35D13C E00526BC 00431021 */  addu      $v0, $v0, $v1
 /* 35D140 E00526C0 000210C0 */  sll       $v0, $v0, 3
-/* 35D144 E00526C4 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 35D144 E00526C4 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 35D148 E00526C8 00220821 */  addu      $at, $at, $v0
-/* 35D14C E00526CC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 35D14C E00526CC C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 35D150 E00526D0 4407B000 */  mfc1      $a3, $f22
 /* 35D154 E00526D4 46000007 */  neg.s     $f0, $f0
 /* 35D158 E00526D8 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_35DA00/func_E0056BD0.s

@@ -74,9 +74,9 @@ glabel func_E0056BD0
 /* 35E6E0 E0056CE0 00431021 */  addu      $v0, $v0, $v1
 /* 35E6E4 E0056CE4 000210C0 */  sll       $v0, $v0, 3
 /* 35E6E8 E0056CE8 4406A000 */  mfc1      $a2, $f20
-/* 35E6EC E0056CEC 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 35E6EC E0056CEC 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 35E6F0 E0056CF0 00220821 */  addu      $at, $at, $v0
-/* 35E6F4 E0056CF4 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 35E6F4 E0056CF4 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 35E6F8 E0056CF8 4407B000 */  mfc1      $a3, $f22
 /* 35E6FC E0056CFC 46000007 */  neg.s     $f0, $f0
 /* 35E700 E0056D00 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_35E920/func_E00584D4.s

@@ -66,9 +66,9 @@ glabel func_E00584D4
 /* 35EEE8 E00585C8 00431021 */  addu      $v0, $v0, $v1
 /* 35EEEC E00585CC 000210C0 */  sll       $v0, $v0, 3
 /* 35EEF0 E00585D0 4406A000 */  mfc1      $a2, $f20
-/* 35EEF4 E00585D4 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 35EEF4 E00585D4 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 35EEF8 E00585D8 00220821 */  addu      $at, $at, $v0
-/* 35EEFC E00585DC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 35EEFC E00585DC C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 35EF00 E00585E0 4407B000 */  mfc1      $a3, $f22
 /* 35EF04 E00585E4 46000007 */  neg.s     $f0, $f0
 /* 35EF08 E00585E8 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_3602C0/func_E005A3F4.s

@@ -66,9 +66,9 @@ glabel func_E005A3F4
 /* 3607A8 E005A4E8 00431021 */  addu      $v0, $v0, $v1
 /* 3607AC E005A4EC 000210C0 */  sll       $v0, $v0, 3
 /* 3607B0 E005A4F0 4406A000 */  mfc1      $a2, $f20
-/* 3607B4 E005A4F4 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 3607B4 E005A4F4 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 3607B8 E005A4F8 00220821 */  addu      $at, $at, $v0
-/* 3607BC E005A4FC C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 3607BC E005A4FC C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 3607C0 E005A500 4407C000 */  mfc1      $a3, $f24
 /* 3607C4 E005A504 46000007 */  neg.s     $f0, $f0
 /* 3607C8 E005A508 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_360F40/func_E005C2F8.s

@@ -83,9 +83,9 @@ glabel func_E005C2F8
 /* 361370 E005C430 00431021 */  addu      $v0, $v0, $v1
 /* 361374 E005C434 000210C0 */  sll       $v0, $v0, 3
 /* 361378 E005C438 44060000 */  mfc1      $a2, $f0
-/* 36137C E005C43C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 36137C E005C43C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 361380 E005C440 00220821 */  addu      $at, $at, $v0
-/* 361384 E005C444 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 361384 E005C444 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 361388 E005C448 3C073F80 */  lui       $a3, 0x3f80
 /* 36138C E005C44C 46000007 */  neg.s     $f0, $f0
 /* 361390 E005C450 44050000 */  mfc1      $a1, $f0

asm/nonmatchings/code_3625C0/func_E005E334.s

@@ -68,9 +68,9 @@ glabel func_E005E334
 /* 3629F0 E005E430 000218C0 */  sll       $v1, $v0, 3
 /* 3629F4 E005E434 00431021 */  addu      $v0, $v0, $v1
 /* 3629F8 E005E438 000210C0 */  sll       $v0, $v0, 3
-/* 3629FC E005E43C 3C01800B */  lui       $at, %hi(D_800B1DEC)
+/* 3629FC E005E43C 3C01800B */  lui       $at, %hi(gCameras+0x6C)
 /* 362A00 E005E440 00220821 */  addu      $at, $at, $v0
-/* 362A04 E005E444 C4201DEC */  lwc1      $f0, %lo(D_800B1DEC)($at)
+/* 362A04 E005E444 C4201DEC */  lwc1      $f0, %lo(gCameras+0x6C)($at)
 /* 362A08 E005E448 3C073F80 */  lui       $a3, 0x3f80
 /* 362A0C E005E44C 46000007 */  neg.s     $f0, $f0
 /* 362A10 E005E450 44050000 */  mfc1      $a1, $f0