fox_52730 decomped, other cleanup (#46)

* objects?

* objects2?

* more stuff

* format

* even more cleanup

* RCP function names

* format

* NO U

* makerom too

* stuff

* last function

* symbols...why

* data

* cleaning

* expert mode

* foxname

* one more name

* forgot something

* one more variable cleanup

* I swear I can stop

4 files changed, 671 insertions, 149 deletions

diff --git a/linker_scripts/us/symbol_addr_mesg.txt b/linker_scripts/us/symbol_addr_mesg.txt
index 63775563..49e579cc 100644
--- a/linker_scripts/us/symbol_addr_mesg.txt
+++ b/linker_scripts/us/symbol_addr_mesg.txt
@@ -777,145 +777,3 @@ gMsg_ID_23029 = 0x80185b48;
 gMsg_ID_23030 = 0x80185ba0;                
 gMsg_ID_23031 = 0x80185c00;                
 gMsg_ID_23032 = 0x80185c68;                
-// D_8017B2CC = 0x8017B2CC;
-// D_8017B730 = 0x8017B730;
-// D_8017B7A8 = 0x8017B7A8;
-// D_8017B7FC = 0x8017B7FC;
-// D_8017B848 = 0x8017B848;
-// gMsg_ID_5504 = 0x8017D138;
-// D_8017E264 = 0x8017E264;
-// D_8017E934 = 0x8017E934;
-// D_8017E974 = 0x8017E974;
-// D_8017E9AC = 0x8017E9AC;
-// D_8017E9FC = 0x8017E9FC;
-// D_8017EA34 = 0x8017EA34;
-// D_8017EA88 = 0x8017EA88;
-// D_8017EACC = 0x8017EACC;
-// D_8017EAF0 = 0x8017EAF0;
-// D_8017EB14 = 0x8017EB14;
-// D_8017EB44 = 0x8017EB44;
-// D_8017EB9C = 0x8017EB9C;
-// D_8017EBD4 = 0x8017EBD4;
-// D_8017EC24 = 0x8017EC24;
-// D_8017EC60 = 0x8017EC60;
-// D_8017ECAC = 0x8017ECAC;
-// D_8017ECF4 = 0x8017ECF4;
-// D_8017ED28 = 0x8017ED28;
-// D_8017ED50 = 0x8017ED50;
-// D_8017ED70 = 0x8017ED70;
-// D_8017ED9C = 0x8017ED9C;
-// D_8017EDB8 = 0x8017EDB8;
-// D_8017EFA0 = 0x8017EFA0;
-// D_8017EFF0 = 0x8017EFF0;
-// D_8017F048 = 0x8017F048;
-// D_8017F090 = 0x8017F090;
-// D_8017F0D4 = 0x8017F0D4;
-// D_8017F114 = 0x8017F114;
-// D_8017F144 = 0x8017F144;
-// D_8017F194 = 0x8017F194;
-// D_8017F1DC = 0x8017F1DC;
-// D_8017F218 = 0x8017F218;
-// D_8017F26C = 0x8017F26C;
-// D_8017F2A4 = 0x8017F2A4;
-// D_8017F2E8 = 0x8017F2E8;
-// D_8017F31C = 0x8017F31C;
-// D_8017F344 = 0x8017F344;
-// D_8017F37C = 0x8017F37C;
-// D_8017F3C8 = 0x8017F3C8;
-// D_8017F3EC = 0x8017F3EC;
-// D_8017F8C8 = 0x8017F8C8;
-// D_8017F8F4 = 0x8017F8F4;
-// D_8017F920 = 0x8017F920;
-// D_80180001 = 0x80180001;
-// D_80180E38 = 0x80180E38;
-// D_80180E70 = 0x80180E70;
-// D_80180EC4 = 0x80180EC4;
-// D_80180EF4 = 0x80180EF4;
-// D_80180F30 = 0x80180F30;
-// D_80180FFC = 0x80180FFC;
-// D_8018102C = 0x8018102C;
-// D_80181530 = 0x80181530;
-// D_8018163C = 0x8018163C;
-// D_80181664 = 0x80181664;
-// D_80181698 = 0x80181698;
-// D_801816C8 = 0x801816C8;
-// D_80181C30 = 0x80181C30;
-// D_8018236C = 0x8018236C;
-// D_801823B0 = 0x801823B0;
-// D_80182544 = 0x80182544;
-// D_80182940 = 0x80182940;
-// D_801829FC = 0x801829FC;
-// D_80182F34 = 0x80182F34;
-// D_80182F74 = 0x80182F74;
-// D_80182FA8 = 0x80182FA8;
-// D_80182FF0 = 0x80182FF0;
-// D_80183028 = 0x80183028;
-// D_80183068 = 0x80183068;
-// D_801830B0 = 0x801830B0;
-// D_80183110 = 0x80183110;
-// D_8018314C = 0x8018314C;
-// D_8018318C = 0x8018318C;
-// D_801831B4 = 0x801831B4;
-// D_801831EC = 0x801831EC;
-// D_80183204 = 0x80183204;
-// D_80183244 = 0x80183244;
-// D_80183280 = 0x80183280;
-// D_801832AC = 0x801832AC;
-// D_801832E4 = 0x801832E4;
-// D_801833F0 = 0x801833F0;
-// D_8018341C = 0x8018341C;
-// D_80183448 = 0x80183448;
-// D_80183488 = 0x80183488;
-// D_801834D4 = 0x801834D4;
-// D_8018350C = 0x8018350C;
-// D_80183558 = 0x80183558;
-// D_8018359C = 0x8018359C;
-// D_801835D0 = 0x801835D0;
-// D_80183630 = 0x80183630;
-// D_8018366C = 0x8018366C;
-// D_80183690 = 0x80183690;
-// D_801836B0 = 0x801836B0;
-// D_801836F8 = 0x801836F8;
-// D_80183724 = 0x80183724;
-// D_80183760 = 0x80183760;
-// D_801837B4 = 0x801837B4;
-// D_801837F8 = 0x801837F8;
-// D_8018380C = 0x8018380C;
-// D_80183820 = 0x80183820;
-// D_80183834 = 0x80183834;
-// D_8018385C = 0x8018385C;
-// D_80183898 = 0x80183898;
-// D_801838DC = 0x801838DC;
-// D_80183900 = 0x80183900;
-// D_80183950 = 0x80183950;
-// D_8018398C = 0x8018398C;
-// D_801839B8 = 0x801839B8;
-// D_80183A08 = 0x80183A08;
-// D_80183A64 = 0x80183A64;
-// D_80183AAC = 0x80183AAC;
-// D_80183CA8 = 0x80183CA8;
-// D_80183CF0 = 0x80183CF0;
-// D_80183D3C = 0x80183D3C;
-// D_8018406C = 0x8018406C;
-// D_801840A8 = 0x801840A8;
-// D_801840EC = 0x801840EC;
-// D_801843C8 = 0x801843C8;
-// D_80184408 = 0x80184408;
-// D_80184424 = 0x80184424;
-// D_80184474 = 0x80184474;
-// D_801844B0 = 0x801844B0;
-// D_801844EC = 0x801844EC;
-// D_80184558 = 0x80184558;
-// D_801845A8 = 0x801845A8;
-// D_801845F8 = 0x801845F8;
-// D_80184620 = 0x80184620;
-// D_80184644 = 0x80184644;
-// D_80184668 = 0x80184668;
-// D_801846A0 = 0x801846A0;
-// D_801846D8 = 0x801846D8;
-// D_801846E8 = 0x801846E8;
-// D_801846FC = 0x801846FC;
-// D_8018481C = 0x8018481C;
-// D_801849B8 = 0x801849B8;
-// D_80184A04 = 0x80184A04;
-// D_80184A4C = 0x80184A4C;
diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt
index 0459eefe..b6f64530 100644
--- a/linker_scripts/us/symbol_addrs.txt
+++ b/linker_scripts/us/symbol_addrs.txt
@@ -13,6 +13,13 @@ gFrameBuffers = 0x8038F800;
 gDmaTable = 0x80178A70; //size:0x5A0
 D_80178A70 = 0x80178A78; //ignore:true
 
+D_80161AA8 = 0x80161AA8;//size:0x10
+D_800CA23C = 0x800CA23C;//size:0x18
+D_800CA26C = 0x800CA26C;//size:0x20
+D_800CA260 = 0x800CA260;//size:0xC
+D_801613E0 = 0x801613E0;//size:0x18
+D_800CC124 = 0x800CC124;//type:u8
+
 D_80161B00 = 0x80161B00; //size:0x1900
 D_80163400 = 0x80163400; //size:0xBE0
 D_80163FE0 = 0x80163FE0; //size:0xB130
@@ -20,9 +27,11 @@ D_8016F110 = 0x8016F110; //size:0x1020
 D_80170130 = 0x80170130; //size:0x36B0
 D_801737E0 = 0x801737E0; //size:0x870
 D_80174050 = 0x80174050; //size:0x700
-D_80174750 = 0x80174750;//size:0x12C0
-D_80175A10 = 0x80175A10;//size:0xA28
-D_80176438 = 0x80176438;//size:0x18
+D_80174750 = 0x80174750; //size:0x12C0
+D_80175A10 = 0x80175A10; //size:0xA28
+D_80176438 = 0x80176438; //size:0x18
+
+gExpertMode = 0x801779F8;
 
 D_800D3180 = 0x800D3180; // size:0x1E
 gSetupDLs = 0x800D31B0; // size:0x18C0
@@ -40,8 +49,8 @@ Save_Write = 0x800C3084;
 Save_Read = 0x800C3194;
 gSaveFile = 0x80178870; //size:0x200
 
-__rspboot_start = 0x80000450;
-__rspboot_end = 0x80000520;
+__rspboot_start = 0x80000450;//name_end:__rspboot_end
+__aspmain_start = 0x80000520;//name_end:__aspmain_end
 __f3dex_start = 0x80001410;
 gF3dexData = 0x800C3DD0;
 
diff --git a/linker_scripts/us/symbol_addrs_libultra.txt b/linker_scripts/us/symbol_addrs_libultra.txt
index 3b73394f..87add7cf 100644
--- a/linker_scripts/us/symbol_addrs_libultra.txt
+++ b/linker_scripts/us/symbol_addrs_libultra.txt
@@ -64,7 +64,7 @@ __osLeoResume = 0x8002A99C;
 __osPfsGetStatus = 0x8002AC30;
 __osSpRawWriteIo = 0x8002E1E0;
 __osSpRawReadIo = 0x8002E230;
-osCreatePiMgr = 0x800227A0;
+osCreatePiManager = 0x800227A0;
 ramromMain = 0x8002296C;
 osSetThreadPri = 0x80022A80; 
 osInitialize = 0x80022B60;
diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld
index 0e4fd647..c0a5c3ec 100644
--- a/linker_scripts/us/undefined_syms.ld
+++ b/linker_scripts/us/undefined_syms.ld
@@ -1,3 +1,312 @@
+func_8018753C = 0x8018753C;
+func_8018F31C = 0x8018F31C;
+func_8018F8B8 = 0x8018F8B8;
+func_801A2A78 = 0x801A2A78;
+func_801A6608 = 0x801A6608;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A3240 = 0x801A3240;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A2B24 = 0x801A2B24;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801A23AC = 0x801A23AC;
+func_801BE1FC = 0x801BE1FC;
+func_801935D4 = 0x801935D4;
+func_8019350C = 0x8019350C;
+func_80197CB8 = 0x80197CB8;
+func_8018BAAC = 0x8018BAAC;
+func_8018BBA4 = 0x8018BBA4;
+func_8018BBF8 = 0x8018BBF8;
+func_8018BD7C = 0x8018BD7C;
+func_8018DA6C = 0x8018DA6C;
+func_8018DAEC = 0x8018DAEC;
+func_8018DB6C = 0x8018DB6C;
+func_801BEC74 = 0x801BEC74;
+func_80188448 = 0x80188448;
+func_8018F884 = 0x8018F884;
+func_801A4CB0 = 0x801A4CB0;
+func_801A12C4 = 0x801A12C4;
+func_801A12C4 = 0x801A12C4;
+func_801AC294 = 0x801AC294;
+func_801A12C4 = 0x801A12C4;
+func_801A12C4 = 0x801A12C4;
+func_801A12C4 = 0x801A12C4;
+func_801A12C4 = 0x801A12C4;
+func_801A12C4 = 0x801A12C4;
+func_801A12C4 = 0x801A12C4;
+func_801A43BC = 0x801A43BC;
+func_801A4A64 = 0x801A4A64;
+func_801A5F90 = 0x801A5F90;
+func_801A6100 = 0x801A6100;
+func_801A6540 = 0x801A6540;
+func_801A68EC = 0x801A68EC;
+func_801ADAC8 = 0x801ADAC8;
+func_801AE2C0 = 0x801AE2C0;
+func_801AEEFC = 0x801AEEFC;
+func_801A54E8 = 0x801A54E8;
+func_80189AFC = 0x80189AFC;
+func_8018E5B4 = 0x8018E5B4;
+func_8018EF14 = 0x8018EF14;
+func_8018E2D8 = 0x8018E2D8;
+func_8018AABC = 0x8018AABC;
+func_8018BE84 = 0x8018BE84;
+func_8018B6AC = 0x8018B6AC;
+func_8018A1C0 = 0x8018A1C0;
+func_80190430 = 0x80190430;
+func_80190F08 = 0x80190F08;
+func_801914C4 = 0x801914C4;
+func_80191B4C = 0x80191B4C;
+func_80191DB0 = 0x80191DB0;
+func_80191FFC = 0x80191FFC;
+func_80192C18 = 0x80192C18;
+func_80193240 = 0x80193240;
+func_8019983C = 0x8019983C;
+func_80199E24 = 0x80199E24;
+func_8019D3C4 = 0x8019D3C4;
+func_8019A1FC = 0x8019A1FC;
+func_8019ACCC = 0x8019ACCC;
+func_8019B7DC = 0x8019B7DC;
+func_8019BDE0 = 0x8019BDE0;
+func_8019C1CC = 0x8019C1CC;
+func_8019C83C = 0x8019C83C;
+func_8019CE58 = 0x8019CE58;
+func_801AE168 = 0x801AE168;
+func_801AEB44 = 0x801AEB44;
+func_801B099C = 0x801B099C;
+func_801B0EC0 = 0x801B0EC0;
+func_801B619C = 0x801B619C;
+func_801B90DC = 0x801B90DC;
+func_801B504C = 0x801B504C;
+func_801B7A24 = 0x801B7A24;
+func_801BA108 = 0x801BA108;
+func_801BA4E4 = 0x801BA4E4;
+func_801BAD7C = 0x801BAD7C;
+func_801BB204 = 0x801BB204;
+func_801BC930 = 0x801BC930;
+func_801BDE6C = 0x801BDE6C;
+func_801BD264 = 0x801BD264;
+func_801BEB1C = 0x801BEB1C;
+func_80188FE4 = 0x80188FE4;
+func_8019E3A8 = 0x8019E3A8;
+func_8019F7AC = 0x8019F7AC;
+func_8019F7AC = 0x8019F7AC;
+func_8019F7AC = 0x8019F7AC;
+func_80192E2C = 0x80192E2C;
+func_801934D0 = 0x801934D0;
+func_80193244 = 0x80193244;
+func_80188660 = 0x80188660;
+func_8018AA74 = 0x8018AA74;
+func_8018ECAC = 0x8018ECAC;
+func_8018ED78 = 0x8018ED78;
+func_8018EE84 = 0x8018EE84;
+func_8018EF90 = 0x8018EF90;
+func_8018BACC = 0x8018BACC;
+func_801887D0 = 0x801887D0;
+func_801BEC5C = 0x801BEC5C;
+func_8018C54C = 0x8018C54C;
+func_80193434 = 0x80193434;
+func_8018FF84 = 0x8018FF84;
+func_80190020 = 0x80190020;
+func_801982A8 = 0x801982A8;
+func_801949DC = 0x801949DC;
+func_80191AFC = 0x80191AFC;
+func_80196288 = 0x80196288;
+func_8019E98C = 0x8019E98C;
+func_8019E2C4 = 0x8019E2C4;
+func_801A71B8 = 0x801A71B8;
+func_801968F4 = 0x801968F4;
+func_80193B1C = 0x80193B1C;
+func_801B4D84 = 0x801B4D84;
+func_801985E4 = 0x801985E4;
+func_801928C8 = 0x801928C8;
+func_8018B8C0 = 0x8018B8C0;
+func_80197C64 = 0x80197C64;
+func_80192A68 = 0x80192A68;
+func_80188FA8 = 0x80188FA8;
+func_8018DCE4 = 0x8018DCE4;
+func_8018DBEC = 0x8018DBEC;
+func_8018DE14 = 0x8018DE14;
+func_801A5AF0 = 0x801A5AF0;
+func_801AEAA0 = 0x801AEAA0;
+func_801A5D68 = 0x801A5D68;
+func_801A0AF0 = 0x801A0AF0;
+func_8018CF98 = 0x8018CF98;
+func_80191180 = 0x80191180;
+
+func_80187530 = 0x80187530;
+func_8018756C = 0x8018756C;
+func_801875A4 = 0x801875A4;
+func_80187650 = 0x80187650;
+func_801877C4 = 0x801877C4;
+func_80187944 = 0x80187944;
+func_8018795C = 0x8018795C;
+func_801880E4 = 0x801880E4;
+func_80188344 = 0x80188344;
+func_80188528 = 0x80188528;
+func_80188AD0 = 0x80188AD0;
+func_80188CAC = 0x80188CAC;
+func_80188F60 = 0x80188F60;
+func_80188FAC = 0x80188FAC;
+func_80189058 = 0x80189058;
+func_80189114 = 0x80189114;
+func_80189194 = 0x80189194;
+func_8018933C = 0x8018933C;
+func_801893B8 = 0x801893B8;
+func_80189470 = 0x80189470;
+func_801895B8 = 0x801895B8;
+func_80189724 = 0x80189724;
+func_8018978C = 0x8018978C;
+func_80189B70 = 0x80189B70;
+func_80189CC8 = 0x80189CC8;
+func_8018A544 = 0x8018A544;
+func_8018AB44 = 0x8018AB44;
+func_8018AED0 = 0x8018AED0;
+func_8018B15C = 0x8018B15C;
+func_8018B268 = 0x8018B268;
+func_8018B418 = 0x8018B418;
+func_8018B58C = 0x8018B58C;
+func_8018B9D0 = 0x8018B9D0;
+func_8018C19C = 0x8018C19C;
+func_8018C8A8 = 0x8018C8A8;
+func_8018CAD4 = 0x8018CAD4;
+func_8018D9EC = 0x8018D9EC;
+func_8018DBF0 = 0x8018DBF0;
+func_8018DDAC = 0x8018DDAC;
+func_8018E290 = 0x8018E290;
+func_8018E54C = 0x8018E54C;
+func_8018E5F8 = 0x8018E5F8;
+func_8018E76C = 0x8018E76C;
+func_8018F038 = 0x8018F038;
+func_8018F044 = 0x8018F044;
+func_8018F330 = 0x8018F330;
+func_8018F4D8 = 0x8018F4D8;
+func_8018FE38 = 0x8018FE38;
+func_8018FF20 = 0x8018FF20;
+func_80190078 = 0x80190078;
+func_801904CC = 0x801904CC;
+func_80190A00 = 0x80190A00;
+func_80191010 = 0x80191010;
+func_80191054 = 0x80191054;
+func_801912FC = 0x801912FC;
+func_80191680 = 0x80191680;
+func_80191BC4 = 0x80191BC4;
+func_80192094 = 0x80192094;
+func_801922DC = 0x801922DC;
+func_80192358 = 0x80192358;
+func_801923C0 = 0x801923C0;
+func_8019243C = 0x8019243C;
+func_801924A8 = 0x801924A8;
+func_80192518 = 0x80192518;
+func_80192834 = 0x80192834;
+func_80192984 = 0x80192984;
+func_80192CD4 = 0x80192CD4;
+func_80192E64 = 0x80192E64;
+func_80192E94 = 0x80192E94;
+func_80192EB0 = 0x80192EB0;
+func_80193380 = 0x80193380;
+func_801933DC = 0x801933DC;
+func_80193540 = 0x80193540;
+func_8019356C = 0x8019356C;
+func_80193718 = 0x80193718;
+func_80194398 = 0x80194398;
+func_801946C4 = 0x801946C4;
+func_80194A84 = 0x80194A84;
+func_80196210 = 0x80196210;
+func_80197A94 = 0x80197A94;
+func_80198968 = 0x80198968;
+func_8019969C = 0x8019969C;
+func_80199A28 = 0x80199A28;
+func_80199F10 = 0x80199F10;
+func_8019A5D4 = 0x8019A5D4;
+func_8019B548 = 0x8019B548;
+func_8019B854 = 0x8019B854;
+func_8019BE48 = 0x8019BE48;
+func_8019C454 = 0x8019C454;
+func_8019C778 = 0x8019C778;
+func_8019C888 = 0x8019C888;
+func_8019CBEC = 0x8019CBEC;
+func_8019CE88 = 0x8019CE88;
+func_8019D15C = 0x8019D15C;
+func_8019D700 = 0x8019D700;
+func_8019E234 = 0x8019E234;
+func_8019E410 = 0x8019E410;
+func_8019E454 = 0x8019E454;
+func_8019EA60 = 0x8019EA60;
+func_8019EA7C = 0x8019EA7C;
+func_8019EE68 = 0x8019EE68;
+func_8019F20C = 0x8019F20C;
+func_8019FF9C = 0x8019FF9C;
+func_801A003C = 0x801A003C;
+func_801A0120 = 0x801A0120;
+func_801A0BD8 = 0x801A0BD8;
+func_801A2DD8 = 0x801A2DD8;
+func_801A3BD4 = 0x801A3BD4;
+func_801A3E98 = 0x801A3E98;
+func_801A46A0 = 0x801A46A0;
+func_801A4B24 = 0x801A4B24;
+func_801A4E44 = 0x801A4E44;
+func_801A52B8 = 0x801A52B8;
+func_801A57D0 = 0x801A57D0;
+func_801A5B3C = 0x801A5B3C;
+func_801A5B4C = 0x801A5B4C;
+func_801A5E54 = 0x801A5E54;
+func_801A5FD0 = 0x801A5FD0;
+func_801A6144 = 0x801A6144;
+func_801A67C8 = 0x801A67C8;
+func_801A7E7C = 0x801A7E7C;
+func_801AC438 = 0x801AC438;
+func_801AC918 = 0x801AC918;
+func_801AD6C0 = 0x801AD6C0;
+func_801AD6F0 = 0x801AD6F0;
+func_801ADD68 = 0x801ADD68;
+func_801AE3D8 = 0x801AE3D8;
+func_801AE87C = 0x801AE87C;
+func_801AEC04 = 0x801AEC04;
+func_801AFA5C = 0x801AFA5C;
+func_801B0B60 = 0x801B0B60;
+func_801B134C = 0x801B134C;
+func_801B50E8 = 0x801B50E8;
+func_801B638C = 0x801B638C;
+func_801B6FF8 = 0x801B6FF8;
+func_801B7C78 = 0x801B7C78;
+func_801B91A4 = 0x801B91A4;
+func_801BA26C = 0x801BA26C;
+func_801BA6A4 = 0x801BA6A4;
+func_801BADF8 = 0x801BADF8;
+func_801BB79C = 0x801BB79C;
+func_801BC9A0 = 0x801BC9A0;
+func_801BD54C = 0x801BD54C;
+func_801BE3F8 = 0x801BE3F8;
+func_801BEC50 = 0x801BEC50;
+func_801BEC68 = 0x801BEC68;
+
+D_1022120 = 0x01022120;
+D_1024410 = 0x01024410;
+D_1024570 = 0x01024570;
+D_10246D0 = 0x010246D0;
+
 D_2000000 = 0x02000000;
 D_2000890 = 0x02000890;
 D_2001090 = 0x02001090;
@@ -27,6 +336,26 @@ D_200F080 = 0x0200F080;
 D_200F910 = 0x0200F910;
 D_20101A0 = 0x020101A0;
 
+D_3001C90 = 0x03001C90;
+D_3003CE0 = 0x03003CE0;
+D_3007650 = 0x03007650;
+D_3012ED0 = 0x03012ED0;
+D_3013580 = 0x03013580;
+D_3013780 = 0x03013780;
+D_3016B00 = 0x03016B00;
+D_3016CC0 = 0x03016CC0;
+D_30173C0 = 0x030173C0;
+D_30174E0 = 0x030174E0;
+D_3017600 = 0x03017600;
+D_301B080 = 0x0301B080;
+D_302ED4C = 0x0302ED4C;
+D_302ED98 = 0x0302ED98;
+D_302EDB4 = 0x0302EDB4;
+D_302EE00 = 0x0302EE00;
+D_302EE64 = 0x0302EE64;
+D_302EE80 = 0x0302EE80;
+D_302EE9C = 0x0302EE9C;
+
 D_5000000 = 0x05000000;
 D_5000080 = 0x05000080;
 D_5000100 = 0x05000100;
@@ -36,4 +365,330 @@ D_5000280 = 0x05000280;
 D_5000300 = 0x05000300;
 D_5000380 = 0x05000380;
 D_5000400 = 0x05000400;
-D_5000480 = 0x05000480;
\ No newline at end of file
+D_5000480 = 0x05000480;
+
+D_6000E00 = 0x06000E00;
+D_6001360 = 0x06001360;
+D_6001DA0 = 0x06001DA0;
+D_60023B0 = 0x060023B0;
+D_6002990 = 0x06002990;
+D_6003000 = 0x06003000;
+D_60030F0 = 0x060030F0;
+D_60034D0 = 0x060034D0;
+D_6003610 = 0x06003610;
+D_60036A0 = 0x060036A0;
+D_6004170 = 0x06004170;
+D_6005360 = 0x06005360;
+D_6005780 = 0x06005780;
+D_6006140 = 0x06006140;
+D_6006310 = 0x06006310;
+D_60064AC = 0x060064AC;
+D_60064C8 = 0x060064C8;
+D_60064FC = 0x060064FC;
+D_6006518 = 0x06006518;
+D_6006564 = 0x06006564;
+D_60065B0 = 0x060065B0;
+D_60065FC = 0x060065FC;
+D_6006648 = 0x06006648;
+D_6006694 = 0x06006694;
+D_60066E0_f32 = 0x060066E0;
+D_60066E0_Gfx = 0x060066E0;
+D_600672C = 0x0600672C;
+D_6006778 = 0x06006778;
+D_60067C4 = 0x060067C4;
+D_6006808 = 0x06006808;
+D_600683C = 0x0600683C;
+D_6006858 = 0x06006858;
+D_6006890_f32 = 0x06006890;
+D_6006890_Gfx = 0x06006890;
+D_60068BC = 0x060068BC;
+D_60068F0 = 0x060068F0;
+D_6006A3C = 0x06006A3C;
+D_6006A80 = 0x06006A80;
+D_6006BF0 = 0x06006BF0;
+D_6006C44 = 0x06006C44;
+D_6006F50 = 0x06006F50;
+D_6007410 = 0x06007410;
+D_60075D0 = 0x060075D0;
+D_60079B0 = 0x060079B0;
+D_6007D80 = 0x06007D80;
+D_6008370 = 0x06008370;
+D_600924C = 0x0600924C;
+D_60092E8 = 0x060092E8;
+D_6009388 = 0x06009388;
+D_60097E0 = 0x060097E0;
+D_6009CC4 = 0x06009CC4;
+D_6009CFC = 0x06009CFC;
+D_600A420 = 0x0600A420;
+D_600AF40 = 0x0600AF40;
+D_600B8B0 = 0x0600B8B0;
+D_600BAF0 = 0x0600BAF0;
+D_600BF80 = 0x0600BF80;
+D_600E820 = 0x0600E820;
+D_600EC90 = 0x0600EC90;
+D_600EE10 = 0x0600EE10;
+D_600EEF0 = 0x0600EEF0;
+D_600F4C0 = 0x0600F4C0;
+D_600F560 = 0x0600F560;
+D_600F6C0 = 0x0600F6C0;
+D_600FE9C = 0x0600FE9C;
+D_600FEB8 = 0x0600FEB8;
+D_600FF30 = 0x0600FF30;
+D_600FF80 = 0x0600FF80;
+D_600FFA0 = 0x0600FFA0;
+D_600FFC0 = 0x0600FFC0;
+D_600FFE0 = 0x0600FFE0;
+D_60102C0 = 0x060102C0;
+D_6010960 = 0x06010960;
+D_6010A50 = 0x06010A50;
+D_6010E00 = 0x06010E00;
+D_6011058 = 0x06011058;
+D_601115C = 0x0601115C;
+D_601115C = 0x0601115C;
+D_6011B24 = 0x06011B24;
+D_6011BF4 = 0x06011BF4;
+D_6011C10 = 0x06011C10;
+D_6011C48 = 0x06011C48;
+D_6011C80 = 0x06011C80;
+D_6011EE0 = 0x06011EE0;
+D_60120F0 = 0x060120F0;
+D_60132B0 = 0x060132B0;
+D_60137B0 = 0x060137B0;
+D_6013960 = 0x06013960;
+D_6013B50 = 0x06013B50;
+D_60143E0 = 0x060143E0;
+D_6014500 = 0x06014500;
+D_6014670 = 0x06014670;
+D_6014A20 = 0x06014A20;
+D_6014B50 = 0x06014B50;
+D_60153B0 = 0x060153B0;
+D_6015730 = 0x06015730;
+D_6015F00 = 0x06015F00;
+D_6016270 = 0x06016270;
+D_60164F0 = 0x060164F0;
+D_6016580 = 0x06016580;
+D_601668C = 0x0601668C;
+D_60166F4 = 0x060166F4;
+D_6016714 = 0x06016714;
+D_6018450 = 0x06018450;
+D_60188D0 = 0x060188D0;
+D_6018C00 = 0x06018C00;
+D_6018E80 = 0x06018E80;
+D_601A7D0 = 0x0601A7D0;
+D_601B0D0 = 0x0601B0D0;
+D_601B4E0 = 0x0601B4E0;
+D_601B4FC = 0x0601B4FC;
+D_601B518 = 0x0601B518;
+D_601B560 = 0x0601B560;
+D_601B584 = 0x0601B584;
+D_601B5F4 = 0x0601B5F4;
+D_601B610 = 0x0601B610;
+D_601B644 = 0x0601B644;
+D_601B678 = 0x0601B678;
+D_601B6C4 = 0x0601B6C4;
+D_601B710 = 0x0601B710;
+D_601B75C = 0x0601B75C;
+D_601B7C0 = 0x0601B7C0;
+D_601B7F8 = 0x0601B7F8;
+D_601B830 = 0x0601B830;
+D_601B868 = 0x0601B868;
+D_601B8A0 = 0x0601B8A0;
+D_601B8D8 = 0x0601B8D8;
+D_601BEC0 = 0x0601BEC0;
+D_601C6A0 = 0x0601C6A0;
+D_601C9B0 = 0x0601C9B0;
+D_601D730 = 0x0601D730;
+D_601DE60 = 0x0601DE60;
+D_601F1D0 = 0x0601F1D0;
+D_601F500 = 0x0601F500;
+D_601F5A0 = 0x0601F5A0;
+D_601FCB0 = 0x0601FCB0;
+D_60231C0 = 0x060231C0;
+D_60238F0 = 0x060238F0;
+D_6024010 = 0x06024010;
+D_60244A0 = 0x060244A0;
+D_6024AC0 = 0x06024AC0;
+D_60270E0 = 0x060270E0;
+D_6027180 = 0x06027180;
+D_6027900 = 0x06027900;
+D_6028454 = 0x06028454;
+D_602B4C0 = 0x0602B4C0;
+D_602B9EC = 0x0602B9EC;
+D_602BA20 = 0x0602BA20;
+D_602BAE4 = 0x0602BAE4;
+D_602BBD8 = 0x0602BBD8;
+D_602BC54 = 0x0602BC54;
+D_602BC58 = 0x0602BC58;
+D_602BE3C = 0x0602BE3C;
+D_602BE58 = 0x0602BE58;
+D_602BFC4 = 0x0602BFC4;
+D_602C044 = 0x0602C044;
+D_602C1D4 = 0x0602C1D4;
+D_602C218 = 0x0602C218;
+D_602C234 = 0x0602C234;
+D_602C250 = 0x0602C250;
+D_602C294 = 0x0602C294;
+D_602C2B0 = 0x0602C2B0;
+D_602D5F0 = 0x0602D5F0;
+D_602DAE0 = 0x0602DAE0;
+D_602DB80 = 0x0602DB80;
+D_602DC20 = 0x0602DC20;
+D_602DCA0 = 0x0602DCA0;
+D_602E080 = 0x0602E080;
+D_602E570 = 0x0602E570;
+D_602E7A0 = 0x0602E7A0;
+D_602E9E0 = 0x0602E9E0;
+D_602F684 = 0x0602F684;
+D_602F6A0 = 0x0602F6A0;
+D_602F6EC = 0x0602F6EC;
+D_602F708 = 0x0602F708;
+D_602F724 = 0x0602F724;
+D_602F740 = 0x0602F740;
+D_602F75C = 0x0602F75C;
+D_602F7C0 = 0x0602F7C0;
+D_602FA50 = 0x0602FA50;
+D_6030500 = 0x06030500;
+D_6030630 = 0x06030630;
+D_6030B10 = 0x06030B10;
+D_6030BE0 = 0x06030BE0;
+D_6030BFC = 0x06030BFC;
+D_6030C18 = 0x06030C18;
+D_6030C44 = 0x06030C44;
+D_6030C60 = 0x06030C60;
+D_6030C7C = 0x06030C7C;
+D_6030D20 = 0x06030D20;
+D_6030D74 = 0x06030D74;
+D_6030DF8 = 0x06030DF8;
+D_6030E14 = 0x06030E14;
+D_6030E30 = 0x06030E30;
+D_6030E4C = 0x06030E4C;
+D_6030E68 = 0x06030E68;
+D_6030F74 = 0x06030F74;
+D_6031398 = 0x06031398;
+D_60313CC = 0x060313CC;
+D_6031400 = 0x06031400;
+D_603144C = 0x0603144C;
+D_6031480 = 0x06031480;
+D_60314C8 = 0x060314C8;
+D_6031500 = 0x06031500;
+D_6031538 = 0x06031538;
+D_6031554 = 0x06031554;
+D_6031570 = 0x06031570;
+D_6032488 = 0x06032488;
+D_60324EC = 0x060324EC;
+D_6032550 = 0x06032550;
+D_603405C = 0x0603405C;
+D_6034368 = 0x06034368;
+D_6034478 = 0x06034478;
+D_603450C = 0x0603450C;
+D_6034588 = 0x06034588;
+D_6034664 = 0x06034664;
+D_6034770 = 0x06034770;
+D_60347D4 = 0x060347D4;
+D_60347F0 = 0x060347F0;
+D_603486C = 0x0603486C;
+D_60359C8 = 0x060359C8;
+D_6035A14 = 0x06035A14;
+D_6035A48 = 0x06035A48;
+D_6035AE0 = 0x06035AE0;
+D_6035D9C = 0x06035D9C;
+D_6035E04 = 0x06035E04;
+D_6035F10 = 0x06035F10;
+D_60360C0 = 0x060360C0;
+D_6036154 = 0x06036154;
+D_60361F0 = 0x060361F0;
+D_6036204 = 0x06036204;
+D_603626C = 0x0603626C;
+D_6036288 = 0x06036288;
+D_60362A4 = 0x060362A4;
+D_60362D8 = 0x060362D8;
+D_60362F4 = 0x060362F4;
+D_6036328 = 0x06036328;
+D_6036344 = 0x06036344;
+D_6036370 = 0x06036370;
+D_603638C = 0x0603638C;
+D_60363B8 = 0x060363B8;
+D_60363E4 = 0x060363E4;
+D_6036410 = 0x06036410;
+D_603643C = 0x0603643C;
+D_6036458 = 0x06036458;
+D_60364C0 = 0x060364C0;
+D_60364DC = 0x060364DC;
+D_6036594 = 0x06036594;
+D_60366EC = 0x060366EC;
+D_6036708 = 0x06036708;
+D_6036724 = 0x06036724;
+D_6036728 = 0x06036728;
+D_6036744 = 0x06036744;
+D_6036760 = 0x06036760;
+D_603677C = 0x0603677C;
+D_6036894 = 0x06036894;
+D_60368E0 = 0x060368E0;
+D_6036930 = 0x06036930;
+D_603694C = 0x0603694C;
+D_6036968 = 0x06036968;
+D_603DCA4 = 0x0603DCA4;
+D_603DD40 = 0x0603DD40;
+D_603DDF0 = 0x0603DDF0;
+D_603DE8C = 0x0603DE8C;
+D_603DEF4 = 0x0603DEF4;
+D_603DF8C = 0x0603DF8C;
+D_603DFDC = 0x0603DFDC;
+D_603E014 = 0x0603E014;
+D_603E030 = 0x0603E030;
+D_603E09C = 0x0603E09C;
+D_603E0EC = 0x0603E0EC;
+D_603E118 = 0x0603E118;
+D_603E14C = 0x0603E14C;
+D_603E1B4 = 0x0603E1B4;
+D_603E21C = 0x0603E21C;
+D_603E3E0 = 0x0603E3E0;
+D_603E468 = 0x0603E468;
+D_603E484 = 0x0603E484;
+D_603E4A0 = 0x0603E4A0;
+D_603E4A4 = 0x0603E4A4;
+D_603E4DC = 0x0603E4DC;
+D_603E514 = 0x0603E514;
+D_603E54C = 0x0603E54C;
+D_603E598 = 0x0603E598;
+D_603E5B4 = 0x0603E5B4;
+D_603E5D0 = 0x0603E5D0;
+D_603E5D0 = 0x0603E5D0;
+D_603E5D0 = 0x0603E5D0;
+D_603E604 = 0x0603E604;
+D_603E620 = 0x0603E620;
+D_603E714 = 0x0603E714;
+D_603E748 = 0x0603E748;
+D_603E7C4 = 0x0603E7C4;
+D_603E840 = 0x0603E840;
+D_603E88C = 0x0603E88C;
+D_603E8A8 = 0x0603E8A8;
+D_603E98C = 0x0603E98C;
+D_603E9EC = 0x0603E9EC;
+D_603EA08 = 0x0603EA08;
+D_603EA74 = 0x0603EA74;
+D_603EAE0 = 0x0603EAE0;
+D_603EB0C = 0x0603EB0C;
+
+D_700AB70 = 0x0700AB70;
+D_700BE00 = 0x0700BE00;
+
+D_9003F50 = 0x09003F50;
+D_9005C80 = 0x09005C80;
+D_900DD20 = 0x0900DD20;
+D_900F060 = 0x0900F060;
+D_900F1D0 = 0x0900F1D0;
+D_901DA50 = 0x0901DA50;
+D_9023AD0 = 0x09023AD0;
+
+D_C038A48 = 0x0C038A48;
+D_C038B40 = 0x0C038B40;
+D_C038B40 = 0x0C038B40;
+D_C038BA4 = 0x0C038BA4;
+D_C038BD8 = 0x0C038BD8;
+D_C038DC0 = 0x0C038DC0;
+D_C038F24 = 0x0C038F24;
+
+D_D000000 = 0x0D000000;
+D_D00B5C0 = 0x0D00B5C0;
+D_D00B720 = 0x0D00B720;