diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-03-23 12:11:10 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-23 12:11:10 -0500 |
commit | 2fd4f339b42c010191c199772b09ac34c580de94 (patch) | |
tree | e562899f35861ece70c292602fe6aac2f50906bf /asm/wonder_mail.s | |
parent | 7b142311a7294c4c7a943870fa5f24f0fbea604a (diff) |
Miscellaneous Work (Again) (#31)
* move some personality data from asm to C
* combine personality_test files and add my close attempt at RedrawPartnerSelectionMenu
* decomp some more wonder mail funcs and label some more data
* lots of data splitting and move some to src
* split out more dungeon data
* continue splitting out more dungeon data
* doc rescue team rank/pts funcs/data and exclusive pokemon ewram
* doc more sound things and decomp a func
* decomp LoadTeamRankBadge and label some data members
* split out rescue team and text util stuff
* forgot a constant
* match a few funcs and clean up a few
* cleaned up sub_80A28B4
Diffstat (limited to 'asm/wonder_mail.s')
-rw-r--r-- | asm/wonder_mail.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/wonder_mail.s b/asm/wonder_mail.s index 7f2973c..e5d1c87 100644 --- a/asm/wonder_mail.s +++ b/asm/wonder_mail.s @@ -10283,17 +10283,17 @@ _0802F630: bl sub_802F2E8 b _0802F6E4 _0802F644: - bl sub_8092178 + bl GetRescueTeamRank ldr r1, [r5] strb r0, [r1, 0x9] ldr r0, [r5] ldr r0, [r0, 0x10] ldr r0, [r0, 0x24] - bl sub_8092158 + bl AddToTeamRankPts movs r0, 0xCB bl sub_8011988 ldr r4, [r5] - bl sub_8092178 + bl GetRescueTeamRank ldrb r1, [r4, 0x9] lsls r0, 24 lsrs r0, 24 @@ -10337,7 +10337,7 @@ _0802F6A4: ldr r4, _0802F6F0 adds r0, r4, 0 bl strcpy - bl sub_8092178 + bl GetRescueTeamRank lsls r0, 24 lsrs r0, 24 bl GetTeamRankString |