diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2020-11-05 18:11:47 -0600 |
---|---|---|
committer | Seth Barberee <seth.barberee@gmail.com> | 2020-11-05 18:11:47 -0600 |
commit | 799fa82c1aede6d33778bfb6e69a5faf5ef98781 (patch) | |
tree | ea3c86172899c6c71fb1c2277dea9bf653b29acf /src | |
parent | 1c2975874bbb675ad92ddd3c82f56b46779af31c (diff) |
finally figured out fatal error func and another func
Diffstat (limited to 'src')
-rw-r--r-- | src/code_80118A4_1.c | 16 | ||||
-rw-r--r-- | src/code_80A7714.c | 19 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/code_80118A4_1.c b/src/code_80118A4_1.c index c2fa641..9d57d7d 100644 --- a/src/code_80118A4_1.c +++ b/src/code_80118A4_1.c @@ -2,6 +2,9 @@ extern u8 gUnknown_203B150; +void PrintFuncFileLine(char *r0, const char *r1, ...); +extern const char gUnknown_80D421C; + void nullsub_199(void) { } @@ -67,3 +70,16 @@ void nullsub_137(void) { } + +// TODO merge with fatal_system +void FatalErrorPrintFuncFileLine(const char *r0, const char *r1) +{ + char buf[0x100]; + if(r0 != 0){ + PrintFuncFileLine(buf, r1, r0); + } + else + { + PrintFuncFileLine(buf, r1, &gUnknown_80D421C); + } +} diff --git a/src/code_80A7714.c b/src/code_80A7714.c index 0522ef1..ae8798a 100644 --- a/src/code_80A7714.c +++ b/src/code_80A7714.c @@ -3,6 +3,7 @@ extern void sub_80A68A0(void); extern void sub_80A7094(u32 r0, u32 r1, u32 r2, u32 r3); extern void sub_80A7310(u32 r0, u32 r1, u32 r2, u32 r3); +extern void sub_80A7784(); extern s16 gUnknown_2039DE0; void sub_80A7714(void) @@ -25,3 +26,21 @@ void sub_80A7754(void) { gUnknown_2039DE0 = -1; } + +void sub_80A7764(s16 r0) +{ + s32 temp = r0; + sub_80A7784(); + if(temp != -1) + { + gUnknown_2039DE0 = temp; + } +} + +void sub_80A7784(void) +{ + if(gUnknown_2039DE0 != -1) + { + gUnknown_2039DE0 = -1; + } +} |