summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/daycare.s18
-rw-r--r--asm/egg_hatch.s10
-rw-r--r--data/specials.inc2
-rw-r--r--include/asm.inc.h2
-rw-r--r--src/daycare.c40
-rw-r--r--src/mori_debug_menu.c4
6 files changed, 36 insertions, 40 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]
diff --git a/data/specials.inc b/data/specials.inc
index bac45b91b..dd12775f5 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -187,7 +187,7 @@ gSpecials::
.4byte sp0B8_daycare
.4byte sp0B9_daycare_relationship_comment
.4byte sub_8042328
- .4byte daycare_send
+ .4byte Daycare_SendPokemon_Special
.4byte ChooseSendDaycareMon
.4byte ShowDaycareLevelMenu
.4byte sub_80417B8
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 9a404db59..2c28398b8 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -31,7 +31,7 @@ void StoreWordInTwoHalfwords(u16 *, u32);
void LoadWordFromTwoHalfwords(u16 *, u32 *);
// src/daycare.o
-u8 daycare_count_pokemon(struct BoxPokemon *);
+u8 Daycare_CountPokemon(struct BoxPokemon *);
// asm/daycare.o
void sub_8041324(struct BoxPokemon *, void *);
diff --git a/src/daycare.c b/src/daycare.c
index 0d80bc54a..cf7a5cd5f 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -5,7 +5,7 @@
extern u8 gLastFieldPokeMenuOpened;
-u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest)
+u8 *GetMonNick(struct Pokemon *mon, u8 *dest)
{
s8 nickname[POKEMON_NAME_LENGTH * 2];
@@ -13,7 +13,7 @@ u8 *pokemon_get_nick(struct Pokemon *mon, u8 *dest)
return StringCopy10(dest, nickname);
}
-u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest)
+u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest)
{
s8 nickname[POKEMON_NAME_LENGTH * 2];
@@ -21,16 +21,14 @@ u8 *pokemon_get_nick_(struct BoxPokemon *mon, u8 *dest)
return StringCopy10(dest, nickname);
}
-u8 daycare_count_pokemon(struct BoxPokemon *daycare_data)
+u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data)
{
u8 i, count;
count = 0;
- for(i = 0;i <= 1;i++) {
- if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0) {
+ for(i = 0;i <= 1;i++)
+ if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0)
count++;
- }
- }
return count;
}
@@ -98,36 +96,34 @@ _08041374:\n\
.syntax divided\n");
}
-s8 daycare_empty_slot(struct BoxPokemon * daycare_data)
+s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
{
u8 i;
- for(i = 0;i <= 1;i++){
- if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0){
+ for(i = 0;i <= 1;i++)
+ if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) == 0)
return i;
- }
- }
return -1;
}
-/*void sub_80413C8(struct Pokemon * mon, struct BoxPokemon * daycare_data){ // unfinished
+/*void Daycare_SendPokemon(struct Pokemon * mon, struct BoxPokemon * daycare_data){ // unfinished
s8 empty_slot;
- empty_slot = daycare_empty_slot(daycare_data);
+ empty_slot = Daycare_FindEmptySpot(daycare_data);
if(MonHasMail(mon) != 0){ // if the mon holds a mail?
u8 empty_slot_times_56 = empty_slot * 56;
u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36;
StringCopy(something2, gSaveBlock2.playerName);
PadNameString(something2, 0xFC);
something2 += 8;
- pokemon_get_nick(mon, something2);
+ GetMonNick(mon, something2);
u8 pokerus = GetMonData(mon, MON_DATA_64);
something1 += (u8 * daycare_data)
}*/
__attribute__((naked))
-void sub_80413C8()
+void Daycare_SendPokemon()
{
// strange stack usage - happens because THUMB ARM only allows R0-R7 to be pushed/popped:
// all registers in reglist must be Lo registers, except that PUSH can include the LR, and POP can include the PC
@@ -140,7 +136,7 @@ void sub_80413C8()
adds r7, r0, 0\n\
mov r8, r1\n\
mov r0, r8\n\
- bl daycare_empty_slot\n\
+ bl Daycare_FindEmptySpot\n\
lsls r0, 24\n\
lsrs r4, r0, 24\n\
mov r9, r4\n\
@@ -168,7 +164,7 @@ void sub_80413C8()
adds r6, 0x8\n\
adds r0, r7, 0\n\
adds r1, r6, 0\n\
- bl pokemon_get_nick\n\
+ bl GetMonNick\n\
adds r0, r7, 0\n\
movs r1, 0x40\n\
bl GetMonData\n\
@@ -228,9 +224,9 @@ _08041498: .4byte 0x00002b4c\n\
.syntax divided\n");
}
-void daycare_send()
+void Daycare_SendPokemon_Special()
{
- sub_80413C8(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData);
+ Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData);
}
void sub_80417F4(u8 *);
@@ -291,7 +287,7 @@ u16 sub_8041570(struct BoxPokemon * daycare_data, u8 a2){
adds r6, r5, r0\n\
ldr r1, _08041640 @ =gStringVar1\n\
adds r0, r6, 0\n\
- bl pokemon_get_nick_\n\
+ bl GetBoxMonNick\n\
adds r0, r6, 0\n\
movs r1, 0xB\n\
bl GetBoxMonData\n\
@@ -382,7 +378,7 @@ u16 sub_8041648()
return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004);
}
-u8 sub_8041664(struct BoxPokemon * mon, u32 steps){
+u8 Daycare_GetLevelAfterSteps(struct BoxPokemon * mon, u32 steps){
struct BoxPokemon temp = *mon;
u32 new_exp = GetBoxMonData(mon, MON_DATA_EXP) + steps;
SetBoxMonData(&temp, MON_DATA_EXP, (u8 *) &new_exp);
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index ab0e00c8a..fd0ad773b 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -65,7 +65,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
s8 MoriDebugMenu_Egg(void)
{
- if ( daycare_count_pokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
+ if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
sub_8041940();
CloseMenu();
@@ -74,7 +74,7 @@ s8 MoriDebugMenu_Egg(void)
s8 MoriDebugMenu_MaleEgg(void)
{
- if ( daycare_count_pokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
+ if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
sub_8041950();
CloseMenu();
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 01:51:36 +0000