start start menu decomp

asm/battle_records.s

@@ -507,7 +507,7 @@ sub_813C2F4: @ 813C2F4
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4}
 	pop {r0}
@@ -544,7 +544,7 @@ sub_813C384: @ 813C384
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	mov r1, r8
 	ldrb r0, [r1]
 	ldr r5, =gUnknown_085B3D8C
@@ -554,7 +554,7 @@ sub_813C384: @ 813C384
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x50
-	bl Print
+	bl PrintTextOnWindow
 	mov r1, r8
 	ldrb r0, [r1]
 	str r4, [sp]
@@ -563,7 +563,7 @@ sub_813C384: @ 813C384
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x80
-	bl Print
+	bl PrintTextOnWindow
 	mov r1, r8
 	ldrb r0, [r1]
 	str r4, [sp]
@@ -572,7 +572,7 @@ sub_813C384: @ 813C384
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0xB0
-	bl Print
+	bl PrintTextOnWindow
 	b _0813C4A8
 	.pool
 _0813C40C:
@@ -601,7 +601,7 @@ _0813C40C:
 	movs r1, 0x1
 	ldr r2, =gStringVar1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r1, [r6, 0xA]
 	ldr r0, =gStringVar1
 	movs r2, 0x1
@@ -615,7 +615,7 @@ _0813C40C:
 	movs r1, 0x1
 	ldr r2, =gStringVar1
 	movs r3, 0x50
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r1, [r6, 0xC]
 	ldr r0, =gStringVar1
 	movs r2, 0x1
@@ -629,7 +629,7 @@ _0813C40C:
 	movs r1, 0x1
 	ldr r2, =gStringVar1
 	movs r3, 0x80
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r1, [r6, 0xE]
 	ldr r0, =gStringVar1
 	movs r2, 0x1
@@ -643,7 +643,7 @@ _0813C40C:
 	movs r1, 0x1
 	ldr r2, =gStringVar1
 	movs r3, 0xB0
-	bl Print
+	bl PrintTextOnWindow
 _0813C4A8:
 	add sp, 0xC
 	pop {r3}
@@ -689,7 +689,7 @@ sub_813C4BC: @ 813C4BC
 	str r4, [sp, 0x4]
 	str r4, [sp, 0x8]
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =gSaveBlock1Ptr
 	mov r8, r0
 	ldr r0, [r0]
@@ -708,7 +708,7 @@ sub_813C4BC: @ 813C4BC
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	mov r7, r8
 	movs r6, 0xE0
 	lsls r6, 19

asm/berry_blender.s

@@ -8365,7 +8365,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24
 	str r4, [sp, 0x4]
 	str r4, [sp, 0x8]
 	adds r2, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r5]
 	ldr r2, =gUnknown_085EE473
 	movs r1, 0x29
@@ -8374,7 +8374,7 @@ ShowBerryBlenderRecordWindow: @ 8083E24
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x4
-	bl Print
+	bl PrintTextOnWindow
 	movs r6, 0
 	movs r7, 0xA4
 	lsls r7, 22
@@ -8425,7 +8425,7 @@ _08083E8A:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x80
 	lsls r0, 21
 	adds r7, r0

asm/berry_tag_screen.s

@@ -612,7 +612,7 @@ sub_8178174: @ 8178174
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r0, [r4, 0x8]
 	cmp r0, 0
 	beq _08178230
@@ -662,7 +662,7 @@ _081781C8:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0x28
-	bl Print
+	bl PrintTextOnWindow
 	b _08178242
 	.pool
 _08178230:
@@ -673,7 +673,7 @@ _08178230:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0x28
-	bl Print
+	bl PrintTextOnWindow
 _08178242:
 	add sp, 0xC
 	pop {r4-r7}
@@ -704,7 +704,7 @@ itemid_copy_name: @ 8178250
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r6, 0x7]
 	cmp r0, 0
 	beq _081782B0
@@ -720,7 +720,7 @@ itemid_copy_name: @ 8178250
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0x28
-	bl Print
+	bl PrintTextOnWindow
 	b _081782C2
 	.pool
 _081782B0:
@@ -731,7 +731,7 @@ _081782B0:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0x28
-	bl Print
+	bl PrintTextOnWindow
 _081782C2:
 	add sp, 0xC
 	pop {r4-r6}
@@ -760,7 +760,7 @@ sub_81782D0: @ 81782D0
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -787,7 +787,7 @@ sub_8178304: @ 8178304
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r0}
 	bx r0

asm/cable_club.s

@@ -74,7 +74,7 @@ sub_80B23B0: @ 80B23B0
 	adds r0, r4, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r4, 0
 	movs r1, 0x3
 	bl CopyWindowToVram

asm/clear_save_data_screen.s

@@ -41,7 +41,7 @@ sub_817ACE4: @ 817ACE4
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =gUnknown_085F06D8
 	movs r1, 0x2
 	movs r2, 0xE
@@ -95,7 +95,7 @@ _0817AD68:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, =gTasks
 	lsls r0, r5, 2
 	adds r0, r5

asm/coins.s

@@ -35,7 +35,7 @@ PrintCoinsString: @ 8145B54
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4}
 	pop {r0}

asm/contest_painting.s

@@ -438,7 +438,7 @@ _081301A6:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x1
 	bl CopyBgTilemapBufferToVram
 _081301D4:

asm/decoration.s

@@ -669,7 +669,7 @@ _08126F2C:
 	adds r0, r5, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	add sp, 0xC
@@ -742,7 +742,7 @@ _08126FA2:
 	movs r1, 0x1
 	adds r2, r4, 0
 	adds r3, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	mov r0, r8
 	bl sub_8161AD0
 	adds r1, r0, 0
@@ -780,7 +780,7 @@ _08126FA2:
 	movs r1, 0x1
 	adds r2, r4, 0
 	adds r3, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x18
 	pop {r3-r5}
 	mov r8, r3
@@ -1632,7 +1632,7 @@ _08127782:
 	adds r0, r5, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4,r5}
 	pop {r0}

asm/easy_chat.s

@@ -5910,7 +5910,7 @@ sub_811D028: @ 811D028
 	str r4, [sp]
 	str r5, [sp, 0x4]
 	str r6, [sp, 0x8]
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4-r6}
 	pop {r0}

asm/field_player_avatar.s

@@ -4294,7 +4294,7 @@ _0808CA94:
 	movs r0, 0
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r0, [r4, 0xC]
 	adds r0, 0x1
 	strh r0, [r4, 0xC]
@@ -4405,7 +4405,7 @@ fish6: @ 808CB6C
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]

asm/field_region_map.s

@@ -172,7 +172,7 @@ _08170300:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0
@@ -303,7 +303,7 @@ sub_8170428: @ 8170428
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	b _08170470

asm/link.s

@@ -43761,7 +43761,7 @@ sub_801FDDC: @ 801FDDC
 	str r4, [sp, 0x4]
 	str r6, [sp, 0x8]
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x18]
 	ldr r2, =gUnknown_085EAE66
@@ -43771,7 +43771,7 @@ sub_801FDDC: @ 801FDDC
 	str r6, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x18]
 	movs r1, 0x1
@@ -52875,7 +52875,7 @@ sub_80247D4: @ 80247D4
 	movs r1, 0x1
 	mov r2, r9
 	mov r3, r8
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r3,r4}
 	mov r8, r3
@@ -52917,7 +52917,7 @@ sub_802482C: @ 802482C
 	adds r0, r6, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	str r4, [sp]
 	adds r0, r6, 0
 	mov r1, r8
@@ -59432,7 +59432,7 @@ sub_8027BEC: @ 8027BEC
 	adds r0, r7, 0
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r6, 0
 	ldr r2, =gStringVar1
 	mov r8, r2
@@ -59474,7 +59474,7 @@ _08027C76:
 	adds r0, r7, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, [sp, 0x18]
 	lsls r3, r2, 3
 	subs r3, r5
@@ -59491,7 +59491,7 @@ _08027C76:
 	adds r0, r7, 0
 	movs r1, 0x1
 	mov r2, r8
-	bl Print
+	bl PrintTextOnWindow
 	adds r6, 0x1
 	cmp r6, 0x2
 	ble _08027C76
@@ -62870,7 +62870,7 @@ _08029774:
 	str r3, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	bl link_get_multiplayer_id
 	lsls r0, 24
 	lsrs r0, 24
@@ -62926,7 +62926,7 @@ _080297CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, =gUnknown_02022CF8
 	ldr r0, [r2]
 	add r0, r10
@@ -62941,7 +62941,7 @@ _080297CC:
 	movs r1, 0x1
 	ldr r2, =gUnknown_085EDE5D
 	lsrs r3, 24
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r5, 0x1
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -63080,7 +63080,7 @@ _0802996C:
 	movs r5, 0
 	str r5, [sp, 0x8]
 	mov r2, r8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r4]
 	add r0, r9
 	ldrb r0, [r0]
@@ -63091,7 +63091,7 @@ _0802996C:
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x44
-	bl Print
+	bl PrintTextOnWindow
 	mov r9, r5
 	ldr r0, [sp, 0xC]
 	cmp r9, r0
@@ -63219,7 +63219,7 @@ _08029AE0:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	ldr r2, =gStringVar4
-	bl Print
+	bl PrintTextOnWindow
 _08029B10:
 	adds r0, r7, 0x1
 	lsls r0, 24
@@ -63347,7 +63347,7 @@ _08029BFC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	b _08029F88
 	.pool
 _08029C60:
@@ -63513,7 +63513,7 @@ _08029DA0:
 	str r6, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	bl sub_81AFBF0
 	bl sub_802762C
 	lsls r0, 16
@@ -63539,7 +63539,7 @@ _08029DA0:
 	movs r1, 0x1
 	adds r2, r7, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	bl sub_80279C8
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -63585,7 +63585,7 @@ _08029EA8:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 _08029EC8:
 	ldr r4, =gUnknown_02022CF8
 	ldr r0, [r4]
@@ -63819,7 +63819,7 @@ _0802A0CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r7]
 	add r0, r10
 	ldrb r0, [r0]
@@ -63831,7 +63831,7 @@ _0802A0CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r7]
 	add r0, r10
 	ldrb r0, [r0]
@@ -63844,7 +63844,7 @@ _0802A0CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r7]
 	add r0, r10
 	ldrb r0, [r0]
@@ -63856,7 +63856,7 @@ _0802A0CC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r7]
 	add r0, r8
 	ldrb r0, [r0]
@@ -63923,7 +63923,7 @@ _0802A1DC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r7]
 	add r0, r8
 	ldrb r0, [r0]
@@ -63936,7 +63936,7 @@ _0802A1DC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r7]
 	add r0, r8
 	ldrb r0, [r0]
@@ -63953,7 +63953,7 @@ _0802A1DC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r7]
 	add r0, r8
 	ldrb r0, [r0]
@@ -64243,7 +64243,7 @@ _0802A4AC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	adds r0, r4
 	ldrb r0, [r0]
@@ -64403,7 +64403,7 @@ _0802A610:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r6]
 	adds r0, r4
 	ldrb r0, [r0]
@@ -70279,7 +70279,7 @@ _0802D46A:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -70363,7 +70363,7 @@ _0802D516:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -70481,7 +70481,7 @@ _0802D606:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -70561,7 +70561,7 @@ _0802D6AA:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -70760,7 +70760,7 @@ sub_802D7E8: @ 802D7E8
 	str r1, [sp, 0x4]
 	str r3, [sp, 0x8]
 	movs r1, 0x1
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -70814,7 +70814,7 @@ sub_802D884: @ 802D884
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r4]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -70867,7 +70867,7 @@ sub_802D8FC: @ 802D8FC
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r4]
 	ldrb r0, [r0, 0x12]
 	movs r1, 0x2
