Link every linkable object in 0-01, no common-bss splits yet

This commit is contained in:
Phillip Stephens 2024-12-21 02:16:00 -08:00
parent 79766a5dd0
commit d76ff1446d
6 changed files with 1075 additions and 1052 deletions

View File

@ -16808,7 +16808,7 @@ lbl_803CD2A4 = .rodata:0x803CD2A4; // type:object size:0x14 data:4byte
lbl_803CD2B8 = .rodata:0x803CD2B8; // type:object size:0x10 data:4byte
lbl_803CD2C8 = .rodata:0x803CD2C8; // type:object size:0x10 data:4byte
lbl_803CD2D8 = .rodata:0x803CD2D8; // type:object size:0x310
lbl_803CD5E8 = .rodata:0x803CD5E8; // type:object size:0x10
@stringBase0 = .rodata:0x803CD5E8; // type:object size:0x10 scope:local data:string_table
lbl_803CD5F8 = .rodata:0x803CD5F8; // type:object size:0x8
lbl_803CD600 = .rodata:0x803CD600; // type:object size:0x28
lbl_803CD628 = .rodata:0x803CD628; // type:object size:0x8
@ -16989,7 +16989,7 @@ lbl_803CE4B2 = .rodata:0x803CE4B2; // type:object size:0x76
@stringBase0 = .rodata:0x803CE548; // type:object size:0x1C scope:local data:string_table
lbl_803CE568 = .rodata:0x803CE568; // type:object size:0x30
lbl_803CE598 = .rodata:0x803CE598; // type:object size:0x28
lbl_803CE5C0 = .rodata:0x803CE5C0; // type:object size:0x8
@stringBase0 = .rodata:0x803CE5C0; // type:object size:0x8 scope:local data:string_table
lbl_803CE5C8 = .rodata:0x803CE5C8; // type:object size:0x8
lbl_803CE5D0 = .rodata:0x803CE5D0; // type:object size:0xE data:string
lbl_803CE5DE = .rodata:0x803CE5DE; // type:object size:0x12
@ -17904,20 +17904,20 @@ ClampRegion = .rodata:0x803D8588; // type:object size:0xA scope:local data:byte
__ptmf_null = .rodata:0x803D8598; // type:object size:0xC scope:global data:4byte
__constants = .rodata:0x803D85A8; // type:object size:0x18 scope:local align:8 data:double
fix_pool_sizes = .rodata:0x803D85C0; // type:object size:0x18 scope:global data:4byte
lbl_803D85D8 = .rodata:0x803D85D8; // type:object size:0xE0
@stringBase0 = .rodata:0x803D85D8; // type:object size:0xE0 scope:local data:string_table
@stringBase0 = .rodata:0x803D86B8; // type:object size:0x5 scope:local data:string_table
@stringBase0 = .rodata:0x803D86C0; // type:object size:0x25 scope:local data:string_table
lbl_803D86E8 = .rodata:0x803D86E8; // type:object size:0x2C data:4byte
lbl_803D8714 = .rodata:0x803D8714; // type:object size:0xC data:4byte
lbl_803D8720 = .rodata:0x803D8720; // type:object size:0x30
@121 = .rodata:0x803D86E8; // type:object size:0x2C scope:local data:4byte
@136 = .rodata:0x803D8714; // type:object size:0xC scope:local data:4byte
halF = .rodata:0x803D8720; // type:object size:0x30 scope:local
Zero = .rodata:0x803D8750; // type:object size:0x10 scope:local
lbl_803D8760 = .rodata:0x803D8760; // type:object size:0x30 align:8 data:double
bp = .rodata:0x803D8760; // type:object size:0x30 scope:local align:8 data:double
two_over_pi = .rodata:0x803D8790; // type:object size:0x108 scope:local
npio2_hw = .rodata:0x803D8898; // type:object size:0x80 scope:local
init_jk = .rodata:0x803D8918; // type:object size:0x10 scope:local
PIo2 = .rodata:0x803D8928; // type:object size:0x40 scope:local align:8 data:double
T = .rodata:0x803D8968; // type:object size:0x68 scope:local align:8 data:double
lbl_803D89D0 = .rodata:0x803D89D0; // type:object size:0x98
atanhi = .rodata:0x803D89D0; // type:object size:0x98 scope:local
dspMixerCycles = .rodata:0x803D8A68; // type:object size:0x40 scope:global
pbOffsets$455 = .rodata:0x803D8AA8; // type:object size:0x18 scope:global
inpColdMIDIDefaults = .rodata:0x803D8AC0; // type:object size:0x86 scope:local
@ -18092,7 +18092,7 @@ lbl_803DA384 = .data:0x803DA384; // type:object size:0xC
lbl_803DA390 = .data:0x803DA390; // type:object size:0x3C data:4byte
lbl_803DA3CC = .data:0x803DA3CC; // type:object size:0x74
__vt__9CTweakGui = .data:0x803DA440; // type:object size:0x10 scope:global
lbl_803DA450 = .data:0x803DA450; // type:object size:0x88
__vt__12CScriptActor = .data:0x803DA450; // type:object size:0x88 scope:global
__vt__14CScriptTrigger = .data:0x803DA4D8; // type:object size:0x80 scope:global
__vt__15CScriptWaypoint = .data:0x803DA558; // type:object size:0x6C scope:global
lbl_803DA5C8 = .data:0x803DA5C8; // type:object size:0x2CC
@ -19100,8 +19100,8 @@ Type = .data:0x803F6EF8; // type:object size:0x10 scope:local
@462 = .data:0x803F6F88; // type:object size:0x14 scope:local data:string
@463 = .data:0x803F6F9C; // type:object size:0x9 scope:local data:string
@464 = .data:0x803F6FA8; // type:object size:0x9 scope:local data:string
XYNTSC = .data:0x803F6FB8; // type:object size:0x30 scope:local
...data.0 = .data:0x803F6FB8; // type:label scope:local
XYNTSC = .data:0x803F6FB8; // type:object size:0x30 scope:local
XYPAL = .data:0x803F6FE8; // type:object size:0x30 scope:local
@16 = .data:0x803F7018; // type:object size:0x33 scope:local data:string
@3 = .data:0x803F7050; // type:object size:0x45 scope:local data:string
@ -19115,7 +19115,7 @@ XYPAL = .data:0x803F6FE8; // type:object size:0x30 scope:local
@395 = .data:0x803F70F0; // type:object size:0xD scope:local data:string
@396 = .data:0x803F7100; // type:object size:0xE scope:local data:string
@397 = .data:0x803F7110; // type:object size:0xA scope:local data:string
THPVersionStr = .data:0x803F7120; // type:object size:0x40 scope:local
@3 = .data:0x803F7120; // type:object size:0x40 scope:local
ResetFunctionInfo = .data:0x803F7160; // type:object size:0x10 scope:local
D54 = .data:0x803F7170; // type:object size:0x2D scope:local data:byte
...data.0 = .data:0x803F7170; // type:label scope:local
@ -20009,7 +20009,7 @@ lbl_805A7318 = .sdata:0x805A7318; // type:object size:0x4
lbl_805A731C = .sdata:0x805A731C; // type:object size:0x4
@317 = .sdata:0x805A7320; // type:object size:0x4 scope:local data:float
lbl_805A7328 = .sdata:0x805A7328; // type:object size:0x1 data:byte
lbl_805A7329 = .sdata:0x805A7329; // type:object size:0x7 data:byte
@339 = .sdata:0x805A7329; // type:object size:0x7 scope:local data:byte
lbl_805A7330 = .sdata:0x805A7330; // type:object size:0x4 data:4byte
lbl_805A7334 = .sdata:0x805A7334; // type:object size:0x4 data:4byte
lbl_805A7338 = .sdata:0x805A7338; // type:object size:0x4 data:4byte
@ -21129,7 +21129,7 @@ lbl_805A85D4 = .sdata:0x805A85D4; // type:object size:0x4 data:float
lbl_805A85D8 = .sdata:0x805A85D8; // type:object size:0x4
lbl_805A85DC = .sdata:0x805A85DC; // type:object size:0x4
lbl_805A85E0 = .sdata:0x805A85E0; // type:object size:0x8 data:float
lbl_805A85E8 = .sdata:0x805A85E8; // type:object size:0x8 data:float
energyball_lbl_805A85E8 = .sdata:0x805A85E8; // type:object size:0x8 data:float
lbl_805A85F0 = .sdata:0x805A85F0; // type:object size:0x4 data:4byte
lbl_805A85F4 = .sdata:0x805A85F4; // type:object size:0x4 data:4byte
lbl_805A85F8 = .sdata:0x805A85F8; // type:object size:0x4 data:float
@ -21526,8 +21526,8 @@ lbl_805A8CC0 = .sbss:0x805A8CC0; // type:object size:0x4 data:4byte
lbl_805A8CC4 = .sbss:0x805A8CC4; // type:object size:0x1 data:byte
lbl_805A8CC8 = .sbss:0x805A8CC8; // type:object size:0x4 data:4byte
lbl_805A8CCC = .sbss:0x805A8CCC; // type:object size:0x4 data:4byte
sReferenceCount$253 = .sbss:0x805A8CD0; // type:object size:0x4 scope:local data:4byte
init$254 = .sbss:0x805A8CD4; // type:object size:0x1 scope:local data:byte
sReferenceCount$253 = .sbss:0x805A8CD0; // type:object size:0x4 scope:local data:4byte scope:local
init$254 = .sbss:0x805A8CD4; // type:object size:0x1 scope:local data:byte scope:local
gpTweakPlayer = .sbss:0x805A8CD8; // type:object size:0x4 scope:global data:4byte
gpTweakBall = .sbss:0x805A8CDC; // type:object size:0x4 scope:global data:4byte
gpTweakGame = .sbss:0x805A8CE0; // type:object size:0x4 scope:global data:4byte
@ -22401,17 +22401,17 @@ Chan = .sbss:0x805A9BE8; // type:object size:0x4 scope:local data:4byte
Dev = .sbss:0x805A9BEC; // type:object size:0x4 scope:local data:4byte
Enabled = .sbss:0x805A9BF0; // type:object size:0x4 scope:local data:4byte
BarnacleEnabled = .sbss:0x805A9BF4; // type:object size:0x4 scope:local data:4byte
Ydchuff = .sbss:0x805A9C00; // type:object size:0x20 scope:local align:32 data:4byte
Udchuff = .sbss:0x805A9C20; // type:object size:0x20 scope:local align:32 data:4byte
Vdchuff = .sbss:0x805A9C40; // type:object size:0x20 scope:local align:32 data:4byte
Yachuff = .sbss:0x805A9C60; // type:object size:0x20 scope:local align:32 data:4byte
Uachuff = .sbss:0x805A9C80; // type:object size:0x20 scope:local align:32 data:4byte
Ydchuff = .sbss:0x805A9C00; // type:object size:0x4 scope:local align:32 data:4byte
Udchuff = .sbss:0x805A9C20; // type:object size:0x4 scope:local align:32 data:4byte
Vdchuff = .sbss:0x805A9C40; // type:object size:0x4 scope:local align:32 data:4byte
Yachuff = .sbss:0x805A9C60; // type:object size:0x4 scope:local align:32 data:4byte
Uachuff = .sbss:0x805A9C80; // type:object size:0x4 scope:local align:32 data:4byte
Vachuff = .sbss:0x805A9CA0; // type:object size:0x4 scope:local align:32 data:4byte
__THPHuffmanBits = .sbss:0x805A9CA4; // type:object size:0x4 scope:local data:4byte
__THPHuffmanSizeTab = .sbss:0x805A9CA8; // type:object size:0x4 scope:local data:4byte
__THPHuffmanCodeTab = .sbss:0x805A9CAC; // type:object size:0x14 scope:local data:4byte
Gbase = .sbss:0x805A9CC0; // type:object size:0x20 scope:local align:32 data:4byte
Gwid = .sbss:0x805A9CE0; // type:object size:0x20 scope:local align:32 data:4byte
__THPHuffmanCodeTab = .sbss:0x805A9CAC; // type:object size:0x4 scope:local data:4byte
Gbase = .sbss:0x805A9CC0; // type:object size:0x4 scope:local align:32 data:4byte
Gwid = .sbss:0x805A9CE0; // type:object size:0x4 scope:local align:32 data:4byte
Gq = .sbss:0x805A9D00; // type:object size:0x4 scope:local align:32 data:4byte
__THPOldGQR5 = .sbss:0x805A9D04; // type:object size:0x4 scope:local data:4byte
__THPOldGQR6 = .sbss:0x805A9D08; // type:object size:0x4 scope:local data:4byte
@ -26838,7 +26838,7 @@ lbl_805AEC80 = .sdata2:0x805AEC80; // type:object size:0x8 align:8 data:double
lbl_805AEC88 = .sdata2:0x805AEC88; // type:object size:0x8 align:8 data:double
@38 = .sdata2:0x805AEC90; // type:object size:0x4 scope:local data:4byte
lbl_805AEC98 = .sdata2:0x805AEC98; // type:object size:0x8 align:8 data:double
lbl_805AECA0 = .sdata2:0x805AECA0; // type:object size:0x4 data:4byte
@150 = .sdata2:0x805AECA0; // type:object size:0x4 scope:local data:4byte
lbl_805AECA4 = .sdata2:0x805AECA4; // type:object size:0x1 data:byte
lbl_805AECA8 = .sdata2:0x805AECA8; // type:object size:0x8 align:8 data:double
lbl_805AECB0 = .sdata2:0x805AECB0; // type:object size:0x8 align:8 data:double

