match func_801DAAE0

9 files changed, 898 insertions, 903 deletions

diff --git a/Makefile b/Makefile
index 126561d..9ecf9e8 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ include obj_files.mk
 
 O_FILES := $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(SPLIT_O_FILES) \
            $(DTORS_O_FILES) $(RODATA_O_FILES) $(DATA_O_FILES)    \
-           $(BSS_O_FILES) $(SDATA_O_FILES) $(SDATA2_O_FILES) 	  \
+           $(SDATA_O_FILES) $(SDATA2_O_FILES) 	  \
 		   $(SBSS2_O_FILES)
 
 #-------------------------------------------------------------------------------
diff --git a/asm/bss.s b/asm/bss.s
index e823435..713c2f5 100644
--- a/asm/bss.s
+++ b/asm/bss.s
@@ -447,864 +447,3 @@ lbl_80490D90:
 .global lbl_80491290
 lbl_80491290:
 	.skip 0x20
-.global lbl_804912B0
-lbl_804912B0:
-	.skip 0xC0
-.global lbl_80491370
-lbl_80491370:
-	.skip 0x100
-.global lbl_80491470
-lbl_80491470:
-	.skip 0x380
-.global lbl_804917F0
-lbl_804917F0:
-	.skip 0x40
-.global lbl_80491830
-lbl_80491830:
-	.skip 0x10
-.global lbl_80491840
-lbl_80491840:
-	.skip 0x30
-.global lbl_80491870
-lbl_80491870:
-	.skip 0x1C
-.global lbl_8049188C
-lbl_8049188C:
-	.skip 0x1C
-.global lbl_804918A8
-lbl_804918A8:
-	.skip 0xC
-.global lbl_804918B4
-lbl_804918B4:
-	.skip 0xC
-.global lbl_804918C0
-lbl_804918C0:
-	.skip 0x10
-.global lbl_804918D0
-lbl_804918D0:
-	.skip 0xA0
-.global lbl_80491970
-lbl_80491970:
-	.skip 0x30
-.global lbl_804919A0
-lbl_804919A0:
-	.skip 0x10
-.global lbl_804919B0
-lbl_804919B0:
-	.skip 0x8C
-.global lbl_80491A3C
-lbl_80491A3C:
-	.skip 0x64
-.global lbl_80491AA0
-lbl_80491AA0:
-	.skip 0x5F0
-.global lbl_80492090
-lbl_80492090:
-	.skip 0x20
-.global lbl_804920B0
-lbl_804920B0:
-	.skip 0x20
-.global lbl_804920D0
-lbl_804920D0:
-	.skip 0x20
-.global lbl_804920F0
-lbl_804920F0:
-	.skip 0x100
-.global lbl_804921F0
-lbl_804921F0:
-	.skip 0x30
-.global lbl_80492220
-lbl_80492220:
-	.skip 0x10
-.global lbl_80492230
-lbl_80492230:
-	.skip 0xC
-.global lbl_8049223C
-lbl_8049223C:
-	.skip 0xC
-.global lbl_80492248
-lbl_80492248:
-	.skip 0xC
-.global lbl_80492254
-lbl_80492254:
-	.skip 0xC
-.global lbl_80492260
-lbl_80492260:
-	.skip 0x18
-.global lbl_80492278
-lbl_80492278:
-	.skip 0x10
-.global lbl_80492288
-lbl_80492288:
-	.skip 0x48
-.global lbl_804922D0
-lbl_804922D0:
-	.skip 0xC
-.global lbl_804922DC
-lbl_804922DC:
-	.skip 0x3E0
-.global lbl_804926BC
-lbl_804926BC:
-	.skip 0x3D4
-.global lbl_80492A90
-lbl_80492A90:
-	.skip 0xC
-.global lbl_80492A9C
-lbl_80492A9C:
-	.skip 0x3E0
-.global lbl_80492E7C
-lbl_80492E7C:
-	.skip 0x3D4
-.global lbl_80493250
-lbl_80493250:
-	.skip 0x60
-.global lbl_804932B0
-lbl_804932B0:
-	.skip 0x30
-.global lbl_804932E0
-lbl_804932E0:
-	.skip 0x30
-.global lbl_80493310
-lbl_80493310:
-	.skip 0x10
-.global lbl_80493320
-lbl_80493320:
-	.skip 0x10
-.global lbl_80493330
-lbl_80493330:
-	.skip 0x2D8
-.global lbl_80493608
-lbl_80493608:
-	.skip 0xC
-.global lbl_80493614
-lbl_80493614:
-	.skip 0xC
-.global lbl_80493620
-lbl_80493620:
-	.skip 0xC
-.global lbl_8049362C
-lbl_8049362C:
-	.skip 0xC
-.global lbl_80493638
-lbl_80493638:
-	.skip 0x10
-.global lbl_80493648
-lbl_80493648:
-	.skip 0x10
-.global lbl_80493658
-lbl_80493658:
-	.skip 0x800
-.global lbl_80493E58
-lbl_80493E58:
-	.skip 0x110
-.global lbl_80493F68
-lbl_80493F68:
-	.skip 0x100
-.global lbl_80494068
-lbl_80494068:
-	.skip 0x400
-.global lbl_80494468
-lbl_80494468:
-	.skip 0x6C
-.global lbl_804944D4
-lbl_804944D4:
-	.skip 0x2274
-.global lbl_80496748
-lbl_80496748:
-	.skip 0xC
-.global lbl_80496754
-lbl_80496754:
-	.skip 0xC
-.global lbl_80496760
-lbl_80496760:
-	.skip 0x40
-.global lbl_804967A0
-lbl_804967A0:
-	.skip 0x20
-.global lbl_804967C0
-lbl_804967C0:
-	.skip 0xC
-.global lbl_804967CC
-lbl_804967CC:
-	.skip 0x17D4
-.global lbl_80497FA0
-lbl_80497FA0:
-	.skip 0x20
-.global lbl_80497FC0
-lbl_80497FC0:
-	.skip 0x20
-.global lbl_80497FE0
-lbl_80497FE0:
-	.skip 0xC
-.global lbl_80497FEC
-lbl_80497FEC:
-	.skip 0x654B4
-.global lbl_804FD4A0
-lbl_804FD4A0:
-	.skip 0x200
-.global lbl_804FD6A0
-lbl_804FD6A0:
-	.skip 0x200
-.global lbl_804FD8A0
-lbl_804FD8A0:
-	.skip 0x200
-.global lbl_804FDAA0
-lbl_804FDAA0:
-	.skip 0x10
-.global lbl_804FDAB0
-lbl_804FDAB0:
-	.skip 0x170
-.global lbl_804FDC20
-lbl_804FDC20:
-	.skip 0x780
-.global lbl_804FE3A0
-lbl_804FE3A0:
-	.skip 0x180
-.global lbl_804FE520
-lbl_804FE520:
-	.skip 0x410
-.global lbl_804FE930
-lbl_804FE930:
-	.skip 0x3C00
-.global lbl_80502530
-lbl_80502530:
-	.skip 0x18
-.global lbl_80502548
-lbl_80502548:
-	.skip 0x5B0
-.global lbl_80502AF8
-lbl_80502AF8:
-	.skip 0x1000
-.global lbl_80503AF8
-lbl_80503AF8:
-	.skip 0x100
-.global lbl_80503BF8
-lbl_80503BF8:
-	.skip 0x88
-.global lbl_80503C80
-lbl_80503C80:
-	.skip 0x20
-.global lbl_80503CA0
-lbl_80503CA0:
-	.skip 0x50
-.global lbl_80503CF0
-lbl_80503CF0:
-	.skip 0x50
-.global lbl_80503D40
-lbl_80503D40:
-	.skip 0xC2C4
-.global lbl_80510004
-lbl_80510004:
-	.skip 0x449C
-.global lbl_805144A0
-lbl_805144A0:
-	.skip 0x2C8
-.global lbl_80514768
-lbl_80514768:
-	.skip 0x18
-.global lbl_80514780
-lbl_80514780:
-	.skip 0x58
-.global lbl_805147D8
-lbl_805147D8:
-	.skip 0x318
-.global lbl_80514AF0
-lbl_80514AF0:
-	.skip 0x100
-.global lbl_80514BF0
-lbl_80514BF0:
-	.skip 0x2C8
-.global lbl_80514EB8
-lbl_80514EB8:
-	.skip 0x328
-.global lbl_805151E0
-lbl_805151E0:
-	.skip 0x20
-.global lbl_80515200
-lbl_80515200:
-	.skip 0x20
-.global lbl_80515220
-lbl_80515220:
-	.skip 0x20
-.global lbl_80515240
-lbl_80515240:
-	.skip 0x20
-.global lbl_80515260
-lbl_80515260:
-	.skip 0x20
-.global lbl_80515280
-lbl_80515280:
-	.skip 0x20
-.global lbl_805152A0
-lbl_805152A0:
-	.skip 0x200
-.global lbl_805154A0
-lbl_805154A0:
-	.skip 0x20
-.global lbl_805154C0
-lbl_805154C0:
-	.skip 0xC0
-.global lbl_80515580
-lbl_80515580:
-	.skip 0x80
-.global lbl_80515600
-lbl_80515600:
-	.skip 0x20
-.global lbl_80515620
-lbl_80515620:
-	.skip 0x20
-.global lbl_80515640
-lbl_80515640:
-	.skip 0x160
-.global lbl_805157A0
-lbl_805157A0:
-	.skip 0x78
-.global lbl_80515818
-lbl_80515818:
-	.skip 0x78
-.global lbl_80515890
-lbl_80515890:
-	.skip 0x80
-.global lbl_80515910
-lbl_80515910:
-	.skip 0x20
-.global lbl_80515930
-lbl_80515930:
-	.skip 0x680
-.global lbl_80515FB0
-lbl_80515FB0:
-	.skip 0x24
-.global lbl_80515FD4
-lbl_80515FD4:
-	.skip 0x24
-.global lbl_80515FF8
-lbl_80515FF8:
-	.skip 0xD8
-.global lbl_805160D0
-lbl_805160D0:
-	.skip 0x1B0
-.global lbl_80516280
-lbl_80516280:
-	.skip 0x700
-.global lbl_80516980
-lbl_80516980:
-	.skip 0x20
-.global lbl_805169A0
-lbl_805169A0:
-	.skip 0x30
-.global lbl_805169D0
-lbl_805169D0:
-	.skip 0x30
-.global lbl_80516A00
-lbl_80516A00:
-	.skip 0x40
-.global lbl_80516A40
-lbl_80516A40:
-	.skip 0x20
-.global lbl_80516A60
-lbl_80516A60:
-	.skip 0x20
-.global lbl_80516A80
-lbl_80516A80:
-	.skip 0x4A40
-.global lbl_8051B4C0
-lbl_8051B4C0:
-	.skip 0x30
-.global lbl_8051B4F0
-lbl_8051B4F0:
-	.skip 0x60
-.global lbl_8051B550
-lbl_8051B550:
-	.skip 0x30
-.global lbl_8051B580
-lbl_8051B580:
-	.skip 0x90
-.global lbl_8051B610
-lbl_8051B610:
-	.skip 0xD0
-.global lbl_8051B6E0
-lbl_8051B6E0:
-	.skip 0x80
-.global lbl_8051B760
-lbl_8051B760:
-	.skip 0x80
-.global lbl_8051B7E0
-lbl_8051B7E0:
-	.skip 0x20
-.global lbl_8051B800
-lbl_8051B800:
-	.skip 0xC0
-.global lbl_8051B8C0
-lbl_8051B8C0:
-	.skip 0x80
-.global lbl_8051B940
-lbl_8051B940:
-	.skip 0x80
-.global lbl_8051B9C0
-lbl_8051B9C0:
-	.skip 0x1200
-.global lbl_8051CBC0
-lbl_8051CBC0:
-	.skip 0x1200
-.global lbl_8051DDC0
-lbl_8051DDC0:
-	.skip 0xD80
-.global lbl_8051EB40
-lbl_8051EB40:
-	.skip 0x100
-.global lbl_8051EC40
-lbl_8051EC40:
-	.skip 0x40
-.global lbl_8051EC80
-lbl_8051EC80:
-	.skip 0x8A0
-.global lbl_8051F520
-lbl_8051F520:
-	.skip 0x480
-.global lbl_8051F9A0
-lbl_8051F9A0:
-	.skip 0x60
-.global lbl_8051FA00
-lbl_8051FA00:
-	.skip 0x40
-.global lbl_8051FA40
-lbl_8051FA40:
-	.skip 0x80
-.global lbl_8051FAC0
-lbl_8051FAC0:
-	.skip 0x7800
-.global lbl_805272C0
-lbl_805272C0:
-	.skip 0x1800
-.global lbl_80528AC0
-lbl_80528AC0:
-	.skip 0x8700
-.global lbl_805311C0
-lbl_805311C0:
-	.skip 0x10
-.global lbl_805311D0
-lbl_805311D0:
-	.skip 0x18
-.global lbl_805311E8
-lbl_805311E8:
-	.skip 0x2A00
-.global lbl_80533BE8
-lbl_80533BE8:
-	.skip 0x1998
-.global lbl_80535580
-lbl_80535580:
-	.skip 0x18
-.global lbl_80535598
-lbl_80535598:
-	.skip 0x28
-.global lbl_805355C0
-lbl_805355C0:
-	.skip 0x100
-.global lbl_805356C0
-lbl_805356C0:
-	.skip 0x10
-.global lbl_805356D0
-lbl_805356D0:
-	.skip 0x1490
-.global lbl_80536B60
-lbl_80536B60:
-	.skip 0x50
-.global lbl_80536BB0
-lbl_80536BB0:
-	.skip 0x80
-.global lbl_80536C30
-lbl_80536C30:
-	.skip 0x80
-.global lbl_80536CB0
-lbl_80536CB0:
-	.skip 0x90
-.global lbl_80536D40
-lbl_80536D40:
-	.skip 0x30
-.global lbl_80536D70
-lbl_80536D70:
-	.skip 0x10
-.global lbl_80536D80
-lbl_80536D80:
-	.skip 0x1000
-.global lbl_80537D80
-lbl_80537D80:
-	.skip 0x26C0
-.global lbl_8053A440
-lbl_8053A440:
-	.skip 0x28
-.global lbl_8053A468
-lbl_8053A468:
-	.skip 0x18
-.global lbl_8053A480
-lbl_8053A480:
-	.skip 0x60
-.global lbl_8053A4E0
-lbl_8053A4E0:
-	.skip 0x748
-.global lbl_8053AC28
-lbl_8053AC28:
-	.skip 0x468
-.global lbl_8053B090
-lbl_8053B090:
-	.skip 0x138
-.global lbl_8053B1C8
-lbl_8053B1C8:
-	.skip 0x60
-.global lbl_8053B228
-lbl_8053B228:
-	.skip 0x58
-.global lbl_8053B280
-lbl_8053B280:
-	.skip 0x1000
-.global lbl_8053C280
-lbl_8053C280:
-	.skip 0x20
-.global lbl_8053C2A0
-lbl_8053C2A0:
-	.skip 0x20
-.global lbl_8053C2C0
-lbl_8053C2C0:
-	.skip 0x28AE0
-.global lbl_80564DA0
-lbl_80564DA0:
-	.skip 0x40
-.global lbl_80564DE0
-lbl_80564DE0:
-	.skip 0x60
-.global lbl_80564E40
-lbl_80564E40:
-	.skip 0x1000
-.global lbl_80565E40
-lbl_80565E40:
-	.skip 0x1000
-.global lbl_80566E40
-lbl_80566E40:
-	.skip 0x7E0
-.global lbl_80567620
-lbl_80567620:
-	.skip 0x1000
-.global lbl_80568620
-lbl_80568620:
-	.skip 0x30
-.global lbl_80568650
-lbl_80568650:
-	.skip 0x88
-.global lbl_805686D8
-lbl_805686D8:
-	.skip 0x90
-.global lbl_80568768
-lbl_80568768:
-	.skip 0x30
-.global lbl_80568798
-lbl_80568798:
-	.skip 0x7C
-.global lbl_80568814
-lbl_80568814:
-	.skip 0x104
-.global lbl_80568918
-lbl_80568918:
-	.skip 0x30
-.global lbl_80568948
-lbl_80568948:
-	.skip 0x230
-.global lbl_80568B78
-lbl_80568B78:
-	.skip 0x27C8
-.global lbl_8056B340
-lbl_8056B340:
-	.skip 0x3B0
-.global lbl_8056B6F0
-lbl_8056B6F0:
-	.skip 0x148
-.global lbl_8056B838
-lbl_8056B838:
-	.skip 0x408
-.global lbl_8056BC40
-lbl_8056BC40:
-	.skip 0x7E8
-.global lbl_8056C428
-lbl_8056C428:
-	.skip 0x418
-.global lbl_8056C840
-lbl_8056C840:
-	.skip 0x4640
-.global lbl_80570E80
-lbl_80570E80:
-	.skip 0x40
-.global lbl_80570EC0
-lbl_80570EC0:
-	.skip 0x1A0
-.global lbl_80571060
-lbl_80571060:
-	.skip 0x4000
-.global lbl_80575060
-lbl_80575060:
-	.skip 0x4000
-.global lbl_80579060
-lbl_80579060:
-	.skip 0x20
-.global lbl_80579080
-lbl_80579080:
-	.skip 0x40
-.global lbl_805790C0
-lbl_805790C0:
-	.skip 0xA0
-.global lbl_80579160
-lbl_80579160:
-	.skip 0xA0
-.global lbl_80579200
-lbl_80579200:
-	.skip 0x280
-.global lbl_80579480
-lbl_80579480:
-	.skip 0xC0
-.global lbl_80579540
-lbl_80579540:
-	.skip 0x40
-.global lbl_80579580
-lbl_80579580:
-	.skip 0x220
-.global lbl_805797A0
-lbl_805797A0:
-	.skip 0x1318
-.global lbl_8057AAB8
-lbl_8057AAB8:
-	.skip 0x18
-.global lbl_8057AAD0
-lbl_8057AAD0:
-	.skip 0x10
-.global lbl_8057AAE0
-lbl_8057AAE0:
-	.skip 0xCA0
-.global lbl_8057B780
-lbl_8057B780:
-	.skip 0x3020
-.global lbl_8057E7A0
-lbl_8057E7A0:
-	.skip 0x180
-.global lbl_8057E920
-lbl_8057E920:
-	.skip 0xE0
-.global lbl_8057EA00
-lbl_8057EA00:
-	.skip 0x20
-.global lbl_8057EA20
-lbl_8057EA20:
-	.skip 0x20
-.global lbl_8057EA40
-lbl_8057EA40:
-	.skip 0x20
-.global lbl_8057EA60
-lbl_8057EA60:
-	.skip 0xB68
-.global lbl_8057F5C8
-lbl_8057F5C8:
-	.skip 0x27FB8
-.global lbl_805A7580
-lbl_805A7580:
-	.skip 0x20
-.global lbl_805A75A0
-lbl_805A75A0:
-	.skip 0x68000
-.global lbl_8060F5A0
-lbl_8060F5A0:
-	.skip 0x68
-.global lbl_8060F608
-lbl_8060F608:
-	.skip 0x10
-.global lbl_8060F618
-lbl_8060F618:
-	.skip 0x230
-.global lbl_8060F848
-lbl_8060F848:
-	.skip 0x208
-.global lbl_8060FA50
-lbl_8060FA50:
-	.skip 0x1A0
-.global lbl_8060FBF0
-lbl_8060FBF0:
-	.skip 0x18
-.global lbl_8060FC08
-lbl_8060FC08:
-	.skip 0x80
-.global lbl_8060FC88
-lbl_8060FC88:
-	.skip 0x100
-.global lbl_8060FD88
-lbl_8060FD88:
-	.skip 0x738
-.global lbl_806104C0
-lbl_806104C0:
-	.skip 0x20
-.global lbl_806104E0
-lbl_806104E0:
-	.skip 0x1D0
-.global lbl_806106B0
-lbl_806106B0:
-	.skip 0x174
-.global lbl_80610824
-lbl_80610824:
-	.skip 0x104
-.global lbl_80610928
-lbl_80610928:
-	.skip 0x178
-.global lbl_80610AA0
-lbl_80610AA0:
-	.skip 0x58
-.global lbl_80610AF8
-lbl_80610AF8:
-	.skip 0x80
-.global lbl_80610B78
-lbl_80610B78:
-	.skip 0x58
-.global lbl_80610BD0
-lbl_80610BD0:
-	.skip 0x10090
-.global lbl_80620C60
-lbl_80620C60:
-	.skip 0x30
-.global lbl_80620C90
-lbl_80620C90:
-	.skip 0x18
-.global lbl_80620CA8
-lbl_80620CA8:
-	.skip 0x40
-.global lbl_80620CE8
-lbl_80620CE8:
-	.skip 0x100
-.global lbl_80620DE8
-lbl_80620DE8:
-	.skip 0x100
-.global lbl_80620EE8
-lbl_80620EE8:
-	.skip 0x100
-.global lbl_80620FE8
-lbl_80620FE8:
-	.skip 0x200
-.global lbl_806211E8
-lbl_806211E8:
-	.skip 0x30
-.global lbl_80621218
-lbl_80621218:
-	.skip 0x200
-.global lbl_80621418
-lbl_80621418:
-	.skip 0x2D8
-.global lbl_806216F0
-lbl_806216F0:
-	.skip 0x18
-.global lbl_80621708
-lbl_80621708:
-	.skip 0x10
-.global lbl_80621718
-lbl_80621718:
-	.skip 0x10
-.global lbl_80621728
-lbl_80621728:
-	.skip 0xC
-.global lbl_80621734
-lbl_80621734:
-	.skip 0xC
-.global lbl_80621740
-lbl_80621740:
-	.skip 0x100
-.global lbl_80621840
-lbl_80621840:
-	.skip 0xC
-.global lbl_8062184C
-lbl_8062184C:
-	.skip 0xF4
-.global lbl_80621940
-lbl_80621940:
-	.skip 0xC
-.global lbl_8062194C
-lbl_8062194C:
-	.skip 0x2C
-.global lbl_80621978
-lbl_80621978:
-	.skip 0x10
-.global lbl_80621988
-lbl_80621988:
-	.skip 0x38
-.global lbl_806219C0
-lbl_806219C0:
-	.skip 0xC
-.global lbl_806219CC
-lbl_806219CC:
-	.skip 0x24
-.global lbl_806219F0
-lbl_806219F0:
-	.skip 0x2D8
-.global lbl_80621CC8
-lbl_80621CC8:
-	.skip 0x38
-.global lbl_80621D00
-lbl_80621D00:
-	.skip 0x10
-.global lbl_80621D10
-lbl_80621D10:
-	.skip 0x330
-.global lbl_80622040
-lbl_80622040:
-	.skip 0x16970
-.global lbl_806389B0
-lbl_806389B0:
-	.skip 0x10
-.global lbl_806389C0
-lbl_806389C0:
-	.skip 0x3A0
-.global lbl_80638D60
-lbl_80638D60:
-	.skip 0x4020
-.global lbl_8063CD80
-lbl_8063CD80:
-	.skip 0x18
-.global lbl_8063CD98
-lbl_8063CD98:
-	.skip 0xC
-.global lbl_8063CDA4
-lbl_8063CDA4:
-	.skip 0x3C
-.global lbl_8063CDE0
-lbl_8063CDE0:
-	.skip 0xC
-.global lbl_8063CDEC
-lbl_8063CDEC:
-	.skip 0x1C
-.global lbl_8063CE08
-lbl_8063CE08:
-	.skip 0x20
-.global lbl_8063CE28
-lbl_8063CE28:
-	.skip 0xC
-.global lbl_8063CE34
-lbl_8063CE34:
-	.skip 0x84
-.global lbl_8063CEB8
-lbl_8063CEB8:
-	.skip 0x10
-.global lbl_8063CEC8
-lbl_8063CEC8:
-	.skip 0x10
-.global lbl_8063CED8
-lbl_8063CED8:
-	.skip 0x18
-.global lbl_8063CEF0
-lbl_8063CEF0:
-	.skip 0xC0
-.global lbl_8063CFB0
-lbl_8063CFB0:
-	.skip 0xC0
-.global lbl_8063D070
-lbl_8063D070:
-	.skip 0x10
-.global lbl_8063D080
-lbl_8063D080:
-	.skip 0x18
-.global lbl_8063D098
-lbl_8063D098:
-	.skip 0x198
-.global lbl_8063D230
-lbl_8063D230:
-	.skip 0x90
diff --git a/asm/bss_2.s b/asm/bss_2.s
new file mode 100644
index 0000000..bcde67a
--- /dev/null
+++ b/asm/bss_2.s
@@ -0,0 +1,860 @@
+.section .bss, "wa"  # 0x80474F00 - 0x80643050