@@ -72425,7 +72425,7 @@ sub_802E500: @ 802E500
 	adds r0, r4, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r6, 0
 	adds r7, r4, 0
 	movs r0, 0xFF
@@ -72453,7 +72453,7 @@ _0802E58A:
 	adds r0, r7, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [sp, 0x20]
 	ldm r0!, {r1}
 	str r0, [sp, 0x20]
@@ -72480,7 +72480,7 @@ _0802E58A:
 	adds r0, r7, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x80
 	lsls r0, 21
 	add r8, r0

asm/main_menu.s

@@ -4509,7 +4509,7 @@ CreateMainMenuErrorWindow: @ 8031E18
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x7
 	bl PutWindowTilemap
 	movs r0, 0x7

asm/mauville_old_man.s

@@ -810,7 +810,7 @@ sub_8120708: @ 8120708
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =gUnknown_03002F84
 	strb r4, [r0]
 	movs r0, 0
@@ -2292,7 +2292,7 @@ _08121272:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x80
 	lsls r0, 21
 	adds r5, r0
@@ -2321,7 +2321,7 @@ _081212AA:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r4, [r5]
 	bl sub_8120ED8
 	adds r1, r0, 0

asm/money.s

@@ -207,7 +207,7 @@ _080E5264:
 	adds r0, r7, 0
 	movs r1, 0x1
 	mov r3, r8
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r3}
 	mov r8, r3

asm/naming_screen.s

@@ -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

asm/option_menu.s

@@ -833,7 +833,7 @@ _080BABAE:
 	movs r1, 0x1
 	add r2, sp, 0xC
 	adds r3, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x1C
 	pop {r4-r6}
 	pop {r0}
@@ -1470,7 +1470,7 @@ sub_80BB0D0: @ 80BB0D0
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -1505,7 +1505,7 @@ _080BB114:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24

asm/player_pc.s

@@ -472,7 +472,7 @@ sub_816B21C: @ 816B21C
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4}
 	pop {r0}
@@ -966,7 +966,7 @@ sub_816B5F8: @ 816B5F8
 	adds r0, r4, 0
 	movs r1, 0x1
 	adds r2, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	ldr r4, =gUnknown_0203BCB8
@@ -1968,7 +1968,7 @@ _0816BE8E:
 	adds r0, r6, 0
 	movs r1, 0x7
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 _0816BED4:
 	add sp, 0xC
 	pop {r4-r6}
@@ -2019,7 +2019,7 @@ _0816BF32:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4,r5}
 	pop {r0}
@@ -2317,7 +2317,7 @@ _0816C186:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r4]
 	ldr r1, =0x00000662
 	adds r0, r1
@@ -2448,7 +2448,7 @@ sub_816C2C0: @ 816C2C0
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4-r6}
 	pop {r0}
@@ -2909,7 +2909,7 @@ sub_816C6BC: @ 816C6BC
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4-r6}
 	pop {r0}

asm/record_mixing.s

@@ -470,7 +470,7 @@ sub_80E70F4: @ 80E70F4
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram

asm/region_map.s

@@ -3461,7 +3461,7 @@ _0812480C:
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	b _0812489C
@@ -3607,7 +3607,7 @@ _08124926:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r5]
 	ldrb r0, [r0, 0xB]
 	ldr r1, [r4]
@@ -3628,7 +3628,7 @@ _08124926:
 	movs r0, 0x1
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	ldr r0, =gUnknown_03001180
@@ -3674,7 +3674,7 @@ _081249FC:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	ldr r0, =gUnknown_03001180

asm/reset_rtc_screen.s

@@ -460,7 +460,7 @@ sub_809EBC4: @ 809EBC4
 	mov r0, r10
 	movs r1, 0x1
 	ldr r3, [sp, 0xC]
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -523,7 +523,7 @@ sub_809ECB4: @ 809ECB4
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x7E
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	add sp, 0xC
@@ -976,7 +976,7 @@ sub_809F0C0: @ 809F0C0
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	add sp, 0xC
@@ -1020,7 +1020,7 @@ _0809F11C:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, =gLocalTime
 	ldrh r3, [r1]
 	ldrb r0, [r1, 0x2]
@@ -1041,7 +1041,7 @@ _0809F11C:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =gSaveBlock2Ptr
 	ldr r1, [r0]
 	adds r0, r1, 0

asm/rom6.s

@@ -8236,8 +8236,8 @@ _08139944:
 	bx r1
 	thumb_func_end sub_813990C
 
-	thumb_func_start in_multi_battle_room_with_var_condition
+	thumb_func_start InMultiBattleRoom
-in_multi_battle_room_with_var_condition: @ 813994C
+InMultiBattleRoom: @ 813994C
 	push {lr}
 	ldr r0, =gSaveBlock1Ptr
 	ldr r0, [r0]
@@ -8259,7 +8259,7 @@ _08139978:
 _0813997A:
 	pop {r1}
 	bx r1
-	thumb_func_end in_multi_battle_room_with_var_condition
+	thumb_func_end InMultiBattleRoom
 
 	thumb_func_start sub_8139980
 sub_8139980: @ 8139980
@@ -8530,7 +8530,7 @@ sub_8139B60: @ 8139B60
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r6, =gUnknown_085B2BB4
 	ldr r4, =gSpecialVar_0x8005
 	ldrh r0, [r4]
@@ -8555,7 +8555,7 @@ sub_8139B60: @ 8139B60
 	mov r1, r8
 	str r1, [sp, 0x8]
 	movs r1, 0x1
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r5]
 	bl PutWindowTilemap
 	ldrb r0, [r5]
@@ -10149,7 +10149,7 @@ sub_813A8FC: @ 813A8FC
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x2C
 	pop {r0}
 	bx r0
@@ -10644,7 +10644,7 @@ sub_813AD34: @ 813AD34
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	b _0813ADAC
 	.pool
 _0813AD90:
@@ -10660,7 +10660,7 @@ _0813AD90:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 _0813ADAC:
 	add sp, 0xC
 	pop {r4-r7}
@@ -10764,7 +10764,7 @@ _0813AE1E:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r0, [r6, 0x22]
 	lsls r0, 24
 	lsrs r0, 24

asm/rom_8034C54.s

@@ -18305,7 +18305,7 @@ bs5_8016AC0: @ 803EFF0
 	strh r1, [r0]
 	ldr r0, =gUnknown_02022E16
 	strh r1, [r0]
-	ldr r1, =gUnknown_0203A04C
+	ldr r1, =gNumSafariBalls
 	ldrb r0, [r1]
 	subs r0, 0x1
 	strb r0, [r1]

asm/rom_8072304.s

@@ -4422,7 +4422,7 @@ sub_80747D8: @ 80747D8
 	ldr r1, =gUnknown_085CCB3C
 	add r0, sp, 0x4
 	bl StringCopy
-	ldr r1, =gUnknown_0203A04C
+	ldr r1, =gNumSafariBalls
 	ldrb r1, [r1]
 	movs r2, 0
 	movs r3, 0x2

asm/rom_80C6FA0.s

@@ -6108,7 +6108,7 @@ sub_80CA4FC: @ 80CA4FC
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, [r6]
 	ldr r1, =0x00000d1d
 	adds r2, r1
@@ -6119,7 +6119,7 @@ sub_80CA4FC: @ 80CA4FC
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, [r6]
 	ldr r0, =0x00000d41
 	adds r2, r0
@@ -6130,7 +6130,7 @@ sub_80CA4FC: @ 80CA4FC
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0xA
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, [r6]
 	ldr r1, =0x00000d65
 	adds r2, r1
@@ -6141,7 +6141,7 @@ sub_80CA4FC: @ 80CA4FC
 	movs r0, 0
 	movs r1, 0
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	b _080CA5E8
 	.pool
 _080CA588:
@@ -6155,7 +6155,7 @@ _080CA588:
 	movs r0, 0
 	movs r1, 0
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, [r6]
 	ldr r1, =0x00000cf9
 	adds r2, r1
@@ -6166,7 +6166,7 @@ _080CA588:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, [r6]
 	ldr r0, =0x00000d1d
 	adds r2, r0
@@ -6177,7 +6177,7 @@ _080CA588:
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, [r6]
 	ldr r1, =0x00000d41
 	adds r2, r1
@@ -6188,7 +6188,7 @@ _080CA588:
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0xA
-	bl Print
+	bl PrintTextOnWindow
 _080CA5E8:
 	movs r0, 0
 	movs r1, 0x2
@@ -7058,7 +7058,7 @@ _080CAD30:
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x1
 	movs r1, 0x2
 	movs r2, 0xE
@@ -26425,7 +26425,7 @@ _080D4A18:
 	movs r1, 0x7
 	add r2, sp, 0xC
 	adds r3, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	bl GetMapNamePopUpWindowId
 	lsls r0, 24
 	lsrs r0, 24

asm/rom_815A0D4.s

@@ -13440,7 +13440,7 @@ _08160EF0:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 _08160F38:
 	add sp, 0xC
 	pop {r4-r6}
@@ -13594,7 +13594,7 @@ sub_8161074: @ 8161074
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 _081610A6:
 	add sp, 0xC
 	pop {r4,r5}

asm/rom_8161F74.s

@@ -9016,7 +9016,7 @@ sub_8166D44: @ 8166D44
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	bl PutWindowTilemap
 	movs r0, 0x2
@@ -9232,7 +9232,7 @@ sub_8166F50: @ 8166F50
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	bl PutWindowTilemap
 	movs r0, 0x2
@@ -9271,7 +9271,7 @@ sub_8166FB0: @ 8166FB0
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -10673,7 +10673,7 @@ sub_8167BA0: @ 8167BA0
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, [r7]
 	ldr r1, =0x00008041
 	adds r0, r1

asm/rom_818CFC8.s

@@ -20282,13 +20282,13 @@ _081979F6:
 	.pool
 	thumb_func_end sub_81979C4
 
-	thumb_func_start get_start_menu_window_id_maybe
+	thumb_func_start GetStartMenuWindowId
-get_start_menu_window_id_maybe: @ 8197A08
+GetStartMenuWindowId: @ 8197A08
 	ldr r0, =gUnknown_0203CD8C
 	ldrb r0, [r0]
 	bx lr
 	.pool
-	thumb_func_end get_start_menu_window_id_maybe
+	thumb_func_end GetStartMenuWindowId
 
 	thumb_func_start remove_start_menu_window_maybe
 remove_start_menu_window_maybe: @ 8197A14
@@ -21634,7 +21634,7 @@ RedrawMenuCursor: @ 8198448
 	movs r4, 0
 	str r4, [sp, 0x4]
 	str r4, [sp, 0x8]
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r3,r4}
 	mov r8, r3
@@ -22022,7 +22022,7 @@ _08198774:
 	adds r0, r6, 0
 	mov r1, r10
 	mov r3, r9
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -22744,7 +22744,7 @@ _08198CF8:
 	str r0, [sp, 0x8]
 	mov r0, r10
 	ldr r1, [sp, 0xC]
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -23253,7 +23253,7 @@ sub_8199060: @ 8199060
 	str r3, [sp, 0x4]
 	str r3, [sp, 0x8]
 	adds r3, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r3-r5}
 	mov r8, r3
@@ -23882,7 +23882,7 @@ _081995AA:
 	mov r0, r8
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x80
 	lsls r0, 21
 	adds r6, r0
@@ -24175,7 +24175,7 @@ _081997EC:
 	str r0, [sp, 0x8]
 	mov r0, r10
 	movs r1, 0x1
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, [sp, 0xC]
 	lsls r0, r1, 24
 	adds r5, r0
@@ -25303,7 +25303,7 @@ _0819A04C:
 	adds r0, r7, 0
 	movs r1, 0x1
 	adds r2, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4-r7}
 	pop {r0}
