diff options
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/jp/ignored_addresses.txt | 2 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_assets.txt | 3 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_code.txt | 102 | ||||
| -rw-r--r-- | linker_scripts/jp/symbol_addrs_overlays.txt | 120 |
4 files changed, 115 insertions, 112 deletions
diff --git a/linker_scripts/jp/ignored_addresses.txt b/linker_scripts/jp/ignored_addresses.txt index 0069d07..4859cad 100644 --- a/linker_scripts/jp/ignored_addresses.txt +++ b/linker_scripts/jp/ignored_addresses.txt @@ -31,6 +31,8 @@ D_E4D10 = 0xE4D10; // ignore:true D_13D9A0 = 0x13D9A0; // ignore:true D_675720 = 0x675720; // ignore:true D_73F4D0 = 0x73F4D0; // ignore:true +D_81AA60 = 0x81AA60; // ignore:true +D_81D540 = 0x81D540; // ignore:true __osBbIsBb = 0x80000388; // ignore:true diff --git a/linker_scripts/jp/symbol_addrs_assets.txt b/linker_scripts/jp/symbol_addrs_assets.txt index 16a412b..edcaa8e 100644 --- a/linker_scripts/jp/symbol_addrs_assets.txt +++ b/linker_scripts/jp/symbol_addrs_assets.txt @@ -1270,6 +1270,8 @@ act_house_goki_model_2 = 0x6000188; // segment:act_house_goki rom:0x1147188 act_house_goki_pal = 0x6000250; // segment:act_house_goki rom:0x1147250 act_house_goki_tex = 0x6000270; // segment:act_house_goki rom:0x1147270 +data_combi_table = 0x6000000; // segment:data_combi rom:0x11E2000 size:0x684 + act_bee_v = 0x6000000; // segment:act_bee rom:0x11F4000 size:0x3A0 act_bee_C_model = 0x60003A0; // segment:act_bee rom:0x11F43A0 act_bee_B_model = 0x60004B8; // segment:act_bee rom:0x11F44B8 @@ -1350,3 +1352,4 @@ int_sum_clchest03_door_model = 0x6000D30; // segment:int_sum_clchest03 rom:0x15D int_sum_clchest03_base_model = 0x6000DF0; // segment:int_sum_clchest03 rom:0x15D0DF0 cKF_je_r_int_sum_clchest03_tbl = 0x6000F38; // segment:int_sum_clchest03 rom:0x15D0F38 cKF_bs_r_int_sum_clchest03 = 0x6000F5C; // segment:int_sum_clchest03 rom:0x15D0F5C + diff --git a/linker_scripts/jp/symbol_addrs_code.txt b/linker_scripts/jp/symbol_addrs_code.txt index 9439a58..9cd0ae5 100644 --- a/linker_scripts/jp/symbol_addrs_code.txt +++ b/linker_scripts/jp/symbol_addrs_code.txt @@ -776,7 +776,7 @@ func_80071DB4_jp = 0x80071DB4; // type:func func_800721C8_jp = 0x800721C8; // type:func func_800721E4_jp = 0x800721E4; // type:func func_80072238_jp = 0x80072238; // type:func -func_80072264_jp = 0x80072264; // type:func +mCoBG_Attribute2CheckPlant = 0x80072264; // type:func func_80072340_jp = 0x80072340; // type:func func_80072398_jp = 0x80072398; // type:func func_800723C4_jp = 0x800723C4; // type:func @@ -1358,10 +1358,10 @@ mFI_UtNum2UtCol = 0x800895B8; // type:func func_80089698_jp = 0x80089698; // type:func func_80089704_jp = 0x80089704; // type:func func_800897D0_jp = 0x800897D0; // type:func -func_80089888_jp = 0x80089888; // type:func +mFI_GetUnitCol = 0x80089888; // type:func func_800898F4_jp = 0x800898F4; // type:func func_800899CC_jp = 0x800899CC; // type:func -func_80089A34_jp = 0x80089A34; // type:func +mFI_GetSoundSourcePBlockNum = 0x80089A34; // type:func func_80089AAC_jp = 0x80089AAC; // type:func func_80089B1C_jp = 0x80089B1C; // type:func func_80089B94_jp = 0x80089B94; // type:func @@ -2857,21 +2857,21 @@ func_800BC6B0_jp = 0x800BC6B0; // type:func func_800BC724_jp = 0x800BC724; // type:func func_800BC830_jp = 0x800BC830; // type:func mQst_PrintQuestInfo = 0x800BC938; // type:func -func_800BCBA0_jp = 0x800BCBA0; // type:func -func_800BCBDC_jp = 0x800BCBDC; // type:func -func_800BCC20_jp = 0x800BCC20; // type:func -func_800BCC30_jp = 0x800BCC30; // type:func -func_800BCC40_jp = 0x800BCC40; // type:func -func_800BCCFC_jp = 0x800BCCFC; // type:func +mRF_Malloc = 0x800BCBA0; // type:func +mRF_Free = 0x800BCBDC; // type:func +mRF_StepNo = 0x800BCC20; // type:func +mRF_TryCnt = 0x800BCC30; // type:func +mRF_PrintDebug = 0x800BCC40; // type:func +mRF_MakeRandomField = 0x800BCCFC; // type:func mRF_Type2BlockInfo = 0x800BCDCC; // type:func -func_800BCDFC_jp = 0x800BCDFC; // type:func -func_800BCE80_jp = 0x800BCE80; // type:func -func_800BCEA4_jp = 0x800BCEA4; // type:func -func_800BCF64_jp = 0x800BCF64; // type:func -func_800BCFA4_jp = 0x800BCFA4; // type:func +mRF_Info2BlockType = 0x800BCDFC; // type:func +mRF_GateType2GateCount = 0x800BCE80; // type:func +mRF_SearchPond = 0x800BCEA4; // type:func +mRF_Attr2BeastRoadAttr = 0x800BCF64; // type:func +mRF_BlockTypeDirect2GateType = 0x800BCFA4; // type:func mRF_BlockTypeDirect2GateData = 0x800BCFC8; // type:func -func_800BD02C_jp = 0x800BD02C; // type:func -func_800BD1E4_jp = 0x800BD1E4; // type:func +mRF_BlockInf2CheckBeastRoad = 0x800BD02C; // type:func +mRF_CheckBeastRoad = 0x800BD1E4; // type:func gfx_set_fog_position = 0x800BD2B0; // type:func gfx_set_fog_nosync = 0x800BD37C; // type:func func_800BD3EC_jp = 0x800BD3EC; // type:func @@ -4842,42 +4842,42 @@ D_8010C650_jp = 0x8010C650; // type:u8 D_8010C65C_jp = 0x8010C65C; // D_8010C66C_jp = 0x8010C66C; // type:u16 D_8010C670_jp = 0x8010C670; // type:u16 -D_8010C680_jp = 0x8010C680; // -D_8010C684_jp = 0x8010C684; // -D_8010C694_jp = 0x8010C694; // -D_8010C69C_jp = 0x8010C69C; // type:u8 -D_8010C6A4_jp = 0x8010C6A4; // -D_8010C6B0_jp = 0x8010C6B0; // +l_delivery_limit = 0x8010C680; // type:u8 +l_errand_limit = 0x8010C684; // type:u8 +l_contest_limit = 0x8010C694; // type:u8 +l_contest_fin_limit = 0x8010C69C; // type:u8 +l_limit_table = 0x8010C6A4; // +l_limit_table_max = 0x8010C6B0; // D_8010C6B8_jp = 0x8010C6B8; // -D_8010C6C0_jp = 0x8010C6C0; // -D_8010C6C4_jp = 0x8010C6C4; // -D_8010C6C8_jp = 0x8010C6C8; // -D_8010C6CC_jp = 0x8010C6CC; // -D_8010C6F8_jp = 0x8010C6F8; // -D_8010C848_jp = 0x8010C848; // type:u8 -D_8010C850_jp = 0x8010C850; // -D_8010C858_jp = 0x8010C858; // -D_8010C860_jp = 0x8010C860; // -D_8010C868_jp = 0x8010C868; // -D_8010C870_jp = 0x8010C870; // -D_8010C878_jp = 0x8010C878; // -D_8010C880_jp = 0x8010C880; // -D_8010C888_jp = 0x8010C888; // -D_8010C890_jp = 0x8010C890; // -D_8010C8A0_jp = 0x8010C8A0; // -D_8010C8B0_jp = 0x8010C8B0; // -D_8010C8C0_jp = 0x8010C8C0; // -D_8010C8D0_jp = 0x8010C8D0; // -D_8010C8E0_jp = 0x8010C8E0; // -D_8010C8F0_jp = 0x8010C8F0; // -D_8010C900_jp = 0x8010C900; // -D_8010C910_jp = 0x8010C910; // -D_8010C928_jp = 0x8010C928; // -D_8010C940_jp = 0x8010C940; // -D_8010C958_jp = 0x8010C958; // -D_8010C970_jp = 0x8010C970; // -D_8010C9D0_jp = 0x8010C9D0; // type:u8 -D_8010CB20_jp = 0x8010CB20; // +mRF_AllocatedBuf = 0x8010C6C0; // +stepNo = 0x8010C6C4; // +tryCnt = 0x8010C6C8; // +mRF_DebugMsg = 0x8010C6CC; // +mRF_block_info = 0x8010C6F8; // +gate_count_table = 0x8010C848; // type:u8 size:0x6 +gate1_type0_up = 0x8010C850; // +gate1_type0_lt = 0x8010C858; // +gate1_type0_dn = 0x8010C860; // +gate1_type0_rt = 0x8010C868; // +gate1_type1_up = 0x8010C870; // +gate1_type1_lt = 0x8010C878; // +gate1_type1_dn = 0x8010C880; // +gate1_type1_rt = 0x8010C888; // +gate2_type0_up = 0x8010C890; // +gate2_type0_lt = 0x8010C8A0; // +gate2_type0_dn = 0x8010C8B0; // +gate2_type0_rt = 0x8010C8C0; // +gate2_type1_up = 0x8010C8D0; // +gate2_type1_lt = 0x8010C8E0; // +gate2_type1_dn = 0x8010C8F0; // +gate2_type1_rt = 0x8010C900; // +gate3_type0_up = 0x8010C910; // +gate3_type0_lt = 0x8010C928; // +gate3_type0_dn = 0x8010C940; // +gate3_type0_rt = 0x8010C958; // +mRF_gate_correct_info = 0x8010C970; // +mRF_gate_info2 = 0x8010C9D0; // type:u8 +wpos = 0x8010CB20; // type:f32 size:0xC allow_duplicates:true z_gsCPModeSet_Data = 0x8010CB30; // type:Gfx size:0x2D0 RSP_RDP_clear_data = 0x8010CE00; // type:Gfx size:0x60 fade_gfx = 0x8010CE60; // type:Gfx size:0x30 diff --git a/linker_scripts/jp/symbol_addrs_overlays.txt b/linker_scripts/jp/symbol_addrs_overlays.txt index 1277f88..9792664 100644 --- a/linker_scripts/jp/symbol_addrs_overlays.txt +++ b/linker_scripts/jp/symbol_addrs_overlays.txt @@ -6654,7 +6654,7 @@ B_80921EB8_jp = 0x80921EB8; // type:s8 // .text -func_80922800_jp = 0x80922800; // type:func +mRF_GetRandom = 0x80922800; // type:func func_80922840_jp = 0x80922840; // type:func func_80922854_jp = 0x80922854; // type:func func_8092288C_jp = 0x8092288C; // type:func @@ -6698,62 +6698,61 @@ func_80924C9C_jp = 0x80924C9C; // type:func func_80924DB0_jp = 0x80924DB0; // type:func func_80924DF4_jp = 0x80924DF4; // type:func func_80924E6C_jp = 0x80924E6C; // type:func -func_80924EEC_jp = 0x80924EEC; // type:func - -// .data - -D_80925080_jp = 0x80925080; // -D_809250B8_jp = 0x809250B8; // -D_809250BC_jp = 0x809250BC; // -D_809250C4_jp = 0x809250C4; // -D_809250C8_jp = 0x809250C8; // -D_809250D0_jp = 0x809250D0; // -D_809250D4_jp = 0x809250D4; // -D_809250DC_jp = 0x809250DC; // -D_809250E8_jp = 0x809250E8; // type:u8 -D_809250F0_jp = 0x809250F0; // -D_809250F4_jp = 0x809250F4; // -D_809250FC_jp = 0x809250FC; // -D_80925100_jp = 0x80925100; // -D_80925108_jp = 0x80925108; // -D_8092510C_jp = 0x8092510C; // -D_80925114_jp = 0x80925114; // -D_80925118_jp = 0x80925118; // -D_80925120_jp = 0x80925120; // -D_80925124_jp = 0x80925124; // -D_8092512C_jp = 0x8092512C; // -D_80925130_jp = 0x80925130; // -D_80925138_jp = 0x80925138; // -D_8092513C_jp = 0x8092513C; // -D_80925144_jp = 0x80925144; // -D_80925160_jp = 0x80925160; // type:u8 -D_80925168_jp = 0x80925168; // -D_8092516C_jp = 0x8092516C; // -D_80925174_jp = 0x80925174; // -D_80925178_jp = 0x80925178; // -D_80925180_jp = 0x80925180; // -D_80925184_jp = 0x80925184; // -D_8092518C_jp = 0x8092518C; // -D_80925190_jp = 0x80925190; // -D_80925198_jp = 0x80925198; // -D_8092519C_jp = 0x8092519C; // -D_809251A4_jp = 0x809251A4; // -D_809251A8_jp = 0x809251A8; // -D_809251B0_jp = 0x809251B0; // -D_809251B4_jp = 0x809251B4; // -D_809251BC_jp = 0x809251BC; // -D_809251C0_jp = 0x809251C0; // -D_809251D8_jp = 0x809251D8; // -D_809251E8_jp = 0x809251E8; // -D_809251F8_jp = 0x809251F8; // -D_80925240_jp = 0x80925240; // -D_80925248_jp = 0x80925248; // -D_80925250_jp = 0x80925250; // -D_80925258_jp = 0x80925258; // -D_8092527C_jp = 0x8092527C; // -D_8092528C_jp = 0x8092528C; // type:u8 -D_8092528D_jp = 0x8092528D; // type:u8 -D_80925294_jp = 0x80925294; // type:u16 +mRF_MakeRandomField_ovl = 0x80924EEC; // type:func + +// .data + +l_base_blocks = 0x80925080; // type:u8 +l_cliff_startA_factor = 0x809250B8; // type:u8 size:0x2 +l_cliff_startA = 0x809250BC; // +l_cliff_startB_factor = 0x809250C4; // type:u8 size:0x3 +l_cliff_startB = 0x809250C8; // +l_cliff_startC_factor = 0x809250D0; // type:u8 size:0x2 +l_cliff_startC = 0x809250D4; // +l_cliff_start_table = 0x809250DC; // +l_cliff_next_direct = 0x809250E8; // type:u8 size:0x7 +l_cliff1_next = 0x809250F0; // type:u8 size:0x3 +l_cliff1_next_class = 0x809250F4; // +l_cliff2_next = 0x809250FC; // type:u8 size:0x2 +l_cliff2_next_class = 0x80925100; // +l_cliff3_next = 0x80925108; // type:u8 size:0x2 +l_cliff3_next_class = 0x8092510C; // +l_cliff4_next = 0x80925114; // type:u8 size:0x3 +l_cliff4_next_class = 0x80925118; // +l_cliff5_next = 0x80925120; // type:u8 size:0x2 +l_cliff5_next_class = 0x80925124; // +l_cliff6_next = 0x8092512C; // type:u8 size:0x2 +l_cliff6_next_class = 0x80925130; // +l_cliff7_next = 0x80925138; // type:u8 size:0x3 +l_cliff7_next_class = 0x8092513C; // +l_cliff_next_data = 0x80925144; // +l_river_next_direct = 0x80925160; // +l_river1_next = 0x80925168; // type:u8 size:0x3 +l_river1_next_class = 0x8092516C; // +l_river2_next = 0x80925174; // type:u8 size:0x2 +l_river2_next_class = 0x80925178; // +l_river3_next = 0x80925180; // type:u8 size:0x2 +l_river3_next_class = 0x80925184; // +l_river4_next = 0x8092518C; // type:u8 size:0x2 +l_river4_next_class = 0x80925190; // +l_river5_next = 0x80925198; // type:u8 size:0x3 +l_river5_next_class = 0x8092519C; // +l_river6_next = 0x809251A4; // type:u8 size:0x2 +l_river6_next_class = 0x809251A8; // +l_river7_next = 0x809251B0; // type:u8 size:0x3 +l_river7_next_class = 0x809251B4; // +l_river_next_data = 0x809251BC; // size:0x1C +x_offset = 0x809251D8; // +z_offset = 0x809251E8; // +blockGroup = 0x809251F8; // +river1_album_data = 0x80925240; // type:u8 size:0x7 +river2_album_data = 0x80925248; // type:u8 size:0x7 +river3_album_data = 0x80925250; // type:u8 size:0x7 +river_no_album_data = 0x80925258; // type:u8 size:0x7 +river_cliff_album_data = 0x80925260; // +startX_table = 0x8092527C; // +cross_data = 0x8092528C; // type:u8 size:0x7 +init_cmb = 0x80925294; // type:u16 size:0x2 // .rodata @@ -6762,15 +6761,14 @@ jtbl_809252BC_jp = 0x809252BC; // type:jtbl // .bss -B_809252E0_jp = 0x809252E0; // -B_80925318_jp = 0x80925318; // +keep_blocks = 0x809252E0; // +challenge_flag = 0x80925318; // B_80925350_jp = 0x80925350; // type:s16 B_809253C0_jp = 0x809253C0; // type:s16 B_80925430_jp = 0x80925430; // B_80925468_jp = 0x80925468; // B_809254A0_jp = 0x809254A0; // -B_809254D8_jp = 0x809254D8; // type:s16 -B_80925548_jp = 0x80925548; // +l_use_data = 0x809254D8; // type:s16 size:0x70 D_80925550_jp = 0x80925550; // // .text |