+

+.global lbl_80491370

+lbl_80491370:

+	.skip 0x100

+.global lbl_80491470

+lbl_80491470:

+	.skip 0x380

+.global lbl_804917F0

+lbl_804917F0:

+	.skip 0x40

+.global lbl_80491830

+lbl_80491830:

+	.skip 0x10

+.global lbl_80491840

+lbl_80491840:

+	.skip 0x30

+.global lbl_80491870

+lbl_80491870:

+	.skip 0x1C

+.global lbl_8049188C

+lbl_8049188C:

+	.skip 0x1C

+.global lbl_804918A8

+lbl_804918A8:

+	.skip 0xC

+.global lbl_804918B4

+lbl_804918B4:

+	.skip 0xC

+.global lbl_804918C0

+lbl_804918C0:

+	.skip 0x10

+.global lbl_804918D0

+lbl_804918D0:

+	.skip 0xA0

+.global lbl_80491970

+lbl_80491970:

+	.skip 0x30

+.global lbl_804919A0

+lbl_804919A0:

+	.skip 0x10

+.global lbl_804919B0

+lbl_804919B0:

+	.skip 0x8C

+.global lbl_80491A3C

+lbl_80491A3C:

+	.skip 0x64

+.global lbl_80491AA0

+lbl_80491AA0:

+	.skip 0x5F0

+.global lbl_80492090

+lbl_80492090:

+	.skip 0x20

+.global lbl_804920B0

+lbl_804920B0:

+	.skip 0x20

+.global lbl_804920D0

+lbl_804920D0:

+	.skip 0x20

+.global lbl_804920F0

+lbl_804920F0:

+	.skip 0x100

+.global lbl_804921F0

+lbl_804921F0:

+	.skip 0x30

+.global lbl_80492220

+lbl_80492220:

+	.skip 0x10

+.global lbl_80492230

+lbl_80492230:

+	.skip 0xC

+.global lbl_8049223C

+lbl_8049223C:

+	.skip 0xC

+.global lbl_80492248

+lbl_80492248:

+	.skip 0xC

+.global lbl_80492254

+lbl_80492254:

+	.skip 0xC

+.global lbl_80492260

+lbl_80492260:

+	.skip 0x18

+.global lbl_80492278

+lbl_80492278:

+	.skip 0x10

+.global lbl_80492288

+lbl_80492288:

+	.skip 0x48

+.global lbl_804922D0

+lbl_804922D0:

+	.skip 0xC

+.global lbl_804922DC

+lbl_804922DC:

+	.skip 0x3E0

+.global lbl_804926BC

+lbl_804926BC:

