Merge pull request #233 from DizzyEggg/code_80521D0

code_80521D0.s (dungeon_message.c and dungeon_move.c)
pret · Oct 26, 2024 · d8329f7 · d8329f7
2 parents 9bf6af6 + c41b7f0
commit d8329f7
Show file tree

Hide file tree

Showing 132 changed files with 7,305 additions and 12,793 deletions.
diff --git a/asm/code_2.s b/asm/code_2.s
@@ -169,7 +169,7 @@ QuickSave:
 	movs r1, 0
 	movs r2, 0
 	movs r3, 0x20
-	bl xxx_info_box_80141B4
+	bl CreateDialogueBoxAndPortrait
 	b _08000892
 	.align 2, 0
 _080007AC: .4byte gUnknown_2026E4E
@@ -234,7 +234,7 @@ _08000822:
 	movs r1, 0
 	movs r2, 0
 	ldr r3, _08000838
-	bl xxx_info_box_80141B4
+	bl CreateDialogueBoxAndPortrait
 	movs r6, 0x3C
 	movs r4, 0x1
 	b _08000892
@@ -248,7 +248,7 @@ _0800083C:
 	movs r1, 0
 	movs r2, 0
 	movs r3, 0
-	bl xxx_info_box_80141B4
+	bl CreateDialogueBoxAndPortrait
 	movs r4, 0x3
 	b _08000892
 	.align 2, 0
@@ -258,7 +258,7 @@ _08000854:
 	movs r1, 0
 	movs r2, 0
 	ldr r3, _08000868
-	bl xxx_info_box_80141B4
+	bl CreateDialogueBoxAndPortrait
 _08000860:
 	movs r4, 0x2
 	b _08000892
@@ -358,7 +358,7 @@ _08000934:
 	movs r1, 0
 	movs r2, 0
 	movs r3, 0x20
-	bl xxx_info_box_80141B4
+	bl CreateDialogueBoxAndPortrait
 	movs r4, 0x2
 	b _080009A2
 	.align 2, 0
@@ -374,7 +374,7 @@ _08000952:
 	ldr r3, _08000964
 	movs r1, 0
 	movs r2, 0
-	bl xxx_info_box_80141B4
+	bl CreateDialogueBoxAndPortrait
 _0800095C:
 	movs r4, 0x1
 	b _080009A2

diff --git a/asm/code_800F990.s b/asm/code_800F990.s
@@ -2325,9 +2325,9 @@ sub_8010C10:
 	str r1, [sp, 0x10]
 	movs r1, 0
 	movs r3, 0
-	bl sub_8014248
+	bl CreateMenuDialogueBoxAndPortrait
 _08010C2C:
-	bl xxx_draw_string_80144C4
+	bl DrawDialogueBoxString
 	bl sub_8010960
 	add r0, sp, 0x14
 	bl sub_80144A4

diff --git a/asm/code_80140DC.s b/asm/code_80140DC.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8014248
-sub_8014248:
+	thumb_func_start CreateMenuDialogueBoxAndPortrait
+CreateMenuDialogueBoxAndPortrait:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -277,7 +277,7 @@ _08014480:
 	pop {r4-r7}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8014248
+	thumb_func_end CreateMenuDialogueBoxAndPortrait
 
 	thumb_func_start sub_8014490
 sub_8014490:
@@ -311,8 +311,8 @@ _080144BC: .4byte gUnknown_202EC1C
 _080144C0: .4byte gUnknown_202E744
 	thumb_func_end sub_80144A4
 
-	thumb_func_start xxx_draw_string_80144C4
-xxx_draw_string_80144C4:
+	thumb_func_start DrawDialogueBoxString
+DrawDialogueBoxString:
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1018,7 +1018,7 @@ _08014A72:
 	bx r0
 	.align 2, 0
 _08014A84: .4byte gUnknown_202E744
-	thumb_func_end xxx_draw_string_80144C4
+	thumb_func_end DrawDialogueBoxString
 
 	thumb_func_start sub_8014A88
 sub_8014A88:

diff --git a/asm/code_8040094.s b/asm/code_8040094.s
@@ -1728,7 +1728,7 @@ _08040E6E:
 	ldr r0, _08040ECC
 	ldr r1, [r0]
 	adds r0, r6, 0
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 	movs r1, 0xD2
 	lsls r1, 1
 	adds r0, r6, 0

diff --git a/asm/code_8045A00.s b/asm/code_8045A00.s
@@ -278,7 +278,7 @@ _08045FAC:
 _08045FD0:
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 	b _08045FF2
 	.align 2, 0
 _08045FDC: .4byte 0x00ff0008
@@ -288,10 +288,10 @@ _08045FE8:
 	ldr r0, _08045FFC
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 _08045FF2:
 	ldrb r0, [r5, 0x2]
-	bl HandleOnPickupTutorial
+	bl TryDisplayItemPickupTutorialMessage
 	b _080460E0
 	.align 2, 0
 _08045FFC: .4byte gPickedUpItemToolbox
