diff --git a/splat.yaml b/splat.yaml index f4a859a..1b0beaf 100644 --- a/splat.yaml +++ b/splat.yaml @@ -307,6 +307,8 @@ segments: - [0x2DE10, asm] - [0x2E450, data] + - [0x387C0, data, "data/overlay_table"] + - [0x38B50, data] - [0x3E330, rodata, "5FC0"] # - [0x3E408, rodata, "5FC0"] @@ -370,6 +372,8 @@ segments: start: 0x40E80 vram: 0x8016AF80 bss_size: 0x6C60 + # Complete + find_file_boundaries: False subsegments: - [0x40E80, asm, "segment_obdata/ob_blushing_ship"] - [0x420D0, asm, "segment_obdata/ob_awful_bells"] @@ -446,36 +450,45 @@ segments: # __SOME_OVERLAY_TABLE[17] - type: code - dir: overlay_69900 + name: overlay_69900 start: 0x69900 vram: 0x80197B70 bss_size: 0x60 symbol_name_format: overlay_69900_$VRAM_$ROM exclusive_ram_id: test_overlapping + # Complete + find_file_boundaries: False subsegments: - - [0x69900, asm, "ob_ancient_ball"] - - [0x6D3D0, asm, "ob_fixed_mitten"] + - [0x69900, asm, "overlay_69900/ob_ancient_ball"] + - [0x6D3D0, asm, "overlay_69900/ob_fixed_mitten"] - [0x6DF80, data] + - [0x6E1B0, data, "gfx/ob_quarrelsome_spot"] + - [0x6E250, data] - - [0x6E2B0, rodata, "ob_ancient_ball"] + - [0x6E2A0, rodata, "overlay_69900/ob_fixed_mitten"] + - [0x6E2B0, rodata, "overlay_69900/ob_ancient_ball"] - { start: 0x6E660, type: bss, vram: 0x8019C8D0 } - [0x6E660, bin] - # # __SOME_OVERLAY_TABLE[1] - # - type: code - # dir: overlay_6E660 - # start: 0x6E660 - # vram: 0x80197B70 - # bss_size: 0x10 - # symbol_name_format: overlay_6E660_$VRAM_$ROM - # exclusive_ram_id: test_overlapping - # subsegments: - # - [0x6E660, asm] + # __SOME_OVERLAY_TABLE[1] + - type: code + name: overlay_6E660 + start: 0x6E660 + vram: 0x80197B70 + bss_size: 0x10 + symbol_name_format: overlay_6E660_$VRAM_$ROM + exclusive_ram_id: test_overlapping + # Complete + find_file_boundaries: False + subsegments: + - [0x6E660, asm, "overlay_6E660/ob_chunky_hot"] - # - { start: 0x71280, type: bss, vram: 0x8019A790 } + - [0x70E70, rodata, "overlay_6E660/ob_chunky_hot"] + + - { start: 0x71280, type: bss, vram: 0x8019A790 } - type: code dir: overlay_71280 @@ -484,37 +497,40 @@ segments: bss_size: 0x40 symbol_name_format: overlay_71280_$VRAM_$ROM exclusive_ram_id: test_overlapping + # Complete find_file_boundaries: False subsegments: - - [0x71280, asm, "worried_hair"] + - [0x71280, asm, "reset_control_deck"] + - [0x75B50, asm, "save_menu"] + - [0x77770, asm, "save_game"] - - [0x783A0, rodata, "worried_hair"] - # - [0x78410, rodata] - # - [0x785D0, rodata] - # - [0x790F0, rodata] - # - [0x79160, rodata] - # - [0x793F0, rodata] + - [0x783A0, rodata, "reset_control_deck"] + - [0x785D0, rodata, "save_menu"] + - [0x79160, rodata, "save_game"] # - { start: 0x79730, type: bss, vram: 0x801A2C50 } - type: code - dir: overlay_79730 + name: overlay_79730 start: 0x79730 vram: 0x8019A7A0 bss_size: 0x0 symbol_name_format: overlay_79730_$VRAM_$ROM exclusive_ram_id: test_overlapping subsegments: - - [0x79730, asm, "ob_painstaking_leg"] - - [0x7E4F0, asm, "ob_reach_bead"] - - [0x83080, asm, "ob_thick_turn"] - - [0x83610, asm, "ob_enthusiastic_friction"] + - [0x79730, asm, "overlay_79730/ob_painstaking_leg"] + - [0x7E4F0, asm, "overlay_79730/ob_reach_bead"] + - [0x83080, asm, "overlay_79730/ob_thick_turn"] + - [0x83610, asm, "overlay_79730/ob_enthusiastic_friction"] - [0x85820, data] + - [0x867B0, data, "gfx/ob_pithy_seashore"] + - [0x86890, data] + - [0x869F0, data] - - [0x86EF0, rodata, "ob_painstaking_leg"] - - [0x87130, rodata, "ob_reach_bead"] - - [0x871C0, rodata, "ob_thick_turn"] + - [0x86EF0, rodata, "overlay_79730/ob_painstaking_leg"] + - [0x87130, rodata, "overlay_79730/ob_reach_bead"] + - [0x871C0, rodata, "overlay_79730/ob_thick_turn"] - { start: 0x87200, type: bss, vram: 0x801A8270 } @@ -533,31 +549,27 @@ segments: - { start: 0xDDF60, type: bss, vram: 0x801F1500 } - [0xDDF60, bin] - + # __SOME_OVERLAY_TABLE[2] - # - type: code - # dir: overlay_E48F0 - # start: 0xE48F0 - # vram: 0x80197B70 - # bss_size: 0x20 - # symbol_name_format: overlay_E48F0_$VRAM_$ROM - # exclusive_ram_id: test_overlapping - # subsegments: - # - [0xE48F0, asm] - # - [0xE4BE0, asm] - # - [0xE5960, asm, "speech"] + - type: code + dir: overlay_E48F0 + start: 0xE48F0 + vram: 0x80197B70 + bss_size: 0x20 + symbol_name_format: overlay_E48F0_$VRAM_$ROM + exclusive_ram_id: test_overlapping + # Complete + find_file_boundaries: False + subsegments: + - [0xE48F0, asm, "speech"] - # - [0xEAF00, data] + - [0xEAF00, rodata, "speech"] - # - [0xEAFE8, rodata] - - # - { start: 0xEBBB0, type: bss, vram: 0x8019EE30 } - - - [0xEBBB0, bin] + - { start: 0xEBBB0, type: bss, vram: 0x8019EE30 } # __SOME_OVERLAY_TABLE_3 - type: code - dir: overlay_EBBB0 + name: overlay_EBBB0 start: 0xEBBB0 vram: 0x8019EE50 bss_size: 0x310 @@ -566,14 +578,18 @@ segments: # Complete find_file_boundaries: False subsegments: - - [0xEBBB0, asm, "ob_noble_cabbage"] - - [0xED530, asm, "ob_overrated_spoon"] - - [0xF6340, asm, "ob_used_shop"] + - [0xEBBB0, asm, "overlay_EBBB0/ob_noble_cabbage"] + - [0xED530, asm, "overlay_EBBB0/ob_overrated_spoon"] + - [0xF6340, asm, "overlay_EBBB0/ob_used_shop"] - [0xF8550, data] + - [0xF9A70, data, "gfx/ob_macho_spoon"] + - [0xF9B40, data] + - [0xF9D90, data, "gfx/ob_terrible_curve"] + - [0xF9E60, data] - - [0xF9E70, rodata, "ob_noble_cabbage"] - - [0xF9EA0, rodata, "ob_overrated_spoon"] + - [0xF9E70, rodata, "overlay_EBBB0/ob_noble_cabbage"] + - [0xF9EA0, rodata, "overlay_EBBB0/ob_overrated_spoon"] - { start: 0xF9FF0, type: bss, vram: 0x801AD290 } diff --git a/symbol_addrs.txt b/symbol_addrs.txt index f7eaf4b..2310aeb 100644 --- a/symbol_addrs.txt +++ b/symbol_addrs.txt @@ -139,6 +139,18 @@ DISPLAY_LIST_801ACA00 = 0x801ACA00; // rom:0xF9760 DISPLAY_LIST_801ACD10 = 0x801ACD10; // rom:0xF9A70 DISPLAY_LIST_801AD030 = 0x801AD030; // rom:0xF9D90 +DISPLAY_LIST_801EE868 = 0x801EE868; // rom:0xDB2C8 +DISPLAY_LIST_801EE7E8 = 0x801EE7E8; // rom:0xDB248 +DISPLAY_LIST_801EEFE0 = 0x801EEFE0; // rom:0xDBA40 size:0x38 +DISPLAY_LIST_801EEFB0 = 0x801EEFB0; // rom:0xDBA10 + +DISPLAY_LIST_801A6F58 = 0x801A6F58; // rom:0x85EE8 +DISPLAY_LIST_801A7820 = 0x801A7820; // rom:0x867B0 +DISPLAY_LIST_801A79E8 = 0x801A79E8; // rom:0x86978 + +DISPLAY_LIST_801AB8B8 = 0x801AB8B8; // rom:0xF8618 +DISPLAY_LIST_801AB918 = 0x801AB918; // rom:0xF8678 + LIGHTS_801869A0 = 0x801869A0; // rom:0x5C8A0 size:40 __SOMETHING_FRAMEBUFFERS = 0x800A9EE0; // rom:0x3A2E0 size:0xC