+	.skip 0x3D4

+.global lbl_80492A90

+lbl_80492A90:

+	.skip 0xC

+.global lbl_80492A9C

+lbl_80492A9C:

+	.skip 0x3E0

+.global lbl_80492E7C

+lbl_80492E7C:

+	.skip 0x3D4

+.global lbl_80493250

+lbl_80493250:

+	.skip 0x60

+.global lbl_804932B0

+lbl_804932B0:

+	.skip 0x30

+.global lbl_804932E0

+lbl_804932E0:

+	.skip 0x30

+.global lbl_80493310

+lbl_80493310:

+	.skip 0x10

+.global lbl_80493320

+lbl_80493320:

+	.skip 0x10

+.global lbl_80493330

+lbl_80493330:

+	.skip 0x2D8

+.global lbl_80493608

+lbl_80493608:

+	.skip 0xC

+.global lbl_80493614

+lbl_80493614:

+	.skip 0xC

+.global lbl_80493620

+lbl_80493620:

+	.skip 0xC

+.global lbl_8049362C

+lbl_8049362C:

+	.skip 0xC

+.global lbl_80493638

+lbl_80493638:

+	.skip 0x10

+.global lbl_80493648

+lbl_80493648:

+	.skip 0x10

+.global lbl_80493658

+lbl_80493658:

