summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2020-11-01 12:27:21 -0600
committerSeth Barberee <seth.barberee@gmail.com>2020-11-01 12:27:21 -0600
commit22f19f8d55bdc749775438b34cdaa209d07bd8c1 (patch)
tree692837dd1abac080d011fe2708b9c62e1d150a2f /asm
parenta0d2d8e9519a7cc9075950c5eec211008fbe0463 (diff)
more work on funcs
Diffstat (limited to 'asm')
-rw-r--r--asm/code_80118A4.s32
-rw-r--r--asm/code_80521D0.s23
2 files changed, 0 insertions, 55 deletions
diff --git a/asm/code_80118A4.s b/asm/code_80118A4.s
index 1969c48..4fbfa06 100644
--- a/asm/code_80118A4.s
+++ b/asm/code_80118A4.s
@@ -5,38 +5,6 @@
.text
- @ Unused
- thumb_func_start PrintFuncFileLineOrNotEntry
-PrintFuncFileLineOrNotEntry:
- push {r4,lr}
- sub sp, 0x4
- adds r4, r0, 0
- adds r0, r1, 0
- cmp r0, 0
- beq _08011A90
- ldr r1, _08011A8C
- ldr r2, [r0, 0x8]
- ldr r3, [r0]
- ldr r0, [r0, 0x4]
- str r0, [sp]
- adds r0, r4, 0
- bl sprintf
- b _08011A98
- .align 2, 0
-_08011A8C: .4byte gUnknown_80D418C
-_08011A90:
- ldr r1, _08011AA0
- adds r0, r4, 0
- bl sprintf
-_08011A98:
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_08011AA0: .4byte gNotEntryText
- thumb_func_end PrintFuncFileLineOrNotEntry
-
thumb_func_start PrintFuncFileLine
PrintFuncFileLine:
push {r4,r5,lr}
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index c7b0327..d6930c2 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -116336,27 +116336,4 @@ _0808CD94: .4byte sub_8086A3C
_0808CD98: .4byte gUnknown_202E038
thumb_func_end sub_808CD44
- thumb_func_start sub_808CD9C
-sub_808CD9C:
- push {lr}
- bl sub_8086448
- ldr r0, _0808CDAC
- bl sub_80866C4
- pop {r0}
- bx r0
- .align 2, 0
-_0808CDAC: .4byte gUnknown_810697C
- thumb_func_end sub_808CD9C
-
- thumb_func_start sub_808CDB0
-sub_808CDB0:
- lsls r0, 24
- lsrs r0, 21
- ldr r1, _0808CDBC
- adds r0, r1
- bx lr
- .align 2, 0
-_0808CDBC: .4byte gUnknown_8107544
- thumb_func_end sub_808CDB0
-
.align 2,0 @ Don't pad with nop