Merge pull request pret#201 from red031000/master

clean up easy_chat.c
red031000 · Jul 22, 2023 · 7b0be66 · 7b0be66
2 parents decd3cd + 229fb46
commit 7b0be66
Show file tree

Hide file tree

Showing 29 changed files with 1,541 additions and 1,557 deletions.
diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -68,7 +68,7 @@
 .public GF_RTC_GetTimeOfDayWildParam
 .public WallpaperPasswordBank_Create
 .public WallpaperPasswordBank_Delete
-.public WallpaperPasswordBank_GetNum
+.public WallpaperPasswordBank_GetCount
 .public WallpaperPasswordBank_GetIndexOfWord
 .public CreateCameraTranslationWrapper
 .public DeleteCameraTranslationWrapper

diff --git a/asm/include/overlay_45_thumb.inc b/asm/include/overlay_45_thumb.inc
@@ -34,8 +34,8 @@
 .public DestroySysTask
 .public WallpaperPasswordBank_Create
 .public WallpaperPasswordBank_Delete
-.public WallpaperPasswordBank_GetNum
-.public WallpaperPasswordBank_GetWordI
+.public WallpaperPasswordBank_GetCount
+.public WallpaperPasswordBank_GetWordAtIndex
 .public sub_02018068
 .public sub_020181B0
 .public sub_020181EC

diff --git a/asm/overlay_02.s b/asm/overlay_02.s
@@ -14700,7 +14700,7 @@ ov02_0224CAB8: ; 0x0224CAB8
 	add r6, r2, #0
 	str r1, [sp]
 	add r7, r3, #0
-	bl WallpaperPasswordBank_GetNum
+	bl WallpaperPasswordBank_GetCount
 	add r4, r0, #0
 	add r0, r5, #0
 	add r1, r6, #0
@@ -14868,7 +14868,7 @@ ov02_0224CBF8: ; 0x0224CBF8
 	add r6, r2, #0
 	str r1, [sp]
 	add r7, r3, #0
-	bl WallpaperPasswordBank_GetNum
+	bl WallpaperPasswordBank_GetCount
 	add r4, r0, #0
 	add r0, r5, #0
 	add r1, r6, #0

diff --git a/asm/overlay_25.s b/asm/overlay_25.s
@@ -593,17 +593,17 @@ _02259D7A:
 
 ; It's MATCH!
 ov25_02259D84:
-	.byte 0x00, msg_0294_00003, EC_GROUP_PEOPLE, 0xFF
+	.byte 0x00, msg_0294_00003, EC_GROUP_TRAINER, 0xFF
 	.short msg_0285_match, 0x0000
 
 ; VICTORY! Thank you!
 ov25_02259D8C: ; 0x02259D8C
-	.byte 0x01, msg_0296_00007, EC_GROUP_PEOPLE, 0xFF
+	.byte 0x01, msg_0296_00007, EC_GROUP_TRAINER, 0xFF
 	.short msg_0285_victory, 0x0000
 
 ; You win... THANKS!
 ov25_02259D94: ; 0x02259D94
-	.byte 0x02, msg_0292_00000, EC_GROUP_LIFESTYLE, 0xFF
+	.byte 0x02, msg_0292_00000, EC_GROUP_GREETINGS, 0xFF
 	.short msg_0287_thanks, 0x0000
 
 ov25_02259D9C: ; 0x02259D9C

diff --git a/asm/overlay_45_thumb.s b/asm/overlay_45_thumb.s
@@ -6146,7 +6146,7 @@ ov45_0222CA10: ; 0x0222CA10
 	add r4, r1, #0
 	add r6, r0, #0
 	add r5, r2, #0
-	bl WallpaperPasswordBank_GetNum
+	bl WallpaperPasswordBank_GetCount
 	add r7, r0, #0
 	str r4, [sp, #8]
 	add r0, sp, #8
@@ -6157,7 +6157,7 @@ ov45_0222CA10: ; 0x0222CA10
 	add r0, r0, r4
 	bl _u32_div_f
 	add r0, r6, #0
-	bl WallpaperPasswordBank_GetWordI
+	bl WallpaperPasswordBank_GetWordAtIndex
 	strh r0, [r5]
 	add r0, sp, #8
 	ldrb r0, [r0, #1]
@@ -6166,7 +6166,7 @@ ov45_0222CA10: ; 0x0222CA10
 	add r0, r4, r0
 	bl _u32_div_f
 	add r0, r6, #0
-	bl WallpaperPasswordBank_GetWordI
+	bl WallpaperPasswordBank_GetWordAtIndex
 	strh r0, [r5, #2]
 	add r0, sp, #8
 	ldrb r4, [r0, #2]
@@ -6175,14 +6175,14 @@ ov45_0222CA10: ; 0x0222CA10
 	add r0, r0, r4
 	bl _u32_div_f
 	add r0, r6, #0
-	bl WallpaperPasswordBank_GetWordI
+	bl WallpaperPasswordBank_GetWordAtIndex
 	strh r0, [r5, #4]
 	ldr r0, [sp]
 	add r1, r7, #0
 	add r0, r4, r0
 	bl _u32_div_f
 	add r0, r6, #0
-	bl WallpaperPasswordBank_GetWordI
+	bl WallpaperPasswordBank_GetWordAtIndex
 	strh r0, [r5, #6]
 	add sp, #0xc
 	pop {r4, r5, r6, r7, pc}