through ScrCmd_fadescreenspeed

2019-01-06 10:22:04 -05:00
parent 1cb1fd2bf8
commit 257bde9b08
5 changed files with 100 additions and 199 deletions
@@ -5,204 +5,6 @@

 	.text

-	thumb_func_start ScrCmd_setflag
-ScrCmd_setflag: @ 806A82C
-	push {lr}
-	bl ScriptReadHalfword
-	lsls r0, 16
-	lsrs r0, 16
-	bl FlagSet
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end ScrCmd_setflag
-
-	thumb_func_start ScrCmd_clearflag
-ScrCmd_clearflag: @ 806A840
-	push {lr}
-	bl ScriptReadHalfword
-	lsls r0, 16
-	lsrs r0, 16
-	bl FlagClear
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end ScrCmd_clearflag
-
-	thumb_func_start ScrCmd_checkflag
-ScrCmd_checkflag: @ 806A854
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptReadHalfword
-	lsls r0, 16
-	lsrs r0, 16
-	bl FlagGet
-	strb r0, [r4, 0x2]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end ScrCmd_checkflag
-
-	thumb_func_start ScrCmd_incrementgamestat
-ScrCmd_incrementgamestat: @ 806A870
-	push {lr}
-	ldr r1, [r0, 0x8]
-	ldrb r2, [r1]
-	adds r1, 0x1
-	str r1, [r0, 0x8]
-	adds r0, r2, 0
-	bl IncrementGameStat
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end ScrCmd_incrementgamestat
-
-	thumb_func_start sub_806A888
-sub_806A888: @ 806A888
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, [r5, 0x8]
-	ldrb r4, [r0]
-	adds r0, 0x1
-	str r0, [r5, 0x8]
-	adds r0, r5, 0
-	bl ScriptReadWord
-	adds r6, r0, 0
-	adds r0, r4, 0
-	bl GetGameStat
-	cmp r0, r6
-	bcs _0806A8AA
-	movs r0, 0
-	b _0806A8B4
-_0806A8AA:
-	cmp r0, r6
-	bne _0806A8B2
-	movs r0, 0x1
-	b _0806A8B4
-_0806A8B2:
-	movs r0, 0x2
-_0806A8B4:
-	strb r0, [r5, 0x2]
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806A888
-
-	thumb_func_start sub_806A8C0
-sub_806A8C0: @ 806A8C0
-	push {r4,lr}
-	bl ScriptReadHalfword
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r4, 0
-	bl sub_8115748
-	adds r0, r4, 0
-	bl sub_80F85BC
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806A8C0
-
-	thumb_func_start ScrCmd_animateflash
-ScrCmd_animateflash: @ 806A8E0
-	push {lr}
-	ldr r1, [r0, 0x8]
-	ldrb r2, [r1]
-	adds r1, 0x1
-	str r1, [r0, 0x8]
-	adds r0, r2, 0
-	bl sub_807F028
-	bl ScriptContext1_Stop
-	movs r0, 0x1
-	pop {r1}
-	bx r1
-	thumb_func_end ScrCmd_animateflash
-
-	thumb_func_start ScrCmd_setflashradius
-ScrCmd_setflashradius: @ 806A8FC
-	push {lr}
-	bl ScriptReadHalfword
-	lsls r0, 16
-	lsrs r0, 16
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	bl Overworld_SetFlashLevel
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end ScrCmd_setflashradius
-
-	thumb_func_start sub_806A918
-sub_806A918: @ 806A918
-	push {lr}
-	ldr r0, _0806A92C @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0806A930
-	movs r0, 0
-	b _0806A932
-	.align 2, 0
-_0806A92C: .4byte gPaletteFade
-_0806A930:
-	movs r0, 0x1
-_0806A932:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_806A918
-
-	thumb_func_start ScrCmd_fadescreen
-ScrCmd_fadescreen: @ 806A938
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r1, [r4, 0x8]
-	ldrb r0, [r1]
-	adds r1, 0x1
-	str r1, [r4, 0x8]
-	movs r1, 0
-	bl fade_screen
-	ldr r1, _0806A95C @ =sub_806A918
-	adds r0, r4, 0
-	bl SetupNativeScript
-	movs r0, 0x1
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0806A95C: .4byte sub_806A918
-	thumb_func_end ScrCmd_fadescreen
-
-	thumb_func_start ScrCmd_fadescreenspeed
-ScrCmd_fadescreenspeed: @ 806A960
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r2, [r4, 0x8]
-	ldrb r0, [r2]
-	adds r2, 0x1
-	str r2, [r4, 0x8]
-	ldrb r1, [r2]
-	adds r2, 0x1
-	str r2, [r4, 0x8]
-	lsls r1, 24
-	asrs r1, 24
-	bl fade_screen
-	ldr r1, _0806A98C @ =sub_806A918
-	adds r0, r4, 0
-	bl SetupNativeScript
-	movs r0, 0x1
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0806A98C: .4byte sub_806A918
-	thumb_func_end ScrCmd_fadescreenspeed
-
 	thumb_func_start RunPauseTimer
 RunPauseTimer: @ 806A990
 	push {lr}