support for EU rev 0, updates to tools, other cleanup (#255)

* srceu

* remove warning

* and some cleanup

8 files changed, 1523 insertions, 27 deletions

diff --git a/linker_scripts/eu/rev0/hardware_regs.ld b/linker_scripts/eu/rev0/hardware_regs.ld
new file mode 100644
index 00000000..489e4fae
--- /dev/null
+++ b/linker_scripts/eu/rev0/hardware_regs.ld
@@ -0,0 +1,120 @@
+// Signal Processor Registers
+SP_MEM_ADDR_REG = 0xA4040000; // defined:True
+SP_DRAM_ADDR_REG = 0xA4040004; // defined:True
+SP_RD_LEN_REG = 0xA4040008; // defined:True
+SP_WR_LEN_REG = 0xA404000C; // defined:True
+SP_STATUS_REG = 0xA4040010; // defined:True
+SP_DMA_FULL_REG = 0xA4040014; // defined:True
+SP_DMA_BUSY_REG = 0xA4040018; // defined:True
+SP_SEMAPHORE_REG = 0xA404001C; // defined:True
+
+SP_PC = 0xA4080000; // defined:True
+
+// Display Processor Command Registers / Rasterizer Interface
+DPC_START_REG = 0xA4100000; // defined:True
+DPC_END_REG = 0xA4100004; // defined:True
+DPC_CURRENT_REG = 0xA4100008; // defined:True
+DPC_STATUS_REG = 0xA410000C; // defined:True
+DPC_CLOCK_REG = 0xA4100010; // defined:True
+DPC_BUFBUSY_REG = 0xA4100014; // defined:True
+DPC_PIPEBUSY_REG = 0xA4100018; // defined:True
+DPC_TMEM_REG = 0xA410001C; // defined:True
+
+// Display Processor Span Registers
+DPS_TBIST_REG = 0xA4200000; // defined:True // DPS_TBIST_REG / DP_TMEM_BIST
+DPS_TEST_MODE_REG = 0xA4200004; // defined:True
+DPS_BUFTEST_ADDR_REG = 0xA4200008; // defined:True
+DPS_BUFTEST_DATA_REG = 0xA420000C; // defined:True
+
+// MIPS Interface Registers
+MI_MODE_REG = 0xA4300000; // defined:True // MI_MODE_REG / MI_INIT_MODE_REG
+MI_VERSION_REG = 0xA4300004; // defined:True
+MI_INTR_REG = 0xA4300008; // defined:True
+MI_INTR_MASK_REG = 0xA430000C; // defined:True
+
+// Video Interface Registers
+VI_STATUS_REG = 0xA4400000; // defined:True // VI_STATUS_REG / VI_CONTROL_REG
+VI_DRAM_ADDR_REG = 0xA4400004; // defined:True // VI_DRAM_ADDR_REG / VI_ORIGIN_REG
+VI_WIDTH_REG = 0xA4400008; // defined:True
+VI_INTR_REG = 0xA440000C; // defined:True
+VI_CURRENT_REG = 0xA4400010; // defined:True
+VI_BURST_REG = 0xA4400014; // defined:True // VI_BURST_REG / VI_TIMING_REG
+VI_V_SYNC_REG = 0xA4400018; // defined:True
+VI_H_SYNC_REG = 0xA440001C; // defined:True
+VI_LEAP_REG = 0xA4400020; // defined:True
+VI_H_START_REG = 0xA4400024; // defined:True
+VI_V_START_REG = 0xA4400028; // defined:True
+VI_V_BURST_REG = 0xA440002C; // defined:True
+VI_X_SCALE_REG = 0xA4400030; // defined:True
+VI_Y_SCALE_REG = 0xA4400034; // defined:True
+
+// Audio Interface Registers
+AI_DRAM_ADDR_REG = 0xA4500000; // defined:True
+AI_LEN_REG = 0xA4500004; // defined:True
+AI_CONTROL_REG = 0xA4500008; // defined:True
+AI_STATUS_REG = 0xA450000C; // defined:True
+AI_DACRATE_REG = 0xA4500010; // defined:True
+AI_BITRATE_REG = 0xA4500014; // defined:True
+
+// Peripheral/Parallel Interface Registers
+PI_DRAM_ADDR_REG = 0xA4600000; // defined:True
+PI_CART_ADDR_REG = 0xA4600004; // defined:True
+D_A4600005 = 0xA4600005; // defined:True // TODO figure out its name
+D_A4600006 = 0xA4600006; // defined:True // TODO figure out its name
+D_A4600007 = 0xA4600007; // defined:True // TODO figure out its name
+PI_RD_LEN_REG = 0xA4600008; // defined:True
+PI_WR_LEN_REG = 0xA460000C; // defined:True
+PI_STATUS_REG = 0xA4600010; // defined:True
+PI_BSD_DOM1_LAT_REG = 0xA4600014; // defined:True // PI dom1 latency
+PI_BSD_DOM1_PWD_REG = 0xA4600018; // defined:True // PI dom1 pulse width
+PI_BSD_DOM1_PGS_REG = 0xA460001C; // defined:True // PI dom1 page size
+PI_BSD_DOM1_RLS_REG = 0xA4600020; // defined:True // PI dom1 release
+PI_BSD_DOM2_LAT_REG = 0xA4600024; // defined:True // PI dom2 latency
+PI_BSD_DOM2_LWD_REG = 0xA4600028; // defined:True // PI dom2 pulse width
+PI_BSD_DOM2_PGS_REG = 0xA460002C; // defined:True // PI dom2 page size
+PI_BSD_DOM2_RLS_REG = 0xA4600030; // defined:True // PI dom2 release
+
+// RDRAM Interface Registers
+RI_MODE_REG = 0xA4700000; // defined:True
+RI_CONFIG_REG = 0xA4700004; // defined:True
+RI_CURRENT_LOAD_REG = 0xA4700008; // defined:True
+RI_SELECT_REG = 0xA470000C; // defined:True
+RI_REFRESH_REG = 0xA4700010; // defined:True
+RI_LATENCY_REG = 0xA4700014; // defined:True
+RI_RERROR_REG = 0xA4700018; // defined:True
+RI_WERROR_REG = 0xA470001C; // defined:True
+
+// Serial Interface Registers
+SI_DRAM_ADDR_REG = 0xA4800000; // defined:True
+SI_PIF_ADDR_RD64B_REG = 0xA4800004; // defined:True
+D_A4800008 = 0xA4800008; // defined:True // reserved
+D_A480000C = 0xA480000C; // defined:True // reserved
+SI_PIF_ADDR_WR64B_REG = 0xA4800010; // defined:True
+D_A4800014 = 0xA4800014; // defined:True // reserved
+SI_STATUS_REG = 0xA4800018; // defined:True
+
+LEO_CMD = 0xA5000508;
+LEO_STATUS = 0xA5000508;
+LEO_BM_CTL = 0xA5000510;
+LEO_BM_STATUS = 0xA5000510;
+LEO_SEQ_CTL = 0xA5000518;
+LEO_SEQ_STATUS = 0xA5000518;
+LEO_C2_BUFF = 0xA5000000;
+LEO_SECTOR_BUFF = 0xA5000400;
+LEO_DATA = 0xA5000500;
+LEO_MISC_REG = 0xA5000504;
+LEO_CUR_TK = 0xA500050C;
+LEO_ERR_SECTOR = 0xA5000514;
+LEO_CUR_SECTOR = 0xA500051C;
+LEO_HARD_RESET = 0xA5000520;
+LEO_C1_S0 = 0xA5000524;
+LEO_HOST_SECBYTE = 0xA5000528;
+LEO_C1_S2 = 0xA500052C;
+LEO_SEC_BYTE = 0xA5000530;
+LEO_C1_S4 = 0xA5000534;
+LEO_C1_S6 = 0xA5000538;
+LEO_CUR_ADDR = 0xA500053C;
+LEO_ID_REG = 0xA5000540;
+LEO_TEST_REG = 0xA5000544;
+LEO_TEST_PIN_SEL = 0xA5000548;
+LEO_RAM_ADDR = 0xA5000580;
\ No newline at end of file
diff --git a/linker_scripts/eu/rev0/pif_syms.ld b/linker_scripts/eu/rev0/pif_syms.ld
new file mode 100644
index 00000000..a0e8bcb2
--- /dev/null
+++ b/linker_scripts/eu/rev0/pif_syms.ld
@@ -0,0 +1,10 @@
+// libultra OS symbols
+
+osTvType       = 0x80000300;
+osRomType      = 0x80000304;
+osRomBase      = 0x80000308;
+osResetType    = 0x8000030C;
+osCicId        = 0x80000310;
+osVersion      = 0x80000314;
+osMemSize      = 0x80000318;
+osAppNMIBuffer = 0x8000031C;
\ No newline at end of file
diff --git a/linker_scripts/eu/rev0/symbol_addrs_fix.txt b/linker_scripts/eu/rev0/symbol_addrs_fix.txt
new file mode 100644
index 00000000..0dd634bf
--- /dev/null
+++ b/linker_scripts/eu/rev0/symbol_addrs_fix.txt
@@ -0,0 +1,119 @@
+
+// hallucinated symbols
+D_400001 = 0x400001; //ignore:true
+D_7FFFFFFE = 0x7FFFFFFE; //ignore:True
+D_80000000 = 0x80000000; //ignore:True
+D_80000001 = 0x80000001; //ignore:true
+D_80000002 = 0x80000002; //ignore:True
+D_80000003 = 0x80000003; //ignore:True
+D_80000004 = 0x80000004; //ignore:True
+D_80000006 = 0x80000006; //ignore:True
+D_80000008 = 0x80000008; //ignore:True
+D_8000000A = 0x8000000A; //ignore:True
+D_8000000C = 0x8000000C; //ignore:True
+D_8000000D = 0x8000000D; //ignore:True
+D_8000000E = 0x8000000E; //ignore:True
+D_8000000F = 0x8000000F; //ignore:True
+D_80000014 = 0x80000014; //ignore:True
+D_80000018 = 0x80000018; //ignore:True
+D_8000001C = 0x8000001C; //ignore:True
+D_80000024 = 0x80000024; //ignore:True
+D_800F0032 = 0x800F0032; //ignore:True
+D_80100032 = 0x80100032; //ignore:True
+D_80110000 = 0x80110000; //ignore:True
+D_801100C8 = 0x801100C8; //ignore:True
+D_80120000 = 0x80120000; //ignore:True
+D_801200C8 = 0x801200C8; //ignore:True
+D_80130001 = 0x80130001; //ignore:True
+D_801300C8 = 0x801300C8; //ignore:True
+D_80140001 = 0x80140001; //ignore:true
+D_80150000 = 0x80150000; //ignore:true
+D_80160000 = 0x80160000; //ignore:true
+D_80170000 = 0x80170000; //ignore:true
+D_80170001 = 0x80170001; //ignore:true
+D_80180001 = 0x80180001; //ignore:True
+D_80180058 = 0x80180058; //ignore:True
+
+// mirage symbols
+D_3000000 = 0x3000000; //ignore:true
+D_6000000 = 0x6000000; //ignore:true
+D_7000000 = 0x7000000; //ignore:true
+D_8000000 = 0x8000000; //ignore:true
+D_A000000 = 0xA000000; //ignore:true
+D_C000000 = 0xC000000; //ignore:true
+
+// rsp
+rspbootTextStart = 0x800004D0;//name_end:rspbootTextEnd
+aspMainTextStart = 0x800005A0;//name_end:aspMainTextEnd
+gspF3DEX_fifoTextStart = 0x80001490;//name_end:gspF3DEX_fifoTextEnd
+gspF3DEX_fifoDataStart = 0x800C4980; //name_end:gspF3DEX_fifoDataEnd
+aspMainDataStart = 0x800C3E70; //name_end:aspMainDataEnd
+
+// redundant rodata
+D_800D63EC = 0x800D63EC; //force_migration:true
+D_800D65F8 = 0x800D65F8; //force_migration:true
+D_800D660C = 0x800D660C; //force_migration:true
+D_800D99D0 = 0x800D99D0; //force_migration:true
+D_800D99E0 = 0x800D99E0; //force_migration:true
+D_800D9A04 = 0x800D9A04; //force_migration:true
+D_800DA7B0 = 0x800DA7B0; //force_migration:true
+D_i3_801C517C = 0x801C517C; //force_migration:true segment:ovl_i3
+D_i3_801C5188 = 0x801C5188; //force_migration:true segment:ovl_i3
+D_i3_801C5190 = 0x801C5190; //force_migration:true segment:ovl_i3
+D_i3_801C51B8 = 0x801C51B8; //force_migration:true segment:ovl_i3
+D_i4_801A3754 = 0x801A3754; //force_migration:true segment:ovl_i4
+D_i5_801BF248 = 0x801BF248; //force_migration:true segment:ovl_i5
+D_i5_801BF27C = 0x801BF27C; //force_migration:true segment:ovl_i5
+D_i5_801BF510 = 0x801BF510; //force_migration:true segment:ovl_i5
+D_i5_801BF524 = 0x801BF524; //force_migration:true segment:ovl_i5
+D_i6_801AAF70 = 0x801AAF70; //force_migration:true segment:ovl_i6
+
+// constant for K1 access
+D_A0000000 = 0xA0000000;//ignore:true
+
+// hardcoded address used in sys_rdram
+D_A0300000 = 0xA0300000;//ignore:true
+D_A4000000 = 0xA4000000;//ignore:true
+
+// hardcoded addresses in libultra
+D_BFF00000 = 0xBFF00000;//ignore:true
+D_BFF08000 = 0xBFF08000;//ignore:true
+D_BFF08004 = 0xBFF08004;//ignore:true
+
+// RDB regs used only in exceptasm. Also -2.0f
+D_C0000000 = 0xC0000000;//ignore:true
+D_C0000008 = 0xC0000008;//ignore:true
+D_C000000C = 0xC000000C;//ignore:true
+
+// hidden symbols
+sSamplesPerWavePeriod = 0x800C63E8; //size:0x4 type:u8
+sOvlUnused_Unk = 0x800CCBAC;
+D_800D6994 = 0x800D6994;
+D_80161A91 = 0x80161A91;
+D_801BE59C = 0x801BE59C; //segment:ovl_i5
+
+// fake symbol removal
+D_800CCC44 = 0x800CCC44; //size:0x98
+gDmaTable = 0x8017ABE0; //size:0x650
+
+// dma symbols
+dma_table_ROM_START  =  0xE0570;
+audio_seq_ROM_START  =  0xE0BC0;
+audio_bank_ROM_START = 0x127F50;
+audio_table_ROM_START = 0x1471E0;
+ast_radio_de_ROM_START = 0xDE12C0;
+ast_radio_de_VRAM = 0x8017B230;
+ast_radio_de_ROM_END = 0xDF10B0;
+ast_radio_en_ROM_START = 0xEFB1A0;
+ast_radio_fr_ROM_START = 0xF08CF0;
+ast_radio_fr_ROM_END = 0xF17200;
+
+// buffers
+gDramStack = 0x80289000; //size:0x400 segment:buffers defined:true
+gOSYieldData = 0x80289400; //size:0xC00 segment:buffers defined:true
+gZBuffer = 0x8028A000; //size:0x25800 segment:buffers defined:true
+gTaskOutputBuffer = 0x802AF800; //size:0x30000 name_end:gTaskOutputBufferEnd segment:buffers defined:true
+gAudioHeap = 0x802DF800; //size:0xB0000 segment:buffers defined:true
+gFillBuffer = 0x8038F800; //size:0x780 segment:buffers defined:true
+D_8038FA80 = 0x8038FA80;//ignore:true segment:buffers
+gFrameBuffers = 0x8038FF80; //size:0x70800 segment:buffers defined:true
diff --git a/linker_scripts/eu/rev0/undefined_syms.ld b/linker_scripts/eu/rev0/undefined_syms.ld
new file mode 100644
index 00000000..e8ec3377
--- /dev/null
+++ b/linker_scripts/eu/rev0/undefined_syms.ld
@@ -0,0 +1,1237 @@
+D_1002A20 = 0x1002A20;
+D_1003BE0 = 0x1003BE0;
+D_1003E20 = 0x1003E20;
+D_1003EE0 = 0x1003EE0;
+D_10040B0 = 0x10040B0;
+D_1004FD0 = 0x1004FD0;
+D_1005EF0 = 0x1005EF0;
+D_1006E10 = 0x1006E10;
+D_1007D30 = 0x1007D30;
+D_1008C50 = 0x1008C50;
+D_1009B70 = 0x1009B70;
+D_100AA90 = 0x100AA90;
+D_100B9B0 = 0x100B9B0;
+D_100C8D0 = 0x100C8D0;
+D_100D7F0 = 0x100D7F0;
+D_100E710 = 0x100E710;
+D_100F630 = 0x100F630;
+D_1012090 = 0x1012090;
+D_10124B0 = 0x10124B0;
+D_10124C0 = 0x10124C0;
+D_1012540 = 0x1012540;
+D_1012850 = 0x1012850;
+D_10128C0 = 0x10128C0;
+D_10128D0 = 0x10128D0;
+D_10129A0 = 0x10129A0;
+D_10129C0 = 0x10129C0;
+D_1012A90 = 0x1012A90;
+D_1012AB0 = 0x1012AB0;
+D_1012B80 = 0x1012B80;
+D_1012BA0 = 0x1012BA0;
+D_1012C70 = 0x1012C70;
+D_1012C90 = 0x1012C90;
+D_1012CD0 = 0x1012CD0;
+D_1012CE0 = 0x1012CE0;
+D_1012D18 = 0x1012D18;
+D_1012D30 = 0x1012D30;
+D_1012F20 = 0x1012F20;
+D_10135E0 = 0x10135E0;
+D_10136A8 = 0x10136A8;
+D_10136D0 = 0x10136D0;
+D_1013798 = 0x1013798;
+D_10137D0 = 0x10137D0;
+D_1013EA0 = 0x1013EA0;
+D_1013F80 = 0x1013F80;
+D_1014380 = 0x1014380;
+D_1014390 = 0x1014390;
+D_1014510 = 0x1014510;
+D_1016320 = 0x1016320;
+D_1016790 = 0x1016790;
+D_1017390 = 0x1017390;
+D_1017680 = 0x1017680;
+D_10185D0 = 0x10185D0;
+D_10190D0 = 0x10190D0;
+D_1019ED0 = 0x1019ED0;
+D_101A2D0 = 0x101A2D0;
+D_101A630 = 0x101A630;
+D_101AAB0 = 0x101AAB0;
+D_101B380 = 0x101B380;
+D_101B6F0 = 0x101B6F0;
+D_101B9E0 = 0x101B9E0;
+D_101BB30 = 0x101BB30;
+D_101BCE0 = 0x101BCE0;
+D_101D0F0 = 0x101D0F0;
+D_101D8F0 = 0x101D8F0;
+D_101DB80 = 0x101DB80;
+D_101DE80 = 0x101DE80;
+D_101EA20 = 0x101EA20;
+D_1022C30 = 0x1022C30;
+D_1023C90 = 0x1023C90;
+D_1023FB0 = 0x1023FB0;
+D_1024510 = 0x1024510;
+D_1024560 = 0x1024560;
+D_1024A90 = 0x1024A90;
+D_1025040 = 0x1025040;
+D_10250A0 = 0x10250A0;
+D_1025640 = 0x1025640;
+D_10257A0 = 0x10257A0;
+D_1025868 = 0x1025868;
+D_10258D0 = 0x10258D0;
+D_1025D70 = 0x1025D70;
+D_1026610 = 0x1026610;
+D_1026EA0 = 0x1026EA0;
+D_1029040 = 0x1029040;
+D_102A590 = 0x102A590;
+D_102AE20 = 0x102AE20;
+D_102B6B0 = 0x102B6B0;
+D_102FB60 = 0x102FB60;
+D_10303F0 = 0x10303F0;
+D_1030C90 = 0x1030C90;
+D_1030D18 = 0x1030D18;
+D_1032440 = 0x1032440;
+D_1032CD0 = 0x1032CD0;
+D_1033590 = 0x1033590;
+D_20031B0 = 0x20031B0;
+D_2006F50 = 0x2006F50;
+D_200D750 = 0x200D750;
+D_2010A30 = 0x2010A30;
+D_20112C0 = 0x20112C0;
+D_3000090 = 0x3000090;
+D_3000100 = 0x3000100;
+D_3000120 = 0x3000120;
+D_3000130 = 0x3000130;
+D_30001A0 = 0x30001A0;
+D_30002A0 = 0x30002A0;
+D_3000310 = 0x3000310;
+D_3000410 = 0x3000410;
+D_3000470 = 0x3000470;
+D_3000480 = 0x3000480;
+D_3000660 = 0x3000660;
+D_3000940 = 0x3000940;
+D_3000970 = 0x3000970;
+D_3000AF0 = 0x3000AF0;
+D_3000C70 = 0x3000C70;
+D_3001848 = 0x3001848;
+D_3001A50 = 0x3001A50;
+D_3002E80 = 0x3002E80;
+D_3004450 = 0x3004450;
+D_3004640 = 0x3004640;
+D_3004680 = 0x3004680;
+D_3005980 = 0x3005980;
+D_3005AB0 = 0x3005AB0;
+D_3005EA8 = 0x3005EA8;
+D_30066B0 = 0x30066B0;
+D_3006940 = 0x3006940;
+D_3006AF0 = 0x3006AF0;
+D_3006C70 = 0x3006C70;
+D_3006DE0 = 0x3006DE0;
+D_3007040 = 0x3007040;
+D_3007240 = 0x3007240;
+D_3007C50 = 0x3007C50;
+D_3007E50 = 0x3007E50;
+D_3007E70 = 0x3007E70;
+D_3008100 = 0x3008100;
+D_3008B40 = 0x3008B40;
+D_3008D40 = 0x3008D40;
+D_3009200 = 0x3009200;
+D_3009230 = 0x3009230;
+D_3009F78 = 0x3009F78;
+D_300A180 = 0x300A180;
+D_300A640 = 0x300A640;
+D_300A670 = 0x300A670;
+D_300B548 = 0x300B548;
+D_300D450 = 0x300D450;
+D_300EF50 = 0x300EF50;
+D_300F140 = 0x300F140;
+D_300FA48 = 0x300FA48;
+D_300FC50 = 0x300FC50;
+D_3010970 = 0x3010970;
+D_3010B70 = 0x3010B70;
+D_3011410 = 0x3011410;
+D_3011720 = 0x3011720;
+D_30131F0 = 0x30131F0;
+D_3014380 = 0x3014380;
+D_3014BF0 = 0x3014BF0;
+D_3015120 = 0x3015120;
+D_3015128 = 0x3015128;
+D_30155E0 = 0x30155E0;
+D_3015AF4 = 0x3015AF4;
+D_3015C28 = 0x3015C28;
+D_3015D80 = 0x3015D80;
+D_30163C4 = 0x30163C4;
+D_3016570 = 0x3016570;
+D_30165B8 = 0x30165B8;
+D_30165E0 = 0x30165E0;
+D_3016610 = 0x3016610;
+D_3016628 = 0x3016628;
+D_3016660 = 0x3016660;
+D_3016720 = 0x3016720;
+D_3016770 = 0x3016770;
+D_3016B30 = 0x3016B30;
+D_3016BB0 = 0x3016BB0;
+D_3017080 = 0x3017080;
+D_30174C0 = 0x30174C0;
+D_30175C0 = 0x30175C0;
+D_3017660 = 0x3017660;
+D_3017760 = 0x3017760;
+D_3017F80 = 0x3017F80;
+D_3018080 = 0x3018080;
+D_30182A0 = 0x30182A0;
+D_30183D0 = 0x30183D0;
+D_3018440 = 0x3018440;
+D_30184D8 = 0x30184D8;
+D_30189C0 = 0x30189C0;
+D_3018B60 = 0x3018B60;
+D_3018FF0 = 0x3018FF0;
+D_3019190 = 0x3019190;
+D_30194E0 = 0x30194E0;
+D_30199F0 = 0x30199F0;
+D_301B320 = 0x301B320;
+D_301C020 = 0x301C020;
+D_301CF30 = 0x301CF30;
+D_301D910 = 0x301D910;
+D_301E2E0 = 0x301E2E0;
+D_3020B50 = 0x3020B50;
+D_3021BE0 = 0x3021BE0;
+D_3022540 = 0x3022540;
+D_3024CA0 = 0x3024CA0;
+D_3027200 = 0x3027200;
+D_3027390 = 0x3027390;
+D_3027B80 = 0x3027B80;
+D_3028848 = 0x3028848;
+D_3028AB4 = 0x3028AB4;
+D_302948C = 0x302948C;
+D_30296F8 = 0x30296F8;
+D_3029D28 = 0x3029D28;
+D_302A034 = 0x302A034;
+D_302A63C = 0x302A63C;
+D_302A888 = 0x302A888;
+D_302AA10 = 0x302AA10;
+D_302B5E0 = 0x302B5E0;
+D_302C1C0 = 0x302C1C0;
+D_30395C0 = 0x30395C0;
+D_30396E0 = 0x30396E0;
+D_3039970 = 0x3039970;
+D_303A210 = 0x303A210;
+D_303A254 = 0x303A254;
+D_303A298 = 0x303A298;
+D_303A2DC = 0x303A2DC;
+D_303A584 = 0x303A584;
+D_303A610 = 0x303A610;
+D_303A818 = 0x303A818;
+D_303AA0C = 0x303AA0C;
+D_303AAFC = 0x303AAFC;
+D_303ABEC = 0x303ABEC;
+D_303ACD0 = 0x303ACD0;
+D_303ADFC = 0x303ADFC;
+D_303AEEC = 0x303AEEC;
+D_303AFDC = 0x303AFDC;
+D_303B0C0 = 0x303B0C0;
+D_4000080 = 0x4000080;
+D_400014C = 0x400014C;
+D_40001A4 = 0x40001A4;
+D_4000270 = 0x4000270;
+D_40018A0 = 0x40018A0;
+D_4003BD0 = 0x4003BD0;
+D_40057AC = 0x40057AC;
+D_40058B8 = 0x40058B8;
+D_40068F0 = 0x40068F0;
+D_4007870 = 0x4007870;
+D_4007AF0 = 0x4007AF0;
+D_4008CE0 = 0x4008CE0;
+D_4008F70 = 0x4008F70;
+D_400A30C = 0x400A30C;
+D_400A398 = 0x400A398;
+D_400AAE0 = 0x400AAE0;
+D_400B390 = 0x400B390;
+D_5005450 = 0x5005450;
+D_500C3A0 = 0x500C3A0;
+D_5013550 = 0x5013550;
+D_50153A0 = 0x50153A0;
+D_5015490 = 0x5015490;
+D_5015580 = 0x5015580;
+D_50157F0 = 0x50157F0;
+D_5017200 = 0x5017200;
+D_50177F0 = 0x50177F0;
+D_50178E0 = 0x50178E0;
+D_50179D0 = 0x50179D0;
+D_5017AC0 = 0x5017AC0;
+D_5017BB0 = 0x5017BB0;
+D_5017CA0 = 0x5017CA0;
+D_5017D90 = 0x5017D90;
+D_50183D0 = 0x50183D0;
+D_6000D80 = 0x6000D80;
+D_6001110 = 0x6001110;
+D_6001574 = 0x6001574;
+D_6001840 = 0x6001840;
+D_60018A0 = 0x60018A0;
+D_6001920 = 0x6001920;
+D_6001CA0 = 0x6001CA0;
+D_6001F40 = 0x6001F40;
+D_6001F80 = 0x6001F80;
+D_6002040 = 0x6002040;
+D_6002100 = 0x6002100;
+D_60021A0 = 0x60021A0;
+D_60023B0 = 0x60023B0;
+D_6002440 = 0x6002440;
+D_6002480 = 0x6002480;
+D_60024C0 = 0x60024C0;
+D_6002500 = 0x6002500;
+D_60027B0 = 0x60027B0;
+D_6002920 = 0x6002920;
+D_6002990 = 0x6002990;
+D_6002A30 = 0x6002A30;
+D_6002AF0 = 0x6002AF0;
+D_6002E80 = 0x6002E80;
+D_6002F24 = 0x6002F24;
+D_60030A8 = 0x60030A8;
+D_60030B8 = 0x60030B8;
+D_6003270 = 0x6003270;
+D_60032E0 = 0x60032E0;
+D_6003304 = 0x6003304;
+D_6003420 = 0x6003420;
+D_6003640 = 0x6003640;
+D_60036A0 = 0x60036A0;
+D_6003720 = 0x6003720;
+D_6003760 = 0x6003760;
+D_6003820 = 0x6003820;
+D_6003960 = 0x6003960;
+D_60039A0 = 0x60039A0;
+D_60039C0 = 0x60039C0;
+D_60039F0 = 0x60039F0;
+D_6003BE0 = 0x6003BE0;
+D_6003DE0 = 0x6003DE0;
+D_6003F20 = 0x6003F20;
+D_6004060 = 0x6004060;
+D_6004340 = 0x6004340;
+D_60043C0 = 0x60043C0;
+D_6004428 = 0x6004428;
+D_6004440 = 0x6004440;
+D_6004450 = 0x6004450;
+D_6004488 = 0x6004488;
+D_60044A0 = 0x60044A0;
+D_60045A4 = 0x60045A4;
+D_6004A10 = 0x6004A10;
+D_6004E30 = 0x6004E30;
+D_6005060 = 0x6005060;
+D_6005150 = 0x6005150;
+D_6005260 = 0x6005260;
+D_6005410 = 0x6005410;
+D_6005478 = 0x6005478;
+D_6005530 = 0x6005530;
+D_6005550 = 0x6005550;
+D_6005650 = 0x6005650;
+D_60056C0 = 0x60056C0;
+D_6005830 = 0x6005830;
+D_6005D00 = 0x6005D00;
+D_6005F80 = 0x6005F80;
+D_60060C0 = 0x60060C0;
+D_6006180 = 0x6006180;
+D_6006270 = 0x6006270;
+D_60063E4 = 0x60063E4;
+D_6006480 = 0x6006480;
+D_6006510 = 0x6006510;
+D_6006900 = 0x6006900;
+D_6006960 = 0x6006960;
+D_6006ECC = 0x6006ECC;
+D_60070A0 = 0x60070A0;
+D_60070B8 = 0x60070B8;
+D_6007570 = 0x6007570;
+D_60077D0 = 0x60077D0;
+D_600781C = 0x600781C;
+D_60078F0 = 0x60078F0;
+D_6007BD0 = 0x6007BD0;
+D_6007DF0 = 0x6007DF0;
+D_6007E24 = 0x6007E24;
+D_6007E40 = 0x6007E40;
+D_6007E44 = 0x6007E44;
+D_6007E5C = 0x6007E5C;
+D_6007E78 = 0x6007E78;
+D_6007E94 = 0x6007E94;
+D_6007EB0 = 0x6007EB0;
+D_6007ECC = 0x6007ECC;
+D_6007EE8 = 0x6007EE8;
+D_6007F04 = 0x6007F04;
+D_6007F20 = 0x6007F20;
+D_6007F30 = 0x6007F30;
+D_6007F60 = 0x6007F60;
+D_60080F0 = 0x60080F0;
+D_600810C = 0x600810C;
+D_6008128 = 0x6008128;
+D_6008940 = 0x6008940;
+D_60089C0 = 0x60089C0;
+D_6008B60 = 0x6008B60;
+D_6008BA0 = 0x6008BA0;
+D_60090A0 = 0x60090A0;
+D_6009370 = 0x6009370;
+D_6009378 = 0x6009378;
+D_6009400 = 0x6009400;
+D_6009680 = 0x6009680;
+D_6009750 = 0x6009750;
+D_60097C0 = 0x60097C0;
+D_6009820 = 0x6009820;
+D_60098F0 = 0x60098F0;
+D_6009958 = 0x6009958;
+D_60099C0 = 0x60099C0;
+D_6009A30 = 0x6009A30;
+D_6009A58 = 0x6009A58;
+D_6009D14 = 0x6009D14;
+D_6009E40 = 0x6009E40;
+D_6009E78 = 0x6009E78;
+D_6009F60 = 0x6009F60;
+D_6009FB4 = 0x6009FB4;
+D_600A000 = 0x600A000;
+D_600A120 = 0x600A120;
+D_600A310 = 0x600A310;
+D_600A430 = 0x600A430;
+D_600A850 = 0x600A850;
+D_600A890 = 0x600A890;
+D_600A8C0 = 0x600A8C0;
+D_600ACB0 = 0x600ACB0;
+D_600AD10 = 0x600AD10;
+D_600AE80 = 0x600AE80;
+D_600B0B8 = 0x600B0B8;
+D_600B0D8 = 0x600B0D8;
+D_600B3B4 = 0x600B3B4;
+D_600B4B0 = 0x600B4B0;
+D_600B5A0 = 0x600B5A0;
+D_600B5F8 = 0x600B5F8;
+D_600B710 = 0x600B710;
+D_600BAD0 = 0x600BAD0;
+D_600BD14 = 0x600BD14;
+D_600C040 = 0x600C040;
+D_600C110 = 0x600C110;
+D_600C3D0 = 0x600C3D0;
+D_600C450 = 0x600C450;
+D_600C6B0 = 0x600C6B0;
+D_600C990 = 0x600C990;
+D_600CC90 = 0x600CC90;
+D_600CCBC = 0x600CCBC;
+D_600CCE0 = 0x600CCE0;
+D_600CD60 = 0x600CD60;
+D_600CF30 = 0x600CF30;
+D_600D180 = 0x600D180;
+D_600D1F0 = 0x600D1F0;
+D_600D210 = 0x600D210;
+D_600D378 = 0x600D378;
+D_600D588 = 0x600D588;
+D_600D5F4 = 0x600D5F4;
+D_600D750 = 0x600D750;
+D_600D7A0 = 0x600D7A0;
+D_600D7B0 = 0x600D7B0;
+D_600D7FC = 0x600D7FC;
+D_600D820 = 0x600D820;
+D_600D970 = 0x600D970;
+D_600DAB0 = 0x600DAB0;
+D_600DDC0 = 0x600DDC0;
+D_600DF3C = 0x600DF3C;
+D_600DFB0 = 0x600DFB0;
+D_600E120 = 0x600E120;
+D_600E248 = 0x600E248;
+D_600E380 = 0x600E380;
+D_600E3E0 = 0x600E3E0;
+D_600E450 = 0x600E450;
+D_600E470 = 0x600E470;
+D_600E610 = 0x600E610;
+D_600E758 = 0x600E758;
+D_600E990 = 0x600E990;
+D_600E9A0 = 0x600E9A0;
+D_600EB1C = 0x600EB1C;
+D_600EE24 = 0x600EE24;
+D_600EFD0 = 0x600EFD0;
+D_600F1D8 = 0x600F1D8;
+D_600F280 = 0x600F280;
+D_600F470 = 0x600F470;
+D_600F550 = 0x600F550;
+D_600F590 = 0x600F590;
+D_600F6A4 = 0x600F6A4;
+D_600F750 = 0x600F750;
+D_600F940 = 0x600F940;
+D_600F980 = 0x600F980;
+D_600F9A0 = 0x600F9A0;
+D_600FA60 = 0x600FA60;
+D_600FA80 = 0x600FA80;
+D_600FBF0 = 0x600FBF0;
+D_600FEB0 = 0x600FEB0;
+D_600FED0 = 0x600FED0;
+D_6010080 = 0x6010080;
+D_60101EC = 0x60101EC;
+D_60102A4 = 0x60102A4;
+D_60103D8 = 0x60103D8;
+D_6010510 = 0x6010510;
+D_60105A0 = 0x60105A0;
+D_601062C = 0x601062C;
+D_6010698 = 0x6010698;
+D_6010764 = 0x6010764;
+D_6010970 = 0x6010970;
+D_6010980 = 0x6010980;
+D_6010B90 = 0x6010B90;
+D_6010BC0 = 0x6010BC0;
+D_6010CF8 = 0x6010CF8;
+D_60114B0 = 0x60114B0;
+D_6011620 = 0x6011620;
+D_6011690 = 0x6011690;
+D_60117B0 = 0x60117B0;
+D_6011890 = 0x6011890;
+D_6011B80 = 0x6011B80;
+D_6011C50 = 0x6011C50;
+D_6011E70 = 0x6011E70;
+D_60122F8 = 0x60122F8;
+D_6012384 = 0x6012384;
+D_6012424 = 0x6012424;
+D_6012430 = 0x6012430;
+D_6012508 = 0x6012508;
+D_6012604 = 0x6012604;
+D_60126B0 = 0x60126B0;
+D_60126E0 = 0x60126E0;
+D_60127F0 = 0x60127F0;
+D_60128EC = 0x60128EC;
+D_6012930 = 0x6012930;
+D_6012A98 = 0x6012A98;
+D_6012BC0 = 0x6012BC0;
+D_6012C04 = 0x6012C04;
+D_6012E64 = 0x6012E64;
+D_60130E0 = 0x60130E0;
+D_60130E8 = 0x60130E8;
+D_60132B0 = 0x60132B0;
+D_601349C = 0x601349C;
+D_6013760 = 0x6013760;
+D_6013EF0 = 0x6013EF0;
+D_6014000 = 0x6014000;
+D_6014070 = 0x6014070;
+D_601415C = 0x601415C;
+D_60141E0 = 0x60141E0;
+D_601425C = 0x601425C;
+D_6014280 = 0x6014280;
+D_6014380 = 0x6014380;
+D_60143EC = 0x60143EC;
+D_60146E0 = 0x60146E0;
+D_6014878 = 0x6014878;
+D_6014900 = 0x6014900;
+D_60149EC = 0x60149EC;
+D_6014AC0 = 0x6014AC0;
+D_6014EC8 = 0x6014EC8;
+D_6014F20 = 0x6014F20;
+D_6014F30 = 0x6014F30;
+D_6014F94 = 0x6014F94;
+D_6014FB0 = 0x6014FB0;
+D_6015080 = 0x6015080;
+D_60150C0 = 0x60150C0;
+D_6015158 = 0x6015158;
+D_6015340 = 0x6015340;
+D_6015410 = 0x6015410;
+D_6015520 = 0x6015520;
+D_6015A60 = 0x6015A60;
+D_6015B20 = 0x6015B20;
+D_6015BA8 = 0x6015BA8;
+D_6015CB0 = 0x6015CB0;
+D_6015D94 = 0x6015D94;
+D_6015E54 = 0x6015E54;
+D_6015F20 = 0x6015F20;
+D_6016110 = 0x6016110;
+D_60169A4 = 0x60169A4;
+D_6017030 = 0x6017030;
+D_6017610 = 0x6017610;
+D_6017850 = 0x6017850;
+D_6017880 = 0x6017880;
+D_60178C0 = 0x60178C0;
+D_60179D0 = 0x60179D0;
+D_6017BF0 = 0x6017BF0;
+D_6017ED0 = 0x6017ED0;
+D_6017F08 = 0x6017F08;
+D_60180E4 = 0x60180E4;
+D_6018480 = 0x6018480;
+D_6018500 = 0x6018500;
+D_60188B0 = 0x60188B0;
+D_6018FEC = 0x6018FEC;
+D_6019150 = 0x6019150;
+D_6019308 = 0x6019308;
+D_6019550 = 0x6019550;
+D_6019708 = 0x6019708;
+D_6019B08 = 0x6019B08;
+D_6019BD4 = 0x6019BD4;
+D_6019BE0 = 0x6019BE0;
+D_6019CC8 = 0x6019CC8;
+D_6019DC8 = 0x6019DC8;
+D_6019DE0 = 0x6019DE0;
+D_6019F60 = 0x6019F60;
+D_601A010 = 0x601A010;
+D_601A150 = 0x601A150;
+D_601A23C = 0x601A23C;
+D_601A260 = 0x601A260;
+D_601A280 = 0x601A280;
+D_601A310 = 0x601A310;
+D_601A334 = 0x601A334;
+D_601A540 = 0x601A540;
+D_601A590 = 0x601A590;
+D_601A6F0 = 0x601A6F0;
+D_601A910 = 0x601A910;
+D_601AF30 = 0x601AF30;
+D_601B0D0 = 0x601B0D0;
+D_601B1EC = 0x601B1EC;
+D_601B338 = 0x601B338;
+D_601B550 = 0x601B550;
+D_601B56C = 0x601B56C;
+D_601B6E0 = 0x601B6E0;
+D_601BA18 = 0x601BA18;
+D_601BA80 = 0x601BA80;
+D_601BAB0 = 0x601BAB0;
+D_601BAC0 = 0x601BAC0;
+D_601BB08 = 0x601BB08;
+D_601BE50 = 0x601BE50;
+D_601BF40 = 0x601BF40;
+D_601C4C0 = 0x601C4C0;
+D_601C610 = 0x601C610;
+D_601C648 = 0x601C648;
+D_601C714 = 0x601C714;
+D_601C770 = 0x601C770;
+D_601CB10 = 0x601CB10;
+D_601CBB8 = 0x601CBB8;
+D_601CC50 = 0x601CC50;
+D_601CC60 = 0x601CC60;
+D_601CD00 = 0x601CD00;
+D_601CD84 = 0x601CD84;
+D_601CE10 = 0x601CE10;
+D_601D1C0 = 0x601D1C0;
+D_601D240 = 0x601D240;
+D_601D380 = 0x601D380;
+D_601D454 = 0x601D454;
+D_601D4E0 = 0x601D4E0;
+D_601D6D0 = 0x601D6D0;
+D_601D734 = 0x601D734;
+D_601D770 = 0x601D770;
+D_601D8C0 = 0x601D8C0;
+D_601DD30 = 0x601DD30;
+D_601DF60 = 0x601DF60;
+D_601E190 = 0x601E190;
+D_601E350 = 0x601E350;
+D_601E4C0 = 0x601E4C0;
+D_601E630 = 0x601E630;
+D_601E810 = 0x601E810;
+D_601E8E0 = 0x601E8E0;
+D_601E8F0 = 0x601E8F0;
+D_601ECB0 = 0x601ECB0;
+D_601ED48 = 0x601ED48;
+D_601EE80 = 0x601EE80;
+D_601F280 = 0x601F280;
+D_601F648 = 0x601F648;
+D_601F6F8 = 0x601F6F8;
+D_601F844 = 0x601F844;
+D_601FF44 = 0x601FF44;
+D_6020050 = 0x6020050;
+D_60204B0 = 0x60204B0;
+D_6020620 = 0x6020620;
+D_6020EE8 = 0x6020EE8;
+D_6020F70 = 0x6020F70;
+D_602107C = 0x602107C;
+D_6021474 = 0x6021474;
+D_60214D0 = 0x60214D0;
+D_6021520 = 0x6021520;
+D_6021600 = 0x6021600;
+D_60216FC = 0x60216FC;
+D_6021730 = 0x6021730;
+D_60217BC = 0x60217BC;
+D_60217C4 = 0x60217C4;
+D_6021890 = 0x6021890;
+D_6021930 = 0x6021930;
+D_6021AC0 = 0x6021AC0;
+D_6021D48 = 0x6021D48;
+D_6021E00 = 0x6021E00;
+D_6021E90 = 0x6021E90;
+D_6022090 = 0x6022090;
+D_60222E0 = 0x60222E0;
+D_60225A0 = 0x60225A0;
+D_60225C0 = 0x60225C0;
+D_60226C0 = 0x60226C0;
+D_6022AAC = 0x6022AAC;
+D_6022B78 = 0x6022B78;
+D_6022EF0 = 0x6022EF0;
+D_6022FB0 = 0x6022FB0;
+D_60232C0 = 0x60232C0;
+D_6023320 = 0x6023320;
+D_6023504 = 0x6023504;
+D_60236BC = 0x60236BC;
+D_6023788 = 0x6023788;
+D_6023D04 = 0x6023D04;
+D_6023FA0 = 0x6023FA0;
+D_6024210 = 0x6024210;
+D_602439C = 0x602439C;
+D_60246C0 = 0x60246C0;
+D_6024880 = 0x6024880;
+D_6024910 = 0x6024910;
+D_60249F0 = 0x60249F0;
+D_6024AD0 = 0x6024AD0;
+D_6024CB0 = 0x6024CB0;
+D_6024D70 = 0x6024D70;
+D_6024E90 = 0x6024E90;
+D_60254E0 = 0x60254E0;
+D_6025640 = 0x6025640;
+D_60256E8 = 0x60256E8;
+D_6025730 = 0x6025730;
+D_6025848 = 0x6025848;
+D_6025950 = 0x6025950;
+D_6025A10 = 0x6025A10;
+D_6025BBC = 0x6025BBC;
+D_6025E20 = 0x6025E20;
+D_6025E90 = 0x6025E90;
+D_6026150 = 0x6026150;
+D_6026160 = 0x6026160;
+D_60261E0 = 0x60261E0;
+D_6026980 = 0x6026980;
+D_6026B30 = 0x6026B30;
+D_6026B7C = 0x6026B7C;
+D_6026E88 = 0x6026E88;
+D_6027080 = 0x6027080;
+D_60271D0 = 0x60271D0;
+D_6027230 = 0x6027230;
+D_602753C = 0x602753C;
+D_6027660 = 0x6027660;
+D_6027694 = 0x6027694;
+D_60278A0 = 0x60278A0;
+D_6027A60 = 0x6027A60;
+D_6027A70 = 0x6027A70;
+D_6027C70 = 0x6027C70;
+D_6027D10 = 0x6027D10;
+D_6027FA0 = 0x6027FA0;
+D_6028160 = 0x6028160;
+D_602826C = 0x602826C;
+D_602846C = 0x602846C;
+D_6028D20 = 0x6028D20;
+D_6028EA0 = 0x6028EA0;
+D_6028EC0 = 0x6028EC0;
+D_60297E0 = 0x60297E0;
+D_60298EC = 0x60298EC;
+D_60298F0 = 0x60298F0;
+D_6029DE0 = 0x6029DE0;
+D_6029DF4 = 0x6029DF4;
+D_6029EC4 = 0x6029EC4;
+D_6029F18 = 0x6029F18;
+D_6029FB0 = 0x6029FB0;
+D_602A0B0 = 0x602A0B0;
+D_602A200 = 0x602A200;
+D_602A370 = 0x602A370;
+D_602A39C = 0x602A39C;
+D_602A5E0 = 0x602A5E0;
+D_602A970 = 0x602A970;
+D_602AC28 = 0x602AC28;
+D_602ACB0 = 0x602ACB0;
+D_602AD60 = 0x602AD60;
+D_602AF50 = 0x602AF50;
+D_602AFD0 = 0x602AFD0;
+D_602B0A8 = 0x602B0A8;
+D_602B1F4 = 0x602B1F4;
+D_602B3AC = 0x602B3AC;
+D_602B49C = 0x602B49C;
+D_602B5C8 = 0x602B5C8;
+D_602B6B8 = 0x602B6B8;
+D_602B6D0 = 0x602B6D0;
+D_602B750 = 0x602B750;
+D_602BC40 = 0x602BC40;
+D_602BD50 = 0x602BD50;
+D_602BF50 = 0x602BF50;
+D_602C040 = 0x602C040;
+D_602C0A0 = 0x602C0A0;
+D_602C584 = 0x602C584;
+D_602C5FC = 0x602C5FC;
+D_602C6C0 = 0x602C6C0;
+D_602C6C8 = 0x602C6C8;
+D_602C7C8 = 0x602C7C8;
+D_602C7F0 = 0x602C7F0;
+D_602C850 = 0x602C850;
+D_602C858 = 0x602C858;
+D_602C9BC = 0x602C9BC;
+D_602CAC0 = 0x602CAC0;
+D_602CB18 = 0x602CB18;
+D_602D250 = 0x602D250;
+D_602D480 = 0x602D480;
+D_602D798 = 0x602D798;
+D_602D858 = 0x602D858;
+D_602D9E4 = 0x602D9E4;
+D_602DC28 = 0x602DC28;
+D_602DC50 = 0x602DC50;
+D_602DD00 = 0x602DD00;
+D_602DDD0 = 0x602DDD0;
+D_602DECC = 0x602DECC;
+D_602DF94 = 0x602DF94;
+D_602E180 = 0x602E180;
+D_602E220 = 0x602E220;
+D_602E620 = 0x602E620;
+D_602E730 = 0x602E730;
+D_602EF80 = 0x602EF80;
+D_602F014 = 0x602F014;
+D_602F12C = 0x602F12C;
+D_602F5A0 = 0x602F5A0;
+D_602F730 = 0x602F730;
+D_602F840 = 0x602F840;
+D_6030178 = 0x6030178;
+D_603026C = 0x603026C;
+D_6030A2C = 0x6030A2C;
+D_6030CB8 = 0x6030CB8;
+D_6030ECC = 0x6030ECC;
+D_6031078 = 0x6031078;
+D_60311A0 = 0x60311A0;
+D_6031348 = 0x6031348;
+D_6031558 = 0x6031558;
+D_6031724 = 0x6031724;
+D_60317A0 = 0x60317A0;
+D_60317CC = 0x60317CC;
+D_60317E8 = 0x60317E8;
+D_603182C = 0x603182C;
+D_6031840 = 0x6031840;
+D_6031BF4 = 0x6031BF4;
+D_6031F3C = 0x6031F3C;
+D_6031F74 = 0x6031F74;
+D_6031FAC = 0x6031FAC;
+D_603201C = 0x603201C;
+D_60320B0 = 0x60320B0;
+D_6032374 = 0x6032374;
+D_6032460 = 0x6032460;
+D_6032480 = 0x6032480;
+D_6032820 = 0x6032820;
+D_6032B00 = 0x6032B00;
+D_6032B90 = 0x6032B90;
+D_6032BE8 = 0x6032BE8;
+D_6032C10 = 0x6032C10;
+D_6032CF0 = 0x6032CF0;
+D_6032E90 = 0x6032E90;
+D_60331B0 = 0x60331B0;
+D_6033408 = 0x6033408;
+D_60334E8 = 0x60334E8;
+D_6033590 = 0x6033590;
+D_6033630 = 0x6033630;
+D_603373C = 0x603373C;
+D_6033848 = 0x6033848;
+D_60339AC = 0x60339AC;
+D_6033E30 = 0x6033E30;
+D_6033EF8 = 0x6033EF8;
+D_6034540 = 0x6034540;
+D_6034740 = 0x6034740;
+D_6034B80 = 0x6034B80;
+D_603513C = 0x603513C;
+D_60351A0 = 0x60351A0;
+D_6035204 = 0x6035204;
+D_6035288 = 0x6035288;
+D_60352FC = 0x60352FC;
+D_6035380 = 0x6035380;
+D_60353E4 = 0x60353E4;
+D_6036710 = 0x6036710;
+D_6037920 = 0x6037920;
+D_6037B38 = 0x6037B38;
+D_6037C8C = 0x6037C8C;
+D_6037D70 = 0x6037D70;
+D_6037DE0 = 0x6037DE0;
+D_6037E6C = 0x6037E6C;
+D_6037F30 = 0x6037F30;
+D_6037F54 = 0x6037F54;
+D_6038290 = 0x6038290;
+D_6038328 = 0x6038328;
+D_603838C = 0x603838C;
+D_60383C0 = 0x60383C0;
+D_60383F0 = 0x60383F0;
+D_6038454 = 0x6038454;
+D_60384B8 = 0x60384B8;
+D_603851C = 0x603851C;
+D_6038850 = 0x6038850;
+D_603894C = 0x603894C;
+D_60389E0 = 0x60389E0;
+D_6038C10 = 0x6038C10;
+D_6038C3C = 0x6038C3C;
+D_6038CD8 = 0x6038CD8;
+D_603A698 = 0x603A698;
+D_603C870 = 0x603C870;
+D_603CBF4 = 0x603CBF4;
+D_603F568 = 0x603F568;
+D_60402C8 = 0x60402C8;
+D_6040344 = 0x6040344;
+D_60404A4 = 0x60404A4;
+D_60405D0 = 0x60405D0;
+D_60406B8 = 0x60406B8;
+D_60408D0 = 0x60408D0;
+D_6040A70 = 0x6040A70;
+D_6041DCC = 0x6041DCC;
+D_60429E0 = 0x60429E0;
+D_604380C = 0x604380C;
+D_6044768 = 0x6044768;
+D_60461E0 = 0x60461E0;
+D_604F560 = 0x604F560;
+D_7000490 = 0x7000490;
+D_7000B50 = 0x7000B50;
+D_7000D30 = 0x7000D30;
+D_7001540 = 0x7001540;
+D_7001F80 = 0x7001F80;
+D_7002120 = 0x7002120;
+D_7003770 = 0x7003770;
+D_7003990 = 0x7003990;
+D_7003EE8 = 0x7003EE8;
+D_7004240 = 0x7004240;
+D_7005300 = 0x7005300;
+D_7007CC4 = 0x7007CC4;
+D_7007E90 = 0x7007E90;
+D_7008474 = 0x7008474;
+D_70084CC = 0x70084CC;
+D_7008630 = 0x7008630;
+D_7008734 = 0x7008734;
+D_700883C = 0x700883C;
+D_7008850 = 0x7008850;
+D_70096EC = 0x70096EC;
+D_7009A80 = 0x7009A80;
+D_7009E30 = 0x7009E30;
+D_700A110 = 0x700A110;
+D_700AA10 = 0x700AA10;
+D_700ADE0 = 0x700ADE0;
+D_700B260 = 0x700B260;
+D_700BE90 = 0x700BE90;
+D_700C620 = 0x700C620;
+D_700C8B0 = 0x700C8B0;
+D_700CEC0 = 0x700CEC0;
+D_700D010 = 0x700D010;
+D_700D050 = 0x700D050;
+D_700D9B0 = 0x700D9B0;
+D_700DA50 = 0x700DA50;
+D_700DB68 = 0x700DB68;
+D_700DDD8 = 0x700DDD8;
+D_700DE64 = 0x700DE64;
+D_700DE80 = 0x700DE80;
+D_700DFF4 = 0x700DFF4;
+D_700E060 = 0x700E060;
+D_700E244 = 0x700E244;
+D_700E9E0 = 0x700E9E0;
+D_700EA34 = 0x700EA34;
+D_700EA38 = 0x700EA38;
+D_700EC00 = 0x700EC00;
+D_700F240 = 0x700F240;
+D_700F320 = 0x700F320;
+D_700F8F0 = 0x700F8F0;
+D_7010970 = 0x7010970;
+D_7010E10 = 0x7010E10;
+D_7010EE0 = 0x7010EE0;
+D_7010F00 = 0x7010F00;
+D_7010FD0 = 0x7010FD0;
+D_7010FF0 = 0x7010FF0;
+D_70110C0 = 0x70110C0;
+D_70110E0 = 0x70110E0;
+D_70111B0 = 0x70111B0;
+D_8000100 = 0x8000100;
+D_8000180 = 0x8000180;
+D_8000708 = 0x8000708;
+D_8000D80 = 0x8000D80;
+D_8000D90 = 0x8000D90;
+D_8000FC0 = 0x8000FC0;
+D_80010C0 = 0x80010C0;
+D_8001100 = 0x8001100;
+D_8001150 = 0x8001150;
+D_8001170 = 0x8001170;
+D_80011C8 = 0x80011C8;
+D_8001290 = 0x8001290;
+D_80012D8 = 0x80012D8;
+D_8001300 = 0x8001300;
+D_8001348 = 0x8001348;
+D_8002F30 = 0x8002F30;
+D_80037D0 = 0x80037D0;
+D_8008FE8 = 0x8008FE8;
+D_8025080 = 0x8025080;
+D_9002CF0 = 0x9002CF0;
+D_9003330 = 0x9003330;
+D_9003890 = 0x9003890;
+D_9003DF0 = 0x9003DF0;
+D_9004288 = 0x9004288;
+D_900D098 = 0x900D098;
+D_900D164 = 0x900D164;
+D_900D180 = 0x900D180;
+D_900DF20 = 0x900DF20;
+D_900FC4C = 0x900FC4C;
+D_9010FD0 = 0x9010FD0;
+D_9011200 = 0x9011200;
+D_9013C20 = 0x9013C20;
+D_901C0F4 = 0x901C0F4;
+D_901DA50 = 0x901DA50;
+D_9023290 = 0x9023290;
+D_90234D0 = 0x90234D0;
+D_A0002BC = 0xA0002BC;
+D_A00047C = 0xA00047C;
+D_A000568 = 0xA000568;
+D_A000858 = 0xA000858;
+D_A000934 = 0xA000934;
+D_A000D50 = 0xA000D50;
+D_A000EDC = 0xA000EDC;
+D_A001A70 = 0xA001A70;
+D_A009990 = 0xA009990;
+D_C00308C = 0xC00308C;
+D_C003654 = 0xC003654;
+D_C003B08 = 0xC003B08;
+D_C003B20 = 0xC003B20;
+D_C003F00 = 0xC003F00;
+D_C0053D0 = 0xC0053D0;
+D_C005860 = 0xC005860;
+D_C007F08 = 0xC007F08;
+D_C00EE48 = 0xC00EE48;
+D_C00F598 = 0xC00F598;
+D_C016740 = 0xC016740;
+D_C018050 = 0xC018050;
+D_C018430 = 0xC018430;
+D_C018440 = 0xC018440;
+D_C018598 = 0xC018598;
+D_C019BC4 = 0xC019BC4;
+D_C01DC3C = 0xC01DC3C;
+D_C023520 = 0xC023520;
+D_C024B54 = 0xC024B54;
+D_C0250D0 = 0xC0250D0;
+D_C026C00 = 0xC026C00;
+D_C02AF74 = 0xC02AF74;
+D_C02F494 = 0xC02F494;
+D_C02FDA0 = 0xC02FDA0;
+D_C031244 = 0xC031244;
+D_C034780 = 0xC034780;
+D_C034D98 = 0xC034D98;
+D_C0366A4 = 0xC0366A4;
+D_C0366CC = 0xC0366CC;
+D_C037310 = 0xC037310;
+D_C037B6C = 0xC037B6C;
+D_C03833C = 0xC03833C;
+D_C038E3C = 0xC038E3C;
+D_C039AC4 = 0xC039AC4;
+D_C039CCC = 0xC039CCC;
+D_C039F24 = 0xC039F24;
+D_C039FE8 = 0xC039FE8;
+D_C03A208 = 0xC03A208;
+D_C03A290 = 0xC03A290;
+D_C03B290 = 0xC03B290;
+D_D000170 = 0xD000170;
+D_D001090 = 0xD001090;
+D_D001FB0 = 0xD001FB0;
+D_D002ED0 = 0xD002ED0;
+D_D003DF0 = 0xD003DF0;
+D_D004D10 = 0xD004D10;
+D_D005C30 = 0xD005C30;
+D_D006B50 = 0xD006B50;
+D_D007A70 = 0xD007A70;
+D_D008990 = 0xD008990;
+D_D0098B0 = 0xD0098B0;
+D_D009A40 = 0xD009A40;
+D_D00B880 = 0xD00B880;
+D_E000000 = 0xE000000;
+D_E003AB0 = 0xE003AB0;
+D_E00DFB0 = 0xE00DFB0;
+D_E00E100 = 0xE00E100;
+D_E00F020 = 0xE00F020;
+D_E00FF40 = 0xE00FF40;
+D_E010E60 = 0xE010E60;
+D_F000000 = 0xF000000;
+D_F000F20 = 0xF000F20;
+D_F001E40 = 0xF001E40;
+D_F002500 = 0xF002500;
+D_F002D00 = 0xF002D00;
+D_F002D60 = 0xF002D60;
+D_F003500 = 0xF003500;
+D_F003C80 = 0xF003C80;
+D_F003D00 = 0xF003D00;
+D_F004500 = 0xF004500;
+D_F004BA0 = 0xF004BA0;
+D_F005AC0 = 0xF005AC0;
+D_F0069E0 = 0xF0069E0;
+D_F007900 = 0xF007900;
+D_F008820 = 0xF008820;
+D_F009740 = 0xF009740;
+D_F00A660 = 0xF00A660;
+D_F00B580 = 0xF00B580;
+D_F00C4A0 = 0xF00C4A0;
+D_F00D3C0 = 0xF00D3C0;
+D_F00E2E0 = 0xF00E2E0;
+D_F00F200 = 0xF00F200;
+D_F0103D0 = 0xF0103D0;
+D_F014180 = 0xF014180;
+D_F014310 = 0xF014310;
+
+D_8018751C = 0x8018751C;
+D_80187ED8 = 0x80187ED8;
+D_801897B4 = 0x801897B4;
+D_8019DA68 = 0x8019DA68;
+D_801A27E0 = 0x801A27E0;
+D_801A3CC0 = 0x801A3CC0;
+D_801AB968 = 0x801AB968;
+D_801AB970 = 0x801AB970;
+D_801AB978 = 0x801AB978;
+D_801AB980 = 0x801AB980;
+D_801AB988 = 0x801AB988;
+D_801BAE4C = 0x801BAE4C;
+D_801BAFC4 = 0x801BAFC4;
+D_801BB048 = 0x801BB048;
+D_801BB0DC = 0x801BB0DC;
+D_801BDC28 = 0x801BDC28;
+D_801C1C88 = 0x801C1C88;
+D_801C1C90 = 0x801C1C90;
+D_801C1C94 = 0x801C1C94;
+D_801C1CAC = 0x801C1CAC;
+D_801C1CB8 = 0x801C1CB8;
+D_801C1CBC = 0x801C1CBC;
+D_801C1CD4 = 0x801C1CD4;
+D_801C1CDC = 0x801C1CDC;
+D_801C1D32 = 0x801C1D32;
+D_801C7BE8 = 0x801C7BE8;
+D_801D1BC8 = 0x801D1BC8;
+D_801D1BD0 = 0x801D1BD0;
+D_801D1BD4 = 0x801D1BD4;
+D_801D1BD8 = 0x801D1BD8;
+D_801D1BDC = 0x801D1BDC;
+
+func_80025E38 = 0x80025E38;
+func_800C227C = 0x800C227C;
+func_800C2284 = 0x800C2284;
+func_8018B020 = 0x8018B020;
+func_8018B030 = 0x8018B030;
+func_8018B19C = 0x8018B19C;
+func_8018B254 = 0x8018B254;
+func_8018B3A8 = 0x8018B3A8;
+func_8018B3D8 = 0x8018B3D8;
+func_8018B460 = 0x8018B460;
+func_8018B608 = 0x8018B608;
+func_8018BDC8 = 0x8018BDC8;
+func_8018C3F4 = 0x8018C3F4;
+func_8018C53C = 0x8018C53C;
+func_8018CA10 = 0x8018CA10;
+func_8018CC00 = 0x8018CC00;
+func_8018CD14 = 0x8018CD14;
+func_8018D660 = 0x8018D660;
+func_8018E458 = 0x8018E458;
+func_8018E5D8 = 0x8018E5D8;
+func_8018E8A4 = 0x8018E8A4;
+func_8018EB6C = 0x8018EB6C;
+func_8018F200 = 0x8018F200;
+func_8018F44C = 0x8018F44C;
+func_8018F494 = 0x8018F494;
+func_8018F8AC = 0x8018F8AC;
+func_8018F934 = 0x8018F934;
+func_8018FA90 = 0x8018FA90;
+func_8018FBB8 = 0x8018FBB8;
+func_8018FE64 = 0x8018FE64;
+func_801907C8 = 0x801907C8;
+func_8019085C = 0x8019085C;
+func_80190C40 = 0x80190C40;
+func_80191534 = 0x80191534;
+func_80191A50 = 0x80191A50;
+func_80191B88 = 0x80191B88;
+func_80191E90 = 0x80191E90;
+func_80191EAC = 0x80191EAC;
+func_801920C8 = 0x801920C8;
+func_8019284C = 0x8019284C;
+func_80192890 = 0x80192890;
+func_80192998 = 0x80192998;
+func_80192AD0 = 0x80192AD0;
+func_80192BB8 = 0x80192BB8;
+func_801932F4 = 0x801932F4;
+func_8019337C = 0x8019337C;
+func_80193528 = 0x80193528;
+func_80193BCC = 0x80193BCC;
+func_80193F00 = 0x80193F00;
+func_801949D8 = 0x801949D8;
+func_80194BE0 = 0x80194BE0;
+func_80195074 = 0x80195074;
+func_80195688 = 0x80195688;
+func_801958F8 = 0x801958F8;
+func_80195C84 = 0x80195C84;
+func_80195F7C = 0x80195F7C;
+func_80196720 = 0x80196720;
+func_80196840 = 0x80196840;
+func_80196914 = 0x80196914;
+func_80196D7C = 0x80196D7C;
+func_80196E24 = 0x80196E24;
+func_8019703C = 0x8019703C;
+func_801974FC = 0x801974FC;
+func_801976C0 = 0x801976C0;
+func_8019771C = 0x8019771C;
+func_801981F4 = 0x801981F4;
+func_801998F4 = 0x801998F4;
+func_80199C5C = 0x80199C5C;
+func_80199DC4 = 0x80199DC4;
+func_8019A3FC = 0x8019A3FC;
+func_8019A68C = 0x8019A68C;
+func_8019A81C = 0x8019A81C;
+func_8019ACBC = 0x8019ACBC;
+func_8019B744 = 0x8019B744;
+func_8019B930 = 0x8019B930;
+func_8019BD70 = 0x8019BD70;
+func_8019BFE8 = 0x8019BFE8;
+func_8019BFF4 = 0x8019BFF4;
+func_8019C0AC = 0x8019C0AC;
+func_8019C318 = 0x8019C318;
+func_8019C340 = 0x8019C340;
+func_8019C360 = 0x8019C360;
+func_8019C6B0 = 0x8019C6B0;
+func_8019CB88 = 0x8019CB88;
+func_8019CEFC = 0x8019CEFC;
+func_8019D2D0 = 0x8019D2D0;
+func_8019D3D0 = 0x8019D3D0;
+func_8019D630 = 0x8019D630;
+func_8019DA3C = 0x8019DA3C;
+func_8019E548 = 0x8019E548;
+func_8019EC80 = 0x8019EC80;
+func_8019F2A0 = 0x8019F2A0;
+func_8019F408 = 0x8019F408;
+func_8019FC90 = 0x8019FC90;
+func_801A01F8 = 0x801A01F8;
+func_801A0AF0 = 0x801A0AF0;
+func_801A0EB8 = 0x801A0EB8;
+func_801A1204 = 0x801A1204;
+func_801A1680 = 0x801A1680;
+func_801A2070 = 0x801A2070;
+func_801A2338 = 0x801A2338;
+func_801A23C0 = 0x801A23C0;
+func_801A2474 = 0x801A2474;
+func_801A2898 = 0x801A2898;
+func_801A391C = 0x801A391C;
+func_801A3ED0 = 0x801A3ED0;
+func_801A44DC = 0x801A44DC;
+func_801A4B74 = 0x801A4B74;
+func_801A6DA0 = 0x801A6DA0;
+func_801A7230 = 0x801A7230;
+func_801A75F0 = 0x801A75F0;
+func_801A76C0 = 0x801A76C0;
+func_801A7910 = 0x801A7910;
+func_801A8100 = 0x801A8100;
+func_801A8598 = 0x801A8598;
+func_801A86CC = 0x801A86CC;
+func_801A906C = 0x801A906C;
+func_801A94E4 = 0x801A94E4;
+func_801A98C4 = 0x801A98C4;
+func_801A99D0 = 0x801A99D0;
+func_801A9B74 = 0x801A9B74;
+func_801A9BCC = 0x801A9BCC;
+func_801AA078 = 0x801AA078;
+func_801AB3C8 = 0x801AB3C8;
+func_801AB830 = 0x801AB830;
+func_801AC670 = 0x801AC670;
+func_801AD2A4 = 0x801AD2A4;
+func_801ADC8C = 0x801ADC8C;
+func_801AE368 = 0x801AE368;
+func_801AE778 = 0x801AE778;
+func_801AF430 = 0x801AF430;
+func_801AF4C0 = 0x801AF4C0;
+func_801AFCF4 = 0x801AFCF4;
+func_801B01D4 = 0x801B01D4;
+func_801B0328 = 0x801B0328;
+func_801B0634 = 0x801B0634;
+func_801B08D0 = 0x801B08D0;
+func_801B0A3C = 0x801B0A3C;
+func_801B0B00 = 0x801B0B00;
+func_801B0BC4 = 0x801B0BC4;
+func_801B0DA8 = 0x801B0DA8;
+func_801B1108 = 0x801B1108;
+func_801B1E2C = 0x801B1E2C;
+func_801B3374 = 0x801B3374;
+func_801B3474 = 0x801B3474;
+func_801B4B6C = 0x801B4B6C;
+func_801B6314 = 0x801B6314;
+func_801B775C = 0x801B775C;
+func_801B8B50 = 0x801B8B50;
+func_801B92EC = 0x801B92EC;
+func_801B9DA4 = 0x801B9DA4;
+func_801BA52C = 0x801BA52C;
+func_801BA860 = 0x801BA860;
+func_801BA8B4 = 0x801BA8B4;
+func_801BB550 = 0x801BB550;
+func_801BDFDC = 0x801BDFDC;
+func_801BECCC = 0x801BECCC;
+func_801C1974 = 0x801C1974;
+func_801C1A94 = 0x801C1A94;
+func_801C1B50 = 0x801C1B50;
+func_801C26E0 = 0x801C26E0;
diff --git a/linker_scripts/jp/rev0/symbol_addrs.txt b/linker_scripts/jp/rev0/symbol_addrs.txt
index 4160dfdf..1cfe2ab6 100644
--- a/linker_scripts/jp/rev0/symbol_addrs.txt
+++ b/linker_scripts/jp/rev0/symbol_addrs.txt
@@ -1,6 +1,3 @@
-D_80000450 = 0x80000450;
-D_80000520 = 0x80000520;
-D_80001420 = 0x80001420;
 func_80002850 = 0x80002850;
 func_8000292C = 0x8000292C;
 func_800029B8 = 0x800029B8;
@@ -1604,12 +1601,10 @@ func_800C007C = 0x800C007C;
 func_800C0100 = 0x800C0100;
 func_800C01D4 = 0x800C01D4;
 func_800C02E4 = 0x800C02E4;
-D_800C0430 = 0x800C0430;
 D_800C0760 = 0x800C0760;
 D_800C07B0 = 0x800C07B0;
 D_800C0BE0 = 0x800C0BE0;
 D_800C0E00 = 0x800C0E00;
-D_800C0F20 = 0x800C0F20;
 D_800C1720 = 0x800C1720;
 D_800C1730 = 0x800C1730;
 D_800C1770 = 0x800C1770;
diff --git a/linker_scripts/jp/rev0/symbol_addrs_fix.txt b/linker_scripts/jp/rev0/symbol_addrs_fix.txt
index d91222db..042590cb 100644
--- a/linker_scripts/jp/rev0/symbol_addrs_fix.txt
+++ b/linker_scripts/jp/rev0/symbol_addrs_fix.txt
@@ -35,16 +35,37 @@ D_80170000 = 0x80170000; //ignore:true
 D_80170001 = 0x80170001; //ignore:true
 D_80180000 = 0x80180000; //ignore:true
 D_80180001 = 0x80180001; //ignore:true
+D_80180058 = 0x80180058; //ignore:true
 D_801B0130 = 0x801B0130; //ignore:true
 D_801C0001 = 0x801C0001; //ignore:true
 
 // mirage symbols
-D_6000000 = 0x0A000000; //ignore:true
-D_7000000 = 0x0A000000; //ignore:true
-D_8000000 = 0x0A000000; //ignore:true
+D_6000000 = 0x06000000; //ignore:true
+D_7000000 = 0x07000000; //ignore:true
+D_8000000 = 0x08000000; //ignore:true
 D_A000000 = 0x0A000000; //ignore:true
 D_F000000 = 0x0F000000; //ignore:true
 
+// rsp
+rspbootTextStart = 0x80000450;//name_end:rspbootTextEnd
+aspMainTextStart = 0x80000520;//name_end:aspMainTextEnd
+gspF3DEX_fifoTextStart = 0x80001420;//name_end:gspF3DEX_fifoTextEnd
+gspF3DEX_fifoDataStart = 0x800C0F20; //name_end:gspF3DEX_fifoDataEnd
+aspMainDataStart = 0x800C0430; //name_end:aspMainDataEnd
+
+// constant for K1 access
+D_A0000000 = 0xA0000000;//ignore:true
+
+// hardcoded addresses in libultra
+D_BFF00000 = 0xBFF00000;//ignore:true
+D_BFF08000 = 0xBFF08000;//ignore:true
+D_BFF08004 = 0xBFF08004;//ignore:true
+
+// RDB regs used only in exceptasm. Also -2.0f
+D_C0000000 = 0xC0000000;//ignore:true
+D_C0000008 = 0xC0000008;//ignore:true
+D_C000000C = 0xC000000C;//ignore:true
+
 // redundant rodata
 D_800DB02C = 0x800DB02C; // force_migration:True
 D_800DB24C = 0x800DB24C; // force_migration:True
@@ -65,12 +86,12 @@ D_i5_801B2DE0 = 0x801B2DE0; // force_migration:True segment:ovl_i5
 D_i5_801B2DF4 = 0x801B2DF4; // force_migration:True segment:ovl_i5
 D_i6_8019E810 = 0x8019E810; // force_migration:True segment:ovl_i6
 
-// symbol collisions
-D_i1_80192958 = 0x80192958; //segment:ovl_i1 // i4 func collision
-D_menu_801AE894 = 0x801AE894; // force_migration:True segment:ovl_menu // i5 data collision
-jtbl_menu_801AED88 = 0x801AED88; // force_migration:True segment:ovl_menu // i3 func collision
-D_ending_8018D5D4 = 0x8018D5D4; // force_migration:True segment:ovl_ending  // i6 func collision
-D_ending_8018DC28 = 0x8018DC28; // force_migration:True segment:ovl_ending  // i6 func collision
+// constant for K1 access
+D_A0000000 = 0xA0000000;//ignore:true
+
+// hardcoded address used in sys_rdram
+D_A0300000 = 0xA0300000;//ignore:true
+D_A4000000 = 0xA4000000;//ignore:true
 
 // hidden vars
 D_800C5118 = 0x800C5118;
diff --git a/linker_scripts/jp/rev0/undefined_syms.ld b/linker_scripts/jp/rev0/undefined_syms.ld
index 3091640e..1491e6d7 100644
--- a/linker_scripts/jp/rev0/undefined_syms.ld
+++ b/linker_scripts/jp/rev0/undefined_syms.ld
@@ -243,7 +243,6 @@ D_50070A0 = 0x50070A0;
 D_5007770 = 0x5007770;
 D_5008A50 = 0x5008A50;
 D_500A040 = 0x500A040;
-D_6000000 = 0x6000000;
 D_6000290 = 0x6000290;
 D_6000320 = 0x6000320;
 D_6000604 = 0x6000604;
@@ -849,7 +848,6 @@ D_60492B0 = 0x60492B0;
 D_6049B50 = 0x6049B50;
 D_60565F0 = 0x60565F0;
 D_6058700 = 0x6058700;
-D_7000000 = 0x7000000;
 D_7001540 = 0x7001540;
 D_70017F0 = 0x70017F0;
 D_7001A10 = 0x7001A10;
@@ -922,7 +920,6 @@ D_7011DB0 = 0x7011DB0;
 D_7011EB0 = 0x7011EB0;
 D_7012B00 = 0x7012B00;
 D_7012FC0 = 0x7012FC0;
-D_8000000 = 0x8000000;
 D_8000708 = 0x8000708;
 D_8000D80 = 0x8000D80;
 D_8000D90 = 0x8000D90;
@@ -997,7 +994,6 @@ D_901C0F4 = 0x901C0F4;
 D_901DA50 = 0x901DA50;
 D_9023290 = 0x9023290;
 D_90234D0 = 0x90234D0;
-D_A000000 = 0xA000000;
 D_A0002BC = 0xA0002BC;
 D_A00047C = 0xA00047C;
 D_A000568 = 0xA000568;
@@ -1067,7 +1063,6 @@ D_E00DF80 = 0xE00DF80;
 D_E00EEA0 = 0xE00EEA0;
 D_E00FDC0 = 0xE00FDC0;
 D_E010CE0 = 0xE010CE0;
-D_F000000 = 0xF000000;
 D_F000800 = 0xF000800;
 D_F000F20 = 0xF000F20;
 D_F001000 = 0xF001000;
@@ -1091,7 +1086,3 @@ D_F00F200 = 0xF00F200;
 D_F0103D0 = 0xF0103D0;
 D_F014180 = 0xF014180;
 D_F014310 = 0xF014310;
-
-D_A0000000 = 0xA0000000;
-D_A0300000 = 0xA0300000;
-D_A4000000 = 0xA4000000;
diff --git a/linker_scripts/us/rev1/symbol_addrs.txt b/linker_scripts/us/rev1/symbol_addrs.txt
index ba745dd6..3e708ccf 100644
--- a/linker_scripts/us/rev1/symbol_addrs.txt
+++ b/linker_scripts/us/rev1/symbol_addrs.txt
@@ -29,9 +29,11 @@ D_80180000 = 0x80180000;//ignore:true
 D_80160000 = 0x80160000;//ignore:true
 D_800D0000 = 0x800D0000;//ignore:true
 D_7FFFFFFE = 0x7FFFFFFE;//ignore:true
-D_1000000 =  0x01000000;//ignore:true
-D_TI_A000000 =  0x0A000000;//ignore:true
-D_ENMY_PLANET_4000000 = 0x04000000;//ignore:true
+D_1000000 = 0x01000000;//ignore:true
+
+// mirage symbols
+D_A000000 = 0x0A000000;//ignore:true
+D_4000000 = 0x04000000;//ignore:true
 
 // constant for K1 access
 D_TI_A0000000 = 0xA0000000;//ignore:true
@@ -41,13 +43,14 @@ D_BFF00000 = 0xBFF00000;//ignore:true
 D_BFF08000 = 0xBFF08000;//ignore:true
 D_BFF08004 = 0xBFF08004;//ignore:true
 
-// RDB regs used only in exceptasm. Also 2.0f
+// RDB regs used only in exceptasm. Also -2.0f
 D_C0000000 = 0xC0000000;//ignore:true
 D_C0000008 = 0xC0000008;//ignore:true
 D_C000000C = 0xC000000C;//ignore:true
 
 D_80151650 = 0x80151650; //ignore:true
 
+// dma symbols
 dma_table_ROM_START = 0xDE480; //defined:true
 audio_seq_ROM_START = 0xDEA20; //defined:true
 audio_bank_ROM_START = 0x119710; //defined:true