diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-02-27 10:16:45 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-27 12:16:45 -0600 |
commit | d72e17b5f5d795bebda2f6dc78dccb5e80c432b5 (patch) | |
tree | 776df17a36e2b30d2b362649db4408d701d55f9d /asm/code_809017C.s | |
parent | 7fa4f1a92bdc4cefb094f9e3f1144ad3e3a588d9 (diff) |
Miscellaneous decomp/labeling/splitting (#29)
* lots of wonder mail work, credits and label some stuff
* nonmatch one intr func, match another, and label unused intr func
* seperate credits out
* split out debug menu and other stuff that isn't main menu
* label another func
* label some more funcs
Diffstat (limited to 'asm/code_809017C.s')
-rw-r--r-- | asm/code_809017C.s | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/asm/code_809017C.s b/asm/code_809017C.s index f155cb0..7a79b2c 100644 --- a/asm/code_809017C.s +++ b/asm/code_809017C.s @@ -442,7 +442,7 @@ _0809048E: b _080904BA .align 2, 0 _080904AC: .4byte gUnknown_8115ADC -_080904B0: .4byte gUnknown_202DF98 +_080904B0: .4byte gAvailablePokemonNames _080904B4: .4byte gUnknown_8115B3C _080904B8: ldr r0, _08090528 @@ -4302,7 +4302,7 @@ sub_8092094: ldr r0, [r4] ldr r1, _080920B4 movs r2, 0xA - bl sub_8092310 + bl BoundedCopyStringtoBuffer ldr r1, [r4] movs r0, 0 str r0, [r1, 0xC] @@ -4467,8 +4467,8 @@ _080921A2: bx r1 thumb_func_end sub_8092178 - thumb_func_start sub_80921A8 -sub_80921A8: + thumb_func_start GetTeamRankString +GetTeamRankString: lsls r0, 24 ldr r1, _080921B4 lsrs r0, 22 @@ -4477,7 +4477,7 @@ sub_80921A8: bx lr .align 2, 0 _080921B4: .4byte gRescueTeamRanks - thumb_func_end sub_80921A8 + thumb_func_end GetTeamRankString thumb_func_start sub_80921B8 sub_80921B8: @@ -4580,19 +4580,19 @@ sub_809222C: _0809227C: .4byte gUnknown_203B464 thumb_func_end sub_809222C - thumb_func_start sub_8092280 -sub_8092280: + thumb_func_start ReturnIntFromChar +ReturnIntFromChar: lsls r0, 24 lsrs r0, 24 bx lr - thumb_func_end sub_8092280 + thumb_func_end ReturnIntFromChar - thumb_func_start sub_8092288 -sub_8092288: + thumb_func_start ReturnIntFromChar2 +ReturnIntFromChar2: lsls r0, 24 lsrs r0, 24 bx lr - thumb_func_end sub_8092288 + thumb_func_end ReturnIntFromChar2 thumb_func_start sub_8092290 sub_8092290: @@ -4603,7 +4603,7 @@ sub_8092290: _08092298: ldrb r0, [r4] adds r4, 0x1 - bl sub_8092288 + bl ReturnIntFromChar2 strb r0, [r5] adds r5, 0x1 _080922A4: @@ -4627,7 +4627,7 @@ sub_80922B4: _080922BE: ldrb r0, [r4] adds r4, 0x1 - bl sub_8092288 + bl ReturnIntFromChar2 strb r0, [r6] adds r6, 0x1 _080922CA: @@ -4657,8 +4657,8 @@ sub_80922E4: _080922F0: .4byte gUnknown_810983C thumb_func_end sub_80922E4 - thumb_func_start sub_80922F4 -sub_80922F4: + thumb_func_start CopyStringtoBuffer +CopyStringtoBuffer: push {lr} adds r2, r0, 0 b _08092300 @@ -4674,10 +4674,10 @@ _08092300: strb r0, [r2] pop {r0} bx r0 - thumb_func_end sub_80922F4 + thumb_func_end CopyStringtoBuffer - thumb_func_start sub_8092310 -sub_8092310: + thumb_func_start BoundedCopyStringtoBuffer +BoundedCopyStringtoBuffer: push {r4,lr} adds r4, r0, 0 b _0809231C @@ -4699,6 +4699,6 @@ _0809232E: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8092310 + thumb_func_end BoundedCopyStringtoBuffer .align 2, 0 @ Don't pad with nop. |