@@ -28273,7 +28273,7 @@ sub_819B9B4: @ 819B9B4
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x2
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -28371,7 +28371,7 @@ _0819BA9C:
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0x2
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -28397,7 +28397,7 @@ sub_819BAC8: @ 819BAC8
 	movs r0, 0x2
 	movs r1, 0x1
 	movs r3, 0x2
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -28684,7 +28684,7 @@ sub_819BCF8: @ 819BCF8
 	movs r0, 0x5
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x5
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -34147,7 +34147,7 @@ sub_819EB18: @ 819EB18
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x2
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -34246,7 +34246,7 @@ sub_819EBEC: @ 819EBEC
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0x2
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -34714,7 +34714,7 @@ _0819EFF2:
 	movs r0, 0x8
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x8
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -37534,7 +37534,7 @@ _081A06B8:
 	adds r0, r5, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r4, 0x1
 	lsls r0, 24
 	lsrs r4, r0, 24
@@ -40160,7 +40160,7 @@ sub_81A1C4C: @ 81A1C4C
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4,r5}
 	pop {r0}
@@ -40199,7 +40199,7 @@ _081A1C9E:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0x4
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x34
 	pop {r4}
 	pop {r0}
@@ -40241,7 +40241,7 @@ sub_81A1CD8: @ 81A1CD8
 	movs r1, 0x1
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =0x0000270f
 	cmp r6, r0
 	bls _081A1D24
@@ -40266,7 +40266,7 @@ _081A1D24:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0xC]
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -40500,7 +40500,7 @@ _081A1F28:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r6]
 	ldr r2, =gUnknown_085EE2F9
 	movs r1, 0x61
@@ -40510,7 +40510,7 @@ _081A1F28:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0xA
 	bl sub_81A1C90
 	mov r0, r8
@@ -40613,7 +40613,7 @@ sub_81A2008: @ 81A2008
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	mov r2, r12
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =gStringVar1
 	adds r1, r4, 0
 	movs r2, 0x1
@@ -40633,7 +40633,7 @@ sub_81A2008: @ 81A2008
 	movs r1, 0x1
 	adds r2, r4, 0
 	adds r3, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r3-r5}
 	mov r8, r3
@@ -40771,7 +40771,7 @@ _081A2184:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, =gUnknown_0203AB74
 	ldrb r0, [r1]
 	ldr r2, =gUnknown_085EE2F9
@@ -40781,7 +40781,7 @@ _081A2184:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0xA
 	bl sub_81A1C90
 	str r6, [sp]
@@ -40907,7 +40907,7 @@ sub_81A22B8: @ 81A22B8
 	movs r1, 0x1
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =0x0000270f
 	cmp r6, r0
 	bls _081A2304
@@ -40932,7 +40932,7 @@ _081A2304:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0xC]
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -41125,7 +41125,7 @@ _081A24B0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r6]
 	ldr r2, =gUnknown_085EE2F9
 	movs r1, 0x61
@@ -41135,7 +41135,7 @@ _081A24B0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0xA
 	bl sub_81A1C90
 	mov r0, r8
@@ -41235,7 +41235,7 @@ sub_81A258C: @ 81A258C
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	mov r2, r12
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =gStringVar1
 	adds r1, r4, 0
 	movs r2, 0x1
@@ -41255,7 +41255,7 @@ sub_81A258C: @ 81A258C
 	movs r1, 0x1
 	adds r2, r4, 0
 	adds r3, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r3-r5}
 	mov r8, r3
@@ -41363,7 +41363,7 @@ sub_81A2698: @ 81A2698
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r6]
 	ldr r2, =gUnknown_085EE2F9
 	movs r1, 0x61
@@ -41372,7 +41372,7 @@ sub_81A2698: @ 81A2698
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0xA
 	bl sub_81A1C90
 	movs r0, 0
@@ -41488,7 +41488,7 @@ sub_81A27E8: @ 81A27E8
 	movs r1, 0x1
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =0x0000270f
 	cmp r6, r0
 	bls _081A2834
@@ -41513,7 +41513,7 @@ _081A2834:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0xC]
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -41668,7 +41668,7 @@ sub_81A2968: @ 81A2968
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r5]
 	ldr r2, =gUnknown_085EE2F9
 	movs r1, 0x61
@@ -41677,7 +41677,7 @@ sub_81A2968: @ 81A2968
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x10
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x48
 	movs r2, 0x7E
@@ -41750,7 +41750,7 @@ sub_81A2A28: @ 81A2A28
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	mov r2, r12
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =0x0000270f
 	cmp r7, r0
 	bls _081A2A80
@@ -41776,7 +41776,7 @@ _081A2A80:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0x10]
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r5, 0
 	ldr r1, [sp, 0xC]
 	movs r2, 0x1
@@ -41795,7 +41795,7 @@ _081A2A80:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0x14]
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x18
 	pop {r3-r5}
 	mov r8, r3
@@ -42051,7 +42051,7 @@ _081A2CE0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	mov r1, r8
 	ldrb r0, [r1]
 	ldr r2, =gUnknown_085EE326
@@ -42060,7 +42060,7 @@ _081A2CE0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x98
-	bl Print
+	bl PrintTextOnWindow
 	mov r1, r8
 	ldrb r0, [r1]
 	ldr r2, =gUnknown_085EE2F9
@@ -42070,7 +42070,7 @@ _081A2CE0:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0xA
 	bl sub_81A1C90
 	movs r4, 0x9E
@@ -42156,7 +42156,7 @@ sub_81A2DB4: @ 81A2DB4
 	movs r1, 0x1
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =0x0000270f
 	cmp r6, r0
 	bls _081A2E00
@@ -42181,7 +42181,7 @@ _081A2E00:
 	movs r1, 0x1
 	adds r2, r4, 0
 	ldr r3, [sp, 0xC]
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x10
 	pop {r3-r5}
 	mov r8, r3
@@ -42336,7 +42336,7 @@ sub_81A2F38: @ 81A2F38
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r5]
 	ldr r2, =gUnknown_085EE2F9
 	movs r1, 0x61
@@ -42345,7 +42345,7 @@ sub_81A2F38: @ 81A2F38
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0xA
 	bl sub_81A1C90
 	movs r0, 0
@@ -42416,7 +42416,7 @@ sub_81A2FF8: @ 81A2FF8
 	movs r5, 0
 	str r5, [sp, 0x8]
 	mov r2, r9
-	bl Print
+	bl PrintTextOnWindow
 	ldr r7, =gUnknown_085EDFA0
 	movs r0, 0x1
 	adds r1, r7, 0
@@ -42434,7 +42434,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r7, =gUnknown_085EDFA4
 	movs r0, 0x1
 	adds r1, r7, 0
@@ -42451,7 +42451,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r7, =gUnknown_085EDFA8
 	movs r0, 0x1
 	adds r1, r7, 0
@@ -42468,7 +42468,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r7, =gUnknown_085EDFAC
 	movs r0, 0x1
 	adds r1, r7, 0
@@ -42485,7 +42485,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	ldr r2, =gUnknown_085EB0E8
 	movs r1, 0x29
@@ -42494,7 +42494,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	ldr r2, =gUnknown_085EB0ED
 	movs r1, 0x39
@@ -42503,7 +42503,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	ldr r2, =gUnknown_085EB0F4
 	movs r1, 0x49
@@ -42512,7 +42512,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	ldr r2, =gUnknown_085EB0F9
 	movs r1, 0x59
@@ -42521,7 +42521,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	ldr r2, =gUnknown_085EB0FF
 	movs r1, 0x69
@@ -42530,7 +42530,7 @@ sub_81A2FF8: @ 81A2FF8
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x6
-	bl Print
+	bl PrintTextOnWindow
 	movs r1, 0
 _081A314A:
 	movs r5, 0
@@ -42568,7 +42568,7 @@ _081A315C:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	mov r2, r9
-	bl Print
+	bl PrintTextOnWindow
 	adds r4, 0x2
 	adds r5, 0x1
 	cmp r5, 0x3
@@ -44855,7 +44855,7 @@ sub_81A4594: @ 81A4594
 	adds r0, r5, 0
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0xFF
 	strb r0, [r6, 0xD]
 	ldrh r0, [r6, 0x4]
@@ -44878,7 +44878,7 @@ sub_81A4594: @ 81A4594
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r1, [r6, 0x4]
 	ldr r0, =0x0000270f
 	cmp r1, r0
@@ -44914,7 +44914,7 @@ _081A4618:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 _081A465C:
 	add sp, 0x2C
 	pop {r3-r5}
@@ -44965,7 +44965,7 @@ sub_81A4684: @ 81A4684
 	str r3, [sp, 0x8]
 	movs r1, 0x1
 	mov r3, r12
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r0, [r5, 0x8]
 	cmp r0, 0
 	beq _081A47BC
@@ -44996,7 +44996,7 @@ sub_81A4684: @ 81A4684
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	adds r4, r5, 0
 	adds r4, 0x12
 	adds r0, r4, 0
@@ -45037,7 +45037,7 @@ _081A473C:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r1, [r5, 0x8]
 	ldr r0, =0x0000270f
 	cmp r1, r0
@@ -45073,7 +45073,7 @@ _081A4778:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 _081A47BC:
 	add sp, 0x2C
 	pop {r3-r5}
@@ -45348,7 +45348,7 @@ sub_81A4998: @ 81A4998
 	str r5, [sp, 0x8]
 	adds r2, r6, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, =gUnknown_08611D00
 	ldr r2, [sp, 0x90]
 	lsls r0, r2, 2
@@ -45370,7 +45370,7 @@ sub_81A4998: @ 81A4998
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	cmp r7, 0x9
 	bne _081A4A6C
 	ldr r2, =gSaveBlock2Ptr
@@ -59192,7 +59192,7 @@ _081ABC6C:
 	adds r0, r5, 0
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4,r5}
 	pop {r0}
@@ -59232,7 +59232,7 @@ _081ABCD4:
 	movs r1, 0x1
 	adds r2, r6, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	str r5, [sp]
 	adds r0, r4, 0
 	movs r1, 0x26
@@ -61915,7 +61915,7 @@ UseRegisteredKeyItemOnField: @ 81AD520
 	lsrs r7, r0, 24
 	cmp r7, 0
 	bne _081AD54C
-	bl in_multi_battle_room_with_var_condition
+	bl InMultiBattleRoom
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -73208,7 +73208,7 @@ _081B3104:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	bl schedule_bg_copy_tilemap_to_vram
 _081B313C:
@@ -73591,7 +73591,7 @@ sub_81B3414: @ 81B3414
 	adds r0, 0xF
 	adds r1, 0x17
 	movs r2, 0
-	bl append_byte
+	bl AppendToList
 	movs r7, 0
 	ldr r0, =gUnknown_08615D7E
 	ldrh r0, [r0]
@@ -73627,7 +73627,7 @@ _081B345A:
 	adds r2, 0x13
 	lsls r2, 24
 	lsrs r2, 24
-	bl append_byte
+	bl AppendToList
 	b _081B34A0
 	.pool
 _081B3490:
@@ -73661,7 +73661,7 @@ _081B34A0:
 	adds r0, 0xF
 	adds r1, 0x17
 	movs r2, 0x1
-	bl append_byte
+	bl AppendToList
 _081B34D2:
 	movs r0, 0x64
 	mov r1, r10
@@ -73682,7 +73682,7 @@ _081B34D2:
 	adds r0, 0xF
 	adds r1, 0x17
 	movs r2, 0x6
-	bl append_byte
+	bl AppendToList
 	b _081B3518
 	.pool
 _081B3508:
@@ -73692,7 +73692,7 @@ _081B3508:
 	adds r0, 0xF
 	adds r1, 0x17
 	movs r2, 0x3