View File

@ -4,10 +4,9 @@ hash: 860141f9671fc141ce8f55448643f713bc64b349
symbols: config/GM8E01_01/symbols.txt
splits: config/GM8E01_01/splits.txt
mw_comment_version: 8
quick_analysis: false # Faster reruns after full analysis
quick_analysis: true # Faster reruns after full analysis
fill_gaps: true # Alignments known
# Extract embedded assets
extract:
- symbol: sDefaultFontData
@ -17,8 +16,8 @@ extract:
binary: MetroidPrime/DefaultFontTexture.bin
header: MetroidPrime/DefaultFontTexture.inc
#modules:
#- object: files/NESemuP.rel
# hash: 3cf7c08ff9aad30e6122a9ce1df35fb717df3586
# symbols: config/GM8E01_01/NESemu/symbols.txt
# splits: config/GM8E01_01/NESemu/splits.txt
modules:
- object: files/NESemuP.rel
hash: 3cf7c08ff9aad30e6122a9ce1df35fb717df3586
symbols: config/GM8E01_01/NESemu/symbols.txt
splits: config/GM8E01_01/NESemu/splits.txt

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -422,7 +422,10 @@ static short _fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0};
#pragma force_active on
/* TODO: This is a hack we need to see what's throwing off the alignment and fix it */
#if VERSION == 0
static char padding[32] = {0};
#endif
#pragma force_active reset
/*
* g721_decoder()

View File

@ -53,12 +53,12 @@ void CGameCubeDoll::Touch() {
}
/* TODO: This is in CEnergyBall, need to figure out what it is and name it appropriately */
extern float lbl_805A85E8;
extern float energyball_lbl_805A85E8;
void CGameCubeDoll::Update(float dt) {
if (!CheckLoadComplete())
return;
x1c_fader = rstl::min_val(lbl_805A85E8, (dt * 2.f) + x1c_fader);
x1c_fader = rstl::min_val(energyball_lbl_805A85E8, (dt * 2.f) + x1c_fader);
UpdateActorLights();
}