Merge branch 'master' into link

57 files changed, 76 insertions, 2696 deletions

diff --git a/asm/battle_anim_80D51AC.s b/asm/battle_anim_80D51AC.s
index 3ee1786ad..3ee1786ad 100755..100644
--- a/asm/battle_anim_80D51AC.s
+++ b/asm/battle_anim_80D51AC.s
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s
index 884383591..031bf2128 100644
--- a/asm/battle_anim_80FE840.s
+++ b/asm/battle_anim_80FE840.s
@@ -18852,7 +18852,7 @@ _0810800C:
 	negs r0, r0
 	cmp r1, r0
 	bne _08108022
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	adds r0, r7, 0
 	bl DestroyTask
 _08108022:
diff --git a/asm/battle_anim_815A0D4.s b/asm/battle_anim_815A0D4.s
index d583f1e85..d583f1e85 100755..100644
--- a/asm/battle_anim_815A0D4.s
+++ b/asm/battle_anim_815A0D4.s
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s
index 8e82de6c6..c2517586e 100755..100644
--- a/asm/battle_frontier_1.s
+++ b/asm/battle_frontier_1.s
@@ -9449,7 +9449,7 @@ _08193AA8:
 	b _08193BC2
 _08193ABA:
 	bl FreeAllWindowBuffers
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r4, =gUnknown_0203CD7C
 	ldr r0, [r4]
 	bl Free
@@ -9494,7 +9494,7 @@ _08193B20:
 	cmp r6, 0
 	bne _08193BC2
 	bl FreeAllWindowBuffers
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r4, =gUnknown_0203CD7C
 	ldr r0, [r4]
 	bl Free
@@ -9534,7 +9534,7 @@ _08193B84:
 	cmp r6, 0
 	bne _08193BC2
 	bl FreeAllWindowBuffers
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r4, =gUnknown_0203CD7C
 	ldr r0, [r4]
 	bl Free
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s
index 23f870d4d..98b5187c2 100755..100644
--- a/asm/battle_frontier_2.s
+++ b/asm/battle_frontier_2.s
@@ -18556,7 +18556,7 @@ _081A4202:
 	thumb_func_start sub_81A4224
 sub_81A4224: @ 81A4224
 	push {lr}
-	bl sub_81652B4
+	bl ValidateEReaderTrainer
 	pop {r0}
 	bx r0
 	thumb_func_end sub_81A4224
diff --git a/asm/battle_records.s b/asm/battle_records.s
index c441adc74..bcf82dbb8 100644
--- a/asm/battle_records.s
+++ b/asm/battle_records.s
@@ -1034,7 +1034,7 @@ _0813C6FA:
 	thumb_func_start sub_813C80C
 sub_813C80C: @ 813C80C
 	push {lr}
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl ResetPaletteFade
diff --git a/asm/battle_tent.s b/asm/battle_tent.s
index 8253d4f98..8253d4f98 100755..100644
--- a/asm/battle_tent.s
+++ b/asm/battle_tent.s
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index caad96269..c5d0cf3ba 100755..100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -5898,8 +5898,8 @@ _08165294:
 	.pool
 	thumb_func_end GetEreaderTrainerName
 
-	thumb_func_start sub_81652B4
-sub_81652B4: @ 81652B4
+	thumb_func_start ValidateEReaderTrainer
+ValidateEReaderTrainer: @ 81652B4
 	push {r4-r6,lr}
 	ldr r2, =gSpecialVar_Result
 	movs r0, 0
@@ -5951,7 +5951,7 @@ _08165316:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_81652B4
+	thumb_func_end ValidateEReaderTrainer
 
 	thumb_func_start sub_8165328
 sub_8165328: @ 8165328
diff --git a/asm/berry_tag_screen.s b/asm/berry_tag_screen.s
index 75e50f88d..2a87fbf18 100644
--- a/asm/berry_tag_screen.s
+++ b/asm/berry_tag_screen.s
@@ -119,7 +119,7 @@ _08177D18:
 	bl clear_scheduled_bg_copies_to_vram
 	b _08177DDC
 _08177D26:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	b _08177DDC
 _08177D2C:
 	bl ResetPaletteFade
diff --git a/asm/cable_car.s b/asm/cable_car.s
index 092e9a75e..6fd44dd9f 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -88,7 +88,7 @@ _0814FD20:
 	bl SetVBlankCallback
 	movs r0, 0
 	bl sub_8150B6C
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r3, 0xC0
 	lsls r3, 19
 	movs r4, 0xC0
diff --git a/asm/contest_link_81D9DE4.s b/asm/contest_link_81D9DE4.s
index 12eb159f7..12eb159f7 100755..100644
--- a/asm/contest_link_81D9DE4.s
+++ b/asm/contest_link_81D9DE4.s
diff --git a/asm/contest_painting.s b/asm/contest_painting.s
index 4e58b4cc3..8bb38eeed 100644
--- a/asm/contest_painting.s
+++ b/asm/contest_painting.s
@@ -107,7 +107,7 @@ _0812FE80:
 	.4byte _0812FF2A
 	.4byte _0812FF54
 _0812FE94:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r0, 0
 	bl SetVBlankCallback
 	bl AllocateMonSpritesGfx
diff --git a/asm/field_screen.s b/asm/field_screen.s
index dd8ad0094..4aea710d2 100644
--- a/asm/field_screen.s
+++ b/asm/field_screen.s
@@ -9621,7 +9621,7 @@ _080AFE64:
 	ldrsh r0, [r4, r3]
 	cmp r0, 0x1
 	bne _080AFEB4
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r0, 0x2
 	strh r0, [r4]
 	b _080AFEC6
@@ -9714,7 +9714,7 @@ _080AFF28:
 	ldrsh r0, [r4, r3]
 	cmp r0, 0x1
 	bne _080AFF78
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r0, 0x2
 	strh r0, [r4]
 	b _080AFF8A
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s
index 20380e478..19a29d729 100755..100644
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -244,7 +244,7 @@ _080D38F8:
 	lsrs r4, r0, 16
 	movs r7, 0x1
 	movs r5, 0
-	ldr r3, =gUnknown_0857C60A
+	ldr r3, =gUnknown_0857C608 + 2
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	adds r6, 0x1
diff --git a/asm/fldeff_groundshake.s b/asm/fldeff_groundshake.s
index 81d92430e..81d92430e 100755..100644
--- a/asm/fldeff_groundshake.s
+++ b/asm/fldeff_groundshake.s
diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s
index c3aa4f1ed..c3aa4f1ed 100755..100644
--- a/asm/fldeff_softboiled.s
+++ b/asm/fldeff_softboiled.s
diff --git a/asm/fossil_specials.s b/asm/fossil_specials.s
index 6883743ec..7956f814a 100755..100644
--- a/asm/fossil_specials.s
+++ b/asm/fossil_specials.s
@@ -657,7 +657,7 @@ _081BF0B4:
 	ldr r0, [r0]
 	ldr r1, [r0]
 	movs r5, 0
-	ldr r2, =gUnknown_08617C44
+	ldr r2, =gRootFossil_Gfx
 _081BF0BE:
 	adds r0, r5, r2
 	ldrb r0, [r0]
diff --git a/asm/hof_pc.s b/asm/hof_pc.s
deleted file mode 100644
index 29ca9204f..000000000
--- a/asm/hof_pc.s
+++ /dev/null
@@ -1,73 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start AccessHallOfFamePC
-AccessHallOfFamePC: @ 8137C28
-	push {lr}
-	ldr r0, =CB2_DoHallOfFamePC
-	bl SetMainCallback2
-	bl ScriptContext2_Enable
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end AccessHallOfFamePC
-
-	thumb_func_start ReturnFromHallOfFamePC
-ReturnFromHallOfFamePC: @ 8137C3C
-	push {lr}
-	ldr r0, =c2_exit_to_overworld_2_switch
-	bl SetMainCallback2
-	ldr r1, =gFieldCallback
-	ldr r0, =ReshowPCMenuAfterHallOfFamePC
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ReturnFromHallOfFamePC
-
-	thumb_func_start ReshowPCMenuAfterHallOfFamePC
-ReshowPCMenuAfterHallOfFamePC: @ 8137C5C
-	push {lr}
-	sub sp, 0x4
-	bl ScriptContext2_Enable
-	bl Overworld_PlaySpecialMapMusic
-	bl sp109_CreatePCMenu
-	bl sub_80E2514
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r0, =Task_WaitForPaletteFade
-	movs r1, 0xA
-	bl CreateTask
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ReshowPCMenuAfterHallOfFamePC
-
-	thumb_func_start Task_WaitForPaletteFade
-Task_WaitForPaletteFade: @ 8137C94
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08137CAC
-	adds r0, r2, 0
-	bl DestroyTask
-_08137CAC:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Task_WaitForPaletteFade
diff --git a/asm/international_string_util.s b/asm/international_string_util.s
index 469d88787..469d88787 100755..100644
--- a/asm/international_string_util.s
+++ b/asm/international_string_util.s
diff --git a/asm/intro.s b/asm/intro.s
index 21ecf41ad..62ac7ed2d 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -184,7 +184,7 @@ _0816CCF4:
 	movs r0, 0
 	movs r2, 0
 	bl load_copyright_graphics
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
diff --git a/asm/item_icon.s b/asm/item_icon.s
index e3fe4189a..e3fe4189a 100755..100644
--- a/asm/item_icon.s
+++ b/asm/item_icon.s
diff --git a/asm/item_menu.s b/asm/item_menu.s
index db3d38668..1d79852fe 100755..100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -343,7 +343,7 @@ _081AAE34:
 	bl clear_scheduled_bg_copies_to_vram
 	b _081AB012
 _081AAE3E:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