-	bl append_byte
+	bl AppendToList
 _081B3518:
 	ldr r0, =gUnknown_0203CEC4
 	ldr r1, [r0]
@@ -73700,7 +73700,7 @@ _081B3518:
 	adds r0, 0xF
 	adds r1, 0x17
 	movs r2, 0x2
-	bl append_byte
+	bl AppendToList
 	add sp, 0x4
 	pop {r3-r5}
 	mov r8, r3
@@ -73745,7 +73745,7 @@ _081B3560:
 	.4byte _081B35FE
 	.4byte _081B35FA
 _081B3594:
-	bl in_multi_battle_room_with_var_condition
+	bl InMultiBattleRoom
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -79778,7 +79778,7 @@ _081B6A40:
 	adds r0, r6, 0
 	mov r1, r10
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	cmp r4, 0
 	beq _081B6A82
 	adds r0, r7, 0x1

asm/rom_81BE66C.s

@@ -14443,7 +14443,7 @@ sub_81C6404: @ 81C6404
 	movs r0, 0x3
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4}
 	pop {r0}
@@ -14481,7 +14481,7 @@ sub_81C645C: @ 81C645C
 	movs r0, 0x3
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4}
 	pop {r0}
@@ -18385,7 +18385,7 @@ _081C8434:
 	str r6, [sp, 0x8]
 	adds r2, r7, 0
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r0, [r4, 0xC]
 	adds r0, 0x1
 	strh r0, [r4, 0xC]
@@ -19595,7 +19595,7 @@ sub_81C8D4C: @ 81C8D4C
 	str r2, [sp, 0x8]
 	adds r2, r5, 0
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r4, 0
 	movs r1, 0
 	bl sub_81C8C64
@@ -19723,7 +19723,7 @@ sub_81C8E54: @ 81C8E54
 	movs r1, 0x7
 	adds r2, r5, 0
 	movs r3, 0x2
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r0, [r7, 0x8]
 	ldrb r1, [r7, 0x4]
 	str r1, [sp]
@@ -25899,7 +25899,7 @@ sub_81CBE88: @ 81CBE88
 	movs r1, 0x7
 	adds r2, r3, 0
 	movs r3, 0x2
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -25934,7 +25934,7 @@ sub_81CBEB4: @ 81CBEB4
 	adds r0, r5, 0
 	movs r1, 0x7
 	adds r2, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4-r6}
 	pop {r0}
@@ -25982,7 +25982,7 @@ _081CBF24:
 	movs r1, 0x7
 	add r2, sp, 0xC
 	adds r3, r4, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x2C
 	pop {r4,r5}
 	pop {r0}
@@ -26016,7 +26016,7 @@ _081CBF76:
 	str r1, [sp, 0x8]
 	movs r1, 0x7
 	movs r3, 0x10
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x80
 	lsls r0, 21
 	adds r6, r0
@@ -26201,7 +26201,7 @@ sub_81CC0E0: @ 81CC0E0
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x20
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -26235,7 +26235,7 @@ sub_81CC11C: @ 81CC11C
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -26278,7 +26278,7 @@ sub_81CC158: @ 81CC158
 	adds r0, r2, 0
 	adds r2, r5, 0
 	movs r3, 0x20
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0xC
 	pop {r4,r5}
 	pop {r0}
@@ -27520,7 +27520,7 @@ _081CCB44:
 	str r1, [sp, 0x8]
 	movs r1, 0x7
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r1, [r5]
 	ldrb r2, [r5, 0x3]
 	adds r0, r4, 0
@@ -27552,7 +27552,7 @@ _081CCB8E:
 	str r1, [sp, 0x8]
 	movs r1, 0x7
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, =0x00001041
 	movs r0, 0xC
 	str r0, [sp]
@@ -27582,7 +27582,7 @@ _081CCBDC:
 	str r1, [sp, 0x8]
 	movs r1, 0x7
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrh r1, [r5]
 	ldrb r2, [r5, 0x3]
 	adds r0, r4, 0
@@ -27861,7 +27861,7 @@ _081CCE08:
 	movs r1, 0x7
 	adds r2, r6, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x80
 	lsls r0, 21
 	adds r4, r0
@@ -30977,7 +30977,7 @@ _081CE7DA:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	b _081CE924
 _081CE800:
 	bl sub_81CDD5C
@@ -31002,7 +31002,7 @@ _081CE80C:
 	str r4, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	add r1, sp, 0xC
 	movs r0, 0xFC
 	strb r0, [r1]
@@ -31028,7 +31028,7 @@ _081CE80C:
 	movs r1, 0x1
 	add r2, sp, 0xC
 	movs r3, 0x4
-	bl Print
+	bl PrintTextOnWindow
 	bl sub_81CDD48
 	adds r1, r0, 0
 	lsls r1, 16
@@ -31044,7 +31044,7 @@ _081CE80C:
 	movs r1, 0x1
 	add r2, sp, 0xC
 	movs r3, 0x1C
-	bl Print
+	bl PrintTextOnWindow
 	b _081CE924
 	.pool
 _081CE89C:
@@ -33024,7 +33024,7 @@ sub_81CF7F4: @ 81CF7F4
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x4
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r4, 0
 	adds r1, r7, 0
 	movs r2, 0x1
@@ -33040,7 +33040,7 @@ sub_81CF7F4: @ 81CF7F4
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0x22
-	bl Print
+	bl PrintTextOnWindow
 	mov r1, r8
 	ldrb r0, [r1, 0x8]
 	movs r1, 0x2
@@ -34423,7 +34423,7 @@ sub_81D02B0: @ 81D02B0
 	adds r0, r4, 0
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	add sp, 0x1C
 	pop {r4,r5}
 	pop {r0}
@@ -36086,7 +36086,7 @@ sub_81D0FF0: @ 81D0FF0
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r6]
 	cmp r0, 0
 	beq _081D1040
@@ -36131,7 +36131,7 @@ _081D104A:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x3C
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r4, 0
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -36205,7 +36205,7 @@ sub_81D10D0: @ 81D10D0
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	mov r1, r8
 	ldrb r0, [r1, 0xC]
 	movs r1, 0x2
@@ -39489,7 +39489,7 @@ sub_81D28FC: @ 81D28FC
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r5, =gUnknown_085EFA52
 	movs r1, 0x29
 	mov r10, r1
@@ -39501,7 +39501,7 @@ sub_81D28FC: @ 81D28FC
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x4
-	bl Print
+	bl PrintTextOnWindow
 	ldr r5, =gUnknown_085EFA56
 	movs r0, 0x1
 	adds r1, r5, 0
@@ -39518,7 +39518,7 @@ sub_81D28FC: @ 81D28FC
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r5, =gUnknown_085EFA5D
 	movs r0, 0x1
 	adds r1, r5, 0
@@ -39535,7 +39535,7 @@ sub_81D28FC: @ 81D28FC
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	negs r0, r0
 	cmp r9, r0
@@ -39566,7 +39566,7 @@ _081D29C4:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x4
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, =gUnknown_085EFA52
 	movs r0, 0x1
 	movs r2, 0
@@ -39587,7 +39587,7 @@ _081D29C4:
 	movs r0, 0
 	movs r1, 0x1
 	add r2, sp, 0xC
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r6, 0x1]
 	cmp r0, 0x1
 	bhi _081D2A3C
@@ -39611,7 +39611,7 @@ _081D2A4A:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x6A
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r6, 0x3]
 	cmp r0, 0
 	bne _081D2A70
@@ -39636,7 +39636,7 @@ _081D2A7E:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x6A
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, =gMoveDescriptionPointers
 	mov r0, r9
 	subs r0, 0x1
@@ -39651,7 +39651,7 @@ _081D2A7E:
 	movs r1, 0x7
 	adds r2, r5, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 _081D2AB6:
 	add sp, 0x2C
 	pop {r3-r5}
@@ -39690,7 +39690,7 @@ sub_81D2ACC: @ 81D2ACC
 	str r6, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r5, =gUnknown_085EFA67
 	movs r0, 0x1
 	adds r1, r5, 0
@@ -39706,7 +39706,7 @@ sub_81D2ACC: @ 81D2ACC
 	movs r0, 0x1
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r5, =gUnknown_085EFA6E
 	movs r0, 0x1
 	adds r1, r5, 0
@@ -39721,7 +39721,7 @@ sub_81D2ACC: @ 81D2ACC
 	movs r0, 0x1
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	negs r0, r0
 	cmp r4, r0
@@ -39749,7 +39749,7 @@ _081D2B6C:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x4
-	bl Print
+	bl PrintTextOnWindow
 	ldr r1, =gContestEffectDescriptionPointers
 	ldrb r0, [r4]
 	lsls r0, 2
@@ -39763,7 +39763,7 @@ _081D2B6C:
 	movs r1, 0x7
 	adds r2, r5, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x1
 	movs r1, 0x2
 	bl CopyWindowToVram

asm/roulette.s

@@ -519,7 +519,7 @@ _081406E0:
 	str r5, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -751,7 +751,7 @@ sub_8140914: @ 8140914
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r5]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -2655,7 +2655,7 @@ _08141902:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -2678,7 +2678,7 @@ _08141928:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -2816,7 +2816,7 @@ sub_8141A18: @ 8141A18
 	movs r1, 0x1
 	mov r2, r8
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r5]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -3012,7 +3012,7 @@ _08141BB0:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -3039,7 +3039,7 @@ _08141C58:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -3071,7 +3071,7 @@ _08141CBC:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -3158,7 +3158,7 @@ _08141D44:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r4]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -4676,7 +4676,7 @@ sub_81429F0: @ 81429F0
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -4753,7 +4753,7 @@ sub_8142A88: @ 8142A88
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -4778,7 +4778,7 @@ _08142B28:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -4808,7 +4808,7 @@ _08142B78:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram

asm/safari_zone.s

@@ -44,7 +44,7 @@ sub_80FC0D4: @ 80FC0D4
 	bl IncrementGameStat
 	bl SetSafariZoneFlag
 	bl sub_80FC244
-	ldr r1, =gUnknown_0203A04C
+	ldr r1, =gNumSafariBalls
 	movs r0, 0x1E
 	strb r0, [r1]
 	ldr r1, =gUnknown_0203A04E
@@ -72,7 +72,7 @@ sub_80FC114: @ 80FC114
 	bl sub_80EE44C
 	bl ResetSafariZoneFlag
 	bl sub_80FC244
-	ldr r1, =gUnknown_0203A04C
+	ldr r1, =gNumSafariBalls
 	movs r0, 0
 	strb r0, [r1]
 	ldr r1, =gUnknown_0203A04E
@@ -139,7 +139,7 @@ sub_80FC190: @ 80FC190
 	adds r0, 0x1
 	strb r0, [r1]
 _080FC1AE:
-	ldr r0, =gUnknown_0203A04C
+	ldr r0, =gNumSafariBalls
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080FC1D8

asm/scrcmd.s

@@ -3339,7 +3339,7 @@ _0809AC4E:
 	movs r1, 0x1
 	adds r2, r4, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	add sp, 0xC
 	pop {r4,r5}
@@ -3763,7 +3763,7 @@ _0809AEC6:
 	str r1, [sp, 0x8]
 	movs r1, 0x6
 	adds r3, r6, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r5]
 	movs r1, 0x3
 	bl CopyWindowToVram

asm/script_menu.s

@@ -761,7 +761,7 @@ _080E23D4:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, =gUnknown_085EB198
 	movs r0, 0x31
 	str r0, [sp]
@@ -770,7 +770,7 @@ _080E23D4:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	b _080E247A
 	.pool
 _080E2448:
@@ -795,7 +795,7 @@ _080E2448:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 _080E247A:
 	ldr r0, =0x000008ab
 	bl FlagGet
@@ -813,7 +813,7 @@ _080E247A:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 	b _080E24C6
 	.pool
 _080E24B0:
