diff options
Diffstat (limited to 'yamls')
| -rw-r--r-- | yamls/jp/assets.yaml | 17 | ||||
| -rw-r--r-- | yamls/jp/code.yaml | 7 | ||||
| -rw-r--r-- | yamls/jp/overlays.yaml | 18 |
3 files changed, 27 insertions, 15 deletions
diff --git a/yamls/jp/assets.yaml b/yamls/jp/assets.yaml index 065bdd6..a70ba8b 100644 --- a/yamls/jp/assets.yaml +++ b/yamls/jp/assets.yaml @@ -7034,12 +7034,23 @@ align: 0x1000 - [0x11E1A20] - - name: segment_011E2000 - type: bin + - name: data_combi + dir: combi + type: code start: 0x11E2000 - # vram: + vram: 0x06000000 + exclusive_ram_id: segment_06 compress: True align: 0x1000 + symbol_name_format: $VRAM_$ROM + subsegments: + - [auto, c, data_combi] + - start: 0x11E2000 + type: .data + name: data_combi + subsegments: + - [0x11E2000, combi, data_combi_table] + - [0x11E2684] - [0x11E2690] - name: segment_011E3000 diff --git a/yamls/jp/code.yaml b/yamls/jp/code.yaml index 4e12fab..c052055 100644 --- a/yamls/jp/code.yaml +++ b/yamls/jp/code.yaml @@ -71,7 +71,7 @@ - [0x6DA460, asm, code/6DA460] - [0x6DB420, c, code/m_private] - [0x6DE300, asm, code/6DE300] - - [0x6E08E0, asm, code/m_random_field] + - [0x6E0840, c, code/m_random_field] - [0x6E0F50, c, code/m_rcp] - [0x6E2300, c, code/m_room_type] - [0x6E30B0, c, code/m_scene_ftr] @@ -184,7 +184,8 @@ - [0x72F980, .data, code/m_player_call] - [0x72F9B0, data, code/72F9B0] - [0x7302C0, .data, code/m_private] - - [0x730320, data, code/730320] + - [0x730320, data, code/m_quest] + - [0x730360, .data, code/m_random_field] - [0x7307D0, .data, code/m_rcp] - [0x730B60, .data, code/m_room_type] - [0x731740, data, code/731740] @@ -257,7 +258,7 @@ - [0x73B0F0, rodata, code/73B0F0] - [0x73B130, .rodata, code/m_private] - [0x73B210, rodata, code/73B210] - - [0x73B250, rodata, code/73B250] + - [0x73B250, .rodata, code/m_random_field] - [0x73B360, .rodata, code/m_room_type] - [0x73B3E0, .rodata, code/m_scene_ftr] - [0x73B400, rodata, code/m_shop] diff --git a/yamls/jp/overlays.yaml b/yamls/jp/overlays.yaml index 9a28677..95ebcf5 100644 --- a/yamls/jp/overlays.yaml +++ b/yamls/jp/overlays.yaml @@ -1070,7 +1070,7 @@ subsegments: - [0x81A1A0, data, overlays/other_ovl/ovl__00815B70/ovl__00815B70_reloc] - - name: ovl__0081AA60 + - name: m_random_field_ovl type: code start: 0x81AA60 vram: 0x80922800 @@ -1078,24 +1078,24 @@ compress: True bss_size: 0x270 subsegments: - - [0x81AA60, asm, overlays/other_ovl/ovl__0081AA60/ovl__0081AA60] - - [0x81D2E0, data, overlays/other_ovl/ovl__0081AA60/ovl__0081AA60] - - [0x81D500, rodata, overlays/other_ovl/ovl__0081AA60/ovl__0081AA60] - - { start: 0x81D540, type: bss, vram: 0x809252E0, name: overlays/other_ovl/ovl__0081AA60/ovl__0081AA60 } - - name: ovl__0081AA60_reloc + - [0x81AA60, asm, overlays/other_ovl/m_random_field_ovl/m_random_field_ovl] + - [0x81D2E0, data, overlays/other_ovl/m_random_field_ovl/m_random_field_ovl] + - [0x81D500, rodata, overlays/other_ovl/m_random_field_ovl/m_random_field_ovl] + - { start: 0x81D540, type: bss, vram: 0x809252E0, name: overlays/other_ovl/m_random_field_ovl/m_random_field_ovl } + - name: m_random_field_ovl_reloc type: code start: 0x81D540 vram: 0x80925550 - follows_vram: ovl__0081AA60 + follows_vram: m_random_field_ovl compress: True subsegments: - - [0x81D540, data, overlays/other_ovl/ovl__0081AA60/ovl__0081AA60_reloc] + - [0x81D540, data, overlays/other_ovl/m_random_field_ovl/m_random_field_ovl_reloc] - name: ovl__0081D9D0 type: code start: 0x81D9D0 vram: 0x809259E0 - follows_vram: ovl__0081AA60_reloc + follows_vram: m_random_field_ovl_reloc compress: True bss_size: 0x4E0 subsegments: |