diff --git a/asm/include/overlay_24.inc b/asm/include/overlay_24.inc
index 68e80ba5..300b35d7 100644
--- a/asm/include/overlay_24.inc
+++ b/asm/include/overlay_24.inc
@@ -1,68 +1,72 @@
 #pragma once
-.public ShowDBox
-.public Rand16Bit
-.public StrncpySimple
-.public SpecialProcAddItemToBag
-.public strcpy
-.public ov11_02306C9C
-.public sub_02052F8C
-.public ov11_022DC504
-.public sub_020107AC
-.public sub_0202F2C4
-.public sub_0202836C
-.public CreateNormalMenu
-.public sub_0203EFD4
-.public sub_02017C50
-.public IsBagFull
-.public SetPokemonJoined
-.public IsDBoxActive
-.public ShowKeyboard
-.public sub_0200EB90
-.public sub_02037468
-.public SpecialStrcpy
-.public sub_02055DD0
-.public MemAlloc
-.public FreeNormalMenu
-.public CreateDBox
-.public StrcpySimple
-.public FreeDBox
-.public sub_02039218
-.public GetNormalMenuResult
-.public ShowPortraitBox
-.public MemFree
-.public GetNameRaw
-.public sub_0203931C
-.public sub_02017C10
-.public sub_0203909C
-.public ov11_02306C64
-.public sub_0203D438
-.public ov11_0230D220
-.public CreatePortraitBox
-.public InitPortraitBoxWithMonsterId
-.public sub_02053B60
-.public StrncpySimpleNoPadSafe
-.public ov11_02310BDC
-.public sub_0203D538
-.public sub_0206351C
-.public sub_0202C70C
-.public SetPortraitEmotion
-.public sub_0201077C
-.public GetNameWithGender
-.public GetFirstEmptyMemberIdx
-.public HidePortraitBox
-.public SetPortraitLayout
-.public sub_0200D670
-.public ov11_023061E4
-.public ShowMessageInDBox
 .public __divsi3
-.public InitPreprocessorArgs
-.public sub_020107C4
-.public sub_02017CB4
-.public IncrementNbEggsHatched
-.public sub_020107DC
+.public _020A1868
+.public _020A18B8
+.public _020A18DC
+.public _020A18E0
+.public CreateDBox
+.public CreateNormalMenu
+.public CreatePortraitBox
+.public FreeDBox
+.public FreeNormalMenu
+.public FreePortraitBox
 .public GetAdventureLogCompleted
+.public GetFirstEmptyMemberIdx
 .public GetKeyboardStatus
 .public GetKeyboardStringResult
+.public GetNameRaw
+.public GetNameWithGender
+.public GetNormalMenuResult
+.public HidePortraitBox
+.public IncrementNbEggsHatched
+.public InitPortraitBoxWithMonsterId
+.public InitPreprocessorArgs
+.public IsBagFull
+.public IsDBoxActive
+.public MemAlloc
+.public MemFree
+.public ov11_022DC504
+.public ov11_022E6E68
+.public ov11_023061E4
+.public ov11_02306C64
+.public ov11_02306C9C
+.public ov11_0230D220
+.public ov11_02310BDC
+.public Rand16Bit
+.public SetPokemonJoined
+.public SetPortraitEmotion
+.public SetPortraitLayout
+.public ShowDBox
+.public ShowKeyboard
+.public ShowMessageInDBox
+.public ShowPortraitBox
+.public SpecialProcAddItemToBag
+.public SpecialStrcpy
+.public strcpy
+.public StrcpySimple
+.public StrncpySimple
+.public StrncpySimpleNoPadSafe
+.public sub_0200D670
+.public sub_0200EB90
+.public sub_0201077C
 .public sub_02010794