diff --git a/asm/item_menu_icons.s b/asm/item_menu_icons.s
index 1adc0feb7..1adc0feb7 100755..100644
--- a/asm/item_menu_icons.s
+++ b/asm/item_menu_icons.s
diff --git a/asm/learn_move.s b/asm/learn_move.s
index f42514e68..f42514e68 100755..100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
diff --git a/asm/list_menu.s b/asm/list_menu.s
index 7fa0a8dd2..7fa0a8dd2 100755..100644
--- a/asm/list_menu.s
+++ b/asm/list_menu.s
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 041d3964d..6b9227442 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -262,6 +262,13 @@
 	.2byte \output
 	.2byte SPECIAL_\function
 	.endm
+	
+	@ temporary solution
+	.macro specialvar_ output, functionId
+	.byte 0x26
+	.2byte \output
+	.2byte \functionId
+	.endm
 
 	@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).
 	.macro waitstate
diff --git a/asm/main_menu.s b/asm/main_menu.s
index 5b50c42de..9d6cba40f 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -127,7 +127,7 @@ InitMainMenu: @ 802F6F4
 	movs r1, 0xF0
 	movs r2, 0x20
 	bl LoadPalette
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
@@ -1487,7 +1487,7 @@ _08030460:
 	ldr r0, =gMain
 	ldr r1, =CB2_ReinitMainMenu
 	str r1, [r0, 0x8]
-	ldr r0, =CB2_OptionsMenu
+	ldr r0, =CB2_InitOptionMenu
 	b _0803048A
 	.pool
 _08030478:
@@ -1929,7 +1929,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
 	movs r1, 0x1
 	movs r2, 0x10
 	bl LoadPalette
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	bl dp13_810BB8C
@@ -3708,7 +3708,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
 	strh r0, [r4, 0x16]
 	ldr r0, =0x0000ffc4
 	strh r0, [r4, 0x10]
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	bl dp13_810BB8C
@@ -4783,7 +4783,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x14]
 	lsrs r0, 3
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r1, [r0]
 	movs r2, 0x90
 	lsls r2, 1
@@ -4793,7 +4793,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x14]
 	lsrs r0, 3
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r0, [r0, 0x4]
 	movs r1, 0x20
 	movs r2, 0x20
diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s
index f10dff946..9802c3151 100755..100644
--- a/asm/map_name_popup.s
+++ b/asm/map_name_popup.s
@@ -518,7 +518,7 @@ _080D4C0A:
 	lsls r1, r4, 4
 	subs r1, r4
 	lsls r1, 6
-	ldr r2, =gUnknown_0857DD04
+	ldr r2, =gMapPopUp_Outline_Table
 	adds r1, r2
 	movs r2, 0x80
 	lsls r2, 3
@@ -541,7 +541,7 @@ _080D4C0A:
 	.pool
 _080D4C6C:
 	lsls r0, r4, 5
-	ldr r1, =gUnknown_0857F384
+	ldr r1, =gMapPopUp_Palette_Table
 	adds r0, r1
 	movs r1, 0xE0
 	movs r2, 0x20
@@ -550,7 +550,7 @@ _080D4C7A:
 	lsls r1, r4, 4
 	subs r1, r4
 	lsls r1, 6
-	ldr r0, =gUnknown_0857C684
+	ldr r0, =gMapPopUp_Table
 	adds r1, r0
 	movs r0, 0x50
 	str r0, [sp]
diff --git a/asm/menu.s b/asm/menu.s
index fac6ed72a..fac6ed72a 100755..100644
--- a/asm/menu.s
+++ b/asm/menu.s
diff --git a/asm/menu_indicators.s b/asm/menu_indicators.s
index b923b53d0..b923b53d0 100755..100644
--- a/asm/menu_indicators.s
+++ b/asm/menu_indicators.s
diff --git a/asm/mon_markings.s b/asm/mon_markings.s
index 1624fddca..dfc375fdf 100644
--- a/asm/mon_markings.s
+++ b/asm/mon_markings.s
@@ -21,7 +21,7 @@ sub_811F918: @ 811F918
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x14]
 	lsrs r0, 3
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r3, =gUnknown_0203A124
 	ldr r2, [r3]
 	ldr r1, [r0]
diff --git a/asm/mystery_event_menu.s b/asm/mystery_event_menu.s
index cc2744ba0..f5e808416 100644
--- a/asm/mystery_event_menu.s
+++ b/asm/mystery_event_menu.s
@@ -468,7 +468,7 @@ _08178D74:
 	bne _08178E58
 	ldr r5, =0x0201c000
 	adds r0, r5, 0
