Added bss (#18)

asm/bss_800040C0.s

@@ -0,0 +1,21 @@
+.include "macros.inc"
+
+.section .bss
+
+glabel D_80162790
+.skip 1456
+
+glabel D_80162D40
+.skip 24
+
+glabel D_80162D58
+.skip 4
+
+glabel D_80162D5C
+.skip 4
+
+glabel D_80162D60
+.skip 4
+
+glabel D_80162D64
+.skip 12

asm/bss_80004740.s

@@ -0,0 +1,15 @@
+.include "macros.inc"
+
+.section .bss
+
+glabel D_80162D70
+.skip 6
+
+glabel D_80162D76
+.skip 2
+
+glabel D_80162D78
+.skip 2
+
+glabel D_80162D7A
+.skip 6

asm/bss_80004EF0.s

@@ -0,0 +1,108 @@
+.include "macros.inc"
+
+.section .bss
+
+glabel D_80162D80
+.skip 4
+
+glabel D_80162D84
+.skip 2
+
+glabel D_80162D86
+.skip 2
+
+glabel D_80162D88
+.skip 4
+
+glabel D_80162D8C
+.skip 4
+
+glabel D_80162D90
+.skip 4
+
+glabel D_80162D94
+.skip 4
+
+glabel D_80162D98
+.skip 4
+
+glabel D_80162D9C
+.skip 4
+
+glabel D_80162DA0
+.skip 4
+
+glabel D_80162DA4
+.skip 4
+
+glabel D_80162DA8
+.skip 4
+
+glabel D_80162DAC
+.skip 4
+
+glabel D_80162DB0
+.skip 4
+
+glabel D_80162DB4
+.skip 4
+
+glabel D_80162DB8
+.skip 4
+
+glabel D_80162DBC
+.skip 4
+
+glabel D_80162DC0
+.skip 4
+
+glabel D_80162DC4
+.skip 4
+
+glabel D_80162DC8
+.skip 4
+
+glabel D_80162DCC
+.skip 4
+
+glabel D_80162DD0
+.skip 4
+
+glabel D_80162DD4
+.skip 2
+
+glabel D_80162DD6
+.skip 2
+
+glabel D_80162DD8
+.skip 4
+
+glabel D_80162DDC
+.skip 4
+
+glabel D_80162DE0
+.skip 4
+
+glabel D_80162DE4
+.skip 4
+
+glabel D_80162DE8
+.skip 4
+
+glabel D_80162DEC
+.skip 4
+
+glabel D_80162DF0
+.skip 4
+
+glabel D_80162DF4
+.skip 4
+
+glabel D_80162DF8
+.skip 4
+
+glabel D_80162DFC
+.skip 4
+
+glabel D_80162E00
+.skip 112

asm/bss_80005FD0.s

@@ -0,0 +1,312 @@
+.include "macros.inc"
+
+.section .bss
+
+glabel D_80162E70
+.skip 64
+
+glabel D_80162EB0
+.skip 2
+
+glabel D_80162EB2
+.skip 6
+
+glabel D_80162EB8
+.skip 80
+
+glabel D_80162F08
+.skip 8
+
+glabel D_80162F10
+.skip 64
+
+glabel D_80162F50
+.skip 60
+
+glabel D_80162F8C
+.skip 20
+
+glabel D_80162FA0
+.skip 8
+
+glabel D_80162FA8
+.skip 8
+
+glabel D_80162FB0
+.skip 16
+
+glabel D_80162FC0
+.skip 12
+
+glabel D_80162FCC
+.skip 2
+
+glabel D_80162FCE
+.skip 2
+
+glabel D_80162FD0
+.skip 8
+
+glabel D_80162FD8
+.skip 32
+
+glabel D_80162FF8
+.skip 24
+
+glabel D_80163010
+.skip 24
+
+glabel D_80163028
+.skip 40
+
+glabel D_80163050
+.skip 24
+
+glabel D_80163068
+.skip 40
+
+glabel D_80163090
+.skip 40
+
+glabel D_801630B8
+.skip 40
+
+glabel D_801630E0
+.skip 2
+
+glabel D_801630E2
+.skip 6
+
+glabel D_801630E8
+.skip 20
+
+glabel D_801630FC
+.skip 4
+
+glabel D_80163100
+.skip 40
+
+glabel D_80163128
+.skip 40
+
+glabel D_80163150
+.skip 40
+
+glabel D_80163178
+.skip 40
+
+glabel D_801631A0
+.skip 40
+
+glabel D_801631C8
+.skip 4
+
+glabel D_801631CC
+.skip 4
+
+glabel D_801631D0
+.skip 4
+
+glabel D_801631D4
+.skip 4
+
+glabel D_801631D8
+.skip 4
+
+glabel D_801631DC
+.skip 4
+
+glabel D_801631E0
+.skip 24
+
+glabel D_801631F8
+.skip 20
+
+glabel D_8016320C
+.skip 4
+
+glabel D_80163210
+.skip 40
+
+glabel D_80163238
+.skip 8
+
+glabel D_80163240
+.skip 24
+
+glabel D_80163258
+.skip 24
+
+glabel D_80163270
+.skip 24
+
+glabel D_80163288
+.skip 40
+
+glabel D_801632B0
+.skip 8
+
+glabel D_801632B8
+.skip 24
+
+glabel D_801632D0
+.skip 24
+
+glabel D_801632E8
+.skip 24
+
+glabel D_80163300
+.skip 24
+
+glabel D_80163318
+.skip 24
+
+glabel D_80163330
+.skip 16
+
+glabel D_80163340
+.skip 4
+
+glabel D_80163344
+.skip 2
+
+glabel D_80163346
+.skip 2
+
+glabel D_80163348
+.skip 4
+
+glabel D_8016334C
+.skip 4
+
+glabel D_80163350
+.skip 24
+
+glabel D_80163368
+.skip 16
+
+glabel D_80163378
+.skip 4
+
+glabel D_8016337C
+.skip 4
+
+glabel D_80163380
+.skip 24
+
+glabel D_80163398
+.skip 24
+
+glabel D_801633B0
+.skip 24
+
+glabel D_801633C8
+.skip 24
+
+glabel D_801633E0
+.skip 24
+
+glabel D_801633F8
+.skip 24
+
+glabel D_80163410
+.skip 8
+
+glabel D_80163418
+.skip 16
+
+glabel D_80163428
+.skip 16
+
+glabel D_80163438
+.skip 16
+
+glabel D_80163448
+.skip 2
+
+glabel D_8016344A
+.skip 2
+
+glabel D_8016344C
+.skip 4
+
+glabel D_80163450
+.skip 40
+
+glabel D_80163478
+.skip 2
+
+glabel D_8016347A
+.skip 2
+
+glabel D_8016347C
+.skip 2
+
+glabel D_8016347E
+.skip 2
+
+glabel D_80163480
+.skip 4
+
+glabel D_80163484
+.skip 4
+
+glabel D_80163488
+.skip 4
+
+glabel D_8016348C
+.skip 4
+
+glabel D_80163490
+.skip 24
+
+glabel D_801634A8
+.skip 24
+
+glabel D_801634C0
+.skip 24
+
+glabel D_801634D8
+.skip 20
+
+glabel D_801634EC
+.skip 4
+
+glabel D_801634F0
+.skip 4
+
+glabel D_801634F4
+.skip 4
+
+glabel D_801634F8
+.skip 4
+
+glabel D_801634FC
+.skip 8
+
+glabel D_80163504
+.skip 76
+
+glabel D_80163550
+.skip 72
+
+glabel D_80163598
+.skip 4
+
+glabel D_8016359C
+.skip 4
+
+glabel D_801635A0
+.skip 4
+
+glabel D_801635A4
+.skip 12
+
+glabel D_801635B0
+.skip 12
+
+glabel D_801635BC
+.skip 8
+
+glabel D_801635C4
+.skip 220

asm/bss_800431B0.s

@@ -0,0 +1,11 @@
+.include "macros.inc"
+
+.section .bss
+
+glabel D_801636A0
+.skip 16
+
+glabel D_801636B0
+.skip 252
+
+glabel D_801637AC

asm/bss_8028DF00.s

@@ -0,0 +1,65 @@
+.include "macros.inc"
+
+.section .bss
+
+glabel D_802BA030
+.skip 2
+
+glabel D_802BA032
+.skip 2
+
+glabel D_802BA034
+.skip 4
+
+glabel D_802BA038
+.skip 8
+
+glabel D_802BA040
+.skip 2
+
+glabel D_802BA042
+.skip 2
+
+glabel D_802BA044
+.skip 2
+
+glabel D_802BA046
+.skip 2
+
+glabel D_802BA048
+.skip 8
+
+glabel D_802BA050
+.skip 4
+
+glabel D_802BA054
+.skip 4
+
+glabel D_802BA058
+.skip 4
+
+glabel D_802BA05C
+.skip 4
+
+glabel D_802BA060
+.skip 512
+
+glabel D_802BA260
+.skip 16
+
+glabel D_802BA270
+.skip 4
+
+glabel D_802BA274
+.skip 4
+
+glabel D_802BA278
+.skip 4
+
+glabel D_802BA27C
+.skip 4
+
+glabel D_802BA280
+.skip 16
+
+glabel D_802BA290

asm/bss_80296A50.s

@@ -0,0 +1,4 @@
+.include "macros.inc"
+
+.section .bss
+

asm/bss_main.s

@@ -0,0 +1,581 @@
+.include "macros.inc"
+.section .bss
+
+glabel gControllers # 0x800F6910
+.word 0x00000000
+
+glabel D_800F6914
+.hword 0x0000
+
+glabel D_800F6916
+.hword 0x0000
+
+glabel D_800F6918
+.word 0x00000000
+.word 0x00000000
+
+glabel gPlayer2Controller # 0x800F6920
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+
+glabel gPlayer3Controller # 0x800F6930
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+
+glabel gPlayer4Controller # 0x800F6940
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+
+glabel D_800F6950
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+
+glabel D_800F6960
+.skip 16
+
+glabel D_800F6970
+.skip 16
+
+glabel D_800F6980
+.skip 16
+
+glabel D_800F6990
+.word 0x00000000
+
+glabel D_800F6994
+.skip 16
+
+glabel gPlayer1PosX # 0x800F69A4
+.word 0x00000000
+
+glabel gPlayer1PosY # 0x800F69A8
+.word 0x00000000
+
+glabel gPlayer1PosZ # 0x800F69AC
+.skip 18
+
+glabel gPlayer1Rotation # 0x800F69BE
+.skip 22
+
+glabel D_800F69D4
+.skip 80
+
+glabel D_800F6A24
+.skip 40
+
+glabel D_800F6A4C
+.skip 408
+
+glabel D_800F6BE4
+.skip 2948
+
+glabel D_800F7768
+.skip 3544
+
+glabel D_800F8540
+.skip 3544
+
+glabel D_800F9318
+.skip 3544
+
+glabel D_800FA0F0
+.skip 3544
+
+glabel D_800FAEC8
+.skip 3544
+
+glabel D_800FBCA0
+.skip 3544
+
+glabel D_800FCA78
+.skip 3544
+
+glabel D_800FD850
+.skip 16
+
+glabel gGfxPools
+.skip 10616
+
+glabel D_801001D8
+.skip 322920
+
+glabel gGfxPool # 0x8014EF40
+.skip 8
+
+glabel D_8014EF48
+.skip 8
+
+glabel sSoundVblankHandler  # 0x8014EF50
+.skip 8
+
+glabel D_8014EF58
+.skip 24
+
+glabel D_8014EF70
+.skip 24
+
+glabel D_8014EF88
+.skip 48
+
+glabel gIntrMesgQueue
+.skip 24
+
+glabel D_8014EFD0
+.skip 24
+
+glabel sSoundMesgQueue # 0x8014EFE8
+.skip 24
+
+glabel sSoundMesgBuf # 0x8014F000
+.skip 4
+glabel D_8014F004
+.skip 4
+
+glabel D_8014F008
+.skip 4
+
+glabel D_8014F00C
+.skip 12
+
+glabel D_8014F018
+.skip 64
+
+glabel D_8014F058
+.skip 64
+
+glabel D_8014F098
+.skip 8
+
+glabel D_8014F0A0
+.skip 24
+
+glabel gSIEventMesgQueue
+.skip 24
+
+glabel gSIEventMesgBuf
+.skip 16
+
+glabel gControllerStatuses
+.skip 2
+
+glabel D_8014F0E2
+.skip 14
+
+glabel gControllerPads
+.skip 24
+
+glabel gControllerBits
+.skip 8
+
+glabel D_8014F110
+.skip 4096
+
+glabel D_80150110
+.skip 2
+
+glabel D_80150112
+.skip 2
+
+glabel D_80150114
+.skip 4
+
+glabel D_80150118
+.skip 4
+
+glabel D_8015011C
+.skip 2
+
+glabel D_8015011E
+.skip 2
+
+glabel D_80150120
+.skip 4
+
+glabel D_80150124
+.skip 12
+
+glabel D_80150130
+.skip 4
+
+glabel D_80150134
+.skip 4
+
+glabel D_80150138
+.skip 4
+
+glabel D_8015013C
+.skip 12
+
+glabel D_80150148
+.skip 4
+
+glabel D_8015014C
+.skip 4
+
+glabel D_80150150
+.skip 8
+
+glabel D_80150158
+.skip 256
+
+glabel gSegmentTable # 0x80150258
+.skip 20
+
+glabel D_8015026C
+.skip 44
+
+glabel gDisplayListHead # 0x80150298
+.word 0x00000000
+
+glabel gGfxSPTask
+.word 0x00000000
+
+glabel D_801502A0
+.skip 8
+
+glabel D_801502A8
+.skip 12
+
+glabel D_801502B4
+.skip 12
+
+glabel D_801502C0
+.skip 8256
+
+glabel D_80152300
+.skip 2
+
+glabel D_80152302
+.skip 2
+
+glabel D_80152304
+.skip 2
+
+glabel D_80152306
+.skip 2
+
+glabel D_80152308
+.skip 440
+
+glabel D_801524C0
+.skip 8624
+
+glabel D_80154670
+.skip 8624
+
+glabel D_80156820
+.skip 8624
+
+glabel D_801589D0
+.skip 2224
+
+glabel D_80159280
+.skip 6400
+
+glabel D_8015AB80
+.skip 5248
+
+glabel D_8015C000
+.skip 3376
+
+glabel D_8015CD30
+.skip 4528
+
+glabel gGfxSPTaskYieldBuffer # 0x8015DEE0
+.skip 4352
+
+glabel gGfxSPTaskStack # 0x8015EFE0
+.skip 1024
+
+glabel D_8015F3E0
+.skip 128
+
+glabel D_8015F460
+.skip 32
+
+glabel D_8015F480
+.skip 44
+
+glabel D_8015F4AC
+.skip 2
+
+glabel D_8015F4AE
+.skip 2
+
+glabel D_8015F4B0
+.skip 2
+
+glabel D_8015F4B2
+.skip 14
+
+glabel D_8015F4C0
+.skip 44
+
+glabel D_8015F4EC
+.skip 2
+
+glabel D_8015F4EE
+.skip 2
+
+glabel D_8015F4F0
+.skip 2
+
+glabel D_8015F4F2
+.skip 14
+
+glabel D_8015F500
+.skip 44
+
+glabel D_8015F52C
+.skip 2
+
+glabel D_8015F52E
+.skip 2
+
+glabel D_8015F530
+.skip 2
+
+glabel D_8015F532
+.skip 14
+
+glabel D_8015F540
+.skip 44
+
+glabel D_8015F56C
+.skip 2
+
+glabel D_8015F56E
+.skip 2
+
+glabel D_8015F570
+.skip 2
+
+glabel D_8015F572
+.skip 14
+
+glabel D_8015F580
+.skip 4
+
+glabel D_8015F584
+.skip 4
+
+glabel D_8015F588
+.skip 2
+
+glabel D_8015F58A
+.skip 2
+
+glabel D_8015F58C
+.skip 4
+
+glabel D_8015F590
+.skip 12
+
+glabel D_8015F59C
+.skip 4
+
+glabel D_8015F5A0
+.skip 4
+
+glabel D_8015F5A4
+.skip 196
+
+glabel D_8015F668
+.skip 128
+
+glabel D_8015F6E8
+.skip 2
+
+glabel D_8015F6EA
+.skip 2
+
+glabel D_8015F6EC
+.skip 2
+
+glabel D_8015F6EE
+.skip 2
+
+glabel D_8015F6F0
+.skip 2
+
+glabel D_8015F6F2
+.skip 2
+
+glabel D_8015F6F4
+.skip 2
+
+glabel D_8015F6F6
+.skip 2
+
+glabel D_8015F6F8
+.skip 2
+
+glabel D_8015F6FA
+.skip 2
+
+glabel D_8015F6FC
+.skip 2
+
+glabel D_8015F6FE
+.skip 2
+
+glabel D_8015F700
+.skip 2
+
+glabel D_8015F702
+.skip 2
+
+glabel D_8015F704
+.skip 4
+
+glabel D_8015F708
+.skip 16
+
+glabel D_8015F718
+.skip 12
+
+glabel D_8015F724
+.skip 4
+
+glabel gPrevLoadedAddress # 0x8015F728
+.skip 4
+
+glabel gHeapEndPtr # 0x8015F72C
+.skip 4
+
+glabel D_8015F730
+.word 0x00000000
+
+glabel D_8015F734
+.word 0x00000000
+
+glabel D_8015F738
+.skip 16
+
+glabel D_8015F748
+.skip 16
+
+glabel D_8015F758
+.skip 16
+
+glabel D_8015F768
+.skip 16
+
+glabel D_8015F778
+.skip 12
+
+glabel gCourseDirection
+.skip 4
+
+glabel D_8015F788
+.skip 8
+
+glabel D_8015F790
+.skip 256
+
+glabel D_8015F890
+.skip 2
+
+glabel D_8015F892
+.skip 2
+
+glabel D_8015F894
+.skip 4
+
+glabel D_8015F898
+.skip 32
+
+glabel D_8015F8B8
+.skip 4
+
+glabel D_8015F8BC
+.skip 4
+
+glabel D_8015F8C0
+.skip 4
+
+glabel D_8015F8C4
+.skip 4
+
+glabel D_8015F8C8
+.skip 4
+
+glabel D_8015F8CC
+.skip 4
+
+glabel D_8015F8D0
+.skip 8
+
+glabel D_8015F8D8
+.skip 4
+
+glabel D_8015F8DC
+.skip 4
+
+glabel D_8015F8E0
+.skip 4
+
+glabel D_8015F8E4
+.skip 4
+
+glabel D_8015F8E8
+.skip 8
+
+glabel D_8015F8F0
+.skip 2
+
+glabel D_8015F8F2
+.skip 2
+
+glabel D_8015F8F4
+.skip 2
+
+glabel D_8015F8F6
+.skip 10
+
+glabel D_8015F900
+.skip 184
+
+glabel D_8015F9B8
+.skip 6
+
+glabel D_8015F9BE
+.skip 938
+
+glabel D_8015FD68
+.skip 9665
+
+glabel D_80162329
+.skip 591
+
+glabel D_80162578
+.skip 112
+
+glabel D_801625E8
+.skip 2
+
+glabel sController1Unplugged
+.skip 2
+
+glabel D_801625EC
+.skip 4
+
+glabel D_801625F0
+.skip 4
+
+glabel D_801625F4
+.skip 4
+
+glabel D_801625F8
+.skip 4
+
+glabel D_801625FC
+

asm/code_80091750.s

@@ -31989,8 +31989,8 @@ glabel L800ADFA0
 /* 0AEBAC 800ADFAC 8FA50020 */   lw    $a1, 0x20($sp)
 /* 0AEBB0 800ADFB0 3C08800E */  lui   $t0, %hi(D_800DC5FC) # $t0, 0x800e
 /* 0AEBB4 800ADFB4 9508C5FC */  lhu   $t0, %lo(D_800DC5FC)($t0)
-/* 0AEBB8 800ADFB8 3C0B800F */  lui   $t3, %hi(gPlayer1Controller) # $t3, 0x800f
-/* 0AEBBC 800ADFBC 256B6910 */  addiu $t3, %lo(gPlayer1Controller) # addiu $t3, $t3, 0x6910
+/* 0AEBB8 800ADFB8 3C0B800F */  lui   $t3, %hi(gControllers) # $t3, 0x800f
+/* 0AEBBC 800ADFBC 256B6910 */  addiu $t3, %lo(gControllers) # addiu $t3, $t3, 0x6910
 /* 0AEBC0 800ADFC0 00084900 */  sll   $t1, $t0, 4
 /* 0AEBC4 800ADFC4 252AFFF0 */  addiu $t2, $t1, -0x10
 /* 0AEBC8 800ADFC8 014B3021 */  addu  $a2, $t2, $t3

asm/code_8028DF00.s

@@ -1918,8 +1918,8 @@ glabel func_8028F970
 /* 0F8FCC 8028F9BC 0012C900 */   sll   $t9, $s2, 4
 /* 0F8FD0 8028F9C0 3C09800E */  lui   $t1, %hi(D_800DC52C) # $t1, 0x800e
 /* 0F8FD4 8028F9C4 8D29C52C */  lw    $t1, %lo(D_800DC52C)($t1)
-/* 0F8FD8 8028F9C8 3C08800F */  lui   $t0, %hi(gPlayer1Controller) # $t0, 0x800f
-/* 0F8FDC 8028F9CC 25086910 */  addiu $t0, %lo(gPlayer1Controller) # addiu $t0, $t0, 0x6910
+/* 0F8FD8 8028F9C8 3C08800F */  lui   $t0, %hi(gControllers) # $t0, 0x800f
+/* 0F8FDC 8028F9CC 25086910 */  addiu $t0, %lo(gControllers) # addiu $t0, $t0, 0x6910
 /* 0F8FE0 8028F9D0 24010003 */  li    $at, 3
 /* 0F8FE4 8028F9D4 11210017 */  beq   $t1, $at, .L8028FA34
 /* 0F8FE8 8028F9D8 03288021 */   addu  $s0, $t9, $t0

asm/code_80296A50.s

@@ -11587,9 +11587,9 @@ glabel update_obj_fake_item_box
 /* 10A8E0 802A12D0 02002025 */   move  $a0, $s0
 /* 10A8E4 802A12D4 8FA2002C */  lw    $v0, 0x2c($sp)
 /* 10A8E8 802A12D8 8FAF0074 */  lw    $t7, 0x74($sp)
-/* 10A8EC 802A12DC 3C19800F */  lui   $t9, %hi(gPlayer1Controller) # $t9, 0x800f
+/* 10A8EC 802A12DC 3C19800F */  lui   $t9, %hi(gControllers) # $t9, 0x800f
 /* 10A8F0 802A12E0 944D0000 */  lhu   $t5, ($v0)
-/* 10A8F4 802A12E4 27396910 */  addiu $t9, %lo(gPlayer1Controller) # addiu $t9, $t9, 0x6910
+/* 10A8F4 802A12E4 27396910 */  addiu $t9, %lo(gControllers) # addiu $t9, $t9, 0x6910
 /* 10A8F8 802A12E8 000FC100 */  sll   $t8, $t7, 4
 /* 10A8FC 802A12EC 31AE4000 */  andi  $t6, $t5, 0x4000
 /* 10A900 802A12F0 11C0006D */  beqz  $t6, .L802A14A8

asm/code_802A3730.s

@@ -4154,12 +4154,12 @@ glabel func_802A74BC
 /* 110AF0 802A74E0 3C048016 */  lui   $a0, %hi(D_801646F0) # $a0, 0x8016
 /* 110AF4 802A74E4 3C058016 */  lui   $a1, %hi(D_8015F790) # $a1, 0x8016
 /* 110AF8 802A74E8 3C0B800E */  lui   $t3, %hi(D_800DC52C) # $t3, 0x800e
-/* 110AFC 802A74EC 3C08800F */  lui   $t0, %hi(gPlayer1Controller) # $t0, 0x800f
+/* 110AFC 802A74EC 3C08800F */  lui   $t0, %hi(gControllers) # $t0, 0x800f
 /* 110B00 802A74F0 2442F480 */  addiu $v0, %lo(D_8015F480) # addiu $v0, $v0, -0xb80
 /* 110B04 802A74F4 24636990 */  addiu $v1, %lo(D_800F6990) # addiu $v1, $v1, 0x6990
 /* 110B08 802A74F8 248446F0 */  addiu $a0, %lo(D_801646F0) # addiu $a0, $a0, 0x46f0
 /* 110B0C 802A74FC 24A5F790 */  addiu $a1, %lo(D_8015F790) # addiu $a1, $a1, -0x870
-/* 110B10 802A7500 25086910 */  addiu $t0, %lo(gPlayer1Controller) # addiu $t0, $t0, 0x6910
+/* 110B10 802A7500 25086910 */  addiu $t0, %lo(gControllers) # addiu $t0, $t0, 0x6910
 /* 110B14 802A7504 256BC52C */  addiu $t3, %lo(D_800DC52C) # addiu $t3, $t3, -0x3ad4
 /* 110B18 802A7508 24100050 */  li    $s0, 80
 /* 110B1C 802A750C 2411003C */  li    $s1, 60

asm/code_802B0210.s

@@ -803,8 +803,8 @@ glabel L802B0C70
 /* 11A368 802B0D58 5160002A */  beql  $t3, $zero, .L802B0E04
 /* 11A36C 802B0D5C 8FBF001C */   lw    $ra, 0x1c($sp)
 /* 11A370 802B0D60 860C0010 */  lh    $t4, 0x10($s0)
-/* 11A374 802B0D64 3C0E800F */  lui   $t6, %hi(gPlayer1Controller) # $t6, 0x800f
-/* 11A378 802B0D68 25CE6910 */  addiu $t6, %lo(gPlayer1Controller) # addiu $t6, $t6, 0x6910
+/* 11A374 802B0D64 3C0E800F */  lui   $t6, %hi(gControllers) # $t6, 0x800f
+/* 11A378 802B0D68 25CE6910 */  addiu $t6, %lo(gControllers) # addiu $t6, $t6, 0x6910
 /* 11A37C 802B0D6C 000C6900 */  sll   $t5, $t4, 4
 /* 11A380 802B0D70 01AE1021 */  addu  $v0, $t5, $t6
 /* 11A384 802B0D74 94430006 */  lhu   $v1, 6($v0)
@@ -1199,8 +1199,8 @@ glabel L802B11FC
 /* 11A914 802B1304 8FBF001C */   lw    $ra, 0x1c($sp)
 /* 11A918 802B1308 860F0014 */  lh    $t7, 0x14($s0)
 .L802B130C:
-/* 11A91C 802B130C 3C19800F */  lui   $t9, %hi(gPlayer1Controller) # $t9, 0x800f
-/* 11A920 802B1310 27396910 */  addiu $t9, %lo(gPlayer1Controller) # addiu $t9, $t9, 0x6910
+/* 11A91C 802B130C 3C19800F */  lui   $t9, %hi(gControllers) # $t9, 0x800f
+/* 11A920 802B1310 27396910 */  addiu $t9, %lo(gControllers) # addiu $t9, $t9, 0x6910
 /* 11A924 802B1314 000FC100 */  sll   $t8, $t7, 4
 /* 11A928 802B1318 03191021 */  addu  $v0, $t8, $t9
 /* 11A92C 802B131C 94490006 */  lhu   $t1, 6($v0)
@@ -2202,8 +2202,8 @@ glabel L802B2094
 /* 11B7F4 802B21E4 8C63C4BC */   lw    $v1, %lo(D_800DC4BC)($v1)
 .L802B21E8:
 /* 11B7F8 802B21E8 860B0010 */  lh    $t3, 0x10($s0)
-/* 11B7FC 802B21EC 3C0D800F */  lui   $t5, %hi(gPlayer1Controller) # $t5, 0x800f
-/* 11B800 802B21F0 25AD6910 */  addiu $t5, %lo(gPlayer1Controller) # addiu $t5, $t5, 0x6910
+/* 11B7FC 802B21EC 3C0D800F */  lui   $t5, %hi(gControllers) # $t5, 0x800f
+/* 11B800 802B21F0 25AD6910 */  addiu $t5, %lo(gControllers) # addiu $t5, $t5, 0x6910
 /* 11B804 802B21F4 000B6100 */  sll   $t4, $t3, 4
 /* 11B808 802B21F8 018D1821 */  addu  $v1, $t4, $t5
 .L802B21FC:
@@ -3245,7 +3245,7 @@ glabel func_802B30EC
 /* 11C718 802B3108 AFB70034 */  sw    $s7, 0x34($sp)
 /* 11C71C 802B310C AFB30024 */  sw    $s3, 0x24($sp)
 /* 11C720 802B3110 3C10800F */  lui   $s0, %hi(D_800F6990) # $s0, 0x800f
-/* 11C724 802B3114 3C12800F */  lui   $s2, %hi(gPlayer1Controller) # $s2, 0x800f
+/* 11C724 802B3114 3C12800F */  lui   $s2, %hi(gControllers) # $s2, 0x800f
 /* 11C728 802B3118 3C14800F */  lui   $s4, %hi(D_800F6950) # $s4, 0x800f
 /* 11C72C 802B311C 3C15800E */  lui   $s5, %hi(D_800DC4E0) # $s5, 0x800e
 /* 11C730 802B3120 3C16800E */  lui   $s6, %hi(D_800DC4D0) # $s6, 0x800e
@@ -3256,7 +3256,7 @@ glabel func_802B30EC
 /* 11C744 802B3134 26D6C4D0 */  addiu $s6, %lo(D_800DC4D0) # addiu $s6, $s6, -0x3b30
 /* 11C748 802B3138 26B5C4E0 */  addiu $s5, %lo(D_800DC4E0) # addiu $s5, $s5, -0x3b20
 /* 11C74C 802B313C 26946950 */  addiu $s4, %lo(D_800F6950) # addiu $s4, $s4, 0x6950
-/* 11C750 802B3140 26526910 */  addiu $s2, %lo(gPlayer1Controller) # addiu $s2, $s2, 0x6910
+/* 11C750 802B3140 26526910 */  addiu $s2, %lo(gControllers) # addiu $s2, $s2, 0x6910
 /* 11C754 802B3144 26106990 */  addiu $s0, %lo(D_800F6990) # addiu $s0, $s0, 0x6990
 /* 11C758 802B3148 24130DD8 */  li    $s3, 3544
 /* 11C75C 802B314C 2417DFFF */  li    $s7, -8193
@@ -3509,8 +3509,8 @@ glabel L802B33CC
 /* 11CAEC 802B34DC 53000195 */  beql  $t8, $zero, .L802B3B34
 /* 11CAF0 802B34E0 8FBF002C */   lw    $ra, 0x2c($sp)
 /* 11CAF4 802B34E4 86190014 */  lh    $t9, 0x14($s0)
-/* 11CAF8 802B34E8 3C09800F */  lui   $t1, %hi(gPlayer1Controller) # $t1, 0x800f
-/* 11CAFC 802B34EC 25296910 */  addiu $t1, %lo(gPlayer1Controller) # addiu $t1, $t1, 0x6910
+/* 11CAF8 802B34E8 3C09800F */  lui   $t1, %hi(gControllers) # $t1, 0x800f
+/* 11CAFC 802B34EC 25296910 */  addiu $t1, %lo(gControllers) # addiu $t1, $t1, 0x6910
 /* 11CB00 802B34F0 00194100 */  sll   $t0, $t9, 4
 /* 11CB04 802B34F4 01091021 */  addu  $v0, $t0, $t1
 /* 11CB08 802B34F8 94430008 */  lhu   $v1, 8($v0)
@@ -4554,8 +4554,8 @@ glabel L802B4324
 /* 11DA64 802B4454 8C42C4BC */   lw    $v0, %lo(D_800DC4BC)($v0)
 /* 11DA68 802B4458 86090014 */  lh    $t1, 0x14($s0)
 .L802B445C:
-/* 11DA6C 802B445C 3C0B800F */  lui   $t3, %hi(gPlayer1Controller) # $t3, 0x800f
-/* 11DA70 802B4460 256B6910 */  addiu $t3, %lo(gPlayer1Controller) # addiu $t3, $t3, 0x6910
+/* 11DA6C 802B445C 3C0B800F */  lui   $t3, %hi(gControllers) # $t3, 0x800f
+/* 11DA70 802B4460 256B6910 */  addiu $t3, %lo(gControllers) # addiu $t3, $t3, 0x6910
 /* 11DA74 802B4464 00095100 */  sll   $t2, $t1, 4
 /* 11DA78 802B4468 10000002 */  b     .L802B4474
 /* 11DA7C 802B446C 014B1021 */   addu  $v0, $t2, $t3

asm/non_matchings/code_800AF9B0.s

@@ -652,8 +652,8 @@ glabel func_800B0350
 /* 0B0F68 800B0368 15C0006E */  bnez  $t6, .L800B0524
 /* 0B0F6C 800B036C AFB00018 */   sw    $s0, 0x18($sp)
 /* 0B0F70 800B0370 3C12800F */  lui   $s2, %hi(D_800E86A0) # $s2, 0x800f
-/* 0B0F74 800B0374 3C11800F */  lui   $s1, %hi(gPlayer1Controller) # $s1, 0x800f
-/* 0B0F78 800B0378 26316910 */  addiu $s1, %lo(gPlayer1Controller) # addiu $s1, $s1, 0x6910
+/* 0B0F74 800B0374 3C11800F */  lui   $s1, %hi(gControllers) # $s1, 0x800f
+/* 0B0F78 800B0378 26316910 */  addiu $s1, %lo(gControllers) # addiu $s1, $s1, 0x6910
 /* 0B0F7C 800B037C 265286A0 */  addiu $s2, %lo(D_800E86A0) # addiu $s2, $s2, -0x7960
 /* 0B0F80 800B0380 00008025 */  move  $s0, $zero
 .L800B0384:

asm/non_matchings/main/func_80000934.s

@@ -2,7 +2,7 @@ glabel func_80000934
 /* 001534 80000934 3C0E8016 */  lui   $t6, %hi(sController1Unplugged) # $t6, 0x8016
 /* 001538 80000938 85CE25EA */  lh    $t6, %lo(sController1Unplugged)($t6)
 /* 00153C 8000093C 00047900 */  sll   $t7, $a0, 4
-/* 001540 80000940 3C18800F */  lui   $t8, %hi(gPlayer1Controller) # $t8, 0x800f
+/* 001540 80000940 3C18800F */  lui   $t8, %hi(gControllers) # $t8, 0x800f
 /* 001544 80000944 15C00036 */  bnez  $t6, .L80000A20
 /* 001548 80000948 0004C880 */   sll   $t9, $a0, 2
 /* 00154C 8000094C 0324C823 */  subu  $t9, $t9, $a0
@@ -11,7 +11,7 @@ glabel func_80000934
 /* 001558 80000958 0019C840 */  sll   $t9, $t9, 1
 /* 00155C 8000095C 03281821 */  addu  $v1, $t9, $t0
 /* 001560 80000960 80690002 */  lb    $t1, 2($v1)
-/* 001564 80000964 27186910 */  addiu $t8, %lo(gPlayer1Controller) # addiu $t8, $t8, 0x6910
+/* 001564 80000964 27186910 */  addiu $t8, %lo(gControllers) # addiu $t8, $t8, 0x6910
 /* 001568 80000968 01F81021 */  addu  $v0, $t7, $t8
 /* 00156C 8000096C A4490000 */  sh    $t1, ($v0)
 /* 001570 80000970 806A0003 */  lb    $t2, 3($v1)

asm/non_matchings/profiler/profiler_log_gfx_time.s

@@ -1,38 +0,0 @@
-glabel profiler_log_gfx_time
-/* 00425C 8000365C 27BDFFE8 */  addiu $sp, $sp, -0x18
-/* 004260 80003660 1480000F */  bnez  $a0, .L800036A0
-/* 004264 80003664 AFBF0014 */   sw    $ra, 0x14($sp)
-/* 004268 80003668 3C02800E */  lui   $v0, %hi(D_800DC66C) # $v0, 0x800e
-/* 00426C 8000366C 2442C66C */  addiu $v0, %lo(D_800DC66C) # addiu $v0, $v0, -0x3994
-/* 004270 80003670 844E0000 */  lh    $t6, ($v0)
-/* 004274 80003674 3C018016 */  lui   $at, %hi(D_80162602) # 0x8016
-/* 004278 80003678 39CF0001 */  xori  $t7, $t6, 1
-/* 00427C 8000367C A44F0000 */  sh    $t7, ($v0)
-/* 004280 80003680 84580000 */  lh    $t8, ($v0)
-/* 004284 80003684 0018C880 */  sll   $t9, $t8, 2
-/* 004288 80003688 0338C823 */  subu  $t9, $t9, $t8
-/* 00428C 8000368C 0019C8C0 */  sll   $t9, $t9, 3
-/* 004290 80003690 0338C821 */  addu  $t9, $t9, $t8
-/* 004294 80003694 0019C8C0 */  sll   $t9, $t9, 3
-/* 004298 80003698 00390821 */  addu  $at, $at, $t9
-/* 00429C 8000369C A4202602 */  sh    $zero, %lo(D_80162602)($at) # 0x2602($at)
-.L800036A0:
-/* 0042A0 800036A0 0C033778 */  jal   osGetTime
-/* 0042A4 800036A4 AFA40018 */   sw    $a0, 0x18($sp)
-/* 0042A8 800036A8 3C08800E */  lui   $t0, %hi(D_800DC66C) # $t0, 0x800e
-/* 0042AC 800036AC 8508C66C */  lh    $t0, %lo(D_800DC66C)($t0)
-/* 0042B0 800036B0 8FA40018 */  lw    $a0, 0x18($sp)
-/* 0042B4 800036B4 8FBF0014 */  lw    $ra, 0x14($sp)
-/* 0042B8 800036B8 00084880 */  sll   $t1, $t0, 2
-/* 0042BC 800036BC 01284823 */  subu  $t1, $t1, $t0
-/* 0042C0 800036C0 000948C0 */  sll   $t1, $t1, 3
-/* 0042C4 800036C4 01284821 */  addu  $t1, $t1, $t0
-/* 0042C8 800036C8 000948C0 */  sll   $t1, $t1, 3
-/* 0042CC 800036CC 000450C0 */  sll   $t2, $a0, 3
-/* 0042D0 800036D0 012A5821 */  addu  $t3, $t1, $t2
-/* 0042D4 800036D4 3C018016 */  lui   $at, %hi(D_80162630) # 0x8016
-/* 0042D8 800036D8 002B0821 */  addu  $at, $at, $t3
-/* 0042DC 800036DC AC222630 */  sw    $v0, %lo(D_80162630)($at) # 0x2630($at)
-/* 0042E0 800036E0 AC232634 */  sw    $v1, %lo(D_80162634)($at) # 0x2634($at)
-/* 0042E4 800036E4 03E00008 */  jr    $ra
-/* 0042E8 800036E8 27BD0018 */   addiu $sp, $sp, 0x18

data/data_0DD0A0.s

@@ -27,7 +27,7 @@ glabel sNextDisplaySPTask
 .word 0x00000000
 
 glabel D_800DC4BC
-.word gPlayer1Controller
+.word gControllers
 
 glabel D_800DC4C0
 .word gPlayer2Controller

mk64.ld

@@ -38,7 +38,14 @@ OUTPUT_ARCH (mips)
       . = ALIGN(0x10); \
    } \
    END_SEG(name)