@@ -336,7 +336,7 @@ _0804602E:
 _08046048:
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 	b _080460E0
 	.align 2, 0
 _08046054: .4byte gFormatItems
@@ -379,7 +379,7 @@ _08046094:
 _080460AC:
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 	b _080460DA
 	.align 2, 0
 _080460B8: .4byte gAvailablePokemonNames
@@ -394,10 +394,10 @@ _080460C0:
 	ldr r0, _080460F4
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 _080460DA:
 	ldrb r0, [r5, 0x2]
-	bl HandleOnPickupTutorial
+	bl TryDisplayItemPickupTutorialMessage
 _080460E0:
 	add sp, 0xB8
 	pop {r3-r5}
@@ -996,7 +996,7 @@ sub_804652C:
 	ldr r0, _080465A4
 	ldr r1, [r0]
 	mov r0, r10
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 	mov r0, r9
 	ldrb r1, [r0]
 	movs r0, 0x1
@@ -1156,7 +1156,7 @@ _080466B6:
 	ldr r2, [r0]
 	mov r0, r10
 	mov r1, sp
-	bl sub_8052364
+	bl TryDisplayDungeonLoggableMessage5
 	b _0804671E
 	.align 2, 0
 _080466C4: .4byte gItemFellOutOfSight
@@ -1202,7 +1202,7 @@ _0804670C:
 	ldr r2, [r0]
 	mov r0, r10
 	mov r1, sp
-	bl sub_8052364
+	bl TryDisplayDungeonLoggableMessage5
 _0804671E:
 	add sp, 0x10
 	pop {r3-r5}
@@ -1721,7 +1721,7 @@ _08046B0A:
 	ldr r4, _08046B38
 	add r4, sp
 	ldr r0, [r4]
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 	b _08046C7C
 	.align 2, 0
 _08046B2C: .4byte 0x0000052c
@@ -1734,7 +1734,7 @@ _08046B3C:
 	ldr r5, _08046B50
 	add r5, sp
 	ldr r0, [r5]
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 	b _08046C7C
 	.align 2, 0
 _08046B4C: .4byte gItemLost
@@ -1748,7 +1748,7 @@ _08046B54:
 	ldr r2, _08046C94
 	add r2, sp
 	ldr r0, [r2]
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 _08046B68:
 	movs r3, 0
 	mov r9, r3

diff --git a/asm/code_8046CE4.s b/asm/code_8046CE4.s
@@ -418,7 +418,7 @@ _08047462:
 	ldr r2, [r0]
 	mov r0, r9
 	adds r1, r4, 0
-	bl sub_80522F4
+	bl TryDisplayDungeonLoggableMessage3
 	mov r0, r9
 	adds r1, r4, 0
 	bl TrySendImmobilizeSleepEndMsg
@@ -475,7 +475,7 @@ _080474E2:
 	ldr r2, [r0]
 	mov r0, r9
 	adds r1, r4, 0
-	bl sub_80522F4
+	bl TryDisplayDungeonLoggableMessage3
 	b _08047524
 	.align 2, 0
 _0804750C: .4byte gAvailablePokemonNames
@@ -486,7 +486,7 @@ _08047518:
 	ldr r2, [r0]
 	mov r0, r9
 	adds r1, r4, 0
-	bl sub_80522F4
+	bl TryDisplayDungeonLoggableMessage3
 _08047524:
 	adds r5, 0x8
 	subs r6, 0x1
@@ -552,7 +552,7 @@ _08047596:
 	ldr r0, _080475C0
 	ldr r1, [r0]
 	mov r0, r9
-	bl SendMessage
+	bl TryDisplayDungeonLoggableMessage
 _080475A8:
 	movs r3, 0x90
 	lsls r3, 2
@@ -924,7 +924,7 @@ _0804786E:
 	ldr r2, [r0]
 	ldr r0, [sp, 0x10]
 	adds r1, r5, 0
-	bl sub_80522F4
+	bl TryDisplayDungeonLoggableMessage3
 	ldr r0, [sp, 0x10]
 	adds r1, r5, 0
 	bl TrySendImmobilizeSleepEndMsg
@@ -962,7 +962,7 @@ _080478DC:
 	ldr r2, [r0]
 	ldr r0, [sp, 0x10]
 	adds r1, r5, 0
-	bl sub_80522F4
+	bl TryDisplayDungeonLoggableMessage3
 	b _08047900
 	.align 2, 0
 _080478F0: .4byte gUnknown_80F9510
@@ -971,7 +971,7 @@ _080478F4:
 	ldr r2, [r0]
 	ldr r0, [sp, 0x10]
 	adds r1, r5, 0
-	bl sub_80522F4
+	bl TryDisplayDungeonLoggableMessage3
 _08047900:
 	movs r2, 0x1
 	str r2, [sp, 0x20]