-	bl sub_81538A0
+	bl RunMysteryEventScript
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
deleted file mode 100644
index a7cee8846..000000000
--- a/asm/mystery_event_script.s
+++ /dev/null
@@ -1,870 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81537CC
-sub_81537CC: @ 81537CC
-	push {r4,lr}
-	adds r4, r3, 0
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r2, 16
-	lsrs r2, 16
-	movs r3, 0x1
-	ands r0, r3
-	cmp r0, 0
-	beq _081537FC
-	ands r1, r3
-	cmp r1, 0
-	beq _081537FC
-	movs r0, 0x4
-	ands r2, r0
-	cmp r2, 0
-	beq _081537FC
-	movs r0, 0x80
-	lsls r0, 2
-	ands r0, r4
-	cmp r0, 0
-	beq _081537FC
-	movs r0, 0x1
-	b _081537FE
-_081537FC:
-	movs r0, 0
-_081537FE:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81537CC
-
-	thumb_func_start sub_8153804
-sub_8153804: @ 8153804
-	push {lr}
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftCantBeUsed
-	bl StringExpandPlaceholders
-	movs r0, 0x3
-	bl SetMysteryEventScriptStatus
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153804
-
-	thumb_func_start sub_8153820
-sub_8153820: @ 8153820
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r1, =gUnknown_082DED2C
-	ldr r2, =gUnknown_082DED2C + 0x44
-	bl InitScriptContext
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl SetupBytecodeScript
-	str r5, [r4, 0x64]
-	movs r0, 0
-	str r0, [r4, 0x68]
-	str r0, [r4, 0x6C]
-	str r0, [r4, 0x70]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153820
-
-	thumb_func_start sub_8153850
-sub_8153850: @ 8153850
-	push {r4,lr}
-	adds r4, r0, 0
-	bl RunScriptCommand
-	lsls r0, 24
-	cmp r0, 0
-	beq _08153868
-	ldr r0, [r4, 0x70]
-	cmp r0, 0
-	beq _08153868
-	movs r0, 0x1
-	b _0815386A
-_08153868:
-	movs r0, 0
-_0815386A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153850
-
-	thumb_func_start sub_8153870
-sub_8153870: @ 8153870
-	push {lr}
-	adds r1, r0, 0
-	ldr r0, =gUnknown_0203BBC0
-	bl sub_8153820
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153870
-
-	thumb_func_start sub_8153884
-sub_8153884: @ 8153884
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, =gUnknown_0203BBC0
-	adds r0, r4, 0
-	bl sub_8153850
-	ldr r1, [r4, 0x6C]
-	str r1, [r5]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153884
-
-	thumb_func_start sub_81538A0
-sub_81538A0: @ 81538A0
-	push {r4,lr}
-	adds r1, r0, 0
-	ldr r4, =gUnknown_0203BBC0
-	adds r0, r4, 0
-	bl sub_8153820
-_081538AC:
-	adds r0, r4, 0
-	bl sub_8153850
-	cmp r0, 0
-	bne _081538AC
-	ldr r0, [r4, 0x6C]
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81538A0
-
-	thumb_func_start SetMysteryEventScriptStatus
-SetMysteryEventScriptStatus: @ 81538C4
-	ldr r1, =gUnknown_0203BBC0
-	str r0, [r1, 0x6C]
-	bx lr
-	.pool
-	thumb_func_end SetMysteryEventScriptStatus
-
-	thumb_func_start sub_81538D0
-sub_81538D0: @ 81538D0
-	push {lr}
-	movs r2, 0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00003b18
-	adds r3, r0, r1
-	movs r1, 0
-_081538DE:
-	adds r0, r3, r1
-	ldrb r0, [r0]
-	adds r2, r0
-	adds r1, 0x1
-	cmp r1, 0xB
-	bls _081538DE
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81538D0
-
-	thumb_func_start sub_81538F8
-sub_81538F8: @ 81538F8
-	push {r4,r5,lr}
-	ldr r5, =gSaveBlock1Ptr
-	ldr r0, [r5]
-	ldr r1, =0x00003b18
-	adds r4, r0, r1
-	bl sub_81538D0
-	adds r1, r0, 0
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _0815392A
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	beq _0815392A
-	ldrh r0, [r4, 0x2]
-	cmp r0, 0
-	beq _0815392A
-	cmp r1, 0
-	beq _0815392A
-	ldr r0, [r5]
-	ldr r2, =0x00003b14
-	adds r0, r2
-	ldr r0, [r0]
-	cmp r1, r0
-	beq _0815393C
-_0815392A:
-	movs r0, 0
-	b _0815393E
-	.pool
-_0815393C:
-	movs r0, 0x1
-_0815393E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81538F8
-
-	thumb_func_start sub_8153944
-sub_8153944: @ 8153944
-	push {lr}
-	sub sp, 0x4
-	mov r1, sp
-	movs r0, 0
-	strh r0, [r1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00003b14
-	adds r1, r0
-	ldr r2, =0x01000008
-	mov r0, sp
-	bl CpuSet
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153944
-
-	thumb_func_start sub_8153970
-sub_8153970: @ 8153970
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r3, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r5, r1, 0
-	lsls r2, 16
-	lsrs r2, 16
-	adds r6, r2, 0
-	cmp r3, 0
-	beq _08153990
-	cmp r1, 0
-	beq _08153990
-	cmp r2, 0
-	bne _08153996
-_08153990:
-	bl sub_8153944
-	b _081539BC
-_08153996:
-	ldr r4, =gSaveBlock1Ptr
-	ldr r0, [r4]
-	ldr r1, =0x00003b18
-	adds r0, r1
-	strb r3, [r0]
-	ldr r0, [r4]
-	ldr r2, =0x00003b19
-	adds r0, r2
-	strb r5, [r0]
-	ldr r0, [r4]
-	adds r1, 0x2
-	adds r0, r1
-	strh r6, [r0]
-	bl sub_81538D0
-	ldr r1, [r4]
-	ldr r2, =0x00003b14
-	adds r1, r2
-	str r0, [r1]
-_081539BC:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153970
-
-	thumb_func_start sub_81539D4
-sub_81539D4: @ 81539D4
-	push {r4-r6,lr}
-	ldr r6, =gSaveBlock1Ptr
-	ldr r0, [r6]
-	ldr r1, =0x00003b18
-	adds r4, r0, r1
-	bl sub_81538F8
-	cmp r0, 0
-	bne _081539F8
-	bl sub_8153944
-	movs r0, 0
-	b _08153A1A
-	.pool
-_081539F8:
-	ldrh r5, [r4, 0x2]
-	ldrb r0, [r4, 0x1]
-	subs r0, 0x1
-	strb r0, [r4, 0x1]
-	lsls r0, 24
-	cmp r0, 0
-	bne _08153A0C
-	bl sub_8153944
-	b _08153A18
-_08153A0C:
-	bl sub_81538D0
-	ldr r1, [r6]
-	ldr r2, =0x00003b14
-	adds r1, r2
-	str r0, [r1]
-_08153A18:
-	adds r0, r5, 0
-_08153A1A:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81539D4
-
-	thumb_func_start script_status_stop_and_ret_1
-script_status_stop_and_ret_1: @ 8153A24
-	push {lr}
-	bl StopScript
-	movs r0, 0x1
-	pop {r1}
-	bx r1
-	thumb_func_end script_status_stop_and_ret_1
-
-	thumb_func_start sub_8153A30
-sub_8153A30: @ 8153A30
-	push {r4-r7,lr}
-	adds r7, r0, 0
-	bl ScriptReadWord
-	str r0, [r7, 0x68]
-	adds r0, r7, 0
-	bl ScriptReadHalfword
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	adds r0, r7, 0
-	bl ScriptReadWord
-	adds r6, r0, 0
-	adds r0, r7, 0
-	bl ScriptReadHalfword
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r7, 0
-	bl ScriptReadWord
-	adds r3, r0, 0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl sub_81537CC
-	cmp r0, 0x1
-	bne _08153A74
-	str r0, [r7, 0x70]
-	b _08153A78
-_08153A74:
-	bl sub_8153804
-_08153A78:
-	movs r0, 0x1
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153A30
-
-	thumb_func_start sub_8153A80
-sub_8153A80: @ 8153A80
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_8153A80
-
-	thumb_func_start sub_8153A84
-sub_8153A84: @ 8153A84
-	ldr r1, [r0, 0x8]
-	ldrb r2, [r1]
-	adds r1, 0x1
-	str r1, [r0, 0x8]
-	str r2, [r0, 0x6C]
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_8153A84
-
-	thumb_func_start sub_8153A94
-sub_8153A94: @ 8153A94
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r0, [r4, 0x8]
-	ldrb r5, [r0]
-	adds r0, 0x1
-	str r0, [r4, 0x8]
-	adds r0, r4, 0
-	bl ScriptReadWord
-	ldr r1, [r4, 0x68]
-	subs r0, r1
-	ldr r1, [r4, 0x64]
-	adds r1, r0, r1
-	cmp r5, 0xFF
-	beq _08153AB8
-	ldr r0, [r4, 0x6C]
-	cmp r5, r0
-	bne _08153ABE
-_08153AB8:
-	ldr r0, =gStringVar4
-	bl StringExpandPlaceholders
-_08153ABE:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153A94
-
-	thumb_func_start sub_8153ACC
-sub_8153ACC: @ 8153ACC
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptReadWord
-	ldr r1, [r4, 0x68]
-	subs r0, r1
-	ldr r1, [r4, 0x64]
-	adds r0, r1
-	bl ScriptContext2_RunNewScript
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153ACC
-
-	thumb_func_start sub_8153AE8
-sub_8153AE8: @ 8153AE8
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	adds r7, r0, 0
-	bl IsEnigmaBerryValid
-	mov r8, r0
-	adds r0, r7, 0
-	bl ScriptReadWord
-	adds r4, r0, 0
-	ldr r0, [r7, 0x68]
-	subs r4, r0
-	ldr r0, [r7, 0x64]
-	adds r4, r0
-	ldr r0, =gStringVar1
-	mov r9, r0
-	ldr r6, =gSaveBlock1Ptr
-	ldr r1, [r6]
-	ldr r5, =0x000031f8
-	adds r1, r5
-	movs r2, 0x7
-	bl StringCopyN
-	adds r0, r4, 0
-	bl SetEnigmaBerry
-	ldr r4, =gStringVar2
-	ldr r1, [r6]
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0x7
-	bl StringCopyN
-	mov r0, r8
-	cmp r0, 0
-	bne _08153B54
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftBerry
-	b _08153B74
-	.pool
-_08153B54:
-	mov r0, r9
-	adds r1, r4, 0
-	bl StringCompare
-	cmp r0, 0
-	beq _08153B70
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftBerryTransform
-	b _08153B74
-	.pool
-_08153B70:
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftBerryObtained
-_08153B74:
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r7, 0x6C]
-	bl IsEnigmaBerryValid
-	cmp r0, 0x1
-	bne _08153B9C
-	ldr r0, =0x0000402d
-	movs r1, 0x1
-	bl VarSet
-	b _08153BA0
-	.pool
-_08153B9C:
-	movs r0, 0x1
-	str r0, [r7, 0x6C]
-_08153BA0:
-	movs r0, 0
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153AE8
-
-	thumb_func_start sub_8153BB0
-sub_8153BB0: @ 8153BB0
-	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]
-	bl GiveGiftRibbonToParty
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftSpecialRibbon
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153BB0
-
-	thumb_func_start sub_8153BE4
-sub_8153BE4: @ 8153BE4
-	push {r4-r6,lr}
-	mov r6, r9
-	mov r5, r8
-	push {r5,r6}
-	sub sp, 0x4
-	adds r4, r0, 0
-	ldr r0, [r4, 0x8]
-	ldrb r1, [r0]
-	mov r9, r1
-	adds r0, 0x1
-	str r0, [r4, 0x8]
-	ldrb r1, [r0]
-	mov r8, r1
-	adds r1, r0, 0x1
-	str r1, [r4, 0x8]
-	ldrb r6, [r0, 0x1]
-	adds r1, 0x1
-	str r1, [r4, 0x8]
-	adds r0, r4, 0
-	bl ScriptReadWord
-	adds r5, r0, 0
-	ldr r0, [r4, 0x68]
-	subs r5, r0
-	ldr r0, [r4, 0x64]
-	adds r5, r0
-	adds r0, r4, 0
-	bl ScriptReadWord
-	adds r1, r0, 0
-	ldr r0, [r4, 0x68]
-	subs r1, r0
-	ldr r0, [r4, 0x64]
-	adds r1, r0
-	subs r1, r5
-	lsls r1, 16
-	lsrs r1, 16
-	str r6, [sp]
-	adds r0, r5, 0
-	mov r2, r9
-	mov r3, r8
-	bl InitRamScript
-	movs r0, 0
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153BE4
-
-	thumb_func_start sub_8153C4C
-sub_8153C4C: @ 8153C4C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl EnableNationalPokedex
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftNationalDex
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153C4C
-
-	thumb_func_start sub_8153C70
-sub_8153C70: @ 8153C70
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r1, [r4, 0x8]
-	ldrb r0, [r1]
-	adds r1, 0x1
-	str r1, [r4, 0x8]
-	bl sub_811EFC0
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftRareWord
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153C70
-
-	thumb_func_start sub_8153C9C
-sub_8153C9C: @ 8153C9C
-	push {r4,r5,lr}
-	ldr r1, [r0, 0x8]
-	ldrb r5, [r1]
-	adds r1, 0x1
-	str r1, [r0, 0x8]
-	ldrb r4, [r1]
-	adds r1, 0x1
-	str r1, [r0, 0x8]
-	bl ScriptReadHalfword
-	adds r2, r0, 0
-	lsls r2, 16
-	lsrs r2, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_8153970
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153C9C
-
-	thumb_func_start sub_8153CC8
-sub_8153CC8: @ 8153CC8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x88
-	adds r6, r0, 0
-	bl ScriptReadWord
-	ldr r1, [r6, 0x68]
-	subs r0, r1
-	ldr r1, [r6, 0x64]
-	adds r5, r0, r1
-	movs r0, 0x64
-	adds r0, r5
-	mov r8, r0
-	add r4, sp, 0x24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x64
-	bl memcpy
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	lsls r0, 16
-	lsrs r4, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	bne _08153D18
-	ldr r0, =gStringVar1
-	ldr r1, =gText_EggNickname
-	movs r2, 0xB
-	bl StringCopyN
-	b _08153D22
-	.pool
-_08153D18:
-	ldr r0, =gStringVar1
-	ldr r1, =gText_Pokemon
-	movs r2, 0xB
-	bl StringCopyN
-_08153D22:
-	ldr r0, =gPlayerPartyCount
-	ldrb r0, [r0]
-	cmp r0, 0x6
-	bne _08153D4C
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftFullParty
-	bl StringExpandPlaceholders
-	movs r0, 0x3
-	b _08153DB6
-	.pool
-_08153D4C:
-	ldr r7, =gPlayerParty + 500
-	adds r0, r7, 0
-	adds r1, r5, 0
-	movs r2, 0x64
-	bl memcpy
-	mov r0, sp
-	mov r1, r8
-	movs r2, 0x24
-	bl memcpy
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	beq _08153D86
-	adds r0, r4, 0
-	bl SpeciesToNationalPokedexNum
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl GetSetPokedexFlag
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl GetSetPokedexFlag
-_08153D86:
-	adds r0, r7, 0
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _08153DA4
-	adds r0, r7, 0
-	mov r1, sp
-	bl GiveMailToMon2
-_08153DA4:
-	bl CompactPartySlots
-	bl CalculatePlayerPartyCount
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftSentOver
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-_08153DB6:
-	str r0, [r6, 0x6C]
-	movs r0, 0
-	add sp, 0x88
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153CC8
-
-	thumb_func_start sub_8153DD4
-sub_8153DD4: @ 8153DD4
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptReadWord
-	adds r1, r0, 0
-	ldr r0, [r4, 0x68]
-	subs r1, r0
-	ldr r0, [r4, 0x64]
-	adds r1, r0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00000bec
-	adds r0, r2
-	movs r2, 0xBC
-	bl memcpy
-	bl sub_81652B4
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftNewTrainer
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153DD4
-
-	thumb_func_start sub_8153E1C
-sub_8153E1C: @ 8153E1C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl EnableResetRTC
-	ldr r0, =gStringVar4
-	ldr r1, =gText_InGameClockUsable
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153E1C
-
-	thumb_func_start sub_8153E40
-sub_8153E40: @ 8153E40
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl ScriptReadWord
-	adds r5, r0, 0
-	adds r0, r6, 0
-	bl ScriptReadWord
-	adds r4, r0, 0
-	ldr r0, [r6, 0x68]
-	subs r4, r0
-	ldr r0, [r6, 0x64]
-	adds r4, r0
-	adds r0, r6, 0
-	bl ScriptReadWord
-	adds r1, r0, 0
-	ldr r0, [r6, 0x68]
-	subs r1, r0
-	ldr r0, [r6, 0x64]
-	adds r1, r0
-	subs r1, r4
-	adds r0, r4, 0
-	bl CalcByteArraySum
-	cmp r5, r0
-	beq _08153E7E
-	movs r0, 0
-	str r0, [r6, 0x70]
-	movs r0, 0x1
-	str r0, [r6, 0x6C]
-_08153E7E:
-	movs r0, 0x1
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153E40
-
-	thumb_func_start sub_8153E88
-sub_8153E88: @ 8153E88
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl ScriptReadWord
-	adds r5, r0, 0
-	adds r0, r6, 0
-	bl ScriptReadWord
-	adds r4, r0, 0
-	ldr r0, [r6, 0x68]
-	subs r4, r0
-	ldr r0, [r6, 0x64]
-	adds r4, r0
-	adds r0, r6, 0
-	bl ScriptReadWord
-	adds r1, r0, 0
-	ldr r0, [r6, 0x68]
-	subs r1, r0
-	ldr r0, [r6, 0x64]
-	adds r1, r0
-	subs r1, r4
-	adds r0, r4, 0
-	bl CalcCRC16
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r5, r0
-	beq _08153ECA
-	movs r0, 0
-	str r0, [r6, 0x70]
-	movs r0, 0x1
-	str r0, [r6, 0x6C]
-_08153ECA:
-	movs r0, 0x1
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153E88
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s
index 25f7fe605..25f7fe605 100755..100644
--- a/asm/new_menu_helpers.s
+++ b/asm/new_menu_helpers.s
diff --git a/asm/option_menu.s b/asm/option_menu.s
index 1c554e26f..c3fc4d140 100644
--- a/asm/option_menu.s
+++ b/asm/option_menu.s
@@ -5,1690 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80BA4B0
-sub_80BA4B0: @ 80BA4B0
-	push {lr}
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80BA4B0
 
