Merge pull request #259 from AnonymousRandomPerson/master

Synced some dungeon symbol names with Sky
pret · Nov 16, 2024 · 07e740f · 07e740f
2 parents a916297 + 082fb07
commit 07e740f
Show file tree

Hide file tree

Showing 89 changed files with 1,845 additions and 1,813 deletions.
diff --git a/asm/code_2.s b/asm/code_2.s
@@ -3,7 +3,7 @@
 
 	.syntax unified
 
-	.text	
+	.text
 
 	thumb_func_start LoadTitleScreen
 LoadTitleScreen:
@@ -1262,7 +1262,7 @@ sub_8001064:
 	movs r0, 0x4
 	ldrsh r1, [r5, r0]
 	adds r0, r4, 0
-	bl CopyMonsterNametoBuffer
+	bl CopyMonsterNameToBuffer
 	mov r0, sp
 	adds r1, r4, 0
 	bl CopyStringtoBuffer
@@ -1293,7 +1293,7 @@ _080010AE:
 	movs r0, 0x6
 	ldrsh r1, [r5, r0]
 	adds r0, r4, 0
-	bl CopyMonsterNametoBuffer
+	bl CopyMonsterNameToBuffer
 	mov r0, sp
 	adds r1, r4, 0
 	bl CopyStringtoBuffer

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 TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	movs r1, 0xD2
 	lsls r1, 1
 	adds r0, r6, 0
@@ -2501,7 +2501,7 @@ _080414A0:
 _080414A4:
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl MoveMatchesChargingStatus
+	bl MoveMatchesBideClassStatus
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24

diff --git a/asm/code_8045A00.s b/asm/code_8045A00.s
@@ -65,7 +65,7 @@ _08045E1E:
 	ldr r0, _08045E38
 	adds r1, r7, 0
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	ldr r0, _08045E3C
 	b _08046048
 	.align 2, 0
@@ -278,7 +278,7 @@ _08045FAC:
 _08045FD0:
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	b _08045FF2
 	.align 2, 0
 _08045FDC: .4byte 0x00ff0008
@@ -288,7 +288,7 @@ _08045FE8:
 	ldr r0, _08045FFC
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 _08045FF2:
 	ldrb r0, [r5, 0x2]
 	bl TryDisplayItemPickupTutorialMessage
@@ -331,12 +331,12 @@ _0804602E:
 	ldr r0, _08046058
 	adds r1, r7, 0
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	ldr r0, _0804605C
 _08046048:
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	b _080460E0
 	.align 2, 0
 _08046054: .4byte gFormatBuffer_Items
@@ -374,12 +374,12 @@ _08046094:
 	ldr r0, _080460B8
 	adds r1, r7, 0
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	ldr r0, _080460BC
 _080460AC:
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	b _080460DA
 	.align 2, 0
 _080460B8: .4byte gFormatBuffer_Monsters
@@ -394,7 +394,7 @@ _080460C0:
 	ldr r0, _080460F4
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 _080460DA:
 	ldrb r0, [r5, 0x2]
 	bl TryDisplayItemPickupTutorialMessage
@@ -996,7 +996,7 @@ sub_804652C:
 	ldr r0, _080465A4
 	ldr r1, [r0]
 	mov r0, r10
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	mov r0, r9
 	ldrb r1, [r0]
 	movs r0, 0x1
@@ -1721,7 +1721,7 @@ _08046B0A:
 	ldr r4, _08046B38
 	add r4, sp
 	ldr r0, [r4]
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	b _08046C7C
 	.align 2, 0
 _08046B2C: .4byte 0x0000052c
@@ -1734,7 +1734,7 @@ _08046B3C:
 	ldr r5, _08046B50
 	add r5, sp
 	ldr r0, [r5]
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	b _08046C7C
 	.align 2, 0
 _08046B4C: .4byte gItemLost
@@ -1748,7 +1748,7 @@ _08046B54:
 	ldr r2, _08046C94
 	add r2, sp
 	ldr r0, [r2]
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 _08046B68:
 	movs r3, 0
 	mov r9, r3

diff --git a/asm/code_8046CE4.s b/asm/code_8046CE4.s
@@ -410,7 +410,7 @@ _08047462:
 	ldr r0, _080474C4
 	adds r1, r4, 0
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	ldr r0, _080474C8
 	ldr r1, [sp, 0x214]
 	bl sub_8045C08
@@ -463,7 +463,7 @@ _080474E2:
 	ldr r0, _0804750C
 	adds r1, r4, 0
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	ldr r0, _08047510
 	ldr r1, [sp, 0x214]
 	bl sub_8045BF8
