diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-09-09 20:54:41 -0500 |
| commit | a1368c545df5d49c2cde32c09c14aba8d4bdc967 (patch) | |
| tree | 0dd69e9a676d0d4872e51552d465cbc0364e2a55 /asm/naming_screen.s | |
| parent | f29fc55796cc5500f954b396264edc863f96f486 (diff) | |
| parent | eb280768a48eba5332468b463aab962e1eafb18e (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'asm/naming_screen.s')
| -rw-r--r-- | asm/naming_screen.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/naming_screen.s b/asm/naming_screen.s index b385fc444..d67f1425d 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -730,7 +730,7 @@ pokemon_store: @ 80E33D8 ldrb r0, [r0] cmp r0, 0x2 bne _080E342C - bl calc_player_party_count + bl CalculatePlayerPartyCount lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 @@ -3276,7 +3276,7 @@ sub_80E4894: @ 80E4894 str r1, [sp, 0x8] movs r1, 0x1 movs r3, 0x8 - bl Print + bl PrintTextOnWindow ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -3328,7 +3328,7 @@ sub_80E48E8: @ 80E48E8 movs r1, 0x1 add r2, sp, 0xC movs r3, 0x8 - bl Print + bl PrintTextOnWindow ldr r0, [r5] adds r0, r4 ldrb r0, [r0] @@ -3865,7 +3865,7 @@ _080E4D76: str r1, [sp, 0x8] movs r1, 0x1 add r2, sp, 0xC - bl Print + bl PrintTextOnWindow adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 |