-	thumb_func_start sub_80BA4C8
-sub_80BA4C8: @ 80BA4C8
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80BA4C8
-
-	thumb_func_start CB2_OptionsMenu
-CB2_OptionsMenu: @ 80BA4DC
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0xC
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0xB
-	bhi _080BA538
-	lsls r0, 2
-	ldr r1, =_080BA508
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080BA508:
-	.4byte _080BA538
-	.4byte _080BA54C
-	.4byte _080BA69C
-	.4byte _080BA6BC
-	.4byte _080BA6E0
-	.4byte _080BA718
-	.4byte _080BA728
-	.4byte _080BA740
-	.4byte _080BA748
-	.4byte _080BA760
-	.4byte _080BA774
-	.4byte _080BA80C
-_080BA538:
-	movs r0, 0
-	bl SetVBlankCallback
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	b _080BA7F4
-	.pool
-_080BA54C:
-	movs r3, 0xC0
-	lsls r3, 19
-	movs r4, 0xC0
-	lsls r4, 9
-	add r1, sp, 0x8
-	mov r8, r1
-	add r2, sp, 0x4
-	movs r6, 0
-	ldr r1, =0x040000d4
-	movs r5, 0x80
-	lsls r5, 5
-	ldr r7, =0x81000800
-	movs r0, 0x81
-	lsls r0, 24
-	mov r12, r0
-_080BA56A:
-	strh r6, [r2]
-	add r0, sp, 0x4
-	str r0, [r1]
-	str r3, [r1, 0x4]
-	str r7, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r3, r5
-	subs r4, r5
-	cmp r4, r5
-	bhi _080BA56A
-	strh r6, [r2]
-	add r2, sp, 0x4
-	str r2, [r1]
-	str r3, [r1, 0x4]
-	lsrs r0, r4, 1
-	mov r2, r12
-	orrs r0, r2
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	movs r0, 0xE0
-	lsls r0, 19
-	movs r3, 0x80
-	lsls r3, 3
-	movs r4, 0
-	str r4, [sp, 0x8]
-	ldr r2, =0x040000d4
-	mov r1, r8
-	str r1, [r2]
-	str r0, [r2, 0x4]
-	lsrs r0, r3, 2
-	movs r1, 0x85
-	lsls r1, 24
-	orrs r0, r1
-	str r0, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	movs r1, 0xA0
-	lsls r1, 19
-	add r0, sp, 0x4
-	strh r4, [r0]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	lsrs r3, 1
-	movs r0, 0x81
-	lsls r0, 24
-	orrs r3, r0
-	str r3, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	movs r0, 0
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_0855C698
-	movs r0, 0
-	movs r2, 0x2
-	bl InitBgsFromTemplates
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	movs r0, 0x1
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	movs r0, 0x1
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	movs r0, 0x2
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	movs r0, 0x2
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	movs r0, 0x3
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	movs r0, 0x3
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	ldr r0, =gUnknown_0855C680
-	bl InitWindows
-	bl DeactivateAllTextPrinters
-	movs r0, 0x40
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x44
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x48
-	movs r1, 0x1
-	bl SetGpuReg
-	movs r0, 0x4A
-	movs r1, 0x23
-	bl SetGpuReg
-	movs r0, 0x50
-	movs r1, 0xC1
-	bl SetGpuReg
-	movs r0, 0x52
-	movs r1, 0
-	bl SetGpuReg
-	movs r0, 0x54
-	movs r1, 0x4
-	bl SetGpuReg
-	movs r1, 0xC1
-	lsls r1, 6
-	movs r0, 0
-	bl SetGpuReg
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	bl ShowBg
-	b _080BA7EC
-	.pool
-_080BA69C:
-	bl ResetPaletteFade
-	bl remove_some_task
-	bl ResetTasks
-	bl ResetSpriteData
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	b _080BA7F4
-	.pool
-_080BA6BC:
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x14]
-	lsrs r0, 3
-	bl sub_8098758
-	ldr r1, [r0]
-	movs r2, 0x90
-	lsls r2, 1
-	movs r3, 0xD1
-	lsls r3, 1
-	movs r0, 0x1
-	bl LoadBgTiles
-	b _080BA7EC
-	.pool
-_080BA6E0:
-	ldr r0, =gUnknown_0855C6A0
-	movs r1, 0
-	movs r2, 0x2
-	bl LoadPalette
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldrb r0, [r0, 0x14]
-	lsrs r0, 3
-	bl sub_8098758
-	ldr r0, [r0, 0x4]
-	movs r1, 0x70
-	movs r2, 0x20
-	bl LoadPalette
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	b _080BA7F4
-	.pool
-_080BA718:
-	ldr r0, =gUnknown_0855C604
-	movs r1, 0x10
-	movs r2, 0x20
-	bl LoadPalette
-	b _080BA7EC
-	.pool
-_080BA728:
-	movs r0, 0
-	bl PutWindowTilemap
-	bl sub_80BB0D0
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	b _080BA7F4
-	.pool
-_080BA740:
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r2, r0
-	b _080BA7F4
-_080BA748:
-	movs r0, 0x1
-	bl PutWindowTilemap
-	bl sub_80BB104
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-_080BA760:
-	bl sub_80BB154
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	b _080BA7F4
-	.pool
-_080BA774:
-	ldr r0, =sub_80BA83C
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gTasks
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	adds r4, r1
-	movs r0, 0
-	strh r0, [r4, 0x8]
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x14]
-	lsls r0, 29
-	lsrs r0, 29
-	strh r0, [r4, 0xA]
-	ldrb r1, [r2, 0x15]
-	lsls r1, 29
-	lsrs r1, 31
-	strh r1, [r4, 0xC]
-	ldrb r1, [r2, 0x15]
-	lsls r1, 30
-	lsrs r1, 31
-	strh r1, [r4, 0xE]
-	ldrb r1, [r2, 0x15]
-	lsls r1, 31
-	lsrs r1, 31
-	strh r1, [r4, 0x10]
-	ldrb r1, [r2, 0x13]
-	strh r1, [r4, 0x12]
-	ldrb r1, [r2, 0x14]
-	lsrs r1, 3
-	strh r1, [r4, 0x14]
-	bl sub_80BAC38
-	ldrb r0, [r4, 0xC]
-	bl sub_80BAD08
-	ldrb r0, [r4, 0xE]
-	bl sub_80BAD84
-	ldrb r0, [r4, 0x10]
-	bl sub_80BAE08
-	ldrb r0, [r4, 0x12]
-	bl sub_80BB028
-	ldrb r0, [r4, 0x14]
-	bl sub_80BAF0C
-	ldrb r0, [r4, 0x8]
-	bl sub_80BAB38
-	movs r0, 0x1
-	movs r1, 0x3
-	bl CopyWindowToVram
-_080BA7EC:
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-_080BA7F4:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _080BA828
-	.pool
-_080BA80C:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r0, =sub_80BA4C8
-	bl SetVBlankCallback
-	ldr r0, =sub_80BA4B0
-	bl SetMainCallback2
-_080BA828:
-	add sp, 0xC
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end CB2_OptionsMenu
-
-	thumb_func_start sub_80BA83C
-sub_80BA83C: @ 80BA83C
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080BA85C
-	ldr r0, =gTasks
-	lsls r1, r2, 2
-	adds r1, r2
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, =sub_80BA86C
-	str r0, [r1]
-_080BA85C:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BA83C
-
-	thumb_func_start sub_80BA86C
-sub_80BA86C: @ 80BA86C
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080BA89C
-	ldr r0, =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	movs r2, 0x8
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x6
-	beq _080BA892
-	b _080BAA5A
-_080BA892:
-	b _080BA8AE
-	.pool
-_080BA89C:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _080BA8BC
-	ldr r0, =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-_080BA8AE:
-	ldr r0, =sub_80BAA64
-	str r0, [r1]
-	b _080BAA5A
-	.pool
-_080BA8BC:
-	movs r0, 0x40
-	ands r0, r1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	cmp r6, 0
-	beq _080BA8EC
-	ldr r1, =gTasks
-	lsls r2, r4, 2
-	adds r0, r2, r4
-	lsls r0, 3
-	adds r3, r0, r1
-	ldrh r5, [r3, 0x8]
-	movs r6, 0x8
-	ldrsh r0, [r3, r6]
-	adds r7, r1, 0
-	cmp r0, 0
-	ble _080BA8E8
-	subs r0, r5, 0x1
-	b _080BA90C
-	.pool
-_080BA8E8:
-	movs r0, 0x6
-	b _080BA90C
-_080BA8EC:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _080BA924
-	ldr r1, =gTasks
-	lsls r2, r4, 2
-	adds r0, r2, r4
-	lsls r0, 3
-	adds r3, r0, r1
-	ldrh r5, [r3, 0x8]
-	movs r7, 0x8
-	ldrsh r0, [r3, r7]
-	adds r7, r1, 0
-	cmp r0, 0x5
-	bgt _080BA914
-	adds r0, r5, 0x1
-_080BA90C:
-	strh r0, [r3, 0x8]
-	b _080BA916
-	.pool
-_080BA914:
-	strh r6, [r3, 0x8]
-_080BA916:
-	adds r0, r2, r4
-	lsls r0, 3
-	adds r0, r7
-	ldrb r0, [r0, 0x8]
-	bl sub_80BAB38
-	b _080BAA5A
-_080BA924:
-	ldr r0, =gTasks
-	lsls r2, r4, 2
-	adds r1, r2, r4
-	lsls r1, 3
-	adds r1, r0
-	movs r3, 0x8
-	ldrsh r1, [r1, r3]
-	adds r7, r0, 0
-	cmp r1, 0x5
-	bls _080BA93A
-	b _080BAA5A
-_080BA93A:
-	lsls r0, r1, 2
-	ldr r1, =_080BA94C
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080BA94C:
-	.4byte _080BA964
-	.4byte _080BA98A
-	.4byte _080BA9B0
-	.4byte _080BA9D6
-	.4byte _080BA9FC
-	.4byte _080BAA22
-_080BA964:
-	adds r4, r2, r4
-	lsls r4, 3
-	adds r4, r7
-	ldrb r5, [r4, 0xA]
-	adds r0, r5, 0
-	bl sub_80BABDC
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	strh r0, [r4, 0xA]
-	movs r6, 0xA
-	ldrsh r0, [r4, r6]
-	cmp r5, r0
-	beq _080BAA46
-	adds r0, r1, 0
-	bl sub_80BAC38
-	b _080BAA46
-_080BA98A:
-	adds r4, r2, r4
-	lsls r4, 3
-	adds r4, r7
-	ldrb r5, [r4, 0xC]
-	adds r0, r5, 0
-	bl sub_80BACE0
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	strh r0, [r4, 0xC]
-	movs r7, 0xC
-	ldrsh r0, [r4, r7]
-	cmp r5, r0
-	beq _080BAA46
-	adds r0, r1, 0
-	bl sub_80BAD08
-	b _080BAA46
-_080BA9B0:
-	adds r4, r2, r4
-	lsls r4, 3
-	adds r4, r7
-	ldrb r5, [r4, 0xE]
-	adds r0, r5, 0
-	bl sub_80BAD5C
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	strh r0, [r4, 0xE]
-	movs r2, 0xE
-	ldrsh r0, [r4, r2]
-	cmp r5, r0
-	beq _080BAA46
-	adds r0, r1, 0
-	bl sub_80BAD84
-	b _080BAA46
-_080BA9D6:
-	adds r4, r2, r4
-	lsls r4, 3
-	adds r4, r7
-	ldrb r5, [r4, 0x10]
-	adds r0, r5, 0
-	bl sub_80BADD8
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	strh r0, [r4, 0x10]
-	movs r3, 0x10
-	ldrsh r0, [r4, r3]
-	cmp r5, r0
-	beq _080BAA46
-	adds r0, r1, 0
-	bl sub_80BAE08
-	b _080BAA46
-_080BA9FC:
-	adds r4, r2, r4
-	lsls r4, 3
-	adds r4, r7
-	ldrb r5, [r4, 0x12]
-	adds r0, r5, 0
-	bl sub_80BAFCC
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	strh r0, [r4, 0x12]
-	movs r6, 0x12
-	ldrsh r0, [r4, r6]
-	cmp r5, r0
-	beq _080BAA46
-	adds r0, r1, 0
-	bl sub_80BB028
-	b _080BAA46
-_080BAA22:
-	adds r4, r2, r4
-	lsls r4, 3
-	adds r4, r7
-	ldrb r5, [r4, 0x14]
-	adds r0, r5, 0
-	bl sub_80BAE5C
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r0, 0
-	strh r0, [r4, 0x14]
-	movs r7, 0x14
-	ldrsh r0, [r4, r7]
-	cmp r5, r0
-	beq _080BAA46
-	adds r0, r1, 0
-	bl sub_80BAF0C
-_080BAA46:
-	ldr r1, =gUnknown_02039B48
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _080BAA5A
-	movs r0, 0
-	strb r0, [r1]
-	movs r0, 0x1
-	movs r1, 0x2
-	bl CopyWindowToVram
-_080BAA5A:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BA86C
-
-	thumb_func_start sub_80BAA64
-sub_80BAA64: @ 80BAA64
-	push {r4-r6,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r6, =gSaveBlock2Ptr
-	ldr r3, [r6]
-	ldr r1, =gTasks
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	adds r4, r1
-	movs r0, 0x7
-	ldrb r1, [r4, 0xA]
-	ands r1, r0
-	ldrb r2, [r3, 0x14]
-	movs r0, 0x8
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3, 0x14]
-	ldr r3, [r6]
-	movs r5, 0x1
-	ldrb r1, [r4, 0xC]
-	ands r1, r5
-	lsls r1, 2
-	ldrb r2, [r3, 0x15]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3, 0x15]
-	ldr r3, [r6]
-	ldrb r1, [r4, 0xE]
-	ands r1, r5
-	lsls r1, 1
-	ldrb r2, [r3, 0x15]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3, 0x15]
-	ldr r3, [r6]
-	ldrb r1, [r4, 0x10]
-	ands r1, r5
-	ldrb r2, [r3, 0x15]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3, 0x15]
-	ldr r1, [r6]
-	ldrh r0, [r4, 0x12]
-	movs r5, 0
-	strb r0, [r1, 0x13]
-	ldr r3, [r6]
-	ldrb r1, [r4, 0x14]
-	lsls r1, 3
-	ldrb r2, [r3, 0x14]
-	movs r0, 0x7
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3, 0x14]
-	movs r0, 0x1
-	negs r0, r0
-	str r5, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldr r0, =sub_80BAB08
-	str r0, [r4]
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BAA64
-
-	thumb_func_start sub_80BAB08
-sub_80BAB08: @ 80BAB08
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080BAB2C
-	adds r0, r2, 0
-	bl DestroyTask
-	bl FreeAllWindowBuffers
-	ldr r0, =gMain
-	ldr r0, [r0, 0x8]
-	bl SetMainCallback2
-_080BAB2C:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BAB08
-
-	thumb_func_start sub_80BAB38
-sub_80BAB38: @ 80BAB38
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r1, 0x87
-	lsls r1, 5
-	movs r0, 0x40
-	bl SetGpuReg
-	lsls r4, 4
-	adds r1, r4, 0
-	adds r1, 0x28
-	lsls r1, 8
-	adds r4, 0x38
-	orrs r1, r4
-	lsls r1, 16
-	lsrs r1, 16
-	movs r0, 0x44
-	bl SetGpuReg
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80BAB38
-
-	thumb_func_start sub_80BAB68
-sub_80BAB68: @ 80BAB68
-	push {r4-r6,lr}
-	sub sp, 0x1C
-	adds r4, r0, 0
-	lsls r1, 24
-	lsrs r6, r1, 24
-	lsls r2, 24
-	lsrs r5, r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	movs r2, 0
-	ldrb r1, [r4]
-	adds r0, r1, 0
-	cmp r0, 0xFF
-	beq _080BABA0
-_080BAB84:
-	mov r0, sp
-	adds r0, r2
-	adds r0, 0xC
-	strb r1, [r0]
-	adds r4, 0x1
-	adds r0, r2, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	ldrb r1, [r4]
-	adds r0, r1, 0
-	cmp r0, 0xFF
-	beq _080BABA0
-	cmp r2, 0xE
-	bls _080BAB84
-_080BABA0:
-	cmp r3, 0
-	beq _080BABAE
-	add r1, sp, 0xC
-	movs r0, 0x4
-	strb r0, [r1, 0x2]
-	movs r0, 0x5
-	strb r0, [r1, 0x5]
-_080BABAE:
-	mov r1, sp
-	adds r1, r2
-	adds r1, 0xC
-	movs r0, 0xFF
-	strb r0, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	movs r0, 0xFF
-	str r0, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	movs r0, 0x1
-	movs r1, 0x1
-	add r2, sp, 0xC
-	adds r3, r6, 0
-	bl PrintTextOnWindow
-	add sp, 0x1C
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80BAB68
-
-	thumb_func_start sub_80BABDC
-sub_80BABDC: @ 80BABDC
-	push {lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r2, =gMain
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080BAC08
-	cmp r3, 0x1
-	bhi _080BAC00
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	b _080BAC02
-	.pool
-_080BAC00:
-	movs r3, 0
-_080BAC02:
-	ldr r1, =gUnknown_02039B48
-	movs r0, 0x1
-	strb r0, [r1]
-_080BAC08:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080BAC2C
-	cmp r3, 0
-	beq _080BAC24
-	subs r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	b _080BAC26
-	.pool
-_080BAC24:
-	movs r3, 0x2
-_080BAC26:
-	ldr r1, =gUnknown_02039B48
-	movs r0, 0x1
-	strb r0, [r1]
-_080BAC2C:
-	adds r0, r3, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80BABDC
-
-	thumb_func_start sub_80BAC38
-sub_80BAC38: @ 80BAC38
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	mov r1, sp
-	movs r2, 0
-	strb r2, [r1]
-	strb r2, [r1, 0x1]
-	strb r2, [r1, 0x2]
-	adds r1, r0
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r4, =gText_TextSpeedSlow
-	mov r0, sp
-	ldrb r3, [r0]
-	adds r0, r4, 0
-	movs r1, 0x68
-	bl sub_80BAB68
-	movs r0, 0x1
-	adds r1, r4, 0
-	movs r2, 0
-	bl GetStringWidth
-	adds r4, r0, 0
-	ldr r0, =gText_TextSpeedMid
-	mov r8, r0
-	movs r0, 0x1
-	mov r1, r8
-	movs r2, 0
-	bl GetStringWidth
-	adds r5, r0, 0
-	ldr r6, =gText_TextSpeedFast
-	movs r0, 0x1
-	adds r1, r6, 0
-	movs r2, 0
-	bl GetStringWidth
-	subs r5, 0x5E
-	subs r4, r5
-	subs r4, r0
-	lsrs r0, r4, 31
-	adds r4, r0
-	asrs r4, 1
-	adds r4, 0x68
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, sp
-	ldrb r3, [r0, 0x1]
-	mov r0, r8
-	adds r1, r4, 0
-	movs r2, 0
-	bl sub_80BAB68
-	movs r0, 0x1
-	adds r1, r6, 0
-	movs r2, 0xC6
-	bl GetStringRightAlignXOffset
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r0, sp
-	ldrb r3, [r0, 0x2]
-	adds r0, r6, 0
-	movs r2, 0
-	bl sub_80BAB68
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BAC38
-
-	thumb_func_start sub_80BACE0
-sub_80BACE0: @ 80BACE0
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x30
-	ands r0, r1
-	cmp r0, 0
-	beq _080BACFA
-	movs r1, 0x1
-	eors r2, r1
-	ldr r0, =gUnknown_02039B48
-	strb r1, [r0]
-_080BACFA:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80BACE0
-
-	thumb_func_start sub_80BAD08
-sub_80BAD08: @ 80BAD08
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	mov r1, sp
-	movs r2, 0
-	strb r2, [r1]
-	strb r2, [r1, 0x1]
-	adds r1, r0
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, =gText_BattleSceneOn
-	mov r1, sp
-	ldrb r3, [r1]
-	movs r1, 0x68
-	movs r2, 0x10
-	bl sub_80BAB68
-	ldr r4, =gText_BattleSceneOff
-	movs r0, 0x1
-	adds r1, r4, 0
-	movs r2, 0xC6
-	bl GetStringRightAlignXOffset
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r0, sp
-	ldrb r3, [r0, 0x1]
-	adds r0, r4, 0
-	movs r2, 0x10
-	bl sub_80BAB68
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BAD08
-
-	thumb_func_start sub_80BAD5C
-sub_80BAD5C: @ 80BAD5C
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x30
-	ands r0, r1
-	cmp r0, 0
-	beq _080BAD76
-	movs r1, 0x1
-	eors r2, r1
-	ldr r0, =gUnknown_02039B48
-	strb r1, [r0]
-_080BAD76:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80BAD5C
-
-	thumb_func_start sub_80BAD84
-sub_80BAD84: @ 80BAD84
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	mov r1, sp
-	movs r2, 0
-	strb r2, [r1]
-	strb r2, [r1, 0x1]
-	adds r1, r0
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, =gText_BattleStyleShift
-	mov r1, sp
-	ldrb r3, [r1]
-	movs r1, 0x68
-	movs r2, 0x20
-	bl sub_80BAB68
-	ldr r4, =gText_BattleStyleSet
-	movs r0, 0x1
-	adds r1, r4, 0
-	movs r2, 0xC6
-	bl GetStringRightAlignXOffset
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r0, sp
-	ldrb r3, [r0, 0x1]
-	adds r0, r4, 0
-	movs r2, 0x20
-	bl sub_80BAB68
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BAD84
-
-	thumb_func_start sub_80BADD8
-sub_80BADD8: @ 80BADD8
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x30
-	ands r0, r1
-	cmp r0, 0
-	beq _080BADF8
-	movs r4, 0x1
-	eors r5, r4
-	adds r0, r5, 0
-	bl SetPokemonCryStereo
-	ldr r0, =gUnknown_02039B48
-	strb r4, [r0]
-_080BADF8:
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80BADD8
-
-	thumb_func_start sub_80BAE08
-sub_80BAE08: @ 80BAE08
-	push {r4,lr}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	mov r1, sp
-	movs r2, 0
-	strb r2, [r1]
-	strb r2, [r1, 0x1]
-	adds r1, r0
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, =gText_SoundMono
-	mov r1, sp
-	ldrb r3, [r1]
-	movs r1, 0x68
-	movs r2, 0x30
-	bl sub_80BAB68
-	ldr r4, =gText_SoundStereo
-	movs r0, 0x1
-	adds r1, r4, 0
-	movs r2, 0xC6
-	bl GetStringRightAlignXOffset
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r0, sp
-	ldrb r3, [r0, 0x1]
-	adds r0, r4, 0
-	movs r2, 0x30
-	bl sub_80BAB68
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BAE08
-
-	thumb_func_start sub_80BAE5C
-sub_80BAE5C: @ 80BAE5C
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080BAEAE
-	cmp r4, 0x12
-	bhi _080BAE80
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	b _080BAE82
-	.pool
-_080BAE80:
-	movs r4, 0
-_080BAE82:
-	adds r0, r4, 0
-	bl sub_8098758
-	ldr r1, [r0]
-	movs r2, 0x90
-	lsls r2, 1
-	movs r3, 0xD1
-	lsls r3, 1
-	movs r0, 0x1
-	bl LoadBgTiles
-	adds r0, r4, 0
-	bl sub_8098758
-	ldr r0, [r0, 0x4]
-	movs r1, 0x70
-	movs r2, 0x20
-	bl LoadPalette
-	ldr r1, =gUnknown_02039B48
-	movs r0, 0x1
-	strb r0, [r1]
-_080BAEAE:
-	ldr r0, =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080BAEFE
-	cmp r4, 0
-	beq _080BAED0
-	subs r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	b _080BAED2
-	.pool
-_080BAED0:
-	movs r4, 0x13
-_080BAED2:
-	adds r0, r4, 0
-	bl sub_8098758
-	ldr r1, [r0]
-	movs r2, 0x90
-	lsls r2, 1
-	movs r3, 0xD1
-	lsls r3, 1
-	movs r0, 0x1
-	bl LoadBgTiles
-	adds r0, r4, 0
-	bl sub_8098758
-	ldr r0, [r0, 0x4]
-	movs r1, 0x70
-	movs r2, 0x20
-	bl LoadPalette
-	ldr r1, =gUnknown_02039B48
-	movs r0, 0x1
-	strb r0, [r1]
-_080BAEFE:
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80BAE5C
-
-	thumb_func_start sub_80BAF0C
-sub_80BAF0C: @ 80BAF0C
-	push {r4-r7,lr}
-	sub sp, 0x10
-	lsls r0, 24
-	movs r1, 0x80
-	lsls r1, 17
-	adds r0, r1
-	lsrs r6, r0, 24
-	movs r5, 0
-	ldr r1, =gText_FrameTypeNumber
-	ldrb r0, [r1]
-	ldr r7, =gText_FrameType
-	cmp r0, 0xFF
-	beq _080BAF44
-	adds r2, r1, 0
-_080BAF28:
-	mov r0, sp
-	adds r1, r0, r5
-	adds r0, r5, r2
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r0, r5, r2
-	ldrb r0, [r0]
-	cmp r0, 0xFF
-	beq _080BAF44
-	cmp r5, 0x5
-	bls _080BAF28
-_080BAF44:
-	adds r0, r6, 0
-	movs r1, 0xA
-	bl __udivsi3
-	adds r2, r0, 0
-	lsls r0, r2, 24
-	cmp r0, 0
-	beq _080BAF80
-	mov r0, sp
-	adds r1, r0, r5
-	adds r0, r2, 0
-	adds r0, 0xA1
-	strb r0, [r1]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r1, sp
-	adds r4, r1, r5
-	adds r0, r6, 0
-	movs r1, 0xA
-	bl __umodsi3
-	adds r0, 0xA1
-	strb r0, [r4]
-	b _080BAF9E
-	.pool
-_080BAF80:
-	mov r0, sp
-	adds r4, r0, r5
-	adds r0, r6, 0
-	movs r1, 0xA
-	bl __umodsi3
-	adds r0, 0xA1
-	strb r0, [r4]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r0, sp
-	adds r1, r0, r5
-	movs r0, 0x77
-	strb r0, [r1]
-_080BAF9E:
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	mov r0, sp
-	adds r1, r0, r5
-	movs r0, 0xFF
-	strb r0, [r1]
-	adds r0, r7, 0
-	movs r1, 0x68
-	movs r2, 0x50
-	movs r3, 0
-	bl sub_80BAB68
-	mov r0, sp
-	movs r1, 0x80
-	movs r2, 0x50
-	movs r3, 0x1
-	bl sub_80BAB68
-	add sp, 0x10
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80BAF0C
-
-	thumb_func_start sub_80BAFCC
-sub_80BAFCC: @ 80BAFCC
-	push {lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r2, =gMain
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080BAFF8
-	cmp r3, 0x1
-	bhi _080BAFF0
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	b _080BAFF2
-	.pool
-_080BAFF0:
-	movs r3, 0
-_080BAFF2:
-	ldr r1, =gUnknown_02039B48
-	movs r0, 0x1
-	strb r0, [r1]
-_080BAFF8:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080BB01C
-	cmp r3, 0
-	beq _080BB014
-	subs r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	b _080BB016
-	.pool
-_080BB014:
-	movs r3, 0x2
-_080BB016:
-	ldr r1, =gUnknown_02039B48
-	movs r0, 0x1
-	strb r0, [r1]
-_080BB01C:
-	adds r0, r3, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80BAFCC
-
-	thumb_func_start sub_80BB028
-sub_80BB028: @ 80BB028
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r0, 24
-	mov r1, sp
-	movs r2, 0
-	strb r2, [r1]
-	strb r2, [r1, 0x1]
-	strb r2, [r1, 0x2]
-	adds r1, r0
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r4, =gText_ButtonTypeNormal
-	mov r0, sp
-	ldrb r3, [r0]
-	adds r0, r4, 0
-	movs r1, 0x68
-	movs r2, 0x40
-	bl sub_80BAB68
-	movs r0, 0x1
-	adds r1, r4, 0
-	movs r2, 0
-	bl GetStringWidth
-	adds r4, r0, 0
-	ldr r0, =gText_ButtonTypeLR
-	mov r8, r0
-	movs r0, 0x1
-	mov r1, r8
-	movs r2, 0
-	bl GetStringWidth
-	adds r5, r0, 0
-	ldr r6, =gText_ButtonTypeLEqualsA
-	movs r0, 0x1
-	adds r1, r6, 0
-	movs r2, 0
-	bl GetStringWidth
-	subs r5, 0x5E
-	subs r4, r5
-	subs r4, r0
-	lsrs r0, r4, 31
-	adds r4, r0
-	asrs r4, 1
-	adds r4, 0x68
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, sp
-	ldrb r3, [r0, 0x1]
-	mov r0, r8
-	adds r1, r4, 0
-	movs r2, 0x40
-	bl sub_80BAB68
-	movs r0, 0x1
-	adds r1, r6, 0
-	movs r2, 0xC6
-	bl GetStringRightAlignXOffset
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	mov r0, sp
-	ldrb r3, [r0, 0x2]
-	adds r0, r6, 0
-	movs r2, 0x40
-	bl sub_80BAB68
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BB028
-
-	thumb_func_start sub_80BB0D0
-sub_80BB0D0: @ 80BB0D0
-	push {lr}
-	sub sp, 0xC
-	movs r0, 0
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	ldr r2, =gText_Option
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0xFF
-	str r0, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x8
-	bl PrintTextOnWindow
-	movs r0, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BB0D0
-
-	thumb_func_start sub_80BB104
-sub_80BB104: @ 80BB104
-	push {r4,r5,lr}
-	sub sp, 0xC
-	movs r0, 0x1
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	movs r4, 0
-	ldr r5, =gUnknown_0855C664
-_080BB114:
-	lsls r0, r4, 2
-	adds r0, r5
-	ldr r2, [r0]
-	lsls r0, r4, 4
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [sp]
-	movs r0, 0xFF
-	str r0, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	movs r0, 0x1
-	movs r1, 0x1
-	movs r3, 0x8
-	bl PrintTextOnWindow
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x6
-	bls _080BB114
-	movs r0, 0x1
-	movs r1, 0x3
-	bl CopyWindowToVram
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BB104
-
-	thumb_func_start sub_80BB154
-sub_80BB154: @ 80BB154
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	movs r4, 0x1
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	movs r5, 0x7
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	movs r1, 0xD1
-	lsls r1, 1
-	movs r2, 0x1
-	movs r3, 0
-	bl FillBgTilemapBufferRect
-	movs r0, 0x1B
-	mov r8, r0
-	str r0, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	ldr r1, =0x000001a3
-	movs r2, 0x2
-	movs r3, 0
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	movs r1, 0xD2
-	lsls r1, 1
-	movs r2, 0x1C
-	movs r3, 0
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	movs r6, 0x2
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	ldr r1, =0x000001a5
-	movs r2, 0x1
-	movs r3, 0x1
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	ldr r1, =0x000001a7
-	movs r2, 0x1C
-	movs r3, 0x1
-	bl FillBgTilemapBufferRect
-	movs r7, 0xD4
-	lsls r7, 1
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	adds r1, r7, 0
-	movs r2, 0x1
-	movs r3, 0x3
-	bl FillBgTilemapBufferRect
-	ldr r0, =0x000001a9
-	mov r10, r0
-	mov r0, r8
-	str r0, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	mov r1, r10
-	movs r2, 0x2
-	movs r3, 0x3
-	bl FillBgTilemapBufferRect
-	movs r0, 0xD5
-	lsls r0, 1
-	mov r9, r0
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	mov r1, r9
-	movs r2, 0x1C
-	movs r3, 0x3
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	movs r1, 0xD1
-	lsls r1, 1
-	movs r2, 0x1
-	movs r3, 0x4
-	bl FillBgTilemapBufferRect
-	movs r0, 0x1A
-	mov r8, r0
-	str r0, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	ldr r1, =0x000001a3
-	movs r2, 0x2
-	movs r3, 0x4
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	movs r1, 0xD2
-	lsls r1, 1
-	movs r2, 0x1C
-	movs r3, 0x4
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	movs r6, 0x12
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	ldr r1, =0x000001a5
-	movs r2, 0x1
-	movs r3, 0x5
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	str r6, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	ldr r1, =0x000001a7
-	movs r2, 0x1C
-	movs r3, 0x5
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	adds r1, r7, 0
-	movs r2, 0x1
-	movs r3, 0x13
-	bl FillBgTilemapBufferRect
-	mov r0, r8
-	str r0, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	mov r1, r10
-	movs r2, 0x2
-	movs r3, 0x13
-	bl FillBgTilemapBufferRect
-	str r4, [sp]
-	str r4, [sp, 0x4]
-	str r5, [sp, 0x8]
-	movs r0, 0x1
-	mov r1, r9
-	movs r2, 0x1C
-	movs r3, 0x13
-	bl FillBgTilemapBufferRect
-	movs r0, 0x1
-	bl CopyBgTilemapBufferToVram
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BB154
 
 	.align 2, 0 @ Don't pad with nop.
diff --git a/asm/overworld.s b/asm/overworld.s
index ca059beed..69751d298 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -4122,7 +4122,7 @@ sub_80867D8: @ 80867D8
 	movs r0, 0
 	movs r1, 0
 	bl SetGpuReg
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r2, =0x05000002
 	mov r1, sp
 	movs r0, 0
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 27ec779e7..730e90932 100755..100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -107,7 +107,7 @@ _081B0290:
 	b _081B048C
 	.pool
 _081B02AC:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	b _081B0484
 _081B02B2:
 	bl ResetPaletteFade
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 92130e051..8da7d6df0 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -379,7 +379,7 @@ _080BB582:
 	b _080BB74C
 	.pool
 _080BB5FC:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl ResetPaletteFade
diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s
index 9157059db..9157059db 100755..100644
--- a/asm/pokemon_icon.s
+++ b/asm/pokemon_icon.s
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 4a445d524..4a445d524 100755..100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 51f322e1e..0030b33d2 100755..100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -2239,7 +2239,7 @@ _081C50E4:
 	bl clear_scheduled_bg_copies_to_vram
 	b _081C51A2
 _081C50EE:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	b _081C51A2
 _081C50F4:
 	bl FreeAllSpritePalettes
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 1bd305305..8428b1b4d 100755..100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -7095,7 +7095,7 @@ titlescreen_0: @ 81CA92C
 	movs r0, 0x44
 	movs r1, 0xA0
 	bl SetGpuRegBits
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl sub_81CAA3C
 	ldr r2, =gUnknown_08620384
 	ldr r0, [r2]
@@ -7122,7 +7122,7 @@ sub_81CA994: @ 81CA994
 	lsls r1, 6
 	movs r0, 0
 	bl ClearGpuRegBits
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r0, =sub_81CA9EC
 	bl FindTaskIdByFunc
 	lsls r0, 24
diff --git a/asm/rayquaza_scene.s b/asm/rayquaza_scene.s
index ab04d8660..f60b2a252 100755..100644
--- a/asm/rayquaza_scene.s
+++ b/asm/rayquaza_scene.s
@@ -45,7 +45,7 @@ sub_81D6774: @ 81D6774
 	push {lr}
 	bl SetVBlankHBlankCallbacksToNull
 	bl clear_scheduled_bg_copies_to_vram
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl FreeAllSpritePalettes
 	bl ResetPaletteFade
 	bl ResetSpriteData
@@ -1522,7 +1522,7 @@ _081D73D8:
 	adds r0, r2
 	ldrh r1, [r4, 0x6]
 	strh r1, [r0, 0xE]
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 _081D7428:
 	ldrh r0, [r4]
 	adds r0, 0x1
@@ -1774,7 +1774,7 @@ sub_81D7600: @ 81D7600
 	bl ChangeBgY
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	strh r4, [r5]
diff --git a/asm/record_mixing.s b/asm/record_mixing.s
index 6afa59a2a..a8e3c0081 100644
--- a/asm/record_mixing.s
+++ b/asm/record_mixing.s
@@ -114,7 +114,7 @@ sub_80E6CA0: @ 80E6CA0
 	lsls r0, 24
 	cmp r0, 0
 	bne _080E6D1C
-	bl sub_81539D4
+	bl GetRecordMixingGift
 	ldr r2, =0x000011c8
 	adds r1, r5, r2
 	strh r0, [r1]
@@ -186,7 +186,7 @@ sub_80E6D54: @ 80E6D54
 	lsls r0, 24
 	cmp r0, 0
 	bne _080E6DEE
-	bl sub_81539D4
+	bl GetRecordMixingGift
 	ldr r2, =0x000011c8
 	adds r1, r5, r2
 	strh r0, [r1]
@@ -282,7 +282,7 @@ _080E6E60:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080E6EFA
-	bl sub_81539D4
+	bl GetRecordMixingGift
 	ldr r1, [r5]
 	ldr r2, =0x00001210
 	adds r1, r2
diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s
index 1f5ef83d8..ab5e0840c 100644
--- a/asm/reset_rtc_screen.s
+++ b/asm/reset_rtc_screen.s
@@ -887,7 +887,7 @@ _0809EFCA:
 	movs r1, 0x80
 	bl ResetOamRange
 	bl LoadOam
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl dp12_8087EA4
 	bl ResetSpriteData
 	bl ResetTasks
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s
index 55d098e15..2fc97120a 100644
--- a/asm/rom_8011DC0.s
+++ b/asm/rom_8011DC0.s
@@ -10876,7 +10876,7 @@ _08018482:
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	bl ResetTasks
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_082F0598
@@ -14859,7 +14859,7 @@ sub_801A43C: @ 801A43C
 	bl ResetPaletteFade
 	bl ResetSpriteData
 	bl ResetTasks
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl m4aSoundVSyncOn
 	ldr r0, =sub_801A418
 	bl SetVBlankCallback
@@ -21107,7 +21107,7 @@ _0801D7D0:
 	ldr r1, [r4, 0x18]
 	movs r2, 0xBC
 	bl memcpy
-	bl sub_81652B4
+	bl ValidateEReaderTrainer
 	b _0801D804
 	.pool
 _0801D7F0:
@@ -28238,7 +28238,7 @@ _080210A0:
 	movs r0, 0
 	movs r1, 0
 	bl SetGpuReg
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl reset_temp_tile_data_buffers
 	b _080212FC
 _080210BE:
@@ -44190,7 +44190,7 @@ sub_8028FF8: @ 8028FF8
 	lsls r4, 24
 	lsrs r4, 24
 	adds r0, r4, 0
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r1, [r0]
 	movs r2, 0x90
 	lsls r2, 1
@@ -44198,7 +44198,7 @@ sub_8028FF8: @ 8028FF8
 	movs r3, 0x1
 	bl LoadBgTiles
 	adds r0, r4, 0
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r0, [r0, 0x4]
 	movs r1, 0xA0
 	movs r2, 0x20
diff --git a/asm/roulette.s b/asm/roulette.s
index 9d9e39feb..3568c1911 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -423,7 +423,7 @@ _081405F4:
 _08140618:
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	bl ResetVramOamAndBgCntRegs
 	bl ResetAllBgsCoordinates
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 233a5e14c..1f7c86e84 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -676,9 +676,9 @@ _080E2360:
 	.pool
 	thumb_func_end sub_80E2308
 
-	thumb_func_start sp109_CreatePCMenu
-@ bool sp109_CreatePCMenu()
-sp109_CreatePCMenu: @ 80E236C
+	thumb_func_start ScrSpecial_CreatePCMenu
+@ bool ScrSpecial_CreatePCMenu()
+ScrSpecial_CreatePCMenu: @ 80E236C
 	push {lr}
 	ldr r0, =sub_80E2058
 	bl FuncIsActiveTask
@@ -698,7 +698,7 @@ _080E2394:
 _080E2396:
 	pop {r1}
 	bx r1
-	thumb_func_end sp109_CreatePCMenu
+	thumb_func_end ScrSpecial_CreatePCMenu
 
 	thumb_func_start CreatePCMenu
 CreatePCMenu: @ 80E239C
@@ -858,8 +858,8 @@ _080E24C6:
 	.pool
 	thumb_func_end CreatePCMenu
 
-	thumb_func_start sub_80E2514
-sub_80E2514: @ 80E2514
+	thumb_func_start ScriptMenu_DisplayPCStartupPrompt
+ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
 	push {lr}
 	sub sp, 0x10
 	movs r0, 0
@@ -882,7 +882,7 @@ sub_80E2514: @ 80E2514
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80E2514
+	thumb_func_end ScriptMenu_DisplayPCStartupPrompt
 
 	thumb_func_start sub_80E2548
 sub_80E2548: @ 80E2548
diff --git a/asm/script_movement.s b/asm/script_movement.s
index 5f06fd179..5f06fd179 100755..100644
--- a/asm/script_movement.s
+++ b/asm/script_movement.s
diff --git a/asm/shop.s b/asm/shop.s
index ccbf458c9..4ecab08ca 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -448,7 +448,7 @@ _080DFE20:
 	ldr r2, =0x01000100
 	add r0, sp, 0x8
 	bl CpuFastSet
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl reset_temp_tile_data_buffers
 	bl FreeAllSpritePalettes
 	bl ResetPaletteFade
diff --git a/asm/smokescreen.s b/asm/smokescreen.s
index 464e25c40..464e25c40 100755..100644
--- a/asm/smokescreen.s
+++ b/asm/smokescreen.s
diff --git a/asm/start_menu.s b/asm/start_menu.s
index fa2d86dce..0ecc2f275 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -653,7 +653,7 @@ _0809FD38:
 	bl play_some_sound
 	bl RemoveExtraStartMenuWindows
 	bl overworld_free_bg_tilemaps
-	ldr r0, =CB2_OptionsMenu
+	ldr r0, =CB2_InitOptionMenu
 	bl SetMainCallback2
 	ldr r1, =gMain
 	ldr r0, =sub_8086194
@@ -1510,7 +1510,7 @@ _080A0418:
 	bl SetGpuReg
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r2, 0xA0
 	lsls r2, 19
 	mov r1, sp
diff --git a/asm/title_screen.s b/asm/title_screen.s
index b5286d049..54c1b5353 100644
--- a/asm/title_screen.s
+++ b/asm/title_screen.s
@@ -614,7 +614,7 @@ _080AA8C4:
 	ldr r0, =gUnknown_08DDE458
 	ldr r1, =0x0600d800
 	bl LZ77UnCompVram
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 888ce8d29..8b77e8393 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -1556,7 +1556,7 @@ sub_80C3404: @ 80C3404
 sub_80C3414: @ 80C3414
 	push {lr}
 	bl ResetTasks
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r0, =sub_80C2760
 	movs r1, 0
 	bl CreateTask
@@ -3976,7 +3976,7 @@ sub_80C4998: @ 80C4998
 	bl HideBg
 	movs r0, 0x3
 	bl HideBg
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl dp12_8087EA4
 	movs r1, 0
 	ldr r0, =gUnknown_02038C28
@@ -5310,7 +5310,7 @@ _080C54AC:
 _080C54D8:
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	movs r0, 0x2
 	bl DisableInterrupts
@@ -5594,7 +5594,7 @@ _080C577C:
 	bl HideBg
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	b _080C57E4
 _080C57A6:
@@ -7189,7 +7189,7 @@ _080C64F0:
 _080C6510:
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	b _080C6694
 _080C6520:
@@ -7400,7 +7400,7 @@ _080C66FC:
 _080C6722:
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	b _080C67A4
 _080C6732:
diff --git a/asm/trainer_rematch.s b/asm/trainer_rematch.s
index 1c874f28f..1c874f28f 100755..100644
--- a/asm/trainer_rematch.s
+++ b/asm/trainer_rematch.s
diff --git a/asm/unknown_task.s b/asm/unknown_task.s
index f6b96287e..a8672ac8f 100644
--- a/asm/unknown_task.s
+++ b/asm/unknown_task.s
@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start remove_some_task
-remove_some_task: @ 80B9FB8
+	thumb_func_start ScanlineEffect_Stop
+ScanlineEffect_Stop: @ 80B9FB8
 	push {r4,lr}
 	ldr r4, =gUnknown_02039B28
 	movs r0, 0
@@ -32,7 +32,7 @@ _080B9FE2:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end remove_some_task
+	thumb_func_end ScanlineEffect_Stop
 
 	thumb_func_start dp12_8087EA4
 dp12_8087EA4: @ 80B9FF8
diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s
index 60c11524a..60c11524a 100755..100644
--- a/asm/use_pokeblock.s
+++ b/asm/use_pokeblock.s