@@ -552,7 +552,7 @@ _08047596:
 	ldr r0, _080475C0
 	ldr r1, [r0]
 	mov r0, r9
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 _080475A8:
 	movs r3, 0x90
 	lsls r3, 2
@@ -913,7 +913,7 @@ _0804786E:
 	ldr r0, _080478D4
 	adds r1, r5, 0
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	lsls r0, r6, 24
 	cmp r0, 0
 	beq _080478DC

diff --git a/asm/code_804FD30.s b/asm/code_804FD30.s
@@ -4118,7 +4118,7 @@ sub_8051E7C:
 	ldr r0, _08051EB4
 	ldr r1, [r0]
 	mov r0, r9
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	b _080520F6
 	.align 2, 0
 _08051EB4: .4byte gUnknown_80FDDF0
@@ -4378,7 +4378,7 @@ _0805207A:
 	ldr r0, _080520E8
 	ldr r1, [r0]
 	mov r0, r9
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	movs r0, 0x14
 	movs r1, 0x3C
 	bl sub_803E708
@@ -4399,7 +4399,7 @@ _080520EC:
 	ldr r0, _08052108
 	ldr r1, [r0]
 	mov r0, r9
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 _080520F6:
 	add sp, 0x14
 	pop {r3-r5}

diff --git a/asm/code_805D8C8.s b/asm/code_805D8C8.s
@@ -2171,7 +2171,7 @@ sub_8062B74:
 	ldr r0, _08062BD0
 	mov r1, r10
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	ldr r0, _08062BD4
 	ldr r2, [r0]
 	movs r0, 0
@@ -2322,7 +2322,7 @@ sub_8062CA8:
 	ldr r0, _08062CF8
 	adds r1, r4, 0
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	ldr r0, _08062CFC
 	ldr r2, [r0]
 	movs r0, 0
@@ -3429,7 +3429,7 @@ sub_8063578:
 	ldr r0, _080635FC
 	ldr r1, [sp, 0x14]
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	lsls r4, 3
 	adds r4, 0xA
 	ldr r0, _08063600
@@ -4122,7 +4122,7 @@ _08063AEC:
 	ldr r0, _08063B2C
 	ldr r1, [r0]
 	adds r0, r6, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	b _08063B3A
 	.align 2, 0
 _08063B1C: .4byte gDungeon
@@ -4134,7 +4134,7 @@ _08063B30:
 	ldr r0, _08063B50
 	ldr r1, [r0]
 	adds r0, r6, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 _08063B3A:
 	movs r0, 0x78
 	movs r1, 0x1F
@@ -4442,7 +4442,7 @@ _08063D70:
 	ldr r0, _08063DAC
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 	b _08063DBA
 	.align 2, 0
 _08063D98: .4byte gDungeon
@@ -4455,7 +4455,7 @@ _08063DB0:
 	ldr r0, _08063DD0
 	ldr r1, [r0]
 	adds r0, r7, 0
-	bl TryDisplayDungeonLoggableMessage
+	bl LogMessageByIdWithPopupCheckUser
 _08063DBA:
 	movs r0, 0x78
 	movs r1, 0x1F
@@ -5474,7 +5474,7 @@ sub_806455C:
 	ldr r1, [r4, 0x14]
 	add r0, sp, 0x4
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	str r5, [sp]
 	movs r0, 0x8
 	movs r1, 0x12

diff --git a/asm/code_805D8C8_1.s b/asm/code_805D8C8_1.s
@@ -1010,7 +1010,7 @@ _080690A2:
 	adds r0, r2
 	mov r1, r8
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	b _08069484
 	.align 2, 0
 _080690E4: .4byte gDungeon
@@ -1283,7 +1283,7 @@ _0806930A:
 	adds r0, r2
 	mov r1, r8
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 	b _08069352
 	.align 2, 0
 _0806932C: .4byte gUnknown_202EE70
@@ -1301,7 +1301,7 @@ _08069338:
 	adds r0, r3
 	mov r1, r8
 	movs r2, 0
-	bl SetMessageArgument
+	bl SubstitutePlaceholderStringTags
 _08069352:
 	bl GetLeader
 	cmp r0, 0
@@ -1515,7 +1515,7 @@ _080694FC:
 _0806950A:
 	adds r0, r4, 0
 	adds r1, r4, 0
-	bl SendImmobilizeEndMessage
+	bl EndFrozenClassStatus
 _08069512:
 	movs r0, 0x4
 	ldrsh r2, [r4, r0]