@@ -826,7 +826,7 @@ _080E24B0:
 	adds r0, r6, 0
 	movs r1, 0x1
 	adds r3, r7, 0
-	bl Print
+	bl PrintTextOnWindow
 _080E24C6:
 	ldr r4, =gStringVar4
 	ldr r1, =gUnknown_085EB183
@@ -1228,7 +1228,7 @@ _080E2802:
 	adds r0, r6, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	adds r0, r5, 0x1
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -1687,7 +1687,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, =gUnknown_085EB264
 	movs r0, 0x19
 	str r0, [sp]
@@ -1696,7 +1696,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, =gUnknown_085EB26C
 	movs r0, 0x29
 	str r0, [sp]
@@ -1705,7 +1705,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, =gUnknown_085EB270
 	movs r0, 0x39
 	str r0, [sp]
@@ -1714,7 +1714,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r0, =gSaveBlock2Ptr
 	ldr r2, [r0]
 	movs r0, 0x49
@@ -1724,7 +1724,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, =gUnknown_085EB279
 	movs r0, 0x59
 	str r0, [sp]
@@ -1733,7 +1733,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, =gUnknown_085EB27E
 	movs r0, 0x69
 	str r0, [sp]
@@ -1742,7 +1742,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldr r2, =gUnknown_085EB285
 	movs r0, 0x79
 	str r0, [sp]
@@ -1751,7 +1751,7 @@ CreateStartMenu: @ 80E2BAC
 	adds r0, r4, 0
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x10
 	str r0, [sp]
 	movs r0, 0x8

asm/slot_machine.s

@@ -984,7 +984,7 @@ sub_812ACF4: @ 812ACF4
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -1552,7 +1552,7 @@ sub_812B158: @ 812B158
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -1642,7 +1642,7 @@ sub_812B214: @ 812B214
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -1695,7 +1695,7 @@ sub_812B280: @ 812B280
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram

asm/start_menu.s

@@ -5,386 +5,6 @@
 
 	.text
 
-	thumb_func_start BuildStartMenuActions
-BuildStartMenuActions: @ 809F440
-	push {lr}
-	ldr r0, =gUnknown_0203760F
-	movs r1, 0
-	strb r1, [r0]
-	bl is_c1_link_related_active
-	cmp r0, 0x1
-	bne _0809F45C
-	bl BuildStartMenuActions_LinkMode
-	b _0809F4AC
-	.pool
-_0809F45C:
-	bl InUnionRoom
-	cmp r0, 0x1
-	bne _0809F46A
-	bl BuildStartMenuActions_UnionRoom
-	b _0809F4AC
-_0809F46A:
-	bl GetSafariZoneFlag
-	cmp r0, 0x1
-	bne _0809F478
-	bl BuildStartMenuActions_SafariZone
-	b _0809F4AC
-_0809F478:
-	bl InBattlePike
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809F488
-	bl BuildStartMenuActions_BattlePike
-	b _0809F4AC
-_0809F488:
-	bl InBattlePyramid
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809F498
-	bl BuildStartMenuActions_BattlePyramid
-	b _0809F4AC
-_0809F498:
-	bl in_multi_battle_room_with_var_condition
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809F4A8
-	bl BuildStartMenuActions_MultiBattleRoom
-	b _0809F4AC
-_0809F4A8:
-	bl BuildStartMenuActions_Normal
-_0809F4AC:
-	pop {r0}
-	bx r0
-	thumb_func_end BuildStartMenuActions
-
-	thumb_func_start AddStartMenuAction
-@ void AddStartMenuAction(u8 entry)
-AddStartMenuAction: @ 809F4B0
-	push {lr}
-	adds r2, r0, 0
-	lsls r2, 24
-	lsrs r2, 24
-	ldr r0, =gUnknown_02037610
-	ldr r1, =gUnknown_0203760F
-	bl append_byte
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end AddStartMenuAction
-
-	thumb_func_start BuildStartMenuActions_Normal
-BuildStartMenuActions_Normal: @ 809F4CC
-	push {lr}
-	ldr r0, =0x00000861
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809F4E2
-	movs r0, 0
-	bl AddStartMenuAction
-_0809F4E2:
-	movs r0, 0x86
-	lsls r0, 4
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809F4F8
-	movs r0, 0x1
-	bl AddStartMenuAction
-_0809F4F8:
-	movs r0, 0x2
-	bl AddStartMenuAction
-	ldr r0, =0x00000862
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809F512
-	movs r0, 0x3
-	bl AddStartMenuAction
-_0809F512:
-	movs r0, 0x4
-	bl AddStartMenuAction
-	movs r0, 0x5
-	bl AddStartMenuAction
-	movs r0, 0x6
-	bl AddStartMenuAction
-	movs r0, 0x7
-	bl AddStartMenuAction
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuildStartMenuActions_Normal
-
-	thumb_func_start BuildStartMenuActions_SafariZone
-BuildStartMenuActions_SafariZone: @ 809F538
-	push {lr}
-	movs r0, 0x8
-	bl AddStartMenuAction
-	movs r0, 0
-	bl AddStartMenuAction
-	movs r0, 0x1
-	bl AddStartMenuAction
-	movs r0, 0x2
-	bl AddStartMenuAction
-	movs r0, 0x4
-	bl AddStartMenuAction
-	movs r0, 0x6
-	bl AddStartMenuAction
-	movs r0, 0x7
-	bl AddStartMenuAction
-	pop {r0}
-	bx r0
-	thumb_func_end BuildStartMenuActions_SafariZone
-
-	thumb_func_start BuildStartMenuActions_LinkMode
-BuildStartMenuActions_LinkMode: @ 809F568
-	push {lr}
-	movs r0, 0x1
-	bl AddStartMenuAction
-	movs r0, 0x2
-	bl AddStartMenuAction
-	ldr r0, =0x00000862
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809F58A
-	movs r0, 0x3
-	bl AddStartMenuAction
-_0809F58A:
-	movs r0, 0x9
-	bl AddStartMenuAction
-	movs r0, 0x6
-	bl AddStartMenuAction
-	movs r0, 0x7
-	bl AddStartMenuAction
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuildStartMenuActions_LinkMode
-
-	thumb_func_start BuildStartMenuActions_UnionRoom
-BuildStartMenuActions_UnionRoom: @ 809F5A4
-	push {lr}
-	movs r0, 0x1
-	bl AddStartMenuAction
-	movs r0, 0x2
-	bl AddStartMenuAction
-	ldr r0, =0x00000862
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0809F5C6
-	movs r0, 0x3
-	bl AddStartMenuAction
-_0809F5C6:
-	movs r0, 0x4
-	bl AddStartMenuAction
-	movs r0, 0x6
-	bl AddStartMenuAction
-	movs r0, 0x7
-	bl AddStartMenuAction
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end BuildStartMenuActions_UnionRoom
-
-	thumb_func_start BuildStartMenuActions_BattlePike
-BuildStartMenuActions_BattlePike: @ 809F5E0
-	push {lr}
-	movs r0, 0
-	bl AddStartMenuAction
-	movs r0, 0x1
-	bl AddStartMenuAction
-	movs r0, 0x4
-	bl AddStartMenuAction
-	movs r0, 0x6
-	bl AddStartMenuAction
-	movs r0, 0x7
-	bl AddStartMenuAction
-	pop {r0}
-	bx r0
-	thumb_func_end BuildStartMenuActions_BattlePike
-
-	thumb_func_start BuildStartMenuActions_BattlePyramid
-BuildStartMenuActions_BattlePyramid: @ 809F604
-	push {lr}
-	movs r0, 0x1
-	bl AddStartMenuAction
-	movs r0, 0xC
-	bl AddStartMenuAction
-	movs r0, 0x4
-	bl AddStartMenuAction
-	movs r0, 0xA
-	bl AddStartMenuAction
-	movs r0, 0xB
-	bl AddStartMenuAction
-	movs r0, 0x6
-	bl AddStartMenuAction
-	movs r0, 0x7
-	bl AddStartMenuAction
-	pop {r0}
-	bx r0
-	thumb_func_end BuildStartMenuActions_BattlePyramid
-
-	thumb_func_start BuildStartMenuActions_MultiBattleRoom
-BuildStartMenuActions_MultiBattleRoom: @ 809F634
-	push {lr}
-	movs r0, 0x1
-	bl AddStartMenuAction
-	movs r0, 0x4
-	bl AddStartMenuAction
-	movs r0, 0x6
-	bl AddStartMenuAction
-	movs r0, 0x7
-	bl AddStartMenuAction
-	pop {r0}
-	bx r0
-	thumb_func_end BuildStartMenuActions_MultiBattleRoom
-
-	thumb_func_start sub_809F654
-sub_809F654: @ 809F654
-	push {r4,r5,lr}
-	sub sp, 0xC
-	ldr r4, =gUnknown_0203760C
-	ldr r0, =gUnknown_08510508
-	bl AddWindow
-	strb r0, [r4]
-	ldrb r0, [r4]
-	bl PutWindowTilemap
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_81973FC
-	ldr r0, =gStringVar1
-	ldr r1, =gUnknown_0203A04C
-	ldrb r1, [r1]
-	movs r2, 0x1
-	movs r3, 0x2
-	bl ConvertIntToDecimalStringN
-	ldr r5, =gStringVar4
-	ldr r1, =gUnknown_085EE6FF
-	adds r0, r5, 0
-	bl StringExpandPlaceholders
-	ldrb r0, [r4]
-	movs r1, 0x1
-	str r1, [sp]
-	movs r1, 0xFF
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	movs r1, 0x1
-	adds r2, r5, 0
-	movs r3, 0
-	bl Print
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809F654
-
-	thumb_func_start sub_809F6C8
-sub_809F6C8: @ 809F6C8
-	push {r4,r5,lr}
-	sub sp, 0xC
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00000cb2
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r0, 0x7
-	bne _0809F6F0
-	ldr r4, =gUnknown_0203760D
-	ldr r0, =gUnknown_08510538
-	b _0809F6F4
-	.pool
-_0809F6F0:
-	ldr r4, =gUnknown_0203760D
-	ldr r0, =gUnknown_08510530
-_0809F6F4:
-	bl AddWindow
-	strb r0, [r4]
-	ldr r4, =gUnknown_0203760D
-	ldrb r0, [r4]
-	bl PutWindowTilemap
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_81973FC
-	ldr r0, =gStringVar1
-	ldr r2, =gUnknown_08510510
-	ldr r1, =gSaveBlock2Ptr
-	ldr r1, [r1]
-	ldr r3, =0x00000cb2
-	adds r1, r3
-	ldrh r1, [r1]
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl StringCopy
-	ldr r5, =gStringVar4
-	ldr r1, =gUnknown_085EE716
-	adds r0, r5, 0
-	bl StringExpandPlaceholders
-	ldrb r0, [r4]
-	movs r1, 0x1
-	str r1, [sp]
-	movs r1, 0xFF
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	movs r1, 0x1
-	adds r2, r5, 0
-	movs r3, 0
-	bl Print
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809F6C8
-
-	thumb_func_start RemoveExtraStartMenuWindows
-RemoveExtraStartMenuWindows: @ 809F774
-	push {r4,lr}
-	bl GetSafariZoneFlag
-	cmp r0, 0
-	beq _0809F796
-	ldr r4, =gUnknown_0203760C
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_8198070
-	ldrb r0, [r4]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	ldrb r0, [r4]
-	bl RemoveWindow
-_0809F796:
-	bl InBattlePyramid
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809F7B0
-	ldr r4, =gUnknown_0203760D
-	ldrb r0, [r4]
-	movs r1, 0
-	bl sub_8198070
-	ldrb r0, [r4]
-	bl RemoveWindow
-_0809F7B0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end RemoveExtraStartMenuWindows
 
 	thumb_func_start PrintStartMenuActions
 PrintStartMenuActions: @ 809F7C0