+	.skip 0x800

+.global lbl_80493E58

+lbl_80493E58:

+	.skip 0x110

+.global lbl_80493F68

+lbl_80493F68:

+	.skip 0x100

+.global lbl_80494068

+lbl_80494068:

+	.skip 0x400

+.global lbl_80494468

+lbl_80494468:

+	.skip 0x6C

+.global lbl_804944D4

+lbl_804944D4:

+	.skip 0x2274

+.global lbl_80496748

+lbl_80496748:

+	.skip 0xC

+.global lbl_80496754

+lbl_80496754:

+	.skip 0xC

+.global lbl_80496760

+lbl_80496760:

+	.skip 0x40

+.global lbl_804967A0

+lbl_804967A0:

+	.skip 0x20

+.global lbl_804967C0

+lbl_804967C0:

+	.skip 0xC

+.global lbl_804967CC

+lbl_804967CC:

+	.skip 0x17D4

+.global lbl_80497FA0

+lbl_80497FA0:

+	.skip 0x20

+.global lbl_80497FC0

+lbl_80497FC0:

+	.skip 0x20

+.global lbl_80497FE0

+lbl_80497FE0:

+	.skip 0xC

+.global lbl_80497FEC

+lbl_80497FEC:

+	.skip 0x654B4

+.global lbl_804FD4A0

+lbl_804FD4A0:

+	.skip 0x200

+.global lbl_804FD6A0

+lbl_804FD6A0:

+	.skip 0x200

+.global lbl_804FD8A0

+lbl_804FD8A0:

+	.skip 0x200

+.global lbl_804FDAA0

+lbl_804FDAA0:

+	.skip 0x10

+.global lbl_804FDAB0

+lbl_804FDAB0:

+	.skip 0x170

+.global lbl_804FDC20

+lbl_804FDC20:

+	.skip 0x780

+.global lbl_804FE3A0

+lbl_804FE3A0:

+	.skip 0x180

+.global lbl_804FE520

+lbl_804FE520:

+	.skip 0x410

+.global lbl_804FE930

+lbl_804FE930:

+	.skip 0x3C00

+.global lbl_80502530

+lbl_80502530:

+	.skip 0x18

+.global lbl_80502548

+lbl_80502548:

+	.skip 0x5B0

+.global lbl_80502AF8

+lbl_80502AF8:

+	.skip 0x1000

+.global lbl_80503AF8

+lbl_80503AF8:

+	.skip 0x100

+.global lbl_80503BF8

+lbl_80503BF8:

+	.skip 0x88

+.global lbl_80503C80

+lbl_80503C80:

+	.skip 0x20

+.global lbl_80503CA0

+lbl_80503CA0:

+	.skip 0x50

+.global lbl_80503CF0

+lbl_80503CF0:

+	.skip 0x50

+.global lbl_80503D40

+lbl_80503D40:

+	.skip 0xC2C4

+.global lbl_80510004

+lbl_80510004:

+	.skip 0x449C

+.global lbl_805144A0

+lbl_805144A0:

+	.skip 0x2C8

+.global lbl_80514768

+lbl_80514768:

+	.skip 0x18

+.global lbl_80514780

+lbl_80514780:

+	.skip 0x58

+.global lbl_805147D8

+lbl_805147D8:

+	.skip 0x318

+.global lbl_80514AF0

+lbl_80514AF0:

+	.skip 0x100

+.global lbl_80514BF0

+lbl_80514BF0:

+	.skip 0x2C8

+.global lbl_80514EB8

+lbl_80514EB8:

+	.skip 0x328

+.global lbl_805151E0

+lbl_805151E0:

+	.skip 0x20

+.global lbl_80515200

+lbl_80515200:

+	.skip 0x20

+.global lbl_80515220

+lbl_80515220:

+	.skip 0x20

+.global lbl_80515240

+lbl_80515240:

+	.skip 0x20

+.global lbl_80515260

+lbl_80515260:

+	.skip 0x20

+.global lbl_80515280

+lbl_80515280:

+	.skip 0x20

+.global lbl_805152A0

+lbl_805152A0:

+	.skip 0x200

+.global lbl_805154A0

+lbl_805154A0:

+	.skip 0x20

+.global lbl_805154C0

+lbl_805154C0:

+	.skip 0xC0

+.global lbl_80515580

+lbl_80515580:

+	.skip 0x80

+.global lbl_80515600

+lbl_80515600:

+	.skip 0x20

+.global lbl_80515620

+lbl_80515620:

+	.skip 0x20

+.global lbl_80515640

+lbl_80515640:

+	.skip 0x160

+.global lbl_805157A0

+lbl_805157A0:

+	.skip 0x78

+.global lbl_80515818

+lbl_80515818:

+	.skip 0x78

+.global lbl_80515890

+lbl_80515890:

+	.skip 0x80

+.global lbl_80515910

+lbl_80515910:

+	.skip 0x20

+.global lbl_80515930

+lbl_80515930:

+	.skip 0x680

+.global lbl_80515FB0

+lbl_80515FB0:

+	.skip 0x24

+.global lbl_80515FD4

+lbl_80515FD4:

+	.skip 0x24

+.global lbl_80515FF8

+lbl_80515FF8:

+	.skip 0xD8

+.global lbl_805160D0

+lbl_805160D0:

+	.skip 0x1B0

+.global lbl_80516280

+lbl_80516280:

+	.skip 0x700

+.global lbl_80516980

+lbl_80516980:

+	.skip 0x20

+.global lbl_805169A0

+lbl_805169A0:

+	.skip 0x30

+.global lbl_805169D0

+lbl_805169D0:

+	.skip 0x30

+.global lbl_80516A00

+lbl_80516A00:

+	.skip 0x40

+.global lbl_80516A40

+lbl_80516A40:

+	.skip 0x20

+.global lbl_80516A60

+lbl_80516A60:

+	.skip 0x20

+.global lbl_80516A80

+lbl_80516A80:

+	.skip 0x4A40

+.global lbl_8051B4C0

+lbl_8051B4C0:

+	.skip 0x30

+.global lbl_8051B4F0

+lbl_8051B4F0:

+	.skip 0x60

+.global lbl_8051B550

+lbl_8051B550:

+	.skip 0x30

+.global lbl_8051B580

+lbl_8051B580:

+	.skip 0x90

+.global lbl_8051B610

+lbl_8051B610:

+	.skip 0xD0

+.global lbl_8051B6E0

+lbl_8051B6E0:

+	.skip 0x80

+.global lbl_8051B760

+lbl_8051B760:

+	.skip 0x80

+.global lbl_8051B7E0

+lbl_8051B7E0:

+	.skip 0x20

+.global lbl_8051B800

+lbl_8051B800:

+	.skip 0xC0

