diff --git a/splat.yaml b/splat.yaml index d8510db..d15f1a0 100644 --- a/splat.yaml +++ b/splat.yaml @@ -726,40 +726,32 @@ segments: - [0x145210, bin] - # # __SOME_OVERLAY_TABLE[8] - # - type: code - # dir: overlay_145210 - # start: 0x145210 - # vram: 0x801F4030 - # bss_size: 0x70 - # symbol_name_format: overlay_145210_$VRAM_$ROM - # exclusive_ram_id: test_overlapping - # subsegments: - # - [0x145210, asm] - # - [0x145290, asm] - # - [0x149A80, asm] - # - [0x14AB50, asm] + # __SOME_OVERLAY_TABLE[8] + - type: code + name: overlay_145210 + start: 0x145210 + vram: 0x801F4030 + bss_size: 0x70 + symbol_name_format: overlay_145210_$VRAM_$ROM + exclusive_ram_id: test_overlapping + subsegments: + - [0x145210, c, "overlay_145210/_ob_weak_church"] + - [0x145290, c, "overlay_145210/_ob_shivering_chalk"] + - [0x145EB0, c, "overlay_145210/_ob_hypnotic_lamp"] + - [0x149A80, c, "overlay_145210/_ob_posh_guitar"] + - [0x14AB50, c, "overlay_145210/_ob_terrible_event"] - # - [0x14DE90, data] - # - [0x14E120, data] - # - [0x14E150, data] - # - [0x14E1A0, data] - # - [0x14E370, data] - - # - [0x14E3E0, data] - # # - [0x14E3E0, .data, "vert"] - # # - [0x14E460, .data, "vert"] - # - [0x14E530, data] - # - [0x14E5B0, data] - # - [0x14E5E0, data] + - [0x14DE90, data] + - [0x14E3E0, .data, "vtx/_ob_abundant_frogs"] + - [0x14E530, data] - # - [0x14E720, rodata] - # - [0x14E790, rodata] - # - [0x14E920, rodata] - # - [0x14EAC0, rodata] - # - [0x14EBA0, rodata] + - [0x14EA70, .rodata, "overlay_145210/_ob_shivering_chalk"] + - [0x14EAC0, .rodata, "overlay_145210/_ob_hypnotic_lamp"] + - [0x14EBA0, .rodata, "overlay_145210/_ob_posh_guitar"] - # - { start: 0x14EBE0, type: bss, vram: 0x801FDA00 } + - { start: 0x14EBE0, type: bss, vram: 0x801FDA00 } + + - [0x14EBE0, bin] # # __SOME_OVERLAY_TABLE[9] # - type: code diff --git a/src/overlay_145210/_ob_hypnotic_lamp.c b/src/overlay_145210/_ob_hypnotic_lamp.c new file mode 100644 index 0000000..356474f --- /dev/null +++ b/src/overlay_145210/_ob_hypnotic_lamp.c @@ -0,0 +1,76 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F4CD0_145EB0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F4EB4_146094); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F4ED8_1460B8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F4FF4_1461D4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F503C_14621C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F50F0_1462D0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F5504_1466E4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F5550_146730); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F57D0_1469B0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F5AD0_146CB0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F5C74_146E54); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F5D28_146F08); + +INCLUDE_RODATA(const s32, "overlay_145210/_ob_hypnotic_lamp", D_overlay_145210_801FD958_14EB38); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F5E94_147074); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F632C_14750C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6540_147720); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F67F0_1479D0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F69A0_147B80); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F69FC_147BDC); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6B64_147D44); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6BC0_147DA0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6C48_147E28); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6CB4_147E94); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6D3C_147F1C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6DC8_147FA8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6DD8_147FB8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F6E14_147FF4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F7684_148864); + +INCLUDE_RODATA(const s32, "overlay_145210/_ob_hypnotic_lamp", D_overlay_145210_801FD9A0_14EB80); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F7C40_148E20); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F83F4_1495D4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F8510_1496F0); + +void func_overlay_145210_801F85F0_1497D0(void) { +} + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F85F8_1497D8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F86A8_149888); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F8774_149954); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_hypnotic_lamp", func_overlay_145210_801F8830_149A10); diff --git a/src/overlay_145210/_ob_posh_guitar.c b/src/overlay_145210/_ob_posh_guitar.c new file mode 100644 index 0000000..b3b2ac7 --- /dev/null +++ b/src/overlay_145210/_ob_posh_guitar.c @@ -0,0 +1,35 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F88A0_149A80); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F8BD0_149DB0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F8F04_14A0E4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F9188_14A368); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F940C_14A5EC); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F95F8_14A7D8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F96A0_14A880); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F9700_14A8E0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F9770_14A950); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F9860_14AA40); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_posh_guitar", func_overlay_145210_801F988C_14AA6C); + +INCLUDE_RODATA(const s32, "overlay_145210/_ob_posh_guitar", D_overlay_145210_801FD9D4_14EBB4); + +INCLUDE_RODATA(const s32, "overlay_145210/_ob_posh_guitar", D_overlay_145210_801FD9E0_14EBC0); + +INCLUDE_RODATA(const s32, "overlay_145210/_ob_posh_guitar", D_overlay_145210_801FD9E4_14EBC4); + +INCLUDE_RODATA(const s32, "overlay_145210/_ob_posh_guitar", D_overlay_145210_801FD9E8_14EBC8); + +INCLUDE_RODATA(const s32, "overlay_145210/_ob_posh_guitar", D_overlay_145210_801FD9EC_14EBCC); + +INCLUDE_RODATA(const s32, "overlay_145210/_ob_posh_guitar", D_overlay_145210_801FD9F0_14EBD0); diff --git a/src/overlay_145210/_ob_shivering_chalk.c b/src/overlay_145210/_ob_shivering_chalk.c new file mode 100644 index 0000000..7630e5f --- /dev/null +++ b/src/overlay_145210/_ob_shivering_chalk.c @@ -0,0 +1,51 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F40B0_145290); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4208_1453E8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4358_145538); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4578_145758); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F45D0_1457B0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4638_145818); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4734_145914); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F477C_14595C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F47C4_1459A4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F480C_1459EC); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4960_145B40); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4A34_145C14); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4A6C_145C4C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4AD0_145CB0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4B14_145CF4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4B38_145D18); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4B5C_145D3C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4BBC_145D9C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4BE8_145DC8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4BF0_145DD0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4BF8_145DD8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4C04_145DE4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4C18_145DF8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4C24_145E04); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_shivering_chalk", func_overlay_145210_801F4C38_145E18); diff --git a/src/overlay_145210/_ob_terrible_event.c b/src/overlay_145210/_ob_terrible_event.c new file mode 100644 index 0000000..3afe7fb --- /dev/null +++ b/src/overlay_145210/_ob_terrible_event.c @@ -0,0 +1,25 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801F9970_14AB50); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801F9EC8_14B0A8); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FA6F0_14B8D0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FAB04_14BCE4); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FAE24_14C004); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FB174_14C354); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FB3BC_14C59C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FBAAC_14CC8C); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FBE70_14D050); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FC230_14D410); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FC610_14D7F0); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_terrible_event", func_overlay_145210_801FC998_14DB78); diff --git a/src/overlay_145210/_ob_weak_church.c b/src/overlay_145210/_ob_weak_church.c new file mode 100644 index 0000000..ee47c9d --- /dev/null +++ b/src/overlay_145210/_ob_weak_church.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(const s32, "overlay_145210/_ob_weak_church", func_overlay_145210_801F4030_145210); + +INCLUDE_ASM(const s32, "overlay_145210/_ob_weak_church", func_overlay_145210_801F40A0_145280); diff --git a/src/overlay_145210/vert.c b/src/vtx/_ob_abundant_frogs.c similarity index 94% rename from src/overlay_145210/vert.c rename to src/vtx/_ob_abundant_frogs.c index 05b7ebf..266d9df 100644 --- a/src/overlay_145210/vert.c +++ b/src/vtx/_ob_abundant_frogs.c @@ -16,7 +16,7 @@ Vtx VTX_801FD200[] = { /* 14E460 801FD280 */ Gfx DISPLAY_LIST_801FD280[] = { - gsSPVertex(0x801FD200, 8, 0), + gsSPVertex(VTX_801FD200, 8, 0), gsSP2Triangles(0, 1, 6, 0, 0, 6, 7, 0), gsSP2Triangles(1, 2, 5, 0, 1, 5, 6, 0), gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0), @@ -37,7 +37,7 @@ Vtx VTX_801FD2A8[] = { /* 14E508 801FD328 */ Gfx DISPLAY_LIST_801FD328[] = { - gsSPVertex(0x801FD2A8, 8, 0), + gsSPVertex(VTX_801FD2A8, 8, 0), gsSP2Triangles(0, 1, 6, 0, 0, 6, 7, 0), gsSP2Triangles(1, 2, 5, 0, 1, 5, 6, 0), gsSP2Triangles(2, 3, 4, 0, 2, 4, 5, 0),