@@ -397,12 +17,12 @@ PrintStartMenuActions: @ 809F7C0
 	mov r8, r0
 	adds r6, r1, 0
 	ldrb r2, [r0]
-	ldr r0, =gUnknown_08510540
+	ldr r0, =sStartMenuItems
 	mov r9, r0
 	ldr r1, =gStringVar4
 	mov r10, r1
 _0809F7DA:
-	ldr r0, =gUnknown_02037610
+	ldr r0, =sCurrentStartMenuActions
 	lsls r2, 24
 	asrs r4, r2, 24
 	adds r5, r4, r0
@@ -416,7 +36,7 @@ _0809F7DA:
 	adds r7, r2, 0
 	cmp r1, r0
 	bne _0809F828
-	bl get_start_menu_window_id_maybe
+	bl GetStartMenuWindowId
 	lsls r0, 24
 	lsrs r0, 24
 	ldrb r1, [r5]
@@ -437,7 +57,7 @@ _0809F828:
 	ldr r1, [r0]
 	mov r0, r10
 	bl StringExpandPlaceholders
-	bl get_start_menu_window_id_maybe
+	bl GetStartMenuWindowId
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r4, 4
@@ -452,14 +72,14 @@ _0809F828:
 	movs r1, 0x1
 	mov r2, r10
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 _0809F858:
 	movs r0, 0x80
 	lsls r0, 17
 	adds r1, r7, r0
 	lsrs r2, r1, 24
 	asrs r1, 24
-	ldr r0, =gUnknown_0203760F
+	ldr r0, =sNumStartMenuActions
 	ldrb r0, [r0]
 	cmp r1, r0
 	bge _0809F87C
@@ -522,7 +142,7 @@ _0809F8D8:
 	.pool
 _0809F8E4:
 	bl sub_81973A4
-	ldr r0, =gUnknown_0203760F
+	ldr r0, =sNumStartMenuActions
 	ldrb r0, [r0]
 	bl sub_81979C4
 	lsls r0, 24
@@ -538,13 +158,13 @@ _0809F90C:
 	bl GetSafariZoneFlag
 	cmp r0, 0
 	beq _0809F918
-	bl sub_809F654
+	bl DisplaySafariBallsWindow
 _0809F918:
 	bl InBattlePyramid
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809F926
-	bl sub_809F6C8
+	bl DisplayPyramidFloorWindow
 _0809F926:
 	ldr r1, =gUnknown_02037619
 	b _0809F940
@@ -564,15 +184,15 @@ _0809F940:
 	b _0809F98C
 	.pool
 _0809F94C:
-	bl get_start_menu_window_id_maybe
+	bl GetStartMenuWindowId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x10
 	str r1, [sp]
-	ldr r1, =gUnknown_0203760F
+	ldr r1, =sNumStartMenuActions
 	ldrb r1, [r1]
 	str r1, [sp, 0x4]
-	ldr r4, =gUnknown_0203760E
+	ldr r4, =sStartMenuCursorPos
 	ldrb r1, [r4]
 	str r1, [sp, 0x8]
 	movs r1, 0x1
@@ -580,7 +200,7 @@ _0809F94C:
 	movs r3, 0x9
 	bl sub_81983AC
 	strb r0, [r4]
-	bl get_start_menu_window_id_maybe
+	bl GetStartMenuWindowId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -762,7 +382,7 @@ HandleStartMenuInput: @ 809FAC4
 	movs r0, 0x1
 	negs r0, r0
 	bl MoveMenuCursor
-	ldr r1, =gUnknown_0203760E
+	ldr r1, =sStartMenuCursorPos
 	strb r0, [r1]
 _0809FAE4:
 	ldrh r1, [r4, 0x2E]
@@ -774,7 +394,7 @@ _0809FAE4:
 	bl PlaySE
 	movs r0, 0x1
 	bl MoveMenuCursor
-	ldr r1, =gUnknown_0203760E
+	ldr r1, =sStartMenuCursorPos
 	strb r0, [r1]
 _0809FAFE:
 	ldrh r1, [r4, 0x2E]
@@ -784,9 +404,9 @@ _0809FAFE:
 	beq _0809FB98
 	movs r0, 0x5
 	bl PlaySE
-	ldr r1, =gUnknown_08510540
+	ldr r1, =sStartMenuItems
-	ldr r2, =gUnknown_02037610
+	ldr r2, =sCurrentStartMenuActions
-	ldr r0, =gUnknown_0203760E
+	ldr r0, =sStartMenuCursorPos
 	ldrb r0, [r0]
 	adds r0, r2
 	ldrb r0, [r0]
@@ -804,9 +424,9 @@ _0809FAFE:
 	beq _0809FBA0
 _0809FB34:
 	ldr r3, =gUnknown_03005DF4
-	ldr r1, =gUnknown_08510540
+	ldr r1, =sStartMenuItems
-	ldr r2, =gUnknown_02037610
+	ldr r2, =sCurrentStartMenuActions
-	ldr r0, =gUnknown_0203760E
+	ldr r0, =sStartMenuCursorPos
 	ldrb r0, [r0]
 	adds r0, r2
 	ldrb r0, [r0]
@@ -1458,7 +1078,7 @@ _080A009A:
 	thumb_func_start sub_80A00A0
 sub_80A00A0: @ 80A00A0
 	push {lr}
-	bl get_start_menu_window_id_maybe
+	bl GetStartMenuWindowId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0
@@ -1789,7 +1409,7 @@ sub_80A0340: @ 80A0340
 	thumb_func_start sub_80A035C
 sub_80A035C: @ 80A035C
 	push {lr}
-	bl get_start_menu_window_id_maybe
+	bl GetStartMenuWindowId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0
@@ -2239,7 +1859,7 @@ _080A0710:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r4, 0x11
 	ldrb r0, [r6]
 	ldr r2, =gUnknown_085EED26
@@ -2249,7 +1869,7 @@ _080A0710:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	adds r1, r5, 0
 	mov r2, r9
@@ -2274,7 +1894,7 @@ _080A0710:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x4
 	adds r1, r5, 0
 	mov r2, r9
@@ -2293,7 +1913,7 @@ _080A0710:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	mov r0, r10
 	bl FlagGet
 	lsls r0, 24
@@ -2309,7 +1929,7 @@ _080A0710:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x1
 	adds r1, r5, 0
 	mov r2, r9
@@ -2328,7 +1948,7 @@ _080A0710:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 _080A0802:
 	adds r4, 0x10
 	ldrb r0, [r6]
@@ -2341,7 +1961,7 @@ _080A0802:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x2
 	adds r1, r5, 0
 	mov r2, r9
@@ -2360,7 +1980,7 @@ _080A0802:
 	str r7, [sp, 0x8]
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r6]
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -2445,7 +2065,7 @@ sub_80A08CC: @ 80A08CC
 	thumb_func_start sub_80A0914
 sub_80A0914: @ 80A0914
 	push {lr}
-	bl get_start_menu_window_id_maybe
+	bl GetStartMenuWindowId
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -2467,8 +2087,8 @@ sub_80A0934: @ 80A0934
 	bx r0
 	thumb_func_end sub_80A0934
 
-	thumb_func_start append_byte
+	thumb_func_start AppendToList
-append_byte: @ 80A0944
+AppendToList: @ 80A0944
 	ldrb r3, [r1]
 	adds r0, r3
 	strb r2, [r0]
@@ -2476,6 +2096,6 @@ append_byte: @ 80A0944
 	adds r0, 0x1
 	strb r0, [r1]
 	bx lr
-	thumb_func_end append_byte
+	thumb_func_end AppendToList
 
 	.align 2, 0 @ Don't pad with nop.

asm/starter_choose.s

@@ -336,7 +336,7 @@ sub_81341FC: @ 81341FC
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl PutWindowTilemap
 	movs r0, 0
@@ -515,7 +515,7 @@ sub_8134390: @ 8134390
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	ldr r0, =gUnknown_085B1DDC

asm/trade.s

@@ -5598,7 +5598,7 @@ sub_807A19C: @ 807A19C
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x14
 	movs r2, 0xC

asm/trader.s

@@ -165,7 +165,7 @@ _08133B3C:
 	movs r1, 0x1
 	ldr r2, =gUnknown_085E8D38
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	b _08133B94
 	.pool
 _08133B70:
@@ -185,7 +185,7 @@ _08133B70:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 _08133B94:
 	adds r0, r5, 0x1
 	lsls r0, 24
@@ -205,7 +205,7 @@ _08133B94:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0x8
-	bl Print
+	bl PrintTextOnWindow
 	ldrb r0, [r7, 0x6]
 	movs r1, 0x5
 	movs r2, 0

asm/trainer_card.s

@@ -419,7 +419,7 @@ _080C2A2C:
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram

asm/wallclock.s

@@ -361,7 +361,7 @@ Cb2_StartWallClock: @ 81349F4
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0x2
@@ -508,7 +508,7 @@ _08134BA4:
 	str r1, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0x1
 	bl PutWindowTilemap
 	movs r0, 0x2
@@ -691,7 +691,7 @@ sub_8134DC4: @ 8134DC4
 	str r0, [sp, 0x8]
 	movs r1, 0x1
 	movs r3, 0
-	bl Print
+	bl PrintTextOnWindow
 	movs r0, 0
 	bl PutWindowTilemap
 	movs r0, 0

data/data3.s

@@ -1256,19 +1256,19 @@ gUnknown_085104C4:: @ 85104C4
 gUnknown_085104F0:: @ 85104F0
 	.incbin "baserom.gba", 0x5104f0, 0x18
 
-gUnknown_08510508:: @ 8510508
+gSafariBallsWindowTemplate:: @ 8510508
 	.incbin "baserom.gba", 0x510508, 0x8
 
 gUnknown_08510510:: @ 8510510
 	.incbin "baserom.gba", 0x510510, 0x20
 
-gUnknown_08510530:: @ 8510530
+gPyramidFloorWindowTemplate_2:: @ 8510530
 	.incbin "baserom.gba", 0x510530, 0x8
 
-gUnknown_08510538:: @ 8510538
+gPyramidFloorWindowTemplate_1:: @ 8510538
 	.incbin "baserom.gba", 0x510538, 0x8
 
-gUnknown_08510540:: @ 8510540
+sStartMenuItems:: @ 8510540
 	.incbin "baserom.gba", 0x510540, 0x68
 
 gUnknown_085105A8:: @ 85105A8

data/strings.s

@@ -1761,10 +1761,10 @@ gUnknown_085EE68E:: @ 85EE68E
 gUnknown_085EE690:: @ 85EE690
 	.incbin "baserom.gba", 0x5ee690, 0x6f
 
-gUnknown_085EE6FF:: @ 85EE6FF
+gOtherText_SafariStock:: @ 85EE6FF
 	.incbin "baserom.gba", 0x5ee6ff, 0x17
 
-gUnknown_085EE716:: @ 85EE716
+gOtherText_BattlePyramid_X:: @ 85EE716
 	.incbin "baserom.gba", 0x5ee716, 0x4f
 
 gUnknown_085EE765:: @ 85EE765

include/menu.h

@@ -0,0 +1,18 @@
+#ifndef GUARD_MENU_H
+#define GUARD_MENU_H
+
+#include "text.h"
+
+struct MenuAction
+{
+   const u8 *text;
+   u8 (*func)();
+};
+
+struct MenuAction2
+{
+    const u8 *text;
+    void (*func)(u8);
+};
+
+#endif // GUARD_MENU_H

include/safari_zone.h