+.global lbl_8051B8C0

+lbl_8051B8C0:

+	.skip 0x80

+.global lbl_8051B940

+lbl_8051B940:

+	.skip 0x80

+.global lbl_8051B9C0

+lbl_8051B9C0:

+	.skip 0x1200

+.global lbl_8051CBC0

+lbl_8051CBC0:

+	.skip 0x1200

+.global lbl_8051DDC0

+lbl_8051DDC0:

+	.skip 0xD80

+.global lbl_8051EB40

+lbl_8051EB40:

+	.skip 0x100

+.global lbl_8051EC40

+lbl_8051EC40:

+	.skip 0x40

+.global lbl_8051EC80

+lbl_8051EC80:

+	.skip 0x8A0

+.global lbl_8051F520

+lbl_8051F520:

+	.skip 0x480

+.global lbl_8051F9A0

+lbl_8051F9A0:

+	.skip 0x60

+.global lbl_8051FA00

+lbl_8051FA00:

+	.skip 0x40

+.global lbl_8051FA40

+lbl_8051FA40:

+	.skip 0x80

+.global lbl_8051FAC0

+lbl_8051FAC0:

+	.skip 0x7800

+.global lbl_805272C0

+lbl_805272C0:

+	.skip 0x1800

+.global lbl_80528AC0

+lbl_80528AC0:

+	.skip 0x8700

+.global lbl_805311C0

+lbl_805311C0:

+	.skip 0x10

+.global lbl_805311D0

+lbl_805311D0:

+	.skip 0x18

+.global lbl_805311E8

+lbl_805311E8:

+	.skip 0x2A00

+.global lbl_80533BE8

+lbl_80533BE8:

+	.skip 0x1998

+.global lbl_80535580

+lbl_80535580:

+	.skip 0x18

+.global lbl_80535598

+lbl_80535598:

+	.skip 0x28

+.global lbl_805355C0

+lbl_805355C0:

+	.skip 0x100

+.global lbl_805356C0

+lbl_805356C0:

+	.skip 0x10

+.global lbl_805356D0

+lbl_805356D0:

+	.skip 0x1490

+.global lbl_80536B60

+lbl_80536B60:

+	.skip 0x50

+.global lbl_80536BB0

+lbl_80536BB0:

+	.skip 0x80

+.global lbl_80536C30

+lbl_80536C30:

+	.skip 0x80

+.global lbl_80536CB0

+lbl_80536CB0:

+	.skip 0x90

+.global lbl_80536D40

+lbl_80536D40:

+	.skip 0x30

+.global lbl_80536D70

+lbl_80536D70:

+	.skip 0x10

+.global lbl_80536D80

+lbl_80536D80:

+	.skip 0x1000

+.global lbl_80537D80

+lbl_80537D80:

+	.skip 0x26C0

+.global lbl_8053A440

+lbl_8053A440:

+	.skip 0x28

+.global lbl_8053A468

+lbl_8053A468:

+	.skip 0x18

+.global lbl_8053A480

+lbl_8053A480:

+	.skip 0x60

+.global lbl_8053A4E0

+lbl_8053A4E0:

+	.skip 0x748

+.global lbl_8053AC28

+lbl_8053AC28:

+	.skip 0x468

+.global lbl_8053B090

+lbl_8053B090:

+	.skip 0x138

+.global lbl_8053B1C8

+lbl_8053B1C8:

+	.skip 0x60

+.global lbl_8053B228

+lbl_8053B228:

+	.skip 0x58

+.global lbl_8053B280

+lbl_8053B280:

+	.skip 0x1000

+.global lbl_8053C280

+lbl_8053C280:

+	.skip 0x20

+.global lbl_8053C2A0

+lbl_8053C2A0:

+	.skip 0x20

+.global lbl_8053C2C0

+lbl_8053C2C0:

+	.skip 0x28AE0

+.global lbl_80564DA0

+lbl_80564DA0:

+	.skip 0x40

+.global lbl_80564DE0

+lbl_80564DE0:

+	.skip 0x60

+.global lbl_80564E40

+lbl_80564E40:

+	.skip 0x1000

+.global lbl_80565E40

+lbl_80565E40:

+	.skip 0x1000

+.global lbl_80566E40

+lbl_80566E40:

+	.skip 0x7E0

+.global lbl_80567620

+lbl_80567620:

+	.skip 0x1000

+.global lbl_80568620

+lbl_80568620:

+	.skip 0x30

+.global lbl_80568650

+lbl_80568650:

+	.skip 0x88

+.global lbl_805686D8

+lbl_805686D8:

+	.skip 0x90

+.global lbl_80568768

+lbl_80568768:

+	.skip 0x30

+.global lbl_80568798

+lbl_80568798:

+	.skip 0x7C

+.global lbl_80568814

+lbl_80568814:

+	.skip 0x104

+.global lbl_80568918

+lbl_80568918:

+	.skip 0x30

+.global lbl_80568948

+lbl_80568948:

+	.skip 0x230

+.global lbl_80568B78

+lbl_80568B78:

+	.skip 0x27C8

+.global lbl_8056B340

+lbl_8056B340:

+	.skip 0x3B0

+.global lbl_8056B6F0

+lbl_8056B6F0:

+	.skip 0x148

+.global lbl_8056B838

+lbl_8056B838:

+	.skip 0x408

+.global lbl_8056BC40

+lbl_8056BC40:

+	.skip 0x7E8

+.global lbl_8056C428

+lbl_8056C428:

+	.skip 0x418

+.global lbl_8056C840

+lbl_8056C840:

+	.skip 0x4640

+.global lbl_80570E80

+lbl_80570E80:

+	.skip 0x40

+.global lbl_80570EC0

+lbl_80570EC0:

+	.skip 0x1A0

+.global lbl_80571060

+lbl_80571060:

+	.skip 0x4000

+.global lbl_80575060

+lbl_80575060:

+	.skip 0x4000

+.global lbl_80579060

+lbl_80579060:

+	.skip 0x20

+.global lbl_80579080

+lbl_80579080:

+	.skip 0x40

+.global lbl_805790C0

+lbl_805790C0:

+	.skip 0xA0

+.global lbl_80579160

+lbl_80579160:

+	.skip 0xA0

+.global lbl_80579200

+lbl_80579200:

+	.skip 0x280

+.global lbl_80579480

+lbl_80579480:

+	.skip 0xC0

+.global lbl_80579540

+lbl_80579540:

+	.skip 0x40

+.global lbl_80579580

+lbl_80579580:

+	.skip 0x220

+.global lbl_805797A0

+lbl_805797A0:

+	.skip 0x1318

+.global lbl_8057AAB8

+lbl_8057AAB8:

+	.skip 0x18

+.global lbl_8057AAD0

+lbl_8057AAD0:

+	.skip 0x10

+.global lbl_8057AAE0

+lbl_8057AAE0:

+	.skip 0xCA0

+.global lbl_8057B780

+lbl_8057B780:

+	.skip 0x3020

+.global lbl_8057E7A0

+lbl_8057E7A0:

+	.skip 0x180

+.global lbl_8057E920

+lbl_8057E920:

+	.skip 0xE0

+.global lbl_8057EA00