-.public FreePortraitBox
-.public ov11_022E6E68
\ No newline at end of file
+.public sub_020107AC
+.public sub_020107C4
+.public sub_020107DC
+.public sub_02017C10
+.public sub_02017C50
+.public sub_02017CB4
+.public sub_0202836C
+.public sub_0202C70C
+.public sub_0202F2C4
+.public sub_02037468
+.public sub_0203909C
+.public sub_02039218
+.public sub_0203931C
+.public sub_0203D438
+.public sub_0203D538
+.public sub_0203EFD4
+.public sub_02052F8C
+.public sub_02053B60
+.public sub_02055DD0
+.public sub_0206351C
\ No newline at end of file
diff --git a/asm/main_0200C4CC.s b/asm/main_0200C4CC.s
index 4daf1614..4432ba83 100644
--- a/asm/main_0200C4CC.s
+++ b/asm/main_0200C4CC.s
@@ -169883,7 +169883,10 @@ _020A0C6E:
 	.byte 0xD0, 0x07, 0x00, 0x00, 0x2C, 0x04, 0x00, 0x00, 0x0A, 0x30, 0x04, 0x00, 0xD0, 0x07, 0x00, 0x00
 	.global _020A1864
 _020A1864:
-	.byte 0xB4, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00
+	.byte 0xB4, 0x00, 0x00, 0x00
+	.global _020A1868
+_020A1868:
+	.byte 0x32, 0x00, 0x00, 0x00
 	.global SPECIAL_BAND_STAT_BOOST
 SPECIAL_BAND_STAT_BOOST:
 	.byte 0x0C, 0x00, 0x00, 0x00
@@ -169933,7 +169936,10 @@ WONDER_GUMMI_STAT_BOOST:
 	.byte 0x03, 0x00, 0x00, 0x00
 	.global ZINC_BAND_STAT_BOOST
 ZINC_BAND_STAT_BOOST:
-	.byte 0x08, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00
+	.byte 0x08, 0x00, 0x00, 0x00
+	.global _020A18B8
+_020A18B8:
+	.byte 0x0A, 0x00, 0x00, 0x00
 	.global _020A18BC
 _020A18BC:
 	.byte 0x78, 0x05, 0x00, 0x00
@@ -169949,7 +169955,13 @@ _020A18C8:
 	.global _020A18D0
 _020A18D0:
 	.byte 0x05, 0x00, 0x05, 0x00
-	.byte 0x00, 0xC9, 0xFE, 0xFF, 0x00, 0x08, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00, 0x05, 0x00
+	.byte 0x00, 0xC9, 0xFE, 0xFF, 0x00, 0x08, 0x00, 0x00
+	.global _020A18DC
+_020A18DC:
+	.byte 0x05, 0x00, 0x05, 0x00
+	.global _020A18E0
+_020A18E0:
+	.byte 0x05, 0x00, 0x05, 0x00
 	.global _020A18E4
 _020A18E4:
 	.byte 0x05, 0x00, 0x05, 0x00, 0x54, 0x01, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xFF
diff --git a/asm/overlay_24.s b/asm/overlay_24.s
index 85902f21..f80afb25 100644
--- a/asm/overlay_24.s
+++ b/asm/overlay_24.s
@@ -356,7 +356,7 @@ ov24_0238A610: ; 0x0238A610
 	stmdb sp!, {r3, r4, lr}
 	sub sp, sp, #0x1c
 	ldr r1, _0238B384 ; =ov24_0238C600
-	ldr r3, _0238B388 ; =0x0238C50A
+	ldr r3, _0238B388 ; =ov24_0238C50A
 	ldr r1, [r1]
 	add r2, sp, #8
 	str r0, [r1]
@@ -484,10 +484,10 @@ _0238A7E4:
 	bl ShowMessageInDBox
 	b _0238B37C
 _0238A800:
-	ldr r0, _0238B3A0 ; =0x0238C5C0
+	ldr r0, _0238B3A0 ; =ov24_0238C5C0
 	mov r4, #4
 	ldr r1, _0238B3A4 ; =0x00300013
-	ldr r3, _0238B3A8 ; =0x0238C538
+	ldr r3, _0238B3A8 ; =ov24_0238C538
 	mov r2, #0
 	str r4, [sp]
 	bl CreateNormalMenu
@@ -855,7 +855,7 @@ _0238ACE0:
 	b _0238B37C
 _0238AD90:
 	mov r0, #0
