Compare commits
5 Commits
26f00605e9
...
4fec5e1726
| Author | SHA1 | Date |
|---|---|---|
gijs
|
4fec5e1726 | |
|
gijs
|
3ac868f6ac | |
|
gijs
|
f839da2581 | |
|
gijs
|
1c2a037909 | |
|
gijs
|
721b5a2236 |
|
|
@ -244,7 +244,7 @@ extern u8* __SOME_OVERLAY_ID_ARRAY[11];
|
|||
extern OverlayEntry __SOME_OVERLAY_TABLE[11];
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ void* field_0x0;
|
||||
/* 0x00 */ void (*setup)(void);
|
||||
/* 0x04 */ void* field_0x4;
|
||||
/* 0x08 */ void* field_0x8;
|
||||
/* 0x0c */ void* field_0xc;
|
||||
|
|
@ -257,10 +257,19 @@ extern OverlaySomething* (*D_800AF028[24])(void);
|
|||
|
||||
extern OverlaySomething* D_800E8294;
|
||||
|
||||
extern OverlaySomething __OVERLAY_INFO_79730_65C50;
|
||||
extern OverlaySomething __OVERLAY_INFO_87200_65C64;
|
||||
extern OverlaySomething __OVERLAY_INFO_87200_65C78;
|
||||
extern OverlaySomething __OVERLAY_INFO_71280_65C8C;
|
||||
extern OverlaySomething __OVERLAY_INFO_71280_65CA0;
|
||||
|
||||
extern OverlaySomething *__get_overlay_info_71280_65C8C(void);
|
||||
|
||||
extern void __setup_overlay_79730(void);
|
||||
extern void __setup_overlay_87200(void);
|
||||
extern void __setup_overlay_71280_51674(void);
|
||||
extern void __setup_overlay_71280_51940(void);
|
||||
|
||||
extern u8* func_80076188(void);
|
||||
extern void func_80076194(void);
|
||||
extern void func_800761A4(void);
|
||||
|
|
|
|||
44
splat.yaml
44
splat.yaml
|
|
@ -573,35 +573,39 @@ segments:
|
|||
- { start: 0x87200, type: bss, vram: 0x801A8270 }
|
||||
|
||||
- type: code
|
||||
dir: overlay_87200
|
||||
name: overlay_87200
|
||||
start: 0x87200
|
||||
vram: 0x8019A7A0
|
||||
bss_size: 0x0
|
||||
symbol_name_format: overlay_87200_$VRAM_$ROM
|
||||
exclusive_ram_id: test_overlapping
|
||||
# Complete
|
||||
find_file_boundaries: False
|
||||
subsegments:
|
||||
- [0x87200, c, "_ob_tasteless_knife"]
|
||||
- [0xAE2A0, c, "_ob_obscene_pizzas"]
|
||||
- [0xB48F0, c, "_ob_great_flight"]
|
||||
- [0xB8DE0, c, "_ob_clever_island"]
|
||||
- [0xBA2C0, c, "_ob_orange_run"]
|
||||
- [0xC15F0, c, "_ob_marked_poison"]
|
||||
- [0xC2330, c, "_ob_flimsy_key"]
|
||||
- [0xC3F50, c, "_ob_fuzzy_kittens"]
|
||||
- [0xC4A40, c, "_ob_acidic_size"]
|
||||
- [0xC54C0, c, "_ob_stiff_fact"]
|
||||
- [0xD0380, c, "_ob_venomous_harmony"]
|
||||
- [0x87200, c, "overlay_87200/_ob_tasteless_knife"]
|
||||
- [0xAE2A0, c, "overlay_87200/_ob_obscene_pizzas"]
|
||||
- [0xB48F0, c, "overlay_87200/_ob_great_flight"]
|
||||
- [0xB8DE0, c, "overlay_87200/_ob_clever_island"]
|
||||
- [0xBA2C0, c, "overlay_87200/_ob_orange_run"]
|
||||
- [0xC15F0, c, "overlay_87200/_ob_marked_poison"]
|
||||
- [0xC2330, c, "overlay_87200/_ob_flimsy_key"]
|
||||
- [0xC3F50, c, "overlay_87200/_ob_fuzzy_kittens"]
|
||||
- [0xC4A40, c, "overlay_87200/_ob_acidic_size"]
|
||||
- [0xC54C0, c, "overlay_87200/_ob_stiff_fact"]
|
||||
- [0xD0380, c, "overlay_87200/_ob_venomous_harmony"]
|
||||
|
||||
- [0xDAB20, data]
|
||||
- [0xDBA10, data, "gfx/_ob_malicious_zipper"]
|
||||
- [0xDBA40, data]
|
||||
|
||||
- [0xDC3A0, .rodata, "_ob_tasteless_knife"]
|
||||
- [0xDC490, .rodata, "_ob_obscene_pizzas"]
|
||||
- [0xDC5B0, .rodata, "_ob_clever_island"]
|
||||
- [0xDC5D0, .rodata, "_ob_orange_run"]
|
||||
- [0xDC660, .rodata, "_ob_fuzzy_kittens"]
|
||||
- [0xDC690, .rodata, "_ob_acidic_size"]
|
||||
- [0xDC6D0, .rodata, "_ob_stiff_fact"]
|
||||
- [0xDCFC0, .rodata, "_ob_venomous_harmony"]
|
||||
- [0xDC3A0, .rodata, "overlay_87200/_ob_tasteless_knife"]
|
||||
- [0xDC490, .rodata, "overlay_87200/_ob_obscene_pizzas"]
|
||||
- [0xDC5B0, .rodata, "overlay_87200/_ob_clever_island"]
|
||||
- [0xDC5D0, .rodata, "overlay_87200/_ob_orange_run"]
|
||||
- [0xDC660, .rodata, "overlay_87200/_ob_fuzzy_kittens"]
|
||||
- [0xDC690, .rodata, "overlay_87200/_ob_acidic_size"]
|
||||
- [0xDC6D0, .rodata, "overlay_87200/_ob_stiff_fact"]
|
||||
- [0xDCFC0, .rodata, "overlay_87200/_ob_venomous_harmony"]
|
||||
|
||||
- { start: 0xDDF60, type: bss, vram: 0x801F1500 }
|
||||
|
||||
|
|
|
|||
117
src/514B0.c
117
src/514B0.c
|
|
@ -1,117 +0,0 @@
|
|||
#include "common.h"
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017B5B0);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017B5BC);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017B5E0);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", __setup_overlay_79730);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", __setup_overlay_87200);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", __setup_overlay_71280);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017B838);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017B9A8);
|
||||
|
||||
void func_8017BA2C(void) { }
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BA34);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BA40);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BB08);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BB34);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BB50);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BD48);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BDC0);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BED4);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BF10);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017BFB0);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017C074);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017C24C);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017C29C);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017C2FC);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017C384);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017C4B4);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017C584);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017CBE8);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017D6D0);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017E264);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017E80C);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017EAE8);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017EC84);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017EE64);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017EF24);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F010);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F114);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F214);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F334);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F36C);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F3C0);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F408);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F490);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017F554);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017FAF8);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_8017FC28);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_801805B4);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_801805D0);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", __handle_name_input);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_80180B1C);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_80180BDC);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_80181498);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_801814AC);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_80181504);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_801818A0);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_80181C2C);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_80182578);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_80184130);
|
||||
|
||||
INCLUDE_ASM(const s32, "514B0", func_801841F4);
|
||||
|
|
@ -1,10 +1,5 @@
|
|||
#include "common.h"
|
||||
|
||||
extern u32 __setup_overlay_79730[];
|
||||
extern u32 __setup_overlay_87200[];
|
||||
extern u32 __setup_overlay_71280_51674[];
|
||||
extern u32 __setup_overlay_71280_51940[];
|
||||
|
||||
extern u32 func_8017B838[];
|
||||
extern u32 func_8017B9A8[];
|
||||
extern u32 func_8017BA2C[];
|
||||
|
|
|
|||
|
|
@ -4,9 +4,23 @@ extern void func_801C1990();
|
|||
extern void func_8019A7A0();
|
||||
extern u32 D_801977C8;
|
||||
|
||||
INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B5B0);
|
||||
extern u8 D_801936E0;
|
||||
|
||||
INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B5BC);
|
||||
/* 514B0 8017B5B0 */
|
||||
OverlaySomething *func_8017B5B0(void) {
|
||||
return &__OVERLAY_INFO_79730_65C50;
|
||||
}
|
||||
|
||||
/* 514BC 8017B5BC */
|
||||
OverlaySomething* func_8017B5BC(void) {
|
||||
OverlaySomething* ret;
|
||||
|
||||
ret = &__OVERLAY_INFO_87200_65C64;
|
||||
if (D_801936E0 != 0)
|
||||
ret = &__OVERLAY_INFO_87200_65C78;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* 514E0 8017B5E0 */
|
||||
OverlaySomething *__get_overlay_info_71280_65C8C(void) {
|
||||
|
|
@ -105,10 +119,12 @@ INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B838);
|
|||
|
||||
INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017B9A8);
|
||||
|
||||
void func_8017BA2C(void) {
|
||||
}
|
||||
void func_8017BA2C(void) { }
|
||||
|
||||
INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", func_8017BA34);
|
||||
/* 51934 8017BA34 */
|
||||
OverlaySomething *func_8017BA34(void) {
|
||||
return &__OVERLAY_INFO_71280_65CA0;
|
||||
}
|
||||
|
||||
INCLUDE_ASM(const s32, "segment_obdata/_ob_squeamish_mask", __setup_overlay_71280_51940);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue