diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/daycare.s | 18 | ||||
| -rw-r--r-- | asm/egg_hatch.s | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/asm/daycare.s b/asm/daycare.s index abb361d89..2944f7565 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -30,7 +30,7 @@ sub_80416A0: @ 80416A0 add r5, r8 ldr r1, [r5] adds r0, r4, 0 - bl sub_8041664 + bl Daycare_GetLevelAfterSteps lsls r0, 24 lsrs r0, 24 subs r0, r6 @@ -60,7 +60,7 @@ sub_80416E8: @ 80416E8 adds r6, r0 ldr r1, _08041720 @ =gStringVar1 adds r0, r6, 0 - bl pokemon_get_nick_ + bl GetBoxMonNick ldr r0, _08041724 @ =gStringVar2 adds r1, r5, 0 movs r2, 0 @@ -92,7 +92,7 @@ sub_8041728: @ 8041728 adds r6, r0 ldr r1, _08041768 @ =gStringVar1 adds r0, r6, 0 - bl pokemon_get_nick_ + bl GetBoxMonNick movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -1625,7 +1625,7 @@ sub_80422C4: @ 80422C4 beq _080422FC ldr r1, _0804231C @ =gStringVar1 adds r0, r6, 0 - bl pokemon_get_nick_ + bl GetBoxMonNick adds r0, r6, 0 movs r1, 0x3 bl GetBoxMonData @@ -1650,7 +1650,7 @@ _080422FC: beq _08042314 ldr r1, _08042324 @ =gStringVar2 adds r0, r4, 0 - bl pokemon_get_nick_ + bl GetBoxMonNick _08042314: pop {r4-r6} pop {r0} @@ -1671,7 +1671,7 @@ sub_8042328: @ 8042328 ldr r4, _08042358 @ =gPlayerParty adds r0, r4 ldr r1, _0804235C @ =gStringVar1 - bl pokemon_get_nick_ + bl GetBoxMonNick ldrb r0, [r6] muls r0, r5 adds r0, r4 @@ -1714,7 +1714,7 @@ sp0B6_daycare: @ 8042370 _08042384: .4byte gSaveBlock1 + 0x2F9C _08042388: adds r0, r4, 0 - bl daycare_count_pokemon + bl Daycare_CountPokemon lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -2118,7 +2118,7 @@ _08042648: adds r5, r1, r0 adds r0, r4, 0 adds r1, r5, 0 - bl pokemon_get_nick_ + bl GetBoxMonNick adds r0, r5, 0 adds r1, r4, 0 bl MonAppendGenderSymbol @@ -2178,7 +2178,7 @@ _080426C6: adds r1, r6, r3 adds r1, r2 ldr r1, [r1] - bl sub_8041664 + bl Daycare_GetLevelAfterSteps adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index 90ae6aaf7..2f11d4111 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -52,7 +52,7 @@ AddHatchedMonToParty: @ 80429EC bl sub_8090D90 ldr r1, _08042AA4 @ =gStringVar1 adds r0, r5, 0 - bl pokemon_get_nick + bl GetMonNick mov r2, sp adds r2, 0xE movs r0, 0x4 @@ -110,7 +110,7 @@ sub_8042ABC: @ 8042ABC lsls r0, 4 adds r0, r5, r0 mov r1, sp - bl pokemon_get_nick_ + bl GetBoxMonNick lsls r0, r4, 3 subs r0, r4 lsls r1, r0, 3 @@ -857,7 +857,7 @@ _08043124: ldr r1, _08043150 @ =gPlayerParty adds r0, r1 ldr r1, _08043154 @ =gStringVar1 - bl pokemon_get_nick + bl GetMonNick ldr r4, _08043158 @ =gStringVar4 ldr r1, _0804315C @ =gOtherText_HatchedFromEgg adds r0, r4, 0 @@ -898,7 +898,7 @@ _08043180: ldr r1, _080431A8 @ =gPlayerParty adds r0, r1 ldr r1, _080431AC @ =gStringVar1 - bl pokemon_get_nick + bl GetMonNick ldr r4, _080431B0 @ =gStringVar4 ldr r1, _080431B4 @ =gOtherText_NickHatchPrompt adds r0, r4, 0 @@ -957,7 +957,7 @@ _080431DA: adds r0, r6 ldr r1, _08043280 @ =gStringVar3 mov r10, r1 - bl pokemon_get_nick + bl GetMonNick mov r2, r9 ldr r0, [r2] ldrb r0, [r0, 0x4] |