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/pokemon.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/pokemon.s')
| -rw-r--r-- | asm/pokemon.s | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/asm/pokemon.s b/asm/pokemon.s index 852b601..bd729f7 100644 --- a/asm/pokemon.s +++ b/asm/pokemon.s @@ -147,11 +147,11 @@ _0808CEA4: add r4, sp, 0x58 adds r0, r4, 0 adds r1, r7, 0 - bl sub_808D8BC + bl CopySpeciesNametoBuffer add r0, sp, 0x4C adds r1, r4, 0 movs r2, 0xA - bl sub_8092310 + bl BoundedCopyStringtoBuffer lsls r4, r7, 3 b _0808CF72 _0808CF36: @@ -339,11 +339,11 @@ _0808D09A: bne _0808D0B4 mov r0, sp mov r1, r9 - bl sub_808D8BC + bl CopySpeciesNametoBuffer mov r0, r8 mov r1, sp movs r2, 0xA - bl sub_8092310 + bl BoundedCopyStringtoBuffer b _0808D0C8 _0808D0B4: movs r2, 0 @@ -1422,10 +1422,10 @@ sub_808D824: adds r4, r0, 0 movs r1, 0x8 ldrsh r0, [r4, r1] - bl sub_808D994 + bl GetMonSpecies adds r1, r0, 0 mov r0, sp - bl sub_80922F4 + bl CopyStringtoBuffer movs r2, 0 adds r4, 0x4C _0808D83E: @@ -1475,10 +1475,10 @@ sub_808D864: movs r7, 0 _0808D888: ldrb r0, [r6] - bl sub_8092280 + bl ReturnIntFromChar adds r4, r0, 0 ldrb r0, [r5] - bl sub_8092280 + bl ReturnIntFromChar cmp r4, r0 ble _0808D8A4 movs r0, 0x1 @@ -1501,8 +1501,8 @@ _0808D8B4: bx r1 thumb_func_end sub_808D864 - thumb_func_start sub_808D8BC -sub_808D8BC: + thumb_func_start CopySpeciesNametoBuffer +CopySpeciesNametoBuffer: push {lr} lsls r1, 16 asrs r1, 16 @@ -1519,7 +1519,7 @@ sub_808D8BC: bx r0 .align 2, 0 _0808D8DC: .4byte gMonsterParameters - thumb_func_end sub_808D8BC + thumb_func_end CopySpeciesNametoBuffer thumb_func_start sub_808D8E0 sub_808D8E0: @@ -1579,7 +1579,7 @@ sub_808D930: bne _0808D970 ldr r5, _0808D968 movs r0, 0xC9 - bl sub_808D994 + bl GetMonSpecies adds r4, r0, 0 adds r0, r6, 0 bl sub_808E8C8 @@ -1614,8 +1614,8 @@ _0808D98C: .4byte gUnknown_8107638 _0808D990: .4byte gMonsterParameters thumb_func_end sub_808D930 - thumb_func_start sub_808D994 -sub_808D994: + thumb_func_start GetMonSpecies +GetMonSpecies: lsls r0, 16 asrs r0, 16 ldr r1, _0808D9A8 @@ -1628,7 +1628,7 @@ sub_808D994: bx lr .align 2, 0 _0808D9A8: .4byte gMonsterParameters - thumb_func_end sub_808D994 + thumb_func_end GetMonSpecies thumb_func_start sub_808D9AC sub_808D9AC: |