@@ -0,0 +1,20 @@
+#ifndef GUARD_SAFARI_ZONE_H
+#define GUARD_SAFARI_ZONE_H
+
+extern u8 gNumSafariBalls;
+
+bool32 GetSafariZoneFlag(void);
+void SetSafariZoneFlag(void);
+void ResetSafariZoneFlag(void);
+
+void EnterSafariMode(void);
+void ExitSafariMode(void);
+
+bool8 SafariZoneTakeStep(void);
+void SafariZoneRetirePrompt(void);
+
+void SafariZoneGetPokeblockNameInFeeder(void);
+struct Pokeblock *SafariZoneGetActivePokeblock(void);
+void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index);
+
+#endif // GUARD_SAFARI_ZONE_H

include/start_menu.h

@@ -0,0 +1,6 @@
+#ifndef GUARD_START_MENU_H
+#define GUARD_START_MENU_H
+
+void AppendToList(u8* list, u8* pos, u8 newEntry);
+
+#endif // GUARD_START_MENU_H

include/text.h

@@ -91,7 +91,7 @@ extern u8 gStringVar4[];
 
 void SetFontsPointer(const struct FontInfo *fonts);
 void DeactivateAllTextPrinters (void);
-u16 Print(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
+u16 PrintTextOnWindow(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
 bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*callback)(struct TextSubPrinter *, u16));
 void RunTextPrinters(void);
 bool8 IsTextPrinterActive(u8 id);

include/window.h

@@ -31,7 +31,7 @@ struct Window
 };
 
 bool16 InitWindows(struct WindowTemplate *templates);
-u16 AddWindow(struct WindowTemplate *template);
+u16 AddWindow(const struct WindowTemplate *template);
 int AddWindowWithoutTileMap(struct WindowTemplate *template);
 void RemoveWindow(u8 windowId);
 void FreeAllWindowBuffers(void);

ld_script.txt

@@ -9,11 +9,14 @@ SECTIONS {
     ewram (NOLOAD) :
     ALIGN(4)
     {
+        gHeap = .;
+
+        . = 0x1C000;
 
 <EWRAM>
 
-        . = 0x60000;
+        . = 0x40000;
-    }
+}
 
     . = 0x3000000;
 
