Merge pull request #65 from MokhaLeee/main

prep in process

Author: MokhaLeee

asm/playrank_0808F33C.s

@@ -2,271 +2,6 @@
 
 	.syntax unified
 
-	thumb_func_start func_fe6_0808FDE8
-func_fe6_0808FDE8: @ 0x0808FDE8
-	push {r4, r5, r6, r7, lr}
-	adds r7, r0, #0
-	lsls r1, r1, #0x10
-	lsrs r4, r1, #0x10
-	lsls r2, r2, #0x18
-	lsrs r6, r2, #0x18
-	lsls r3, r3, #0x18
-	lsrs r5, r3, #0x18
-	adds r3, r5, #0
-	lsls r0, r3, #0x10
-	cmp r0, #0
-	beq .L0808FE30
-.L0808FE00:
-	asrs r0, r0, #0x10
-	subs r0, r5, r0
-	lsls r0, r0, #6
-	adds r2, r7, r0
-	lsls r1, r6, #0x10
-	lsls r3, r3, #0x10
-	cmp r1, #0
-	beq .L0808FE24
-.L0808FE10:
-	strh r4, [r2]
-	adds r2, #2
-	adds r0, r4, #1
-	lsls r0, r0, #0x10
-	lsrs r4, r0, #0x10
-	ldr r0, .L0808FE38 @ =0xFFFF0000
-	adds r1, r1, r0
-	asrs r0, r1, #0x10
-	cmp r0, #0
-	bgt .L0808FE10
-.L0808FE24:
-	ldr r1, .L0808FE38 @ =0xFFFF0000
-	adds r0, r3, r1
-	lsrs r3, r0, #0x10
-	lsls r0, r3, #0x10
-	cmp r0, #0
-	bgt .L0808FE00
-.L0808FE30:
-	pop {r4, r5, r6, r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-.L0808FE38: .4byte 0xFFFF0000
-
-	thumb_func_start EndingCredit_SetupGfx
-EndingCredit_SetupGfx: @ 0x0808FE3C
-	push {r4, lr}
-	adds r4, r0, #0
-	bl UnpackUiWindowFrameGraphics
-	adds r4, #0x64
-	movs r3, #0
-	movs r0, #0
-	strh r0, [r4]
-	ldr r0, .L0808FEA4 @ =gCreditInfoDispStep
-	strb r3, [r0]
-	ldr r0, .L0808FEA8 @ =unk_02016A3D
-	strb r3, [r0]
-	ldr r0, .L0808FEAC @ =unk_02016A3F
-	strb r3, [r0]
-	ldr r0, .L0808FEB0 @ =gEndingStep
-	strb r3, [r0]
-	ldr r4, .L0808FEB4 @ =gDispIo
-	adds r2, r4, #0
-	adds r2, #0x3c
-	movs r0, #0x3f
-	ldrb r1, [r2]
-	ands r0, r1
-	movs r1, #0x40
-	orrs r0, r1
-	strb r0, [r2]
-	adds r0, r4, #0
-	adds r0, #0x44
-	strb r3, [r0]
-	adds r1, r4, #0
-	adds r1, #0x45
-	movs r0, #0x10
-	strb r0, [r1]
-	adds r0, r4, #0
-	adds r0, #0x46
-	strb r3, [r0]
-	ldr r0, .L0808FEB8 @ =0x0000FFE0
-	ldrh r2, [r4, #0x3c]
-	ands r0, r2
-	movs r1, #3
-	orrs r0, r1
-	ldr r1, .L0808FEBC @ =0x0000E0FF
-	ands r0, r1
-	movs r2, #0xc0
-	lsls r2, r2, #4
-	adds r1, r2, #0
-	orrs r0, r1
-	strh r0, [r4, #0x3c]
-	bl SetupCreditCharacterGlyphs
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-.L0808FEA4: .4byte gCreditInfoDispStep
-.L0808FEA8: .4byte unk_02016A3D
-.L0808FEAC: .4byte unk_02016A3F
-.L0808FEB0: .4byte gEndingStep
-.L0808FEB4: .4byte gDispIo
-.L0808FEB8: .4byte 0x0000FFE0
-.L0808FEBC: .4byte 0x0000E0FF
-
-	thumb_func_start GameCredit_Init
-GameCredit_Init: @ 0x0808FEC0
-	push {lr}
-	ldr r2, .L0808FED4 @ =gEndingDispType
-	movs r1, #1
-	strb r1, [r2]
-	bl EndingCredit_SetupGfx
-	bl SetupEndingPInfo2Uids
-	pop {r0}
-	bx r0
-	.align 2, 0
-.L0808FED4: .4byte gEndingDispType
-
-	thumb_func_start EndingCredit_ReinitType2
-EndingCredit_ReinitType2: @ 0x0808FED8
-	push {lr}
-	ldr r2, .L0808FEEC @ =gEndingDispType
-	movs r1, #2
-	strb r1, [r2]
-	bl EndingCredit_SetupGfx
-	bl SetupEndingPInfo2Uids
-	pop {r0}
-	bx r0
-	.align 2, 0
-.L0808FEEC: .4byte gEndingDispType
-
-	thumb_func_start EndingCredit_ReinitType0
-EndingCredit_ReinitType0: @ 0x0808FEF0
-	push {lr}
-	ldr r2, .L0808FF00 @ =gEndingDispType
-	movs r1, #0
-	strb r1, [r2]
-	bl EndingCredit_SetupGfx
-	pop {r0}
-	bx r0
-	.align 2, 0
-.L0808FF00: .4byte gEndingDispType
-
-	thumb_func_start func_fe6_0808FF04
-func_fe6_0808FF04: @ 0x0808FF04
-	push {r4, r5, lr}
-	adds r3, r0, #0
-	adds r5, r1, #0
-	adds r4, r2, #0
-	ldr r0, .L0808FF34 @ =unk_02016A42
-	ldrb r0, [r0]
-	cmp r0, #0x13
-	bhi .L0808FF40
-	ldr r1, .L0808FF38 @ =unk_02016A43
-	adds r2, r3, #0
-	adds r2, #0x4c
-	movs r3, #0
-	ldrsh r0, [r2, r3]
-	adds r0, r0, r1
-	movs r1, #0x16
-	strb r1, [r0]
-	ldr r1, .L0808FF3C @ =unk_02016AC3
-	movs r3, #0
-	ldrsh r0, [r2, r3]
-	adds r0, r0, r1
-	asrs r1, r4, #1
-	strb r1, [r0]
-	b .L0808FF8C
-	.align 2, 0
-.L0808FF34: .4byte unk_02016A42
-.L0808FF38: .4byte unk_02016A43
-.L0808FF3C: .4byte unk_02016AC3
-.L0808FF40:
-	ldr r1, .L0808FF5C @ =unk_02016AC3
-	adds r0, r3, #0
-	adds r0, #0x4c
-	movs r2, #0
-	ldrsh r4, [r0, r2]
-	adds r3, r4, r1
-	ldrb r1, [r3]
-	adds r2, r0, #0
-	cmp r1, #0
-	beq .L0808FF60
-	subs r0, r1, #1
-	strb r0, [r3]
-	b .L0808FF8C
-	.align 2, 0
-.L0808FF5C: .4byte unk_02016AC3
-.L0808FF60:
-	ldr r3, .L0808FF88 @ =unk_02016A43
-	adds r0, r4, r3
-	ldrb r1, [r0]
-	adds r1, #4
-	strb r1, [r0]
-	movs r1, #0
-	ldrsh r0, [r2, r1]
-	adds r0, r0, r3
-	ldrb r1, [r0]
-	cmp r1, r5
-	ble .L0808FF78
-	strb r5, [r0]
-.L0808FF78:
-	ldrh r0, [r2]
-	adds r1, r0, #1
-	strh r1, [r2]
-	lsls r0, r0, #0x10
-	asrs r0, r0, #0x10
-	adds r0, r0, r3
-	ldrb r0, [r0]
-	b .L0808FF94
-	.align 2, 0
-.L0808FF88: .4byte unk_02016A43
-.L0808FF8C:
-	ldrh r0, [r2]
-	adds r0, #1
-	strh r0, [r2]
-	movs r0, #0xf0
-.L0808FF94:
-	pop {r4, r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-
-	thumb_func_start func_fe6_0808FF9C
-func_fe6_0808FF9C: @ 0x0808FF9C
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	adds r6, r1, #0
-	adds r5, r2, #0
-	ldr r2, .L0808FFC8 @ =gUnk_0868BB1C
-	ldrb r0, [r2]
-	cmp r0, #0
-	beq .L0808FFD8
-	movs r1, #0
-	adds r3, r2, #0
-.L0808FFB0:
-	ldrb r0, [r3]
-	cmp r0, r6
-	bne .L0808FFCC
-	ldrb r0, [r3, #1]
-	cmp r0, r5
-	bne .L0808FFCC
-	ldrb r3, [r3, #2]
-	adds r0, r3, r4
-	adds r4, r0, #0
-	subs r4, #8
-	b .L0808FFD8
-	.align 2, 0
-.L0808FFC8: .4byte gUnk_0868BB1C
-.L0808FFCC:
-	adds r1, #4
-	adds r3, #4
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne .L0808FFB0
-.L0808FFD8:
-	adds r0, r4, #0
-	pop {r4, r5, r6}
-	pop {r1}
-	bx r1
 
 	thumb_func_start func_fe6_0808FFE0
 func_fe6_0808FFE0: @ 0x0808FFE0
@@ -1856,7 +1591,7 @@ func_fe6_08090BC8: @ 0x08090BC8
 	ldr r1, .L08090D30 @ =0x00006140
 	movs r2, #0xf
 	movs r3, #0xa
-	bl func_fe6_0808FDE8
+	bl PutEndingCreditTm
 	movs r0, #4
 	bl EnableBgSync
 	pop {r4, r5}