-
+	
+#define BEGIN_NOLOAD(name) \
+    _##name##SegNoloadStart = ADDR(.name.noload); \
+    .name.noload (NOLOAD) :
+	
+#define END_NOLOAD(name) \
+    _##name##SegNoloadEnd = ADDR(.name.noload) + SIZEOF(.name.noload);
+	
 SECTIONS
 {
    __romPos = 0;
@@ -102,6 +109,26 @@ SECTIONS
    }
    END_SEG(main)
 
+   BEGIN_NOLOAD(main) {
+      BUILD_DIR/src/main.o(.bss);
+
+      BUILD_DIR/asm/bss_main.o(.bss);
+
+      BUILD_DIR/src/profiler.o(.bss);
+      BUILD_DIR/asm/bss_800040C0.o(.bss);
+      BUILD_DIR/asm/bss_80004740.o(.bss);
+      BUILD_DIR/asm/bss_80004EF0.o(.bss);
+      BUILD_DIR/asm/bss_80005FD0.o(.bss);
+      BUILD_DIR/asm/bss_800431B0.o(.bss);
+      BUILD_DIR/asm/bss_MainSeg.o(.bss);
+   }
+   END_NOLOAD(main)
+	
+   _mainSegmentNoloadSize = SIZEOF(.main.noload) + 0x10;
+   
+   _mainSegmentNoloadSizeHi = _mainSegmentNoloadSize >> 16;
+   _mainSegmentNoloadSizeLo = _mainSegmentNoloadSize & 0xFFFF;
+
    /* 0x8028DF00 0F7510-123640 [2C130] */
    BEGIN_SEG(code_8028DF00, SEG_8028DF00)
    {
@@ -116,6 +143,16 @@ SECTIONS
    }
    END_SEG(code_8028DF00)
 