@@ -101,6 +104,7 @@ SECTIONS {
         asm/field_tasks.o(.text);
         asm/clock.o(.text);
         asm/reset_rtc_screen.o(.text);
+        src/start_menu.o(.text);
         asm/start_menu.o(.text);
         asm/tileset.o(.text);
         src/palette.o(.text);
@@ -109,7 +113,7 @@ SECTIONS {
         asm/rom_80A5C6C.o(.text);
         src/task.o(.text);
         asm/reshow_battle_screen.o(.text);
-        asm/battle_anin_80A9C70.o(.text);
+        asm/battle_anim_80A9C70.o(.text);
         asm/title_screen.o(.text);
         asm/weather.o(.text);
         asm/rom_80AEFFC.o(.text);

src/battle_ai.c

@@ -27,10 +27,10 @@
 
 enum
 {
-    TARGET,
+    AI_TARGET,
-    USER,
+    AI_USER,
-    TARGET_PARTNER,
+    AI_TARGET_PARTNER,
-    USER_PARTNER
+    AI_USER_PARTNER
 };
 
 // AI states
@@ -1033,7 +1033,7 @@ static void BattleAICmd_if_hp_less_than(void)
 {
     u16 index;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1048,7 +1048,7 @@ static void BattleAICmd_if_hp_more_than(void)
 {
     u16 index;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1063,7 +1063,7 @@ static void BattleAICmd_if_hp_equal(void)
 {
     u16 index;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1078,7 +1078,7 @@ static void BattleAICmd_if_hp_not_equal(void)
 {
     u16 index;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1094,7 +1094,7 @@ static void BattleAICmd_if_status(void)
     u16 index;
     u32 arg;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1112,7 +1112,7 @@ static void BattleAICmd_if_not_status(void)
     u16 index;
     u32 arg;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1130,7 +1130,7 @@ static void BattleAICmd_if_status2(void)
     u16 index;
     u32 arg;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1148,7 +1148,7 @@ static void BattleAICmd_if_not_status2(void)
     u16 index;
     u32 arg;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1166,7 +1166,7 @@ static void BattleAICmd_if_status3(void)
     u16 index;
     u32 arg;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1184,7 +1184,7 @@ static void BattleAICmd_if_not_status3(void)
     u16 index;
     u32 arg;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1202,7 +1202,7 @@ static void BattleAICmd_if_side_affecting(void)
     u16 index;
     u32 arg1, arg2;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1221,7 +1221,7 @@ static void BattleAICmd_if_not_side_affecting(void)
     u16 index;
     u32 arg1, arg2;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1458,14 +1458,14 @@ static u8 BattleAI_GetWantedBank(u8 index)
 {
     switch (index)
     {
-        case USER:
+        case AI_USER:
             return sBank_AI;
-        case TARGET:
+        case AI_TARGET:
         default:
             return gBankTarget;
-        case USER_PARTNER:
+        case AI_USER_PARTNER:
             return sBank_AI ^ 2;
-        case TARGET_PARTNER:
+        case AI_TARGET_PARTNER:
             return gBankTarget ^ 2;
     }
 }
@@ -1738,7 +1738,7 @@ _08132130:\n\
 
 static void BattleAICmd_get_last_used_bank_move(void)
 {
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         AI_THINKING_STRUCT->funcResult = gLastUsedMovesByBanks[sBank_AI];
     else
         AI_THINKING_STRUCT->funcResult = gLastUsedMovesByBanks[gBankTarget];
@@ -1795,7 +1795,7 @@ static void BattleAICmd_count_alive_pokemon(void)
 
     AI_THINKING_STRUCT->funcResult = 0;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1848,7 +1848,7 @@ static void BattleAICmd_get_ability(void)
 {
     u8 index;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         index = sBank_AI;
     else
         index = gBankTarget;
@@ -1910,7 +1910,7 @@ static void BattleAICmd_check_ability(void)
     u8 bank = BattleAI_GetWantedBank(gAIScriptPtr[1]);
     u8 ability = gAIScriptPtr[2];
 
-    if (gAIScriptPtr[1] == TARGET || gAIScriptPtr[1] == TARGET_PARTNER)
+    if (gAIScriptPtr[1] == AI_TARGET || gAIScriptPtr[1] == AI_TARGET_PARTNER)
     {
         if (BATTLE_HISTORY->abilities[bank] != 0)
         {
@@ -2290,7 +2290,7 @@ static void BattleAICmd_if_stat_level_less_than(void)
 {
     u32 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2305,7 +2305,7 @@ static void BattleAICmd_if_stat_level_more_than(void)
 {
     u32 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2320,7 +2320,7 @@ static void BattleAICmd_if_stat_level_equal(void)
 {
     u32 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2335,7 +2335,7 @@ static void BattleAICmd_if_stat_level_not_equal(void)
 {
     u32 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2409,7 +2409,7 @@ static void BattleAICmd_if_has_move(void)
 
     switch(gAIScriptPtr[1])
     {
-        case USER:
+        case AI_USER:
             for (i = 0; i < 4; i++)
             {
                 if (gBattleMons[sBank_AI].moves[i] == *temp_ptr)
@@ -2425,7 +2425,7 @@ static void BattleAICmd_if_has_move(void)
                 gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
                 return;
             }
-        case USER_PARTNER:
+        case AI_USER_PARTNER:
             if (gBattleMons[sBank_AI ^ 2].hp == 0)
             {
                 gAIScriptPtr += 8;
@@ -2449,8 +2449,8 @@ static void BattleAICmd_if_has_move(void)
                 gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
                 return;
             }
-        case TARGET:
+        case AI_TARGET:
-        case TARGET_PARTNER:
+        case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
                 if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] == *temp_ptr)
@@ -2476,8 +2476,8 @@ static void BattleAICmd_if_dont_have_move(void)
 
     switch(gAIScriptPtr[1])
     {
-        case USER:
+        case AI_USER:
-        case USER_PARTNER: // UB: no separate check for user partner
+        case AI_USER_PARTNER: // UB: no separate check for user partner
             for (i = 0; i < 4; i++)
             {
                 if (gBattleMons[sBank_AI].moves[i] == *temp_ptr)
@@ -2493,8 +2493,8 @@ static void BattleAICmd_if_dont_have_move(void)
                 gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 4);
                 return;
             }
-        case TARGET:
+        case AI_TARGET:
-        case TARGET_PARTNER:
+        case AI_TARGET_PARTNER:
             for (i = 0; i < 4; i++)
             {
                 if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] == *temp_ptr)
@@ -2519,8 +2519,8 @@ static void BattleAICmd_if_move_effect(void)
 
     switch (gAIScriptPtr[1])
     {
-    case USER:
+    case AI_USER:
-    case USER_PARTNER:
+    case AI_USER_PARTNER:
         for (i = 0; i < 4; i++)
         {
             if(gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBank_AI].moves[i]].effect == gAIScriptPtr[2])
@@ -2531,8 +2531,8 @@ static void BattleAICmd_if_move_effect(void)
         else
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
         break;
-    case TARGET:
+    case AI_TARGET:
-    case TARGET_PARTNER:
+    case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
             if (gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankTarget].moves[i]].effect == gAIScriptPtr[2])
@@ -2552,8 +2552,8 @@ static void BattleAICmd_if_not_move_effect(void)
 
     switch (gAIScriptPtr[1])
     {
-    case USER:
+    case AI_USER:
-    case USER_PARTNER:
+    case AI_USER_PARTNER:
         for (i = 0; i < 4; i++)
         {
             if(gBattleMons[sBank_AI].moves[i] != 0 && gBattleMoves[gBattleMons[sBank_AI].moves[i]].effect == gAIScriptPtr[2])
@@ -2564,8 +2564,8 @@ static void BattleAICmd_if_not_move_effect(void)
         else
             gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 3);
         break;
-    case TARGET:
+    case AI_TARGET:
-    case TARGET_PARTNER:
+    case AI_TARGET_PARTNER:
         for (i = 0; i < 4; i++)
         {
             if (BATTLE_HISTORY->usedMoves[gBankTarget].moves[i] && gBattleMoves[BATTLE_HISTORY->usedMoves[gBankTarget].moves[i]].effect == gAIScriptPtr[2])
@@ -2583,7 +2583,7 @@ static void BattleAICmd_if_any_move_disabled_or_encored(void)
 {
     u8 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2662,7 +2662,7 @@ static void BattleAICmd_get_hold_effect(void)
     u8 bank;
     u16 status;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2702,7 +2702,7 @@ static void BattleAICmd_get_gender(void)
 {
     u8 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2716,7 +2716,7 @@ static void BattleAICmd_is_first_turn(void)
 {
     u8 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2730,7 +2730,7 @@ static void BattleAICmd_get_stockpile_count(void)
 {
     u8 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2751,7 +2751,7 @@ static void BattleAICmd_get_used_held_item(void)
 {
     u8 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;
@@ -2791,7 +2791,7 @@ static void BattleAICmd_get_protect_count(void)
 {
     u8 bank;
 
-    if (gAIScriptPtr[1] == USER)
+    if (gAIScriptPtr[1] == AI_USER)
         bank = sBank_AI;
     else
         bank = gBankTarget;

src/load_save.c

@@ -70,7 +70,6 @@ struct SaveBlocksInOne
     struct SaveBlock1 sav1;
     struct PokemonStorage sav3;
 };
-
 /*
 void MoveSaveBlocks_ResetHeap(void)
 {

src/malloc.c

@@ -1,7 +1,5 @@
 #include "global.h"
 
-EWRAM_DATA u8 gHeap[0x1C000] = {0};
-
 static void *sHeapStart;
 static u32 sHeapSize;
 

src/start_menu.c

@@ -0,0 +1,231 @@
+#include "global.h"
+#include "start_menu.h"
+#include "menu.h"
+#include "safari_zone.h"
+#include "event_data.h"
+#include "window.h"
+#include "string_util.h"
+#include "text.h"
+
+// Menu actions
+enum
+{
+    MENU_ACTION_POKEDEX,
+    MENU_ACTION_POKEMON,
+    MENU_ACTION_BAG,
+    MENU_ACTION_POKENAV,
+    MENU_ACTION_PLAYER,
+    MENU_ACTION_SAVE,
+    MENU_ACTION_OPTION,
+    MENU_ACTION_EXIT,
+    MENU_ACTION_RETIRE_SAFARI,
+    MENU_ACTION_PLAYER_LINK,
+    MENU_ACTION_REST_FRONTIER,
+    MENU_ACTION_RETIRE_FRONTIER,
+    MENU_ACTION_PYRAMID_BAG
+};
+
+static void BuildStartMenuActions_LinkMode(void);
+static void BuildStartMenuActions_UnionRoom(void);
+static void BuildStartMenuActions_SafariZone(void);
+static void BuildStartMenuActions_BattlePike(void);
+static void BuildStartMenuActions_BattlePyramid(void);
+static void BuildStartMenuActions_MultiBattleRoom(void);
+static void BuildStartMenuActions_Normal(void);
+u8 StartMenu_PlayerName(void);
+
+extern bool32 is_c1_link_related_active(void);
+extern bool32 InUnionRoom(void);
+extern bool8 InBattlePike(void);
+extern bool8 InBattlePyramid(void);
+extern bool8 InMultiBattleRoom(void);
+extern void sub_81973FC(u8 windowId, u8 a1);
+extern void sub_8198070(u8 windowId, u8 a1);
+
+EWRAM_DATA u8 sSafariBallsWindowId = 0;
+EWRAM_DATA u8 sBattlePyramidFloorWindowId = 0;
+EWRAM_DATA u8 sStartMenuCursorPos = 0;
+EWRAM_DATA u8 sNumStartMenuActions = 0;
+EWRAM_DATA u8 sCurrentStartMenuActions[9] = {0};
+
+void BuildStartMenuActions(void)
+{
+    sNumStartMenuActions = 0;
+    if (is_c1_link_related_active() == TRUE)
+        BuildStartMenuActions_LinkMode();
+    else if (InUnionRoom() == TRUE)
+        BuildStartMenuActions_UnionRoom();
+    else if (GetSafariZoneFlag() == TRUE)
+        BuildStartMenuActions_SafariZone();
+    else if (InBattlePike())
+        BuildStartMenuActions_BattlePike();
+    else if (InBattlePyramid())
+        BuildStartMenuActions_BattlePyramid();
+    else if (InMultiBattleRoom())
+        BuildStartMenuActions_MultiBattleRoom();
+    else
+        BuildStartMenuActions_Normal();
+}
+
+void AddStartMenuAction(u8 action)
+{
+    AppendToList(sCurrentStartMenuActions, &sNumStartMenuActions, action);
+}
+
+static void BuildStartMenuActions_Normal(void)
+{
+    if (FlagGet(SYS_POKEDEX_GET) == TRUE)
+        AddStartMenuAction(MENU_ACTION_POKEDEX);
+    if (FlagGet(SYS_POKEMON_GET) == TRUE)
+        AddStartMenuAction(MENU_ACTION_POKEMON);
+    AddStartMenuAction(MENU_ACTION_BAG);
+    if (FlagGet(SYS_POKENAV_GET) == TRUE)
+        AddStartMenuAction(MENU_ACTION_POKENAV);
+    AddStartMenuAction(MENU_ACTION_PLAYER);
+    AddStartMenuAction(MENU_ACTION_SAVE);
+    AddStartMenuAction(MENU_ACTION_OPTION);
+    AddStartMenuAction(MENU_ACTION_EXIT);
+}
+
+static void BuildStartMenuActions_SafariZone(void)
+{
+    AddStartMenuAction(MENU_ACTION_RETIRE_SAFARI);
+    AddStartMenuAction(MENU_ACTION_POKEDEX);
+    AddStartMenuAction(MENU_ACTION_POKEMON);
+    AddStartMenuAction(MENU_ACTION_BAG);
+    AddStartMenuAction(MENU_ACTION_PLAYER);
+    AddStartMenuAction(MENU_ACTION_OPTION);
+    AddStartMenuAction(MENU_ACTION_EXIT);
+}
+
+static void BuildStartMenuActions_LinkMode(void)
+{
+    AddStartMenuAction(MENU_ACTION_POKEMON);
+    AddStartMenuAction(MENU_ACTION_BAG);
+    if (FlagGet(SYS_POKENAV_GET) == TRUE)
+        AddStartMenuAction(MENU_ACTION_POKENAV);
+    AddStartMenuAction(MENU_ACTION_PLAYER_LINK);
+    AddStartMenuAction(MENU_ACTION_OPTION);
+    AddStartMenuAction(MENU_ACTION_EXIT);
+}
+
+static void BuildStartMenuActions_UnionRoom(void)
+{
+    AddStartMenuAction(MENU_ACTION_POKEMON);
+    AddStartMenuAction(MENU_ACTION_BAG);
+    if (FlagGet(SYS_POKENAV_GET) == TRUE)
+        AddStartMenuAction(MENU_ACTION_POKENAV);
+    AddStartMenuAction(MENU_ACTION_PLAYER);
+    AddStartMenuAction(MENU_ACTION_OPTION);
+    AddStartMenuAction(MENU_ACTION_EXIT);
+}
+
+static void BuildStartMenuActions_BattlePike(void)
+{
+    AddStartMenuAction(MENU_ACTION_POKEDEX);
+    AddStartMenuAction(MENU_ACTION_POKEMON);
+    AddStartMenuAction(MENU_ACTION_PLAYER);
+    AddStartMenuAction(MENU_ACTION_OPTION);
+    AddStartMenuAction(MENU_ACTION_EXIT);
+}
+
+static void BuildStartMenuActions_BattlePyramid(void)
+{
+    AddStartMenuAction(MENU_ACTION_POKEMON);
+    AddStartMenuAction(MENU_ACTION_PYRAMID_BAG);
+    AddStartMenuAction(MENU_ACTION_PLAYER);
+    AddStartMenuAction(MENU_ACTION_REST_FRONTIER);
+    AddStartMenuAction(MENU_ACTION_RETIRE_FRONTIER);
+    AddStartMenuAction(MENU_ACTION_OPTION);
+    AddStartMenuAction(MENU_ACTION_EXIT);
+}
+
+static void BuildStartMenuActions_MultiBattleRoom(void)
+{
+    AddStartMenuAction(MENU_ACTION_POKEMON);
+    AddStartMenuAction(MENU_ACTION_PLAYER);
+    AddStartMenuAction(MENU_ACTION_OPTION);
+    AddStartMenuAction(MENU_ACTION_EXIT);
+}
+
+extern const struct WindowTemplate gSafariBallsWindowTemplate;
+extern const struct WindowTemplate gPyramidFloorWindowTemplate_1;
+extern const struct WindowTemplate gPyramidFloorWindowTemplate_2;
+extern const u8 gOtherText_SafariStock[];
+
+void DisplaySafariBallsWindow(void)
+{
+    sSafariBallsWindowId = AddWindow(&gSafariBallsWindowTemplate);
+    PutWindowTilemap(sSafariBallsWindowId);
+    sub_81973FC(sSafariBallsWindowId, 0);
+    ConvertIntToDecimalStringN(gStringVar1, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2);
+    StringExpandPlaceholders(gStringVar4, gOtherText_SafariStock);
+    PrintTextOnWindow(sSafariBallsWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
+    CopyWindowToVram(sSafariBallsWindowId, 2);
+}
+
+extern const u8* const gUnknown_08510510[];
+extern const u8 gOtherText_BattlePyramid_X[];
+
+void DisplayPyramidFloorWindow(void)
+{
+    // TODO: fix location
+    if (*(u16*)(&gSaveBlock2Ptr->field_CAA[8]) == 7)
+        sBattlePyramidFloorWindowId = AddWindow(&gPyramidFloorWindowTemplate_1);
+    else
+        sBattlePyramidFloorWindowId = AddWindow(&gPyramidFloorWindowTemplate_2);
+    PutWindowTilemap(sBattlePyramidFloorWindowId);
+    sub_81973FC(sBattlePyramidFloorWindowId, 0);
+    StringCopy(gStringVar1, gUnknown_08510510[*(u16*)(&gSaveBlock2Ptr->field_CAA[8])]);
+    StringExpandPlaceholders(gStringVar4, gOtherText_BattlePyramid_X);
+    PrintTextOnWindow(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
+    CopyWindowToVram(sBattlePyramidFloorWindowId, 2);
+}
+
+void RemoveExtraStartMenuWindows(void)
+{
+    if (GetSafariZoneFlag())
+    {
+        sub_8198070(sSafariBallsWindowId, 0);
+        CopyWindowToVram(sSafariBallsWindowId, 2);
+        RemoveWindow(sSafariBallsWindowId);
+    }
+    if (InBattlePyramid())
+    {
+        sub_8198070(sBattlePyramidFloorWindowId, 0);
+        RemoveWindow(sBattlePyramidFloorWindowId);
+    }
+}
+
+extern const struct MenuAction sStartMenuItems[];
+
+/*
+// Prints n menu items starting at *index
+static bool32 PrintStartMenuItemsMultistep(s16 *index, u32 n)
+{
+    s8 _index = *index;
+
+    do
+    {
+        if (sStartMenuItems[sCurrentStartMenuActions[_index]].func == StartMenu_PlayerName)
+        {
+
+        }
+        else
+        {
+
+        }
+
+    } while (++_index > sNumStartMenuActions);
+
+    if (--n == 0)
+    {
+        *index = _index;
+        return FALSE;
+    }
+    else
+    {
+        *index = _index;
+        return TRUE;
+    }
+}*/

src/text.c

@@ -149,7 +149,7 @@ void DeactivateAllTextPrinters (void)
         gTextPrinters[printer].sub_union.sub.active = 0;
 }
 
-u16 Print(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16))
+u16 PrintTextOnWindow(u8 windowId, u8 fontId, u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextSubPrinter *, u16))
 {
     struct TextSubPrinter subPrinter;
 

src/window.c

@@ -118,7 +118,7 @@ bool16 InitWindows(struct WindowTemplate *templates)
     return TRUE;
 }
 
-u16 AddWindow(struct WindowTemplate *template)
+u16 AddWindow(const struct WindowTemplate *template)
 {
     u16 win;
     u8 bgLayer;

sym_ewram.txt

@@ -1,4 +1,3 @@
-    .include "src/malloc.o"
     .include "src/decompress.o"
 
 gTrainerId: @ 2020000
@@ -806,21 +805,7 @@ gUnknown_020375D6: @ 20375D6
 	.space 0x2
 
     .include "src/event_data.o"
-
+    .include "src/start_menu.o"
-gUnknown_0203760C: @ 203760C
-	.space 0x1
-
-gUnknown_0203760D: @ 203760D
-	.space 0x1
-
-gUnknown_0203760E: @ 203760E
-	.space 0x1
-
-gUnknown_0203760F: @ 203760F
-	.space 0x1
-
-gUnknown_02037610: @ 2037610
-	.space 0x9
 
 gUnknown_02037619: @ 2037619
 	.space 0x1
@@ -1298,7 +1283,7 @@ gUnknown_0203A044: @ 203A044
 gUnknown_0203A048: @ 203A048
 	.space 0x4
 
-gUnknown_0203A04C: @ 203A04C
+gNumSafariBalls: @ 203A04C
 	.space 0x2
 
 gUnknown_0203A04E: @ 203A04E