mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-26 23:47:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Final match

Browse Source
This commit is contained in:
robojumper
2024-05-06 01:08:02 +02:00
parent 141fd65621
commit 025bcfa4bb
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/symbols.txt
+9 -4
View File
@@ -37119,7 +37119,12 @@ lbl_8056EC08 = .data:0x8056EC08; // type:object size:0x1C
lbl_8056EC24 = .data:0x8056EC24; // type:object size:0x1C
lbl_8056EC40 = .data:0x8056EC40; // type:object size:0x10
lbl_8056EC50 = .data:0x8056EC50; // type:object size:0x38
lbl_8056EC88 = .data:0x8056EC88; // type:object size:0x78
lbl_8056EC88 = .data:0x8056EC88; // type:object size:0xE data:string
lbl_8056EC98 = .data:0x8056EC98; // type:object size:0x16 data:string
lbl_8056ECB0 = .data:0x8056ECB0; // type:object size:0x20 data:string
lbl_8056ECD0 = .data:0x8056ECD0; // type:object size:0xA data:string
lbl_8056ECDC = .data:0x8056ECDC; // type:object size:0xD data:string
lbl_8056ECF0 = .data:0x8056ECF0; // type:object size:0x10 data:string
lbl_8056ED00 = .data:0x8056ED00; // type:object size:0x30
lbl_8056ED30 = .data:0x8056ED30; // type:object size:0x30
lbl_8056ED60 = .data:0x8056ED60; // type:object size:0x10
@@ -39587,11 +39592,11 @@ lbl_80574ED0 = .sdata:0x80574ED0; // type:object size:0x8 data:byte
lbl_80574ED8 = .sdata:0x80574ED8; // type:object size:0x8
lbl_80574EE0 = .sdata:0x80574EE0; // type:object size:0x8
lbl_80574EE8 = .sdata:0x80574EE8; // type:object size:0x8 data:4byte
lbl_80574EF0 = .sdata:0x80574EF0; // type:object size:0x8
lbl_80574EF0 = .sdata:0x80574EF0; // type:object size:0x2 data:string
lbl_80574EF8 = .sdata:0x80574EF8; // type:object size:0x8 data:string
lbl_80574F00 = .sdata:0x80574F00; // type:object size:0x8 data:string
lbl_80574F08 = .sdata:0x80574F08; // type:object size:0x8 data:string
lbl_80574F10 = .sdata:0x80574F10; // type:object size:0x8
lbl_80574F10 = .sdata:0x80574F10; // type:object size:0x7 data:string
lbl_80574F18 = .sdata:0x80574F18; // type:object size:0x8 data:4byte
lbl_80574F20 = .sdata:0x80574F20; // type:object size:0x8
lbl_80574F28 = .sdata:0x80574F28; // type:object size:0x4
@@ -49355,7 +49360,7 @@ zero__Q23EGG8Vector3f = .bss:0x80674C30; // type:object size:0xC data:float
ex__Q23EGG8Vector3f = .bss:0x80674C3C; // type:object size:0xC data:float
ey__Q23EGG8Vector3f = .bss:0x80674C48; // type:object size:0xC data:float
ez__Q23EGG8Vector3f = .bss:0x80674C54; // type:object size:0xC data:float
lbl_80674C60 = .bss:0x80674C60; // type:object size:0x108
buf__Q23EGG6Assert = .bss:0x80674C60; // type:object size:0x108
lbl_80674D68 = .bss:0x80674D68; // type:object size:0x90
lbl_80674DF8 = .bss:0x80674DF8; // type:object size:0x30 data:float
lbl_80674E28 = .bss:0x80674E28; // type:object size:0x20
configure.py
+1 -1
View File
@@ -385,7 +385,7 @@ config.libs = [
EGGLib(
"prim",
[
Object(NonMatching, "egg/prim/eggAssert.cpp"),
Object(Matching, "egg/prim/eggAssert.cpp"),
],
),
# {
src/egg/prim/eggAssert.cpp
+3 -6
View File
@@ -67,14 +67,11 @@ bool sAssertOccurred;
}
/* 8049c150 */ bool isOutsideMEM1(u32 addr) {
// TODO
if (0x80000000 <= addr) {
if (addr <= 0x83000000 - 1) {
return false;
}
if (!(0x80000000 <= addr) || !(addr <= 0x83000000 - 1)) {
return true;
}
return true;
return false;
}
/* 8049c180 */ AssertCallback setAssertCallback(AssertCallback cb) {