Update

1 files changed, 5 insertions, 294 deletions

diff --git a/asm/intro_credits_graphics.s b/asm/intro_credits_graphics.s
index 190093076..ea4c50aaa 100644
--- a/asm/intro_credits_graphics.s
+++ b/asm/intro_credits_graphics.s
@@ -6,295 +6,6 @@
 
 	.text
 
-
-
-	thumb_func_start sub_8148F3C
-sub_8148F3C: @ 8148F3C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _08148FB4 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r3, r0, r1
-	ldrh r0, [r3, 0xA]
-	lsls r4, r0, 16
-	adds r6, r1, 0
-	cmp r4, 0
-	beq _08148F7C
-	movs r1, 0xC
-	ldrsh r0, [r3, r1]
-	lsls r0, 16
-	ldrh r1, [r3, 0xE]
-	adds r2, r0, r1
-	lsrs r0, r4, 12
-	subs r2, r0
-	asrs r1, r2, 16
-	strh r1, [r3, 0xC]
-	strh r2, [r3, 0xE]
-	ldr r0, _08148FB8 @ =REG_BG1HOFS
-	strh r1, [r0]
-	ldr r2, _08148FBC @ =REG_BG1VOFS
-	ldr r1, _08148FC0 @ =gUnknown_02039358
-	ldr r0, _08148FC4 @ =gUnknown_0203935A
-	ldrh r0, [r0]
-	ldrh r1, [r1]
-	adds r0, r1
-	strh r0, [r2]
-_08148F7C:
-	ldrh r0, [r3, 0x10]
-	lsls r4, r0, 16
-	cmp r4, 0
-	beq _08148FD8
-	movs r1, 0x12
-	ldrsh r0, [r3, r1]
-	lsls r0, 16
-	ldrh r1, [r3, 0x14]
-	adds r2, r0, r1
-	lsrs r0, r4, 12
-	subs r2, r0
-	asrs r1, r2, 16
-	strh r1, [r3, 0x12]
-	strh r2, [r3, 0x14]
-	ldr r0, _08148FC8 @ =REG_BG2HOFS
-	strh r1, [r0]
-	movs r1, 0x8
-	ldrsh r0, [r3, r1]
-	cmp r0, 0
-	beq _08148FD0
-	ldr r2, _08148FCC @ =REG_BG2VOFS
-	ldr r1, _08148FC0 @ =gUnknown_02039358
-	ldr r0, _08148FC4 @ =gUnknown_0203935A
-	ldrh r0, [r0]
-	ldrh r1, [r1]
-	adds r0, r1
-	strh r0, [r2]
-	b _08148FD8
-	.align 2, 0
-_08148FB4: .4byte gTasks
-_08148FB8: .4byte REG_BG1HOFS
-_08148FBC: .4byte REG_BG1VOFS
-_08148FC0: .4byte gUnknown_02039358
-_08148FC4: .4byte gUnknown_0203935A
-_08148FC8: .4byte REG_BG2HOFS
-_08148FCC: .4byte REG_BG2VOFS
-_08148FD0:
-	ldr r0, _08149010 @ =REG_BG2VOFS
-	ldr r1, _08149014 @ =gUnknown_02039358
-	ldrh r1, [r1]
-	strh r1, [r0]
-_08148FD8:
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r3, r0, r6
-	ldrh r0, [r3, 0x16]
-	lsls r4, r0, 16
-	cmp r4, 0
-	beq _08149008
-	movs r1, 0x18
-	ldrsh r0, [r3, r1]
-	lsls r0, 16
-	ldrh r1, [r3, 0x1A]
-	adds r2, r0, r1
-	lsrs r0, r4, 12
-	subs r2, r0
-	asrs r1, r2, 16
-	strh r1, [r3, 0x18]
-	strh r2, [r3, 0x1A]
-	ldr r0, _08149018 @ =REG_BG3HOFS
-	strh r1, [r0]
-	ldr r1, _0814901C @ =REG_BG3VOFS
-	ldr r0, _08149014 @ =gUnknown_02039358
-	ldrh r0, [r0]
-	strh r0, [r1]
-_08149008:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08149010: .4byte REG_BG2VOFS
-_08149014: .4byte gUnknown_02039358
-_08149018: .4byte REG_BG3HOFS
-_0814901C: .4byte REG_BG3VOFS
-	thumb_func_end sub_8148F3C
-
-	thumb_func_start sub_8149020
-sub_8149020: @ 8149020
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _08149100
-	cmp r0, 0x1
-	ble _08149034
-	cmp r0, 0x2
-	beq _08149098
-_08149034:
-	ldr r0, _08149060 @ =gMain
-	ldr r2, [r0, 0x20]
-	movs r0, 0x3
-	ands r0, r2
-	cmp r0, 0
-	bne _08149100
-	ldr r0, _08149064 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08149100
-	movs r0, 0x4
-	ands r2, r0
-	cmp r2, 0
-	beq _0814906C
-	ldr r2, _08149068 @ =gPlttBufferUnfaded
-	ldrh r1, [r2, 0x12]
-	mov r0, sp
-	strh r1, [r0]
-	ldrh r1, [r2, 0x14]
-	b _08149076
-	.align 2, 0
-_08149060: .4byte gMain
-_08149064: .4byte gPaletteFade
-_08149068: .4byte gPlttBufferUnfaded
-_0814906C:
-	ldr r2, _08149094 @ =gPlttBufferUnfaded
-	ldrh r1, [r2, 0x14]
-	mov r0, sp
-	strh r1, [r0]
-	ldrh r1, [r2, 0x12]
-_08149076:
-	adds r0, 0x2
-	strh r1, [r0]
-	adds r4, r0, 0
-	mov r0, sp
-	movs r1, 0x9
-	movs r2, 0x2
-	bl LoadPalette
-	adds r0, r4, 0
-	movs r1, 0xA
-	movs r2, 0x2
-	bl LoadPalette
-	b _08149100
-	.align 2, 0
-_08149094: .4byte gPlttBufferUnfaded
-_08149098:
-	ldr r0, _081490C8 @ =gMain
-	ldr r2, [r0, 0x20]
-	movs r0, 0x3
-	ands r0, r2
-	cmp r0, 0
-	bne _08149100
-	ldr r0, _081490CC @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08149100
-	movs r0, 0x4
-	ands r2, r0
-	cmp r2, 0
-	beq _081490D8
-	mov r1, sp
-	ldr r2, _081490D0 @ =0x00003d27
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r2, _081490D4 @ =0x00000295
-	b _081490E6
-	.align 2, 0
-_081490C8: .4byte gMain
-_081490CC: .4byte gPaletteFade
-_081490D0: .4byte 0x00003d27
-_081490D4: .4byte 0x00000295
-_081490D8:
-	mov r1, sp
-	movs r2, 0xC7
-	lsls r2, 2
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r1, 0x2
-	ldr r2, _08149108 @ =0x00003d27
-_081490E6:
-	adds r0, r2, 0
-	strh r0, [r1]
-	adds r4, r1, 0
-	mov r0, sp
-	movs r1, 0xC
-	movs r2, 0x2
-	bl LoadPalette
-	adds r0, r4, 0
-	movs r1, 0xD
-	movs r2, 0x2
-	bl LoadPalette
-_08149100:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08149108: .4byte 0x00003d27
-	thumb_func_end sub_8149020
-
-	thumb_func_start sub_814910C
-sub_814910C: @ 814910C
-	push {lr}
-	adds r2, r0, 0
-	ldr r0, _08149124 @ =gUnknown_0203935C
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _08149128
-	adds r0, r2, 0
-	bl DestroySprite
-	b _0814916C
-	.align 2, 0
-_08149124: .4byte gUnknown_0203935C
-_08149128:
-	movs r1, 0x20
-	ldrsh r0, [r2, r1]
-	lsls r0, 16
-	ldrh r1, [r2, 0x32]
-	orrs r0, r1
-	ldrh r1, [r2, 0x30]
-	adds r0, r1
-	asrs r1, r0, 16
-	strh r1, [r2, 0x20]
-	strh r0, [r2, 0x32]
-	cmp r1, 0xFF
-	ble _08149144
-	ldr r0, _08149158 @ =0x0000ffe0
-	strh r0, [r2, 0x20]
-_08149144:
-	movs r1, 0x2E
-	ldrsh r0, [r2, r1]
-	cmp r0, 0
-	beq _08149164
-	ldr r1, _0814915C @ =gUnknown_02039358
-	ldr r0, _08149160 @ =gUnknown_0203935A
-	ldrh r0, [r0]
-	ldrh r1, [r1]
-	adds r0, r1
-	b _08149168
-	.align 2, 0
-_08149158: .4byte 0x0000ffe0
-_0814915C: .4byte gUnknown_02039358
-_08149160: .4byte gUnknown_0203935A
-_08149164:
-	ldr r0, _08149170 @ =gUnknown_02039358
-	ldrh r0, [r0]
-_08149168:
-	negs r0, r0
-	strh r0, [r2, 0x26]
-_0814916C:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08149170: .4byte gUnknown_02039358
-	thumb_func_end sub_814910C
-
 	thumb_func_start sub_8149174
 sub_8149174: @ 8149174
 	push {r4-r7,lr}
@@ -345,11 +56,11 @@ _0814919E:
 	movs r0, 0xC
 	orrs r3, r0
 	strb r3, [r4, 0x5]
-	ldrb r1, [r6]
-	lsls r1, 26
-	lsrs r1, 30
-	lsls r1, 6
-	ldrb r2, [r4, 0x1]
+	ldrb r1, [r6] @take var0
+	lsls r1, 26 @shift left
+	lsrs r1, 30 @shift right
+	lsls r1, 6 @gf wat r u doin
+	ldrb r2, [r4, 0x1] @load OamData byte 1
 	mov r0, r9
 	ands r0, r2
 	orrs r0, r1