-	ldr r3, _0238B3CC ; =0x0238C520
+	ldr r3, _0238B3CC ; =ov24_0238C520
 	mov r2, r0
 	mov r1, #0x11
 	str r0, [sp]
@@ -900,7 +900,7 @@ ov24_0238ADFC: ; 0x0238ADFC
 	str r2, [sp]
 	str r0, [sp, #4]
 	ldr r0, _0238B384 ; =ov24_0238C600
-	ldr r3, _0238B3D0 ; =0x0238C508
+	ldr r3, _0238B3D0 ; =ov24_0238C508
 	ldr r2, [r0]
 	add r0, r2, #0x248
 	add r2, r2, #0x42
@@ -958,7 +958,7 @@ _0238AF00:
 	bl Rand16Bit
 	mov r1, #0x64
 	bl __divsi3
-	ldr r0, _0238B3D8 ; =0x020A1868
+	ldr r0, _0238B3D8 ; =_020A1868
 	ldrsh r0, [r0]
 	cmp r1, r0
 	bge _0238B094
@@ -1047,7 +1047,7 @@ _0238AFC0:
 	strh r2, [sp, #0x18]
 	add r0, r0, #0x7a
 	strh r1, [sp, #0x16]
-	ldr r2, _0238B3E0 ; =0x0238C514
+	ldr r2, _0238B3E0 ; =ov24_0238C514
 	add r1, sp, #0x14
 	add r0, r0, #0x100
 	bl sub_0200D670
@@ -1103,7 +1103,7 @@ _0238B114:
 	mov r2, #1
 	str r2, [sp]
 	ldr r1, _0238B384 ; =ov24_0238C600
-	ldr r2, _0238B3D0 ; =0x0238C508
+	ldr r2, _0238B3D0 ; =ov24_0238C508
 	ldr r1, [r1]
 	add r3, sp, #8
 	add r1, r1, #0x42
@@ -1123,13 +1123,13 @@ _0238B170:
 	mov r2, #0xa
 	bl StrncpySimple
 	ldr r2, _0238B384 ; =ov24_0238C600
-	ldr r0, _0238B3E4 ; =0x020A18B8
+	ldr r0, _0238B3E4 ; =_020A18B8
 	ldr r1, [r2]
 	ldrsh r3, [r0]
 	ldr lr, [r1, #0x1e8]
-	ldr r1, _0238B3E8 ; =0x020A18DC
+	ldr r1, _0238B3E8 ; =_020A18DC
 	ldrsh r4, [lr, #0xa]
-	ldr r0, _0238B3EC ; =0x020A18E0
+	ldr r0, _0238B3EC ; =_020A18E0
 	ldrsh ip, [r1]
 	add r3, r4, r3
 	strh r3, [lr, #0xa]
@@ -1259,15 +1259,15 @@ _0238B37C:
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
 _0238B384: .word ov24_0238C600
-_0238B388: .word 0x0238C50A
+_0238B388: .word ov24_0238C50A
 _0238B38C: .word 0x00003018
 _0238B390: .word 0x0000038A
 _0238B394: .word 0x0000038B
 _0238B398: .word 0x00003008
 _0238B39C: .word 0x0000038F
-_0238B3A0: .word 0x0238C5C0
+_0238B3A0: .word ov24_0238C5C0
 _0238B3A4: .word 0x00300013
-_0238B3A8: .word 0x0238C538
+_0238B3A8: .word ov24_0238C538
 _0238B3AC: .word 0x00000391
 _0238B3B0: .word 0x0000220F
 _0238B3B4: .word 0x00000392
@@ -1276,15 +1276,15 @@ _0238B3BC: .word 0x00000397
 _0238B3C0: .word 0x00000396
 _0238B3C4: .word 0x00000715
 _0238B3C8: .word 0x00000395
-_0238B3CC: .word 0x0238C520
-_0238B3D0: .word 0x0238C508
+_0238B3CC: .word ov24_0238C520
+_0238B3D0: .word ov24_0238C508
 _0238B3D4: .word 0x000003A2
-_0238B3D8: .word 0x020A1868
+_0238B3D8: .word _020A1868
 _0238B3DC: .word 0x000003A1
-_0238B3E0: .word 0x0238C514
-_0238B3E4: .word 0x020A18B8
-_0238B3E8: .word 0x020A18DC
-_0238B3EC: .word 0x020A18E0
+_0238B3E0: .word ov24_0238C514
+_0238B3E4: .word _020A18B8
+_0238B3E8: .word _020A18DC
+_0238B3EC: .word _020A18E0
 _0238B3F0: .word 0x00000399
 _0238B3F4: .word 0x000003A3
 	arm_func_end ov24_0238ADFC
@@ -1293,7 +1293,7 @@ _0238B3F4: .word 0x000003A3
 ov24_0238B3F8: ; 0x0238B3F8
 	stmdb sp!, {r3, r4, lr}
 	sub sp, sp, #0x1c
-	ldr r3, _0238C160 ; =0x0238C50A
+	ldr r3, _0238C160 ; =ov24_0238C50A
 	add r2, sp, #0x12
 	mov r1, #4
 _0238B40C:
@@ -1419,10 +1419,10 @@ _0238B5C0:
 	bl ShowMessageInDBox
 	b _0238C158
 _0238B5DC:
-	ldr r0, _0238C17C ; =0x0238C5C0
+	ldr r0, _0238C17C ; =ov24_0238C5C0
 	mov r4, #4
 	ldr r1, _0238C180 ; =0x00300013
-	ldr r3, _0238C184 ; =0x0238C538
+	ldr r3, _0238C184 ; =ov24_0238C538
 	mov r2, #0
 	str r4, [sp]
 	bl CreateNormalMenu
@@ -1790,7 +1790,7 @@ _0238BABC:
 	b _0238C158
 _0238BB6C:
 	mov r0, #0
-	ldr r3, _0238C1A8 ; =0x0238C520
+	ldr r3, _0238C1A8 ; =ov24_0238C520
 	mov r2, r0
 	mov r1, #0x11
 	str r0, [sp]
@@ -1831,7 +1831,7 @@ _0238BB94:
 	str r2, [sp]
 	str r0, [sp, #4]
 	ldr r0, _0238C164 ; =ov24_0238C600
-	ldr r3, _0238C1AC ; =0x0238C508
+	ldr r3, _0238C1AC ; =ov24_0238C508
 	ldr r2, [r0]
 	add r0, r2, #0x248
 	add r2, r2, #0x42
@@ -1889,7 +1889,7 @@ _0238BCDC:
 	bl Rand16Bit
 	mov r1, #0x64
 	bl __divsi3
-	ldr r0, _0238C1B4 ; =0x020A1868
+	ldr r0, _0238C1B4 ; =_020A1868
 	ldrsh r0, [r0]
 	cmp r1, r0
 	bge _0238BE70
@@ -1978,7 +1978,7 @@ _0238BD9C:
 	strh r2, [sp, #0xc]
 	add r0, r0, #0x7a
 	strh r1, [sp, #0xa]
-	ldr r2, _0238C1BC ; =0x0238C514
+	ldr r2, _0238C1BC ; =ov24_0238C514
 	add r1, sp, #8
 	add r0, r0, #0x100
 	bl sub_0200D670
@@ -2034,7 +2034,7 @@ _0238BEF0:
 	mov r2, #1
 	str r2, [sp]
 	ldr r1, _0238C164 ; =ov24_0238C600
-	ldr r2, _0238C1AC ; =0x0238C508
+	ldr r2, _0238C1AC ; =ov24_0238C508
 	ldr r1, [r1]
 	add r3, sp, #0x12
 	add r1, r1, #0x42
@@ -2054,13 +2054,13 @@ _0238BF4C:
 	mov r2, #0xa
 	bl StrncpySimple
 	ldr r2, _0238C164 ; =ov24_0238C600
-	ldr r0, _0238C1C0 ; =0x020A18B8
+	ldr r0, _0238C1C0 ; =_020A18B8
 	ldr r1, [r2]
 	ldrsh r3, [r0]
 	ldr lr, [r1, #0x1e8]
-	ldr r1, _0238C1C4 ; =0x020A18DC
+	ldr r1, _0238C1C4 ; =_020A18DC
 	ldrsh r4, [lr, #0xa]
-	ldr r0, _0238C1C8 ; =0x020A18E0
+	ldr r0, _0238C1C8 ; =_020A18E0
 	ldrsh ip, [r1]
 	add r3, r4, r3
 	strh r3, [lr, #0xa]
@@ -2189,16 +2189,16 @@ _0238C158:
 	add sp, sp, #0x1c
 	ldmia sp!, {r3, r4, pc}
 	.align 2, 0
-_0238C160: .word 0x0238C50A
+_0238C160: .word ov24_0238C50A
 _0238C164: .word ov24_0238C600
 _0238C168: .word 0x00003018
 _0238C16C: .word 0x0000038A
 _0238C170: .word 0x0000038B
 _0238C174: .word 0x00003008
 _0238C178: .word 0x0000038F
-_0238C17C: .word 0x0238C5C0
+_0238C17C: .word ov24_0238C5C0
 _0238C180: .word 0x00300013
-_0238C184: .word 0x0238C538
+_0238C184: .word ov24_0238C538
 _0238C188: .word 0x00000391
 _0238C18C: .word 0x0000220F
 _0238C190: .word 0x00000392
@@ -2207,15 +2207,15 @@ _0238C198: .word 0x00000397
 _0238C19C: .word 0x00000396
 _0238C1A0: .word 0x00000715
 _0238C1A4: .word 0x00000395
-_0238C1A8: .word 0x0238C520
-_0238C1AC: .word 0x0238C508
+_0238C1A8: .word ov24_0238C520
+_0238C1AC: .word ov24_0238C508
 _0238C1B0: .word 0x000003A2
-_0238C1B4: .word 0x020A1868
+_0238C1B4: .word _020A1868
 _0238C1B8: .word 0x000003A1
-_0238C1BC: .word 0x0238C514
-_0238C1C0: .word 0x020A18B8
-_0238C1C4: .word 0x020A18DC
-_0238C1C8: .word 0x020A18E0
+_0238C1BC: .word ov24_0238C514
+_0238C1C0: .word _020A18B8
+_0238C1C4: .word _020A18DC
+_0238C1C8: .word _020A18E0
 _0238C1CC: .word 0x00000399
 _0238C1D0: .word 0x000003A3
 	arm_func_end ov24_0238B3F8
@@ -2461,9 +2461,22 @@ _0238C504: .word ov24_0238C600
 	arm_func_end ov24_0238C4CC
 	; 0x0238C508
 
-	.byte 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x86, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
+	.global ov24_0238C508
+ov24_0238C508:
+	.byte 0xF8, 0x00
+	.global ov24_0238C50A
+ov24_0238C50A:
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.global ov24_0238C514
+ov24_0238C514:
+	.byte 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+	.global ov24_0238C520
+ov24_0238C520:
+	.byte 0x86, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
 	.byte 0x87, 0x03, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+	.global ov24_0238C538
+ov24_0238C538:
 	.byte 0x8C, 0x03, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x8D, 0x03, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00
 	.byte 0x8E, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
 	.byte 0x8A, 0x03, 0x8B, 0x03, 0x8C, 0x03, 0x8D, 0x03, 0x8E, 0x03, 0x8F, 0x03, 0x90, 0x03, 0x91, 0x03
@@ -2472,7 +2485,10 @@ _0238C504: .word ov24_0238C600
 	.byte 0xA2, 0x03, 0xA3, 0x03, 0xA4, 0x03, 0xA5, 0x03, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x12, 0x10
 	.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x0A, 0x08, 0x03
 	.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x0F, 0x08, 0x03
-	.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
+	.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+	.global ov24_0238C5C0
+ov24_0238C5C0:
+	.byte 0x00, 0x00, 0x00, 0x00, 0x1E, 0x0F, 0x00, 0x00
 	.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x02, 0x08, 0x04
 	.byte 0x00, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00