sync idb

2 files changed, 53 insertions, 66 deletions

diff --git a/asm/rom4.s b/asm/rom4.s
index 46374cb4d..5810f7e5b 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -45548,7 +45548,7 @@ s77_showcontestwinner: @ 80672E8
 	ldrb r2, [r1]
 	adds r1, 0x1
 	str r1, [r0, 0x8]
-	cmp r2, 0 @ Last Master Rank Contest winner
+	cmp r2, 0
 	beq _080672FC
 	adds r0, r2, 0
 	bl sub_8106630
diff --git a/asm/rom5.s b/asm/rom5.s
index e23b9da24..aec3584dd 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -266166,8 +266166,6 @@ _080FC79C: .4byte sub_808AD58
 
 	thumb_func_start sub_80FC7A0
 sub_80FC7A0: @ 80FC7A0
-@ This routine appears to handle contest winners' portraits.
-@ It's called during execution of S77_showcontestwinner.
 	push {lr}
 	ldr r2, _080FC7E8
 	ldr r1, [r0, 0x4]
@@ -266197,7 +266195,7 @@ sub_80FC7A0: @ 80FC7A0
 	subs r0, 0x2
 	cmp r0, 0x22
 	bls _080FC7DC
-	b _quit_080FC928
+	b _080FC928
 _080FC7DC:
 	lsls r0, 2
 	ldr r1, _080FC808
@@ -266216,97 +266214,87 @@ _080FC804: .4byte 0x03005df4
 _080FC808: .4byte _080FC80C
 	.align 2, 0
 _080FC80C:
-	.4byte _080FC898 @ 00
-	.4byte _quit_080FC928 @ 01
-	.4byte _quit_080FC928 @ 02
-	.4byte _quit_080FC928 @ 03
-	.4byte _080FC8F8 @ 04
-	.4byte _quit_080FC928 @ 05
-	.4byte _080FC89E @ 06
-	.4byte _080FC8A4 @ 07
-	.4byte _080FC8B8 @ 08
-	.4byte _080FC8CA @ 09
-	.4byte _quit_080FC928 @ 0a
-	.4byte _080FC8E0 @ 0b
-	.4byte _quit_080FC928 @ 0c
-	.4byte _quit_080FC928 @ 0d
-	.4byte _quit_080FC928 @ 0e
-	.4byte _quit_080FC928 @ 0f
-	.4byte _quit_080FC928 @ 10
-	.4byte _quit_080FC928 @ 11
-	.4byte _quit_080FC928 @ 12
-	.4byte _quit_080FC928 @ 13
-	.4byte _quit_080FC928 @ 14
-	.4byte _quit_080FC928 @ 15
-	.4byte _quit_080FC928 @ 16
-	.4byte _quit_080FC928 @ 17
-	.4byte _quit_080FC928 @ 18
-	.4byte _quit_080FC928 @ 19
-	.4byte _quit_080FC928 @ 1a
-	.4byte _quit_080FC928 @ 1b
-	.4byte _080FC8E6 @ 1c
-	.4byte _080FC8C4 @ 1d
-	.4byte _080FC8EC @ 1e
-	.4byte _080FC8F2 @ 1f
-	.4byte _quit_080FC928 @ 20
-	.4byte _quit_080FC928 @ 21
-	.4byte _080FC904 @ 22
-_080FC898: @ Cuteness
+	.4byte _080FC898
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC8F8
+	.4byte _080FC928
+	.4byte _080FC89E
+	.4byte _080FC8A4
+	.4byte _080FC8B8
+	.4byte _080FC8CA
+	.4byte _080FC928
+	.4byte _080FC8E0
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC8E6
+	.4byte _080FC8C4
+	.4byte _080FC8EC
+	.4byte _080FC8F2
+	.4byte _080FC928
+	.4byte _080FC928
+	.4byte _080FC904
+_080FC898:
 	bl sub_80FCAA4
-	b _quit_080FC928
-
+	b _080FC928
 _080FC89E:
 	bl sub_80FCB5C
-	b _quit_080FC928
-
-_080FC8A4: @ Coolness
+	b _080FC928
+_080FC8A4:
 	bl sub_80FCD54
 	ldr r0, _080FC8B4
 	ldrb r0, [r0]
 	bl sub_80FCC18
-	b _quit_080FC928
+	b _080FC928
 	.align 2, 0
 _080FC8B4: .4byte 0x03005e00
-
 _080FC8B8:
 	bl sub_80FCD54
 	bl sub_80FCEA4
 	bl sub_80FCCBC
 _080FC8C4:
 	bl sub_80FCEA4
-	b _quit_080FC928
-
+	b _080FC928
 _080FC8CA:
 	bl sub_80FCD54
 	bl sub_80FD06C
 	bl sub_80FD06C
 	bl sub_80FD114
 	bl sub_80FCCBC
-	b _quit_080FC928
-
-_080FC8E0: @ Beauty
+	b _080FC928
+_080FC8E0:
 	bl sub_80FCF3C
-	b _quit_080FC928
-
+	b _080FC928
 _080FC8E6:
 	bl sub_80FCD54
-	b _quit_080FC928
-
+	b _080FC928
 _080FC8EC:
 	bl sub_80FD06C
-	b _quit_080FC928
-
+	b _080FC928
 _080FC8F2:
 	bl sub_80FD114
-	b _quit_080FC928
-
-_080FC8F8: @ Toughness
+	b _080FC928
+_080FC8F8:
 	bl sub_80FCAC4
 	movs r0, 0x3
 	bl sub_80FC92C
-	b _quit_080FC928
-
-_080FC904: @ Smartness
+	b _080FC928
+_080FC904:
 	bl sub_80FCD54
 	bl sub_80FD06C
 	bl sub_80FD114
@@ -266317,7 +266305,7 @@ _080FC904: @ Smartness
 	bl sub_80FC92C
 	movs r0, 0x4
 	bl sub_80FC9E4
-_quit_080FC928:
+_080FC928:
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80FC7A0
@@ -267462,7 +267450,6 @@ _080FD1C4: .4byte 0x03005df0
 
 	thumb_func_start sub_80FD1C8
 sub_80FD1C8: @ 80FD1C8
-@ Cuteness contest sketch mod
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9