+lbl_8057EA00:

+	.skip 0x20

+.global lbl_8057EA20

+lbl_8057EA20:

+	.skip 0x20

+.global lbl_8057EA40

+lbl_8057EA40:

+	.skip 0x20

+.global lbl_8057EA60

+lbl_8057EA60:

+	.skip 0xB68

+.global lbl_8057F5C8

+lbl_8057F5C8:

+	.skip 0x27FB8

+.global lbl_805A7580

+lbl_805A7580:

+	.skip 0x20

+.global lbl_805A75A0

+lbl_805A75A0:

+	.skip 0x68000

+.global lbl_8060F5A0

+lbl_8060F5A0:

+	.skip 0x68

+.global lbl_8060F608

+lbl_8060F608:

+	.skip 0x10

+.global lbl_8060F618

+lbl_8060F618:

+	.skip 0x230

+.global lbl_8060F848

+lbl_8060F848:

+	.skip 0x208

+.global lbl_8060FA50

+lbl_8060FA50:

+	.skip 0x1A0

+.global lbl_8060FBF0

+lbl_8060FBF0:

+	.skip 0x18

+.global lbl_8060FC08

+lbl_8060FC08:

+	.skip 0x80

+.global lbl_8060FC88

+lbl_8060FC88:

+	.skip 0x100

+.global lbl_8060FD88

+lbl_8060FD88:

+	.skip 0x738

+.global lbl_806104C0

+lbl_806104C0:

+	.skip 0x20

+.global lbl_806104E0

+lbl_806104E0:

+	.skip 0x1D0

+.global lbl_806106B0

+lbl_806106B0:

+	.skip 0x174

+.global lbl_80610824

+lbl_80610824:

+	.skip 0x104

+.global lbl_80610928

+lbl_80610928:

+	.skip 0x178

+.global lbl_80610AA0

+lbl_80610AA0:

+	.skip 0x58

+.global lbl_80610AF8

+lbl_80610AF8:

+	.skip 0x80

+.global lbl_80610B78

+lbl_80610B78:

+	.skip 0x58

+.global lbl_80610BD0

+lbl_80610BD0:

+	.skip 0x10090

+.global lbl_80620C60

+lbl_80620C60:

+	.skip 0x30

+.global lbl_80620C90

+lbl_80620C90:

+	.skip 0x18

+.global lbl_80620CA8

+lbl_80620CA8:

+	.skip 0x40

+.global lbl_80620CE8

+lbl_80620CE8:

+	.skip 0x100

+.global lbl_80620DE8

+lbl_80620DE8:

+	.skip 0x100

+.global lbl_80620EE8

+lbl_80620EE8:

+	.skip 0x100

+.global lbl_80620FE8

+lbl_80620FE8:

+	.skip 0x200

+.global lbl_806211E8

+lbl_806211E8:

+	.skip 0x30

+.global lbl_80621218

+lbl_80621218:

+	.skip 0x200

+.global lbl_80621418

+lbl_80621418:

+	.skip 0x2D8

+.global lbl_806216F0

+lbl_806216F0:

+	.skip 0x18

+.global lbl_80621708

+lbl_80621708:

+	.skip 0x10

+.global lbl_80621718

+lbl_80621718:

+	.skip 0x10

+.global lbl_80621728

+lbl_80621728:

+	.skip 0xC

+.global lbl_80621734

+lbl_80621734:

+	.skip 0xC

+.global lbl_80621740

+lbl_80621740:

+	.skip 0x100

+.global lbl_80621840

+lbl_80621840:

+	.skip 0xC

+.global lbl_8062184C

+lbl_8062184C:

+	.skip 0xF4

+.global lbl_80621940

+lbl_80621940:

+	.skip 0xC

+.global lbl_8062194C

+lbl_8062194C:

+	.skip 0x2C

+.global lbl_80621978

+lbl_80621978:

+	.skip 0x10

+.global lbl_80621988

+lbl_80621988:

+	.skip 0x38

+.global lbl_806219C0

+lbl_806219C0:

+	.skip 0xC

+.global lbl_806219CC

+lbl_806219CC:

+	.skip 0x24

+.global lbl_806219F0

+lbl_806219F0:

+	.skip 0x2D8

+.global lbl_80621CC8

+lbl_80621CC8:

+	.skip 0x38

+.global lbl_80621D00

+lbl_80621D00:

+	.skip 0x10

+.global lbl_80621D10

+lbl_80621D10:

+	.skip 0x330

+.global lbl_80622040

+lbl_80622040:

+	.skip 0x16970

+.global lbl_806389B0

+lbl_806389B0:

+	.skip 0x10

+.global lbl_806389C0

+lbl_806389C0:

+	.skip 0x3A0

+.global lbl_80638D60

+lbl_80638D60:

+	.skip 0x4020

+.global lbl_8063CD80

+lbl_8063CD80:

+	.skip 0x18

+.global lbl_8063CD98

+lbl_8063CD98:

+	.skip 0xC

+.global lbl_8063CDA4

+lbl_8063CDA4:

+	.skip 0x3C

+.global lbl_8063CDE0

+lbl_8063CDE0:

+	.skip 0xC

+.global lbl_8063CDEC

+lbl_8063CDEC:

+	.skip 0x1C

+.global lbl_8063CE08

+lbl_8063CE08:

+	.skip 0x20

+.global lbl_8063CE28

+lbl_8063CE28:

+	.skip 0xC

+.global lbl_8063CE34

+lbl_8063CE34:

+	.skip 0x84

+.global lbl_8063CEB8

+lbl_8063CEB8:

+	.skip 0x10

+.global lbl_8063CEC8

+lbl_8063CEC8:

+	.skip 0x10

+.global lbl_8063CED8

+lbl_8063CED8:

+	.skip 0x18

+.global lbl_8063CEF0

+lbl_8063CEF0:

+	.skip 0xC0

+.global lbl_8063CFB0

+lbl_8063CFB0:

+	.skip 0xC0

+.global lbl_8063D070

+lbl_8063D070:

+	.skip 0x10

+.global lbl_8063D080

+lbl_8063D080:

+	.skip 0x18

+.global lbl_8063D098

+lbl_8063D098:

+	.skip 0x198

+.global lbl_8063D230

+lbl_8063D230:

+	.skip 0x90

diff --git a/asm/code_801DAAE0.s b/asm/code_801DAAE0_asm.s
index eef5524..905529f 100644
--- a/asm/code_801DAAE0.s
+++ b/asm/code_801DAAE0_asm.s
@@ -2,29 +2,6 @@
 

 .section .text, "ax"  # 0x80006980 - 0x803E1E60

 

-.global func_801DAAE0

-func_801DAAE0:

-/* 801DAAE0 001D6740  3C 60 80 49 */	lis r3, lbl_804912B0@ha

-/* 801DAAE4 001D6744  38 00 00 10 */	li r0, 0x10

-/* 801DAAE8 001D6748  38 63 12 B0 */	addi r3, r3, lbl_804912B0@l

-/* 801DAAEC 001D674C  38 80 00 00 */	li r4, 0

-/* 801DAAF0 001D6750  7C 09 03 A6 */	mtctr r0

-lbl_801DAAF4:

-/* 801DAAF4 001D6754  88 03 00 00 */	lbz r0, 0(r3)

-/* 801DAAF8 001D6758  2C 00 00 00 */	cmpwi r0, 0

-/* 801DAAFC 001D675C  40 82 00 18 */	bne lbl_801DAB14

-/* 801DAB00 001D6760  1C 04 00 0C */	mulli r0, r4, 0xc

-/* 801DAB04 001D6764  3C 60 80 49 */	lis r3, lbl_804912B0@ha

-/* 801DAB08 001D6768  38 63 12 B0 */	addi r3, r3, lbl_804912B0@l

-/* 801DAB0C 001D676C  7C 63 02 14 */	add r3, r3, r0

-/* 801DAB10 001D6770  4E 80 00 20 */	blr

-lbl_801DAB14:

-/* 801DAB14 001D6774  38 63 00 0C */	addi r3, r3, 0xc

-/* 801DAB18 001D6778  38 84 00 01 */	addi r4, r4, 1

-/* 801DAB1C 001D677C  42 00 FF D8 */	bdnz lbl_801DAAF4

-/* 801DAB20 001D6780  38 60 00 00 */	li r3, 0

-/* 801DAB24 001D6784  4E 80 00 20 */	blr

-

 .global func_801DAB28

 func_801DAB28:

 /* 801DAB28 001D6788  88 6D A0 16 */	lbz r3, lbl_8063F2D6-_SDA_BASE_(r13)

@@ -34,10 +11,10 @@ func_801DAB28:
 func_801DAB30:

 /* 801DAB30 001D6790  94 21 FF F0 */	stwu r1, -0x10(r1)

 /* 801DAB34 001D6794  7C 08 02 A6 */	mflr r0

-/* 801DAB38 001D6798  3C 60 80 49 */	lis r3, lbl_804912B0@ha

+/* 801DAB38 001D6798  3C 60 80 49 */	lis r3, gUnk804912B0@ha

 /* 801DAB3C 001D679C  38 80 00 00 */	li r4, 0

 /* 801DAB40 001D67A0  90 01 00 14 */	stw r0, 0x14(r1)

-/* 801DAB44 001D67A4  38 63 12 B0 */	addi r3, r3, lbl_804912B0@l

+/* 801DAB44 001D67A4  38 63 12 B0 */	addi r3, r3, gUnk804912B0@l

 /* 801DAB48 001D67A8  38 A0 00 C0 */	li r5, 0xc0

 /* 801DAB4C 001D67AC  4B E2 95 B9 */	bl memset

 /* 801DAB50 001D67B0  38 60 00 00 */	li r3, 0

diff --git a/include/code_801DAA30.h b/include/code_801DAA30.h
deleted file mode 100644
index 167f01c..0000000
--- a/include/code_801DAA30.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef POKEREVO_CODE_801DAA30_H

-#define POKEREVO_CODE_801DAA30_H

-

-void* operator new(size_t sz);

-void* operator new[](size_t sz);

-void operator delete(void* ptr);

-void operator delete[](void* ptr);

-

-#endif //POKEREVO_CODE_801DAA30_H

diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h
index 34bafa0..e0fb6fe 100644
--- a/include/code_801DAAE0.h
+++ b/include/code_801DAAE0.h
@@ -5,9 +5,17 @@
 extern "C" {

 #endif

 

+class unkClass

+{

+public:

+    u8 unk0;

+    u8 unk1[11];

+};

+

+unkClass* func_801DAAE0(void);

 BOOL func_801DAB28(void);

-void *func_801DAD64(size_t);

-void func_801DAEA4(void *);

+void* func_801DAD64(size_t);

+void func_801DAEA4(void*);

 

 #ifdef __cplusplus

 }

diff --git a/obj_files.mk b/obj_files.mk
index 8a9c578..d22e914 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -8,6 +8,7 @@ EXTABINDEX_O_FILES :=                                             \
 #todo fix with makefile implementation
 SPLIT_O_FILES := 						                          \
     $(BUILD_DIR)/asm/ctors.o						              \
+    $(BUILD_DIR)/asm/bss.o		    				              \
     $(BUILD_DIR)/asm/sbss.o						                  \
     $(BUILD_DIR)/asm/code_80006980.o							  \
 	$(BUILD_DIR)/asm/code_8000748C.o							  \
@@ -217,7 +218,8 @@ SPLIT_O_FILES := 						                          \
 	$(BUILD_DIR)/asm/SDK/NdevExi2A/DebuggerDriver.o                                       \
 	$(BUILD_DIR)/asm/SDK/NdevExi2A/exi2.o                                       \
 	$(BUILD_DIR)/src/code_801DAA30.o                                   \
-	$(BUILD_DIR)/asm/code_801DAAE0.o                                   \
+	$(BUILD_DIR)/src/code_801DAAE0.o                                   \
+	$(BUILD_DIR)/asm/code_801DAAE0_asm.o                                   \
 	$(BUILD_DIR)/asm/code_801DB040.o                                   \
 	$(BUILD_DIR)/asm/code_801DB81C.o                                   \
 	$(BUILD_DIR)/asm/code_801DBB3C.o                                   \
@@ -815,6 +817,7 @@ SPLIT_O_FILES := 						                          \
 	$(BUILD_DIR)/asm/code_803D9208.o \
 	$(BUILD_DIR)/asm/text_11_2.o \
 	$(BUILD_DIR)/asm/ctors_2.o \
+	$(BUILD_DIR)/asm/bss_2.o \
 	$(BUILD_DIR)/asm/sbss_2.o \
 
 
@@ -827,9 +830,6 @@ RODATA_O_FILES :=                                                 \
 DATA_O_FILES :=                                                   \
     $(BUILD_DIR)/asm/data.o
 
-BSS_O_FILES :=                                                    \
-    $(BUILD_DIR)/asm/bss.o
-
 SDATA_O_FILES :=                                                  \
     $(BUILD_DIR)/asm/sdata.o
 
diff --git a/src/code_801DAA30.cpp b/src/code_801DAA30.cpp
index 4a24614..04337f2 100644
--- a/src/code_801DAA30.cpp
+++ b/src/code_801DAA30.cpp
@@ -1,7 +1,6 @@
 #include "types.h"

 #include "unkStruct.h"

 #include "code_801DAAE0.h"

-#include "code_801DAA30.h"

 

 unkStruct gUnk8063F2C8(1, 4, 0);

 

diff --git a/src/code_801DAAE0.cpp b/src/code_801DAAE0.cpp
new file mode 100644
index 0000000..0a7a460
--- /dev/null
+++ b/src/code_801DAAE0.cpp
@@ -0,0 +1,21 @@
+#include "types.h"

+#include "unkStruct.h"

+#include "code_801DAAE0.h"

+

+// TODO: C or C++

+

+extern "C" {

+

+// unkStruct gUnk8063F2D0(1, 4, 0);

+

+unkClass gUnk804912B0[16];

+

+unkClass* func_801DAAE0(void)

+{

+    for (u32 i = 0; i < 16; i++)

+        if (gUnk804912B0[i].unk0 == 0)

+            return &gUnk804912B0[i];

+    return NULL;

+}

+

+}