From a3acf2d8809e49ec5e5a800f3fcf4577228b586f Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 26 Sep 2020 20:09:32 -0500 Subject: some splittig and decomping --- asm/fatal_system.s | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 asm/fatal_system.s (limited to 'asm/fatal_system.s') diff --git a/asm/fatal_system.s b/asm/fatal_system.s new file mode 100644 index 0000000..3a53878 --- /dev/null +++ b/asm/fatal_system.s @@ -0,0 +1,157 @@ + .include "constants/gba_constants.inc" + .include "asm/macros.inc" + + .syntax unified + + .text + + thumb_func_start FatalErrorPrintFuncFileLine +FatalErrorPrintFuncFileLine: + push {lr} + sub sp, 0x100 + adds r2, r0, 0 + cmp r2, 0 + beq _08011B5E + mov r0, sp + bl PrintFuncFileLine + b _08011B66 +_08011B5E: + ldr r2, _08011B6C + mov r0, sp + bl PrintFuncFileLine +_08011B66: + add sp, 0x100 + pop {r0} + bx r0 + .align 2, 0 +_08011B6C: .4byte gUnknown_80D421C + thumb_func_end FatalErrorPrintFuncFileLine + + thumb_func_start FatalErrorFormatMessage +FatalErrorFormatMessage: + push {r0-r3} + push {lr} + sub sp, 0x100 + ldr r1, [sp, 0x104] + add r2, sp, 0x108 + mov r0, sp + bl vsprintf + add sp, 0x100 + pop {r3} + add sp, 0x10 + bx r3 + thumb_func_end FatalErrorFormatMessage + + thumb_func_start sub_8011B88 +sub_8011B88: + push {r0-r3} + push {lr} + sub sp, 0x100 + ldr r1, [sp, 0x104] + add r2, sp, 0x108 + mov r0, sp + bl vsprintf + add sp, 0x100 + pop {r3} + add sp, 0x10 + bx r3 + thumb_func_end sub_8011B88 + + thumb_func_start nullsub_28 +nullsub_28: + bx lr + thumb_func_end nullsub_28 + + thumb_func_start sub_8011BA4 +sub_8011BA4: + movs r0, 0 + bx lr + thumb_func_end sub_8011BA4 + + thumb_func_start sub_8011BA8 +sub_8011BA8: + movs r0, 0 + bx lr + thumb_func_end sub_8011BA8 + + thumb_func_start sub_8011BAC +sub_8011BAC: + ldr r0, _08011BB0 + bx lr + .align 2, 0 +_08011BB0: .4byte gUnknown_80D4288 + thumb_func_end sub_8011BAC + + thumb_func_start sub_8011BB4 +sub_8011BB4: + push {lr} + bl Hang + pop {r0} + bx r0 + thumb_func_end sub_8011BB4 + + thumb_func_start Log +Log: + push {r1-r3} + add sp, 0xC + bx lr + thumb_func_end Log + + thumb_func_start sub_8011BC8 +sub_8011BC8: + push {r2,r3} + add sp, 0x8 + bx lr + thumb_func_end sub_8011BC8 + + thumb_func_start nullsub_29 +nullsub_29: + bx lr + thumb_func_end nullsub_29 + + thumb_func_start nullsub_30 +nullsub_30: + bx lr + thumb_func_end nullsub_30 + + thumb_func_start nullsub_31 +nullsub_31: + bx lr + thumb_func_end nullsub_31 + + thumb_func_start nullsub_32 +nullsub_32: + bx lr + thumb_func_end nullsub_32 + + thumb_func_start FatalErrorHang +FatalErrorHang: + push {lr} + bl Hang + pop {r0} + bx r0 + thumb_func_end FatalErrorHang + + thumb_func_start FatalError +FatalError: + push {r1-r3} + push {r4,lr} + sub sp, 0x100 + adds r1, r0, 0 + ldr r4, [sp, 0x108] + ldr r0, _08011C14 + bl FatalErrorPrintFuncFileLine + add r2, sp, 0x10C + mov r0, sp + adds r1, r4, 0 + bl vsprintf + ldr r0, _08011C18 + mov r1, sp + bl FatalErrorFormatMessage + bl FatalErrorHang + .align 2, 0 +_08011C14: .4byte gUnknown_80D42C0 +_08011C18: .4byte gUnknown_80D42D4 + thumb_func_end FatalError + + .align 2,0 -- cgit v1.2.3 From 30f301d7274abe84ef1b23161631040f58da0173 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 29 Oct 2020 23:02:43 -0500 Subject: doc some strings --- asm/fatal_system.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/fatal_system.s') diff --git a/asm/fatal_system.s b/asm/fatal_system.s index 3a53878..9c4f81c 100644 --- a/asm/fatal_system.s +++ b/asm/fatal_system.s @@ -79,7 +79,7 @@ sub_8011BAC: ldr r0, _08011BB0 bx lr .align 2, 0 -_08011BB0: .4byte gUnknown_80D4288 +_08011BB0: .4byte gNotMountText thumb_func_end sub_8011BAC thumb_func_start sub_8011BB4 @@ -150,7 +150,7 @@ FatalError: bl FatalErrorFormatMessage bl FatalErrorHang .align 2, 0 -_08011C14: .4byte gUnknown_80D42C0 +_08011C14: .4byte gFatalText _08011C18: .4byte gUnknown_80D42D4 thumb_func_end FatalError -- cgit v1.2.3 From 65720e556d95a1a7153fbf8590fe63faedabf080 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 2 Nov 2020 11:15:37 -0600 Subject: some work on fatal system decomping --- asm/fatal_system.s | 97 ------------------------------------------------------ 1 file changed, 97 deletions(-) (limited to 'asm/fatal_system.s') diff --git a/asm/fatal_system.s b/asm/fatal_system.s index 9c4f81c..45009ee 100644 --- a/asm/fatal_system.s +++ b/asm/fatal_system.s @@ -57,101 +57,4 @@ sub_8011B88: bx r3 thumb_func_end sub_8011B88 - thumb_func_start nullsub_28 -nullsub_28: - bx lr - thumb_func_end nullsub_28 - - thumb_func_start sub_8011BA4 -sub_8011BA4: - movs r0, 0 - bx lr - thumb_func_end sub_8011BA4 - - thumb_func_start sub_8011BA8 -sub_8011BA8: - movs r0, 0 - bx lr - thumb_func_end sub_8011BA8 - - thumb_func_start sub_8011BAC -sub_8011BAC: - ldr r0, _08011BB0 - bx lr - .align 2, 0 -_08011BB0: .4byte gNotMountText - thumb_func_end sub_8011BAC - - thumb_func_start sub_8011BB4 -sub_8011BB4: - push {lr} - bl Hang - pop {r0} - bx r0 - thumb_func_end sub_8011BB4 - - thumb_func_start Log -Log: - push {r1-r3} - add sp, 0xC - bx lr - thumb_func_end Log - - thumb_func_start sub_8011BC8 -sub_8011BC8: - push {r2,r3} - add sp, 0x8 - bx lr - thumb_func_end sub_8011BC8 - - thumb_func_start nullsub_29 -nullsub_29: - bx lr - thumb_func_end nullsub_29 - - thumb_func_start nullsub_30 -nullsub_30: - bx lr - thumb_func_end nullsub_30 - - thumb_func_start nullsub_31 -nullsub_31: - bx lr - thumb_func_end nullsub_31 - - thumb_func_start nullsub_32 -nullsub_32: - bx lr - thumb_func_end nullsub_32 - - thumb_func_start FatalErrorHang -FatalErrorHang: - push {lr} - bl Hang - pop {r0} - bx r0 - thumb_func_end FatalErrorHang - - thumb_func_start FatalError -FatalError: - push {r1-r3} - push {r4,lr} - sub sp, 0x100 - adds r1, r0, 0 - ldr r4, [sp, 0x108] - ldr r0, _08011C14 - bl FatalErrorPrintFuncFileLine - add r2, sp, 0x10C - mov r0, sp - adds r1, r4, 0 - bl vsprintf - ldr r0, _08011C18 - mov r1, sp - bl FatalErrorFormatMessage - bl FatalErrorHang - .align 2, 0 -_08011C14: .4byte gFatalText -_08011C18: .4byte gUnknown_80D42D4 - thumb_func_end FatalError - .align 2,0 -- cgit v1.2.3 From 799fa82c1aede6d33778bfb6e69a5faf5ef98781 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 5 Nov 2020 18:11:47 -0600 Subject: finally figured out fatal error func and another func --- asm/fatal_system.s | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'asm/fatal_system.s') diff --git a/asm/fatal_system.s b/asm/fatal_system.s index 45009ee..e4da05e 100644 --- a/asm/fatal_system.s +++ b/asm/fatal_system.s @@ -5,28 +5,6 @@ .text - thumb_func_start FatalErrorPrintFuncFileLine -FatalErrorPrintFuncFileLine: - push {lr} - sub sp, 0x100 - adds r2, r0, 0 - cmp r2, 0 - beq _08011B5E - mov r0, sp - bl PrintFuncFileLine - b _08011B66 -_08011B5E: - ldr r2, _08011B6C - mov r0, sp - bl PrintFuncFileLine -_08011B66: - add sp, 0x100 - pop {r0} - bx r0 - .align 2, 0 -_08011B6C: .4byte gUnknown_80D421C - thumb_func_end FatalErrorPrintFuncFileLine - thumb_func_start FatalErrorFormatMessage FatalErrorFormatMessage: push {r0-r3} -- cgit v1.2.3