Import bss for audio and elsewhere (#416)

13 files changed, 54 insertions, 380 deletions

diff --git a/asm/bss_80005FD0.s b/asm/bss_80005FD0.s
index 82227fae4..df88d5c61 100644
--- a/asm/bss_80005FD0.s
+++ b/asm/bss_80005FD0.s
@@ -1,22 +1,22 @@
 .include "macros.inc"
 
 .section .bss
-.skip 96
 
-glabel D_80162E70
-.skip 64
 
-glabel D_80162EB0
-.skip 2
+#glabel D_80162E70
+#.skip 64
 
-glabel D_80162EB2
-.skip 6
+#glabel D_80162EB0
+#.skip 2
 
-glabel D_80162EB8
-.skip 80
+#glabel D_80162EB2
+#.skip 6
 
-glabel D_80162F08
-.skip 8
+#glabel D_80162EB8
+#.skip 80
+
+#glabel D_80162F08 # fake ptr
+#.skip 8
 
 glabel D_80162F10
 .skip 64
diff --git a/asm/bss_8001C4D0_1.s b/asm/bss_8001C4D0_1.s
deleted file mode 100644
index d54cc9ec8..000000000
--- a/asm/bss_8001C4D0_1.s
+++ /dev/null
@@ -1,82 +0,0 @@
-.include "macros.inc"
-
-.section .bss
-
-glabel D_8018E840
-.skip 16
-
-glabel D_8018E850
-.skip 4
-
-glabel D_8018E854
-.skip 4
-
-glabel D_8018E858
-.skip 4
-
-glabel D_8018E85C
-.skip 4
-
-glabel gTextColor
-.skip 8
-
-glabel gControllerPak1FileHandle
-.skip 104
-
-glabel gControllerPak2FileHandle
-.skip 104
-
-glabel D_8018E938
-.skip 508
-
-glabel D_8018EB34
-.skip 4
-
-glabel D_8018EB38
-.skip 64
-
-glabel gControllerPak1NumFilesUsed
-.skip 4
-
-glabel gControllerPak1MaxWriteableFiles
-.skip 4
-
-glabel gControllerPak1NumPagesFree
-.skip 4
-
-glabel gControllerPak1FileNote
-.skip 4
-
-glabel gControllerPak2FileNote
-.skip 8
-
-# SaveData
-glabel gSaveData
-.skip 512
-
-glabel D_8018ED90
-.skip 1
-
-glabel D_8018ED91
-.skip 3
-
-glabel D_8018ED94
-.skip 4
-
-glabel D_8018ED98
-.skip 4
-
-glabel D_8018ED9C
-.skip 4
-
-glabel D_8018EDA0
-.skip 4
-
-glabel D_8018EDA4
-.skip 4
-
-glabel D_8018EDA8
-.skip 4
-
-glabel D_8018EDAC
-.skip 4
diff --git a/asm/bss_main_audio.s b/asm/bss_main_audio.s
index eda5cef24..25212cdc2 100644
--- a/asm/bss_main_audio.s
+++ b/asm/bss_main_audio.s
@@ -2,48 +2,6 @@
 
 .section .bss
 
-glabel D_8018EF10
-.skip 8
-
-glabel D_8018EF18
-.skip 192
-
-glabel D_8018EFD8
-.skip 3000
-
-glabel D_8018FB90
-.skip 1
-
-glabel D_8018FB91
-.skip 7
-
-glabel D_8018FB98
-.skip 16
-
-glabel D_8018FBA8
-.skip 48
-
-glabel D_8018FBD8
-.skip 48
-
-glabel D_8018FC08
-.skip 8
-
-glabel D_8018FC10
-.skip 16
-
-glabel sSoundRequests
-.skip 6144
-
-glabel sSoundBanks
-.skip 5760
-
-glabel sSoundBankUsedListBack
-.skip 8
-
-glabel sSoundBankFreeListFront
-.skip 8
-
 glabel sNumSoundsInBank
 .skip 8
 
@@ -53,7 +11,7 @@ glabel D_80192AB8
 glabel D_80192C38
 .skip 4
 
-glabel sSoundBankDisabled
+glabel sSoundBankDisabled # 0x80192C3C
 .skip 12
 
 glabel D_80192C48
diff --git a/asm/bss_sptask_audio.s b/asm/bss_sptask_audio.s
deleted file mode 100644
index 2d30b567e..000000000
--- a/asm/bss_sptask_audio.s
+++ /dev/null
@@ -1,177 +0,0 @@
-.include "macros.inc"
-
-.section .bss
-
-# Audio
-
-glabel gSequencePlayers
-.skip 148
-
-glabel D_803B15A4
-.skip 180
-
-glabel D_803B1658
-.skip 328
-
-glabel D_803B17A0
-.skip 48
-
-glabel D_803B17D0
-.skip 280
-
-glabel D_803B18E8
-.skip 328
-# End of gSequencePlayers
-
-glabel gSequenceChannels
-.skip 9408
-
-glabel gSequenceLayers
-.skip 8192
-
-glabel gSequenceChannelNone
-.skip 108
-
-glabel D_803B5F5C
-.skip 92
-
-glabel gLayerFreeList
-.skip 16
-
-glabel gNoteFreeLists
-.skip 64
-
-glabel gCurrAudioFrameDmaQueue
-.skip 24
-
-glabel gCurrAudioFrameDmaMesgBufs
-.skip 256
-
-glabel gCurrAudioFrameDmaIoMesgBufs
-.skip 1536
-
-glabel D_803B6720
-.skip 24
-
-glabel D_803B6738
-.skip 8
-
-glabel D_803B6740
-.skip 24
-
-glabel sSampleDmas
-.skip 1792
-
-glabel gSampleDmaNumListItems
-.skip 4
-
-glabel sSampleDmaListSize1
-.skip 4
-
-glabel D_803B6E60
-.skip 8
-
-glabel sSampleDmaReuseQueue1
-.skip 256
-
-glabel sSampleDmaReuseQueue2
-.skip 256
-
-glabel sSampleDmaReuseQueueTail1
-.skip 1
-
-glabel sSampleDmaReuseQueueTail2
-.skip 1
-
-glabel sSampleDmaReuseQueueHead1
-.skip 1
-
-glabel sSampleDmaReuseQueueHead2
-.skip 1
-
-glabel D_803B706C
-.skip 4
-
-glabel D_803B7070
-.skip 4
-
-glabel D_803B7074
-.skip 4
-
-glabel gAlBankSets
-.skip 4
-
-glabel D_803B707C
-.skip 4
-
-glabel gCtlEntries
-.skip 8
-
-glabel gAudioBufferParameters
-.skip 32
-
-glabel D_803B70A8
-.skip 4
-
-glabel D_803B70AC
-.skip 4
-
-glabel gMaxSimultaneousNotes
-.skip 4
-
-glabel D_803B70B4
-.skip 2
-
-glabel gAudioLibSoundMode
-.skip 2
-
-glabel D_803B70B8
-.skip 4
-
-glabel gCurrAudioFrameDmaCount
-.skip 4
-
-glabel D_803B70C0
-.skip 4
-
-glabel D_803B70C4
-.skip 4
-
-glabel D_803B70C8
-.skip 8
-
-glabel D_803B70D0
-.skip 4
-
-glabel D_803B70D4
-.skip 4
-
-glabel D_803B70D8
-.skip 160
-
-glabel D_803B7178
-.skip 4
-
-glabel D_803B717C
-.skip 4
-
-glabel D_803B7180
-.skip 12
-
-glabel D_803B718C
-.skip 6
-
-glabel D_803B7192
-.skip 2
-
-glabel gAudioRandom
-.skip 4
-
-glabel gAudioErrorFlags
-.skip 8
-
-glabel D_803B71A0
-.skip 16
-
-glabel D_803B71B0
-
diff --git a/asm/non_matchings/audio/external/func_800C29B4.s b/asm/non_matchings/audio/external/func_800C29B4.s
index b1435757a..590b347b1 100644
--- a/asm/non_matchings/audio/external/func_800C29B4.s
+++ b/asm/non_matchings/audio/external/func_800C29B4.s
@@ -13,7 +13,7 @@ glabel func_800C29B4
 /* 0C35E0 800C29E0 0C032EEE */  jal   func_800CBBB8
 /* 0C35E4 800C29E4 03012025 */   or    $a0, $t8, $at
 /* 0C35E8 800C29E8 93C90033 */  lbu   $t1, 0x33($fp)
-/* 0C35EC 800C29EC 3C018019 */  lui   $at, %hi(D_80193318) # 0x8019
+/* 0C35EC 800C29EC 3C018019 */  lui   $at, %hi(D_801930D0+0x248) # 0x8019
 /* 0C35F0 800C29F0 3408FFFF */  li    $t0, 65535
 /* 0C35F4 800C29F4 000950C0 */  sll   $t2, $t1, 3
 /* 0C35F8 800C29F8 01495021 */  addu  $t2, $t2, $t1
@@ -23,7 +23,7 @@ glabel func_800C29B4
 /* 0C3608 800C2A08 01495023 */  subu  $t2, $t2, $t1
 /* 0C360C 800C2A0C 000A5080 */  sll   $t2, $t2, 2
 /* 0C3610 800C2A10 002A0821 */  addu  $at, $at, $t2
-/* 0C3614 800C2A14 A4283318 */  sh    $t0, %lo(D_80193318)($at) # 0x3318($at)
+/* 0C3614 800C2A14 A4283318 */  sh    $t0, %lo(D_801930D0+0x248)($at) # 0x3318($at)
 /* 0C3618 800C2A18 8FDF002C */  lw    $ra, 0x2c($fp)
 /* 0C361C 800C2A1C 03C0E825 */  move  $sp, $fp
 /* 0C3620 800C2A20 8FDE0028 */  lw    $fp, 0x28($fp)
diff --git a/asm/non_matchings/audio/external/func_800C3508.s b/asm/non_matchings/audio/external/func_800C3508.s
index 57af4a628..4d4099b30 100644
--- a/asm/non_matchings/audio/external/func_800C3508.s
+++ b/asm/non_matchings/audio/external/func_800C3508.s
@@ -24,9 +24,9 @@ glabel func_800C3508
 /* 0C415C 800C355C 00084080 */  sll   $t0, $t0, 2
 /* 0C4160 800C3560 01044023 */  subu  $t0, $t0, $a0
 /* 0C4164 800C3564 00084080 */  sll   $t0, $t0, 2
-/* 0C4168 800C3568 3C028019 */  lui   $v0, %hi(D_80193318) # 0x8019
+/* 0C4168 800C3568 3C028019 */  lui   $v0, %hi(D_801930D0+0x248) # 0x8019
 /* 0C416C 800C356C 00481021 */  addu  $v0, $v0, $t0
-/* 0C4170 800C3570 94423318 */  lhu   $v0, %lo(D_80193318)($v0) # 0x3318($v0)
+/* 0C4170 800C3570 94423318 */  lhu   $v0, %lo(D_801930D0+0x248)($v0) # 0x3318($v0)
 .L800C3574:
 /* 0C4174 800C3574 03E00008 */  jr    $ra
 /* 0C4178 800C3578 25BD0010 */   addiu $sp, $t5, 0x10
diff --git a/asm/non_matchings/audio/external/func_800C4FE4.s b/asm/non_matchings/audio/external/func_800C4FE4.s
index 5909f4c70..53ad3388d 100644
--- a/asm/non_matchings/audio/external/func_800C4FE4.s
+++ b/asm/non_matchings/audio/external/func_800C4FE4.s
@@ -43,7 +43,7 @@ glabel func_800C4FE4
 /* 0C5C84 800C5084 014B6021 */  addu  $t4, $t2, $t3
 /* 0C5C88 800C5088 91910004 */  lbu   $s1, 4($t4)
 /* 0C5C8C 800C508C 00137100 */  sll   $t6, $s3, 4
-/* 0C5C90 800C5090 3C04803B */  lui   $a0, %hi(D_803B17D0) # 0x803b
+/* 0C5C90 800C5090 3C04803B */  lui   $a0, %hi(gSequencePlayers+0x2C0) # 0x803b
 /* 0C5C94 800C5094 12210063 */  beq   $s1, $at, .L800C5224
 /* 0C5C98 800C5098 01D37023 */   subu  $t6, $t6, $s3
 /* 0C5C9C 800C509C 00117880 */  sll   $t7, $s1, 2
@@ -60,7 +60,7 @@ glabel func_800C4FE4
 /* 0C5CC8 800C50C8 008D2021 */  addu  $a0, $a0, $t5
 /* 0C5CCC 800C50CC 24010002 */  li    $at, 2
 /* 0C5CD0 800C50D0 1441002D */  bne   $v0, $at, .L800C5188
-/* 0C5CD4 800C50D4 8C8417D0 */   lw    $a0, %lo(D_803B17D0)($a0) # 0x17d0($a0)
+/* 0C5CD4 800C50D4 8C8417D0 */   lw    $a0, %lo(gSequencePlayers+0x2C0)($a0) # 0x17d0($a0)
 /* 0C5CD8 800C50D8 8E080024 */  lw    $t0, 0x24($s0)
 /* 0C5CDC 800C50DC A206002C */  sb    $a2, 0x2c($s0)
 /* 0C5CE0 800C50E0 326400FF */  andi  $a0, $s3, 0xff
diff --git a/asm/non_matchings/audio/external/func_800CA730.s b/asm/non_matchings/audio/external/func_800CA730.s
index f0ab2f04c..bcf98ad7c 100644
--- a/asm/non_matchings/audio/external/func_800CA730.s
+++ b/asm/non_matchings/audio/external/func_800CA730.s
@@ -85,11 +85,11 @@ glabel func_800CA730
 /* 0CB474 800CA874 1500003A */  bnez  $t0, .L800CA960
 /* 0CB478 800CA878 00000000 */   nop   
 /* 0CB47C 800CA87C 9129FC08 */  lbu   $t1, %lo(D_8018FC08)($t1)
-/* 0CB480 800CA880 3C0A803B */  lui   $t2, %hi(D_803B1658) # $t2, 0x803b
+/* 0CB480 800CA880 3C0A803B */  lui   $t2, %hi(gSequencePlayers+0x148) # $t2, 0x803b
 /* 0CB484 800CA884 3C041101 */  lui   $a0, 0x1101
 /* 0CB488 800CA888 11200030 */  beqz  $t1, .L800CA94C
 /* 0CB48C 800CA88C 00000000 */   nop   
-/* 0CB490 800CA890 8D4A1658 */  lw    $t2, %lo(D_803B1658)($t2)
+/* 0CB490 800CA890 8D4A1658 */  lw    $t2, %lo(gSequencePlayers+0x148)($t2)
 /* 0CB494 800CA894 24040001 */  li    $a0, 1
 /* 0CB498 800CA898 000A5FC2 */  srl   $t3, $t2, 0x1f
 /* 0CB49C 800CA89C 1560000B */  bnez  $t3, .L800CA8CC
diff --git a/asm/non_matchings/audio/port_eu/func_800CB818.s b/asm/non_matchings/audio/port_eu/func_800CB818.s
index 2cae275ed..0b06b7947 100644
--- a/asm/non_matchings/audio/port_eu/func_800CB818.s
+++ b/asm/non_matchings/audio/port_eu/func_800CB818.s
@@ -17,10 +17,10 @@ glabel func_800CB818
 /* 0CC454 800CB854 10410033 */  beq   $v0, $at, .L800CB924
 /* 0CC458 800CB858 240100F1 */   li    $at, 241
 /* 0CC45C 800CB85C 10410035 */  beq   $v0, $at, .L800CB934
-/* 0CC460 800CB860 3C03803B */   lui   $v1, %hi(D_803B1658) # 0x803b
+/* 0CC460 800CB860 3C03803B */   lui   $v1, %hi(gSequencePlayers+0x148) # 0x803b
 /* 0CC464 800CB864 240100F2 */  li    $at, 242
 /* 0CC468 800CB868 10410046 */  beq   $v0, $at, .L800CB984
-/* 0CC46C 800CB86C 3C03803B */   lui   $v1, %hi(D_803B1658) # $v1, 0x803b
+/* 0CC46C 800CB86C 3C03803B */   lui   $v1, %hi(gSequencePlayers+0x148) # $v1, 0x803b
 /* 0CC470 800CB870 240100F3 */  li    $at, 243
 /* 0CC474 800CB874 5041005C */  beql  $v0, $at, .L800CB9E8
 /* 0CC478 800CB878 90E40001 */   lbu   $a0, 1($a3)
@@ -78,49 +78,49 @@ glabel func_800CB818
 .L800CB934:
 /* 0CC534 800CB934 3C02803B */  lui   $v0, %hi(gSequencePlayers) # $v0, 0x803b
 /* 0CC538 800CB938 904B1510 */  lbu   $t3, %lo(gSequencePlayers)($v0)
-/* 0CC53C 800CB93C 90681658 */  lbu   $t0, %lo(D_803B1658)($v1)
-/* 0CC540 800CB940 3C04803B */  lui   $a0, %hi(D_803B17A0) # $a0, 0x803b
-/* 0CC544 800CB944 3C05803B */  lui   $a1, %hi(D_803B18E8) # $a1, 0x803b
-/* 0CC548 800CB948 90AA18E8 */  lbu   $t2, %lo(D_803B18E8)($a1)
-/* 0CC54C 800CB94C 908E17A0 */  lbu   $t6, %lo(D_803B17A0)($a0)
+/* 0CC53C 800CB93C 90681658 */  lbu   $t0, %lo(gSequencePlayers+0x148)($v1)
+/* 0CC540 800CB940 3C04803B */  lui   $a0, %hi(gSequencePlayers+0x290) # $a0, 0x803b
+/* 0CC544 800CB944 3C05803B */  lui   $a1, %hi(gSequencePlayers+0x3D8) # $a1, 0x803b
+/* 0CC548 800CB948 90AA18E8 */  lbu   $t2, %lo(gSequencePlayers+0x3D8)($a1)
+/* 0CC54C 800CB94C 908E17A0 */  lbu   $t6, %lo(gSequencePlayers+0x290)($a0)
 /* 0CC550 800CB950 3C01803B */  lui   $at, %hi(gSequencePlayers) # $at, 0x803b
 /* 0CC554 800CB954 35620024 */  ori   $v0, $t3, 0x24
 /* 0CC558 800CB958 A0221510 */  sb    $v0, %lo(gSequencePlayers)($at)
-/* 0CC55C 800CB95C 3C01803B */  lui   $at, %hi(D_803B1658) # $at, 0x803b
+/* 0CC55C 800CB95C 3C01803B */  lui   $at, %hi(gSequencePlayers+0x148) # $at, 0x803b
 /* 0CC560 800CB960 35030024 */  ori   $v1, $t0, 0x24
-/* 0CC564 800CB964 A0231658 */  sb    $v1, %lo(D_803B1658)($at)
-/* 0CC568 800CB968 3C01803B */  lui   $at, %hi(D_803B17A0) # $at, 0x803b
+/* 0CC564 800CB964 A0231658 */  sb    $v1, %lo(gSequencePlayers+0x148)($at)
+/* 0CC568 800CB968 3C01803B */  lui   $at, %hi(gSequencePlayers+0x290) # $at, 0x803b
 /* 0CC56C 800CB96C 35D80024 */  ori   $t8, $t6, 0x24
-/* 0CC570 800CB970 A03817A0 */  sb    $t8, %lo(D_803B17A0)($at)
-/* 0CC574 800CB974 3C01803B */  lui   $at, %hi(D_803B18E8) # $at, 0x803b
+/* 0CC570 800CB970 A03817A0 */  sb    $t8, %lo(gSequencePlayers+0x290)($at)
+/* 0CC574 800CB974 3C01803B */  lui   $at, %hi(gSequencePlayers+0x3D8) # $at, 0x803b
 /* 0CC578 800CB978 354C0024 */  ori   $t4, $t2, 0x24
 /* 0CC57C 800CB97C 1000001D */  b     .L800CB9F4
-/* 0CC580 800CB980 A02C18E8 */   sb    $t4, %lo(D_803B18E8)($at)
+/* 0CC580 800CB980 A02C18E8 */   sb    $t4, %lo(gSequencePlayers+0x3D8)($at)
 .L800CB984:
 /* 0CC584 800CB984 3C02803B */  lui   $v0, %hi(gSequencePlayers) # $v0, 0x803b
 /* 0CC588 800CB988 90421510 */  lbu   $v0, %lo(gSequencePlayers)($v0)
-/* 0CC58C 800CB98C 90631658 */  lbu   $v1, %lo(D_803B1658)($v1)
-/* 0CC590 800CB990 3C04803B */  lui   $a0, %hi(D_803B17A0) # $a0, 0x803b
-/* 0CC594 800CB994 908417A0 */  lbu   $a0, %lo(D_803B17A0)($a0)
-/* 0CC598 800CB998 3C05803B */  lui   $a1, %hi(D_803B18E8) # $a1, 0x803b
+/* 0CC58C 800CB98C 90631658 */  lbu   $v1, %lo(gSequencePlayers+0x148)($v1)
+/* 0CC590 800CB990 3C04803B */  lui   $a0, %hi(gSequencePlayers+0x290) # $a0, 0x803b
+/* 0CC594 800CB994 908417A0 */  lbu   $a0, %lo(gSequencePlayers+0x290)($a0)
+/* 0CC598 800CB998 3C05803B */  lui   $a1, %hi(gSequencePlayers+0x3D8) # $a1, 0x803b
 /* 0CC59C 800CB99C 304FFFDF */  andi  $t7, $v0, 0xffdf
-/* 0CC5A0 800CB9A0 90A518E8 */  lbu   $a1, %lo(D_803B18E8)($a1)
+/* 0CC5A0 800CB9A0 90A518E8 */  lbu   $a1, %lo(gSequencePlayers+0x3D8)($a1)
 /* 0CC5A4 800CB9A4 3C01803B */  lui   $at, %hi(gSequencePlayers) # $at, 0x803b
 /* 0CC5A8 800CB9A8 35E20004 */  ori   $v0, $t7, 4
 /* 0CC5AC 800CB9AC A0221510 */  sb    $v0, %lo(gSequencePlayers)($at)
 /* 0CC5B0 800CB9B0 306AFFDF */  andi  $t2, $v1, 0xffdf
 /* 0CC5B4 800CB9B4 35430004 */  ori   $v1, $t2, 4
-/* 0CC5B8 800CB9B8 3C01803B */  lui   $at, %hi(D_803B1658) # $at, 0x803b
-/* 0CC5BC 800CB9BC A0231658 */  sb    $v1, %lo(D_803B1658)($at)
+/* 0CC5B8 800CB9B8 3C01803B */  lui   $at, %hi(gSequencePlayers+0x148) # $at, 0x803b
+/* 0CC5BC 800CB9BC A0231658 */  sb    $v1, %lo(gSequencePlayers+0x148)($at)
 /* 0CC5C0 800CB9C0 308FFFDF */  andi  $t7, $a0, 0xffdf
 /* 0CC5C4 800CB9C4 35F90004 */  ori   $t9, $t7, 4
-/* 0CC5C8 800CB9C8 3C01803B */  lui   $at, %hi(D_803B17A0) # $at, 0x803b
-/* 0CC5CC 800CB9CC A03917A0 */  sb    $t9, %lo(D_803B17A0)($at)
+/* 0CC5C8 800CB9C8 3C01803B */  lui   $at, %hi(gSequencePlayers+0x290) # $at, 0x803b
+/* 0CC5CC 800CB9CC A03917A0 */  sb    $t9, %lo(gSequencePlayers+0x290)($at)
 /* 0CC5D0 800CB9D0 30AAFFDF */  andi  $t2, $a1, 0xffdf
 /* 0CC5D4 800CB9D4 354C0004 */  ori   $t4, $t2, 4
-/* 0CC5D8 800CB9D8 3C01803B */  lui   $at, %hi(D_803B18E8) # $at, 0x803b
+/* 0CC5D8 800CB9D8 3C01803B */  lui   $at, %hi(gSequencePlayers+0x3D8) # $at, 0x803b
 /* 0CC5DC 800CB9DC 10000005 */  b     .L800CB9F4
-/* 0CC5E0 800CB9E0 A02C18E8 */   sb    $t4, %lo(D_803B18E8)($at)
+/* 0CC5E0 800CB9E0 A02C18E8 */   sb    $t4, %lo(gSequencePlayers+0x3D8)($at)
 /* 0CC5E4 800CB9E4 90E40001 */  lbu   $a0, 1($a3)
 .L800CB9E8:
 /* 0CC5E8 800CB9E8 90E50002 */  lbu   $a1, 2($a3)
diff --git a/asm/non_matchings/code_80005FD0/func_80011A5C.s b/asm/non_matchings/code_80005FD0/func_80011A5C.s
deleted file mode 100644
index dca94b310..000000000
--- a/asm/non_matchings/code_80005FD0/func_80011A5C.s
+++ /dev/null
@@ -1,25 +0,0 @@
-glabel func_80011A5C
-/* 01265C 80011A5C 27BDFFD8 */  addiu $sp, $sp, -0x28
-/* 012660 80011A60 AFB20020 */  sw    $s2, 0x20($sp)
-/* 012664 80011A64 AFB1001C */  sw    $s1, 0x1c($sp)
-/* 012668 80011A68 AFB00018 */  sw    $s0, 0x18($sp)
-/* 01266C 80011A6C 3C108016 */  lui   $s0, %hi(D_80162EB8) # $s0, 0x8016
-/* 012670 80011A70 3C11800E */  lui   $s1, %hi(D_800DC720)
-/* 012674 80011A74 3C128016 */  lui   $s2, %hi(D_80162F08) # $s2, 0x8016
-/* 012678 80011A78 AFBF0024 */  sw    $ra, 0x24($sp)
-/* 01267C 80011A7C 26522F08 */  addiu $s2, %lo(D_80162F08) # addiu $s2, $s2, 0x2f08
-/* 012680 80011A80 2631C720 */  addiu $s1, %lo(D_800DC720) # addiu $s1, $s1, -0x38e0
-/* 012684 80011A84 26102EB8 */  addiu $s0, %lo(D_80162EB8) # addiu $s0, $s0, 0x2eb8
-.L80011A88:
-/* 012688 80011A88 0C026455 */  jal   segmented_to_virtual_dupe_2
-/* 01268C 80011A8C 8E240000 */   lw    $a0, ($s1)
-/* 012690 80011A90 26100004 */  addiu $s0, $s0, 4
-/* 012694 80011A94 26310004 */  addiu $s1, $s1, 4
-/* 012698 80011A98 1612FFFB */  bne   $s0, $s2, .L80011A88
-/* 01269C 80011A9C AE02FFFC */   sw    $v0, -4($s0)
-/* 0126A0 80011AA0 8FBF0024 */  lw    $ra, 0x24($sp)
-/* 0126A4 80011AA4 8FB00018 */  lw    $s0, 0x18($sp)
-/* 0126A8 80011AA8 8FB1001C */  lw    $s1, 0x1c($sp)
-/* 0126AC 80011AAC 8FB20020 */  lw    $s2, 0x20($sp)
-/* 0126B0 80011AB0 03E00008 */  jr    $ra
-/* 0126B4 80011AB4 27BD0028 */   addiu $sp, $sp, 0x28
diff --git a/asm/non_matchings/code_80091750/add_8018D9E0_entry.s b/asm/non_matchings/code_80091750/add_8018D9E0_entry.s
index 0aa1af9a1..8707c3329 100644
--- a/asm/non_matchings/code_80091750/add_8018D9E0_entry.s
+++ b/asm/non_matchings/code_80091750/add_8018D9E0_entry.s
@@ -167,8 +167,8 @@ glabel add_8018D9E0_entry
 /* 09F370 8009E770 00000000 */   nop
 glabel L8009E774
 /* 09F374 8009E774 44802000 */  mtc1  $zero, $f4
-/* 09F378 8009E778 3C018019 */  lui   $at, %hi(D_8018ED94) # $at, 0x8019
-/* 09F37C 8009E77C AC20ED94 */  sw    $zero, %lo(D_8018ED94)($at)
+/* 09F378 8009E778 3C018019 */  lui   $at, %hi(s8018ED94) # $at, 0x8019
+/* 09F37C 8009E77C AC20ED94 */  sw    $zero, %lo(s8018ED94)($at)
 /* 09F380 8009E780 3C01800F */  lui   $at, %hi(D_800E8530) # $at, 0x800f
 /* 09F384 8009E784 E4248530 */  swc1  $f4, %lo(D_800E8530)($at)
 /* 09F388 8009E788 3C014040 */  li    $at, 0x40400000 # 3.000000
diff --git a/asm/non_matchings/code_80091750/func_800A0B80.s b/asm/non_matchings/code_80091750/func_800A0B80.s
index 5732e1314..f769c3613 100644
--- a/asm/non_matchings/code_80091750/func_800A0B80.s
+++ b/asm/non_matchings/code_80091750/func_800A0B80.s
@@ -71,18 +71,18 @@ glabel func_800A0B80
 /* 0A1884 800A0C84 24C60001 */   addiu $a2, $a2, 1
 /* 0A1888 800A0C88 82C20000 */  lb    $v0, ($s6)
 .L800A0C8C:
-/* 0A188C 800A0C8C 3C0D8019 */  lui   $t5, %hi(D_8018EB34) # 0x8019
+/* 0A188C 800A0C8C 3C0D8019 */  lui   $t5, %hi(pfsState+0x1FC) # 0x8019
 /* 0A1890 800A0C90 8EEB0010 */  lw    $t3, 0x10($s7)
 /* 0A1894 800A0C94 00026080 */  sll   $t4, $v0, 2
 /* 0A1898 800A0C98 01AC6821 */  addu  $t5, $t5, $t4
-/* 0A189C 800A0C9C 8DADEB34 */  lw    $t5, %lo(D_8018EB34)($t5) # -0x14cc($t5)
+/* 0A189C 800A0C9C 8DADEB34 */  lw    $t5, %lo(pfsState+0x1FC)($t5) # -0x14cc($t5)
 /* 0A18A0 800A0CA0 01719021 */  addu  $s2, $t3, $s1
 /* 0A18A4 800A0CA4 26520001 */  addiu $s2, $s2, 1
 /* 0A18A8 800A0CA8 15A0003B */  bnez  $t5, .L800A0D98
 /* 0A18AC 800A0CAC 2406004F */   li    $a2, 79
 /* 0A18B0 800A0CB0 00027140 */  sll   $t6, $v0, 5
-/* 0A18B4 800A0CB4 3C188019 */  lui   $t8, %hi(D_8018E938) # $t8, 0x8019
-/* 0A18B8 800A0CB8 2718E938 */  addiu $t8, %lo(D_8018E938) # addiu $t8, $t8, -0x16c8
+/* 0A18B4 800A0CB4 3C188019 */  lui   $t8, %hi(pfsState) # $t8, 0x8019
+/* 0A18B8 800A0CB8 2718E938 */  addiu $t8, %lo(pfsState) # addiu $t8, $t8, -0x16c8
 /* 0A18BC 800A0CBC 25CFFFE0 */  addiu $t7, $t6, -0x20
 /* 0A18C0 800A0CC0 01F8A021 */  addu  $s4, $t7, $t8
 /* 0A18C4 800A0CC4 2684000E */  addiu $a0, $s4, 0xe
diff --git a/asm/non_matchings/code_80091750/func_800A7A4C.s b/asm/non_matchings/code_80091750/func_800A7A4C.s
index 1b45b5b49..3083b3d1b 100644
--- a/asm/non_matchings/code_80091750/func_800A7A4C.s
+++ b/asm/non_matchings/code_80091750/func_800A7A4C.s
@@ -199,8 +199,8 @@ glabel func_800A7A4C
 /* 0A8770 800A7B70 03200008 */  jr    $t9
 /* 0A8774 800A7B74 00000000 */   nop
 glabel L800A7B78
-/* 0A8778 800A7B78 3C028019 */  lui   $v0, %hi(D_8018ED94) # $v0, 0x8019
-/* 0A877C 800A7B7C 8C42ED94 */  lw    $v0, %lo(D_8018ED94)($v0)
+/* 0A8778 800A7B78 3C028019 */  lui   $v0, %hi(s8018ED94) # $v0, 0x8019
+/* 0A877C 800A7B7C 8C42ED94 */  lw    $v0, %lo(s8018ED94)($v0)
 /* 0A8780 800A7B80 28410050 */  slti  $at, $v0, 0x50
 /* 0A8784 800A7B84 10200004 */  beqz  $at, .L800A7B98
 /* 0A8788 800A7B88 3C014040 */   li    $at, 0x40400000 # 3.000000
@@ -265,8 +265,8 @@ glabel L800A7B78
 /* 0A8860 800A7C60 24480001 */  addiu $t0, $v0, 1
 /* 0A8864 800A7C64 46105481 */  sub.s $f18, $f10, $f16
 /* 0A8868 800A7C68 E432EDCC */  swc1  $f18, %lo(D_8018EDCC)($at)
-/* 0A886C 800A7C6C 3C018019 */  lui   $at, %hi(D_8018ED94) # $at, 0x8019
-/* 0A8870 800A7C70 AC28ED94 */  sw    $t0, %lo(D_8018ED94)($at)
+/* 0A886C 800A7C6C 3C018019 */  lui   $at, %hi(s8018ED94) # $at, 0x8019
+/* 0A8870 800A7C70 AC28ED94 */  sw    $t0, %lo(s8018ED94)($at)
 /* 0A8874 800A7C74 3C01C3B4 */  li    $at, 0xC3B40000 # -360.000000
 /* 0A8878 800A7C78 44812000 */  mtc1  $at, $f4
 /* 0A887C 800A7C7C 3C0143B4 */  li    $at, 0x43B40000 # 360.000000