+   	BEGIN_NOLOAD(code_8028DF00) {
+	     BUILD_DIR/asm/bss_8028DF00.o(.bss);
+	   }
+	   END_NOLOAD(code_8028DF00)
+	
+	   _code_8028DF00SegmentNoloadSize = SIZEOF(.code_8028DF00.noload) + 0x10;
+	   
+	   _code_8028DF00SegmentNoloadSizeHi = _code_8028DF00SegmentNoloadSize >> 16;
+	   _code_8028DF00SegmentNoloadSizeLo = _code_8028DF00SegmentNoloadSize & 0xFFFF;
+
    /* 0x80280000 123640-12AAE0 [74A0] */
    BEGIN_SEG(code_80280000, SEG_80280000)
    {

src/code_800AF9B0.c

@@ -2,7 +2,8 @@
 #include <macros.h>
 
 u32 func_802A7B70(u16 x);
-u32 D_8018EDB8, D_8018EDBC;
+extern u32 D_8018EDB8;
+extern u32 D_8018EDBC;
 
 void func_800AF9B0(void) {
     D_8018EDB8 = func_802A7B70(7680);

src/main.c

@@ -219,7 +219,7 @@ void func_80000934(s32 arg0) {
     if (sController1Unplugged == 0) {
         // potantial sizeof structs?
         temp_v1 = (arg0 * 6) + &gControllerPads;
-        temp_v0 = (arg0 * 0x10) + &gPlayer1Controller;
+        temp_v0 = (arg0 * 0x10) + &gControllers;
         temp_v0->unk0 = (s16) temp_v1->unk2;
         temp_v0->unk2 = (s16) temp_v1->unk3;
         temp_t4 = temp_v1->unk0 | 0x2000;

src/memory.c

@@ -26,7 +26,7 @@ extern s32 gPrevMainThreadTask;
 
 extern s32 gDisplayListHead;
 extern u32 D_8015F724;
-u32 D_802BA278;
+extern u32 D_802BA278;
 
 struct MainPoolBlock {
     struct MainPoolBlock *prev;

src/profiler.c

@@ -4,7 +4,7 @@
 #include "profiler.h"
 #include "config.h"
 
-extern struct ProfilerFrameData gProfilerFrameData[2];
+struct ProfilerFrameData gProfilerFrameData[2];
 extern u32 D_800DC568;
 extern u32 D_800DC56C;
 extern s16 D_800DC664;
@@ -29,7 +29,6 @@ void profiler_log_thread4_time(void) {
     }
 }
 
-#ifdef NON_MATCHING
 void profiler_log_gfx_time(enum ProfilerGfxEvent eventID) {
     if (eventID == TASKS_QUEUED) {
         D_800DC66C ^= 1;
@@ -37,9 +36,6 @@ void profiler_log_gfx_time(enum ProfilerGfxEvent eventID) {
     }
     gProfilerFrameData[D_800DC66C].gfxTimes[eventID] = osGetTime();
 }
-#else
-GLOBAL_ASM("asm/non_matchings/profiler/profiler_log_gfx_time.s")
-#endif
 
 void profiler_log_vblank_time(void) {
     struct ProfilerFrameData *profiler = &gProfilerFrameData[D_800DC66C];