Game-Decompilation/sf64
1
0
Fork 0
mirror of https://github.com/sonicdcer/sf64.git synced 2024-11-23 04:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

give EU a symbol addrs file (#256)

Browse Source 
* srceu

* remove warning

* and some cleanup

* symbol addrs for eu

* data

* one cleanup

* move macros to header
This commit is contained in:
petrie911 2024-05-18 23:27:17 -05:00 committed by GitHub
parent 80eaf7d2e5
commit 53c05e51a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 11324 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/sf64dma.h
View File

@ -64,6 +64,18 @@
#define SEGMENT_BSS_END(segment) (segment ## _BSS_END)
#define SEGMENT_BSS_SIZE(segment) ((uintptr_t)SEGMENT_BSS_END(segment) - (uintptr_t)SEGMENT_BSS_START(segment))
#define ROM_SEGMENT(file) { SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }
#define OVERLAY_OFFSETS(file) \
{ { SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }, \
{ SEGMENT_BSS_START(file), SEGMENT_BSS_END(file) }, \
{ SEGMENT_TEXT_START(file), SEGMENT_TEXT_END(file) }, \
{ SEGMENT_DATA_START(file), SEGMENT_RODATA_END(file) } }
#define NO_SEGMENT { NULL, NULL }
#define NO_OVERLAY { NO_SEGMENT, NO_SEGMENT, NO_SEGMENT, NO_SEGMENT }
u8 Load_SceneSetup(u8 sceneId, u8 sceneSetup);
void Load_InitDmaAndMsg(void);
@ -92,6 +104,9 @@ typedef struct {
/* 0xC */ bool compFlag;
} DmaEntry; // size = 0x10;
#define DMA_ENTRY(file) { file##_ROM_START, { file##_ROM_START, file##_ROM_END }, false }
#define DMA_ENTRY_NONE { NULL, { NULL, NULL }, false }
extern DmaEntry gDmaTable[]; // 178A70
DECLARE_SEGMENT(makerom);

9161
linker_scripts/eu/rev0/symbol_addrs.txt Normal file
View File

File diff suppressed because it is too large Load Diff

1043
linker_scripts/eu/rev0/symbol_addrs_assets.txt Normal file
View File

File diff suppressed because it is too large Load Diff

8
linker_scripts/eu/rev0/symbol_addrs_fix.txt
View File

@ -33,6 +33,8 @@ D_80170000 = 0x80170000; //ignore:true
D_80170001 = 0x80170001; //ignore:true
D_80180001 = 0x80180001; //ignore:True
D_80180058 = 0x80180058; //ignore:True
D_801D0001 = 0x801D0001; //ignore:True
D_801C0130 = 0x801C0130; //ignore:True
// mirage symbols
D_3000000 = 0x3000000; //ignore:true
@ -48,6 +50,7 @@ aspMainTextStart = 0x800005A0;//name_end:aspMainTextEnd
gspF3DEX_fifoTextStart = 0x80001490;//name_end:gspF3DEX_fifoTextEnd
gspF3DEX_fifoDataStart = 0x800C4980; //name_end:gspF3DEX_fifoDataEnd
aspMainDataStart = 0x800C3E70; //name_end:aspMainDataEnd
altIPL3Start = 0x8001F090;
// redundant rodata
D_800D63EC = 0x800D63EC; //force_migration:true
@ -89,13 +92,14 @@ D_C000000C = 0xC000000C;//ignore:true
sSamplesPerWavePeriod = 0x800C63E8; //size:0x4 type:u8
sOvlUnused_Unk = 0x800CCBAC;
D_800D6994 = 0x800D6994;
D_80161A91 = 0x80161A91;
D_801BE59C = 0x801BE59C; //segment:ovl_i5
// fake symbol removal
D_800CCC44 = 0x800CCC44; //size:0x98
gDmaTable = 0x8017ABE0; //size:0x650
// that stupid thing where i6 sets a value in ending
D_i6_8019A490 = 0x8019A490; //ignore:true segment:ovl_i6
// dma symbols
dma_table_ROM_START = 0xE0570;
audio_seq_ROM_START = 0xE0BC0;

194
linker_scripts/eu/rev0/undefined_syms.ld
View File

@ -1041,197 +1041,3 @@ D_F00F200 = 0xF00F200;
D_F0103D0 = 0xF0103D0;
D_F014180 = 0xF014180;
D_F014310 = 0xF014310;
D_8018751C = 0x8018751C;
D_80187ED8 = 0x80187ED8;
D_801897B4 = 0x801897B4;
D_8019DA68 = 0x8019DA68;
D_801A27E0 = 0x801A27E0;
D_801A3CC0 = 0x801A3CC0;
D_801AB968 = 0x801AB968;
D_801AB970 = 0x801AB970;
D_801AB978 = 0x801AB978;
D_801AB980 = 0x801AB980;
D_801AB988 = 0x801AB988;
D_801BAE4C = 0x801BAE4C;
D_801BAFC4 = 0x801BAFC4;
D_801BB048 = 0x801BB048;
D_801BB0DC = 0x801BB0DC;
D_801BDC28 = 0x801BDC28;
D_801C1C88 = 0x801C1C88;
D_801C1C90 = 0x801C1C90;
D_801C1C94 = 0x801C1C94;
D_801C1CAC = 0x801C1CAC;
D_801C1CB8 = 0x801C1CB8;
D_801C1CBC = 0x801C1CBC;
D_801C1CD4 = 0x801C1CD4;
D_801C1CDC = 0x801C1CDC;
D_801C1D32 = 0x801C1D32;
D_801C7BE8 = 0x801C7BE8;
D_801D1BC8 = 0x801D1BC8;
D_801D1BD0 = 0x801D1BD0;
D_801D1BD4 = 0x801D1BD4;
D_801D1BD8 = 0x801D1BD8;
D_801D1BDC = 0x801D1BDC;
func_80025E38 = 0x80025E38;
func_800C227C = 0x800C227C;
func_800C2284 = 0x800C2284;
func_8018B020 = 0x8018B020;
func_8018B030 = 0x8018B030;
func_8018B19C = 0x8018B19C;
func_8018B254 = 0x8018B254;
func_8018B3A8 = 0x8018B3A8;
func_8018B3D8 = 0x8018B3D8;
func_8018B460 = 0x8018B460;
func_8018B608 = 0x8018B608;
func_8018BDC8 = 0x8018BDC8;
func_8018C3F4 = 0x8018C3F4;
func_8018C53C = 0x8018C53C;
func_8018CA10 = 0x8018CA10;
func_8018CC00 = 0x8018CC00;
func_8018CD14 = 0x8018CD14;
func_8018D660 = 0x8018D660;
func_8018E458 = 0x8018E458;
func_8018E5D8 = 0x8018E5D8;
func_8018E8A4 = 0x8018E8A4;
func_8018EB6C = 0x8018EB6C;
func_8018F200 = 0x8018F200;
func_8018F44C = 0x8018F44C;
func_8018F494 = 0x8018F494;
func_8018F8AC = 0x8018F8AC;
func_8018F934 = 0x8018F934;
func_8018FA90 = 0x8018FA90;
func_8018FBB8 = 0x8018FBB8;
func_8018FE64 = 0x8018FE64;
func_801907C8 = 0x801907C8;
func_8019085C = 0x8019085C;
func_80190C40 = 0x80190C40;
func_80191534 = 0x80191534;
func_80191A50 = 0x80191A50;
func_80191B88 = 0x80191B88;
func_80191E90 = 0x80191E90;
func_80191EAC = 0x80191EAC;
func_801920C8 = 0x801920C8;
func_8019284C = 0x8019284C;
func_80192890 = 0x80192890;
func_80192998 = 0x80192998;
func_80192AD0 = 0x80192AD0;
func_80192BB8 = 0x80192BB8;
func_801932F4 = 0x801932F4;
func_8019337C = 0x8019337C;
func_80193528 = 0x80193528;
func_80193BCC = 0x80193BCC;
func_80193F00 = 0x80193F00;
func_801949D8 = 0x801949D8;
func_80194BE0 = 0x80194BE0;
func_80195074 = 0x80195074;
func_80195688 = 0x80195688;
func_801958F8 = 0x801958F8;
func_80195C84 = 0x80195C84;
func_80195F7C = 0x80195F7C;
func_80196720 = 0x80196720;
func_80196840 = 0x80196840;
func_80196914 = 0x80196914;
func_80196D7C = 0x80196D7C;
func_80196E24 = 0x80196E24;
func_8019703C = 0x8019703C;
func_801974FC = 0x801974FC;
func_801976C0 = 0x801976C0;
func_8019771C = 0x8019771C;
func_801981F4 = 0x801981F4;
func_801998F4 = 0x801998F4;
func_80199C5C = 0x80199C5C;
func_80199DC4 = 0x80199DC4;
func_8019A3FC = 0x8019A3FC;
func_8019A68C = 0x8019A68C;
func_8019A81C = 0x8019A81C;
func_8019ACBC = 0x8019ACBC;
func_8019B744 = 0x8019B744;
func_8019B930 = 0x8019B930;
func_8019BD70 = 0x8019BD70;
func_8019BFE8 = 0x8019BFE8;
func_8019BFF4 = 0x8019BFF4;
func_8019C0AC = 0x8019C0AC;
func_8019C318 = 0x8019C318;
func_8019C340 = 0x8019C340;
func_8019C360 = 0x8019C360;
func_8019C6B0 = 0x8019C6B0;
func_8019CB88 = 0x8019CB88;
func_8019CEFC = 0x8019CEFC;
func_8019D2D0 = 0x8019D2D0;
func_8019D3D0 = 0x8019D3D0;
func_8019D630 = 0x8019D630;
func_8019DA3C = 0x8019DA3C;
func_8019E548 = 0x8019E548;
func_8019EC80 = 0x8019EC80;
func_8019F2A0 = 0x8019F2A0;
func_8019F408 = 0x8019F408;
func_8019FC90 = 0x8019FC90;
func_801A01F8 = 0x801A01F8;
func_801A0AF0 = 0x801A0AF0;
func_801A0EB8 = 0x801A0EB8;
func_801A1204 = 0x801A1204;
func_801A1680 = 0x801A1680;
func_801A2070 = 0x801A2070;
func_801A2338 = 0x801A2338;
func_801A23C0 = 0x801A23C0;
func_801A2474 = 0x801A2474;
func_801A2898 = 0x801A2898;
func_801A391C = 0x801A391C;
func_801A3ED0 = 0x801A3ED0;
func_801A44DC = 0x801A44DC;
func_801A4B74 = 0x801A4B74;
func_801A6DA0 = 0x801A6DA0;
func_801A7230 = 0x801A7230;
func_801A75F0 = 0x801A75F0;
func_801A76C0 = 0x801A76C0;
func_801A7910 = 0x801A7910;
func_801A8100 = 0x801A8100;
func_801A8598 = 0x801A8598;
func_801A86CC = 0x801A86CC;
func_801A906C = 0x801A906C;
func_801A94E4 = 0x801A94E4;
func_801A98C4 = 0x801A98C4;
func_801A99D0 = 0x801A99D0;
func_801A9B74 = 0x801A9B74;
func_801A9BCC = 0x801A9BCC;
func_801AA078 = 0x801AA078;
func_801AB3C8 = 0x801AB3C8;
func_801AB830 = 0x801AB830;
func_801AC670 = 0x801AC670;
func_801AD2A4 = 0x801AD2A4;
func_801ADC8C = 0x801ADC8C;
func_801AE368 = 0x801AE368;
func_801AE778 = 0x801AE778;
func_801AF430 = 0x801AF430;
func_801AF4C0 = 0x801AF4C0;
func_801AFCF4 = 0x801AFCF4;
func_801B01D4 = 0x801B01D4;
func_801B0328 = 0x801B0328;
func_801B0634 = 0x801B0634;
func_801B08D0 = 0x801B08D0;
func_801B0A3C = 0x801B0A3C;
func_801B0B00 = 0x801B0B00;
func_801B0BC4 = 0x801B0BC4;
func_801B0DA8 = 0x801B0DA8;
func_801B1108 = 0x801B1108;
func_801B1E2C = 0x801B1E2C;
func_801B3374 = 0x801B3374;
func_801B3474 = 0x801B3474;
func_801B4B6C = 0x801B4B6C;
func_801B6314 = 0x801B6314;
func_801B775C = 0x801B775C;
func_801B8B50 = 0x801B8B50;
func_801B92EC = 0x801B92EC;
func_801B9DA4 = 0x801B9DA4;
func_801BA52C = 0x801BA52C;
func_801BA860 = 0x801BA860;
func_801BA8B4 = 0x801BA8B4;
func_801BB550 = 0x801BB550;
func_801BDFDC = 0x801BDFDC;
func_801BECCC = 0x801BECCC;
func_801C1974 = 0x801C1974;
func_801C1A94 = 0x801C1A94;
func_801C1B50 = 0x801C1B50;
func_801C26E0 = 0x801C26E0;

1088
linker_scripts/jp/rev0/symbol_addrs_assets.txt Normal file
View File

File diff suppressed because it is too large Load Diff

5
src/dmatable.c
View File

@ -1,10 +1,5 @@
#include "sf64dma.h"
#define DMA_ENTRY(file) \
{ file##_ROM_START, { file##_ROM_START, file##_ROM_END }, false }
#define DMA_ENTRY_NONE \
{ NULL, { NULL, NULL }, false }
DmaEntry gDmaTable[90] = {
DMA_ENTRY(makerom),
DMA_ENTRY(main),

21
src/engine/fox_load_inits.c
View File

@ -1,26 +1,5 @@
#include "sf64dma.h"
#define NO_SEGMENT \
{ NULL, NULL }
#define OVERLAY_OFFSETS(file) \
{ \
{ SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }, { SEGMENT_BSS_START(file), SEGMENT_BSS_END(file) }, \
{ SEGMENT_TEXT_START(file), SEGMENT_TEXT_END(file) }, { \
SEGMENT_DATA_START(file), SEGMENT_RODATA_END(file) \
} \
}
#define NO_OVERLAY \
{ \
{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { \
NULL, NULL \
} \
}
#define ROM_SEGMENT(file) \
{ SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }
Scene sNoOvl_Logo[1] = {
{ NO_OVERLAY,
{ /* 0x1 */ NO_SEGMENT,

5
srceu/dmatable.c
View File

@ -1,10 +1,5 @@
#include "sf64dma.h"
#define DMA_ENTRY(file) \
{ file##_ROM_START, { file##_ROM_START, file##_ROM_END }, false }
#define DMA_ENTRY_NONE \
{ NULL, { NULL, NULL }, false }
DmaEntry gDmaTable[101] = {
DMA_ENTRY(makerom),
DMA_ENTRY(main),

16
srceu/engine/fox_load_inits.c
View File

@ -1,21 +1,5 @@
#include "sf64dma.h"
#define NO_SEGMENT \
{ NULL, NULL }
#define OVERLAY_OFFSETS(file) \
{ \
{ SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }, { SEGMENT_BSS_START(file), SEGMENT_BSS_END(file) }, \
{ SEGMENT_TEXT_START(file), SEGMENT_TEXT_END(file) }, \
{ SEGMENT_DATA_START(file), SEGMENT_RODATA_END(file) }, \
}
#define NO_OVERLAY \
{ NO_SEGMENT, NO_SEGMENT, NO_SEGMENT, NO_SEGMENT }
#define ROM_SEGMENT(file) \
{ SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }
Scene D_800CAFC4[1] = {
{ NO_OVERLAY,
{ /* 1 */ NO_SEGMENT,

6
srceu/engine/fox_versus.c
View File

@ -125,6 +125,12 @@ void func_800BE708(void) {
#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_versus/func_800C2220.s")
void func_800C227C(void) {
}
void func_800C2284(void) {
}
#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_versus/func_800C228C.s")
#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_versus/func_800C29BC.s")

5
srcjp/dmatable.c
View File

@ -1,10 +1,5 @@
#include "sf64dma.h"
#define DMA_ENTRY(file) \
{ file##_ROM_START, { file##_ROM_START, file##_ROM_END }, false }
#define DMA_ENTRY_NONE \
{ NULL, { NULL, NULL }, false }
DmaEntry gDmaTable[89] = {
DMA_ENTRY(makerom),
DMA_ENTRY(main),

21
srcjp/engine/fox_load_inits.c
View File

@ -1,26 +1,5 @@
#include "sf64dma.h"
#define NO_SEGMENT \
{ NULL, NULL }
#define OVERLAY_OFFSETS(file) \
{ \
{ SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }, { SEGMENT_BSS_START(file), SEGMENT_BSS_END(file) }, \
{ SEGMENT_TEXT_START(file), SEGMENT_TEXT_END(file) }, { \
SEGMENT_DATA_START(file), SEGMENT_RODATA_END(file) \
} \
}
#define NO_OVERLAY \
{ \
{ NULL, NULL }, { NULL, NULL }, { NULL, NULL }, { \
NULL, NULL \
} \
}
#define ROM_SEGMENT(file) \
{ SEGMENT_ROM_START(file), SEGMENT_ROM_END(file) }
Scene sNoOvl_Logo[1] = {
{ NO_OVERLAY,
{ /* 0x1 */ NO_SEGMENT,

1
yamls/eu/rev0/header.yaml
View File

@ -16,6 +16,7 @@ options:
symbol_addrs_path:
- linker_scripts/eu/rev0/symbol_addrs.txt
- linker_scripts/eu/rev0/symbol_addrs_fix.txt
- linker_scripts/eu/rev0/symbol_addrs_assets.txt
asm_path: asm/eu/rev0
src_path: srceu

3
yamls/eu/rev0/main.yaml
View File

@ -87,6 +87,8 @@
- [0x25E10, asm]
- [0x25EC0, asm]
- [0x25FC0, asm]
- [0x26000, asm] # exceptasm
- [0x26D80, asm]
- [0x270F0, asm]
- [0x27980, asm]
- [0x27BF0, asm]
@ -272,7 +274,6 @@
- [0xDB420, .rodata, engine/fox_save]
# Common assets
- [0xDB490, data, common]
- [0xDB490, data, fox_shapes]
- [0xDCC70, data, fox_wheels]
- [0xDDA10, data, fox_msg_textures]

2
yamls/eu/rev0/overlays.yaml
View File

@ -185,7 +185,7 @@
start: 0xEBC490
vram: 0x8018B020
follows_vram: ast_radio_de
bss_size: 0x173A0
bss_size: 0x173C0
symbol_name_format: menu_$VRAM
subsegments:
- [0xEBC490, c, fox_i_menu]

1
yamls/jp/rev0/header.yaml
View File

@ -16,6 +16,7 @@ options:
symbol_addrs_path:
- linker_scripts/jp/rev0/symbol_addrs.txt
- linker_scripts/jp/rev0/symbol_addrs_fix.txt
- linker_scripts/jp/rev0/symbol_addrs_assets.txt
asm_path: asm/jp/rev0
src_path: srcjp