summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/party_menu.s6
-rw-r--r--asm/pokedex.s12
-rw-r--r--asm/rom3.s4
-rw-r--r--asm/rom6.s4
-rw-r--r--asm/rom_80412B0.s260
-rw-r--r--asm/rom_806D7F8.s10
-rw-r--r--asm/rom_80859BC.s2
-rw-r--r--asm/rom_8094928.s22
-rw-r--r--asm/rom_80B5054.s26
-rw-r--r--asm/rom_8148B8C.s4
-rw-r--r--asm/trainer_card.s4
-rw-r--r--data/data2.s2
-rw-r--r--data/specials.s8
-rw-r--r--include/menu.h2
-rw-r--r--include/text.h2
-rw-r--r--src/link.c2
-rw-r--r--src/main_menu.c2
-rw-r--r--src/menu.c2
-rw-r--r--src/option_menu.c2
-rw-r--r--src/pokedex.c4
-rw-r--r--src/pokemon_1.c2
-rw-r--r--src/text.c4
22 files changed, 193 insertions, 193 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 807a73282..b63af2e13 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -112,8 +112,8 @@ sub_806AF8C: @ 806AF8C
_0806AFA8: .4byte sub_806B460
thumb_func_end sub_806AF8C
- thumb_func_start sub_806AFAC
-sub_806AFAC: @ 806AFAC
+ thumb_func_start OpenPartyMenu
+OpenPartyMenu: @ 806AFAC
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -131,7 +131,7 @@ sub_806AFAC: @ 806AFAC
bx r0
.align 2, 0
_0806AFCC: .4byte gUnknown_08376C74
- thumb_func_end sub_806AFAC
+ thumb_func_end OpenPartyMenu
thumb_func_start sub_806AFD0
sub_806AFD0: @ 806AFD0
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 48a3944c4..e3ad1d0d2 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -8828,7 +8828,7 @@ sub_8092B68: @ 8092B68
movs r1, 0x2D
movs r2, 0x10
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
ldrh r0, [r6, 0x1A]
ldrh r1, [r6, 0x18]
adds r0, r1
@@ -8844,7 +8844,7 @@ sub_8092B68: @ 8092B68
movs r1, 0x2D
movs r2, 0x20
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
ldrh r0, [r6, 0x1E]
ldrh r1, [r6, 0x1C]
adds r0, r1
@@ -8861,7 +8861,7 @@ sub_8092B68: @ 8092B68
movs r1, 0x2D
movs r2, 0x30
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
ldrh r0, [r6, 0x22]
ldrh r1, [r6, 0x20]
adds r0, r1
@@ -8875,7 +8875,7 @@ sub_8092B68: @ 8092B68
movs r1, 0x5D
movs r2, 0x30
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
ldrh r0, [r6, 0x12]
ldrh r1, [r6, 0x10]
adds r0, r1
@@ -8891,7 +8891,7 @@ sub_8092B68: @ 8092B68
movs r1, 0x2D
movs r2, 0x40
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
bl sub_806912C
cmp r0, 0
beq _08092C5E
@@ -8910,7 +8910,7 @@ sub_8092B68: @ 8092B68
movs r1, 0x2D
movs r2, 0x50
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_08092C5E:
pop {r3}
mov r8, r3
diff --git a/asm/rom3.s b/asm/rom3.s
index 6a23cf0c0..86a18c075 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -7107,7 +7107,7 @@ _0800F03E:
bl GetMonGender
strb r0, [r5, 0x1C]
adds r0, r7, 0
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
adds r0, r4, 0
movs r1, 0x3
bl GetMonData
@@ -7281,7 +7281,7 @@ _0800F1FA:
str r0, [r1, 0x8]
movs r0, 0x5
movs r1, 0
- bl sub_806AFAC
+ bl OpenPartyMenu
b _0800F27A
.align 2, 0
_0800F228: .4byte gBlockRecvBuffer
diff --git a/asm/rom6.s b/asm/rom6.s
index d3702a5c4..f9b879c69 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -45672,7 +45672,7 @@ sub_8121E10: @ 8121E10
movs r1, 0
strb r1, [r0]
movs r0, 0x4
- bl sub_806AFAC
+ bl OpenPartyMenu
pop {r0}
bx r0
.align 2, 0
@@ -45691,7 +45691,7 @@ sub_8121E34: @ 8121E34
strb r1, [r0]
movs r0, 0x4
movs r1, 0
- bl sub_806AFAC
+ bl OpenPartyMenu
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/rom_80412B0.s b/asm/rom_80412B0.s
index 4229d7ed1..0b3087ace 100644
--- a/asm/rom_80412B0.s
+++ b/asm/rom_80412B0.s
@@ -2467,8 +2467,8 @@ _08042540: .4byte gStringVar4
_08042544: .4byte gUnknown_08209AC4
thumb_func_end sp0B9_daycare_relationship_comment
- thumb_func_start sub_8042548
-sub_8042548: @ 8042548
+ thumb_func_start NameHasGenderSymbol
+NameHasGenderSymbol: @ 8042548
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -2538,10 +2538,10 @@ _080425BA:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8042548
+ thumb_func_end NameHasGenderSymbol
- thumb_func_start sub_80425C4
-sub_80425C4: @ 80425C4
+ thumb_func_start AppendGenderSymbol
+AppendGenderSymbol: @ 80425C4
push {r4,lr}
adds r4, r0, 0
lsls r1, 24
@@ -2549,7 +2549,7 @@ sub_80425C4: @ 80425C4
cmp r1, 0
bne _080425E4
movs r1, 0
- bl sub_8042548
+ bl NameHasGenderSymbol
lsls r0, 24
cmp r0, 0
bne _08042600
@@ -2562,7 +2562,7 @@ _080425E4:
bne _08042600
adds r0, r4, 0
movs r1, 0xFE
- bl sub_8042548
+ bl NameHasGenderSymbol
lsls r0, 24
cmp r0, 0
bne _08042600
@@ -2580,10 +2580,10 @@ _08042602:
bx r1
.align 2, 0
_08042610: .4byte gOtherText_GenderlessSymbol
- thumb_func_end sub_80425C4
+ thumb_func_end AppendGenderSymbol
- thumb_func_start sub_8042614
-sub_8042614: @ 8042614
+ thumb_func_start MonAppendGenderSymbol
+MonAppendGenderSymbol: @ 8042614
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
@@ -2592,14 +2592,14 @@ sub_8042614: @ 8042614
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_80425C4
+ bl AppendGenderSymbol
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8042614
+ thumb_func_end MonAppendGenderSymbol
- thumb_func_start sub_8042630
-sub_8042630: @ 8042630
+ thumb_func_start DaycareLevelMenuGetText
+DaycareLevelMenuGetText: @ 8042630
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2625,7 +2625,7 @@ _08042648:
bl pokemon_get_nick_
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8042614
+ bl MonAppendGenderSymbol
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -2657,10 +2657,10 @@ _08042648:
.align 2, 0
_080426A8: .4byte gOtherText_NewLine2
_080426AC: .4byte gOtherText_CancelAndLv
- thumb_func_end sub_8042630
+ thumb_func_end DaycareLevelMenuGetText
- thumb_func_start sub_80426B0
-sub_80426B0: @ 80426B0
+ thumb_func_start DaycareLevelMenuGetLevelText
+DaycareLevelMenuGetLevelText: @ 80426B0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2721,10 +2721,10 @@ _080426C6:
bx r0
.align 2, 0
_08042728: .4byte gOtherText_NewLine2
- thumb_func_end sub_80426B0
+ thumb_func_end DaycareLevelMenuGetLevelText
- thumb_func_start sub_804272C
-sub_804272C: @ 804272C
+ thumb_func_start DaycareLevelMenuProcessKeyInput
+DaycareLevelMenuProcessKeyInput: @ 804272C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -2836,10 +2836,10 @@ _08042816:
.align 2, 0
_0804281C: .4byte gUnknown_03005CE0
_08042820: .4byte gScriptResult
- thumb_func_end sub_804272C
+ thumb_func_end DaycareLevelMenuProcessKeyInput
- thumb_func_start sub_8042824
-sub_8042824: @ 8042824
+ thumb_func_start ShowDaycareLevelMenu
+ShowDaycareLevelMenu: @ 8042824
push {r4,lr}
sub sp, 0x6C
movs r0, 0xF
@@ -2850,19 +2850,19 @@ sub_8042824: @ 8042824
ldr r4, _08042880 @ =gSaveBlock1 + 0x2F9C
adds r0, r4, 0
add r1, sp, 0x8
- bl sub_8042630
+ bl DaycareLevelMenuGetText
add r0, sp, 0x8
movs r1, 0x10
movs r2, 0x7
bl MenuPrint
adds r0, r4, 0
add r1, sp, 0x8
- bl sub_80426B0
+ bl DaycareLevelMenuGetLevelText
add r0, sp, 0x8
movs r1, 0xCE
movs r2, 0x38
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
movs r0, 0
str r0, [sp]
movs r0, 0xD
@@ -2881,15 +2881,15 @@ sub_8042824: @ 8042824
bx r0
.align 2, 0
_08042880: .4byte gSaveBlock1 + 0x2F9C
-_08042884: .4byte sub_804272C
- thumb_func_end sub_8042824
+_08042884: .4byte DaycareLevelMenuProcessKeyInput
+ thumb_func_end ShowDaycareLevelMenu
- thumb_func_start sub_8042888
-sub_8042888: @ 8042888
+ thumb_func_start ChooseSendDaycareMon
+ChooseSendDaycareMon: @ 8042888
push {lr}
movs r0, 0x6
movs r1, 0
- bl sub_806AFAC
+ bl OpenPartyMenu
ldr r1, _0804289C @ =gMain
ldr r0, _080428A0 @ =c2_exit_to_overworld_2_switch
str r0, [r1, 0x8]
@@ -2898,10 +2898,10 @@ sub_8042888: @ 8042888
.align 2, 0
_0804289C: .4byte gMain
_080428A0: .4byte c2_exit_to_overworld_2_switch
- thumb_func_end sub_8042888
+ thumb_func_end ChooseSendDaycareMon
- thumb_func_start sub_80428A4
-sub_80428A4: @ 80428A4
+ thumb_func_start CreatedHatchedMon
+CreatedHatchedMon: @ 80428A4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3054,10 +3054,10 @@ _0804297C:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80428A4
+ thumb_func_end CreatedHatchedMon
- thumb_func_start sub_80429EC
-sub_80429EC: @ 80429EC
+ thumb_func_start AddHatchedMonToParty
+AddHatchedMonToParty: @ 80429EC
push {r4-r6,lr}
sub sp, 0x14
lsls r0, 24
@@ -3069,7 +3069,7 @@ sub_80429EC: @ 80429EC
adds r5, r0
ldr r1, _08042AA0 @ =gEnemyParty
adds r0, r5, 0
- bl sub_80428A4
+ bl CreatedHatchedMon
add r2, sp, 0xC
movs r6, 0
strb r6, [r2]
@@ -3134,19 +3134,19 @@ sub_80429EC: @ 80429EC
_08042A9C: .4byte gPlayerParty
_08042AA0: .4byte gEnemyParty
_08042AA4: .4byte gStringVar1
- thumb_func_end sub_80429EC
+ thumb_func_end AddHatchedMonToParty
- thumb_func_start sub_8042AA8
-sub_8042AA8: @ 8042AA8
+ thumb_func_start ScriptHatchMon
+ScriptHatchMon: @ 8042AA8
push {lr}
ldr r0, _08042AB8 @ =gUnknown_0202E8CC
ldrb r0, [r0]
- bl sub_80429EC
+ bl AddHatchedMonToParty
pop {r0}
bx r0
.align 2, 0
_08042AB8: .4byte gUnknown_0202E8CC
- thumb_func_end sub_8042AA8
+ thumb_func_end ScriptHatchMon
thumb_func_start sub_8042ABC
sub_8042ABC: @ 8042ABC
@@ -3231,8 +3231,8 @@ _08042B60: .4byte gSaveBlock1 + 0x2F9C
_08042B64: .4byte gUnknown_0202E8CC
thumb_func_end sub_8042B4C
- thumb_func_start sub_8042B68
-sub_8042B68: @ 8042B68
+ thumb_func_start EggHatchCreateMonSprite
+EggHatchCreateMonSprite: @ 8042B68
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -3354,20 +3354,20 @@ _08042C50:
_08042C60: .4byte gUnknown_02024E8C
_08042C64: .4byte gSprites
_08042C68: .4byte SpriteCallbackDummy
- thumb_func_end sub_8042B68
+ thumb_func_end EggHatchCreateMonSprite
- thumb_func_start sub_8042C6C
-sub_8042C6C: @ 8042C6C
+ thumb_func_start VBlankCB_EggHatch
+VBlankCB_EggHatch: @ 8042C6C
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
- thumb_func_end sub_8042C6C
+ thumb_func_end VBlankCB_EggHatch
- thumb_func_start sub_8042C80
-sub_8042C80: @ 8042C80
+ thumb_func_start EggHatch
+EggHatch: @ 8042C80
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -3385,11 +3385,11 @@ sub_8042C80: @ 8042C80
pop {r0}
bx r0
.align 2, 0
-_08042CA8: .4byte sub_8042CAC
- thumb_func_end sub_8042C80
+_08042CA8: .4byte Task_EggHatch
+ thumb_func_end EggHatch
- thumb_func_start sub_8042CAC
-sub_8042CAC: @ 8042CAC
+ thumb_func_start Task_EggHatch
+Task_EggHatch: @ 8042CAC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -3412,13 +3412,13 @@ _08042CD0:
bx r0
.align 2, 0
_08042CD8: .4byte gPaletteFade
-_08042CDC: .4byte sub_8042CE8
+_08042CDC: .4byte CB2_EggHatch_0
_08042CE0: .4byte gUnknown_0300485C
_08042CE4: .4byte sub_8080990
- thumb_func_end sub_8042CAC
+ thumb_func_end Task_EggHatch
- thumb_func_start sub_8042CE8
-sub_8042CE8: @ 8042CE8
+ thumb_func_start CB2_EggHatch_0
+CB2_EggHatch_0: @ 8042CE8
push {r4-r7,lr}
ldr r0, _08042D04 @ =gMain
ldr r1, _08042D08 @ =0x0000043c
@@ -3480,7 +3480,7 @@ _08042D34:
_08042D74: .4byte gUnknown_0300481C
_08042D78: .4byte 0x02018000
_08042D7C: .4byte gUnknown_0202E8CC
-_08042D80: .4byte sub_8042C6C
+_08042D80: .4byte VBlankCB_EggHatch
_08042D84: .4byte gMain
_08042D88: .4byte 0x0000043c
_08042D8C: .4byte gUnknown_0202E8CE
@@ -3564,7 +3564,7 @@ _08042E40:
strb r0, [r1]
ldr r0, [r2]
ldrb r0, [r0, 0x4]
- bl sub_80429EC
+ bl AddHatchedMonToParty
ldr r1, _08042E6C @ =gMain
ldr r2, _08042E70 @ =0x0000043c
adds r1, r2
@@ -3580,7 +3580,7 @@ _08042E74:
ldrb r2, [r0, 0x4]
movs r0, 0
movs r1, 0
- bl sub_8042B68
+ bl EggHatchCreateMonSprite
b _08042F04
.align 2, 0
_08042E84: .4byte gUnknown_0300481C
@@ -3590,7 +3590,7 @@ _08042E88:
ldrb r2, [r0, 0x4]
movs r0, 0
movs r1, 0x1
- bl sub_8042B68
+ bl EggHatchCreateMonSprite
ldr r1, [r4]
strb r0, [r1, 0x1]
ldr r1, _08042EA8 @ =gMain
@@ -3696,12 +3696,12 @@ _08042F6E:
_08042F74: .4byte REG_BG1CNT
_08042F78: .4byte 0x00000501
_08042F7C: .4byte REG_BG0HOFS
-_08042F80: .4byte sub_804300C
+_08042F80: .4byte CB2_EggHatch_1
_08042F84: .4byte gUnknown_0300481C
- thumb_func_end sub_8042CE8
+ thumb_func_end CB2_EggHatch_0
- thumb_func_start sub_8042F88
-sub_8042F88: @ 8042F88
+ thumb_func_start EggHatchSetMonNickname
+EggHatchSetMonNickname: @ 8042F88
push {lr}
ldr r0, _08042FA8 @ =gUnknown_0202E8CC
ldrh r1, [r0]
@@ -3721,10 +3721,10 @@ _08042FA8: .4byte gUnknown_0202E8CC
_08042FAC: .4byte gPlayerParty
_08042FB0: .4byte gStringVar3
_08042FB4: .4byte c2_exit_to_overworld_2_switch
- thumb_func_end sub_8042F88
+ thumb_func_end EggHatchSetMonNickname
- thumb_func_start c3_080472E4
-c3_080472E4: @ 8042FB8
+ thumb_func_start Task_EggHatchPlayBGM
+Task_EggHatchPlayBGM: @ 8042FB8
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -3765,10 +3765,10 @@ _08042FF8:
.align 2, 0
_08043004: .4byte gTasks
_08043008: .4byte 0x00000179
- thumb_func_end c3_080472E4
+ thumb_func_end Task_EggHatchPlayBGM
- thumb_func_start sub_804300C
-sub_804300C: @ 804300C
+ thumb_func_start CB2_EggHatch_1
+CB2_EggHatch_1: @ 804300C
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -3830,7 +3830,7 @@ _08043068:
b _080432BA
.align 2, 0
_08043098: .4byte gUnknown_0300481C
-_0804309C: .4byte c3_080472E4
+_0804309C: .4byte Task_EggHatchPlayBGM
_080430A0:
ldr r0, _080430BC @ =gPaletteFade
ldrb r1, [r0, 0x7]
@@ -3876,7 +3876,7 @@ _080430D2:
b _080432BA
.align 2, 0
_080430F0: .4byte gSprites
-_080430F4: .4byte sub_80432E4
+_080430F4: .4byte SpriteCB_Egg_0
_080430F8:
ldr r2, _0804311C @ =gSprites
ldr r3, [r5]
@@ -3913,7 +3913,7 @@ _08043124:
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
- bl sub_80436FC
+ bl EggHatchPrintMessage2
ldr r0, _08043160 @ =0x00000173
bl PlayFanfare
ldr r1, [r5]
@@ -3954,7 +3954,7 @@ _08043180:
adds r0, r4, 0
bl StringExpandPlaceholders
adds r0, r4, 0
- bl sub_80436D4
+ bl EggHatchPrintMessage1
ldr r1, [r5]
b _0804329C
.align 2, 0
@@ -3963,7 +3963,7 @@ _080431AC: .4byte gStringVar1
_080431B0: .4byte gStringVar4
_080431B4: .4byte gOtherText_NickHatchPrompt
_080431B8:
- bl sub_8043724
+ bl EggHatchUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _080432BA
@@ -4054,7 +4054,7 @@ _080431DA:
_08043278: .4byte gUnknown_0300481C
_0804327C: .4byte gPlayerParty
_08043280: .4byte gStringVar3
-_08043284: .4byte sub_8042F88
+_08043284: .4byte EggHatchSetMonNickname
_08043288:
movs r0, 0x1
negs r0, r0
@@ -4098,10 +4098,10 @@ _080432BA:
.align 2, 0
_080432DC: .4byte gPaletteFade
_080432E0: .4byte c2_exit_to_overworld_2_switch
- thumb_func_end sub_804300C
+ thumb_func_end CB2_EggHatch_1
- thumb_func_start sub_80432E4
-sub_80432E4: @ 80432E4
+ thumb_func_start SpriteCB_Egg_0
+SpriteCB_Egg_0: @ 80432E4
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x2E]
@@ -4117,7 +4117,7 @@ sub_80432E4: @ 80432E4
strh r0, [r4, 0x2E]
b _08043334
.align 2, 0
-_08043300: .4byte sub_804333C
+_08043300: .4byte SpriteCB_Egg_1
_08043304:
ldrh r0, [r4, 0x30]
adds r0, 0x14
@@ -4138,15 +4138,15 @@ _08043304:
adds r0, r4, 0
movs r1, 0x1
bl StartSpriteAnim
- bl sub_80435FC
+ bl CreateRandomEggShardSprite
_08043334:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80432E4
+ thumb_func_end SpriteCB_Egg_0
- thumb_func_start sub_804333C
-sub_804333C: @ 804333C
+ thumb_func_start SpriteCB_Egg_1
+SpriteCB_Egg_1: @ 804333C
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
@@ -4170,7 +4170,7 @@ sub_804333C: @ 804333C
strh r1, [r4, 0x32]
b _08043398
.align 2, 0
-_08043368: .4byte sub_80433A0
+_08043368: .4byte SpriteCB_Egg_2
_0804336C:
ldrh r0, [r4, 0x30]
adds r0, 0x14
@@ -4195,10 +4195,10 @@ _08043398:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_804333C
+ thumb_func_end SpriteCB_Egg_1
- thumb_func_start sub_80433A0
-sub_80433A0: @ 80433A0
+ thumb_func_start SpriteCB_Egg_2
+SpriteCB_Egg_2: @ 80433A0
push {r4-r6,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
@@ -4249,7 +4249,7 @@ sub_80433A0: @ 80433A0
strh r0, [r1, 0x26]
b _0804345A
.align 2, 0
-_08043404: .4byte sub_8043460
+_08043404: .4byte SpriteCB_Egg_3
_08043408: .4byte gUnknown_0300481C
_0804340C: .4byte gPlayerParty
_08043410: .4byte gSprites
@@ -4274,8 +4274,8 @@ _08043418:
adds r0, r4, 0
movs r1, 0x2
bl StartSpriteAnim
- bl sub_80435FC
- bl sub_80435FC
+ bl CreateRandomEggShardSprite
+ bl CreateRandomEggShardSprite
_0804344C:
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -4287,10 +4287,10 @@ _0804345A:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80433A0
+ thumb_func_end SpriteCB_Egg_2
- thumb_func_start sub_8043460
-sub_8043460: @ 8043460
+ thumb_func_start SpriteCB_Egg_3
+SpriteCB_Egg_3: @ 8043460
push {lr}
adds r1, r0, 0
ldrh r0, [r1, 0x2E]
@@ -4308,11 +4308,11 @@ _0804347A:
pop {r0}
bx r0
.align 2, 0
-_08043480: .4byte sub_8043484
- thumb_func_end sub_8043460
+_08043480: .4byte SpriteCB_Egg_4
+ thumb_func_end SpriteCB_Egg_3
- thumb_func_start sub_8043484
-sub_8043484: @ 8043484
+ thumb_func_start SpriteCB_Egg_4
+SpriteCB_Egg_4: @ 8043484
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -4334,7 +4334,7 @@ _080434A4:
bhi _080434C0
movs r4, 0
_080434AC:
- bl sub_80435FC
+ bl CreateRandomEggShardSprite
lsls r0, r4, 16
movs r1, 0x80
lsls r1, 9
@@ -4374,11 +4374,11 @@ _080434EE:
.align 2, 0
_080434F8: .4byte 0x0000ffff
_080434FC: .4byte gPaletteFade
-_08043500: .4byte sub_8043504
- thumb_func_end sub_8043484
+_08043500: .4byte SpriteCB_Egg_5
+ thumb_func_end SpriteCB_Egg_4
- thumb_func_start sub_8043504
-sub_8043504: @ 8043504
+ thumb_func_start SpriteCB_Egg_5
+SpriteCB_Egg_5: @ 8043504
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -4457,10 +4457,10 @@ _08043594: .4byte gSprites
_08043598: .4byte gUnknown_0300481C
_0804359C: .4byte 0x0000ffff
_080435A0: .4byte SpriteCallbackDummy
- thumb_func_end sub_8043504
+ thumb_func_end SpriteCB_Egg_5
- thumb_func_start sub_80435A4
-sub_80435A4: @ 80435A4
+ thumb_func_start SpriteCB_EggShard
+SpriteCB_EggShard: @ 80435A4
push {r4,lr}
adds r2, r0, 0
ldrh r0, [r2, 0x30]
@@ -4507,10 +4507,10 @@ _080435F6:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80435A4
+ thumb_func_end SpriteCB_EggShard
- thumb_func_start sub_80435FC
-sub_80435FC: @ 80435FC
+ thumb_func_start CreateRandomEggShardSprite
+CreateRandomEggShardSprite: @ 80435FC
push {r4-r6,lr}
sub sp, 0x8
ldr r3, _0804364C @ =gEggShardVelocities
@@ -4543,7 +4543,7 @@ sub_80435FC: @ 80435FC
movs r1, 0x3C
adds r2, r6, 0
adds r3, r5, 0
- bl sub_8043654
+ bl CreateEggShardSprite
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -4551,10 +4551,10 @@ sub_80435FC: @ 80435FC
.align 2, 0
_0804364C: .4byte gEggShardVelocities
_08043650: .4byte gUnknown_0300481C
- thumb_func_end sub_80435FC
+ thumb_func_end CreateRandomEggShardSprite
- thumb_func_start sub_8043654
-sub_8043654: @ 8043654
+ thumb_func_start CreateEggShardSprite
+CreateEggShardSprite: @ 8043654
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -4616,10 +4616,10 @@ sub_8043654: @ 8043654
.align 2, 0
_080436CC: .4byte gSpriteTemplate_820A418
_080436D0: .4byte gSprites
- thumb_func_end sub_8043654
+ thumb_func_end CreateEggShardSprite
- thumb_func_start sub_80436D4
-sub_80436D4: @ 80436D4
+ thumb_func_start EggHatchPrintMessage1
+EggHatchPrintMessage1: @ 80436D4
push {lr}
sub sp, 0x4
adds r1, r0, 0
@@ -4638,10 +4638,10 @@ sub_80436D4: @ 80436D4
bx r0
.align 2, 0
_080436F8: .4byte gUnknown_0300481C
- thumb_func_end sub_80436D4
+ thumb_func_end EggHatchPrintMessage1
- thumb_func_start sub_80436FC
-sub_80436FC: @ 80436FC
+ thumb_func_start EggHatchPrintMessage2
+EggHatchPrintMessage2: @ 80436FC
push {lr}
sub sp, 0x4
adds r1, r0, 0
@@ -4660,10 +4660,10 @@ sub_80436FC: @ 80436FC
bx r0
.align 2, 0
_08043720: .4byte gUnknown_0300481C
- thumb_func_end sub_80436FC
+ thumb_func_end EggHatchPrintMessage2
- thumb_func_start sub_8043724
-sub_8043724: @ 8043724
+ thumb_func_start EggHatchUpdateWindowText
+EggHatchUpdateWindowText: @ 8043724
push {lr}
ldr r0, _08043738 @ =gUnknown_0300481C
ldr r0, [r0]
@@ -4675,7 +4675,7 @@ sub_8043724: @ 8043724
bx r1
.align 2, 0
_08043738: .4byte gUnknown_0300481C
- thumb_func_end sub_8043724
+ thumb_func_end EggHatchUpdateWindowText
thumb_func_start sub_804373C
sub_804373C: @ 804373C
@@ -18643,7 +18643,7 @@ _0804A614:
bne _0804A664
add r0, sp, 0xC
movs r1, 0
- bl sub_8042548
+ bl NameHasGenderSymbol
lsls r0, 24
cmp r0, 0
bne _0804A6CC
@@ -18665,7 +18665,7 @@ _0804A664:
bne _0804A6CC
add r0, sp, 0xC
movs r1, 0xFE
- bl sub_8042548
+ bl NameHasGenderSymbol
lsls r0, 24
cmp r0, 0
bne _0804A6CC
@@ -27718,7 +27718,7 @@ _0804F31A:
lsls r2, 3
ldr r0, _0804F368 @ =gStringVar1
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_0804F34A:
movs r0, 0x2
add r8, r0
diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s
index 1de8affd2..e5012500d 100644
--- a/asm/rom_806D7F8.s
+++ b/asm/rom_806D7F8.s
@@ -6065,7 +6065,7 @@ _08070864:
lsls r5, r2, 3
adds r2, r5, 0
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
mov r8, r4
cmp r7, 0x2
bne _080708FC
@@ -6077,7 +6077,7 @@ _08070864:
ldr r0, _080708F8 @ =gOtherText_TallPlusAndRightArrow
adds r2, r5, 0
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
b _08070910
.align 2, 0
_080708E4: .4byte gStringVar1
@@ -6095,7 +6095,7 @@ _080708FC:
ldr r0, _08070960 @ =gOtherText_TallPlusAndRightArrow
adds r2, r5, 0
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_08070910:
movs r0, 0xFC
mov r1, r10
@@ -6122,7 +6122,7 @@ _08070910:
lsls r2, r0, 3
mov r0, r10
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
@@ -6208,7 +6208,7 @@ _08070982:
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index a24402dc6..5a92065fd 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -8381,7 +8381,7 @@ sub_8089A70: @ 8089A70
strb r1, [r0, 0x8]
movs r0, 0
movs r1, 0
- bl sub_806AFAC
+ bl OpenPartyMenu
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s
index 177b7609a..f49f9d6be 100644
--- a/asm/rom_8094928.s
+++ b/asm/rom_8094928.s
@@ -705,7 +705,7 @@ sub_8094E20: @ 8094E20
bl pokemon_change_order
movs r0, 0x1
movs r1, 0xFF
- bl sub_806AFAC
+ bl OpenPartyMenu
pop {r0}
bx r0
.align 2, 0
@@ -23151,7 +23151,7 @@ _0809FF6A:
movs r1, 0x7E
movs r2, 0x38
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
pop {r4,r5}
pop {r0}
bx r0
@@ -23923,7 +23923,7 @@ sub_80A0664: @ 80A0664
adds r0, r4, 0
bl StringCopy
adds r0, r4, 0
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
b _080A06C2
.align 2, 0
_080A06A0: .4byte 0x02018000
@@ -27057,7 +27057,7 @@ sub_80A1EF8: @ 80A1EF8
mov r0, r8
adds r1, r5, 0
adds r2, r6, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
add sp, 0x4
pop {r3,r4}
mov r8, r3
@@ -32634,7 +32634,7 @@ _080A49F4:
movs r2, 0x78
_080A4A08:
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
b _080A4A4C
.align 2, 0
_080A4A10: .4byte gUnknown_0840E740
@@ -32663,7 +32663,7 @@ _080A4A28:
mov r0, sp
movs r1, 0x4
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_080A4A4C:
add sp, 0x64
pop {r4,r5}
@@ -32742,7 +32742,7 @@ _080A4AB0:
mov r0, sp
movs r1, 0x4
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_080A4AD2:
add sp, 0x64
pop {r4,r5}
@@ -51750,7 +51750,7 @@ sub_80AE098: @ 80AE098
adds r1, r6, 0
bl StringCopy
mov r0, sp
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
ldr r0, _080AE0F4 @ =gUnknown_0203869A
ldrb r1, [r0]
movs r0, 0x1
@@ -51832,7 +51832,7 @@ _080AE108:
cmp r0, 0
beq _080AE19A
mov r0, sp
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
adds r0, r6, 0
movs r1, 0x3
bl GetMonData
@@ -63280,7 +63280,7 @@ _080B38EE:
movs r1, 0xCA
adds r2, r7, 0
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
add sp, 0x4
pop {r3,r4}
mov r8, r3
@@ -63362,7 +63362,7 @@ _080B39AC:
movs r1, 0xCA
adds r2, r7, 0
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_080B39C2:
add sp, 0x4
pop {r3,r4}
diff --git a/asm/rom_80B5054.s b/asm/rom_80B5054.s
index 16ceb308d..ee355d706 100644
--- a/asm/rom_80B5054.s
+++ b/asm/rom_80B5054.s
@@ -5735,7 +5735,7 @@ _080B7ACE:
lsls r2, r7, 3
mov r0, sp
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_080B7AE4:
add sp, 0x10
pop {r4-r7}
@@ -18847,7 +18847,7 @@ _080BDFDE:
bl sub_80BDEAC
strb r0, [r5, 0x3]
adds r0, r6, 0
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
_080BE012:
pop {r3}
mov r8, r3
@@ -19110,7 +19110,7 @@ sub_80BE188: @ 80BE188
bl sub_80BDEAC
strb r0, [r4, 0x1F]
adds r0, r5, 0
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
_080BE224:
pop {r4-r6}
pop {r0}
@@ -19482,7 +19482,7 @@ sub_80BE478: @ 80BE478
bl sub_80BDEAC
strb r0, [r4, 0x1F]
adds r0, r5, 0
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
_080BE548:
pop {r3,r4}
mov r8, r3
@@ -19731,7 +19731,7 @@ sub_80BE6A0: @ 80BE6A0
bl sub_80BDEAC
strb r0, [r4, 0xE]
adds r0, r5, 0
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -122775,7 +122775,7 @@ sub_80F0A74: @ 80F0A74
adds r0, r4, 0
movs r1, 0x61
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
ldr r1, _080F0AE8 @ =0x0000d158
adds r0, r5, r1
ldrh r0, [r0]
@@ -123240,7 +123240,7 @@ _080F0E42:
_080F0E54:
movs r1, 0x61
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
b _080F0EA0
.align 2, 0
_080F0E60: .4byte gUnknown_083DFEC4
@@ -123262,7 +123262,7 @@ _080F0E6C:
adds r0, r4, 0
movs r1, 0x61
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
b _080F0D6C
.align 2, 0
_080F0E94: .4byte gUnknown_083DFEC4
@@ -124630,7 +124630,7 @@ _080F19B8:
movs r1, 0x1
movs r2, 0x70
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
pop {r4,r5}
pop {r0}
bx r0
@@ -141428,7 +141428,7 @@ sub_80F9A8C: @ 80F9A8C
adds r0, r1
ldrb r0, [r0, 0x8]
movs r1, 0
- bl sub_806AFAC
+ bl OpenPartyMenu
adds r0, r4, 0
bl DestroyTask
_080F9ABE:
@@ -146483,7 +146483,7 @@ _080FC184:
movs r1, 0x1
movs r2, 0x90
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
b _080FC1E6
.align 2, 0
_080FC19C: .4byte gUnknown_083E771C
@@ -164709,7 +164709,7 @@ sub_8104B80: @ 8104B80
movs r1, 0xA
movs r2, 0x20
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -168695,7 +168695,7 @@ _081069AE:
adds r1, 0x1
lsls r2, 3
movs r3, 0x1
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_081069BE:
pop {r4-r6}
pop {r0}
diff --git a/asm/rom_8148B8C.s b/asm/rom_8148B8C.s
index 68e09152a..45959da5b 100644
--- a/asm/rom_8148B8C.s
+++ b/asm/rom_8148B8C.s
@@ -3303,7 +3303,7 @@ sub_814A518: @ 814A518
adds r4, r0, 0
lsls r1, 24
lsrs r5, r1, 24
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
adds r0, r4, 0
bl StringLength
lsls r0, 24
@@ -3357,7 +3357,7 @@ sub_814A568: @ 814A568
b _0814A588
_0814A582:
adds r0, r4, 0
- bl SkipExtCtrlCodes
+ bl StripExtCtrlCodes
_0814A588:
pop {r4}
pop {r0}
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 9eac88649..e793fc376 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -2563,7 +2563,7 @@ sub_8094448: @ 8094448
movs r1, 0x70
movs r2, 0x78
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
adds r0, r4, 0
adds r0, 0x7E
ldrh r1, [r0]
@@ -2575,7 +2575,7 @@ sub_8094448: @ 8094448
movs r1, 0x95
movs r2, 0x78
movs r3, 0
- bl sub_80729D8
+ bl MenuPrint_PixelCoords
_0809448C:
add sp, 0x10
pop {r4}
diff --git a/data/data2.s b/data/data2.s
index 62ab6f901..0370630c0 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -2167,7 +2167,7 @@ gSpriteAnimTable_820A408:: @ 820A408
.align 2
gSpriteTemplate_820A418:: @ 820A418
- spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, sub_80435A4
+ spr_template 23456, 54321, gOamData_820A3E0, gSpriteAnimTable_820A408, NULL, gDummySpriteAffineAnimTable, SpriteCB_EggShard
@ The values are Q8.8 fixed-point numbers.
.align 1
diff --git a/data/specials.s b/data/specials.s
index 4b0087182..0d79f0368 100644
--- a/data/specials.s
+++ b/data/specials.s
@@ -188,13 +188,13 @@ gSpecials::
.4byte sp0B9_daycare_relationship_comment
.4byte sub_8042328
.4byte daycare_send
- .4byte sub_8042888
- .4byte sub_8042824
+ .4byte ChooseSendDaycareMon
+ .4byte ShowDaycareLevelMenu
.4byte sub_80417B8
.4byte sub_8041770
.4byte sub_8041648
- .4byte sub_8042AA8
- .4byte sub_8042C80
+ .4byte ScriptHatchMon
+ .4byte EggHatch
.4byte sub_8042B4C
.4byte sub_811043C
.4byte sub_80B7CE8
diff --git a/include/menu.h b/include/menu.h
index f6c6e6851..4b54fc9a9 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -41,7 +41,7 @@ void PrintMenuItemsReordered(u8, u8, u8, u8 * const [][2], u8*);
void InitYesNoMenu(u8, u8, u8);
void DisplayYesNoMenu(u8, u8, u32);
s8 ProcessMenuInputNoWrap_(void);
-u8 sub_80729D8(u8 *, u8, u16, u8);
+u8 MenuPrint_PixelCoords(u8 *, u8, u16, u8);
u8 sub_8072A18(u8 *, u8, u16, u8, u32);
u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32);
int sub_8072AB0(u8 *, u8, u16, u8, u8, u32);
diff --git a/include/text.h b/include/text.h
index ff1229ffb..d79611f85 100644
--- a/include/text.h
+++ b/include/text.h
@@ -178,7 +178,7 @@ void sub_8004E28(struct Window *win, u8 *foreground, u8 *background, u8 *shadow)
void sub_8004E3C(struct WindowConfig *winConfig, u8 *tileData, const u8 *text);
u8 GetStringWidthGivenWindowConfig(struct WindowConfig *winConfig, const u8 *s);
void ConvertInternationalString(u8 *s, u8 language);
-void SkipExtCtrlCodes(u8 *str);
+void StripExtCtrlCodes(u8 *str);
s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2);
u8 sub_8004FD0(struct Window *win, u8 *dest, const u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 width, u32 a8);
diff --git a/src/link.c b/src/link.c
index 0e88ac91a..3f4ffe97d 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1241,7 +1241,7 @@ static void CB2_PrintErrorMessage(void)
switch (gMain.state)
{
case 0:
- sub_80729D8(gMultiText_LinkError, 20, 56, 1);
+ MenuPrint_PixelCoords(gMultiText_LinkError, 20, 56, 1);
break;
case 30:
case 60:
diff --git a/src/main_menu.c b/src/main_menu.c
index 550072099..9a5326ea1 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -626,7 +626,7 @@ void PrintBadgeCount(void)
MenuPrint(gMainMenuString_Badges, 16, 5);
ConvertIntToDecimalString(buffer, GetBadgeCount());
- sub_80729D8(buffer, 205, 40, 1);
+ MenuPrint_PixelCoords(buffer, 205, 40, 1);
}
//Text Strings
diff --git a/src/menu.c b/src/menu.c
index 4f194c0e8..4bdaa8caf 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -579,7 +579,7 @@ s8 ProcessMenuInputNoWrap_(void)
return ProcessMenuInputNoWrap();
}
-u8 sub_80729D8(u8 *text, u8 left, u16 top, u8 a4)
+u8 MenuPrint_PixelCoords(u8 *text, u8 left, u16 top, u8 a4)
{
return sub_8004D04(gMenuWindowPtr, text, gMenuTextTileOffset, left, top, a4);
}
diff --git a/src/option_menu.c b/src/option_menu.c
index 67a715988..abd295007 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -332,7 +332,7 @@ static void DrawOptionMenuChoice(u8 *text, u8 x, u8 y, u8 style)
dst[2] = style;
dst[i] = EOS;
- sub_80729D8(dst, x, y, 1);
+ MenuPrint_PixelCoords(dst, x, y, 1);
}
static u8 TextSpeed_ProcessInput(u8 selection)
diff --git a/src/pokedex.c b/src/pokedex.c
index ded629987..ae4aafbf2 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1139,7 +1139,7 @@ u8 sub_808DFE4(u16 a, u8 b, u8 c)
for(i = 0; i < 10; i++)
text[i] = 0xAE;
}
- sub_80729D8(text, (b - 0x11) * 8 + 0xFC, c * 8, 0);
+ MenuPrint_PixelCoords(text, (b - 0x11) * 8 + 0xFC, c * 8, 0);
}
#else
__attribute__((naked))
@@ -1228,7 +1228,7 @@ _0808E070:\n\
lsrs r2, r6, 16\n\
mov r0, sp\n\
movs r3, 0\n\
- bl sub_80729D8\n\
+ bl MenuPrint_PixelCoords\n\
adds r0, r4, 0\n\
add sp, 0xC\n\
pop {r4-r6}\n\
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index eb344946a..0c34279f7 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -307,7 +307,7 @@ void sub_803ADE8(struct Pokemon *mon, struct UnknownPokemonStruct *src)
language = 2;
SetMonData(mon, MON_DATA_LANGUAGE, &language);
- SkipExtCtrlCodes(nickname);
+ StripExtCtrlCodes(nickname);
SetMonData(mon, MON_DATA_NICKNAME, nickname);
SetMonData(mon, MON_DATA_FRIENDSHIP, (u8 *)&src->friendship);
SetMonData(mon, MON_DATA_HP_EV, (u8 *)&src->hpEV);
diff --git a/src/text.c b/src/text.c
index fe284328f..4f2581af6 100644
--- a/src/text.c
+++ b/src/text.c
@@ -3667,7 +3667,7 @@ void ConvertInternationalString(u8 *s, u8 language)
u8 i;
u8 length;
- SkipExtCtrlCodes(s);
+ StripExtCtrlCodes(s);
i = StringLength(s);
s[i++] = 0xFC;
s[i++] = 22;
@@ -3686,7 +3686,7 @@ void ConvertInternationalString(u8 *s, u8 language)
}
}
-void SkipExtCtrlCodes(u8 *str)
+void StripExtCtrlCodes(u8 *str)
{
u16 srcIndex = 0;
u16 destIndex = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 16:55:35 +0000