diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..dda07ebb4
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,28 @@
+language: generic
+dist: trusty
+sudo: false
+env:
+  global:
+    - DEVKITARM=$HOME/devkitARM
+addons:
+  apt:
+    packages:
+      - gcc-multilib
+      - linux-libc-dev
+cache:
+  apt: true
+install:
+  - pushd $HOME
+  - travis_retry wget http://download.sourceforge.net/devkitpro/devkitARM_r46-x86_64-linux.tar.bz2
+  - tar xf devkitARM*.tar.bz2
+  - travis_retry git clone https://github.com/pret/agbcc.git
+  - cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR
+  - popd
+
+matrix:
+  include:
+    - os: linux
+      env: _="Build"
+      script:
+        - ./build_tools.sh
+        - make -j2 compare
diff --git a/INSTALL.md b/INSTALL.md
index 75adc2ea1..cd8f4b185 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,4 +1,4 @@
-First, you must put a Pokémon Emerald (US) ROM in the root directory of the repository and name it `baserom.gba`. It should have a SHA1 checksum of `f3ae088181bf583e55daf962a92bb46f4f1d07b7`. Then, follow the OS-specific instructions below.
+Follow the OS-specific instructions below.
 
 # Linux
 
@@ -8,12 +8,12 @@ Make sure that there is an environment variable called DEVKITARM with the path o
 
 Then get the compiler from https://github.com/pret/agbcc and run the following commands.
 
-	build.sh
-	install.sh PATH_OF_POKEEMERALD_DIRECTORY
+	./build.sh
+	./install.sh PATH_OF_POKEEMERALD_DIRECTORY
 
 Then in the pokeemerald directory, build the tools.
 
-	build_tools.sh
+	./build_tools.sh
 
 Finally, build the rom.
 
diff --git a/Makefile b/Makefile
index 8a7777270..b9e2fb289 100644
--- a/Makefile
+++ b/Makefile
@@ -168,5 +168,3 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
 
-baserom.gba: ;
-	$(error baserom.gba is required to build)
diff --git a/README.md b/README.md
index 727f74abf..3ea6c26ef 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,14 @@
 # Pokémon Emerald
 
+[![Build Status][travis-badge]][travis]
+
 This is a disassembly of Pokémon Emerald.
 
 It builds the following rom:
 
 * pokeemerald.gba `sha1: f3ae088181bf583e55daf962a92bb46f4f1d07b7`
 
-To set up the repository, see [**INSTALL.md**](INSTALL.md).
+To set up the repository, see [INSTALL.md](INSTALL.md).
 
 
 ## See also
@@ -32,3 +34,5 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
 [pokefirered]: https://github.com/pret/pokefirered
 [Discord]: https://discord.gg/cJxDDVP
 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
+[travis]: https://travis-ci.org/pret/pokeemerald
+[travis-badge]: https://travis-ci.org/pret/pokeemerald.svg?branch=master
diff --git a/asm/battle_anim_80D51AC.s b/asm/battle_anim_80D51AC.s
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s
old mode 100755
new mode 100644
index 8e82de6c6..c2517586e
--- 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
old mode 100755
new mode 100644
index 23f870d4d..98b5187c2
--- 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
old mode 100755
new mode 100644
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
old mode 100755
new mode 100644
index caad96269..c5d0cf3ba
--- 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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
index 20380e478..19a29d729
--- 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
old mode 100755
new mode 100644
diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s
old mode 100755
new mode 100644
diff --git a/asm/fossil_specials.s b/asm/fossil_specials.s
old mode 100755
new mode 100644
index 6883743ec..7956f814a
--- 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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
diff --git a/asm/item_menu.s b/asm/item_menu.s
old mode 100755
new mode 100644
index db3d38668..1d79852fe
--- 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
old mode 100755
new mode 100644
diff --git a/asm/learn_move.s b/asm/learn_move.s
old mode 100755
new mode 100644
diff --git a/asm/list_menu.s b/asm/list_menu.s
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
index f10dff946..9802c3151
--- 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
old mode 100755
new mode 100644
diff --git a/asm/menu_indicators.s b/asm/menu_indicators.s
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
index 27ec779e7..730e90932
--- 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
old mode 100755
new mode 100644
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
old mode 100755
new mode 100644
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
old mode 100755
new mode 100644
index 51f322e1e..0030b33d2
--- 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
old mode 100755
new mode 100644
index 1bd305305..8428b1b4d
--- 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
old mode 100755
new mode 100644
index ab04d8660..f60b2a252
--- 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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
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
old mode 100755
new mode 100644
diff --git a/build_tools.sh b/build_tools.sh
index f4656e2d8..824ed025b 100755
--- a/build_tools.sh
+++ b/build_tools.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-make -C tools/gbagfx CXX=${1:=g++}
-make -C tools/scaninc CXX=${1:=g++}
-make -C tools/preproc CXX=${1:=g++}
-make -C tools/bin2c CXX=${1:=g++}
-make -C tools/rsfont CXX=${1:=g++}
-make -C tools/aif2pcm CXX=${1:=g++}
-make -C tools/ramscrgen CXX=${1:=g++}
+make -C tools/gbagfx CXX=${1:-g++}
+make -C tools/scaninc CXX=${1:-g++}
+make -C tools/preproc CXX=${1:-g++}
+make -C tools/bin2c CXX=${1:-g++}
+make -C tools/rsfont CXX=${1:-g++}
+make -C tools/aif2pcm CXX=${1:-g++}
+make -C tools/ramscrgen CXX=${1:-g++}
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s
index c9bab5a64..8fc2939c6 100644
--- a/data/battle_frontier_2.s
+++ b/data/battle_frontier_2.s
@@ -373,7 +373,166 @@ gUnknown_08610948:: @ 8610948
 
 	.align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data
 gUnknown_08610970:: @ 8610970
-	.incbin "baserom.gba", 0x610970, 0x580
+	.string "サダヒロ$", 8
+	.string "ALANN$", 8
+	.string "ALAIN$", 8
+	.string "ADELFO$", 8
+	.string "CLAUS$", 8
+	.string "TEO$", 8
+	.byte 0xC9, 0xBD
+	.2byte 0x43
+	.2byte SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT, 0
+	.byte 0x1D, 8, 0x3e, 20, 0, 12, 1, 10, 0x30, 6, 0x44, 20, 0, 0
+	.string "ヒロオ$", 8
+	.string "LIONEL$", 8
+	.string "LIONEL$", 8
+	.string "CAIO$", 8
+	.string "LUDWIG$", 8
+	.string "LEO$", 8
+	.byte 0x9, 0xCF
+	.2byte 0x2B
+	.2byte SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH, 1
+	.byte 0x38, 12, 1, 10, 0x30, 6, 6, 10, 0x20, 0x10, 0x13, 0x22, 0, 0
+	.string "ケイジ$", 8
+	.string "SONNY$", 8
+	.string "HERVE$", 8
+	.string "FEDRO$", 8
+	.string "WENZEL$", 8
+	.string "SANTI$", 8
+	.byte 0x34, 0x2E
+	.2byte 0x26
+	.2byte SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP, 2
+	.byte 1, 10, 10, 0x16, 0x15, 14, 0x30, 6, 0x3b, 12, 0x4, 12, 0, 0
+	.string "ユラ$", 8
+	.string "LAYLA$", 8
+	.string "LAYLA$", 8
+	.string "ASTRID$", 8
+	.string "SONJA$", 8
+	.string "LOLA$", 8
+	.byte 0xEF, 0x84
+	.2byte 0x47
+	.2byte SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA, 3
+	.byte 11, 16, 15, 0x1e, 0x39, 16, 0x21, 0x14, 0x3, 12, 0xff, 0xff, 0, 0
+	.string "ヨウカ$", 8
+	.string "MACY$", 8
+	.string "AMELIE$", 8
+	.string "CLEO$", 8
+	.string "MARIA$", 8
+	.string "ELISA$", 8
+	.byte 0x43, 0x1E
+	.2byte 0x27
+	.2byte SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY, 4
+	.byte 15, 0x1e, 0x14, 16, 6, 16, 15, 0x28, 0x1c, 0x1c, 0x13, 0x1c, 0, 0
+	.string "ヤスシ$", 8
+	.string "DONTE$", 8
+	.string "BRAHIM$", 8
+	.string "GLAUCO$", 8
+	.string "JOSEF$", 8
+	.string "ROQUE$", 8
+	.byte 0x9F, 0x37
+	.2byte 0x30
+	.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA, 5
+	.byte 0x29, 0x0A, 0x08, 0x14, 0x2F, 0x10, 0x38, 0x16, 0x20, 0x08, 0x00, 0x0C, 0x00, 0
+	.string "ミサオ$", 8
+	.string "AMIRA$", 8
+	.string "LAURE$", 8
+	.string "DAFNE$", 8
+	.string "AMELIE$", 8
+	.string "LARA$", 8
+	.byte 0x55, 0xF5
+	.2byte 0x31
+	.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO, 6
+	.byte 0x0B, 0x0C, 0x3E, 0x12, 0x00, 0x0C, 0x31, 0x0A, 0x30, 0x14, 0x00, 0x0C, 0x00, 0x00
+	.string "カズサ$", 8
+	.string "KALI$", 8
+	.string "JODIE$", 8
+	.string "ILENIA$", 8
+	.string "KARO$", 8
+	.string "ELSA$", 8
+	.byte 0x26, 0x8D
+	.2byte 0x14
+	.2byte SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC, 7
+	.byte 0x06, 0x0A, 0x20, 0x06, 0x1F, 0x0A, 0x02, 0x0A, 0x03, 0x0C, 0xFF, 0xFF, 0x00, 0x00
+	.string "スミレ$", 8
+	.string "ANNIE$", 8
+	.string "ANNIE$", 8
+	.string "IMELDA$", 8
+	.string "INES$", 8
+	.string "ROSA$", 8
+	.byte 0xC, 0x80
+	.2byte 0xD
+	.2byte SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY, 8
+	.byte 0x22, 0x1E, 0x33, 0x04, 0x0E, 0x02, 0x02, 0x0A, 0x1E, 0x10, 0x00, 0x0C, 0x00, 0x00
+	.string "アキノリ$", 8
+	.string "DILLEN$", 8
+	.string "RENE$", 8
+	.string "INDRO$", 8
+	.string "DETLEF$", 8
+	.string "PEDRO$", 8
+	.byte 0x9f, 0x46
+	.2byte 0
+	.2byte SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON, 9
+	.byte 0x3D, 0x0A, 0x11, 0x10, 0x1E, 0x0E, 0x1C, 0x20, 0x04, 0x0C, 0xFF, 0xFF, 0x00, 0x00
+	.string "トウゾウ$", 8
+	.string "DALLAS$", 8
+	.string "BRUNO$", 8
+	.string "LEARCO$", 8
+	.string "ANSGAR$", 8
+	.string "MANOLO$", 8
+	.byte 0xFC, 0x71
+	.2byte 0x2D 
+	.2byte SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA, 10
+	.byte 0x05, 0x0A, 0x06, 0x06, 0x0E, 0x16, 0x14, 0x0A, 0x00, 0x0C, 0xFF, 0xFF, 0x00, 0x00
+	.string "セイヤ$", 8
+	.string "FRANK$", 8
+	.string "FRANK$", 8
+	.string "OLINDO$", 8
+	.string "FRANK$", 8
+	.string "MAURO$", 8
+	.byte 0x9E, 0xA3
+	.2byte 0x3A
+	.2byte SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE, 11
+	.byte 0x0E, 0x28, 0x3D, 0x10, 0x0F, 0x24, 0x14, 0x0A, 0x23, 0x1E, 0x24, 0x10, 0x00, 0x00
+	.string "リュウジ$", 8
+	.string "LAMONT$", 8
+	.string "XAV$", 8
+	.string "ORFEO$", 8
+	.string "J{0xf3}RGEN$", 8 @accent?
+	.string "JORGE$", 8
+	.byte 0x90, 0xE5
+	.2byte 0x19
+	.2byte SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING, 12
+	.byte 0x20, 0x10, 0x2E, 0x06, 0x0B, 0x10, 0x22, 0x1E, 0x0F, 0x1E, 0x0B, 0x10, 0x00, 0x00
+	.string "カツアキ$", 8
+	.string "TYRESE$", 8
+	.string "ANDY$", 8
+	.string "PARIDE$", 8
+	.string "DAVID$", 8
+	.string "CHICHO$", 8
+	.byte 0x18, 0xD0
+	.2byte 10
+	.2byte SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING, 13
+	.byte 0x29, 0x0A, 0x3A, 0x06, 0x15, 0x0E, 0x35, 0x14, 0x34, 0x10, 0x1E, 0x06, 0x00, 0x00
+	.string "トシミツ$", 8
+	.string "DANTE$", 8
+	.string "DANTE$", 8
+	.string "RAOUL$", 8
+	.string "LOTHAR$", 8
+	.string "PABLO$", 8
+	.byte 0x75, 0xBC
+	.2byte 14
+	.2byte SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM, 14
+	.byte 0x01, 0x0A, 0x17, 0x10, 0x43, 0x12, 0x22, 0x1E, 0x0B, 0x10, 0x0F, 0x28, 0x00, 0x00
+	.string "ローウェン$", 8
+	.string "ARTURO$", 8
+	.string "ARTURO$", 8
+	.string "ROMOLO$", 8
+	.string "BRIAN$", 8
+	.string "ARTURO$", 8
+	.byte 0x2, 0xFA
+	.2byte 0x20
+	.2byte SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS, 15
+	.byte 0x0F, 0x1E, 0x04, 0x14, 0x2F, 0x10, 0x06, 0x10, 0x20, 0x10, 0x03, 0x0E, 0x00, 0x00
 
 	.align 2
 gUnknown_08610EF0:: @ 8610EF0
diff --git a/data/contest.s b/data/contest.s
index 53cab1935..69820f980 100644
--- a/data/contest.s
+++ b/data/contest.s
@@ -1,5 +1,7 @@
     .include "asm/macros.inc"
     .include "constants/constants.inc"
+	.include "constants/species_constants.inc"
+	.include "include/constants/moves.h"
 
     .section .rodata
     .align 2, 0
@@ -299,11 +301,59 @@ gUnknown_08587F44:: @ 8587F44
 
 	.align 2
 gUnknown_08587FA4:: @ 8587FA4
-	.incbin "baserom.gba", 0x587fa4, 0x100
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_ELECTRIKE
+	.byte 2
+	.string "ELECTER$", 11
+	.string "EZRA$", 8
+	.2byte 0
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_TROPIUS
+	.byte 0
+	.string "TROPO$", 11
+	.string "ALLAN$", 8
+	.2byte 2
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_XATU
+	.byte 1
+	.string "TUXA$", 11
+	.string "JULIET$", 8
+	.2byte 0
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_PLUSLE
+	.byte 4
+	.string "PULSE$", 11
+	.string "BAILY$", 8
+	.2byte 3
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_SHUPPET
+	.byte 3
+	.string "SHUPUP$", 11
+	.string "MELANY$", 8
+	.2byte 1
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_ZANGOOSE
+	.byte 0
+	.string "GOOZAN$", 11
+	.string "HANA$", 8
+	.2byte 2
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_LOUDRED
+	.byte 1
+	.string "LOUDED$", 11
+	.string "BRYANT$", 8
+	.2byte 2
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_DELCATTY
+	.byte 2
+	.string "KITSY$", 11
+	.string "OMAR$", 8
+	.2byte 3
+	
 
 	.align 2
 gUnknown_085880A4:: @ 85880A4
-	.incbin "baserom.gba", 0x5880a4, 0x1800
+	.include "data/contest_opponents.inc"
 
 gUnknown_085898A4:: @ 85898A4
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/data/contest_opponents.inc b/data/contest_opponents.inc
new file mode 100644
index 000000000..d8ccfbb5b
--- /dev/null
+++ b/data/contest_opponents.inc
@@ -0,0 +1,2114 @@
+@todo: cleanup
+	.2byte SPECIES_POOCHYENA
+	.string "POOCHY$    "
+	.string "JIMMY$  "
+	.byte 7
+	.2byte 0
+	.4byte 0xc000fff
+	.2byte 68
+	.2byte 46
+	.2byte 44
+	.2byte 36
+	.2byte 336
+	.byte 10
+	.byte 4
+	.byte 10
+	.byte 3
+	.byte 4
+	.byte 50
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_ILLUMISE
+	.string "MUSILLE$   "
+	.string "EDITH$  "
+	.byte 8
+	.2byte 0
+	.4byte 0x82000fff
+	.2byte 16
+	.2byte 156
+	.2byte 263
+	.2byte 33
+	.2byte 343
+	.byte 10
+	.byte 10
+	.byte 6
+	.byte 1
+	.byte 2
+	.byte 60
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_DUSTOX
+	.string "DUSTER$    "
+	.string "EVAN$   "
+	.byte 11
+	.2byte 0
+	.4byte 0x21000fff
+	.2byte 8
+	.2byte 318
+	.2byte 236
+	.2byte 113
+	.2byte 16
+	.byte 2
+	.byte 10
+	.byte 10
+	.byte 12
+	.byte 4
+	.byte 70
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SEEDOT
+	.string "DOTS$      "
+	.string "KELSEY$ "
+	.byte 16
+	.2byte 0
+	.4byte 0x20800fff
+	.2byte 96
+	.2byte 117
+	.2byte 235
+	.2byte 331
+	.2byte 74
+	.byte 3
+	.byte 3
+	.byte 5
+	.byte 2
+	.byte 7
+	.byte 80
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_TAILLOW
+	.string "TATAY$     "
+	.string "MADISON$"
+	.byte 18
+	.2byte 0
+	.4byte 0x80400fff
+	.2byte 4
+	.2byte 17
+	.2byte 97
+	.2byte 332
+	.2byte 45
+	.byte 1
+	.byte 3
+	.byte 3
+	.byte 5
+	.byte 4
+	.byte 90
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_NINCADA
+	.string "NINDA$     "
+	.string "RAYMOND$"
+	.byte 44
+	.2byte 0
+	.4byte 0x10200fff
+	.2byte 32
+	.2byte 141
+	.2byte 206
+	.2byte 154
+	.2byte 170
+	.byte 5
+	.byte 2
+	.byte 10
+	.byte 7
+	.byte 8
+	.byte 100
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SHROOMISH
+	.string "SMISH$     "
+	.string "GRANT$  "
+	.byte 35
+	.2byte 0
+	.4byte 0x20100fff
+	.2byte 32
+	.2byte 78
+	.2byte 73
+	.2byte 72
+	.2byte 213
+	.byte 3
+	.byte 3
+	.byte 10
+	.byte 2
+	.byte 2
+	.byte 50
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SPHEAL
+	.string "SLEAL$     "
+	.string "PAIGE$  "
+	.byte 26
+	.2byte 0
+	.4byte 0x8080fff
+	.2byte 24
+	.2byte 62
+	.2byte 55
+	.2byte 45
+	.2byte 317
+	.byte 3
+	.byte 5
+	.byte 1
+	.byte 10
+	.byte 10
+	.byte 60
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SLAKOTH
+	.string "SLOKTH$    "
+	.string "ALEC$   "
+	.byte 31
+	.2byte 0
+	.4byte 0x40040fff
+	.2byte 88
+	.2byte 70
+	.2byte 68
+	.2byte 281
+	.2byte 227
+	.byte 10
+	.byte 4
+	.byte 4
+	.byte 5
+	.byte 18
+	.byte 70
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_WHISMUR
+	.string "WHIRIS$    "
+	.string "SYDNEY$ "
+	.byte 47
+	.2byte 0
+	.4byte 0x80020fff
+	.2byte 36
+	.2byte 310
+	.2byte 103
+	.2byte 253
+	.2byte 304
+	.byte 2
+	.byte 2
+	.byte 7
+	.byte 2
+	.byte 7
+	.byte 80
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MAKUHITA
+	.string "MAHITA$    "
+	.string "MORRIS$ "
+	.byte 38
+	.2byte 0
+	.4byte 0x8010fff
+	.2byte 68
+	.2byte 69
+	.2byte 233
+	.2byte 33
+	.2byte 179
+	.byte 9
+	.byte 1
+	.byte 1
+	.byte 8
+	.byte 1
+	.byte 90
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_ARON
+	.string "RONAR$     "
+	.string "MARIAH$ "
+	.byte 10
+	.2byte 0
+	.4byte 0x8008fff
+	.2byte 68
+	.2byte 232
+	.2byte 334
+	.2byte 29
+	.2byte 36
+	.byte 5
+	.byte 10
+	.byte 2
+	.byte 10
+	.byte 2
+	.byte 100
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_CROBAT
+	.string "BATRO$     "
+	.string "RUSSELL$"
+	.byte 33
+	.2byte 0
+	.4byte 0x90004fff
+	.2byte 56
+	.2byte 114
+	.2byte 212
+	.2byte 109
+	.2byte 141
+	.byte 4
+	.byte 2
+	.byte 2
+	.byte 2
+	.byte 10
+	.byte 50
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_GULPIN
+	.string "GULIN$     "
+	.string "MELANIE$"
+	.byte 6
+	.2byte 0
+	.4byte 0x40002fff
+	.2byte 16
+	.2byte 124
+	.2byte 133
+	.2byte 92
+	.2byte 281
+	.byte 1
+	.byte 10
+	.byte 1
+	.byte 10
+	.byte 5
+	.byte 60
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MANECTRIC
+	.string "RIKELEC$   "
+	.string "CHANCE$ "
+	.byte 15
+	.2byte 0
+	.4byte 0x80001fff
+	.2byte 12
+	.2byte 209
+	.2byte 86
+	.2byte 87
+	.2byte 46
+	.byte 20
+	.byte 10
+	.byte 1
+	.byte 1
+	.byte 1
+	.byte 70
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_BULBASAUR
+	.string "BULBY$     "
+	.string "AGATHA$ "
+	.byte 20
+	.2byte 0
+	.4byte 0xc000fff
+	.2byte 48
+	.2byte 45
+	.2byte 73
+	.2byte 33
+	.2byte 230
+	.byte 5
+	.byte 3
+	.byte 10
+	.byte 10
+	.byte 4
+	.byte 50
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_BUTTERFREE
+	.string "FUTTERBE$  "
+	.string "BEAU$   "
+	.byte 40
+	.2byte 0
+	.4byte 0x82000fff
+	.2byte 40
+	.2byte 48
+	.2byte 18
+	.2byte 318
+	.2byte 219
+	.byte 3
+	.byte 10
+	.byte 2
+	.byte 10
+	.byte 4
+	.byte 60
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_PIDGEOTTO
+	.string "PIDEOT$    "
+	.string "KAY$    "
+	.byte 34
+	.2byte 0
+	.4byte 0x21000fff
+	.2byte 12
+	.2byte 119
+	.2byte 98
+	.2byte 332
+	.2byte 297
+	.byte 10
+	.byte 8
+	.byte 4
+	.byte 2
+	.byte 3
+	.byte 70
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_DIGLETT
+	.string "DIGLE$     "
+	.string "CALE$   "
+	.byte 55
+	.2byte 0
+	.4byte 0x20800fff
+	.2byte 96
+	.2byte 91
+	.2byte 89
+	.2byte 90
+	.2byte 222
+	.byte 4
+	.byte 2
+	.byte 3
+	.byte 5
+	.byte 10
+	.byte 80
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_POLIWAG
+	.string "WAGIL$     "
+	.string "CAITLIN$"
+	.byte 53
+	.2byte 0
+	.4byte 0x80400fff
+	.2byte 72
+	.2byte 56
+	.2byte 240
+	.2byte 34
+	.2byte 58
+	.byte 2
+	.byte 10
+	.byte 5
+	.byte 3
+	.byte 10
+	.byte 90
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_TOTODILE
+	.string "TOTDIL$    "
+	.string "COLBY$  "
+	.byte 5
+	.2byte 0
+	.4byte 0x10200fff
+	.2byte 12
+	.2byte 99
+	.2byte 103
+	.2byte 57
+	.2byte 59
+	.byte 6
+	.byte 10
+	.byte 2
+	.byte 1
+	.byte 5
+	.byte 100
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_LEDYBA
+	.string "BALEDY$    "
+	.string "KYLIE$  "
+	.byte 45
+	.2byte 0
+	.4byte 0x20100fff
+	.2byte 20
+	.2byte 226
+	.2byte 97
+	.2byte 129
+	.2byte 213
+	.byte 8
+	.byte 6
+	.byte 8
+	.byte 6
+	.byte 2
+	.byte 90
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_DELIBIRD
+	.string "BIRDLY$    "
+	.string "LIAM$   "
+	.byte 66
+	.2byte 0
+	.4byte 0x8080fff
+	.2byte 112
+	.2byte 217
+	.2byte 263
+	.2byte 264
+	.2byte 216
+	.byte 4
+	.byte 3
+	.byte 10
+	.byte 5
+	.byte 3
+	.byte 80
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_LARVITAR
+	.string "TARVITAR$  "
+	.string "MILO$   "
+	.byte 39
+	.2byte 0
+	.4byte 0x40040fff
+	.2byte 64
+	.2byte 37
+	.2byte 259
+	.2byte 242
+	.2byte 91
+	.byte 8
+	.byte 5
+	.byte 5
+	.byte 8
+	.byte 10
+	.byte 70
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_ROSELIA
+	.string "RELIA$     "
+	.string "KARINA$ "
+	.byte 32
+	.2byte 0
+	.4byte 0x24000fff
+	.2byte 41
+	.2byte 80
+	.2byte 345
+	.2byte 320
+	.2byte 275
+	.byte 50
+	.byte 15
+	.byte 75
+	.byte 10
+	.byte 20
+	.byte 100
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_DODRIO
+	.string "DUODO$     "
+	.string "BOBBY$  "
+	.byte 51
+	.2byte 0
+	.4byte 0x82000fff
+	.2byte 125
+	.2byte 64
+	.2byte 31
+	.2byte 216
+	.2byte 45
+	.byte 15
+	.byte 21
+	.byte 15
+	.byte 85
+	.byte 35
+	.byte 110
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_TRAPINCH
+	.string "PINCHIN$   "
+	.string "CLAIRE$ "
+	.byte 8
+	.2byte 0
+	.4byte 0x81000fff
+	.2byte 113
+	.2byte 44
+	.2byte 28
+	.2byte 91
+	.2byte 185
+	.byte 75
+	.byte 25
+	.byte 25
+	.byte 10
+	.byte 25
+	.byte 120
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_CACNEA
+	.string "NACAC$     "
+	.string "WILLIE$ "
+	.byte 11
+	.2byte 0
+	.4byte 0x80800fff
+	.2byte 37
+	.2byte 191
+	.2byte 43
+	.2byte 40
+	.2byte 28
+	.byte 10
+	.byte 30
+	.byte 25
+	.byte 65
+	.byte 25
+	.byte 130
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SANDSLASH
+	.string "SHRAND$    "
+	.string "CASSIDY$"
+	.byte 18
+	.2byte 0
+	.4byte 0x10400fff
+	.2byte 69
+	.2byte 163
+	.2byte 111
+	.2byte 129
+	.2byte 154
+	.byte 30
+	.byte 90
+	.byte 30
+	.byte 10
+	.byte 100
+	.byte 140
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_BALTOY
+	.string "TOYBAL$    "
+	.string "MORGAN$ "
+	.byte 44
+	.2byte 0
+	.4byte 0x8200fff
+	.2byte 41
+	.2byte 120
+	.2byte 317
+	.2byte 60
+	.2byte 93
+	.byte 50
+	.byte 40
+	.byte 10
+	.byte 35
+	.byte 35
+	.byte 150
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MEDICHAM
+	.string "CHAMCHAM$  "
+	.string "SUMMER$ "
+	.byte 26
+	.2byte 0
+	.4byte 0x10100fff
+	.2byte 77
+	.2byte 179
+	.2byte 9
+	.2byte 7
+	.2byte 8
+	.byte 40
+	.byte 20
+	.byte 40
+	.byte 40
+	.byte 40
+	.byte 100
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SPINDA
+	.string "SPININ$    "
+	.string "MILES$  "
+	.byte 31
+	.2byte 0
+	.4byte 0x80080fff
+	.2byte 49
+	.2byte 298
+	.2byte 244
+	.2byte 95
+	.2byte 253
+	.byte 25
+	.byte 75
+	.byte 25
+	.byte 10
+	.byte 25
+	.byte 110
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SWABLU
+	.string "SWABY$     "
+	.string "AUDREY$ "
+	.byte 47
+	.2byte 0
+	.4byte 0xa0040fff
+	.2byte 41
+	.2byte 119
+	.2byte 195
+	.2byte 219
+	.2byte 54
+	.byte 30
+	.byte 30
+	.byte 40
+	.byte 30
+	.byte 25
+	.byte 120
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SPOINK
+	.string "POINKER$   "
+	.string "AVERY$  "
+	.byte 38
+	.2byte 0
+	.4byte 0x80020fff
+	.2byte 49
+	.2byte 150
+	.2byte 109
+	.2byte 173
+	.2byte 156
+	.byte 40
+	.byte 10
+	.byte 30
+	.byte 40
+	.byte 30
+	.byte 130
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_KECLEON
+	.string "KECON$     "
+	.string "ARIANA$ "
+	.byte 10
+	.2byte 0
+	.4byte 0x80010fff
+	.2byte 97
+	.2byte 168
+	.2byte 103
+	.2byte 246
+	.2byte 20
+	.byte 10
+	.byte 10
+	.byte 40
+	.byte 75
+	.byte 35
+	.byte 140
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_GOLDEEN
+	.string "GOLDEN$    "
+	.string "ASHTON$ "
+	.byte 33
+	.2byte 0
+	.4byte 0x80008fff
+	.2byte 13
+	.2byte 30
+	.2byte 31
+	.2byte 32
+	.2byte 39
+	.byte 70
+	.byte 30
+	.byte 5
+	.byte 30
+	.byte 25
+	.byte 150
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_BARBOACH
+	.string "BOBOACH$   "
+	.string "SANDRA$ "
+	.byte 6
+	.2byte 0
+	.4byte 0x80004fff
+	.2byte 113
+	.2byte 300
+	.2byte 346
+	.2byte 89
+	.2byte 248
+	.byte 45
+	.byte 45
+	.byte 60
+	.byte 25
+	.byte 15
+	.byte 100
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SKARMORY
+	.string "CORPY$     "
+	.string "CARSON$ "
+	.byte 35
+	.2byte 0
+	.4byte 0x8002fff
+	.2byte 77
+	.2byte 129
+	.2byte 104
+	.2byte 97
+	.2byte 15
+	.byte 40
+	.byte 30
+	.byte 25
+	.byte 60
+	.byte 20
+	.byte 110
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_LOTAD
+	.string "TADO$      "
+	.string "KATRINA$"
+	.byte 16
+	.2byte 0
+	.4byte 0x8001fff
+	.2byte 57
+	.2byte 310
+	.2byte 45
+	.2byte 240
+	.2byte 352
+	.byte 15
+	.byte 15
+	.byte 30
+	.byte 15
+	.byte 75
+	.byte 120
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SLOWBRO
+	.string "BROWLO$    "
+	.string "LUKE$   "
+	.byte 17
+	.2byte 0
+	.4byte 0xc000fff
+	.2byte 49
+	.2byte 281
+	.2byte 50
+	.2byte 45
+	.2byte 93
+	.byte 20
+	.byte 40
+	.byte 40
+	.byte 30
+	.byte 20
+	.byte 100
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_FARFETCH_D
+	.string "FETCHIN$   "
+	.string "RAUL$   "
+	.byte 66
+	.2byte 0
+	.4byte 0x82000fff
+	.2byte 21
+	.2byte 263
+	.2byte 210
+	.2byte 19
+	.2byte 216
+	.byte 40
+	.byte 10
+	.byte 40
+	.byte 20
+	.byte 20
+	.byte 110
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SEEL
+	.string "SEELEY$    "
+	.string "JADA$   "
+	.byte 20
+	.2byte 0
+	.4byte 0x21000fff
+	.2byte 25
+	.2byte 213
+	.2byte 58
+	.2byte 219
+	.2byte 45
+	.byte 10
+	.byte 30
+	.byte 40
+	.byte 20
+	.byte 20
+	.byte 120
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_DROWZEE
+	.string "DROWZIN$   "
+	.string "ZEEK$   "
+	.byte 37
+	.2byte 0
+	.4byte 0x20800fff
+	.2byte 121
+	.2byte 50
+	.2byte 248
+	.2byte 237
+	.2byte 216
+	.byte 10
+	.byte 40
+	.byte 50
+	.byte 30
+	.byte 45
+	.byte 130
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_HITMONCHAN
+	.string "HITEMON$   "
+	.string "DIEGO$  "
+	.byte 21
+	.2byte 0
+	.4byte 0x80400fff
+	.2byte 69
+	.2byte 327
+	.2byte 197
+	.2byte 279
+	.2byte 5
+	.byte 45
+	.byte 20
+	.byte 10
+	.byte 20
+	.byte 45
+	.byte 140
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_BLISSEY
+	.string "BLISS$     "
+	.string "ALIYAH$ "
+	.byte 85
+	.2byte 0
+	.4byte 0x10200fff
+	.2byte 89
+	.2byte 47
+	.2byte 135
+	.2byte 121
+	.2byte 38
+	.byte 20
+	.byte 35
+	.byte 40
+	.byte 20
+	.byte 20
+	.byte 150
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_ELEKID
+	.string "KIDLEK$    "
+	.string "NATALIA$"
+	.byte 18
+	.2byte 0
+	.4byte 0x20100fff
+	.2byte 21
+	.2byte 351
+	.2byte 98
+	.2byte 103
+	.2byte 213
+	.byte 40
+	.byte 10
+	.byte 40
+	.byte 25
+	.byte 25
+	.byte 140
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SNUBBULL
+	.string "SNUBBINS$  "
+	.string "DEVIN$  "
+	.byte 48
+	.2byte 0
+	.4byte 0x8080fff
+	.2byte 81
+	.2byte 184
+	.2byte 269
+	.2byte 39
+	.2byte 44
+	.byte 20
+	.byte 20
+	.byte 20
+	.byte 20
+	.byte 20
+	.byte 130
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MISDREAVUS
+	.string "DREAVIS$   "
+	.string "TYLOR$  "
+	.byte 40
+	.2byte 0
+	.4byte 0x40040fff
+	.2byte 41
+	.2byte 195
+	.2byte 212
+	.2byte 109
+	.2byte 220
+	.byte 10
+	.byte 35
+	.byte 10
+	.byte 45
+	.byte 20
+	.byte 120
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_LAIRON
+	.string "LAIRN$     "
+	.string "RONNIE$ "
+	.byte 55
+	.2byte 0
+	.4byte 0x84000fff
+	.2byte 98
+	.2byte 319
+	.2byte 232
+	.2byte 106
+	.2byte 36
+	.byte 30
+	.byte 50
+	.byte 35
+	.byte 100
+	.byte 90
+	.byte 200
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SHIFTRY
+	.string "SHIFTY$    "
+	.string "CLAUDIA$"
+	.byte 8
+	.2byte 0
+	.4byte 0x82000fff
+	.2byte 14
+	.2byte 74
+	.2byte 13
+	.2byte 153
+	.2byte 326
+	.byte 75
+	.byte 75
+	.byte 65
+	.byte 35
+	.byte 70
+	.byte 210
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_NINJASK
+	.string "NINAS$     "
+	.string "ELIAS$  "
+	.byte 11
+	.2byte 0
+	.4byte 0x81000fff
+	.2byte 114
+	.2byte 103
+	.2byte 154
+	.2byte 28
+	.2byte 226
+	.byte 30
+	.byte 50
+	.byte 95
+	.byte 70
+	.byte 70
+	.byte 220
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SWELLOW
+	.string "WELOW$     "
+	.string "JADE$   "
+	.byte 18
+	.2byte 0
+	.4byte 0x80800fff
+	.2byte 14
+	.2byte 97
+	.2byte 332
+	.2byte 17
+	.2byte 19
+	.byte 65
+	.byte 85
+	.byte 35
+	.byte 75
+	.byte 40
+	.byte 230
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MIGHTYENA
+	.string "YENA$      "
+	.string "FRANCIS$"
+	.byte 44
+	.2byte 0
+	.4byte 0x80400fff
+	.2byte 98
+	.2byte 269
+	.2byte 168
+	.2byte 316
+	.2byte 36
+	.byte 40
+	.byte 80
+	.byte 35
+	.byte 70
+	.byte 70
+	.byte 240
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_BEAUTIFLY
+	.string "TIFLY$     "
+	.string "ALISHA$ "
+	.byte 26
+	.2byte 0
+	.4byte 0x80200fff
+	.2byte 42
+	.2byte 234
+	.2byte 318
+	.2byte 78
+	.2byte 290
+	.byte 40
+	.byte 70
+	.byte 25
+	.byte 80
+	.byte 100
+	.byte 250
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SEAKING
+	.string "KINGSEA$   "
+	.string "SAUL$   "
+	.byte 31
+	.2byte 0
+	.4byte 0x80100fff
+	.2byte 118
+	.2byte 175
+	.2byte 48
+	.2byte 30
+	.2byte 31
+	.byte 80
+	.byte 60
+	.byte 30
+	.byte 70
+	.byte 90
+	.byte 200
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_CASTFORM
+	.string "CASTER$    "
+	.string "FELICIA$"
+	.byte 47
+	.2byte 0
+	.4byte 0x80080fff
+	.2byte 126
+	.2byte 241
+	.2byte 311
+	.2byte 201
+	.2byte 216
+	.byte 70
+	.byte 80
+	.byte 80
+	.byte 50
+	.byte 65
+	.byte 210
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MACHOKE
+	.string "CHOKEM$    "
+	.string "EMILIO$ "
+	.byte 38
+	.2byte 0
+	.4byte 0x80040fff
+	.2byte 70
+	.2byte 69
+	.2byte 116
+	.2byte 2
+	.2byte 184
+	.byte 70
+	.byte 85
+	.byte 25
+	.byte 60
+	.byte 50
+	.byte 220
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_LOMBRE
+	.string "LOMBE$     "
+	.string "KARLA$  "
+	.byte 10
+	.2byte 0
+	.4byte 0x80020fff
+	.2byte 58
+	.2byte 213
+	.2byte 148
+	.2byte 253
+	.2byte 45
+	.byte 40
+	.byte 60
+	.byte 90
+	.byte 45
+	.byte 70
+	.byte 230
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SEVIPER
+	.string "VIPES$     "
+	.string "DARRYL$ "
+	.byte 33
+	.2byte 0
+	.4byte 0x80010fff
+	.2byte 98
+	.2byte 305
+	.2byte 137
+	.2byte 35
+	.2byte 103
+	.byte 35
+	.byte 50
+	.byte 90
+	.byte 40
+	.byte 100
+	.byte 240
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_WAILMER
+	.string "MERAIL$    "
+	.string "SELENA$ "
+	.byte 22
+	.2byte 0
+	.4byte 0x80008fff
+	.2byte 26
+	.2byte 352
+	.2byte 156
+	.2byte 323
+	.2byte 150
+	.byte 30
+	.byte 100
+	.byte 100
+	.byte 50
+	.byte 30
+	.byte 250
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MAGIKARP
+	.string "KARPAG$    "
+	.string "NOEL$   "
+	.byte 35
+	.2byte 0
+	.4byte 0x80004fff
+	.2byte 82
+	.2byte 33
+	.2byte 150
+	.2byte 175
+	.2byte 33
+	.byte 30
+	.byte 30
+	.byte 160
+	.byte 50
+	.byte 160
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_LUNATONE
+	.string "LUNONE$    "
+	.string "LACEY$  "
+	.byte 16
+	.2byte 0
+	.4byte 0x80002fff
+	.2byte 42
+	.2byte 153
+	.2byte 248
+	.2byte 94
+	.2byte 93
+	.byte 50
+	.byte 70
+	.byte 60
+	.byte 70
+	.byte 50
+	.byte 210
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_ABSOL
+	.string "ABSO$      "
+	.string "CORBIN$ "
+	.byte 39
+	.2byte 0
+	.4byte 0x80001fff
+	.2byte 14
+	.2byte 195
+	.2byte 258
+	.2byte 63
+	.2byte 163
+	.byte 95
+	.byte 80
+	.byte 85
+	.byte 35
+	.byte 35
+	.byte 220
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_EXEGGUTOR
+	.string "EGGSOR$    "
+	.string "GRACIE$ "
+	.byte 32
+	.2byte 0
+	.4byte 0xc000fff
+	.2byte 98
+	.2byte 23
+	.2byte 95
+	.2byte 121
+	.2byte 285
+	.byte 40
+	.byte 50
+	.byte 60
+	.byte 100
+	.byte 80
+	.byte 200
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_CUBONE
+	.string "CUBIN$     "
+	.string "COLTIN$ "
+	.byte 65
+	.2byte 0
+	.4byte 0x82000fff
+	.2byte 82
+	.2byte 125
+	.2byte 155
+	.2byte 198
+	.2byte 45
+	.byte 40
+	.byte 35
+	.byte 85
+	.byte 35
+	.byte 100
+	.byte 210
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_HITMONLEE
+	.string "HITMON$    "
+	.string "ELLIE$  "
+	.byte 22
+	.2byte 0
+	.4byte 0x21000fff
+	.2byte 70
+	.2byte 179
+	.2byte 279
+	.2byte 116
+	.2byte 25
+	.byte 85
+	.byte 30
+	.byte 25
+	.byte 50
+	.byte 100
+	.byte 220
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SQUIRTLE
+	.string "SURTLE$    "
+	.string "MARCUS$ "
+	.byte 49
+	.2byte 0
+	.4byte 0x20800fff
+	.2byte 82
+	.2byte 39
+	.2byte 145
+	.2byte 264
+	.2byte 110
+	.byte 30
+	.byte 35
+	.byte 100
+	.byte 40
+	.byte 95
+	.byte 230
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_KANGASKHAN
+	.string "KHANKAN$   "
+	.string "KIARA$  "
+	.byte 14
+	.2byte 0
+	.4byte 0x80400fff
+	.2byte 70
+	.2byte 5
+	.2byte 99
+	.2byte 264
+	.2byte 39
+	.byte 100
+	.byte 50
+	.byte 30
+	.byte 50
+	.byte 100
+	.byte 240
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_PINECO
+	.string "PINOC$     "
+	.string "BRYCE$  "
+	.byte 36
+	.2byte 0
+	.4byte 0x10200fff
+	.2byte 42
+	.2byte 153
+	.2byte 191
+	.2byte 113
+	.2byte 202
+	.byte 80
+	.byte 80
+	.byte 80
+	.byte 80
+	.byte 80
+	.byte 250
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_DUNSPARCE
+	.string "DILTOT$    "
+	.string "JAMIE$  "
+	.byte 34
+	.2byte 0
+	.4byte 0x20100fff
+	.2byte 82
+	.2byte 180
+	.2byte 281
+	.2byte 111
+	.2byte 36
+	.byte 40
+	.byte 35
+	.byte 100
+	.byte 40
+	.byte 110
+	.byte 240
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_HOUNDOOM
+	.string "DOOMOND$   "
+	.string "JORGE$  "
+	.byte 48
+	.2byte 0
+	.4byte 0x8080fff
+	.2byte 14
+	.2byte 46
+	.2byte 53
+	.2byte 185
+	.2byte 241
+	.byte 100
+	.byte 100
+	.byte 30
+	.byte 25
+	.byte 80
+	.byte 230
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MILTANK
+	.string "MILKAN$    "
+	.string "DEVON$  "
+	.byte 25
+	.2byte 0
+	.4byte 0x40040fff
+	.2byte 26
+	.2byte 208
+	.2byte 215
+	.2byte 111
+	.2byte 59
+	.byte 50
+	.byte 110
+	.byte 100
+	.byte 35
+	.byte 40
+	.byte 220
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_GYARADOS
+	.string "RADOS$     "
+	.string "JUSTINA$"
+	.byte 32
+	.2byte 0
+	.4byte 0x84000fff
+	.2byte 79
+	.2byte 63
+	.2byte 56
+	.2byte 240
+	.2byte 44
+	.byte 160
+	.byte 200
+	.byte 20
+	.byte 40
+	.byte 160
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_LOUDRED
+	.string "LOUDERD$   "
+	.string "RALPH$  "
+	.byte 21
+	.2byte 0
+	.4byte 0x82000fff
+	.2byte 71
+	.2byte 304
+	.2byte 23
+	.2byte 46
+	.2byte 336
+	.byte 170
+	.byte 50
+	.byte 55
+	.byte 150
+	.byte 160
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SKITTY
+	.string "SITTY$     "
+	.string "ROSA$   "
+	.byte 8
+	.2byte 0
+	.4byte 0x81000fff
+	.2byte 59
+	.2byte 213
+	.2byte 274
+	.2byte 185
+	.2byte 39
+	.byte 40
+	.byte 200
+	.byte 150
+	.byte 185
+	.byte 60
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SLAKING
+	.string "SLING$     "
+	.string "KEATON$ "
+	.byte 11
+	.2byte 0
+	.4byte 0x80800fff
+	.2byte 115
+	.2byte 343
+	.2byte 68
+	.2byte 227
+	.2byte 303
+	.byte 85
+	.byte 85
+	.byte 170
+	.byte 110
+	.byte 150
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_ALTARIA
+	.string "TARIA$     "
+	.string "MAYRA$  "
+	.byte 18
+	.2byte 0
+	.4byte 0x80400fff
+	.2byte 15
+	.2byte 349
+	.2byte 63
+	.2byte 195
+	.2byte 219
+	.byte 170
+	.byte 150
+	.byte 30
+	.byte 30
+	.byte 90
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_KIRLIA
+	.string "LIRKI$     "
+	.string "LAMAR$  "
+	.byte 15
+	.2byte 0
+	.4byte 0x80200fff
+	.2byte 39
+	.2byte 351
+	.2byte 247
+	.2byte 285
+	.2byte 216
+	.byte 230
+	.byte 60
+	.byte 60
+	.byte 230
+	.byte 80
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_BELLOSSOM
+	.string "BLOSSOM$   "
+	.string "AUBREY$ "
+	.byte 26
+	.2byte 0
+	.4byte 0x80100fff
+	.2byte 59
+	.2byte 80
+	.2byte 230
+	.2byte 78
+	.2byte 148
+	.byte 35
+	.byte 200
+	.byte 150
+	.byte 130
+	.byte 40
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SABLEYE
+	.string "EYESAB$    "
+	.string "NIGEL$  "
+	.byte 31
+	.2byte 0
+	.4byte 0x80080fff
+	.2byte 115
+	.2byte 212
+	.2byte 185
+	.2byte 282
+	.2byte 109
+	.byte 25
+	.byte 35
+	.byte 230
+	.byte 150
+	.byte 160
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_NATU
+	.string "UTAN$      "
+	.string "CAMILLE$"
+	.byte 47
+	.2byte 0
+	.4byte 0x80040fff
+	.2byte 115
+	.2byte 101
+	.2byte 248
+	.2byte 109
+	.2byte 94
+	.byte 35
+	.byte 35
+	.byte 150
+	.byte 130
+	.byte 170
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SHARPEDO
+	.string "PEDOS$     "
+	.string "DEON$   "
+	.byte 38
+	.2byte 0
+	.4byte 0x80020fff
+	.2byte 87
+	.2byte 97
+	.2byte 207
+	.2byte 269
+	.2byte 36
+	.byte 140
+	.byte 70
+	.byte 140
+	.byte 75
+	.byte 100
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_LUVDISC
+	.string "LUVIS$     "
+	.string "JANELLE$"
+	.byte 10
+	.2byte 0
+	.4byte 0x80010fff
+	.2byte 83
+	.2byte 186
+	.2byte 213
+	.2byte 36
+	.2byte 204
+	.byte 50
+	.byte 100
+	.byte 220
+	.byte 40
+	.byte 190
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_HERACROSS
+	.string "HEROSS$    "
+	.string "HEATH$  "
+	.byte 33
+	.2byte 0
+	.4byte 0x80008fff
+	.2byte 71
+	.2byte 70
+	.2byte 203
+	.2byte 179
+	.2byte 317
+	.byte 170
+	.byte 70
+	.byte 110
+	.byte 240
+	.byte 140
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_ELECTRODE
+	.string "RODLECT$   "
+	.string "SASHA$  "
+	.byte 6
+	.2byte 0
+	.4byte 0x80004fff
+	.2byte 15
+	.2byte 153
+	.2byte 113
+	.2byte 129
+	.2byte 148
+	.byte 200
+	.byte 200
+	.byte 30
+	.byte 35
+	.byte 50
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_PICHU
+	.string "CHUPY$     "
+	.string "FRANKIE$"
+	.byte 35
+	.2byte 0
+	.4byte 0x80002fff
+	.2byte 59
+	.2byte 186
+	.2byte 213
+	.2byte 156
+	.2byte 39
+	.byte 25
+	.byte 150
+	.byte 180
+	.byte 115
+	.byte 120
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_WOBBUFFET
+	.string "WOBET$     "
+	.string "HELEN$  "
+	.byte 16
+	.2byte 0
+	.4byte 0x80001fff
+	.2byte 111
+	.2byte 68
+	.2byte 243
+	.2byte 219
+	.2byte 194
+	.byte 60
+	.byte 230
+	.byte 50
+	.byte 220
+	.byte 210
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_GENGAR
+	.string "GAREN$     "
+	.string "CAMILE$ "
+	.byte 40
+	.2byte 0
+	.4byte 0xc000fff
+	.2byte 71
+	.2byte 194
+	.2byte 109
+	.2byte 122
+	.2byte 188
+	.byte 200
+	.byte 100
+	.byte 50
+	.byte 80
+	.byte 180
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_PORYGON
+	.string "GONPOR$    "
+	.string "MARTIN$ "
+	.byte 46
+	.2byte 0
+	.4byte 0x82000fff
+	.2byte 127
+	.2byte 176
+	.2byte 160
+	.2byte 216
+	.2byte 278
+	.byte 130
+	.byte 130
+	.byte 130
+	.byte 130
+	.byte 130
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_DRAGONITE
+	.string "DRITE$     "
+	.string "SERGIO$ "
+	.byte 7
+	.2byte 0
+	.4byte 0x21000fff
+	.2byte 71
+	.2byte 200
+	.2byte 21
+	.2byte 239
+	.2byte 89
+	.byte 150
+	.byte 140
+	.byte 50
+	.byte 120
+	.byte 150
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_MEOWTH
+	.string "MEOWY$     "
+	.string "KAILEY$ "
+	.byte 6
+	.2byte 0
+	.4byte 0x20800fff
+	.2byte 51
+	.2byte 45
+	.2byte 269
+	.2byte 6
+	.2byte 44
+	.byte 125
+	.byte 110
+	.byte 180
+	.byte 170
+	.byte 80
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_JYNX
+	.string "NYX$       "
+	.string "PERLA$  "
+	.byte 45
+	.2byte 0
+	.4byte 0x80400fff
+	.2byte 43
+	.2byte 195
+	.2byte 212
+	.2byte 142
+	.2byte 313
+	.byte 100
+	.byte 150
+	.byte 100
+	.byte 150
+	.byte 120
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_TOGEPI
+	.string "GEPITO$    "
+	.string "CLARA$  "
+	.byte 20
+	.2byte 0
+	.4byte 0x10200fff
+	.2byte 19
+	.2byte 45
+	.2byte 281
+	.2byte 227
+	.2byte 266
+	.byte 80
+	.byte 120
+	.byte 200
+	.byte 120
+	.byte 80
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_ESPEON
+	.string "SPEON$     "
+	.string "JAKOB$  "
+	.byte 37
+	.2byte 0
+	.4byte 0x20100fff
+	.2byte 15
+	.2byte 129
+	.2byte 98
+	.2byte 234
+	.2byte 39
+	.byte 180
+	.byte 150
+	.byte 100
+	.byte 80
+	.byte 150
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_SLOWKING
+	.string "SLOWGO$    "
+	.string "TREY$   "
+	.byte 49
+	.2byte 0
+	.4byte 0x8080fff
+	.2byte 83
+	.2byte 263
+	.2byte 174
+	.2byte 281
+	.2byte 264
+	.byte 100
+	.byte 80
+	.byte 200
+	.byte 110
+	.byte 170
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+	.2byte SPECIES_URSARING
+	.string "URSING$    "
+	.string "LANE$   "
+	.byte 44
+	.2byte 0
+	.4byte 0x40040fff
+	.2byte 71
+	.2byte 37
+	.2byte 332
+	.2byte 313
+	.2byte 43
+	.byte 180
+	.byte 140
+	.byte 30
+	.byte 80
+	.byte 190
+	.byte 255
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0x0
+	.4byte 0xffff
+
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 839235589..556ebcd01 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -7,6 +7,7 @@
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
+	
 
 	.section script_data, "aw", %progbits
 
@@ -1770,7 +1771,7 @@ EventScript_271D92:: @ 8271D92
 EventScript_271DAC:: @ 8271DAC
 	message gUnknown_0827266F
 	waitmessage
-	special sp109_CreatePCMenu
+	special ScrSpecial_CreatePCMenu
 	waitstate
 	goto EventScript_271DBC
 	end
diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s
index 6d0b0b3bb..63fc1580e 100644
--- a/data/field_effect_helpers.s
+++ b/data/field_effect_helpers.s
@@ -4,7 +4,7 @@
 	.section .rodata
 
 gUnknown_085CDC38:: @ 85CDC38
-	.incbin "baserom.gba", 0x5cdc38, 0x6
+	.2byte 12, 28, 44
 
 gUnknown_085CDC3E:: @ 85CDC3E
 	.byte 0x00, 0x01, 0x02, 0x03
@@ -22,8 +22,11 @@ gUnknown_085CDC54:: @ 85CDC54
 	.4byte sub_815550C
 
 gUnknown_085CDC60:: @ 85CDC60
-	.incbin "baserom.gba", 0x5cdc60, 0xa
-
+	.byte 0, 0, 1, 2, 3, 0, 0, 1, 1
+	.byte 0
+	
 gUnknown_085CDC6A:: @ 85CDC6A
-	.incbin "baserom.gba", 0x5cdc6a, 0x96
+	.2byte 3, 7
+	@the following might be unref, not sure
+	.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00
 
diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
index 113814721..989d2add7 100644
--- a/data/field_ground_effect.s
+++ b/data/field_ground_effect.s
@@ -39,7 +39,8 @@ gUnknown_0850E654:: @ 850E654
 	.4byte DoTracksGroundEffect_BikeTireTracks
 
 gUnknown_0850E660:: @ 850E660
-	.incbin "baserom.gba", 0x50e660, 0x4
+	.byte 13, 0
+	.byte 24, 0
 
 gUnknown_0850E664:: @ 850E664
 	.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
diff --git a/data/field_player_avatar.s b/data/field_player_avatar.s
index efb2f34cb..c2e0d729d 100644
--- a/data/field_player_avatar.s
+++ b/data/field_player_avatar.s
@@ -115,11 +115,12 @@ gUnknown_08497540:: @ 8497540
 	.4byte sub_808C6FC
 
 gUnknown_08497550:: @ 8497550
-	.incbin "baserom.gba", 0x497550, 0x4
+	.byte 3, 4, 2, 1
 
 gUnknown_08497554:: @ 8497554
-	.incbin "baserom.gba", 0x497554, 0x8
+	.byte 16, 16, 17, 18, 19
 
+	.align 2
 gUnknown_0849755C:: @ 849755C
 	.4byte fish0
 	.4byte fish1
@@ -139,19 +140,21 @@ gUnknown_0849755C:: @ 849755C
 	.4byte fishF
 
 gUnknown_0849759C:: @ 849759C
-	.incbin "baserom.gba", 0x49759c, 0x6
+	.2byte 1, 1, 1
 
 gUnknown_084975A2:: @ 84975A2
-	.incbin "baserom.gba", 0x4975a2, 0x6
+	.2byte 1, 3, 6
 
 gUnknown_084975A8:: @ 84975A8
-	.incbin "baserom.gba", 0x4975a8, 0x2
+	.string "·$"
 
 gUnknown_084975AA:: @ 84975AA
-	.incbin "baserom.gba", 0x4975aa, 0x6
+	.2byte 36, 33, 30
 
 gUnknown_084975B0:: @ 84975B0
-	.incbin "baserom.gba", 0x4975b0, 0xc
+	.2byte 0, 0
+	.2byte 0x28, 10
+	.2byte 0x46, 30
 
 gUnknown_084975BC:: @ 84975BC
 	.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
diff --git a/data/field_special_scene.s b/data/field_special_scene.s
index fe8ef1622..16e5a366d 100644
--- a/data/field_special_scene.s
+++ b/data/field_special_scene.s
@@ -6,10 +6,10 @@
 	.align 2, 0
 
 gTruckCamera_HorizontalTable:: @ 858E898
-	.incbin "baserom.gba", 0x58e898, 0x13
+	.byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0
 
 gUnknown_0858E8AB:: @ 858E8AB
-	.incbin "baserom.gba", 0x58e8ab, 0x2
+	.byte 0x18, 0xFE
 
 gUnknown_0858E8AD:: @ 858E8AD
-	.incbin "baserom.gba", 0x58e8ad, 0x3
+	.byte 0x17, 0xFE
diff --git a/data/field_tasks.s b/data/field_tasks.s
index 8405c64d5..310fd0e2a 100644
--- a/data/field_tasks.s
+++ b/data/field_tasks.s
@@ -5,19 +5,95 @@
     .align 2, 0
 
 gUnknown_08510348:: @ 8510348
-	.incbin "baserom.gba", 0x510348, 0x20
+	.4byte nullsub_34
+	.4byte sub_809E3B4
+	.4byte sub_809DEF0
+	.4byte sub_809DCB4
+	.4byte sub_809E224
+	.4byte EndTruckSequence
+	.4byte sub_80EA3E4
+	.4byte sub_809E4CC
 
 gUnknown_08510368:: @ 8510368
-	.incbin "baserom.gba", 0x510368, 0x20
+	.byte 0
+	.byte 0
+	.2byte 0x259
+	.byte 0
+	.byte 1
+	.2byte 0x261
+	.byte 0
+	.byte 0xFF
+	.2byte 0x259
+	.byte 0
+	.byte 0
+	.2byte 0x261
+	.byte 0
+	.byte 0
+	.2byte 0x252
+	.byte 1
+	.byte 0
+	.2byte 0x253
+	.byte 0xFF
+	.byte 0
+	.2byte 0x252
+	.byte 0
+	.byte 0
+	.2byte 0x253
 
 gUnknown_08510388:: @ 8510388
-	.incbin "baserom.gba", 0x510388, 0x20
+	.byte 0
+	.byte 0
+	.2byte 0x25A
+	.byte 0
+	.byte 1
+	.2byte 0x262
+	.byte 0
+	.byte 0xFF
+	.2byte 0x25A
+	.byte 0
+	.byte 0
+	.2byte 0x262
+	.byte 0
+	.byte 0
+	.2byte 0x254
+	.byte 1
+	.byte 0
+	.2byte 0x255
+	.byte 0xFF
+	.byte 0
+	.2byte 0x254
+	.byte 0
+	.byte 0
+	.2byte 0x255
 
 gUnknown_085103A8:: @ 85103A8
-	.incbin "baserom.gba", 0x5103a8, 0x20
+	.byte 0
+	.byte 0
+	.2byte 0x258
+	.byte 0
+	.byte 1
+	.2byte 0x260
+	.byte 0
+	.byte 0xFF
+	.2byte 0x258
+	.byte 0
+	.byte 0
+	.2byte 0x260
+	.byte 0
+	.byte 0
+	.2byte 0x250
+	.byte 1
+	.byte 0
+	.2byte 0x251
+	.byte 0xFF
+	.byte 0
+	.2byte 0x250
+	.byte 0
+	.byte 0
+	.2byte 0x251
 
 gUnknown_085103C8:: @ 85103C8
-	.incbin "baserom.gba", 0x5103c8, 0x34
+	.2byte 0, 0, 0, 0, 0, 0, 0x4001, 0x4002, 0x4003, 0x4004, 0, 0, 0x4005, 0x4006, 0x4007, 0, 0, 0x4008, 0x4009, 0x400a, 0, 0, 0, 0, 0, 0
 
 gUnknown_085103FC:: @ 85103FC
-	.incbin "baserom.gba", 0x5103fc, 0x8
+	.2byte 0xE8, 0xeb, 0xea, 0xe9
diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s
index f9d72e088..9fea73f9a 100644
--- a/data/fldeff_cut.s
+++ b/data/fldeff_cut.s
@@ -5,16 +5,28 @@
     .align 2, 0
 
 gUnknown_0857C608:: @ 857C608
-	.incbin "baserom.gba", 0x57c608, 0x2
+	.byte 0xfe, 0xfe, 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
+	.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 
+	
+gUnknown_0857C648:: @ 857C648
+	.2byte 0
+	.2byte 0
+	.2byte 0x1401
+	.2byte 0
 
-gUnknown_0857C60A:: @ 857C60A
-	.byte 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
-	.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x50, 0xc6, 0x57, 0x08, 0x58, 0x6e, 0x4f, 0x08, 0x20, 0x00, 0x00, 0x00
+gUnknown_0857C650:: @ 857C650	
+	obj_image_anim_frame 0, 0x1E
+	obj_image_anim_jump 0
+	
+gUnknown_0857C658:: @ 857C658	
+	.4byte gUnknown_0857C650
+	
+gUnknown_0857C65C:: @ 857C65C
+	obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32
 
 	.align 2
 gFieldEffectObjectPaletteInfo6:: @ 857C664
 	obj_pal gFieldEffectObjectPalette6, 0x1000
 
 gUnknown_0857C66C:: @ 857C66C
-	.incbin "baserom.gba", 0x57c66c, 0x18
+	spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8
diff --git a/data/fossil_special_fldeff_groundshake.s b/data/fossil_special_fldeff_groundshake.s
index 8f968d409..8fa546ce8 100644
--- a/data/fossil_special_fldeff_groundshake.s
+++ b/data/fossil_special_fldeff_groundshake.s
@@ -3,32 +3,96 @@
 
 	.section .rodata
 
+	.align 2
 gUnknown_08617274:: @ 8617274
-	.incbin "baserom.gba", 0x617274, 0x920
+	.space 0x20
+	.incbin "graphics/misc/mirage_tower.4bpp"
 
+	.align 2
 gUnknown_08617B94:: @ 8617B94
-	.incbin "baserom.gba", 0x617b94, 0xb0
+	.incbin "graphics/misc/mirage_tower.bin"
 
-gUnknown_08617C44:: @ 8617C44
-	.incbin "baserom.gba", 0x617c44, 0x120
+	.align 2
+gRootFossil_Pal:: @ 8617C24
+	.incbin "graphics/misc/fossil.gbapal"
 
+	.align 2
+gRootFossil_Gfx:: @ 8617C44
+	.incbin "graphics/misc/fossil.4bpp"
+
+	.align 2
+gMirageTowerCrumbles_Gfx:: @ 8617CC4
+	.incbin "graphics/misc/mirage_tower_crumbles.4bpp"
+
+	.align 2
+gMirageTowerCrumbles_Palette:: @ 8617D44
+	.incbin "graphics/misc/mirage_tower_crumbles.gbapal"
+
+	.align 1
 gUnknown_08617D64:: @ 8617D64
-	.incbin "baserom.gba", 0x617d64, 0x30
+	.2byte 0x0000, 0x000a, 0x0041, 0x0011, 0x0003, 0x0032, 0xfff4, 0x0000, 0x004b, 0x000a, 0x000f, 0x005a, 0x0007, 0x0008, 0x0041, 0xffee
+	.2byte 0x0005, 0x004b, 0x0016, 0xfff6, 0x0037, 0xffe8, 0xfffc, 0x0041
 
+	.align 2
 gUnknown_08617D94:: @ 8617D94
-	.incbin "baserom.gba", 0x617d94, 0x10
+	obj_tiles gMirageTowerCrumbles_Gfx, 0x0080, 0x0fa0
+	null_obj_tiles
 
+	.align 2
 gUnknown_08617DA4:: @ 8617DA4
-	.incbin "baserom.gba", 0x617da4, 0x5c
+	.byte 0x12, 0x35, 0x51, 0x02, 0x13, 0x35, 0x51, 0x02, 0x14, 0x35, 0x51, 0x02, 0x12, 0x36, 0x51, 0x02, 0x13, 0x36, 0x51, 0x02, 0x14, 0x36, 0x51, 0x02, 0x12, 0x37, 0x51, 0x02, 0x13, 0x37, 0x51, 0x02
+	.byte 0x14, 0x37, 0x51, 0x02, 0x12, 0x38, 0x51, 0x02, 0x13, 0x38, 0x51, 0x02, 0x14, 0x38, 0x51, 0x02, 0x12, 0x39, 0x59, 0x02, 0x13, 0x39, 0x59, 0x02, 0x14, 0x39, 0x59, 0x02, 0x12, 0x3a, 0x21, 0x01
+	.byte 0x13, 0x3a, 0x21, 0x01, 0x14, 0x3a, 0x21, 0x01
 
+	.align 2
+gSpriteAnim_8617DEC:: @ 8617DEC
+	.2byte 0x0000, 0x0001, 0xffff, 0x0000
+
+	.align 2
+gOamData_8617DF4:: @ 8617DF4
+	.2byte 0x0000, 0x4000, 0x3000, 0x0000
+
+	.align 2
+gSpriteAnimTable_8617DFC:: @ 8617DFC
+	.4byte gSpriteAnim_8617DEC
+
+	.align 2
 gUnknown_08617E00:: @ 8617E00
-	.incbin "baserom.gba", 0x617e00, 0x18
+	spr_template 0xffff, 0xffff, gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_08617E18:: @ 8617E18
-	.incbin "baserom.gba", 0x617e18, 0x1c
+	.byte 0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b
 
+	.align 2
+gSpriteAnim_8617E20:: @ 8617E20
+	.2byte 0x0000, 0x000c, 0xfffe, 0x0000
+
+	.align 2
+gSpriteAnimTable_8617E28:: @ 8617E28
+	.4byte gSpriteAnim_8617E20
+
+	.align 2
+gUnknown_08617E2C:: @ 8617E2C
+	.2byte 0x0000, 0x0000, 0x0000, 0x0000
+
+	.align 2
 gUnknown_08617E34:: @ 8617E34
-	.incbin "baserom.gba", 0x617e34, 0x2c
+	spr_template 0x0fa0, 0xffff, gUnknown_08617E2C, gSpriteAnimTable_8617E28, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
 
+	.align 2
+gSpriteAnim_8617E4C:: @ 8617E4C
+	.2byte 0x0000, 0x000c, 0xfffe, 0x0000
+
+	.align 2
+gSpriteAnim_8617E54:: @ 8617E54
+	.4byte gSpriteAnim_8617E4C
+
+	.align 2
+gOamData_8617E58:: @ 8617E58
+	.2byte 0x0000, 0x4000, 0x0000, 0x0000
+
+	.align 2
 gUnknown_08617E60:: @ 8617E60
-	.incbin "baserom.gba", 0x617e60, 0x18
+	spr_template 0x0fa0, 0xffff, gOamData_8617E58, gSpriteAnim_8617E54, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
+
diff --git a/data/graphics.s b/data/graphics.s
index 11244eb99..8527e570d 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -5041,7 +5041,7 @@ gUnknown_08DDD704:: @ 8DDD704
 	.incbin "graphics/unknown/unknown_DDD704.bin" @ textbox tilemap??
 
 	.align 2
-gUnknown_08DDD728:: @ 8DDD728
+gMessageBox_Pal:: @ 8DDD728
 	.incbin "graphics/text_window/message_box.gbapal"
 
 	.align 2
diff --git a/data/graphics/field_objects/field_object_graphics.inc b/data/graphics/field_objects/field_object_graphics.inc
index 0e55eb146..59333b9a4 100644
--- a/data/graphics/field_objects/field_object_graphics.inc
+++ b/data/graphics/field_objects/field_object_graphics.inc
@@ -5386,7 +5386,8 @@ gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8
 gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938
 	.incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp"
 
-	.incbin "baserom.gba", 0x4f6d38, 0x160
+gUnknown_084F6D38:: @ 84F6D38
+	.incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp"
 
 	.align 2
 gFieldEffectObjectPalette6:: @ 84F6E98
@@ -5500,7 +5501,17 @@ gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938
 gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978
 	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp"
 
-	.incbin "baserom.gba", 0x4f79b8, 0x200
+gUnusedGrass_0:: @4F79B8
+	.incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp"
+	
+gUnusedGrass_1:: @4F7A38
+	.incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp"
+	
+gUnusedGrass_2:: @4F7AB8
+	.incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp"
+	
+gUnusedGrass_3:: @4F7B38
+	.incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp"
 
 	.align 2
 gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8
@@ -5522,7 +5533,8 @@ gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38
 gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8
 	.incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp"
 
-	.incbin "baserom.gba", 0x4f7e38, 0x80
+gUnknown_084F7E38:: @ 84F7E38
+	.incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp"
 
 	.align 2
 gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8
diff --git a/data/item_icon.s b/data/item_icon.s
index dac00dc6c..41fb7d9a1 100644
--- a/data/item_icon.s
+++ b/data/item_icon.s
@@ -6,8 +6,18 @@
 @ 8614410
 	.include "data/graphics/items/item_icon_table.inc"
 
-@ 8614FE0
-	.incbin "baserom.gba", 0x614fe0, 0x14
+gUnknown_08614FE0:: @ 8614FE0
+	.2byte 0
+	.2byte 0x8000
+	.2byte 0x2400
+	.2byte 0
+	
+gUnknown_08614FE8:: @ 8614FE8
+	obj_image_anim_frame 0, 0
+	obj_image_anim_end
+	
+gUnknown_08614FF0:: @ 8614FF0
+	.4byte gUnknown_08614FE8
 
 gUnknown_08614FF4:: @ 8614FF4
-	.incbin "baserom.gba", 0x614ff4, 0x18
+	spr_template 0, 0, gUnknown_08614FE0, gUnknown_08614FF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/item_menu.s b/data/item_menu.s
index b160200e8..1b11c5e59 100644
--- a/data/item_menu.s
+++ b/data/item_menu.s
@@ -100,13 +100,28 @@ gUnknown_08614094:: @ 8614094
 	.4byte 0x6F
 
 gUnknown_086140A4:: @ 86140A4
-	.incbin "baserom.gba", 0x6140a4, 0xc0
+	.incbin "graphics/interface/select_button.4bpp"
 
 gUnknown_08614164:: @ 8614164
-	.incbin "baserom.gba", 0x614164, 0x10
+	.byte 0, 1, 3, 0, 1, 4, 0, 3, 6, 2, 1, 3, 0, 14, 10, 0
 
 gUnknown_08614174:: @ 8614174
-	.incbin "baserom.gba", 0x614174, 0x38
+	window_template 0, 14, 2, 15, 16, 1, 0x27
+	window_template 0, 0, 13, 14, 6, 1, 0x117
+	window_template 0, 4, 1, 8, 2, 1, 0x1A1
+	window_template 0, 1, 13, 5, 6, 12, 0x16B
+	window_template 0, 7, 13, 4, 6, 12, 0x189
+	window_template 1, 2, 15, 27, 4, 15, 0x1B1
+	null_window_template
 
 gUnknown_086141AC:: @ 86141AC
-	.incbin "baserom.gba", 0x6141ac, 0x50
+	window_template 1, 22, 17, 7, 2, 15, 0x21D
+	window_template 1, 22, 15, 7, 4, 15, 0x21D
+	window_template 1, 15, 15, 14, 4, 15, 0x21D
+	window_template 1, 15, 13, 14, 6, 15, 0x21D
+	window_template 1, 2, 15, 27, 4, 15, 0x1B1
+	window_template 1, 24, 15, 5, 4, 15, 0x21D
+	window_template 1, 21, 9, 5, 4, 15, 0x21D
+	window_template 1, 24, 17, 5, 2, 15, 0x21D
+	window_template 1, 18, 11, 10, 2, 15, 0x245
+	window_template 1, 1, 1, 10, 2, 15, 0x231
diff --git a/data/librfu_rodata.s b/data/librfu_rodata.s
index 672053e89..aa8f5170d 100644
--- a/data/librfu_rodata.s
+++ b/data/librfu_rodata.s
@@ -1,7 +1,10 @@
 	.section .rodata
 
 gUnknown_089A3220:: @ 89A3220
-	.incbin "baserom.gba", 0x9a3220, 0x20
+	.byte 2, 14, 0, 10, 9, 5, 7, 2
+	.byte 0, 15, 1, 3, 3, 0, 31, 0
+	.byte 3, 22, 18, 14, 13, 9, 11, 3
+	.byte 15, 15, 1, 3, 3, 0, 0x7f, 0
 
 	.asciz "RFU_V1026"
 
diff --git a/data/map_name_popup.s b/data/map_name_popup.s
index f13886e1d..7dc1da808 100644
--- a/data/map_name_popup.s
+++ b/data/map_name_popup.s
@@ -4,20 +4,66 @@
     .section .rodata
     .align 2, 0
 
-gUnknown_0857C684:: @ 857C684
-	.incbin "baserom.gba", 0x57c684, 0x1680
+gMapPopUp_Table:: @ 857C684
+	.incbin "graphics/interface/map_popup/wood.4bpp"
+	.incbin "graphics/interface/map_popup/marble.4bpp"
+	.incbin "graphics/interface/map_popup/stone.4bpp"
+	.incbin "graphics/interface/map_popup/brick.4bpp"
+	.incbin "graphics/interface/map_popup/underwater.4bpp"
+	.incbin "graphics/interface/map_popup/stone2.4bpp"
 
-gUnknown_0857DD04:: @ 857DD04
-	.incbin "baserom.gba", 0x57dd04, 0x1680
+gMapPopUp_Outline_Table:: @ 857DD04
+	.incbin "graphics/interface/map_popup/wood_outline.4bpp"
+	.incbin "graphics/interface/map_popup/marble_outline.4bpp"
+	.incbin "graphics/interface/map_popup/stone_outline.4bpp"
+	.incbin "graphics/interface/map_popup/brick_outline.4bpp"
+	.incbin "graphics/interface/map_popup/underwater_outline.4bpp"
+	.incbin "graphics/interface/map_popup/stone2_outline.4bpp"
 
-gUnknown_0857F384:: @ 857F384
-	.incbin "baserom.gba", 0x57f384, 0xc0
+gMapPopUp_Palette_Table:: @ 857F384
+	.incbin "graphics/interface/map_popup/wood.gbapal"
+	.incbin "graphics/interface/map_popup/marble.gbapal"
+	.incbin "graphics/interface/map_popup/stone.gbapal"
+	.incbin "graphics/interface/map_popup/brick.gbapal"
+	.incbin "graphics/interface/map_popup/underwater.gbapal"
+	.incbin "graphics/interface/map_popup/stone2.gbapal"
 
 gUnknown_0857F444:: @ 857F444
-	.incbin "baserom.gba", 0x57f444, 0x20
+	.incbin "graphics/interface/map_popup/857F444.gbapal"
 
 gUnknown_0857F464:: @ 857F464
-	.incbin "baserom.gba", 0x57f464, 0xe0
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x05, 0x02, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x05, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x05, 0x02, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x01
+	
+gUnknown_0857F4CC:: @ 857F4CC
+	.string "PYRAMID FLOOR 1$"
+	
+gUnknown_0857F4DC:: @ 857F4DC
+	.string "PYRAMID FLOOR 2$"
+	
+gUnknown_0857F4EC:: @ 857F4EC
+	.string "PYRAMID FLOOR 3$"
+	
+gUnknown_0857F4FC:: @ 857F4FC
+	.string "PYRAMID FLOOR 4$"
+	
+gUnknown_0857F50C:: @ 857F50C
+	.string "PYRAMID FLOOR 5$"
+	
+gUnknown_0857F51C:: @ 857F51C
+	.string "PYRAMID FLOOR 6$"
+	
+gUnknown_0857F52C:: @ 857F52C
+	.string "PYRAMID FLOOR 7$"
+	
+gUnknown_0857F53C:: @ 857F53C
+	.string "PYRAMID$"
 
 gUnknown_0857F544:: @ 857F544
-	.incbin "baserom.gba", 0x57f544, 0x20
+	.4byte gUnknown_0857F4CC
+	.4byte gUnknown_0857F4DC
+	.4byte gUnknown_0857F4EC
+	.4byte gUnknown_0857F4FC
+	.4byte gUnknown_0857F50C
+	.4byte gUnknown_0857F51C
+	.4byte gUnknown_0857F52C
+	.4byte gUnknown_0857F53C
diff --git a/data/mauville_old_man.s b/data/mauville_old_man.s
index d7832b761..c1b4dd1be 100644
--- a/data/mauville_old_man.s
+++ b/data/mauville_old_man.s
@@ -28,13 +28,31 @@ gUnknown_0859F010:: @ 859F010
 	.4byte gUnknown_082944D5
 
 gUnknown_0859F030:: @ 859F030
-	.incbin "baserom.gba", 0x59f030, 0x18
+	.4byte 0, 12, 13, 18, 19, 21
 
 gUnknown_0859F048:: @ 859F048
-	.incbin "baserom.gba", 0x59f048, 0x230
+	.4byte 0x00000132, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956, 0x00000102, MauvilleCity_PokemonCenter_1F_Text_28E9D7, MauvilleCity_PokemonCenter_1F_Text_28E9EF, MauvilleCity_PokemonCenter_1F_Text_28E9FE
+	.4byte 0x00000103, MauvilleCity_PokemonCenter_1F_Text_28EA7D, MauvilleCity_PokemonCenter_1F_Text_28EA98, MauvilleCity_PokemonCenter_1F_Text_28EAA8, 0x00000104, MauvilleCity_PokemonCenter_1F_Text_28EB19, MauvilleCity_PokemonCenter_1F_Text_28EB31, MauvilleCity_PokemonCenter_1F_Text_28EB3E
+	.4byte 0x00000106, MauvilleCity_PokemonCenter_1F_Text_28EBB5, MauvilleCity_PokemonCenter_1F_Text_28EBCD, MauvilleCity_PokemonCenter_1F_Text_28EBDD, 0x00000109, MauvilleCity_PokemonCenter_1F_Text_28EC60, MauvilleCity_PokemonCenter_1F_Text_28EC79, MauvilleCity_PokemonCenter_1F_Text_28EC81
+	.4byte 0x0000010b, MauvilleCity_PokemonCenter_1F_Text_28ED04, MauvilleCity_PokemonCenter_1F_Text_28ED21, MauvilleCity_PokemonCenter_1F_Text_28ED30, 0x0000010c, MauvilleCity_PokemonCenter_1F_Text_28EDA1, MauvilleCity_PokemonCenter_1F_Text_28EDB5, MauvilleCity_PokemonCenter_1F_Text_28EDCF
+	.4byte 0x0000010d, MauvilleCity_PokemonCenter_1F_Text_28EE45, MauvilleCity_PokemonCenter_1F_Text_28EE5D, MauvilleCity_PokemonCenter_1F_Text_28EE6A, 0x0000010e, MauvilleCity_PokemonCenter_1F_Text_28EEDD, MauvilleCity_PokemonCenter_1F_Text_28EEF1, MauvilleCity_PokemonCenter_1F_Text_28EF01
+	.4byte 0x0000010f, MauvilleCity_PokemonCenter_1F_Text_28EF73, MauvilleCity_PokemonCenter_1F_Text_28EF95, MauvilleCity_PokemonCenter_1F_Text_28EFAA, 0x00000110, MauvilleCity_PokemonCenter_1F_Text_28F045, MauvilleCity_PokemonCenter_1F_Text_28F05A, MauvilleCity_PokemonCenter_1F_Text_28F071
+	.4byte 0x00000111, MauvilleCity_PokemonCenter_1F_Text_28F0F3, MauvilleCity_PokemonCenter_1F_Text_28F10D, MauvilleCity_PokemonCenter_1F_Text_28F125, 0x00000112, MauvilleCity_PokemonCenter_1F_Text_28F1BE, MauvilleCity_PokemonCenter_1F_Text_28F1D5, MauvilleCity_PokemonCenter_1F_Text_28F1DE
+	.4byte 0x00000113, MauvilleCity_PokemonCenter_1F_Text_28F24F, MauvilleCity_PokemonCenter_1F_Text_28F269, MauvilleCity_PokemonCenter_1F_Text_28F277, 0x00000114, MauvilleCity_PokemonCenter_1F_Text_28F2FC, MauvilleCity_PokemonCenter_1F_Text_28F314, MauvilleCity_PokemonCenter_1F_Text_28F32A
+	.4byte 0x0000011a, MauvilleCity_PokemonCenter_1F_Text_28F3AD, MauvilleCity_PokemonCenter_1F_Text_28F3C6, MauvilleCity_PokemonCenter_1F_Text_28F3D2, 0x0000011b, MauvilleCity_PokemonCenter_1F_Text_28F44B, MauvilleCity_PokemonCenter_1F_Text_28F461, MauvilleCity_PokemonCenter_1F_Text_28F47C
+	.4byte 0x0000011c, MauvilleCity_PokemonCenter_1F_Text_28F50C, MauvilleCity_PokemonCenter_1F_Text_28F51B, MauvilleCity_PokemonCenter_1F_Text_28F538, 0x0000021d, MauvilleCity_PokemonCenter_1F_Text_28F5BE, MauvilleCity_PokemonCenter_1F_Text_28F5D1, MauvilleCity_PokemonCenter_1F_Text_28F5F2
+	.4byte 0x0000011e, MauvilleCity_PokemonCenter_1F_Text_28F678, MauvilleCity_PokemonCenter_1F_Text_28F694, MauvilleCity_PokemonCenter_1F_Text_28F6B4, 0x00000121, MauvilleCity_PokemonCenter_1F_Text_28F751, MauvilleCity_PokemonCenter_1F_Text_28F76A, MauvilleCity_PokemonCenter_1F_Text_28F776
+	.4byte 0x00000124, MauvilleCity_PokemonCenter_1F_Text_28F7F6, MauvilleCity_PokemonCenter_1F_Text_28F811, MauvilleCity_PokemonCenter_1F_Text_28F822, 0x00000125, MauvilleCity_PokemonCenter_1F_Text_28F89C, MauvilleCity_PokemonCenter_1F_Text_28F8AF, MauvilleCity_PokemonCenter_1F_Text_28F8BC
+	.4byte 0x00000126, MauvilleCity_PokemonCenter_1F_Text_28F92F, MauvilleCity_PokemonCenter_1F_Text_28F941, MauvilleCity_PokemonCenter_1F_Text_28F949, 0x00000127, MauvilleCity_PokemonCenter_1F_Text_28F9D1, MauvilleCity_PokemonCenter_1F_Text_28F9EA, MauvilleCity_PokemonCenter_1F_Text_28F9FD
+	.4byte 0x00000128, MauvilleCity_PokemonCenter_1F_Text_28FA81, MauvilleCity_PokemonCenter_1F_Text_28FA99, MauvilleCity_PokemonCenter_1F_Text_28FAA7, 0x00000129, MauvilleCity_PokemonCenter_1F_Text_28FB1D, MauvilleCity_PokemonCenter_1F_Text_28FB35, MauvilleCity_PokemonCenter_1F_Text_28FB47
+	.4byte 0x0000012a, MauvilleCity_PokemonCenter_1F_Text_28FBC4, MauvilleCity_PokemonCenter_1F_Text_28FBD9, MauvilleCity_PokemonCenter_1F_Text_28FBEA, 0x0000012b, MauvilleCity_PokemonCenter_1F_Text_28FC6B, MauvilleCity_PokemonCenter_1F_Text_28FC85, MauvilleCity_PokemonCenter_1F_Text_28FC98
+	.4byte 0x0000012c, MauvilleCity_PokemonCenter_1F_Text_28FD1D, MauvilleCity_PokemonCenter_1F_Text_28FD35, MauvilleCity_PokemonCenter_1F_Text_28FD40, 0x0000012d, MauvilleCity_PokemonCenter_1F_Text_28FDA2, MauvilleCity_PokemonCenter_1F_Text_28FDBD, MauvilleCity_PokemonCenter_1F_Text_28FDCE
+	.4byte 0x0000012e, MauvilleCity_PokemonCenter_1F_Text_28FE57, MauvilleCity_PokemonCenter_1F_Text_28FE72, MauvilleCity_PokemonCenter_1F_Text_28FE88, 0x0000012f, MauvilleCity_PokemonCenter_1F_Text_28FF0C, MauvilleCity_PokemonCenter_1F_Text_28FF27, MauvilleCity_PokemonCenter_1F_Text_28FF44
+	.4byte 0x00000130, MauvilleCity_PokemonCenter_1F_Text_28FFDD, MauvilleCity_PokemonCenter_1F_Text_28FFFA, MauvilleCity_PokemonCenter_1F_Text_29000D
+
 
 gUnknown_0859F278:: @ 859F278
-	.incbin "baserom.gba", 0x59f278, 0x10
+	.4byte 0x00000131, MauvilleCity_PokemonCenter_1F_Text_290097, MauvilleCity_PokemonCenter_1F_Text_2900B5, MauvilleCity_PokemonCenter_1F_Text_2900CB
 
 gUnknown_0859F288:: @ 859F288
 	.4byte 0x00000024, 0x00000008
diff --git a/data/menu_helpers.s b/data/menu_helpers.s
index 8d0e12939..25ca66485 100644
--- a/data/menu_helpers.s
+++ b/data/menu_helpers.s
@@ -4,11 +4,34 @@
 	.section .rodata
 	.align 2, 0
 
+gUnknown_0859F4E8:: @ 859F4E8
+    .2byte 0x00
+	.2byte 0x4000 
+	.2byte 0x00
+	.2byte 0x00
+
+gUnknown_0859F4F0:: @ 859F4F0
+    obj_image_anim_frame 0x00, 0x00
+	obj_image_anim_end
+
+gUnknown_0859F4F8:: @ 859F4F8
+    obj_image_anim_frame 0x04, 0x00
+	obj_image_anim_end
+
+gUnknown_0859F500:: @ 859F500
+    obj_image_anim_frame 0x00, 0x40
+	obj_image_anim_end
+
+gUnknown_0859F508:: @ 859F508
+    .4byte gUnknown_0859F4F0
+    .4byte gUnknown_0859F4F8
+    .4byte gUnknown_0859F500
+	
 gUnknown_0859F514:: @ 859F514
-	.incbin "baserom.gba", 0x59f514, 0x8
+	.4byte gBagSwapLineGfx, 0x6D0100
 
 gUnknown_0859F51C:: @ 859F51C
-	.incbin "baserom.gba", 0x59f51c, 0x8
+	.4byte gBagSwapLinePal, 0x6D
 
 gUnknown_0859F524:: @ 859F524
-	.incbin "baserom.gba", 0x59f524, 0x18
+	spr_template 0x6D, 0x6D, gUnknown_0859F4E8, gUnknown_0859F508, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/menu_indicators.s b/data/menu_indicators.s
index 43fc0e139..24353b157 100644
--- a/data/menu_indicators.s
+++ b/data/menu_indicators.s
@@ -4,10 +4,41 @@
 	.section .rodata
 
 gUnknown_086141FC:: @ 86141FC
-	.incbin "baserom.gba", 0x6141fc, 0x48
+	.byte 0, 2, 8, 0
+	.byte 1, 2, -8, -1
+	.byte 18, 2, 8, 0
+	.byte 19, 2, -8, -1
+	
+gUnknown_0861420C:: @ 861420C
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08614214:: @ 8614214
+	obj_image_anim_frame 0, 30
+	obj_image_anim_end
+	
+gUnknown_0861421C:: @ 861421C
+	obj_image_anim_frame 0, 0x5e
+	obj_image_anim_end
+	
+gUnknown_08614224:: @ 8614224
+	obj_image_anim_frame 4, 30
+	obj_image_anim_end
+	
+gUnknown_0861422C:: @ 861422C
+	obj_image_anim_frame 4, 0x9e
+	obj_image_anim_end
+	
+gUnknown_08614234:: @ 8614234
+	.4byte gUnknown_08614214
+	.4byte gUnknown_0861421C
+	.4byte gUnknown_08614224
+	.4byte gUnknown_0861422C
 
 gUnknown_08614244:: @ 8614244
-	.incbin "baserom.gba", 0x614244, 0x18
+	spr_template 0, 0, gUnknown_0861420C, gUnknown_08614234, NULL, gDummySpriteAffineAnimTable, sub_81AF264
 
 gUnknown_0861425C:: @ 861425C
 	.4byte 0x00000000
@@ -34,19 +65,29 @@ gUnknown_08614278:: @ 8614278
 	.4byte 0x00700000
 
 gUnknown_0861427C:: @ 861427C
-	.incbin "baserom.gba", 0x61427C, 0x14
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+
+gUnknown_08614284:: @ 8614284
+	obj_image_anim_frame 0, 30
+	obj_image_anim_end
+	
+gUnknown_0861428C:: @ 861428C
+	.4byte gUnknown_08614284
 
 gUnknown_08614290:: @ 8614290
-	.incbin "baserom.gba", 0x614290, 0x18
+	spr_template 0, 0, gUnknown_0861427C, gUnknown_0861428C, NULL, gDummySpriteAffineAnimTable, ObjectCB_RedArrowCursor
 
 gUnknown_086142A8:: @ 86142A8
-	.incbin "baserom.gba", 0x6142a8, 0x20
+	.incbin "graphics/interface/red_arrow.gbapal"
 
 gUnknown_086142C8:: @ 86142C8
-	.incbin "baserom.gba", 0x6142c8, 0x70
+	.incbin "graphics/interface/red_arrow_other.4bpp.lz"
 
 gUnknown_08614338:: @ 8614338
-	.incbin "baserom.gba", 0x614338, 0x40
+	.incbin "graphics/interface/selector_outline.4bpp.lz"
 
 gUnknown_08614378:: @ 8614378
-	.incbin "baserom.gba", 0x614378, 0x44
+	.incbin "graphics/interface/red_arrow.4bpp.lz"
diff --git a/data/mon_markings.s b/data/mon_markings.s
index 795b8d8a6..7d30c0012 100644
--- a/data/mon_markings.s
+++ b/data/mon_markings.s
@@ -5,25 +5,153 @@
 	.align 2, 0
 
 gUnknown_0859E65C:: @ 859E65C
-	.incbin "baserom.gba", 0x59e65c, 0x20
+	.incbin "graphics/misc/mon_markings.gbapal"
 
 gUnknown_0859E67C:: @ 859E67C
-	.incbin "baserom.gba", 0x59e67c, 0x800
+	.incbin "graphics/misc/mon_markings.4bpp"
 
 gUnknown_0859EE7C:: @ 859EE7C
-	.incbin "baserom.gba", 0x59ee7c, 0x8
+	.2byte 0, 0xC000, 0, 0
 
 gUnknown_0859EE84:: @ 859EE84
-	.incbin "baserom.gba", 0x59ee84, 0x58
+	.2byte 0, 0, 0, 0
+	
+gUnknown_0859EE8C:: @ 859EE8C
+	.2byte 0, 5, -1, 0
+	
+gUnknown_0859EE94:: @ 859EE94
+	.2byte 1, 5, -1, 0
+	
+gUnknown_0859EE9C:: @ 859EE9C
+	.2byte 2, 5, -1, 0
+	
+gUnknown_0859EEA4:: @ 859EEA4
+	.2byte 3, 5, -1, 0
+	
+gUnknown_0859EEAC:: @ 859EEAC
+	.2byte 4, 5, -1, 0
+	
+gUnknown_0859EEB4:: @ 859EEB4
+	.2byte 5, 5, -1, 0
+	
+gUnknown_0859EEBC:: @ 859EEBC
+	.2byte 6, 5, -1, 0
+	
+gUnknown_0859EEC4:: @ 859EEC4
+	.2byte 7, 5, -1, 0
+	
+gUnknown_0859EECC:: @ 859EECC
+	.2byte 8, 5, -1, 0
+	
+gUnknown_0859EED4:: @ 859EED4
+	.2byte 9, 5, -1, 0
 
 gUnknown_0859EEDC:: @ 859EEDC
-	.incbin "baserom.gba", 0x59eedc, 0x38
+	.4byte gUnknown_0859EE8C
+	.4byte gUnknown_0859EE94
+	.4byte gUnknown_0859EE9C
+	.4byte gUnknown_0859EEA4
+	.4byte gUnknown_0859EEAC
+	.4byte gUnknown_0859EEB4
+	.4byte gUnknown_0859EEBC
+	.4byte gUnknown_0859EEC4
+	.4byte gUnknown_0859EECC
+	.4byte gUnknown_0859EED4
 
+gUnknown_0859EF04:: @ 859EF04
+	.2byte 0, 5, -1, 0
+	
+gUnknown_0859EF0C:: @ 859EF0C
+	.2byte 64, 5, -1, 0
+	
 gUnknown_0859EF14:: @ 859EF14
-	.incbin "baserom.gba", 0x59ef14, 0x8
+	.4byte gUnknown_0859EF04
+	.4byte gUnknown_0859EF0C
 
 gUnknown_0859EF1C:: @ 859EF1C
-	.incbin "baserom.gba", 0x59ef1c, 0x88
+	.2byte 0x4000
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+
+gUnknown_0859EF24:: @ 859EF24
+	obj_image_anim_frame 0, 5
+	obj_image_anim_end
+
+gUnknown_0859EF2C:: @ 859EF2C
+	obj_image_anim_frame 4, 5
+	obj_image_anim_end
+
+gUnknown_0859EF34:: @ 859EF34
+	obj_image_anim_frame 8, 5
+	obj_image_anim_end
+
+gUnknown_0859EF3C:: @ 859EF3C
+	obj_image_anim_frame 12, 5
+	obj_image_anim_end
+
+gUnknown_0859EF44:: @ 859EF44
+	obj_image_anim_frame 16, 5
+	obj_image_anim_end
+
+gUnknown_0859EF4C:: @ 859EF4C
+	obj_image_anim_frame 20, 5
+	obj_image_anim_end
+
+gUnknown_0859EF54:: @ 859EF54
+	obj_image_anim_frame 24, 5
+	obj_image_anim_end
+
+gUnknown_0859EF5C:: @ 859EF5C
+	obj_image_anim_frame 28, 5
+	obj_image_anim_end
+
+gUnknown_0859EF64:: @ 859EF64
+	obj_image_anim_frame 32, 5
+	obj_image_anim_end
+
+gUnknown_0859EF6C:: @ 859EF6C
+	obj_image_anim_frame 36, 5
+	obj_image_anim_end
+
+gUnknown_0859EF74:: @ 859EF74
+	obj_image_anim_frame 40, 5
+	obj_image_anim_end
+
+gUnknown_0859EF7C:: @ 859EF7C
+	obj_image_anim_frame 44, 5
+	obj_image_anim_end
+
+gUnknown_0859EF84:: @ 859EF84
+	obj_image_anim_frame 48, 5
+	obj_image_anim_end
+
+gUnknown_0859EF8C:: @ 859EF8C
+	obj_image_anim_frame 52, 5
+	obj_image_anim_end
+
+gUnknown_0859EF94:: @ 859EF94
+	obj_image_anim_frame 56, 5
+	obj_image_anim_end
+
+gUnknown_0859EF9C:: @ 859EF9C
+	obj_image_anim_frame 60, 5
+	obj_image_anim_end
 
 gUnknown_0859EFA4:: @ 859EFA4
-	.incbin "baserom.gba", 0x59efa4, 0x40
+	.4byte gUnknown_0859EF24
+	.4byte gUnknown_0859EF2C
+	.4byte gUnknown_0859EF34
+	.4byte gUnknown_0859EF3C
+	.4byte gUnknown_0859EF44
+	.4byte gUnknown_0859EF4C
+	.4byte gUnknown_0859EF54
+	.4byte gUnknown_0859EF5C
+	.4byte gUnknown_0859EF64
+	.4byte gUnknown_0859EF6C
+	.4byte gUnknown_0859EF74
+	.4byte gUnknown_0859EF7C
+	.4byte gUnknown_0859EF84
+	.4byte gUnknown_0859EF8C
+	.4byte gUnknown_0859EF94
+	.4byte gUnknown_0859EF9C
diff --git a/data/mystery_event_menu.s b/data/mystery_event_menu.s
index 1dbe2d580..bb8330497 100644
--- a/data/mystery_event_menu.s
+++ b/data/mystery_event_menu.s
@@ -4,7 +4,9 @@
 	.section .rodata
 
 gUnknown_085EFD64:: @ 85EFD64
-	.incbin "baserom.gba", 0x5efd64, 0x4
+	.4byte 0x1F8
 
 gUnknown_085EFD68:: @ 85EFD68
-	.incbin "baserom.gba", 0x5efd68, 0x18
+	window_template 0, 4, 15, 22, 4, 14, 20
+	window_template 0, 7, 6, 16, 4, 14, 0x6C
+	null_window_template
diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s
index e5525477d..68267a5e3 100644
--- a/data/mystery_event_msg.s
+++ b/data/mystery_event_msg.s
@@ -1,96 +1,342 @@
+#include "constants/flags.h"
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+#include "constants/vars.h"
 	.include "asm/macros.inc"
+	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
 
 	.section .rodata
-
-gText_MysteryGiftBerry:: @ 8674AE4
-	.string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$"
-
-gText_MysteryGiftBerryTransform:: @ 8674B16
-	.string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$"
-
-gText_MysteryGiftBerryObtained:: @ 8674B42
-	.string "The {STR_VAR_1} BERRY has already been\nobtained.$"
-
-gText_MysteryGiftSpecialRibbon:: @ 8674B6A
-	.string "A special RIBBON was awarded to\nyour party POKéMON.$"
-
-gText_MysteryGiftNationalDex:: @ 8674B9E
-	.string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$"
-
-gText_MysteryGiftRareWord:: @ 8674BD4
-	.string "A rare word has been added.$"
-
-gText_MysteryGiftSentOver:: @ 8674BF0
-	.string "{STR_VAR_1} was sent over!$"
-
-gText_MysteryGiftFullParty:: @ 8674C02
-	.string "Your party is full.\n{STR_VAR_1} could not be sent over.$"
-
-gText_MysteryGiftNewTrainer:: @ 8674C31
-	.string "A new TRAINER has arrived in\nHOENN.$"
-	.string "A new adversary has arrived in the\nBATTLE TOWER.$"
-
-gText_MysteryGiftCantBeUsed:: @ 8674C86
-	.string "This data can’t be used in\nthis version.$"
 	
-gUnknown_08674CAF:: @ 8674CAF
-	.incbin "baserom.gba", 0x00674caf, 0x2e
+	.align 2
 
-gText_MysteryGiftStampCard::
+MysteryEventScript_StampCard:: @ 8674CB0
+	setvaddress MysteryEventScript_StampCard
+	setorcopyvar VAR_RESULT, 1
+	specialvar VAR_0x8008, sub_813986C
+	setorcopyvar VAR_RESULT, 0
+	specialvar VAR_0x8009, sub_813986C
+	subvar VAR_0x8008, 32777
+	buffernumberstring 0, VAR_0x8008
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftStampCard
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftStampCard:
 	.string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$"
 
-gUnknown_08674D3D:: @ 8674D3D
-	.incbin "baserom.gba", 0x00674d3d, 0xa1
+MysteryEventScript_SurfPichu:: @ 8674D3D
+	setvaddress MysteryEventScript_SurfPichu
+	checkflag FLAG_MYSTERY_EVENT_DONE
+	vgoto_if 0, SurfPichu_GiveIfPossible
+	gotoram
 
-gText_MysteryGiftEgg::
+SurfPichu_GiveIfPossible: @ 8674D4C
+	specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 6
+	vgoto_if 1, SurfPichu_FullParty
+	setflag FLAG_MYSTERY_EVENT_DONE
+	vcall SurfPichu_GiveEgg
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftEgg
+	waitmessage
+	waitbuttonpress
+	playfanfare MUS_FANFA4
+	waitfanfare
+	release
+	end
+
+SurfPichu_FullParty: @ 8674D73
+	lock
+	faceplayer
+	vmessage sText_FullParty
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+SurfPichu_GiveEgg: @ 8674D7E
+	giveegg SPECIES_PICHU
+	setmonobedient VAR_EVENT_PICHU_SLOT
+	setmonmetlocation VAR_EVENT_PICHU_SLOT, 255
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
+	vgoto_if 1, SurfPichu_Slot1
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
+	vgoto_if 1, SurfPichu_Slot2
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
+	vgoto_if 1, SurfPichu_Slot3
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
+	vgoto_if 1, SurfPichu_Slot4
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
+	vgoto_if 1, SurfPichu_Slot5
+	return
+
+SurfPichu_Slot1: @ 8674DC0
+	setmonmove 1, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot2:: @ 8674DC6
+	setmonmove 2, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot3: @ 8674DCC
+	setmonmove 3, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot4: @ 8674DD2
+	setmonmove 4, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot5: @ 8674DD8
+	setmonmove 5, 2, MOVE_SURF
+	return
+
+sText_MysteryGiftEgg:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$"
+	
+sText_FullParty:
 	.string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$"
 
-gUnknown_08674EC1:: @ 8674EC1
-	.incbin "baserom.gba", 0x00674ec1, 0x29
+MysteryEventScript_VisitingTrainer:: @ 8674EC1
+	setvaddress MysteryEventScript_VisitingTrainer
+	special ValidateEReaderTrainer
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if 1, MysteryEventScript_VisitingTrainerArrived
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftVisitingTrainer
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftVisitingTrainer::
+MysteryEventScript_VisitingTrainerArrived: @ 8674EDF
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftVisitingTrainer_2
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftVisitingTrainer:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$"
+
+sText_MysteryGiftVisitingTrainer_2:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$"
 
-gUnknown_0867513C:: @ 867513C
-	.incbin "baserom.gba", 0x0067513c, 0x48
+MysteryEventScript_BattleCard:: @ 867513C
+	setvaddress MysteryEventScript_BattleCard
+	checkflag FLAG_MYSTERY_EVENT_DONE
+	vgoto_if 1, MysteryEventScript_BattleCardInfo
+	setorcopyvar VAR_RESULT, 2
+	specialvar VAR_0x8008, sub_813986C
+	compare_var_to_value VAR_0x8008, 3
+	vgoto_if 0, MysteryEventScript_BattleCardInfo
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftBattleCountCard_2
+	waitmessage
+	waitbuttonpress
+	giveitem_std ITEM_POTION
+	release
+	setflag FLAG_MYSTERY_EVENT_DONE
+	end
 
-gText_MysteryGiftBattleCountCard::
+MysteryEventScript_BattleCardInfo: @ 8675179
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftBattleCountCard
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftBattleCountCard:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$"
+	
+sText_MysteryGiftBattleCountCard_2:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$"
 
-gUnknown_0867533C:: @ 867533C
-	.incbin "baserom.gba", 0x0067533c, 0x6d
+MysteryEventScript_AuroraTicket:: @ 867533C
+	setvaddress MysteryEventScript_AuroraTicket
+	lock
+	faceplayer
+	checkflag FLAG_0x13A
+	vgoto_if 1, AuroraTicket_Obtained
+	checkflag FLAG_0x1AD
+	vgoto_if 1, AuroraTicket_Obtained
+	checkitem ITEM_AURORA_TICKET, 1
+	compare_var_to_value VAR_RESULT, 1
+	vgoto_if 1, AuroraTicket_Obtained
+	vmessage sText_AuroraTicket1
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_AURORA_TICKET, 1
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if 1, AuroraTicket_NoBagSpace
+	giveitem_std ITEM_AURORA_TICKET
+	setflag FLAG_0x8D5
+	setflag FLAG_0x13A
+	vmessage sText_AuroraTicket2
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftTicket1::
+AuroraTicket_NoBagSpace: @ 8675397
+	vmessage sText_AuroraTicketNoPlace
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+AuroraTicket_Obtained: @ 86753A0
+	vmessage sText_AuroraTicketGot
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_AuroraTicket1:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
+	
+sText_AuroraTicket2:
 	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+	
+sText_AuroraTicketGot:
 	.string "Thank you for using the MYSTERY\nGIFT System.$"
+	
+sText_AuroraTicketNoPlace:
 	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
 
-gUnknown_0867550B:: @ 867550B
-	.incbin "baserom.gba", 0x0067550b, 0x76
+MysteryEventScript_MysticTicket:: @ 867550B
+	setvaddress MysteryEventScript_MysticTicket
+	lock
+	faceplayer
+	checkflag FLAG_0x13B
+	vgoto_if 1, MysticTicket_Obtained
+	checkflag FLAG_0x091
+	vgoto_if 1, MysticTicket_Obtained
+	checkflag FLAG_0x092
+	vgoto_if 1, MysticTicket_Obtained
+	checkitem ITEM_MYSTIC_TICKET, 1
+	compare_var_to_value VAR_RESULT, 1
+	vgoto_if 1, MysticTicket_Obtained
+	vmessage sText_MysticTicket2
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_MYSTIC_TICKET, 1
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if 1, MysticTicket_NoBagSpace
+	giveitem_std ITEM_MYSTIC_TICKET
+	setflag FLAG_0x8E0
+	setflag FLAG_0x13B
+	vmessage sText_MysticTicket1
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftTicket2::
+MysticTicket_NoBagSpace: @ 867556F
+	vmessage sText_MysticTicketNoPlace
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+MysticTicket_Obtained: @ 8675578
+	vmessage sText_MysticTicketGot
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysticTicket2:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
+	
+sText_MysticTicket1:
 	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+	
+sText_MysticTicketGot:
 	.string "Thank you for using the MYSTERY\nGIFT System.$"
+	
+sText_MysticTicketNoPlace:
 	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
 
-gUnknown_086756E3:: @ 86756E3
-	.incbin "baserom.gba", 0x006756e3, 0x25
+MysteryEventScript_AlteringCave:: @ 86756E3
+	setvaddress MysteryEventScript_AlteringCave
+	addvar VAR_ALTERING_CAVE_WILD_SET, 1
+	compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
+	vgoto_if 0, MysteryEventScript_AlteringCave_
+	setvar VAR_ALTERING_CAVE_WILD_SET, 0
+MysteryEventScript_AlteringCave_: @ 86756FD
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftAlteringCave
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftAlteringCave::
+sText_MysteryGiftAlteringCave::
 	.string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$"
 
-gUnknown_086757F4:: @ 86757F4
-	.incbin "baserom.gba", 0x006757f4, 0x6d
+MysteryEventScript_OldSeaMap:: @ 86757F4
+	setvaddress MysteryEventScript_OldSeaMap
+	lock
+	faceplayer
+	checkflag FLAG_0x13C
+	vgoto_if 1, OldSeaMap_Obtained
+	checkflag FLAG_0x1CA
+	vgoto_if 1, OldSeaMap_Obtained
+	checkitem ITEM_OLD_SEA_MAP, 1
+	compare_var_to_value VAR_RESULT, 1
+	vgoto_if 1, OldSeaMap_Obtained
+	vmessage sText_MysteryGiftOldSeaMap
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_OLD_SEA_MAP, 1
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if 1, OldSeaMap_NoBagSpace
+	giveitem_std ITEM_OLD_SEA_MAP
+	setflag FLAG_0x8D6
+	setflag FLAG_0x13C
+	vmessage sText_MysteryGiftOldSeaMap_1
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftOldSeaMap::
+OldSeaMap_NoBagSpace: @ 867584F
+	vmessage sText_MysteryGiftOldSeaMap_3
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+OldSeaMap_Obtained: @ 8675858
+	vmessage sText_MysteryGiftOldSeaMap_2
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysteryGiftOldSeaMap:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$"
+
+sText_MysteryGiftOldSeaMap_1:
 	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+
+sText_MysteryGiftOldSeaMap_2:
 	.string "Thank you for using the MYSTERY\nGIFT System.$"
+
+sText_MysteryGiftOldSeaMap_3:
 	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
-	.align 2
diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s
new file mode 100644
index 000000000..867b05e07
--- /dev/null
+++ b/data/mystery_event_script_cmd_table.s
@@ -0,0 +1,22 @@
+	.section script_data, "aw", %progbits
+
+	.align 2
+gMysteryEventScriptCmdTable:: @ 82DED2C
+	.4byte MEScrCmd_nop
+	.4byte MEScrCmd_checkcompat
+	.4byte MEScrCmd_end
+	.4byte MEScrCmd_setmsg
+	.4byte MEScrCmd_setstatus
+	.4byte MEScrCmd_runscript
+	.4byte MEScrCmd_initramscript
+	.4byte MEScrCmd_setenigmaberry
+	.4byte MEScrCmd_giveribbon
+	.4byte MEScrCmd_givenationaldex
+	.4byte MEScrCmd_addrareword
+	.4byte MEScrCmd_setrecordmixinggift
+	.4byte MEScrCmd_givepokemon
+	.4byte MEScrCmd_addtrainer
+	.4byte MEScrCmd_enableresetrtc
+	.4byte MEScrCmd_checksum
+	.4byte MEScrCmd_crc
+gMysteryEventScriptCmdTableEnd::
diff --git a/data/new_menu_helpers.s b/data/new_menu_helpers.s
index 8d4e43b15..c11d73d7c 100644
--- a/data/new_menu_helpers.s
+++ b/data/new_menu_helpers.s
@@ -4,24 +4,50 @@
 	.section .rodata
 
 gUnknown_0860F074:: @ 860F074
-	.incbin "baserom.gba", 0x60f074, 0x20
+	.incbin "graphics/interface/860F074.gbapal"
 
 gUnknown_0860F094:: @ 860F094
-	.incbin "baserom.gba", 0x60f094, 0x4
+	.byte 8, 4, 1, 0
 
 gUnknown_0860F098:: @ 860F098
-	.incbin "baserom.gba", 0x60f098, 0x10
+	window_template 0, 2, 15, 27, 4, 15, 0x194
+	null_window_template
 
 gUnknown_0860F0A8:: @ 860F0A8
-	.incbin "baserom.gba", 0x60f0a8, 0x8
+	window_template 0, 21, 9, 5, 4, 15, 0x125
 
     @ These are not referenced in src/new_menu_helpers.c; rather, they are in src/menu.c.  Regardless, they were plopped here.
 
 gUnknown_0860F0B0:: @ 860F0B0
-	.incbin "baserom.gba", 0x60f0b0, 0x20
+	.incbin "graphics/interface/860F0B0.gbapal"
 
 gUnknown_0860F0D0:: @ 860F0D0
-	.incbin "baserom.gba", 0x60f0d0, 0x4
+	.byte 15, 1, 2, 0
 
 gUnknown_0860F0D4:: @ 860F0D4
-	.incbin "baserom.gba", 0x60f0d4, 0x68
+	.2byte 0xC0C, 0
+	.2byte 0xC20, 32
+	.2byte 0xC20, 100
+	.2byte 0xC20, 0x60
+	.2byte 0xC20, 0x80
+	.2byte 0xC20, 0x48
+	.2byte 0xC20, 0x44
+	.2byte 0xC20, 0x6C
+	.2byte 0xC20, 0x68
+	.2byte 0xC20, 0x88
+	.2byte 0xC20, 0xA4
+	.2byte 0xC20, 0x24
+	.2byte 0xC20, 0x28
+	.2byte 0xC20, 0x2C
+	.2byte 0xC20, 0x40
+	.2byte 0xC20, 0x84
+	.2byte 0xC20, 0x4C
+	.2byte 0xC20, 0xA0
+	.2byte 0xC20, 0x8C
+	.2byte 0xC2A, 0xA8
+	.2byte 0xC2A, 0xC0
+	.2byte 0xC2A, 0xC8
+	.2byte 0xC2A, 0xE0
+	.2byte 0xC2A, 0xE8
+	.2byte 0x808, 0xAE
+	.2byte 0x808, 0xAF
diff --git a/data/option_menu.s b/data/option_menu.s
deleted file mode 100644
index 05db7fddf..000000000
--- a/data/option_menu.s
+++ /dev/null
@@ -1,20 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0855C604:: @ 855C604
-	.incbin "baserom.gba", 0x55c604, 0x60
-
-gUnknown_0855C664:: @ 855C664
-	.incbin "baserom.gba", 0x55c664, 0x1c
-
-gUnknown_0855C680:: @ 855C680
-	.incbin "baserom.gba", 0x55c680, 0x18
-
-gUnknown_0855C698:: @ 855C698
-	.incbin "baserom.gba", 0x55c698, 0x8
-
-gUnknown_0855C6A0:: @ 855C6A0
-	.incbin "baserom.gba", 0x55c6a0, 0x4
diff --git a/data/overworld.s b/data/overworld.s
index 890829cd9..186af6f44 100644
--- a/data/overworld.s
+++ b/data/overworld.s
@@ -4,22 +4,49 @@
     .section .rodata
     .align 2, 0
 gUnknown_08339D3C:: @ 8339D3C
-	.incbin "baserom.gba", 0x339d3c, 0x28
+	.4byte 0xFFFFFF, 0xFFFFFFFF, 0x4B0, 0xE10, 0x4B0, 0x960, 0x32, 0x50, 0xFFFFFFD4, 0x2C
 
 gUnknown_08339D64:: @ 8339D64
-	.incbin "baserom.gba", 0x339d64, 0x48
+	.4byte 0, 0
+	.4byte 0, 1
+	.4byte 0, -1
+	.4byte -1, 0
+	.4byte 1, 0
+	.4byte -1, 1
+	.4byte 1, 1
+	.4byte -1, -1
+	.4byte 1, -1
 
 gUnknown_08339DAC:: @ 8339DAC
-	.incbin "baserom.gba", 0x339dac, 0x10
+	.4byte 0x1F8
+	.4byte 0x11D1
+	.4byte 0x21C2
+	.4byte 0x31E3
 
 gUnknown_08339DBC:: @ 8339DBC
-	.incbin "baserom.gba", 0x339dbc, 0xc
+	.4byte REG_WIN0H
+	.4byte 0xa2600001
+	.byte 1, 0
 
+	.align 2
 gUnknown_08339DC8:: @ 8339DC8
-	.incbin "baserom.gba", 0x339dc8, 0xc
+	.4byte sub_80879D8
+	.4byte sub_80879F8
+	.4byte sub_80879FC
 
 gUnknown_08339DD4:: @ 8339DD4
-	.incbin "baserom.gba", 0x339dd4, 0x2c
+	.4byte sub_8087A1C
+	.4byte sub_8087A20
+	.4byte sub_8087A20
+	.4byte sub_8087A20
+	.4byte sub_8087A20
+	.4byte sub_8087A1C
+	.4byte sub_8087A1C
+	.4byte sub_8087A88
+	.4byte sub_8087A88
+	.4byte sub_8087A88
+	.4byte sub_8087A88
 
 gUnknown_08339E00:: @ 8339E00
-	.incbin "baserom.gba", 0x339e00, 0x8
+	.4byte sub_8087AA0
+	.4byte sub_8087AA8
diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s
index 2f5bbeb3d..85c30bc6f 100644
--- a/data/pokemon_summary_screen.s
+++ b/data/pokemon_summary_screen.s
@@ -263,7 +263,7 @@ gSpriteAnimTable_861CF60:: @ 861CF60
 
 	.align 2
 gUnknown_0861CFBC:: @ 861CFBC
-	obj_tiles 0x08d971b0, 0x1700, 0x7532
+	obj_tiles gMoveTypes_Gfx, 0x1700, 0x7532
 
 	.align 2
 gUnknown_0861CFC4:: @ 861CFC4
diff --git a/data/record_mixing.s b/data/record_mixing.s
index 0ef0a776a..20a37145c 100644
--- a/data/record_mixing.s
+++ b/data/record_mixing.s
@@ -5,16 +5,33 @@
 	.align 2, 0
 
 gUnknown_0858CF8C:: @ 858CF8C
-	.incbin "baserom.gba", 0x58cf8c, 0x2
+	.byte 1, 0
 
 gUnknown_0858CF8E:: @ 858CF8E
-	.incbin "baserom.gba", 0x58cf8e, 0x6
+	.byte 1, 2, 0
+	.byte 2, 0, 1
 
 gUnknown_0858CF94:: @ 858CF94
-	.incbin "baserom.gba", 0x58cf94, 0x24
+	.byte 1, 0, 3
+	.byte 2, 3, 0
+	.byte 1, 2, 2
+	.byte 0, 3, 1
+	.byte 1, 3, 0
+	.byte 2, 2, 3
+	.byte 0, 1, 3
+	.byte 2, 0, 1
+	.byte 1, 2, 3
+	.byte 0, 2, 3
+	.byte 1, 0, 3
+	.byte 2, 1, 0
 
 gUnknown_0858CFB8:: @ 858CFB8
-	.incbin "baserom.gba", 0x58cfb8, 0x6
+	.byte 0, 1
+	.byte 1, 2
+	.byte 2, 0
 
 gUnknown_0858CFBE:: @ 858CFBE
-	.incbin "baserom.gba", 0x58cfbe, 0xe
+	.byte 0, 1, 2, 3
+	.byte 0, 2, 1, 3
+	.byte 0, 3, 2, 1
+	.byte 0, 0
diff --git a/data/script_funcs.s b/data/script_funcs.s
deleted file mode 100644
index 276807fa5..000000000
--- a/data/script_funcs.s
+++ /dev/null
@@ -1,21 +0,0 @@
-	.section script_data, "aw", %progbits
-
-	.align 2
-gUnknown_082DED2C:: @ 82DED2C
-	.4byte sub_8153A80
-	.4byte sub_8153A30
-	.4byte script_status_stop_and_ret_1
-	.4byte sub_8153A94
-	.4byte sub_8153A84
-	.4byte sub_8153ACC
-	.4byte sub_8153BE4
-	.4byte sub_8153AE8
-	.4byte sub_8153BB0
-	.4byte sub_8153C4C
-	.4byte sub_8153C70
-	.4byte sub_8153C9C
-	.4byte sub_8153CC8
-	.4byte sub_8153DD4
-	.4byte sub_8153E1C
-	.4byte sub_8153E40
-	.4byte sub_8153E88
diff --git a/data/script_menu.s b/data/script_menu.s
index ff9fc3871..dbfb05621 100644
--- a/data/script_menu.s
+++ b/data/script_menu.s
@@ -578,7 +578,7 @@ gUnknown_0858B758:: @ 58B758
 
 
 gUnknown_0858B760:: @ 858B760
-	.4byte 0x0858abd8, 3
+	.4byte gUnknown_0858ABD8, 3
 	.4byte gUnknown_0858B758, 1
 	.4byte gUnknown_0858ABF0, 3
 	.4byte gUnknown_0858AC08, 4
@@ -745,19 +745,36 @@ gUnknown_0858BB80:: @ 858BB80
 	.4byte gText_Exit
 
 gUnknown_0858BB9C:: @ 858BB9C
-	.incbin "baserom.gba", 0x58bb9c, 0x10
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F96
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBAC:: @ 858BBAC
-	.incbin "baserom.gba", 0x58bbac, 0x10
+	.4byte OldaleTown_PokemonCenter_2F_Text_27879F
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
+	.4byte OldaleTown_PokemonCenter_2F_Text_278831
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBBC:: @ 858BBBC
-	.incbin "baserom.gba", 0x58bbbc, 0x10
+	.4byte OldaleTown_PokemonCenter_2F_Text_27879F
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBCC:: @ 858BBCC
-	.incbin "baserom.gba", 0x58bbcc, 0x14
+	.4byte OldaleTown_PokemonCenter_2F_Text_27879F
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
+	.4byte OldaleTown_PokemonCenter_2F_Text_278831
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBE0:: @ 858BBE0
-	.incbin "baserom.gba", 0x58bbe0, 0xc
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBEC:: @ 858BBEC
-	.incbin "baserom.gba", 0x58bbec, 0xc
+	.4byte OldaleTown_PokemonCenter_2F_Text_27879F
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 0cf3dedd1..b8aef7c3d 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1648,15 +1648,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1
 	.string "Which of our services do you wish\n"
 	.string "to use?$"
 
-OldaleTown_PokemonCenter_2F_Text_277F1B: @ 8277F1B
+OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B
 	.string "Trade POKéMON with another player\n"
 	.string "using a GBA Game Link cable.$"
 
-OldaleTown_PokemonCenter_2F_Text_277F5A: @ 8277F5A
+OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A
 	.string "You may battle another TRAINER\n"
 	.string "using a GBA Game Link cable.$"
 
-OldaleTown_PokemonCenter_2F_Text_277F96: @ 8277F96
+OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96
 	.string "You can use the RECORD CORNER with\n"
 	.string "others using a GBA Game Link cable.$"
 
@@ -1826,19 +1826,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B
 OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792
 	.string "Please wait.$"
 
-OldaleTown_PokemonCenter_2F_Text_27879F: @ 827879F
+OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F
 	.string "You may trade your POKéMON here\n"
 	.string "with another TRAINER.$"
 
-OldaleTown_PokemonCenter_2F_Text_2787D5: @ 82787D5
+OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5
 	.string "You may battle with your friends\n"
 	.string "here.$"
 
-OldaleTown_PokemonCenter_2F_Text_2787FC: @ 82787FC
+OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC
 	.string "Two to five TRAINERS can make\n"
 	.string "BERRY POWDER together.$"
 
-OldaleTown_PokemonCenter_2F_Text_278831: @ 8278831
+OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831
 	.string "The records of two to four players\n"
 	.string "can be mixed together.$"
 
@@ -1846,7 +1846,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
 	.string "A guide to the WIRELESS CLUB’s\n"
 	.string "various services.$"
 
-OldaleTown_PokemonCenter_2F_Text_27889C: @ 827889C
+OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C
 	.string "Cancels the selected MENU item.$"
 
 OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 060531c97..627ae904c 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -393,7 +393,7 @@ PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE
 	checkpcitem ITEM_ENIGMA_BERRY, 1
 	compare VAR_RESULT, 1
 	goto_eq PetalburgCity_Gym_EventScript_204E17
-	compare VAR_0x402D, 0
+	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
 	goto_eq PetalburgCity_Gym_EventScript_204E17
 	msgbox PetalburgCity_Gym_Text_2A6D3D, 4
 	setvar VAR_RESULT, 1
@@ -407,7 +407,7 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D
 	giveitem_std ITEM_ENIGMA_BERRY
 	compare VAR_RESULT, 0
 	goto_eq PetalburgCity_Gym_EventScript_272054
-	setvar VAR_0x402D, 0
+	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
 	release
 	end
 
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 327c0cbc6..2e00ee702 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -300,10 +300,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "in hearing my epic tales of legendary\l"
 	.string "TRAINERS.$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E930:: @ 828E930
 	.string "The Save-Happy TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E947:: @ 828E947
 	.string "Saved the game$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER saved the game\n"
@@ -311,10 +314,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "A more cautious TRAINER than\n"
 	.string "{STR_VAR_3} one will never find!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E9D7:: @ 828E9D7
 	.string "The Trendsetter TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E9EF:: @ 828E9EF
 	.string "Started trends$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER started new trends\n"
@@ -322,10 +328,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is setting trends for all\n"
 	.string "the HOENN region!$"
 
-	.string "The BERRY-Planting TRAINER$"
+MauvilleCity_PokemonCenter_1F_Text_28EA7D:: @ 828EA7D
+    .string "The BERRY-Planting TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EA98:: @ 828EA98
 	.string "Planted BERRIES$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER planted BERRIES\n"
@@ -333,10 +342,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a legendary lover of\n"
 	.string "BERRIES!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EB19:: @ 828EB19
 	.string "The BIKE-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EB31:: @ 828EB31
 	.string "Traded BIKES$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER swapped BIKES\n"
@@ -344,10 +356,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must love BIKES deeply\n"
 	.string "and passionately!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EBB5:: @ 828EBB5
 	.string "The Interviewed TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EBCD:: @ 828EBCD
 	.string "Got interviewed$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got interviewed\n"
@@ -355,20 +370,26 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a TRAINER who’s\n"
 	.string "attracting much attention!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EC60:: @ 828EC60
 	.string "The Battle-Happy TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EC79:: @ 828EC79
 	.string "Battled$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EC81:: @ 828EC81
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER battled {STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must be a TRAINER who can\n"
 	.string "never refuse a chance to battle!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28ED04:: @ 828ED04
 	.string "The POKéMON-Catching TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28ED21:: @ 828ED21
 	.string "Caught POKéMON$"
 
+MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -376,10 +397,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a legendary catcher of\n"
 	.string "wild POKéMON!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EDA1:: @ 828EDA1
 	.string "The Fishing TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EDB5:: @ 828EDB5
 	.string "Caught POKéMON with a ROD$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -387,10 +411,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a legendary fishing\n"
 	.string "expert!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EE45:: @ 828EE45
 	.string "The EGG-Warming TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EE5D:: @ 828EE5D
 	.string "Hatched EGGS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER hatched {STR_VAR_1} POKéMON\n"
@@ -398,10 +425,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a legendary warmer\n"
 	.string "of EGGS!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EEDD:: @ 828EEDD
 	.string "The Evolver TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EEF1:: @ 828EEF1
 	.string "Evolved POKéMON$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {STR_VAR_1} POKéMON\n"
@@ -409,10 +439,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is the ultimate evolver\n"
 	.string "of POKéMON!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EF73:: @ 828EF73
 	.string "The POKéMON CENTER-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EF95:: @ 828EF95
 	.string "Used POKéMON CENTERS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -420,10 +453,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "There could be no greater lover of\n"
 	.string "POKéMON CENTERS than {STR_VAR_3}!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F045:: @ 828F045
 	.string "The Homebody TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F05A:: @ 828F05A
 	.string "Rested POKéMON at home$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -431,10 +467,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "There could be no more of a homebody\n"
 	.string "than {STR_VAR_3}!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F0F3:: @ 828F0F3
 	.string "The SAFARI-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F10D:: @ 828F10D
 	.string "Entered the SAFARI ZONE$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER went into the SAFARI ZONE\n"
@@ -442,10 +481,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER whose wild side\n"
 	.string "must come out in the SAFARI ZONE!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F1BE:: @ 828F1BE
 	.string "The CUT-Frenzy TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F1D5:: @ 828F1D5
 	.string "Used CUT$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used CUT\n"
@@ -453,10 +495,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who just must\n"
 	.string "love to CUT!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F24F:: @ 828F24F
 	.string "The ROCK-SMASHING TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F269:: @ 828F269
 	.string "Smashed rocks$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used ROCK SMASH\n"
@@ -464,10 +509,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "can’t leave a stone unsmashed!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F2FC:: @ 828F2FC
 	.string "The Move-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F314:: @ 828F314
 	.string "Moved the SECRET BASE$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER moved the SECRET BASE\n"
@@ -475,10 +523,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who loves\n"
 	.string "to move houses often!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F3AD:: @ 828F3AD
 	.string "The SPLASH-Happy TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F3C6:: @ 828F3C6
 	.string "Used SPLASH$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used SPLASH\n"
@@ -486,10 +537,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who must love\n"
 	.string "SPLASHING around!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F44B:: @ 828F44B
 	.string "The Tenacious TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F461:: @ 828F461
 	.string "Resorted to using STRUGGLE$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER had to rely on STRUGGLE\n"
@@ -497,10 +551,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a tenacious TRAINER\n"
 	.string "who never gives in to adversity!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F50C:: @ 828F50C
 	.string "The SLOT Champ$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F51B:: @ 828F51B
 	.string "Won the jackpot on the SLOTS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won the jackpot on\n"
@@ -508,10 +565,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who was lucky\n"
 	.string "on the SLOTS!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F5BE:: @ 828F5BE
 	.string "The ROULETTE Champ$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F5D1:: @ 828F5D1
 	.string "Had consecutive ROULETTE wins of$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won in ROULETTE\n"
@@ -519,10 +579,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} was lucky when the ball\n"
 	.string "bounced in ROULETTE!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F678:: @ 828F678
 	.string "The BATTLE TOWER Challenger$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F694:: @ 828F694
 	.string "Took the BATTLE TOWER challenge$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER took the BATTLE TOWER\n"
@@ -530,10 +593,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who aspires\n"
 	.string "for excellence in the BATTLE TOWER!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F751:: @ 828F751
 	.string "The Blend-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F76A:: @ 828F76A
 	.string "Made {POKEBLOCK}S$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {POKEBLOCK}S\n"
@@ -541,10 +607,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "There is none better at using a BERRY\n"
 	.string "BLENDER than {STR_VAR_3}!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F7F6:: @ 828F7F6
 	.string "The CONTEST-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F811:: @ 828F811
 	.string "Entered CONTESTS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER entered CONTESTS\n"
@@ -552,10 +621,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must love showing off\n"
 	.string "POKéMON to others!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F89C:: @ 828F89C
 	.string "The CONTEST Master$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F8AF:: @ 828F8AF
 	.string "Won CONTESTS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won CONTESTS\n"
@@ -563,10 +635,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be an incredible\n"
 	.string "CONTEST master!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F92F:: @ 828F92F
 	.string "The Happy Shopper$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F941:: @ 828F941
 	.string "Shopped$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bought items in shops\n"
@@ -574,10 +649,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be one of those\n"
 	.string "people who are born to shop.$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F9D1:: @ 828F9D1
 	.string "The Item-Finding TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F9EA:: @ 828F9EA
 	.string "Used an ITEMFINDER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used an ITEMFINDER\n"
@@ -585,10 +663,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must enjoy scouring the\n"
 	.string "ground for hidden items!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FA81:: @ 828FA81
 	.string "The Rain-Soaked TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FA99:: @ 828FA99
 	.string "Got rained on$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got soaked by rain\n"
@@ -596,10 +677,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3}’s charisma must even\n"
 	.string "attract rain!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FB1D:: @ 828FB1D
 	.string "The Avid POKéDEX Reader$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FB35:: @ 828FB35
 	.string "Checked a POKéDEX$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked a POKéDEX\n"
@@ -607,10 +691,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must love inspecting\n"
 	.string "POKéMON in a POKéDEX!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FBC4:: @ 828FBC4
 	.string "The RIBBON Collector$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FBD9:: @ 828FBD9
 	.string "Received RIBBONS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER received RIBBONS\n"
@@ -618,10 +705,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "loves to collect RIBBONS!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FC6B:: @ 828FC6B
 	.string "The Ledge-Jumping TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FC85:: @ 828FC85
 	.string "Jumped down ledges$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER jumped down ledges\n"
@@ -629,20 +719,26 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "If there’s a ledge to be jumped,\n"
 	.string "{STR_VAR_3} can’t ignore it!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FD1D:: @ 828FD1D
 	.string "The Legendary TV Viewer$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FD35:: @ 828FD35
 	.string "Watched TV$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FD40:: @ 828FD40
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER watched TV\n"
 	.string "{STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must love watching TV!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FDA2:: @ 828FDA2
 	.string "The Time-Conscious TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FDBD:: @ 828FDBD
 	.string "Checked the time$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked the time\n"
@@ -650,10 +746,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a punctual TRAINER\n"
 	.string "who’s conscious of the time.$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FE57:: @ 828FE57
 	.string "The POKéMON LOTTERY Wizard$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FE72:: @ 828FE72
 	.string "Won POKéMON LOTTERIES$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won POKéMON LOTTERIES\n"
@@ -661,10 +760,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must have many friends\n"
 	.string "to trade POKéMON with!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FF0C:: @ 828FF0C
 	.string "The DAY CARE-Using Trainer$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FF27:: @ 828FF27
 	.string "Left POKéMON at the DAY CARE$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER left POKéMON with the\n"
@@ -672,10 +774,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a real go-getter\n"
 	.string "who raises POKéMON aggressively!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FFDD:: @ 828FFDD
 	.string "The CABLE CAR-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FFFA:: @ 828FFFA
 	.string "Rode the CABLE CAR$"
 
+MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER rode the CABLE CAR\n"
@@ -683,10 +788,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a busy TRAINER\n"
 	.string "who’s up and down all the time!$"
 
+MauvilleCity_PokemonCenter_1F_Text_290097:: @ 8290097
 	.string "The Hot Spring-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_2900B5:: @ 82900B5
 	.string "Bathed in hot springs$"
 
+MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bathed in hot springs\n"
@@ -694,6 +802,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a TRAINER with\n"
 	.string "baby-smooth skin!$"
 
+
 MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A
 	lock
 	faceplayer
diff --git a/data/specials.inc b/data/specials.inc
index c07293c6c..ac4a47b69 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -1,4 +1,5 @@
 .macro def_special ptr
+.global SPECIAL_\ptr
 .set SPECIAL_\ptr, __special__
 .set __special__, __special__ + 1
 	.4byte \ptr
@@ -256,7 +257,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_81B9B80
 	def_special sub_81B9D08
 	def_special sub_80F9490
-	def_special sub_81652B4
+	def_special ValidateEReaderTrainer
 	def_special sub_8139228
 	def_special sub_80F94E8
 	def_special sub_816AE58
@@ -272,7 +273,7 @@ gSpecials:: @ 81DBA64
 	def_special ShowBerryBlenderRecordWindow
 	def_special ResetTrickHouseEndRoomFlag
 	def_special SetTrickHouseEndRoomFlag
-	def_special sp109_CreatePCMenu
+	def_special ScrSpecial_CreatePCMenu
 	def_special AccessHallOfFamePC
 	def_special Special_ShowDiploma
 	def_special CheckLeadMonCool
diff --git a/data/strings.s b/data/strings.s
index 360f26711..75b430dd1 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -4379,25 +4379,25 @@ gText_ABtnTitleScreen:: @ 85EE572
 gText_Option:: @ 85EE589
 	.string "OPTION$"
 
-gUnknown_085EE590:: @ 85EE590
+gText_TextSpeed:: @ 85EE590
 	.string "TEXT SPEED$"
 
-gUnknown_085EE59B:: @ 85EE59B
+gText_BattleScene:: @ 85EE59B
 	.string "BATTLE SCENE$"
 
-gUnknown_085EE5A8:: @ 85EE5A8
+gText_BattleStyle:: @ 85EE5A8
 	.string "BATTLE STYLE$"
 
-gUnknown_085EE5B5:: @ 85EE5B5
+gText_Sound:: @ 85EE5B5
 	.string "SOUND$"
 
-gUnknown_085EE5BB:: @ 85EE5BB
+gText_Frame:: @ 85EE5BB
 	.string "FRAME$"
 
-gUnknown_085EE5C1:: @ 85EE5C1
+gText_OptionMenuCancel:: @ 85EE5C1
 	.string "CANCEL$"
 
-gUnknown_085EE5C8:: @ 85EE5C8
+gText_ButtonMode:: @ 85EE5C8
 	.string "BUTTON MODE$"
 
 gText_TextSpeedSlow:: @ 85EE5D4
diff --git a/data/text_window.s b/data/text_window.s
deleted file mode 100644
index 8acbe5a25..000000000
--- a/data/text_window.s
+++ /dev/null
@@ -1,196 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gTextWindowFrame1_Gfx:: @ 850E87C
-	.incbin "graphics/text_window/1.4bpp"
-
-	.align 2
-gTextWindowFrame2_Gfx:: @ 850E99C
-	.incbin "graphics/text_window/2.4bpp"
-
-	.align 2
-gTextWindowFrame3_Gfx:: @ 850EABC
-	.incbin "graphics/text_window/3.4bpp"
-
-	.align 2
-gTextWindowFrame4_Gfx:: @ 850EBDC
-	.incbin "graphics/text_window/4.4bpp"
-
-	.align 2
-gTextWindowFrame5_Gfx:: @ 850ECFC
-	.incbin "graphics/text_window/5.4bpp"
-
-	.align 2
-gTextWindowFrame6_Gfx:: @ 850EE1C
-	.incbin "graphics/text_window/6.4bpp"
-
-	.align 2
-gTextWindowFrame7_Gfx:: @ 850EF3C
-	.incbin "graphics/text_window/7.4bpp"
-
-	.align 2
-gTextWindowFrame8_Gfx:: @ 850F05C
-	.incbin "graphics/text_window/8.4bpp"
-
-	.align 2
-gTextWindowFrame9_Gfx:: @ 850F17C
-	.incbin "graphics/text_window/9.4bpp"
-
-	.align 2
-gTextWindowFrame10_Gfx:: @ 850F29C
-	.incbin "graphics/text_window/10.4bpp"
-
-	.align 2
-gTextWindowFrame11_Gfx:: @ 850F3BC
-	.incbin "graphics/text_window/11.4bpp"
-
-	.align 2
-gTextWindowFrame12_Gfx:: @ 850F4DC
-	.incbin "graphics/text_window/12.4bpp"
-
-	.align 2
-gTextWindowFrame13_Gfx:: @ 850F5FC
-	.incbin "graphics/text_window/13.4bpp"
-
-	.align 2
-gTextWindowFrame14_Gfx:: @ 850F71C
-	.incbin "graphics/text_window/14.4bpp"
-
-	.align 2
-gTextWindowFrame15_Gfx:: @ 850F83C
-	.incbin "graphics/text_window/15.4bpp"
-
-	.align 2
-gTextWindowFrame16_Gfx:: @ 850F95C
-	.incbin "graphics/text_window/16.4bpp"
-
-	.align 2
-gTextWindowFrame17_Gfx:: @ 850FA7C
-	.incbin "graphics/text_window/17.4bpp"
-
-	.align 2
-gTextWindowFrame18_Gfx:: @ 850FB9C
-	.incbin "graphics/text_window/18.4bpp"
-
-	.align 2
-gTextWindowFrame19_Gfx:: @ 850FCBC
-	.incbin "graphics/text_window/19.4bpp"
-
-	.align 2
-gTextWindowFrame20_Gfx:: @ 850FDDC
-	.incbin "graphics/text_window/20.4bpp"
-
-	.align 2
-gTextWindowFrame1_Pal:: @ 850FEFC
-	.incbin "graphics/text_window/1.gbapal"
-
-	.align 2
-gTextWindowFrame2_Pal:: @ 850FF1C
-	.incbin "graphics/text_window/2.gbapal"
-
-	.align 2
-gTextWindowFrame3_Pal:: @ 850FF3C
-	.incbin "graphics/text_window/3.gbapal"
-
-	.align 2
-gTextWindowFrame4_Pal:: @ 850FF5C
-	.incbin "graphics/text_window/4.gbapal"
-
-	.align 2
-gTextWindowFrame5_Pal:: @ 850FF7C
-	.incbin "graphics/text_window/5.gbapal"
-
-	.align 2
-gTextWindowFrame6_Pal:: @ 850FF9C
-	.incbin "graphics/text_window/6.gbapal"
-
-	.align 2
-gTextWindowFrame7_Pal:: @ 850FFBC
-	.incbin "graphics/text_window/7.gbapal"
-
-	.align 2
-gTextWindowFrame8_Pal:: @ 850FFDC
-	.incbin "graphics/text_window/8.gbapal"
-
-	.align 2
-gTextWindowFrame9_Pal:: @ 850FFFC
-	.incbin "graphics/text_window/9.gbapal"
-
-	.align 2
-gTextWindowFrame10_Pal:: @ 851001C
-	.incbin "graphics/text_window/10.gbapal"
-
-	.align 2
-gTextWindowFrame11_Pal:: @ 851003C
-	.incbin "graphics/text_window/11.gbapal"
-
-	.align 2
-gTextWindowFrame12_Pal:: @ 851005C
-	.incbin "graphics/text_window/12.gbapal"
-
-	.align 2
-gTextWindowFrame13_Pal:: @ 851007C
-	.incbin "graphics/text_window/13.gbapal"
-
-	.align 2
-gTextWindowFrame14_Pal:: @ 851009C
-	.incbin "graphics/text_window/14.gbapal"
-
-	.align 2
-gTextWindowFrame15_Pal:: @ 85100BC
-	.incbin "graphics/text_window/15.gbapal"
-
-	.align 2
-gTextWindowFrame16_Pal:: @ 85100DC
-	.incbin "graphics/text_window/16.gbapal"
-
-	.align 2
-gTextWindowFrame17_Pal:: @ 85100FC
-	.incbin "graphics/text_window/17.gbapal"
-
-	.align 2
-gTextWindowFrame18_Pal:: @ 851011C
-	.incbin "graphics/text_window/18.gbapal"
-
-	.align 2
-gTextWindowFrame19_Pal:: @ 851013C
-	.incbin "graphics/text_window/19.gbapal"
-
-	.align 2
-gTextWindowFrame20_Pal:: @ 851015C
-	.incbin "graphics/text_window/20.gbapal"
-
-	.align 2
-gUnknown_0851017C:: @ 851017C
-	.incbin "graphics/text_window/message_box.gbapal"
-
-	.incbin "graphics/text_window/text_pal1.gbapal"
-	.incbin "graphics/text_window/text_pal2.gbapal"
-	.incbin "graphics/text_window/text_pal3.gbapal"
-	.incbin "graphics/text_window/text_pal4.gbapal"
-
-	.align 2
-gUnknown_0851021C:: @ 851021C
-	.4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal
-	.4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal
-	.4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal
-	.4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal
-	.4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal
-	.4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal
-	.4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal
-	.4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal
-	.4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal
-	.4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal
-	.4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal
-	.4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal
-	.4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal
-	.4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal
-	.4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal
-	.4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal
-	.4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal
-	.4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal
-	.4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal
-	.4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal
diff --git a/data/unk_transition.s b/data/unk_transition.s
index 5d0dc07af..2dc54e22d 100644
--- a/data/unk_transition.s
+++ b/data/unk_transition.s
@@ -4,13 +4,14 @@
 	.section .rodata
 
 gUnknown_0862AD54:: @ 862AD54
-	.incbin "baserom.gba", 0x62ad54, 0x1dc
+	.incbin "graphics/battle_transitions/frontier_transition.4bpp.lz"
 
 gUnknown_0862AF30:: @ 862AF30
-	 .incbin "baserom.gba", 0x62af30, 0x1AC
+	.incbin "graphics/battle_transitions/frontier_transition.bin"
 
 gUnknown_0862B0DC:: @ 862B0DC
-	 .incbin "baserom.gba", 0x62b0dc, 0x460
+	.incbin "graphics/battle_transitions/frontier_transition_circles.4bpp.lz"
 
 gUnknown_0862B53C:: @ 862B53C
-	 .incbin "baserom.gba", 0x62b53c, 0x1E0
+	.incbin "graphics/battle_transitions/frontier_transition.gbapal"
+	.space 0x1c0
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s
index 0e99cf223..8497f59ad 100644
--- a/data/use_pokeblock.s
+++ b/data/use_pokeblock.s
@@ -4,19 +4,19 @@
 	.section .rodata
 
 gUnknown_085DFA60:: @ 85DFA60
-	.incbin "baserom.gba", 0x5dfa60, 0x20
+	.incbin "graphics/interface/85DFA60.bin"
 
 gUnknown_085DFA80:: @ 85DFA80
-	.incbin "baserom.gba", 0x5dfa80, 0xe0
+	.incbin "graphics/interface/85DFA80.4bpp"
 
 gUnknown_085DFB60:: @ 85DFB60
-	.incbin "baserom.gba", 0x5dfb60, 0xac
+	.incbin "graphics/interface/85DFB60.bin"
 
 gUnknown_085DFC0C:: @ 85DFC0C
-	.incbin "baserom.gba", 0x5dfc0c, 0xa4
+	.incbin "graphics/interface/85DFC0C.bin"
 
 gUnknown_085DFCB0:: @ 85DFCB0
-	.incbin "baserom.gba", 0x5dfcb0, 0x14
+	.4byte 22, 47, 33, 24, 23
 
 gUnknown_085DFCC4:: @ 85DFCC4
 	.byte 0, 4, 3, 2, 1
@@ -53,13 +53,58 @@ gUnknown_085DFD20:: @ 85DFD20
 	obj_pal gUsePokeblockUpDown_Pal, 0
 
 gUnknown_085DFD28:: @ 85DFD28
-	.incbin "baserom.gba", 0x5dfd28, 0x34
+	.2byte 0x9c, 0x24
+	.2byte 0x75, 0x3b
+	.2byte 0x75, 0x76
+	.2byte 0xc5, 0x76
+	.2byte 0xc5, 0x3b
+	
+gUnknown_085DFD3C:: @ 85DFD3C
+	.2byte 0x4000
+	.2byte 0x8000
+	.2byte 0x400
+	.2byte 0
+	
+gUnknown_085DFD44:: @ 85DFD44
+	obj_image_anim_frame 0, 5
+	obj_image_anim_end
+	
+gUnknown_085DFD4C:: @ 85DFD4C
+	obj_image_anim_frame 8, 5
+	obj_image_anim_end
+	
+gUnknown_085DFD54:: @ 85DFD54
+	.4byte gUnknown_085DFD44
+	.4byte gUnknown_085DFD4C
 
 gUnknown_085DFD5C:: @ 85DFD5C
-	.incbin "baserom.gba", 0x5dfd5c, 0x44
+	spr_template 0, 0, gUnknown_085DFD3C, gUnknown_085DFD54, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	
+gUnknown_085DFD74:: @ 85DFD74
+	.2byte 0x4000
+	.2byte 0xC000
+	.2byte 0x400
+	.2byte 0
+	
+gUnknown_085DFD7C:: @ 85DFD7C
+	obj_image_anim_frame 0, 5
+	obj_image_anim_end
+
+gUnknown_085DFD84:: @ 85DFD84
+	obj_image_anim_frame 32, 5
+	obj_image_anim_end
+
+gUnknown_085DFD8C:: @ 85DFD8C
+	obj_image_anim_frame 64, 5
+	obj_image_anim_end
+	
+gUnknown_085DFD94:: @ 85DFD94
+	.4byte gUnknown_085DFD7C
+	.4byte gUnknown_085DFD84
+	.4byte gUnknown_085DFD8C
 
 gUnknown_085DFDA0:: @ 85DFDA0
-	.incbin "baserom.gba", 0x5dfda0, 0x18
+	spr_template 1, 1, gUnknown_085DFD74, gUnknown_085DFD94, NULL, gDummySpriteAffineAnimTable, sub_8168374
 
 gUnknown_085DFDB8:: @ 85DFDB8
 	.4byte gUsePokeblockCondition_Pal
diff --git a/graphics/battle_anims/backgrounds/00.bin b/graphics/battle_anims/backgrounds/00.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/00.png b/graphics/battle_anims/backgrounds/00.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/02.bin b/graphics/battle_anims/backgrounds/02.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/02.png b/graphics/battle_anims/backgrounds/02.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/03.bin b/graphics/battle_anims/backgrounds/03.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/03.png b/graphics/battle_anims/backgrounds/03.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/04.bin b/graphics/battle_anims/backgrounds/04.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/04.png b/graphics/battle_anims/backgrounds/04.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/05.bin b/graphics/battle_anims/backgrounds/05.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/06.bin b/graphics/battle_anims/backgrounds/06.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/07.bin b/graphics/battle_anims/backgrounds/07.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/07.png b/graphics/battle_anims/backgrounds/07.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/08.bin b/graphics/battle_anims/backgrounds/08.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/09.bin b/graphics/battle_anims/backgrounds/09.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/09.png b/graphics/battle_anims/backgrounds/09.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/10.bin b/graphics/battle_anims/backgrounds/10.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/11.bin b/graphics/battle_anims/backgrounds/11.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/11.png b/graphics/battle_anims/backgrounds/11.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/12.bin b/graphics/battle_anims/backgrounds/12.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/12.png b/graphics/battle_anims/backgrounds/12.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/13.bin b/graphics/battle_anims/backgrounds/13.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/14.bin b/graphics/battle_anims/backgrounds/14.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/15.bin b/graphics/battle_anims/backgrounds/15.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/15.png b/graphics/battle_anims/backgrounds/15.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/16.bin b/graphics/battle_anims/backgrounds/16.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/16.png b/graphics/battle_anims/backgrounds/16.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/17.bin b/graphics/battle_anims/backgrounds/17.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/17.png b/graphics/battle_anims/backgrounds/17.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/18.pal b/graphics/battle_anims/backgrounds/18.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/20.bin b/graphics/battle_anims/backgrounds/20.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/20.png b/graphics/battle_anims/backgrounds/20.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/21.bin b/graphics/battle_anims/backgrounds/21.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/21.png b/graphics/battle_anims/backgrounds/21.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/22.pal b/graphics/battle_anims/backgrounds/22.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/24.pal b/graphics/battle_anims/backgrounds/24.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/attract.bin b/graphics/battle_anims/backgrounds/attract.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/attract.png b/graphics/battle_anims/backgrounds/attract.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/fog.bin b/graphics/battle_anims/backgrounds/fog.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/sandstorm_brew.bin b/graphics/battle_anims/backgrounds/sandstorm_brew.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/sandstorm_brew.png b/graphics/battle_anims/backgrounds/sandstorm_brew.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/scary_face.png b/graphics/battle_anims/backgrounds/scary_face.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/scary_face_contest.bin b/graphics/battle_anims/backgrounds/scary_face_contest.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/scary_face_opponent.bin b/graphics/battle_anims/backgrounds/scary_face_opponent.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/scary_face_player.bin b/graphics/battle_anims/backgrounds/scary_face_player.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/water.png b/graphics/battle_anims/backgrounds/water.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/backgrounds/water_muddy.pal b/graphics/battle_anims/backgrounds/water_muddy.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/cure_bubbles.bin b/graphics/battle_anims/masks/cure_bubbles.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/cure_bubbles.png b/graphics/battle_anims/masks/cure_bubbles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/curse.bin b/graphics/battle_anims/masks/curse.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/curse.png b/graphics/battle_anims/masks/curse.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/metal_shine.bin b/graphics/battle_anims/masks/metal_shine.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/metal_shine.png b/graphics/battle_anims/masks/metal_shine.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/morning_sun.bin b/graphics/battle_anims/masks/morning_sun.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/morning_sun.png b/graphics/battle_anims/masks/morning_sun.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat.png b/graphics/battle_anims/masks/stat.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat1.pal b/graphics/battle_anims/masks/stat1.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat2.pal b/graphics/battle_anims/masks/stat2.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat3.pal b/graphics/battle_anims/masks/stat3.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat4.pal b/graphics/battle_anims/masks/stat4.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat5.pal b/graphics/battle_anims/masks/stat5.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat6.pal b/graphics/battle_anims/masks/stat6.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat7.pal b/graphics/battle_anims/masks/stat7.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat8.pal b/graphics/battle_anims/masks/stat8.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat_tilemap_1.bin b/graphics/battle_anims/masks/stat_tilemap_1.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/stat_tilemap_2.bin b/graphics/battle_anims/masks/stat_tilemap_2.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/unknown_C2EA50.bin b/graphics/battle_anims/masks/unknown_C2EA50.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/masks/unknown_C2EA50.png b/graphics/battle_anims/masks/unknown_C2EA50.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/000.png b/graphics/battle_anims/sprites/000.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/001.pal b/graphics/battle_anims/sprites/001.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/001_0.png b/graphics/battle_anims/sprites/001_0.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/001_1.png b/graphics/battle_anims/sprites/001_1.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/002.png b/graphics/battle_anims/sprites/002.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/003.png b/graphics/battle_anims/sprites/003.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/004.png b/graphics/battle_anims/sprites/004.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/005.png b/graphics/battle_anims/sprites/005.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/006.png b/graphics/battle_anims/sprites/006.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/007.png b/graphics/battle_anims/sprites/007.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/008.png b/graphics/battle_anims/sprites/008.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/009.png b/graphics/battle_anims/sprites/009.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/010.pal b/graphics/battle_anims/sprites/010.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/010_0.png b/graphics/battle_anims/sprites/010_0.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/010_1.png b/graphics/battle_anims/sprites/010_1.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/010_2.png b/graphics/battle_anims/sprites/010_2.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/010_3.png b/graphics/battle_anims/sprites/010_3.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/011.png b/graphics/battle_anims/sprites/011.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/012.png b/graphics/battle_anims/sprites/012.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/013.png b/graphics/battle_anims/sprites/013.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/014.png b/graphics/battle_anims/sprites/014.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/015.png b/graphics/battle_anims/sprites/015.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/016.png b/graphics/battle_anims/sprites/016.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/017.png b/graphics/battle_anims/sprites/017.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/018.png b/graphics/battle_anims/sprites/018.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/019.png b/graphics/battle_anims/sprites/019.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/020.png b/graphics/battle_anims/sprites/020.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/021.png b/graphics/battle_anims/sprites/021.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/022.pal b/graphics/battle_anims/sprites/022.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/023.png b/graphics/battle_anims/sprites/023.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/024.png b/graphics/battle_anims/sprites/024.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/025.png b/graphics/battle_anims/sprites/025.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/026.png b/graphics/battle_anims/sprites/026.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/027.png b/graphics/battle_anims/sprites/027.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/028.png b/graphics/battle_anims/sprites/028.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/029.png b/graphics/battle_anims/sprites/029.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/030.png b/graphics/battle_anims/sprites/030.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/031.png b/graphics/battle_anims/sprites/031.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/032.png b/graphics/battle_anims/sprites/032.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/033.png b/graphics/battle_anims/sprites/033.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/034.png b/graphics/battle_anims/sprites/034.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/035.png b/graphics/battle_anims/sprites/035.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/036.png b/graphics/battle_anims/sprites/036.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/037.png b/graphics/battle_anims/sprites/037.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/038.png b/graphics/battle_anims/sprites/038.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/039.png b/graphics/battle_anims/sprites/039.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/040.png b/graphics/battle_anims/sprites/040.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/041.png b/graphics/battle_anims/sprites/041.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/042.png b/graphics/battle_anims/sprites/042.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/043.png b/graphics/battle_anims/sprites/043.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/044.png b/graphics/battle_anims/sprites/044.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/045.png b/graphics/battle_anims/sprites/045.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/046.png b/graphics/battle_anims/sprites/046.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/047.pal b/graphics/battle_anims/sprites/047.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/048.png b/graphics/battle_anims/sprites/048.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/049.pal b/graphics/battle_anims/sprites/049.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/050.png b/graphics/battle_anims/sprites/050.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/051.png b/graphics/battle_anims/sprites/051.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/052.png b/graphics/battle_anims/sprites/052.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/053.png b/graphics/battle_anims/sprites/053.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/054.png b/graphics/battle_anims/sprites/054.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/055.png b/graphics/battle_anims/sprites/055.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/056.png b/graphics/battle_anims/sprites/056.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/057.png b/graphics/battle_anims/sprites/057.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/058.png b/graphics/battle_anims/sprites/058.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/059.png b/graphics/battle_anims/sprites/059.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/060.png b/graphics/battle_anims/sprites/060.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/061.png b/graphics/battle_anims/sprites/061.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/062.png b/graphics/battle_anims/sprites/062.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/063.png b/graphics/battle_anims/sprites/063.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/064.png b/graphics/battle_anims/sprites/064.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/065.png b/graphics/battle_anims/sprites/065.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/066.png b/graphics/battle_anims/sprites/066.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/067.pal b/graphics/battle_anims/sprites/067.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/068.pal b/graphics/battle_anims/sprites/068.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/070.png b/graphics/battle_anims/sprites/070.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/071.png b/graphics/battle_anims/sprites/071.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/072.png b/graphics/battle_anims/sprites/072.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/073.png b/graphics/battle_anims/sprites/073.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/074.pal b/graphics/battle_anims/sprites/074.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/074_0.png b/graphics/battle_anims/sprites/074_0.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/074_1.png b/graphics/battle_anims/sprites/074_1.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/075.png b/graphics/battle_anims/sprites/075.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/076.png b/graphics/battle_anims/sprites/076.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/077.png b/graphics/battle_anims/sprites/077.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/078.png b/graphics/battle_anims/sprites/078.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/079.png b/graphics/battle_anims/sprites/079.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/080.png b/graphics/battle_anims/sprites/080.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/081.png b/graphics/battle_anims/sprites/081.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/082.png b/graphics/battle_anims/sprites/082.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/083.png b/graphics/battle_anims/sprites/083.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/084.png b/graphics/battle_anims/sprites/084.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/085.png b/graphics/battle_anims/sprites/085.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/086.png b/graphics/battle_anims/sprites/086.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/087.png b/graphics/battle_anims/sprites/087.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/088.png b/graphics/battle_anims/sprites/088.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/089.png b/graphics/battle_anims/sprites/089.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/090.png b/graphics/battle_anims/sprites/090.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/091.png b/graphics/battle_anims/sprites/091.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/092.png b/graphics/battle_anims/sprites/092.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/093.png b/graphics/battle_anims/sprites/093.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/094.png b/graphics/battle_anims/sprites/094.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/095.png b/graphics/battle_anims/sprites/095.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/096.png b/graphics/battle_anims/sprites/096.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/097.png b/graphics/battle_anims/sprites/097.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/098.png b/graphics/battle_anims/sprites/098.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/099.png b/graphics/battle_anims/sprites/099.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/100.png b/graphics/battle_anims/sprites/100.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/101.png b/graphics/battle_anims/sprites/101.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/102.png b/graphics/battle_anims/sprites/102.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/103.png b/graphics/battle_anims/sprites/103.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/104.png b/graphics/battle_anims/sprites/104.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/105.png b/graphics/battle_anims/sprites/105.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/106.png b/graphics/battle_anims/sprites/106.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/107.png b/graphics/battle_anims/sprites/107.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/108.png b/graphics/battle_anims/sprites/108.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/109.png b/graphics/battle_anims/sprites/109.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/110.png b/graphics/battle_anims/sprites/110.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/111.png b/graphics/battle_anims/sprites/111.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/112.png b/graphics/battle_anims/sprites/112.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/113.png b/graphics/battle_anims/sprites/113.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/114.png b/graphics/battle_anims/sprites/114.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/115.png b/graphics/battle_anims/sprites/115.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/116.png b/graphics/battle_anims/sprites/116.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/117.png b/graphics/battle_anims/sprites/117.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/118.png b/graphics/battle_anims/sprites/118.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/119.png b/graphics/battle_anims/sprites/119.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/120.png b/graphics/battle_anims/sprites/120.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/121.png b/graphics/battle_anims/sprites/121.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/122.png b/graphics/battle_anims/sprites/122.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/123.png b/graphics/battle_anims/sprites/123.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/124.png b/graphics/battle_anims/sprites/124.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/125.png b/graphics/battle_anims/sprites/125.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/126.png b/graphics/battle_anims/sprites/126.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/127.png b/graphics/battle_anims/sprites/127.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/128.png b/graphics/battle_anims/sprites/128.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/129.png b/graphics/battle_anims/sprites/129.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/130.png b/graphics/battle_anims/sprites/130.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/131.png b/graphics/battle_anims/sprites/131.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/132.png b/graphics/battle_anims/sprites/132.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/133.png b/graphics/battle_anims/sprites/133.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/134.png b/graphics/battle_anims/sprites/134.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/135.png b/graphics/battle_anims/sprites/135.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/136.png b/graphics/battle_anims/sprites/136.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/137.png b/graphics/battle_anims/sprites/137.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/138.png b/graphics/battle_anims/sprites/138.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/139.png b/graphics/battle_anims/sprites/139.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/140.png b/graphics/battle_anims/sprites/140.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/141.pal b/graphics/battle_anims/sprites/141.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/141_0.png b/graphics/battle_anims/sprites/141_0.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/141_1.png b/graphics/battle_anims/sprites/141_1.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/141_2.png b/graphics/battle_anims/sprites/141_2.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/141_3.png b/graphics/battle_anims/sprites/141_3.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/141_4.png b/graphics/battle_anims/sprites/141_4.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/142.png b/graphics/battle_anims/sprites/142.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/143.png b/graphics/battle_anims/sprites/143.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/144.png b/graphics/battle_anims/sprites/144.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/145.png b/graphics/battle_anims/sprites/145.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/146.png b/graphics/battle_anims/sprites/146.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/147.png b/graphics/battle_anims/sprites/147.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/148.png b/graphics/battle_anims/sprites/148.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/149.png b/graphics/battle_anims/sprites/149.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/150.png b/graphics/battle_anims/sprites/150.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/151.png b/graphics/battle_anims/sprites/151.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/152.png b/graphics/battle_anims/sprites/152.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/153.png b/graphics/battle_anims/sprites/153.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/154.png b/graphics/battle_anims/sprites/154.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/155.png b/graphics/battle_anims/sprites/155.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/156.png b/graphics/battle_anims/sprites/156.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/157.png b/graphics/battle_anims/sprites/157.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/158.png b/graphics/battle_anims/sprites/158.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/159.pal b/graphics/battle_anims/sprites/159.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/159_0.png b/graphics/battle_anims/sprites/159_0.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/159_1.png b/graphics/battle_anims/sprites/159_1.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/160.png b/graphics/battle_anims/sprites/160.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/161.png b/graphics/battle_anims/sprites/161.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/162.png b/graphics/battle_anims/sprites/162.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/163.png b/graphics/battle_anims/sprites/163.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/164.pal b/graphics/battle_anims/sprites/164.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/165.pal b/graphics/battle_anims/sprites/165.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/166.png b/graphics/battle_anims/sprites/166.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/167.pal b/graphics/battle_anims/sprites/167.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/168.pal b/graphics/battle_anims/sprites/168.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/169.pal b/graphics/battle_anims/sprites/169.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/170.pal b/graphics/battle_anims/sprites/170.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/171.png b/graphics/battle_anims/sprites/171.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/172.pal b/graphics/battle_anims/sprites/172.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/173.png b/graphics/battle_anims/sprites/173.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/174.png b/graphics/battle_anims/sprites/174.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/175.png b/graphics/battle_anims/sprites/175.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/176.png b/graphics/battle_anims/sprites/176.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/177.png b/graphics/battle_anims/sprites/177.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/178.png b/graphics/battle_anims/sprites/178.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/179.png b/graphics/battle_anims/sprites/179.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/180.png b/graphics/battle_anims/sprites/180.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/181.png b/graphics/battle_anims/sprites/181.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/182.png b/graphics/battle_anims/sprites/182.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/183.png b/graphics/battle_anims/sprites/183.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/184.png b/graphics/battle_anims/sprites/184.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/185.png b/graphics/battle_anims/sprites/185.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/186.png b/graphics/battle_anims/sprites/186.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/187.png b/graphics/battle_anims/sprites/187.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/188.png b/graphics/battle_anims/sprites/188.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/189.png b/graphics/battle_anims/sprites/189.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/190.png b/graphics/battle_anims/sprites/190.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/191.png b/graphics/battle_anims/sprites/191.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/192.png b/graphics/battle_anims/sprites/192.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/193.png b/graphics/battle_anims/sprites/193.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/194.png b/graphics/battle_anims/sprites/194.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/195.png b/graphics/battle_anims/sprites/195.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/196.png b/graphics/battle_anims/sprites/196.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/197.png b/graphics/battle_anims/sprites/197.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/198.png b/graphics/battle_anims/sprites/198.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/199.png b/graphics/battle_anims/sprites/199.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/200.png b/graphics/battle_anims/sprites/200.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/201.png b/graphics/battle_anims/sprites/201.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/202.png b/graphics/battle_anims/sprites/202.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/203.png b/graphics/battle_anims/sprites/203.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/204.png b/graphics/battle_anims/sprites/204.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/205.png b/graphics/battle_anims/sprites/205.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/206.pal b/graphics/battle_anims/sprites/206.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/206.png b/graphics/battle_anims/sprites/206.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/207.png b/graphics/battle_anims/sprites/207.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/208.png b/graphics/battle_anims/sprites/208.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/209.png b/graphics/battle_anims/sprites/209.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/210.png b/graphics/battle_anims/sprites/210.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/211.png b/graphics/battle_anims/sprites/211.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/212.png b/graphics/battle_anims/sprites/212.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/213.png b/graphics/battle_anims/sprites/213.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/214.png b/graphics/battle_anims/sprites/214.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/215.png b/graphics/battle_anims/sprites/215.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/216.pal b/graphics/battle_anims/sprites/216.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/217.png b/graphics/battle_anims/sprites/217.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/218.png b/graphics/battle_anims/sprites/218.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/219.pal b/graphics/battle_anims/sprites/219.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/220.png b/graphics/battle_anims/sprites/220.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/221.png b/graphics/battle_anims/sprites/221.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/222.png b/graphics/battle_anims/sprites/222.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/223.png b/graphics/battle_anims/sprites/223.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/224.png b/graphics/battle_anims/sprites/224.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/225.png b/graphics/battle_anims/sprites/225.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/226.png b/graphics/battle_anims/sprites/226.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/227.png b/graphics/battle_anims/sprites/227.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/228.png b/graphics/battle_anims/sprites/228.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/229.png b/graphics/battle_anims/sprites/229.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/230.png b/graphics/battle_anims/sprites/230.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/231.png b/graphics/battle_anims/sprites/231.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/232.png b/graphics/battle_anims/sprites/232.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/233.png b/graphics/battle_anims/sprites/233.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/234.png b/graphics/battle_anims/sprites/234.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/235.png b/graphics/battle_anims/sprites/235.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/236.pal b/graphics/battle_anims/sprites/236.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/237.pal b/graphics/battle_anims/sprites/237.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/238.png b/graphics/battle_anims/sprites/238.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/239.png b/graphics/battle_anims/sprites/239.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/240.png b/graphics/battle_anims/sprites/240.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/241.png b/graphics/battle_anims/sprites/241.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/242.png b/graphics/battle_anims/sprites/242.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/243.png b/graphics/battle_anims/sprites/243.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/244.png b/graphics/battle_anims/sprites/244.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/245.png b/graphics/battle_anims/sprites/245.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/246.png b/graphics/battle_anims/sprites/246.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/247.png b/graphics/battle_anims/sprites/247.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/248.png b/graphics/battle_anims/sprites/248.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/249.png b/graphics/battle_anims/sprites/249.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/250.png b/graphics/battle_anims/sprites/250.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/251.png b/graphics/battle_anims/sprites/251.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/252.png b/graphics/battle_anims/sprites/252.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/253.png b/graphics/battle_anims/sprites/253.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/254.png b/graphics/battle_anims/sprites/254.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/255.png b/graphics/battle_anims/sprites/255.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/256.png b/graphics/battle_anims/sprites/256.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/257.png b/graphics/battle_anims/sprites/257.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/258.png b/graphics/battle_anims/sprites/258.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/259.pal b/graphics/battle_anims/sprites/259.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/260.png b/graphics/battle_anims/sprites/260.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/261.png b/graphics/battle_anims/sprites/261.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/262.png b/graphics/battle_anims/sprites/262.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/263.png b/graphics/battle_anims/sprites/263.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/264.png b/graphics/battle_anims/sprites/264.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/265.pal b/graphics/battle_anims/sprites/265.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/266.png b/graphics/battle_anims/sprites/266.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/267.pal b/graphics/battle_anims/sprites/267.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/268.pal b/graphics/battle_anims/sprites/268.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/269.png b/graphics/battle_anims/sprites/269.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/270.png b/graphics/battle_anims/sprites/270.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/271.png b/graphics/battle_anims/sprites/271.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/272.png b/graphics/battle_anims/sprites/272.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/273.png b/graphics/battle_anims/sprites/273.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/274.png b/graphics/battle_anims/sprites/274.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/275.png b/graphics/battle_anims/sprites/275.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/276.png b/graphics/battle_anims/sprites/276.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/277.png b/graphics/battle_anims/sprites/277.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/278.png b/graphics/battle_anims/sprites/278.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/279.png b/graphics/battle_anims/sprites/279.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/280.png b/graphics/battle_anims/sprites/280.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/281.png b/graphics/battle_anims/sprites/281.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/282.png b/graphics/battle_anims/sprites/282.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/283.png b/graphics/battle_anims/sprites/283.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/284.png b/graphics/battle_anims/sprites/284.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/285.png b/graphics/battle_anims/sprites/285.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/286.pal b/graphics/battle_anims/sprites/286.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/287.pal b/graphics/battle_anims/sprites/287.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/288.pal b/graphics/battle_anims/sprites/288.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/effect.pal b/graphics/battle_anims/sprites/effect.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/particles.png b/graphics/battle_anims/sprites/particles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/smokescreen_impact.pal b/graphics/battle_anims/sprites/smokescreen_impact.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/smokescreen_impact.png b/graphics/battle_anims/sprites/smokescreen_impact.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/substitute.bin b/graphics/battle_anims/sprites/substitute.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_anims/sprites/substitute.png b/graphics/battle_anims/sprites/substitute.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/battle_tilemap1.bin b/graphics/battle_frontier/battle_tilemap1.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/battle_tilemap2.bin b/graphics/battle_frontier/battle_tilemap2.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/dome_anim1.pal b/graphics/battle_frontier/dome_anim1.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/dome_anim2.pal b/graphics/battle_frontier/dome_anim2.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/dome_anim3.pal b/graphics/battle_frontier/dome_anim3.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/dome_anim4.pal b/graphics/battle_frontier/dome_anim4.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/factory_menu.bin b/graphics/battle_frontier/factory_menu.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/factory_menu1.png b/graphics/battle_frontier/factory_menu1.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/factory_menu2.png b/graphics/battle_frontier/factory_menu2.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/misc1.png b/graphics/battle_frontier/misc1.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/options.png b/graphics/battle_frontier/options.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/options_pal1.pal b/graphics/battle_frontier/options_pal1.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/options_pal2.pal b/graphics/battle_frontier/options_pal2.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/options_pal3.pal b/graphics/battle_frontier/options_pal3.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/pyramid_light.pal b/graphics/battle_frontier/pyramid_light.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/symbols.png b/graphics/battle_frontier/symbols.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/text.pal b/graphics/battle_frontier/text.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/text_pp.pal b/graphics/battle_frontier/text_pp.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/tourney_bg.png b/graphics/battle_frontier/tourney_bg.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_frontier/tourney_line.png b/graphics/battle_frontier/tourney_line.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/ball_display_unused_extra.png b/graphics/battle_interface/ball_display_unused_extra.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/enemy_mon_shadow.png b/graphics/battle_interface/enemy_mon_shadow.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/expbar.png b/graphics/battle_interface/expbar.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/hpbar.png b/graphics/battle_interface/hpbar.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/hpbar_anim.png b/graphics/battle_interface/hpbar_anim.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/misc.png b/graphics/battle_interface/misc.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/misc_frameend.png b/graphics/battle_interface/misc_frameend.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/status2.png b/graphics/battle_interface/status2.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/status3.png b/graphics/battle_interface/status3.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/status4.png b/graphics/battle_interface/status4.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/status_brn.png b/graphics/battle_interface/status_brn.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/status_frz.png b/graphics/battle_interface/status_frz.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/status_par.png b/graphics/battle_interface/status_par.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/status_psn.png b/graphics/battle_interface/status_psn.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/status_slp.png b/graphics/battle_interface/status_slp.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/unused_window.pal b/graphics/battle_interface/unused_window.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/unused_window.png b/graphics/battle_interface/unused_window.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/unused_window2.png b/graphics/battle_interface/unused_window2.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/unused_window2bar.png b/graphics/battle_interface/unused_window2bar.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/unused_window3.png b/graphics/battle_interface/unused_window3.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/unused_window4.png b/graphics/battle_interface/unused_window4.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/window.png b/graphics/battle_interface/window.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/window2.png b/graphics/battle_interface/window2.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/window3.png b/graphics/battle_interface/window3.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/window4.png b/graphics/battle_interface/window4.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_interface/window5.png b/graphics/battle_interface/window5.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/building/anim_map.bin b/graphics/battle_terrain/building/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/building/anim_tiles.png b/graphics/battle_terrain/building/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/building/map.bin b/graphics/battle_terrain/building/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/building/palette.pal b/graphics/battle_terrain/building/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/building/palette2.pal b/graphics/battle_terrain/building/palette2.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/building/palette3.pal b/graphics/battle_terrain/building/palette3.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/building/tiles.png b/graphics/battle_terrain/building/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/cave/anim_map.bin b/graphics/battle_terrain/cave/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/cave/anim_tiles.png b/graphics/battle_terrain/cave/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/cave/groudon.pal b/graphics/battle_terrain/cave/groudon.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/cave/map.bin b/graphics/battle_terrain/cave/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/cave/palette.pal b/graphics/battle_terrain/cave/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/cave/tiles.png b/graphics/battle_terrain/cave/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/long_grass/anim_map.bin b/graphics/battle_terrain/long_grass/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/long_grass/anim_tiles.png b/graphics/battle_terrain/long_grass/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/long_grass/map.bin b/graphics/battle_terrain/long_grass/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/long_grass/palette.pal b/graphics/battle_terrain/long_grass/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/long_grass/tiles.png b/graphics/battle_terrain/long_grass/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/plain/palette.pal b/graphics/battle_terrain/plain/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/pond_water/anim_map.bin b/graphics/battle_terrain/pond_water/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/pond_water/anim_tiles.png b/graphics/battle_terrain/pond_water/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/pond_water/map.bin b/graphics/battle_terrain/pond_water/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/pond_water/palette.pal b/graphics/battle_terrain/pond_water/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/pond_water/tiles.png b/graphics/battle_terrain/pond_water/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/rock/anim_map.bin b/graphics/battle_terrain/rock/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/rock/anim_tiles.png b/graphics/battle_terrain/rock/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/rock/map.bin b/graphics/battle_terrain/rock/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/rock/palette.pal b/graphics/battle_terrain/rock/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/rock/tiles.png b/graphics/battle_terrain/rock/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sand/anim_map.bin b/graphics/battle_terrain/sand/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sand/anim_tiles.png b/graphics/battle_terrain/sand/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sand/map.bin b/graphics/battle_terrain/sand/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sand/palette.pal b/graphics/battle_terrain/sand/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sand/tiles.png b/graphics/battle_terrain/sand/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sky/anim_map.bin b/graphics/battle_terrain/sky/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sky/anim_tiles.png b/graphics/battle_terrain/sky/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sky/map.bin b/graphics/battle_terrain/sky/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sky/palette.pal b/graphics/battle_terrain/sky/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/sky/tiles.png b/graphics/battle_terrain/sky/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/battle_frontier.pal b/graphics/battle_terrain/stadium/battle_frontier.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/map.bin b/graphics/battle_terrain/stadium/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/palette1.pal b/graphics/battle_terrain/stadium/palette1.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/palette2.pal b/graphics/battle_terrain/stadium/palette2.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/palette3.pal b/graphics/battle_terrain/stadium/palette3.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/palette4.pal b/graphics/battle_terrain/stadium/palette4.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/palette5.pal b/graphics/battle_terrain/stadium/palette5.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/palette6.pal b/graphics/battle_terrain/stadium/palette6.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/palette7.pal b/graphics/battle_terrain/stadium/palette7.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/stadium/tiles.png b/graphics/battle_terrain/stadium/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/tall_grass/anim_map.bin b/graphics/battle_terrain/tall_grass/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/tall_grass/anim_tiles.png b/graphics/battle_terrain/tall_grass/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/tall_grass/map.bin b/graphics/battle_terrain/tall_grass/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/tall_grass/palette.pal b/graphics/battle_terrain/tall_grass/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/tall_grass/tiles.png b/graphics/battle_terrain/tall_grass/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/underwater/anim_map.bin b/graphics/battle_terrain/underwater/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/underwater/anim_tiles.png b/graphics/battle_terrain/underwater/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/underwater/map.bin b/graphics/battle_terrain/underwater/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/underwater/palette.pal b/graphics/battle_terrain/underwater/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/underwater/tiles.png b/graphics/battle_terrain/underwater/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/water/anim_map.bin b/graphics/battle_terrain/water/anim_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/water/anim_tiles.png b/graphics/battle_terrain/water/anim_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/water/kyogre.pal b/graphics/battle_terrain/water/kyogre.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/water/map.bin b/graphics/battle_terrain/water/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/water/palette.pal b/graphics/battle_terrain/water/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/battle_terrain/water/tiles.png b/graphics/battle_terrain/water/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_transitions/frontier_transition.bin b/graphics/battle_transitions/frontier_transition.bin
new file mode 100644
index 000000000..7b9d2af28
Binary files /dev/null and b/graphics/battle_transitions/frontier_transition.bin differ
diff --git a/graphics/battle_transitions/frontier_transition.png b/graphics/battle_transitions/frontier_transition.png
new file mode 100644
index 000000000..05ea84f2c
Binary files /dev/null and b/graphics/battle_transitions/frontier_transition.png differ
diff --git a/graphics/battle_transitions/frontier_transition_circles.png b/graphics/battle_transitions/frontier_transition_circles.png
new file mode 100644
index 000000000..50e44e40c
Binary files /dev/null and b/graphics/battle_transitions/frontier_transition_circles.png differ
diff --git a/graphics/battle_transitions/vs.png b/graphics/battle_transitions/vs.png
old mode 100755
new mode 100644
diff --git a/graphics/battle_transitions/vs_frame.bin b/graphics/battle_transitions/vs_frame.bin
old mode 100755
new mode 100644
diff --git a/graphics/battle_transitions/vs_frame.png b/graphics/battle_transitions/vs_frame.png
old mode 100755
new mode 100644
diff --git a/graphics/berry_blender/arrow_old.png b/graphics/berry_blender/arrow_old.png
old mode 100755
new mode 100644
diff --git a/graphics/berry_crusher/tiles.bin b/graphics/berry_crusher/tiles.bin
old mode 100755
new mode 100644
diff --git a/graphics/berry_crusher/tiles.pal b/graphics/berry_crusher/tiles.pal
old mode 100755
new mode 100644
diff --git a/graphics/berry_crusher/tiles.png b/graphics/berry_crusher/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_small.bin b/graphics/berry_fix/gba_small.bin
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_small.pal b/graphics/berry_fix/gba_small.pal
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_small.png b/graphics/berry_fix/gba_small.png
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer.bin b/graphics/berry_fix/gba_transfer.bin
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer.pal b/graphics/berry_fix/gba_transfer.pal
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer.png b/graphics/berry_fix/gba_transfer.png
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer_error.bin b/graphics/berry_fix/gba_transfer_error.bin
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer_error.pal b/graphics/berry_fix/gba_transfer_error.pal
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer_error.png b/graphics/berry_fix/gba_transfer_error.png
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer_highlight.bin b/graphics/berry_fix/gba_transfer_highlight.bin
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer_highlight.pal b/graphics/berry_fix/gba_transfer_highlight.pal
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/gba_transfer_highlight.png b/graphics/berry_fix/gba_transfer_highlight.png
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/logo.bin b/graphics/berry_fix/logo.bin
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/logo.pal b/graphics/berry_fix/logo.pal
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/logo.png b/graphics/berry_fix/logo.png
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/window.bin b/graphics/berry_fix/window.bin
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/window.pal b/graphics/berry_fix/window.pal
old mode 100755
new mode 100644
diff --git a/graphics/berry_fix/window.png b/graphics/berry_fix/window.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/applause.png b/graphics/contest/applause.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/applause_meter.png b/graphics/contest/applause_meter.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/audience.png b/graphics/contest/audience.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap1.bin b/graphics/contest/clink_tilemap1.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap10.bin b/graphics/contest/clink_tilemap10.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap11.bin b/graphics/contest/clink_tilemap11.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap2.bin b/graphics/contest/clink_tilemap2.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap3.bin b/graphics/contest/clink_tilemap3.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap4.bin b/graphics/contest/clink_tilemap4.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap5.bin b/graphics/contest/clink_tilemap5.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap6.bin b/graphics/contest/clink_tilemap6.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap7.bin b/graphics/contest/clink_tilemap7.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap8.bin b/graphics/contest/clink_tilemap8.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/clink_tilemap9.bin b/graphics/contest/clink_tilemap9.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/faces.png b/graphics/contest/faces.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/heart.png b/graphics/contest/heart.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/judge.png b/graphics/contest/judge.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/judge_symbols.png b/graphics/contest/judge_symbols.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/misc.png b/graphics/contest/misc.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/misc_2.pal b/graphics/contest/misc_2.pal
old mode 100755
new mode 100644
diff --git a/graphics/contest/misc_2.png b/graphics/contest/misc_2.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/misc_2_tilemap_1.bin b/graphics/contest/misc_2_tilemap_1.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/misc_2_tilemap_2.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/misc_2_tilemap_3.bin b/graphics/contest/misc_2_tilemap_3.bin
old mode 100755
new mode 100644
diff --git a/graphics/contest/nextturn.png b/graphics/contest/nextturn.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/nextturn_numbers.png b/graphics/contest/nextturn_numbers.png
old mode 100755
new mode 100644
diff --git a/graphics/contest/nextturn_random.png b/graphics/contest/nextturn_random.png
old mode 100755
new mode 100644
diff --git a/graphics/easy_chat/cursor.png b/graphics/easy_chat/cursor.png
old mode 100755
new mode 100644
diff --git a/graphics/easy_chat/mode.png b/graphics/easy_chat/mode.png
old mode 100755
new mode 100644
diff --git a/graphics/easy_chat/rwindow.png b/graphics/easy_chat/rwindow.png
old mode 100755
new mode 100644
diff --git a/graphics/easy_chat/window.bin b/graphics/easy_chat/window.bin
old mode 100755
new mode 100644
diff --git a/graphics/easy_chat/window.png b/graphics/easy_chat/window.png
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/cursor.png b/graphics/frontier_pass/cursor.png
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/gold.pal b/graphics/frontier_pass/gold.pal
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/map_cursor.png b/graphics/frontier_pass/map_cursor.png
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/medals.png b/graphics/frontier_pass/medals.png
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/silver.pal b/graphics/frontier_pass/silver.pal
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/tilemap1.bin b/graphics/frontier_pass/tilemap1.bin
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/tilemap2.bin b/graphics/frontier_pass/tilemap2.bin
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/tiles.bin b/graphics/frontier_pass/tiles.bin
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/tiles.pal b/graphics/frontier_pass/tiles.pal
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/tiles.png b/graphics/frontier_pass/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/frontier_pass/tiles2.png b/graphics/frontier_pass/tiles2.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/855C604.pal b/graphics/interface/855C604.pal
new file mode 100644
index 000000000..e7d6c330a
--- /dev/null
+++ b/graphics/interface/855C604.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 180 82
+197 123 0
+255 139 131
+255 49 24
+74 74 74
+213 213 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/855C624.bin b/graphics/interface/855C624.bin
new file mode 100644
index 000000000..6f48b39f6
--- /dev/null
+++ b/graphics/interface/855C624.bin
@@ -0,0 +1 @@
+����������������������������������������������������������
\ No newline at end of file
diff --git a/graphics/interface/85DFA60.bin b/graphics/interface/85DFA60.bin
new file mode 100644
index 000000000..b1a4230d4
Binary files /dev/null and b/graphics/interface/85DFA60.bin differ
diff --git a/graphics/interface/85DFA80.png b/graphics/interface/85DFA80.png
new file mode 100644
index 000000000..c1fde0325
Binary files /dev/null and b/graphics/interface/85DFA80.png differ
diff --git a/graphics/interface/85DFB60.bin b/graphics/interface/85DFB60.bin
new file mode 100644
index 000000000..4e7c2d4ad
Binary files /dev/null and b/graphics/interface/85DFB60.bin differ
diff --git a/graphics/interface/85DFC0C.bin b/graphics/interface/85DFC0C.bin
new file mode 100644
index 000000000..5f8f364fc
Binary files /dev/null and b/graphics/interface/85DFC0C.bin differ
diff --git a/graphics/interface/860F074.pal b/graphics/interface/860F074.pal
new file mode 100644
index 000000000..25a3ac1d2
--- /dev/null
+++ b/graphics/interface/860F074.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/860F0B0.pal b/graphics/interface/860F0B0.pal
new file mode 100644
index 000000000..61430dbb3
--- /dev/null
+++ b/graphics/interface/860F0B0.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+74 205 238
+49 164 238
+0 90 131
+24 98 197
+0 139 90
diff --git a/graphics/interface/bag_pyramid.pal b/graphics/interface/bag_pyramid.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/bag_pyramid.png b/graphics/interface/bag_pyramid.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/bag_screen.png b/graphics/interface/bag_screen.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/bag_screen_female.pal b/graphics/interface/bag_screen_female.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/bag_screen_male.pal b/graphics/interface/bag_screen_male.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/bag_swap.png b/graphics/interface/bag_swap.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/ball/ultra.pal b/graphics/interface/ball/ultra.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/ball/ultra.png b/graphics/interface/ball/ultra.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/ball_open.png b/graphics/interface/ball_open.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/berry_tag.bin b/graphics/interface/berry_tag.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/berry_tag_title.bin b/graphics/interface/berry_tag_title.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/check_berry.pal b/graphics/interface/check_berry.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/check_berry.png b/graphics/interface/check_berry.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/check_berry_circle.png b/graphics/interface/check_berry_circle.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/hm.png b/graphics/interface/hm.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/hpbar_anim.png b/graphics/interface/hpbar_anim.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/map_popup/857F444.pal b/graphics/interface/map_popup/857F444.pal
new file mode 100644
index 000000000..19b8cf9c4
--- /dev/null
+++ b/graphics/interface/map_popup/857F444.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+0 0 0
+238 255 255
+65 65 123
+255 255 255
+180 222 255
+139 172 213
+98 123 172
+57 74 131
+16 24 90
+180 222 255
+139 172 213
+98 123 172
+57 74 131
+16 24 90
+255 255 255
diff --git a/graphics/interface/map_popup/brick.png b/graphics/interface/map_popup/brick.png
new file mode 100644
index 000000000..8fef0a1c2
Binary files /dev/null and b/graphics/interface/map_popup/brick.png differ
diff --git a/graphics/interface/map_popup/brick_outline.png b/graphics/interface/map_popup/brick_outline.png
new file mode 100644
index 000000000..be4b6f95a
Binary files /dev/null and b/graphics/interface/map_popup/brick_outline.png differ
diff --git a/graphics/interface/map_popup/marble.png b/graphics/interface/map_popup/marble.png
new file mode 100644
index 000000000..d79b9ec34
Binary files /dev/null and b/graphics/interface/map_popup/marble.png differ
diff --git a/graphics/interface/map_popup/marble_outline.png b/graphics/interface/map_popup/marble_outline.png
new file mode 100644
index 000000000..54f3021ea
Binary files /dev/null and b/graphics/interface/map_popup/marble_outline.png differ
diff --git a/graphics/interface/map_popup/stone.png b/graphics/interface/map_popup/stone.png
new file mode 100644
index 000000000..fe3b7e29d
Binary files /dev/null and b/graphics/interface/map_popup/stone.png differ
diff --git a/graphics/interface/map_popup/stone2.png b/graphics/interface/map_popup/stone2.png
new file mode 100644
index 000000000..261c3184a
Binary files /dev/null and b/graphics/interface/map_popup/stone2.png differ
diff --git a/graphics/interface/map_popup/stone2_outline.png b/graphics/interface/map_popup/stone2_outline.png
new file mode 100644
index 000000000..b0c0748df
Binary files /dev/null and b/graphics/interface/map_popup/stone2_outline.png differ
diff --git a/graphics/interface/map_popup/stone_outline.png b/graphics/interface/map_popup/stone_outline.png
new file mode 100644
index 000000000..7c014d05e
Binary files /dev/null and b/graphics/interface/map_popup/stone_outline.png differ
diff --git a/graphics/interface/map_popup/underwater.png b/graphics/interface/map_popup/underwater.png
new file mode 100644
index 000000000..e6cf2b6c8
Binary files /dev/null and b/graphics/interface/map_popup/underwater.png differ
diff --git a/graphics/interface/map_popup/underwater_outline.png b/graphics/interface/map_popup/underwater_outline.png
new file mode 100644
index 000000000..2ffe3cb75
Binary files /dev/null and b/graphics/interface/map_popup/underwater_outline.png differ
diff --git a/graphics/interface/map_popup/wood.png b/graphics/interface/map_popup/wood.png
new file mode 100644
index 000000000..e846a6bcd
Binary files /dev/null and b/graphics/interface/map_popup/wood.png differ
diff --git a/graphics/interface/map_popup/wood_outline.png b/graphics/interface/map_popup/wood_outline.png
new file mode 100644
index 000000000..d143dbc2f
Binary files /dev/null and b/graphics/interface/map_popup/wood_outline.png differ
diff --git a/graphics/interface/mart_frame.bin b/graphics/interface/mart_frame.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/mart_frame.png b/graphics/interface/mart_frame.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/menu.png b/graphics/interface/menu.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/menu_0.pal b/graphics/interface/menu_0.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/menu_1.pal b/graphics/interface/menu_1.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/menu_map.bin b/graphics/interface/menu_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/money.png b/graphics/interface/money.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/numbers1.png b/graphics/interface/numbers1.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/numbers2.png b/graphics/interface/numbers2.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/party_menu_misc.bin b/graphics/interface/party_menu_misc.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/party_menu_misc.pal b/graphics/interface/party_menu_misc.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_misc.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/party_menu_pokeball.png b/graphics/interface/party_menu_pokeball.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/party_menu_pokeball_small.png b/graphics/interface/party_menu_pokeball_small.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/pokeblock.bin b/graphics/interface/pokeblock.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/pokeblock_case_frame.pal b/graphics/interface/pokeblock_case_frame.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/pokeblock_case_frame.png b/graphics/interface/pokeblock_case_frame.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/pokeblock_device.png b/graphics/interface/pokeblock_device.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/pokeblock_feeding_bg_map.bin b/graphics/interface/pokeblock_feeding_bg_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/powacc_tilemap.bin b/graphics/interface/powacc_tilemap.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/red_arrow.png b/graphics/interface/red_arrow.png
new file mode 100644
index 000000000..91c8268b7
Binary files /dev/null and b/graphics/interface/red_arrow.png differ
diff --git a/graphics/interface/red_arrow_other.png b/graphics/interface/red_arrow_other.png
new file mode 100644
index 000000000..33fcf44b9
Binary files /dev/null and b/graphics/interface/red_arrow_other.png differ
diff --git a/graphics/interface/select_button.png b/graphics/interface/select_button.png
new file mode 100644
index 000000000..bded587fd
Binary files /dev/null and b/graphics/interface/select_button.png differ
diff --git a/graphics/interface/selector_outline.png b/graphics/interface/selector_outline.png
new file mode 100644
index 000000000..d9f3e1b8d
Binary files /dev/null and b/graphics/interface/selector_outline.png differ
diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/status_screen.bin b/graphics/interface/status_screen.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/status_screen.pal b/graphics/interface/status_screen.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/status_screen.png b/graphics/interface/status_screen.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/status_tilemap0.bin b/graphics/interface/status_tilemap0.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/status_tilemap1.bin b/graphics/interface/status_tilemap1.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/status_tilemap2.bin b/graphics/interface/status_tilemap2.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/status_tilemap3.bin b/graphics/interface/status_tilemap3.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/summary.bin b/graphics/interface/summary.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/summary_frames.png b/graphics/interface/summary_frames.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/ui_learn_move.png b/graphics/interface/ui_learn_move.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/unk_tilemap.bin b/graphics/interface/unk_tilemap.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/wallclock.png b/graphics/interface/wallclock.png
old mode 100755
new mode 100644
diff --git a/graphics/interface/wallclock1.bin b/graphics/interface/wallclock1.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/wallclock2.bin b/graphics/interface/wallclock2.bin
old mode 100755
new mode 100644
diff --git a/graphics/interface/wallclock_female.pal b/graphics/interface/wallclock_female.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface/wallclock_male.pal b/graphics/interface/wallclock_male.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface_fr/menu.png b/graphics/interface_fr/menu.png
old mode 100755
new mode 100644
diff --git a/graphics/interface_fr/menu1.pal b/graphics/interface_fr/menu1.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface_fr/menu2.pal b/graphics/interface_fr/menu2.pal
old mode 100755
new mode 100644
diff --git a/graphics/interface_fr/menu3.pal b/graphics/interface_fr/menu3.pal
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro1_text.pal b/graphics/intro/intro1_text.pal
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3.pal b/graphics/intro/intro3.pal
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_clouds.png b/graphics/intro/intro3_clouds.png
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_clouds1.bin b/graphics/intro/intro3_clouds1.bin
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_clouds2.bin b/graphics/intro/intro3_clouds2.bin
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_clouds2.png b/graphics/intro/intro3_clouds2.png
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_clouds3.bin b/graphics/intro/intro3_clouds3.bin
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_clouds4.bin b/graphics/intro/intro3_clouds4.bin
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_groudon.bin b/graphics/intro/intro3_groudon.bin
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_groudon.png b/graphics/intro/intro3_groudon.png
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_kyogre.bin b/graphics/intro/intro3_kyogre.bin
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_kyogre.png b/graphics/intro/intro3_kyogre.png
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_rayquaza.bin b/graphics/intro/intro3_rayquaza.bin
old mode 100755
new mode 100644
diff --git a/graphics/intro/intro3_rayquaza.png b/graphics/intro/intro3_rayquaza.png
old mode 100755
new mode 100644
diff --git a/graphics/intro/legend_bg.png b/graphics/intro/legend_bg.png
old mode 100755
new mode 100644
diff --git a/graphics/intro/legend_bg1.bin b/graphics/intro/legend_bg1.bin
old mode 100755
new mode 100644
diff --git a/graphics/intro/legend_bg2.bin b/graphics/intro/legend_bg2.bin
old mode 100755
new mode 100644
diff --git a/graphics/link/gba.png b/graphics/link/gba.png
old mode 100755
new mode 100644
diff --git a/graphics/link/gba_pal2.pal b/graphics/link/gba_pal2.pal
old mode 100755
new mode 100644
diff --git a/graphics/link/link1.pal b/graphics/link/link1.pal
old mode 100755
new mode 100644
diff --git a/graphics/link/link2.pal b/graphics/link/link2.pal
old mode 100755
new mode 100644
diff --git a/graphics/link/link_winedge.bin b/graphics/link/link_winedge.bin
old mode 100755
new mode 100644
diff --git a/graphics/link/link_winedge.png b/graphics/link/link_winedge.png
old mode 100755
new mode 100644
diff --git a/graphics/link/misc.bin b/graphics/link/misc.bin
old mode 100755
new mode 100644
diff --git a/graphics/link/misc.png b/graphics/link/misc.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/bead/map.bin b/graphics/mail/bead/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/bead/palette.pal b/graphics/mail/bead/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/bead/tiles.png b/graphics/mail/bead/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/dream/map.bin b/graphics/mail/dream/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/dream/palette.pal b/graphics/mail/dream/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/dream/tiles.png b/graphics/mail/dream/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/fab/map.bin b/graphics/mail/fab/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/fab/palette.pal b/graphics/mail/fab/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/fab/tiles.png b/graphics/mail/fab/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/glitter/map.bin b/graphics/mail/glitter/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/glitter/palette.pal b/graphics/mail/glitter/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/glitter/tiles.png b/graphics/mail/glitter/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/harbor/map.bin b/graphics/mail/harbor/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/harbor/palette.pal b/graphics/mail/harbor/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/harbor/tiles.png b/graphics/mail/harbor/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/mech/map.bin b/graphics/mail/mech/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/mech/palette.pal b/graphics/mail/mech/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/mech/tiles.png b/graphics/mail/mech/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/orange/map.bin b/graphics/mail/orange/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/orange/palette.pal b/graphics/mail/orange/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/orange/tiles.png b/graphics/mail/orange/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/retro/map.bin b/graphics/mail/retro/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/retro/palette.pal b/graphics/mail/retro/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/retro/tiles.png b/graphics/mail/retro/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/shadow/map.bin b/graphics/mail/shadow/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/shadow/palette.pal b/graphics/mail/shadow/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/shadow/tiles.png b/graphics/mail/shadow/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/tropic/map.bin b/graphics/mail/tropic/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/tropic/palette.pal b/graphics/mail/tropic/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/tropic/tiles.png b/graphics/mail/tropic/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/wave/map.bin b/graphics/mail/wave/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/wave/palette.pal b/graphics/mail/wave/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/wave/tiles.png b/graphics/mail/wave/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/mail/wood/map.bin b/graphics/mail/wood/map.bin
old mode 100755
new mode 100644
diff --git a/graphics/mail/wood/palette.pal b/graphics/mail/wood/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/mail/wood/tiles.png b/graphics/mail/wood/tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/map_objects/pics/effects/unknown_4F6D38/0.png b/graphics/map_objects/pics/effects/unknown_4F6D38/0.png
new file mode 100644
index 000000000..3ee87e1cd
Binary files /dev/null and b/graphics/map_objects/pics/effects/unknown_4F6D38/0.png differ
diff --git a/graphics/map_objects/pics/effects/unknown_4F7E38/0.png b/graphics/map_objects/pics/effects/unknown_4F7E38/0.png
new file mode 100644
index 000000000..685aee28b
Binary files /dev/null and b/graphics/map_objects/pics/effects/unknown_4F7E38/0.png differ
diff --git a/graphics/map_objects/pics/effects/unused_grass/0.png b/graphics/map_objects/pics/effects/unused_grass/0.png
new file mode 100644
index 000000000..2e16f15cb
Binary files /dev/null and b/graphics/map_objects/pics/effects/unused_grass/0.png differ
diff --git a/graphics/map_objects/pics/effects/unused_grass/1.png b/graphics/map_objects/pics/effects/unused_grass/1.png
new file mode 100644
index 000000000..dd33b0d88
Binary files /dev/null and b/graphics/map_objects/pics/effects/unused_grass/1.png differ
diff --git a/graphics/map_objects/pics/effects/unused_grass/2.png b/graphics/map_objects/pics/effects/unused_grass/2.png
new file mode 100644
index 000000000..345d454cd
Binary files /dev/null and b/graphics/map_objects/pics/effects/unused_grass/2.png differ
diff --git a/graphics/map_objects/pics/effects/unused_grass/3.png b/graphics/map_objects/pics/effects/unused_grass/3.png
new file mode 100644
index 000000000..087676102
Binary files /dev/null and b/graphics/map_objects/pics/effects/unused_grass/3.png differ
diff --git a/graphics/misc/bag.pal b/graphics/misc/bag.pal
old mode 100755
new mode 100644
diff --git a/graphics/misc/bag_female.png b/graphics/misc/bag_female.png
old mode 100755
new mode 100644
diff --git a/graphics/misc/bag_male.png b/graphics/misc/bag_male.png
old mode 100755
new mode 100644
diff --git a/graphics/misc/clock_small.pal b/graphics/misc/clock_small.pal
old mode 100755
new mode 100644
diff --git a/graphics/misc/clock_small.png b/graphics/misc/clock_small.png
old mode 100755
new mode 100644
diff --git a/graphics/misc/confetti.png b/graphics/misc/confetti.png
old mode 100755
new mode 100644
diff --git a/graphics/misc/diploma.png b/graphics/misc/diploma.png
old mode 100755
new mode 100644
diff --git a/graphics/misc/diploma_hoenn.pal b/graphics/misc/diploma_hoenn.pal
old mode 100755
new mode 100644
diff --git a/graphics/misc/diploma_map.bin b/graphics/misc/diploma_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/misc/diploma_national.pal b/graphics/misc/diploma_national.pal
old mode 100755
new mode 100644
diff --git a/graphics/misc/fossil.png b/graphics/misc/fossil.png
new file mode 100644
index 000000000..f92649e98
Binary files /dev/null and b/graphics/misc/fossil.png differ
diff --git a/graphics/misc/mirage_tower.bin b/graphics/misc/mirage_tower.bin
new file mode 100644
index 000000000..85f288387
--- /dev/null
+++ b/graphics/misc/mirage_tower.bin
@@ -0,0 +1,2 @@
+
````````	`
+```
``````````````````` `!`"`#`$`%`&`'`(`)`*`+`,`-`.`/`0`1`2`3`4`5`6`7`8`9`:`;`<`=`>`?`@`A`B`C`D`E`F`G`H`
\ No newline at end of file
diff --git a/graphics/misc/mirage_tower.png b/graphics/misc/mirage_tower.png
new file mode 100644
index 000000000..69ac6a51e
Binary files /dev/null and b/graphics/misc/mirage_tower.png differ
diff --git a/graphics/misc/mirage_tower_crumbles.png b/graphics/misc/mirage_tower_crumbles.png
new file mode 100644
index 000000000..27e5daed0
Binary files /dev/null and b/graphics/misc/mirage_tower_crumbles.png differ
diff --git a/graphics/misc/mon_markings.png b/graphics/misc/mon_markings.png
new file mode 100644
index 000000000..013173292
Binary files /dev/null and b/graphics/misc/mon_markings.png differ
diff --git a/graphics/misc/option_menu_equals_sign.png b/graphics/misc/option_menu_equals_sign.png
new file mode 100644
index 000000000..7e56e3cc3
Binary files /dev/null and b/graphics/misc/option_menu_equals_sign.png differ
diff --git a/graphics/misc/option_menu_text.pal b/graphics/misc/option_menu_text.pal
new file mode 100644
index 000000000..e7d6c330a
--- /dev/null
+++ b/graphics/misc/option_menu_text.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+255 180 82
+197 123 0
+255 139 131
+255 49 24
+74 74 74
+213 213 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/naming_screen/cursor.png b/graphics/naming_screen/cursor.png
old mode 100755
new mode 100644
diff --git a/graphics/naming_screen/keyboard_button.png b/graphics/naming_screen/keyboard_button.png
old mode 100755
new mode 100644
diff --git a/graphics/naming_screen/menu.pal b/graphics/naming_screen/menu.pal
old mode 100755
new mode 100644
diff --git a/graphics/naming_screen/menu.png b/graphics/naming_screen/menu.png
old mode 100755
new mode 100644
diff --git a/graphics/naming_screen/right_pointing_triangle.png b/graphics/naming_screen/right_pointing_triangle.png
old mode 100755
new mode 100644
diff --git a/graphics/naming_screen/roptions.png b/graphics/naming_screen/roptions.png
old mode 100755
new mode 100644
diff --git a/graphics/naming_screen/rwindow.png b/graphics/naming_screen/rwindow.png
old mode 100755
new mode 100644
diff --git a/graphics/naming_screen/underscore.png b/graphics/naming_screen/underscore.png
old mode 100755
new mode 100644
diff --git a/graphics/pokeblock/use_screen/condition.png b/graphics/pokeblock/use_screen/condition.png
old mode 100755
new mode 100644
diff --git a/graphics/pokeblock/use_screen/graph.bin b/graphics/pokeblock/use_screen/graph.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokeblock/use_screen/graph.png b/graphics/pokeblock/use_screen/graph.png
old mode 100755
new mode 100644
diff --git a/graphics/pokeblock/use_screen/nature.pal b/graphics/pokeblock/use_screen/nature.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokeblock/use_screen/updown.png b/graphics/pokeblock/use_screen/updown.png
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/area_unknown.png b/graphics/pokedex/area_unknown.png
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/fade.pal b/graphics/pokedex/fade.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/hoenn_bg.pal b/graphics/pokedex/hoenn_bg.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/menu.png b/graphics/pokedex/menu.png
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/menu2.png b/graphics/pokedex/menu2.png
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/national_bg.pal b/graphics/pokedex/national_bg.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/noball_unused.png b/graphics/pokedex/noball_unused.png
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/search1.bin b/graphics/pokedex/search1.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/search2.bin b/graphics/pokedex/search2.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/search_menu.pal b/graphics/pokedex/search_menu.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/search_menu.png b/graphics/pokedex/search_menu.png
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/text.pal b/graphics/pokedex/text.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap1.bin b/graphics/pokedex/tilemap1.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap2.bin b/graphics/pokedex/tilemap2.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap3.bin b/graphics/pokedex/tilemap3.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap4.bin b/graphics/pokedex/tilemap4.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap5.bin b/graphics/pokedex/tilemap5.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap6.bin b/graphics/pokedex/tilemap6.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap7.bin b/graphics/pokedex/tilemap7.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap8.bin b/graphics/pokedex/tilemap8.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokedex/tilemap9.bin b/graphics/pokedex/tilemap9.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokemon_storage/menu.png b/graphics/pokemon_storage/menu.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/86226E0.pal b/graphics/pokenav/86226E0.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8622700.pal b/graphics/pokenav/8622700.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8622720.pal b/graphics/pokenav/8622720.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8622868.pal b/graphics/pokenav/8622868.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/86231E8.pal b/graphics/pokenav/86231E8.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8623208.pal b/graphics/pokenav/8623208.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8623228.png b/graphics/pokenav/8623228.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/862323C.bin b/graphics/pokenav/862323C.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8623338.pal b/graphics/pokenav/8623338.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8623570.pal b/graphics/pokenav/8623570.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8623790.pal b/graphics/pokenav/8623790.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8624098.pal b/graphics/pokenav/8624098.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/8625660.png b/graphics/pokenav/8625660.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/862A5D4.pal b/graphics/pokenav/862A5D4.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/arrow2.png b/graphics/pokenav/arrow2.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/arrows_matchcall.png b/graphics/pokenav/arrows_matchcall.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/bg.bin b/graphics/pokenav/bg.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/bg.png b/graphics/pokenav/bg.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/blue_light.png b/graphics/pokenav/blue_light.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/cancel.pal b/graphics/pokenav/cancel.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/cancel.png b/graphics/pokenav/cancel.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/dewford_0.bin b/graphics/pokenav/city_maps/dewford_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/ever_grande_0.bin b/graphics/pokenav/city_maps/ever_grande_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/ever_grande_1.bin b/graphics/pokenav/city_maps/ever_grande_1.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/fallarbor_0.bin b/graphics/pokenav/city_maps/fallarbor_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/fortree_0.bin b/graphics/pokenav/city_maps/fortree_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/lavaridge_0.bin b/graphics/pokenav/city_maps/lavaridge_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/lilycove_0.bin b/graphics/pokenav/city_maps/lilycove_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/lilycove_1.bin b/graphics/pokenav/city_maps/lilycove_1.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/littleroot_0.bin b/graphics/pokenav/city_maps/littleroot_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/mauville_0.bin b/graphics/pokenav/city_maps/mauville_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/mauville_1.bin b/graphics/pokenav/city_maps/mauville_1.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/mossdeep_0.bin b/graphics/pokenav/city_maps/mossdeep_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/mossdeep_1.bin b/graphics/pokenav/city_maps/mossdeep_1.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/oldale_0.bin b/graphics/pokenav/city_maps/oldale_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/pacifidlog_0.bin b/graphics/pokenav/city_maps/pacifidlog_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/petalburg_0.bin b/graphics/pokenav/city_maps/petalburg_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/rustboro_0.bin b/graphics/pokenav/city_maps/rustboro_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/rustboro_1.bin b/graphics/pokenav/city_maps/rustboro_1.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/slateport_0.bin b/graphics/pokenav/city_maps/slateport_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/slateport_1.bin b/graphics/pokenav/city_maps/slateport_1.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/sootopolis_0.bin b/graphics/pokenav/city_maps/sootopolis_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/city_maps/verdanturf_0.bin b/graphics/pokenav/city_maps/verdanturf_0.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/condition.bin b/graphics/pokenav/condition.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/condition.png b/graphics/pokenav/condition.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/condition_search2.bin b/graphics/pokenav/condition_search2.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/condition_search2.png b/graphics/pokenav/condition_search2.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/header.bin b/graphics/pokenav/header.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/header.png b/graphics/pokenav/header.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/icon2.png b/graphics/pokenav/icon2.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/icon2_unused.png b/graphics/pokenav/icon2_unused.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/beauty.png b/graphics/pokenav/left_headers/beauty.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/condition.png b/graphics/pokenav/left_headers/condition.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/cool.png b/graphics/pokenav/left_headers/cool.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/cute.png b/graphics/pokenav/left_headers/cute.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/hoenn_map.png b/graphics/pokenav/left_headers/hoenn_map.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/main_menu.png b/graphics/pokenav/left_headers/main_menu.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/match_call.png b/graphics/pokenav/left_headers/match_call.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/palette.pal b/graphics/pokenav/left_headers/palette.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/party.png b/graphics/pokenav/left_headers/party.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/ribbons.png b/graphics/pokenav/left_headers/ribbons.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/search.png b/graphics/pokenav/left_headers/search.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/smart.png b/graphics/pokenav/left_headers/smart.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/left_headers/tough.png b/graphics/pokenav/left_headers/tough.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/marker.png b/graphics/pokenav/marker.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/message.bin b/graphics/pokenav/message.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/message.png b/graphics/pokenav/message.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/beauty.png b/graphics/pokenav/options/beauty.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/cancel.png b/graphics/pokenav/options/cancel.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/condition.png b/graphics/pokenav/options/condition.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/cool.png b/graphics/pokenav/options/cool.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/cute.png b/graphics/pokenav/options/cute.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/hoenn_map.png b/graphics/pokenav/options/hoenn_map.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/match_call.png b/graphics/pokenav/options/match_call.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/options.bin b/graphics/pokenav/options/options.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/options.pal b/graphics/pokenav/options/options.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/party.png b/graphics/pokenav/options/party.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/ribbons.png b/graphics/pokenav/options/ribbons.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/search.png b/graphics/pokenav/options/search.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/smart.png b/graphics/pokenav/options/smart.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/switch_off.png b/graphics/pokenav/options/switch_off.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/options/tough.png b/graphics/pokenav/options/tough.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/outline.png b/graphics/pokenav/outline.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/outline_map.bin b/graphics/pokenav/outline_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/pokeball.png b/graphics/pokenav/pokeball.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/pokeball_matchcall.pal b/graphics/pokenav/pokeball_matchcall.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/pokeball_matchcall.png b/graphics/pokenav/pokeball_matchcall.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons.bin b/graphics/pokenav/ribbons.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons.png b/graphics/pokenav/ribbons.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons_icon.png b/graphics/pokenav/ribbons_icon.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons_icon1.pal b/graphics/pokenav/ribbons_icon1.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons_icon2.pal b/graphics/pokenav/ribbons_icon2.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons_icon3.pal b/graphics/pokenav/ribbons_icon3.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons_icon4.pal b/graphics/pokenav/ribbons_icon4.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons_icon5.pal b/graphics/pokenav/ribbons_icon5.pal
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ribbons_icon_big.png b/graphics/pokenav/ribbons_icon_big.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/sparkle.png b/graphics/pokenav/sparkle.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ui_matchcall.bin b/graphics/pokenav/ui_matchcall.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ui_matchcall.png b/graphics/pokenav/ui_matchcall.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ui_ribbons.bin b/graphics/pokenav/ui_ribbons.bin
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/ui_ribbons.png b/graphics/pokenav/ui_ribbons.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/zoom.png b/graphics/pokenav/zoom.png
old mode 100755
new mode 100644
diff --git a/graphics/pokenav/zoom_tiles.png b/graphics/pokenav/zoom_tiles.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/chase.pal b/graphics/rayquaza_scene/chase.pal
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/chase_bg.bin b/graphics/rayquaza_scene/chase_bg.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/chase_bg.png b/graphics/rayquaza_scene/chase_bg.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/chase_streaks.bin b/graphics/rayquaza_scene/chase_streaks.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/chase_streaks.png b/graphics/rayquaza_scene/chase_streaks.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/clouds.pal b/graphics/rayquaza_scene/clouds.pal
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/clouds.png b/graphics/rayquaza_scene/clouds.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/clouds1.bin b/graphics/rayquaza_scene/clouds1.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/clouds2.bin b/graphics/rayquaza_scene/clouds2.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/clouds3.bin b/graphics/rayquaza_scene/clouds3.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/groudon.png b/graphics/rayquaza_scene/groudon.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/groudon_claw.png b/graphics/rayquaza_scene/groudon_claw.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/groudon_left.png b/graphics/rayquaza_scene/groudon_left.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/groudon_shoulder.png b/graphics/rayquaza_scene/groudon_shoulder.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/groudon_tail.png b/graphics/rayquaza_scene/groudon_tail.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/hush_bg.bin b/graphics/rayquaza_scene/hush_bg.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/hush_bg.pal b/graphics/rayquaza_scene/hush_bg.pal
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/hush_bg.png b/graphics/rayquaza_scene/hush_bg.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/hush_ring.bin b/graphics/rayquaza_scene/hush_ring.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/hush_ring.png b/graphics/rayquaza_scene/hush_ring.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/hush_ring_map.bin b/graphics/rayquaza_scene/hush_ring_map.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/kyogre.png b/graphics/rayquaza_scene/kyogre.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/kyogre_fin.png b/graphics/rayquaza_scene/kyogre_fin.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/kyogre_right.png b/graphics/rayquaza_scene/kyogre_right.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/kyogre_shoulder.png b/graphics/rayquaza_scene/kyogre_shoulder.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/overcast.bin b/graphics/rayquaza_scene/overcast.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/overcast.png b/graphics/rayquaza_scene/overcast.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/overcast2.bin b/graphics/rayquaza_scene/overcast2.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/overcast2.pal b/graphics/rayquaza_scene/overcast2.pal
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/overcast2.png b/graphics/rayquaza_scene/overcast2.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza.bin b/graphics/rayquaza_scene/rayquaza.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza.png b/graphics/rayquaza_scene/rayquaza.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_chase.bin b/graphics/rayquaza_scene/rayquaza_chase.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_chase.png b/graphics/rayquaza_scene/rayquaza_chase.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_chase2.bin b/graphics/rayquaza_scene/rayquaza_chase2.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_fly1.png b/graphics/rayquaza_scene/rayquaza_fly1.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_flyin.png b/graphics/rayquaza_scene/rayquaza_flyin.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_hover.png b/graphics/rayquaza_scene/rayquaza_hover.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_light.bin b/graphics/rayquaza_scene/rayquaza_light.bin
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_light.png b/graphics/rayquaza_scene/rayquaza_light.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/rayquaza_tail.png b/graphics/rayquaza_scene/rayquaza_tail.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/smoke.png b/graphics/rayquaza_scene/smoke.png
old mode 100755
new mode 100644
diff --git a/graphics/rayquaza_scene/splash.png b/graphics/rayquaza_scene/splash.png
old mode 100755
new mode 100644
diff --git a/graphics/roulette/center.png b/graphics/roulette/center.png
old mode 100755
new mode 100644
diff --git a/graphics/roulette/credit.png b/graphics/roulette/credit.png
old mode 100755
new mode 100644
diff --git a/graphics/roulette/headers.png b/graphics/roulette/headers.png
old mode 100755
new mode 100644
diff --git a/graphics/roulette/multiplier.png b/graphics/roulette/multiplier.png
old mode 100755
new mode 100644
diff --git a/graphics/roulette/numbers.png b/graphics/roulette/numbers.png
old mode 100755
new mode 100644
diff --git a/graphics/roulette/wheel.png b/graphics/roulette/wheel.png
old mode 100755
new mode 100644
diff --git a/graphics/roulette/window.png b/graphics/roulette/window.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/85A843E.pal b/graphics/slot_machine/85A843E.pal
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/85A845E.pal b/graphics/slot_machine/85A845E.pal
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/85A847E.pal b/graphics/slot_machine/85A847E.pal
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/85A84B0.pal b/graphics/slot_machine/85A84B0.pal
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/85A84D0.pal b/graphics/slot_machine/85A84D0.pal
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/85A84F0.pal b/graphics/slot_machine/85A84F0.pal
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/85A8524.pal b/graphics/slot_machine/85A8524.pal
new file mode 100644
index 000000000..b93d15ddc
--- /dev/null
+++ b/graphics/slot_machine/85A8524.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+0 0 0
+65 65 65
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/slot_machine/bolt.png b/graphics/slot_machine/bolt.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/duck.png b/graphics/slot_machine/duck.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/large_bolt/0.png b/graphics/slot_machine/large_bolt/0.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/large_bolt/1.png b/graphics/slot_machine/large_bolt/1.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/menu.bin b/graphics/slot_machine/menu.bin
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/menu.pal b/graphics/slot_machine/menu.pal
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/menu.png b/graphics/slot_machine/menu.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/0.png b/graphics/slot_machine/numbers/0.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/1.png b/graphics/slot_machine/numbers/1.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/2.png b/graphics/slot_machine/numbers/2.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/3.png b/graphics/slot_machine/numbers/3.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/4.png b/graphics/slot_machine/numbers/4.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/5.png b/graphics/slot_machine/numbers/5.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/6.png b/graphics/slot_machine/numbers/6.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/7.png b/graphics/slot_machine/numbers/7.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/8.png b/graphics/slot_machine/numbers/8.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/numbers/9.png b/graphics/slot_machine/numbers/9.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/pika_aura.png b/graphics/slot_machine/pika_aura.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_pikachu.png b/graphics/slot_machine/reel_pikachu.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_symbols/1.png b/graphics/slot_machine/reel_symbols/1.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_symbols/2.png b/graphics/slot_machine/reel_symbols/2.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_symbols/3.png b/graphics/slot_machine/reel_symbols/3.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_symbols/4.png b/graphics/slot_machine/reel_symbols/4.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_symbols/5.png b/graphics/slot_machine/reel_symbols/5.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_symbols/6.png b/graphics/slot_machine/reel_symbols/6.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_symbols/7.png b/graphics/slot_machine/reel_symbols/7.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time.png b/graphics/slot_machine/reel_time.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_explosion/0.png b/graphics/slot_machine/reel_time_explosion/0.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_explosion/1.png b/graphics/slot_machine/reel_time_explosion/1.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_machine.png b/graphics/slot_machine/reel_time_machine.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_numbers/0.png b/graphics/slot_machine/reel_time_numbers/0.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_numbers/1.png b/graphics/slot_machine/reel_time_numbers/1.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_numbers/2.png b/graphics/slot_machine/reel_time_numbers/2.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_numbers/3.png b/graphics/slot_machine/reel_time_numbers/3.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_numbers/4.png b/graphics/slot_machine/reel_time_numbers/4.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_numbers/5.png b/graphics/slot_machine/reel_time_numbers/5.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/reel_time_pikachu.png b/graphics/slot_machine/reel_time_pikachu.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/shadow.png b/graphics/slot_machine/shadow.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/slots_layout.bin b/graphics/slot_machine/slots_layout.bin
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/smoke.png b/graphics/slot_machine/smoke.png
old mode 100755
new mode 100644
diff --git a/graphics/slot_machine/spr6.pal b/graphics/slot_machine/spr6.pal
old mode 100755
new mode 100644
diff --git a/graphics/title_screen/title_screen1.bin b/graphics/title_screen/title_screen1.bin
old mode 100755
new mode 100644
diff --git a/graphics/title_screen/title_screen2.bin b/graphics/title_screen/title_screen2.bin
old mode 100755
new mode 100644
diff --git a/graphics/trade/buttons.png b/graphics/trade/buttons.png
old mode 100755
new mode 100644
diff --git a/graphics/trade/menu.pal b/graphics/trade/menu.pal
old mode 100755
new mode 100644
diff --git a/graphics/trade/menu.png b/graphics/trade/menu.png
old mode 100755
new mode 100644
diff --git a/graphics/trainer_card/0star.pal b/graphics/trainer_card/0star.pal
old mode 100755
new mode 100644
diff --git a/graphics/trainer_card/0star_fr.pal b/graphics/trainer_card/0star_fr.pal
old mode 100755
new mode 100644
diff --git a/graphics/trainer_card/card.png b/graphics/trainer_card/card.png
old mode 100755
new mode 100644
diff --git a/graphics/trainer_card/card_fr.png b/graphics/trainer_card/card_fr.png
old mode 100755
new mode 100644
diff --git a/graphics/types/bug.png b/graphics/types/bug.png
old mode 100755
new mode 100644
diff --git a/graphics/types/contest_beauty.png b/graphics/types/contest_beauty.png
old mode 100755
new mode 100644
diff --git a/graphics/types/contest_cool.png b/graphics/types/contest_cool.png
old mode 100755
new mode 100644
diff --git a/graphics/types/contest_cute.png b/graphics/types/contest_cute.png
old mode 100755
new mode 100644
diff --git a/graphics/types/contest_smart.png b/graphics/types/contest_smart.png
old mode 100755
new mode 100644
diff --git a/graphics/types/contest_tough.png b/graphics/types/contest_tough.png
old mode 100755
new mode 100644
diff --git a/graphics/types/dark.png b/graphics/types/dark.png
old mode 100755
new mode 100644
diff --git a/graphics/types/dragon.png b/graphics/types/dragon.png
old mode 100755
new mode 100644
diff --git a/graphics/types/electric.png b/graphics/types/electric.png
old mode 100755
new mode 100644
diff --git a/graphics/types/fight.png b/graphics/types/fight.png
old mode 100755
new mode 100644
diff --git a/graphics/types/fire.png b/graphics/types/fire.png
old mode 100755
new mode 100644
diff --git a/graphics/types/flying.png b/graphics/types/flying.png
old mode 100755
new mode 100644
diff --git a/graphics/types/ghost.png b/graphics/types/ghost.png
old mode 100755
new mode 100644
diff --git a/graphics/types/grass.png b/graphics/types/grass.png
old mode 100755
new mode 100644
diff --git a/graphics/types/ground.png b/graphics/types/ground.png
old mode 100755
new mode 100644
diff --git a/graphics/types/ice.png b/graphics/types/ice.png
old mode 100755
new mode 100644
diff --git a/graphics/types/move_types_1.pal b/graphics/types/move_types_1.pal
old mode 100755
new mode 100644
diff --git a/graphics/types/move_types_2.pal b/graphics/types/move_types_2.pal
old mode 100755
new mode 100644
diff --git a/graphics/types/move_types_3.pal b/graphics/types/move_types_3.pal
old mode 100755
new mode 100644
diff --git a/graphics/types/mystery.png b/graphics/types/mystery.png
old mode 100755
new mode 100644
diff --git a/graphics/types/normal.png b/graphics/types/normal.png
old mode 100755
new mode 100644
diff --git a/graphics/types/poison.png b/graphics/types/poison.png
old mode 100755
new mode 100644
diff --git a/graphics/types/psychic.png b/graphics/types/psychic.png
old mode 100755
new mode 100644
diff --git a/graphics/types/rock.png b/graphics/types/rock.png
old mode 100755
new mode 100644
diff --git a/graphics/types/steel.png b/graphics/types/steel.png
old mode 100755
new mode 100644
diff --git a/graphics/types/water.png b/graphics/types/water.png
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C035B8.png b/graphics/unknown/unknown_C035B8.png
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C06D98.png b/graphics/unknown/unknown_C06D98.png
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C06D98_2.pal b/graphics/unknown/unknown_C06D98_2.pal
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C0CA1C.bin b/graphics/unknown/unknown_C0CA1C.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C0CA40.bin b/graphics/unknown/unknown_C0CA40.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C0CA64.bin b/graphics/unknown/unknown_C0CA64.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C0CAE0.bin b/graphics/unknown/unknown_C0CAE0.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C15BC0.bin b/graphics/unknown/unknown_C15BC0.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C17170.bin b/graphics/unknown/unknown_C17170.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C17410.bin b/graphics/unknown/unknown_C17410.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C1751C.bin b/graphics/unknown/unknown_C1751C.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C17980.bin b/graphics/unknown/unknown_C17980.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C19470.png b/graphics/unknown/unknown_C19470.png
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_C2F9E0.pal b/graphics/unknown/unknown_C2F9E0.pal
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D0D2B4.bin b/graphics/unknown/unknown_D0D2B4.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D12FEC.png b/graphics/unknown/unknown_D12FEC.png
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D1300C.png b/graphics/unknown/unknown_D1300C.png
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D1C060.bin b/graphics/unknown/unknown_D1C060.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D1C060.png b/graphics/unknown/unknown_D1C060.png
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D83900.bin b/graphics/unknown/unknown_D83900.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D83B2C.bin b/graphics/unknown/unknown_D83B2C.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D83C3C.bin b/graphics/unknown/unknown_D83C3C.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D84970.bin b/graphics/unknown/unknown_D84970.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D84F00.bin b/graphics/unknown/unknown_D84F00.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D8C374.bin b/graphics/unknown/unknown_D8C374.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D8C5C4.bin b/graphics/unknown/unknown_D8C5C4.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D95E00.bin b/graphics/unknown/unknown_D95E00.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D960D0.bin b/graphics/unknown/unknown_D960D0.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D963A4.bin b/graphics/unknown/unknown_D963A4.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D9A88C.bin b/graphics/unknown/unknown_D9A88C.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D9AE04.bin b/graphics/unknown/unknown_D9AE04.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_D9AF44.pal b/graphics/unknown/unknown_D9AF44.pal
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD19F8.bin b/graphics/unknown/unknown_DD19F8.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD1A18.png b/graphics/unknown/unknown_DD1A18.png
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD1F78.bin b/graphics/unknown/unknown_DD1F78.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD2010.bin b/graphics/unknown/unknown_DD2010.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD21B0.bin b/graphics/unknown/unknown_DD21B0.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD228C.bin b/graphics/unknown/unknown_DD228C.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD2AE0.bin b/graphics/unknown/unknown_DD2AE0.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD2B78.bin b/graphics/unknown/unknown_DD2B78.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD2D30.bin b/graphics/unknown/unknown_DD2D30.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD2E5C.bin b/graphics/unknown/unknown_DD2E5C.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD36C8.bin b/graphics/unknown/unknown_DD36C8.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD4544.bin b/graphics/unknown/unknown_DD4544.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD4620.bin b/graphics/unknown/unknown_DD4620.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD46E0.bin b/graphics/unknown/unknown_DD46E0.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DD47A0.bin b/graphics/unknown/unknown_DD47A0.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DDB444.pal b/graphics/unknown/unknown_DDB444.pal
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DDCF04.bin b/graphics/unknown/unknown_DDCF04.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_DDD704.bin b/graphics/unknown/unknown_DDD704.bin
old mode 100755
new mode 100644
diff --git a/graphics/unknown/unknown_E6BC04.bin b/graphics/unknown/unknown_E6BC04.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/basic_frame.bin b/graphics/unused/basic_frame.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/basic_frame.png b/graphics/unused/basic_frame.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/battle_anim_023.pal b/graphics/unused/battle_anim_023.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/blank_frame.bin b/graphics/unused/blank_frame.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/blue_frame.bin b/graphics/unused/blue_frame.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/color_frames.png b/graphics/unused/color_frames.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/goosuto.bin b/graphics/unused/goosuto.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/goosuto.png b/graphics/unused/goosuto.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/green_frame.bin b/graphics/unused/green_frame.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/line_sketch.png b/graphics/unused/line_sketch.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/line_sketch_2.bin b/graphics/unused/line_sketch_2.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/line_sketch_2.png b/graphics/unused/line_sketch_2.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/metronome_hand_small.png b/graphics/unused/metronome_hand_small.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/music_notes.png b/graphics/unused/music_notes.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_battle_interface_1.png b/graphics/unused/old_battle_interface_1.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_battle_interface_2.png b/graphics/unused/old_battle_interface_2.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_battle_interface_3.png b/graphics/unused/old_battle_interface_3.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_battle_interface_tilemap.bin b/graphics/unused/old_battle_interface_tilemap.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_beatup.png b/graphics/unused/old_beatup.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_bulbasaur.png b/graphics/unused/old_bulbasaur.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_bulbasaur2.png b/graphics/unused/old_bulbasaur2.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_charizard.png b/graphics/unused/old_charizard.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_charmap.bin b/graphics/unused/old_charmap.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_charmap.pal b/graphics/unused/old_charmap.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_charmap.png b/graphics/unused/old_charmap.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest.bin b/graphics/unused/old_contest.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest.pal b/graphics/unused/old_contest.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_2.bin b/graphics/unused/old_contest_2.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_2.pal b/graphics/unused/old_contest_2.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_2_1.png b/graphics/unused/old_contest_2_1.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_2_2.png b/graphics/unused/old_contest_2_2.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_classes.png b/graphics/unused/old_contest_classes.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_floor.png b/graphics/unused/old_contest_floor.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_frame_1.png b/graphics/unused/old_contest_frame_1.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_frame_2.png b/graphics/unused/old_contest_frame_2.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_meter.png b/graphics/unused/old_contest_meter.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_numbers.png b/graphics/unused/old_contest_numbers.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_contest_symbols.png b/graphics/unused/old_contest_symbols.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_pal1.pal b/graphics/unused/old_pal1.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_pal2.pal b/graphics/unused/old_pal2.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_pal3.pal b/graphics/unused/old_pal3.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_pal4.pal b/graphics/unused/old_pal4.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_pal5.pal b/graphics/unused/old_pal5.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_pal6.pal b/graphics/unused/old_pal6.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/old_pal7.pal b/graphics/unused/old_pal7.pal
old mode 100755
new mode 100644
diff --git a/graphics/unused/red_frame.bin b/graphics/unused/red_frame.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/shadow.png b/graphics/unused/shadow.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/unused_DDCEE4.bin b/graphics/unused/unused_DDCEE4.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/water_splash.bin b/graphics/unused/water_splash.bin
old mode 100755
new mode 100644
diff --git a/graphics/unused/water_splash.png b/graphics/unused/water_splash.png
old mode 100755
new mode 100644
diff --git a/graphics/unused/yellow_frame.bin b/graphics/unused/yellow_frame.bin
old mode 100755
new mode 100644
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 47cc5ad7f..018f35490 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -18,6 +18,7 @@ SLOTMACHINEGFXDIR := graphics/slot_machine
 PKNAVGFXDIR := graphics/pokenav
 PKNAVOPTIONSGFXDIR := graphics/pokenav/options
 PSSGFXDIR := graphics/pokemon_storage
+MAPOBJGFXDIR := graphics/map_objects
 MISCGFXDIR := graphics/misc
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
@@ -630,6 +631,15 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico
 $(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp
 	@cat $^ >$@
 
+$(MAPOBJGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 11
+
+$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 8
+	
+$(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 43
+	
 $(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
 								$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
 								$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 941f40efb..63e053cbd 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -484,7 +484,7 @@
 #define FLAG_0x1E1               0x1E1
 #define FLAG_0x1E2               0x1E2
 #define FLAG_0x1E3               0x1E3
-#define FLAG_0x1E4               0x1E4
+#define FLAG_MYSTERY_EVENT_DONE  0x1E4
 #define FLAG_0x1E5               0x1E5
 #define FLAG_0x1E6               0x1E6
 #define FLAG_0x1E7               0x1E7
diff --git a/include/constants/vars.h b/include/constants/vars.h
index b8bd46a96..c0e3313b6 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -48,7 +48,7 @@
 #define VAR_HAPPINESS_STEP_COUNTER 0x402A
 #define VAR_POISON_STEP_COUNTER    0x402B
 #define VAR_RESET_RTC_ENABLE       0x402C
-#define VAR_0x402D                 0x402D
+#define VAR_ENIGMA_BERRY_AVAILABLE 0x402D
 #define VAR_0x402E                 0x402E
 
 #define VAR_FRONTIER_MANIAC_FACILITY        0x402F
@@ -226,7 +226,7 @@
 #define VAR_0x40DA                 0x40DA
 #define VAR_0x40DB                 0x40DB
 #define VAR_0x40DC                 0x40DC
-#define VAR_0x40DD                 0x40DD
+#define VAR_EVENT_PICHU_SLOT       0x40DD
 #define VAR_0x40DE                 0x40DE
 #define VAR_0x40DF                 0x40DF
 #define VAR_0x40E0                 0x40E0
diff --git a/include/event_scripts.h b/include/event_scripts.h
old mode 100755
new mode 100644
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
old mode 100755
new mode 100644
diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h
old mode 100755
new mode 100644
diff --git a/include/global.h b/include/global.h
index c32909c93..8b1925513 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_GLOBAL_H
 #define GUARD_GLOBAL_H
 
+#include <string.h>
 #include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines.
 #include "gba/gba.h"
 
@@ -12,11 +13,16 @@
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided")
 #define ASM_DIRECT __attribute__((naked))
 
+// IDE support
 #if defined (__APPLE__) || defined (__CYGWIN__)
-void *memset(void *, int, size_t);
-void *memcpy(void *, const void *, size_t);
-int strcmp(const char *s1, const char *s2);
-char* strcpy(char *dst0, const char *src0);
+#define _(x) x
+#define __(x) x
+#define INCBIN_U8 {0}
+#define INCBIN_U16 {0}
+#define INCBIN_U32 {0}
+#define INCBIN_S8 {0}
+#define INCBIN_S16 {0}
+#define INCBIN_S32 {0}
 #endif // __APPLE__
 
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
diff --git a/include/graphics.h b/include/graphics.h
index 85e31aec9..5917e9d2a 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -1,6 +1,10 @@
 #ifndef GUARD_GRAPHICS_H
 #define GUARD_GRAPHICS_H
 
+// overworld
+extern const u32 gMessageBox_Gfx[];
+extern const u16 gMessageBox_Pal[];
+
 // interface pokeballs
 extern const u8 gInterfaceGfx_PokeBall[];
 extern const u8 gInterfacePal_PokeBall[];
diff --git a/include/mystery_event_msg.h b/include/mystery_event_msg.h
new file mode 100644
index 000000000..465b60ccb
--- /dev/null
+++ b/include/mystery_event_msg.h
@@ -0,0 +1,16 @@
+#ifndef GUARD_MYSTERY_EVENT_MSG_H
+#define GUARD_MYSTERY_EVENT_MSG_H
+
+extern const u8 gText_MysteryGiftBerry[];
+extern const u8 gText_MysteryGiftBerryTransform[];
+extern const u8 gText_MysteryGiftBerryObtained[];
+extern const u8 gText_MysteryGiftSpecialRibbon[];
+extern const u8 gText_MysteryGiftNationalDex[];
+extern const u8 gText_MysteryGiftRareWord[];
+extern const u8 gText_MysteryGiftSentOver[];
+extern const u8 gText_MysteryGiftFullParty[];
+extern const u8 gText_MysteryGiftNewTrainer[];
+extern const u8 gText_MysteryGiftNewAdversaryInBattleTower[];
+extern const u8 gText_MysteryGiftCantBeUsed[];
+
+#endif // GUARD_MYSTERY_EVENT_MSG_H
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index ab23a8d00..991cab53a 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -1,7 +1,9 @@
 #ifndef GUARD_MYSTERY_EVENT_SCRIPT_H
 #define GUARD_MYSTERY_EVENT_SCRIPT_H
 
-u32 RunMysteryEventScript(u8 *);
+void sub_8153870(u8 *script);
+bool32 sub_8153884(u32 *a0);
+u32 RunMysteryEventScript(u8 *script);
 void SetMysteryEventScriptStatus(u32 val);
 u16 GetRecordMixingGift(void);
 
diff --git a/include/option_menu.h b/include/option_menu.h
new file mode 100644
index 000000000..b23a73c4c
--- /dev/null
+++ b/include/option_menu.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_OPTION_MENU_H
+#define GUARD_OPTION_MENU_H
+
+void CB2_InitOptionMenu(void);
+
+#endif // GUARD_OPTION_MENU_H
diff --git a/include/strings.h b/include/strings.h
index ea1852a14..186a48ff0 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -153,6 +153,10 @@ extern const u8 gText_MoveItemsDescription[];
 extern const u8 gText_SeeYa[];
 extern const u8 gText_SeeYaDescription[];
 
+extern const u8 gText_EggNickname[];
+extern const u8 gText_Pokemon[];
+extern const u8 gText_InGameClockUsable[];
+
 // menu texts
 extern const u8 gText_MenuPokedex[];
 extern const u8 gText_MenuPokemon[];
@@ -175,4 +179,29 @@ extern const u8 gText_Peak[];
 extern const u8 gText_SafariBallStock[];
 extern const u8 gText_BattlePyramidFloor[];
 
+// option menu texts
+extern const u8 gText_TextSpeedSlow[];
+extern const u8 gText_TextSpeedMid[];
+extern const u8 gText_TextSpeedFast[];
+extern const u8 gText_BattleSceneOn[];
+extern const u8 gText_BattleSceneOff[];
+extern const u8 gText_BattleStyleShift[];
+extern const u8 gText_BattleStyleSet[];
+extern const u8 gText_SoundMono[];
+extern const u8 gText_SoundStereo[];
+extern const u8 gText_FrameTypeNumber[];
+extern const u8 gText_FrameType[];
+extern const u8 gText_ButtonTypeNormal[];
+extern const u8 gText_ButtonTypeLR[];
+extern const u8 gText_ButtonTypeLEqualsA[];
+extern const u8 gText_Option[];
+extern const u8 gText_OptionMenu[];
+extern const u8 gText_TextSpeed[];
+extern const u8 gText_BattleScene[];
+extern const u8 gText_BattleStyle[];
+extern const u8 gText_Sound[];
+extern const u8 gText_Frame[];
+extern const u8 gText_OptionMenuCancel[];
+extern const u8 gText_ButtonMode[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/text_window.h b/include/text_window.h
index 0af007397..e6a753fcb 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -1,13 +1,18 @@
 #ifndef GUARD_TEXT_WINDOW_H
 #define GUARD_TEXT_WINDOW_H
 
+#define WINDOW_FRAMES_COUNT 20
+
 struct TilesPal
 {
-    u32 *tiles;
-    u16 *pal;
+    const u32 *tiles;
+    const u16 *pal;
 };
 
-const struct TilesPal* sub_8098758(u8 id);
+extern const u32 gTextWindowFrame1_Gfx[];
+extern const u16 gTextWindowFrame1_Pal[];
+
+const struct TilesPal* GetWindowFrameTilesPal(u8 id);
 void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset);
 void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset);
 void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset);
@@ -15,8 +20,8 @@ void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset);
 void sub_8098858(u8 windowId, u16 tileNum, u8 palNum);
 void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum);
 void rbox_fill_rectangle(u8 windowId);
-const u16* stdpal_get(u8 id);
-const u16* GetOverworldTextboxPalettePtr(void);
+const u16 *stdpal_get(u8 id);
+const u16 *GetOverworldTextboxPalettePtr(void);
 void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
 
 #endif // GUARD_TEXT_WINDOW_H
diff --git a/include/unknown_task.h b/include/unknown_task.h
index 9c6968c30..906fed3e0 100644
--- a/include/unknown_task.h
+++ b/include/unknown_task.h
@@ -15,7 +15,7 @@ extern struct UnknownTaskStruct gUnknown_0831AC70;
 // Exported RAM declarations
 
 // Exported ROM declarations
-void remove_some_task(void);
+void ScanlineEffect_Stop(void);
 void sub_80BA038(struct UnknownTaskStruct arg0);
 void sub_80BA0A8(void);
 
diff --git a/ld_script.txt b/ld_script.txt
index de08079fc..7fad973fb 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -130,7 +130,7 @@ SECTIONS {
         src/wild_encounter.o(.text);
         asm/field_effect.o(.text);
         asm/unknown_task.o(.text);
-        asm/option_menu.o(.text);
+        src/option_menu.o(.text);
         src/pokedex.o(.text);
         asm/pokedex.o(.text);
         asm/trainer_card.o(.text);
@@ -190,7 +190,7 @@ SECTIONS {
         asm/post_battle_event_funcs.o(.text);
         asm/time_events.o(.text);
         asm/birch_pc.o(.text);
-        asm/hof_pc.o(.text);
+        src/hof_pc.o(.text);
         asm/field_specials.o(.text);
         asm/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
@@ -208,7 +208,7 @@ SECTIONS {
         asm/roulette_util.o(.text);
         asm/cable_car_util.o(.text);
         src/save.o(.text);
-        asm/mystery_event_script.o(.text);
+        src/mystery_event_script.o(.text);
         asm/field_effect_helpers.o(.text);
         asm/contest_ai.o(.text);
         asm/battle_anim_sound_tasks.o(.text);
@@ -291,7 +291,7 @@ SECTIONS {
         data/battle_scripts_2.o(script_data);
         data/battle_ai_scripts.o(script_data);
         data/contest_ai_scripts.o(script_data);
-        data/script_funcs.o(script_data);
+        data/mystery_event_script_cmd_table.o(script_data);
     } =0
 
     lib_text :
@@ -410,7 +410,7 @@ SECTIONS {
         data/field_map_obj.o(.rodata);
         data/field_ground_effect.o(.rodata);
         data/map_obj_8097404.o(.rodata);
-        data/text_window.o(.rodata);
+        src/text_window.o(.rodata);
         src/scrcmd.o(.rodata);
         data/coord_event_weather.o(.rodata);
         data/field_tasks.o(.rodata);
@@ -431,7 +431,7 @@ SECTIONS {
         src/trainer_see.o(.rodata);
         data/wild_encounter.o(.rodata);
         data/field_effect.o(.rodata);
-        data/option_menu.o(.rodata);
+        src/option_menu.o(.rodata);
         src/pokedex.o(.rodata);
         data/pokedex.o(.rodata);
         data/trainer_card.o(.rodata);
@@ -547,6 +547,7 @@ SECTIONS {
         src/unk_transition.o(.rodata);
         data/link_strings.o(.rodata);
         data/fonts.o(.rodata);
+        src/mystery_event_msg.o(.rodata);
         data/mystery_event_msg.o(.rodata);
         src/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);
diff --git a/src/battle_transition.c b/src/battle_transition.c
index ca2134837..e003e0fce 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -2730,6 +2730,10 @@ static bool8 Phase2_ShredSplit_Func2(struct Task *task)
     return FALSE;
 }
 
+// This function never increments the state counter, because the loop condition
+// is always false, resulting in the game being stuck in an infinite loop.
+// It's possible this transition is only partially 
+// done and the second part was left out.
 static bool8 Phase2_ShredSplit_Func3(struct Task *task)
 {
     u16 i;
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index f233dc645..8a9b0caed 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -141,7 +141,7 @@ void InitBerryFixProgram(void)
     SetVBlankCallback(NULL);
     ResetSpriteData();
     ResetTasks();
-    remove_some_task();
+    ScanlineEffect_Stop();
     SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
     berry_fix_mb_manager = AllocZeroed(0x50);
     berry_fix_mb_manager->state = 0;
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
old mode 100755
new mode 100644
diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c
old mode 100755
new mode 100644
diff --git a/src/diploma.c b/src/diploma.c
old mode 100755
new mode 100644
index d4a269757..fedc10bd0
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -72,7 +72,7 @@ void CB2_ShowDiploma(void)
     DmaFill16(3, 0, VRAM, VRAM_SIZE);
     DmaFill32(3, 0, OAM, OAM_SIZE);
     DmaFill16(3, 0, PLTT, PLTT_SIZE);
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     ResetPaletteFade();
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index ed1e7f4cc..b3cd88585 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -63,7 +63,7 @@ extern void sub_806A068(u16, u8);
 extern void fade_screen(u8, u8);
 extern void overworld_free_bg_tilemaps(void);
 extern void sub_80AF168(void);
-extern void remove_some_task(void);
+extern void ScanlineEffect_Stop(void);
 extern void c2_exit_to_overworld_2_switch(void);
 extern void play_some_sound(void);
 extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback);
@@ -506,7 +506,7 @@ static void CB2_EggHatch_0(void)
         FreeAllSpritePalettes();
         ResetSpriteData();
         ResetTasks();
-        remove_some_task();
+        ScanlineEffect_Stop();
         m4aSoundVSyncOn();
         gMain.state++;
         break;
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 536eb6979..2ce788f8e 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -266,7 +266,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
     sub_80356D0();
     LoadBattleTextboxAndBackground();
     ResetSpriteData();
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     FreeAllSpritePalettes();
 
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
old mode 100755
new mode 100644
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
old mode 100755
new mode 100644
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 4465f65a3..3e70e22fa 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -1302,7 +1302,7 @@ static void ClearVramOamPltt_LoadHofPal(void)
 
 static void sub_8174F70(void)
 {
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     reset_temp_tile_data_buffers();
diff --git a/src/hof_pc.c b/src/hof_pc.c
new file mode 100644
index 000000000..e772f04e8
--- /dev/null
+++ b/src/hof_pc.c
@@ -0,0 +1,46 @@
+#include "global.h"
+#include "hall_of_fame.h"
+#include "main.h"
+#include "palette.h"
+#include "overworld.h"
+#include "script.h"
+#include "script_menu.h"
+#include "task.h"
+
+extern void (*gFieldCallback)(void);
+extern void (*gUnknown_0300485C)(void);
+
+extern void Overworld_PlaySpecialMapMusic(void);
+extern bool16 ScrSpecial_CreatePCMenu(void);
+extern void ScriptMenu_DisplayPCStartupPrompt(void);
+
+static void ReshowPCMenuAfterHallOfFamePC(void);
+static void Task_WaitForPaletteFade(u8);
+
+void AccessHallOfFamePC(void)
+{
+    SetMainCallback2(CB2_DoHallOfFamePC);
+    ScriptContext2_Enable();
+}
+
+void ReturnFromHallOfFamePC(void)
+{
+    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    gFieldCallback = ReshowPCMenuAfterHallOfFamePC;
+}
+
+static void ReshowPCMenuAfterHallOfFamePC(void)
+{
+    ScriptContext2_Enable();
+    Overworld_PlaySpecialMapMusic();
+    ScrSpecial_CreatePCMenu();
+    ScriptMenu_DisplayPCStartupPrompt();
+    BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0);
+    CreateTask(Task_WaitForPaletteFade, 10);
+}
+
+static void Task_WaitForPaletteFade(u8 taskId)
+{
+    if (!gPaletteFade.active)
+        DestroyTask(taskId);
+}
diff --git a/src/libisagbprn.c b/src/libisagbprn.c
old mode 100755
new mode 100644
diff --git a/src/link.c b/src/link.c
index 65c5d3982..5a47e2fac 100644
--- a/src/link.c
+++ b/src/link.c
@@ -1637,7 +1637,7 @@ void CB2_LinkError(void)
     ResetPaletteFadeControl();
     FillPalette(0, 0, 2);
     ResetTasks();
-    remove_some_task();
+    ScanlineEffect_Stop();
     if (gWirelessCommType)
     {
         if (!sLinkErrorBuffer.unk_06)
diff --git a/src/mail.c b/src/mail.c
index 68a55e242..c3cbe4a3c 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -240,30 +240,6 @@ static const struct MailLayout sUnknown_0859F458[] = {
     { 0x05, 0x09, 0x60, 0x05, 0x1e, Unknown_0859F444 }
 };
 
-// What the heck are these meant to be? Call them u16 for now.
-
-static const u16 Unknown_0859F4E8[] = {
-    0x00, 0x4000, 0x00, 0x00
-};
-
-static const u16 Unknown_0859F4F0[] = {
-    0x00, 0x00, -1, 0x00
-};
-
-static const u16 Unknown_0859F4F8[] = {
-    0x04, 0x00, -1, 0x00
-};
-
-static const u16 Unknown_0859F500[] = {
-    0x00, 0x40, -1, 0x00
-};
-
-static const u16 *const sUnknown_0859F508[] = {
-    Unknown_0859F4F0,
-    Unknown_0859F4F8,
-    Unknown_0859F500
-};
-
 // .text
 
 void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag)
@@ -329,7 +305,7 @@ static bool8 MailReadBuildGraphics(void)
     {
         case 0:
             SetVBlankCallback(NULL);
-            remove_some_task();
+            ScanlineEffect_Stop();
             SetGpuReg(REG_OFFSET_DISPCNT, 0x0000);
             break;
         case 1:
diff --git a/src/main.c b/src/main.c
index 822aeda21..9f3a815b0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,8 @@
 #include "intro.h"
 #include "main.h"
 
+extern void sub_800B9B8(void);
+extern u8 gUnknown_03002748;
 extern u32 *gUnknown_0203CF5C;
 
 static void VBlankIntr(void);
@@ -405,7 +407,7 @@ void DoSoftReset(void)
 {
     REG_IME = 0;
     m4aSoundVSyncOff();
-    remove_some_task();
+    ScanlineEffect_Stop();
     DmaStop(1);
     DmaStop(2);
     DmaStop(3);
diff --git a/src/mystery_event_msg.c b/src/mystery_event_msg.c
new file mode 100644
index 000000000..74261179b
--- /dev/null
+++ b/src/mystery_event_msg.c
@@ -0,0 +1,13 @@
+#include "global.h"
+
+const u8 gText_MysteryGiftBerry[] = _("Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.");
+const u8 gText_MysteryGiftBerryTransform[] = _("The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.");
+const u8 gText_MysteryGiftBerryObtained[] = _("The {STR_VAR_1} BERRY has already been\nobtained.");
+const u8 gText_MysteryGiftSpecialRibbon[] = _("A special RIBBON was awarded to\nyour party POKéMON.");
+const u8 gText_MysteryGiftNationalDex[] = _("The POKéDEX has been upgraded\nwith the NATIONAL MODE.");
+const u8 gText_MysteryGiftRareWord[] = _("A rare word has been added.");
+const u8 gText_MysteryGiftSentOver[] = _("{STR_VAR_1} was sent over!");
+const u8 gText_MysteryGiftFullParty[] = _("Your party is full.\n{STR_VAR_1} could not be sent over.");
+const u8 gText_MysteryGiftNewTrainer[] = _("A new TRAINER has arrived in\nHOENN.");
+const u8 gText_MysteryGiftNewAdversaryInBattleTower[] = _("A new adversary has arrived in the\nBATTLE TOWER.");
+const u8 gText_MysteryGiftCantBeUsed[] = _("This data can’t be used in\nthis version.");
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
new file mode 100644
index 000000000..8822cd05a
--- /dev/null
+++ b/src/mystery_event_script.c
@@ -0,0 +1,396 @@
+#include "global.h"
+#include "berry.h"
+#include "battle_tower.h"
+#include "easy_chat.h"
+#include "event_data.h"
+#include "mail.h"
+#include "mystery_event_script.h"
+#include "pokedex.h"
+#include "pokemon.h"
+#include "pokemon_size_record.h"
+#include "script.h"
+#include "constants/species.h"
+#include "strings.h"
+#include "string_util.h"
+#include "text.h"
+#include "util.h"
+#include "mystery_event_msg.h"
+#include "pokemon_storage_system.h"
+
+extern void sub_811EFC0(u8);
+extern void ValidateEReaderTrainer(void);
+
+extern ScrCmdFunc gMysteryEventScriptCmdTable[];
+extern ScrCmdFunc gMysteryEventScriptCmdTableEnd[];
+
+#define LANGUAGE_MASK 0x1
+#define VERSION_MASK 0x200
+
+EWRAM_DATA static struct ScriptContext sMysteryEventScriptContext = {0};
+
+static bool32 CheckCompatibility(u16 a1, u32 a2, u16 a3, u32 a4)
+{
+    if (!(a1 & LANGUAGE_MASK))
+        return FALSE;
+
+    if (!(a2 & LANGUAGE_MASK))
+        return FALSE;
+
+    if (!(a3 & 0x4))
+        return FALSE;
+
+    if (!(a4 & VERSION_MASK))
+        return FALSE;
+
+    return TRUE;
+}
+
+static void SetIncompatible(void)
+{
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftCantBeUsed);
+    SetMysteryEventScriptStatus(3);
+}
+
+static void InitMysteryEventScript(struct ScriptContext *ctx, u8 *script)
+{
+    InitScriptContext(ctx, gMysteryEventScriptCmdTable, gMysteryEventScriptCmdTableEnd);
+    SetupBytecodeScript(ctx, script);
+    ctx->data[0] = (u32)script;
+    ctx->data[1] = 0;
+    ctx->data[2] = 0;
+    ctx->data[3] = 0;
+}
+
+static bool32 RunMysteryEventScriptCommand(struct ScriptContext *ctx)
+{
+    if (RunScriptCommand(ctx) && ctx->data[3])
+        return TRUE;
+    else
+        return FALSE;
+}
+
+void sub_8153870(u8 *script)
+{
+    InitMysteryEventScript(&sMysteryEventScriptContext, script);
+}
+
+bool32 sub_8153884(u32 *a0)
+{
+    bool32 ret = RunMysteryEventScriptCommand(&sMysteryEventScriptContext);
+    *a0 = sMysteryEventScriptContext.data[2];
+
+    return ret;
+}
+
+u32 RunMysteryEventScript(u8 *script)
+{
+    struct ScriptContext *ctx = &sMysteryEventScriptContext;
+    InitMysteryEventScript(ctx, script);
+    while (RunMysteryEventScriptCommand(ctx));
+
+    return ctx->data[2];
+}
+
+void SetMysteryEventScriptStatus(u32 val)
+{
+    sMysteryEventScriptContext.data[2] = val;
+}
+
+static int CalcRecordMixingGiftChecksum(void)
+{
+    unsigned int i;
+    int sum = 0;
+    u8 *data = (u8*)(&gSaveBlock1Ptr->recordMixingGift.data);
+
+    for (i = 0; i < sizeof(gSaveBlock1Ptr->recordMixingGift.data); i++)
+        sum += data[i];
+
+    return sum;
+}
+
+static bool32 IsRecordMixingGiftValid(void)
+{
+    struct RecordMixingGiftData *data = &gSaveBlock1Ptr->recordMixingGift.data;
+    int checksum = CalcRecordMixingGiftChecksum();
+
+    if (data->unk0 == 0
+        || data->quantity == 0
+        || data->itemId == 0
+        || checksum == 0
+        || checksum != gSaveBlock1Ptr->recordMixingGift.checksum)
+        return FALSE;
+    else
+        return TRUE;
+}
+
+static void ClearRecordMixingGift(void)
+{
+    CpuFill16(0, &gSaveBlock1Ptr->recordMixingGift, sizeof(gSaveBlock1Ptr->recordMixingGift));
+}
+
+static void SetRecordMixingGift(u8 unk, u8 quantity, u16 itemId)
+{
+    if (!unk || !quantity || !itemId)
+    {
+        ClearRecordMixingGift();
+    }
+    else
+    {
+        gSaveBlock1Ptr->recordMixingGift.data.unk0 = unk;
+        gSaveBlock1Ptr->recordMixingGift.data.quantity = quantity;
+        gSaveBlock1Ptr->recordMixingGift.data.itemId = itemId;
+        gSaveBlock1Ptr->recordMixingGift.checksum = CalcRecordMixingGiftChecksum();
+    }
+}
+
+u16 GetRecordMixingGift(void)
+{
+    struct RecordMixingGiftData *data = &gSaveBlock1Ptr->recordMixingGift.data;
+
+    if (!IsRecordMixingGiftValid())
+    {
+        ClearRecordMixingGift();
+        return 0;
+    }
+    else
+    {
+        u16 itemId = data->itemId;
+        data->quantity--;
+        if (data->quantity == 0)
+            ClearRecordMixingGift();
+        else
+            gSaveBlock1Ptr->recordMixingGift.checksum = CalcRecordMixingGiftChecksum();
+
+        return itemId;
+    }
+}
+
+bool8 MEScrCmd_end(struct ScriptContext *ctx)
+{
+    StopScript(ctx);
+    return TRUE;
+}
+
+bool8 MEScrCmd_checkcompat(struct ScriptContext *ctx)
+{
+    u16 v1;
+    u32 v2;
+    u16 v3;
+    u32 v4;
+
+    ctx->data[1] = ScriptReadWord(ctx);
+    v1 = ScriptReadHalfword(ctx);
+    v2 = ScriptReadWord(ctx);
+    v3 = ScriptReadHalfword(ctx);
+    v4 = ScriptReadWord(ctx);
+
+    if (CheckCompatibility(v1, v2, v3, v4) == TRUE)
+        ctx->data[3] = 1;
+    else
+        SetIncompatible();
+
+    return TRUE;
+}
+
+bool8 MEScrCmd_nop(struct ScriptContext *ctx)
+{
+    return FALSE;
+}
+
+bool8 MEScrCmd_setstatus(struct ScriptContext *ctx)
+{
+    u8 value = ScriptReadByte(ctx);
+    ctx->data[2] = value;
+    return FALSE;
+}
+
+bool8 MEScrCmd_setmsg(struct ScriptContext *ctx)
+{
+    u8 value = ScriptReadByte(ctx);
+    u8 *str = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    if (value == 0xFF || value == ctx->data[2])
+        StringExpandPlaceholders(gStringVar4, str);
+    return FALSE;
+}
+
+bool8 MEScrCmd_runscript(struct ScriptContext *ctx)
+{
+    u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    ScriptContext2_RunNewScript(script);
+    return FALSE;
+}
+
+bool8 MEScrCmd_setenigmaberry(struct ScriptContext *ctx)
+{
+    u8 *str;
+    const u8 *message;
+    bool32 haveBerry = IsEnigmaBerryValid();
+    u8 *berry = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    StringCopyN(gStringVar1, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_COUNT);
+    SetEnigmaBerry(berry);
+    StringCopyN(gStringVar2, gSaveBlock1Ptr->enigmaBerry.berry.name, BERRY_NAME_COUNT);
+
+    if (!haveBerry)
+    {
+        str = gStringVar4;
+        message = gText_MysteryGiftBerry;
+    }
+    else if (StringCompare(gStringVar1, gStringVar2))
+    {
+        str = gStringVar4;
+        message = gText_MysteryGiftBerryTransform;
+    }
+    else
+    {
+        str = gStringVar4;
+        message = gText_MysteryGiftBerryObtained;
+    }
+
+    StringExpandPlaceholders(str, message);
+
+    ctx->data[2] = 2;
+
+    if (IsEnigmaBerryValid() == TRUE)
+        VarSet(VAR_ENIGMA_BERRY_AVAILABLE, 1);
+    else
+        ctx->data[2] = 1;
+
+    return FALSE;
+}
+
+bool8 MEScrCmd_giveribbon(struct ScriptContext *ctx)
+{
+    u8 index = ScriptReadByte(ctx);
+    u8 ribbonId = ScriptReadByte(ctx);
+    GiveGiftRibbonToParty(index, ribbonId);
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSpecialRibbon);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_initramscript(struct ScriptContext *ctx)
+{
+    u8 mapGroup = ScriptReadByte(ctx);
+    u8 mapNum = ScriptReadByte(ctx);
+    u8 objectId = ScriptReadByte(ctx);
+    u8 *script = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    u8 *scriptEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    InitRamScript(script, scriptEnd - script, mapGroup, mapNum, objectId);
+    return FALSE;
+}
+
+bool8 MEScrCmd_givenationaldex(struct ScriptContext *ctx)
+{
+    EnableNationalPokedex();
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNationalDex);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_addrareword(struct ScriptContext *ctx)
+{
+    sub_811EFC0(ScriptReadByte(ctx));
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftRareWord);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_setrecordmixinggift(struct ScriptContext *ctx)
+{
+    u8 unk = ScriptReadByte(ctx);
+    u8 quantity = ScriptReadByte(ctx);
+    u16 itemId = ScriptReadHalfword(ctx);
+    SetRecordMixingGift(unk, quantity, itemId);
+    return FALSE;
+}
+
+bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
+{
+    struct MailStruct mail;
+    struct Pokemon pokemon;
+    u16 species;
+    u16 heldItem;
+    u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0];
+    void *pokemonPtr = (void *)data;
+    void *mailPtr = (void *)(data + sizeof(struct Pokemon));
+
+    pokemon = *(struct Pokemon *)pokemonPtr;
+    species = GetMonData(&pokemon, MON_DATA_SPECIES2);
+
+    if (species == SPECIES_EGG)
+        StringCopyN(gStringVar1, gText_EggNickname, POKEMON_NAME_LENGTH + 1);
+    else
+        StringCopyN(gStringVar1, gText_Pokemon, POKEMON_NAME_LENGTH + 1);
+
+    if (gPlayerPartyCount == PARTY_SIZE)
+    {
+        StringExpandPlaceholders(gStringVar4, gText_MysteryGiftFullParty);
+        ctx->data[2] = 3;
+    }
+    else
+    {
+        memcpy(&gPlayerParty[5], pokemonPtr, sizeof(struct Pokemon));
+        memcpy(&mail, mailPtr, sizeof(struct MailStruct));
+
+        if (species != SPECIES_EGG)
+        {
+            u16 pokedexNum = SpeciesToNationalPokedexNum(species);
+            GetSetPokedexFlag(pokedexNum, FLAG_SET_SEEN);
+            GetSetPokedexFlag(pokedexNum, FLAG_SET_CAUGHT);
+        }
+
+        heldItem = GetMonData(&gPlayerParty[5], MON_DATA_HELD_ITEM);
+        if (ItemIsMail(heldItem))
+            GiveMailToMon2(&gPlayerParty[5], &mail);
+        CompactPartySlots();
+        CalculatePlayerPartyCount();
+        StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSentOver);
+        ctx->data[2] = 2;
+    }
+
+    return FALSE;
+}
+
+bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx)
+{
+    u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0];
+    memcpy((void*)(gSaveBlock2Ptr) + 0xBEC, (void *)data, 0xBC);
+    ValidateEReaderTrainer();
+    StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNewTrainer);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_enableresetrtc(struct ScriptContext *ctx)
+{
+    EnableResetRTC();
+    StringExpandPlaceholders(gStringVar4, gText_InGameClockUsable);
+    ctx->data[2] = 2;
+    return FALSE;
+}
+
+bool8 MEScrCmd_checksum(struct ScriptContext *ctx)
+{
+    int checksum = ScriptReadWord(ctx);
+    u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    if (checksum != CalcByteArraySum(data, dataEnd - data))
+    {
+        ctx->data[3] = 0;
+        ctx->data[2] = 1;
+    }
+    return TRUE;
+}
+
+bool8 MEScrCmd_crc(struct ScriptContext *ctx)
+{
+    int crc = ScriptReadWord(ctx);
+    u8 *data = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    u8 *dataEnd = (u8 *)(ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0]);
+    if (crc != CalcCRC16(data, dataEnd - data))
+    {
+        ctx->data[3] = 0;
+        ctx->data[2] = 1;
+    }
+    return TRUE;
+}
diff --git a/src/option_menu.c b/src/option_menu.c
new file mode 100644
index 000000000..7f92756ab
--- /dev/null
+++ b/src/option_menu.c
@@ -0,0 +1,662 @@
+#include "global.h"
+#include "option_menu.h"
+#include "main.h"
+#include "menu.h"
+#include "unknown_task.h"
+#include "palette.h"
+#include "sprite.h"
+#include "task.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "window.h"
+#include "text.h"
+#include "text_window.h"
+#include "international_string_util.h"
+#include "strings.h"
+
+extern void SetPokemonCryStereo(u32 val);
+
+// Task data
+enum
+{
+    TD_MENUSELECTION,
+    TD_TEXTSPEED,
+    TD_BATTLESCENE,
+    TD_BATTLESTYLE,
+    TD_SOUND,
+    TD_BUTTONMODE,
+    TD_FRAMETYPE,
+};
+
+// Menu items
+enum
+{
+    MENUITEM_TEXTSPEED,
+    MENUITEM_BATTLESCENE,
+    MENUITEM_BATTLESTYLE,
+    MENUITEM_SOUND,
+    MENUITEM_BUTTONMODE,
+    MENUITEM_FRAMETYPE,
+    MENUITEM_CANCEL,
+    MENUITEM_COUNT,
+};
+
+// Window Ids
+enum
+{
+    WIN_TEXT_OPTION,
+    WIN_OPTIONS
+};
+
+// this file's functions
+static void Task_OptionMenuFadeIn(u8 taskId);
+static void Task_OptionMenuProcessInput(u8 taskId);
+static void Task_OptionMenuSave(u8 taskId);
+static void Task_OptionMenuFadeOut(u8 taskId);
+static void HighlightOptionMenuItem(u8 selection);
+static u8   TextSpeed_ProcessInput(u8 selection);
+static void TextSpeed_DrawChoices(u8 selection);
+static u8   BattleScene_ProcessInput(u8 selection);
+static void BattleScene_DrawChoices(u8 selection);
+static u8   BattleStyle_ProcessInput(u8 selection);
+static void BattleStyle_DrawChoices(u8 selection);
+static u8   Sound_ProcessInput(u8 selection);
+static void Sound_DrawChoices(u8 selection);
+static u8   FrameType_ProcessInput(u8 selection);
+static void FrameType_DrawChoices(u8 selection);
+static u8   ButtonMode_ProcessInput(u8 selection);
+static void ButtonMode_DrawChoices(u8 selection);
+static void DrawTextOption(void);
+static void DrawOptionMenuTexts(void);
+static void sub_80BB154(void);
+
+// EWRAM vars
+EWRAM_DATA static bool8 sArrowPressed = FALSE;
+
+// const rom data
+static const u16 sUnknown_0855C604[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
+// note: this is only used in the Japanese release
+static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp");
+
+static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] =
+{
+    gText_TextSpeed,
+    gText_BattleScene,
+    gText_BattleStyle,
+    gText_Sound,
+    gText_ButtonMode,
+    gText_Frame,
+    gText_OptionMenuCancel,
+};
+
+static const struct WindowTemplate sOptionMenuWinTemplates[] =
+{
+    {1, 2, 1, 0x1A, 2, 1, 2},
+    {0, 2, 5, 0x1A, 0xE, 1, 0x36},
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct BgTemplate sOptionMenuBgTemplates[] =
+{
+   {
+       .bg = 1,
+       .charBaseIndex = 1,
+       .mapBaseIndex = 30,
+       .screenSize = 0,
+       .paletteMode = 0,
+       .priority = 0,
+       .baseTile = 0
+   },
+   {
+       .bg = 0,
+       .charBaseIndex = 1,
+       .mapBaseIndex = 31,
+       .screenSize = 0,
+       .paletteMode = 0,
+       .priority = 1,
+       .baseTile = 0
+   }
+};
+
+static const u16 sUnknown_0855C6A0[] = {0x7E51};
+
+// code
+static void MainCB2(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+static void VBlankCB(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void CB2_InitOptionMenu(void)
+{
+    switch (gMain.state)
+    {
+    default:
+    case 0:
+        SetVBlankCallback(NULL);
+        gMain.state++;
+        break;
+    case 1:
+    {
+        u8 *addr;
+        u32 size;
+
+        addr = (u8 *)VRAM;
+        size = 0x18000;
+        while (1)
+        {
+            DmaFill16(3, 0, addr, 0x1000);
+            addr += 0x1000;
+            size -= 0x1000;
+            if (size <= 0x1000)
+            {
+                DmaFill16(3, 0, addr, size);
+                break;
+            }
+        }
+        DmaClear32(3, OAM, OAM_SIZE);
+        DmaClear16(3, PLTT, PLTT_SIZE);
+        SetGpuReg(REG_OFFSET_DISPCNT, 0);
+        ResetBgsAndClearDma3BusyFlags(0);
+        InitBgsFromTemplates(0, sOptionMenuBgTemplates, ARRAY_COUNT(sOptionMenuBgTemplates));
+        ChangeBgX(0, 0, 0);
+        ChangeBgY(0, 0, 0);
+        ChangeBgX(1, 0, 0);
+        ChangeBgY(1, 0, 0);
+        ChangeBgX(2, 0, 0);
+        ChangeBgY(2, 0, 0);
+        ChangeBgX(3, 0, 0);
+        ChangeBgY(3, 0, 0);
+        InitWindows(sOptionMenuWinTemplates);
+        DeactivateAllTextPrinters();
+        SetGpuReg(REG_OFFSET_WIN0H, 0);
+        SetGpuReg(REG_OFFSET_WIN0V, 0);
+        SetGpuReg(REG_OFFSET_WININ, 1);
+        SetGpuReg(REG_OFFSET_WINOUT, 35);
+        SetGpuReg(REG_OFFSET_BLDCNT, 193);
+        SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+        SetGpuReg(REG_OFFSET_BLDY, 4);
+        SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
+        ShowBg(0);
+        ShowBg(1);
+        gMain.state++;
+    }
+        break;
+    case 2:
+        ResetPaletteFade();
+        ScanlineEffect_Stop();
+        ResetTasks();
+        ResetSpriteData();
+        gMain.state++;
+        break;
+    case 3:
+        LoadBgTiles(1, GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->tiles, 0x120, 0x1A2);
+        gMain.state++;
+        break;
+    case 4:
+        LoadPalette(sUnknown_0855C6A0, 0, sizeof(sUnknown_0855C6A0));
+        LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20);
+        gMain.state++;
+        break;
+    case 5:
+        LoadPalette(sUnknown_0855C604, 0x10, sizeof(sUnknown_0855C604));
+        gMain.state++;
+        break;
+    case 6:
+        PutWindowTilemap(0);
+        DrawTextOption();
+        gMain.state++;
+        break;
+    case 7:
+        gMain.state++;
+        break;
+    case 8:
+        PutWindowTilemap(1);
+        DrawOptionMenuTexts();
+        gMain.state++;
+    case 9:
+        sub_80BB154();
+        gMain.state++;
+        break;
+    case 10:
+    {
+        u8 taskId = CreateTask(Task_OptionMenuFadeIn, 0);
+
+        gTasks[taskId].data[TD_MENUSELECTION] = 0;
+        gTasks[taskId].data[TD_TEXTSPEED] = gSaveBlock2Ptr->optionsTextSpeed;
+        gTasks[taskId].data[TD_BATTLESCENE] = gSaveBlock2Ptr->optionsBattleSceneOff;
+        gTasks[taskId].data[TD_BATTLESTYLE] = gSaveBlock2Ptr->optionsBattleStyle;
+        gTasks[taskId].data[TD_SOUND] = gSaveBlock2Ptr->optionsSound;
+        gTasks[taskId].data[TD_BUTTONMODE] = gSaveBlock2Ptr->optionsButtonMode;
+        gTasks[taskId].data[TD_FRAMETYPE] = gSaveBlock2Ptr->optionsWindowFrameType;
+
+        TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
+        BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
+        BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
+        Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
+        ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
+        FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
+        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+
+        CopyWindowToVram(WIN_OPTIONS, 3);
+        gMain.state++;
+        break;
+    }
+    case 11:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        SetVBlankCallback(VBlankCB);
+        SetMainCallback2(MainCB2);
+        return;
+    }
+}
+
+static void Task_OptionMenuFadeIn(u8 taskId)
+{
+    if (!gPaletteFade.active)
+        gTasks[taskId].func = Task_OptionMenuProcessInput;
+}
+
+static void Task_OptionMenuProcessInput(u8 taskId)
+{
+    if (gMain.newKeys & A_BUTTON)
+    {
+        if (gTasks[taskId].data[TD_MENUSELECTION] == MENUITEM_CANCEL)
+            gTasks[taskId].func = Task_OptionMenuSave;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        gTasks[taskId].func = Task_OptionMenuSave;
+    }
+    else if (gMain.newKeys & DPAD_UP)
+    {
+        if (gTasks[taskId].data[TD_MENUSELECTION] > 0)
+            gTasks[taskId].data[TD_MENUSELECTION]--;
+        else
+            gTasks[taskId].data[TD_MENUSELECTION] = 6;
+        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (gTasks[taskId].data[TD_MENUSELECTION] <= 5)
+            gTasks[taskId].data[TD_MENUSELECTION]++;
+        else
+            gTasks[taskId].data[TD_MENUSELECTION] = 0;
+        HighlightOptionMenuItem(gTasks[taskId].data[TD_MENUSELECTION]);
+    }
+    else
+    {
+        u8 previousOption;
+
+        switch (gTasks[taskId].data[TD_MENUSELECTION])
+        {
+        case MENUITEM_TEXTSPEED:
+            previousOption = gTasks[taskId].data[TD_TEXTSPEED];
+            gTasks[taskId].data[TD_TEXTSPEED] = TextSpeed_ProcessInput(gTasks[taskId].data[TD_TEXTSPEED]);
+
+            if (previousOption != gTasks[taskId].data[TD_TEXTSPEED])
+                TextSpeed_DrawChoices(gTasks[taskId].data[TD_TEXTSPEED]);
+            break;
+        case MENUITEM_BATTLESCENE:
+            previousOption = gTasks[taskId].data[TD_BATTLESCENE];
+            gTasks[taskId].data[TD_BATTLESCENE] = BattleScene_ProcessInput(gTasks[taskId].data[TD_BATTLESCENE]);
+
+            if (previousOption != gTasks[taskId].data[TD_BATTLESCENE])
+                BattleScene_DrawChoices(gTasks[taskId].data[TD_BATTLESCENE]);
+            break;
+        case MENUITEM_BATTLESTYLE:
+            previousOption = gTasks[taskId].data[TD_BATTLESTYLE];
+            gTasks[taskId].data[TD_BATTLESTYLE] = BattleStyle_ProcessInput(gTasks[taskId].data[TD_BATTLESTYLE]);
+
+            if (previousOption != gTasks[taskId].data[TD_BATTLESTYLE])
+                BattleStyle_DrawChoices(gTasks[taskId].data[TD_BATTLESTYLE]);
+            break;
+        case MENUITEM_SOUND:
+            previousOption = gTasks[taskId].data[TD_SOUND];
+            gTasks[taskId].data[TD_SOUND] = Sound_ProcessInput(gTasks[taskId].data[TD_SOUND]);
+
+            if (previousOption != gTasks[taskId].data[TD_SOUND])
+                Sound_DrawChoices(gTasks[taskId].data[TD_SOUND]);
+            break;
+        case MENUITEM_BUTTONMODE:
+            previousOption = gTasks[taskId].data[TD_BUTTONMODE];
+            gTasks[taskId].data[TD_BUTTONMODE] = ButtonMode_ProcessInput(gTasks[taskId].data[TD_BUTTONMODE]);
+
+            if (previousOption != gTasks[taskId].data[TD_BUTTONMODE])
+                ButtonMode_DrawChoices(gTasks[taskId].data[TD_BUTTONMODE]);
+            break;
+        case MENUITEM_FRAMETYPE:
+            previousOption = gTasks[taskId].data[TD_FRAMETYPE];
+            gTasks[taskId].data[TD_FRAMETYPE] = FrameType_ProcessInput(gTasks[taskId].data[TD_FRAMETYPE]);
+
+            if (previousOption != gTasks[taskId].data[TD_FRAMETYPE])
+                FrameType_DrawChoices(gTasks[taskId].data[TD_FRAMETYPE]);
+            break;
+        default:
+            return;
+        }
+
+        if (sArrowPressed)
+        {
+            sArrowPressed = FALSE;
+            CopyWindowToVram(WIN_OPTIONS, 2);
+        }
+    }
+}
+
+static void Task_OptionMenuSave(u8 taskId)
+{
+    gSaveBlock2Ptr->optionsTextSpeed = gTasks[taskId].data[TD_TEXTSPEED];
+    gSaveBlock2Ptr->optionsBattleSceneOff = gTasks[taskId].data[TD_BATTLESCENE];
+    gSaveBlock2Ptr->optionsBattleStyle = gTasks[taskId].data[TD_BATTLESTYLE];
+    gSaveBlock2Ptr->optionsSound = gTasks[taskId].data[TD_SOUND];
+    gSaveBlock2Ptr->optionsButtonMode = gTasks[taskId].data[TD_BUTTONMODE];
+    gSaveBlock2Ptr->optionsWindowFrameType = gTasks[taskId].data[TD_FRAMETYPE];
+
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskId].func = Task_OptionMenuFadeOut;
+}
+
+static void Task_OptionMenuFadeOut(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        DestroyTask(taskId);
+        FreeAllWindowBuffers();
+        SetMainCallback2(gMain.savedCallback);
+    }
+}
+
+static void HighlightOptionMenuItem(u8 index)
+{
+    SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(16, 224));
+    SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(index * 16 + 40, index * 16 + 56));
+}
+
+static void DrawOptionMenuChoice(const u8 *text, u8 x, u8 y, u8 style)
+{
+    u8 dst[16];
+    u16 i;
+
+    for (i = 0; *text != EOS && i <= 14; i++)
+        dst[i] = *(text++);
+
+    if (style != 0)
+    {
+        dst[2] = 4;
+        dst[5] = 5;
+    }
+
+    dst[i] = EOS;
+    PrintTextOnWindow(WIN_OPTIONS, 1, dst, x, y + 1, TEXT_SPEED_FF, NULL);
+}
+
+static u8 TextSpeed_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (selection <= 1)
+            selection++;
+        else
+            selection = 0;
+
+        sArrowPressed = TRUE;
+    }
+    if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (selection != 0)
+            selection--;
+        else
+            selection = 2;
+
+        sArrowPressed = TRUE;
+    }
+    return selection;
+}
+
+static void TextSpeed_DrawChoices(u8 selection)
+{
+    u8 styles[3];
+    s32 widthSlow, widthMid, widthFast, xMid;
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[2] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_TextSpeedSlow, 104, 0, styles[0]);
+
+    widthSlow = GetStringWidth(1, gText_TextSpeedSlow, 0);
+    widthMid = GetStringWidth(1, gText_TextSpeedMid, 0);
+    widthFast = GetStringWidth(1, gText_TextSpeedFast, 0);
+
+    widthMid -= 94;
+    xMid = (widthSlow - widthMid - widthFast) / 2 + 104;
+    DrawOptionMenuChoice(gText_TextSpeedMid, xMid, 0, styles[1]);
+
+    DrawOptionMenuChoice(gText_TextSpeedFast, GetStringRightAlignXOffset(1, gText_TextSpeedFast, 198), 0, styles[2]);
+}
+
+static u8 BattleScene_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    {
+        selection ^= 1;
+        sArrowPressed = TRUE;
+    }
+
+    return selection;
+}
+
+static void BattleScene_DrawChoices(u8 selection)
+{
+    u8 styles[2];
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_BattleSceneOn, 104, 16, styles[0]);
+    DrawOptionMenuChoice(gText_BattleSceneOff, GetStringRightAlignXOffset(1, gText_BattleSceneOff, 198), 16, styles[1]);
+}
+
+static u8 BattleStyle_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    {
+        selection ^= 1;
+        sArrowPressed = TRUE;
+    }
+
+    return selection;
+}
+
+static void BattleStyle_DrawChoices(u8 selection)
+{
+    u8 styles[2];
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_BattleStyleShift, 104, 32, styles[0]);
+    DrawOptionMenuChoice(gText_BattleStyleSet, GetStringRightAlignXOffset(1, gText_BattleStyleSet, 198), 32, styles[1]);
+}
+
+static u8 Sound_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & (DPAD_LEFT | DPAD_RIGHT))
+    {
+        selection ^= 1;
+        SetPokemonCryStereo(selection);
+        sArrowPressed = TRUE;
+    }
+
+    return selection;
+}
+
+static void Sound_DrawChoices(u8 selection)
+{
+    u8 styles[2];
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_SoundMono, 104, 48, styles[0]);
+    DrawOptionMenuChoice(gText_SoundStereo, GetStringRightAlignXOffset(1, gText_SoundStereo, 198), 48, styles[1]);
+}
+
+static u8 FrameType_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (selection < WINDOW_FRAMES_COUNT - 1)
+            selection++;
+        else
+            selection = 0;
+
+        LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2);
+        LoadPalette(GetWindowFrameTilesPal(selection)->pal, 0x70, 0x20);
+        sArrowPressed = TRUE;
+    }
+    if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (selection != 0)
+            selection--;
+        else
+            selection = WINDOW_FRAMES_COUNT - 1;
+
+        LoadBgTiles(1, GetWindowFrameTilesPal(selection)->tiles, 0x120, 0x1A2);
+        LoadPalette(GetWindowFrameTilesPal(selection)->pal, 0x70, 0x20);
+        sArrowPressed = TRUE;
+    }
+    return selection;
+}
+
+static void FrameType_DrawChoices(u8 selection)
+{
+    u8 text[16];
+    u8 n = selection + 1;
+    u16 i;
+
+    for (i = 0; gText_FrameTypeNumber[i] != EOS && i <= 5; i++)
+        text[i] = gText_FrameTypeNumber[i];
+
+    // Convert a number to decimal string
+    if (n / 10 != 0)
+    {
+        text[i] = n / 10 + CHAR_0;
+        i++;
+        text[i] = n % 10 + CHAR_0;
+        i++;
+    }
+    else
+    {
+        text[i] = n % 10 + CHAR_0;
+        i++;
+        text[i] = 0x77;
+        i++;
+    }
+
+    text[i] = EOS;
+
+    DrawOptionMenuChoice(gText_FrameType, 104, 80, 0);
+    DrawOptionMenuChoice(text, 128, 80, 1);
+}
+
+static u8 ButtonMode_ProcessInput(u8 selection)
+{
+    if (gMain.newKeys & DPAD_RIGHT)
+    {
+        if (selection <= 1)
+            selection++;
+        else
+            selection = 0;
+
+        sArrowPressed = TRUE;
+    }
+    if (gMain.newKeys & DPAD_LEFT)
+    {
+        if (selection != 0)
+            selection--;
+        else
+            selection = 2;
+
+        sArrowPressed = TRUE;
+    }
+    return selection;
+}
+
+static void ButtonMode_DrawChoices(u8 selection)
+{
+    s32 widthNormal, widthLR, widthLA, xLR;
+    u8 styles[3];
+
+    styles[0] = 0;
+    styles[1] = 0;
+    styles[2] = 0;
+    styles[selection] = 1;
+
+    DrawOptionMenuChoice(gText_ButtonTypeNormal, 104, 64, styles[0]);
+
+    widthNormal = GetStringWidth(1, gText_ButtonTypeNormal, 0);
+    widthLR = GetStringWidth(1, gText_ButtonTypeLR, 0);
+    widthLA = GetStringWidth(1, gText_ButtonTypeLEqualsA, 0);
+
+    widthLR -= 94;
+    xLR = (widthNormal - widthLR - widthLA) / 2 + 104;
+    DrawOptionMenuChoice(gText_ButtonTypeLR, xLR, 64, styles[1]);
+
+    DrawOptionMenuChoice(gText_ButtonTypeLEqualsA, GetStringRightAlignXOffset(1, gText_ButtonTypeLEqualsA, 198), 64, styles[2]);
+}
+
+static void DrawTextOption(void)
+{
+    FillWindowPixelBuffer(WIN_TEXT_OPTION, 0x11);
+    PrintTextOnWindow(WIN_TEXT_OPTION, 1, gText_Option, 8, 1, TEXT_SPEED_FF, NULL);
+    CopyWindowToVram(WIN_TEXT_OPTION, 3);
+}
+
+static void DrawOptionMenuTexts(void)
+{
+    u8 i;
+
+    FillWindowPixelBuffer(WIN_OPTIONS, 0x11);
+    for (i = 0; i < MENUITEM_COUNT; i++)
+    {
+        PrintTextOnWindow(WIN_OPTIONS, 1, sOptionMenuItemsNames[i], 8, (i * 16) + 1, TEXT_SPEED_FF, NULL);
+    }
+    CopyWindowToVram(WIN_OPTIONS, 3);
+}
+
+static void sub_80BB154(void)
+{
+    //                   bg, tileNum, x,    y,    width, height,  pal
+    FillBgTilemapBufferRect(1, 0x1A2, 1,    0,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A3, 2,    0,      0x1B,   1,      7);
+    FillBgTilemapBufferRect(1, 0x1A4, 28,   0,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A5, 1,    1,      1,      2,      7);
+    FillBgTilemapBufferRect(1, 0x1A7, 28,   1,      1,      2,      7);
+    FillBgTilemapBufferRect(1, 0x1A8, 1,    3,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A9, 2,    3,      0x1B,   1,      7);
+    FillBgTilemapBufferRect(1, 0x1AA, 28,   3,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A2, 1,    4,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A3, 2,    4,      0x1A,   1,      7);
+    FillBgTilemapBufferRect(1, 0x1A4, 28,   4,      1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A5, 1,    5,      1,      0x12,   7);
+    FillBgTilemapBufferRect(1, 0x1A7, 28,   5,      1,      0x12,   7);
+    FillBgTilemapBufferRect(1, 0x1A8, 1,    19,     1,      1,      7);
+    FillBgTilemapBufferRect(1, 0x1A9, 2,    19,     0x1A,   1,      7);
+    FillBgTilemapBufferRect(1, 0x1AA, 28,   19,     1,      1,      7);
+
+    CopyBgTilemapBufferToVram(1);
+}
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 737f2c6f3..573eed52b 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -419,7 +419,7 @@ static bool8 InitPokeblockMenu(void)
         gMain.state++;
         break;
     case 1:
-        remove_some_task();
+        ScanlineEffect_Stop();
         gMain.state++;
         break;
     case 2:
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
old mode 100755
new mode 100644
index 31af2bf2f..5ec5410ca
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -75,7 +75,7 @@ extern u8 sub_81221AC();
 extern void SetVBlankHBlankCallbacksToNull();
 extern void ResetVramOamAndBgCntRegs();
 extern void clear_scheduled_bg_copies_to_vram();
-extern void remove_some_task();
+extern void ScanlineEffect_Stop();
 extern void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
 extern void ShowBg(u8 a);
 extern void SetGpuReg(u8 regOffset, u16 value);
@@ -455,7 +455,7 @@ bool8 sub_81BFB10(void)
         gMain.state++;
         break;
     case 1:
-        remove_some_task();
+        ScanlineEffect_Stop();
         gMain.state++;
         break;
     case 2:
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
old mode 100755
new mode 100644
index efe38fbae..8764daa5f
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -9,6 +9,7 @@
 #include "menu.h"
 #include "save.h"
 #include "gba/flash_internal.h"
+#include "text_window.h"
 
 #define MSG_WIN_TOP 12
 #define CLOCK_WIN_TOP (MSG_WIN_TOP - 4)
@@ -21,9 +22,7 @@ extern const u8 gBirchHelpGfx[];
 extern const u8 gBirchBagTilemap[];
 extern const u8 gBirchGrassTilemap[];
 extern const u16 gBirchBagGrassPal[];
-extern const u16 gTextWindowFrame1_Pal[];
 extern const u16 gUnknown_0860F074[];
-extern const u32 gTextWindowFrame1_Gfx[];
 extern struct SaveSection gSaveDataBuffer;
 
 extern u8 gText_SaveFailedCheckingBackup[];
diff --git a/src/save_location.c b/src/save_location.c
old mode 100755
new mode 100644
diff --git a/src/starter_choose.c b/src/starter_choose.c
index c2c553d46..83a7b8112 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -53,7 +53,7 @@ extern const u8 gUnknown_085B1E0C[];
 extern const u8 gUnknown_085B1E28[][2];
 
 extern void sub_809882C(u8, u16, u8);
-extern void remove_some_task(void);
+extern void ScanlineEffect_Stop(void);
 extern void clear_scheduled_bg_copies_to_vram(void);
 extern void dp13_810BB8C(void);
 extern void do_scheduled_bg_tilemap_copies_to_vram(void);
@@ -134,7 +134,7 @@ void CB2_ChooseStarter(void)
     DeactivateAllTextPrinters();
     sub_809882C(0, 0x2A8, 0xD0);
     clear_scheduled_bg_copies_to_vram();
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     ResetPaletteFade();
diff --git a/src/text_window.c b/src/text_window.c
index c5334b11e..33cd7cffe 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -3,21 +3,92 @@
 #include "text_window.h"
 #include "window.h"
 #include "palette.h"
+#include "bg.h"
+#include "graphics.h"
 
-extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
-extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
+// const rom data
+const u32 gTextWindowFrame1_Gfx[] = INCBIN_U32("graphics/text_window/1.4bpp");
+static const u32 sTextWindowFrame2_Gfx[] = INCBIN_U32("graphics/text_window/2.4bpp");
+static const u32 sTextWindowFrame3_Gfx[] = INCBIN_U32("graphics/text_window/3.4bpp");
+static const u32 sTextWindowFrame4_Gfx[] = INCBIN_U32("graphics/text_window/4.4bpp");
+static const u32 sTextWindowFrame5_Gfx[] = INCBIN_U32("graphics/text_window/5.4bpp");
+static const u32 sTextWindowFrame6_Gfx[] = INCBIN_U32("graphics/text_window/6.4bpp");
+static const u32 sTextWindowFrame7_Gfx[] = INCBIN_U32("graphics/text_window/7.4bpp");
+static const u32 sTextWindowFrame8_Gfx[] = INCBIN_U32("graphics/text_window/8.4bpp");
+static const u32 sTextWindowFrame9_Gfx[] = INCBIN_U32("graphics/text_window/9.4bpp");
+static const u32 sTextWindowFrame10_Gfx[] = INCBIN_U32("graphics/text_window/10.4bpp");
+static const u32 sTextWindowFrame11_Gfx[] = INCBIN_U32("graphics/text_window/11.4bpp");
+static const u32 sTextWindowFrame12_Gfx[] = INCBIN_U32("graphics/text_window/12.4bpp");
+static const u32 sTextWindowFrame13_Gfx[] = INCBIN_U32("graphics/text_window/13.4bpp");
+static const u32 sTextWindowFrame14_Gfx[] = INCBIN_U32("graphics/text_window/14.4bpp");
+static const u32 sTextWindowFrame15_Gfx[] = INCBIN_U32("graphics/text_window/15.4bpp");
+static const u32 sTextWindowFrame16_Gfx[] = INCBIN_U32("graphics/text_window/16.4bpp");
+static const u32 sTextWindowFrame17_Gfx[] = INCBIN_U32("graphics/text_window/17.4bpp");
+static const u32 sTextWindowFrame18_Gfx[] = INCBIN_U32("graphics/text_window/18.4bpp");
+static const u32 sTextWindowFrame19_Gfx[] = INCBIN_U32("graphics/text_window/19.4bpp");
+static const u32 sTextWindowFrame20_Gfx[] = INCBIN_U32("graphics/text_window/20.4bpp");
 
-extern const struct TilesPal gUnknown_0851021C[];
-extern const u32 gMessageBox_Gfx[];
-extern const u16 gUnknown_0851017C[];
-extern const u16 gUnknown_08DDD728[];
+const u16 gTextWindowFrame1_Pal[] = INCBIN_U16("graphics/text_window/1.gbapal");
+static const u16 sTextWindowFrame2_Pal[] = INCBIN_U16("graphics/text_window/2.gbapal");
+static const u16 sTextWindowFrame3_Pal[] = INCBIN_U16("graphics/text_window/3.gbapal");
+static const u16 sTextWindowFrame4_Pal[] = INCBIN_U16("graphics/text_window/4.gbapal");
+static const u16 sTextWindowFrame5_Pal[] = INCBIN_U16("graphics/text_window/5.gbapal");
+static const u16 sTextWindowFrame6_Pal[] = INCBIN_U16("graphics/text_window/6.gbapal");
+static const u16 sTextWindowFrame7_Pal[] = INCBIN_U16("graphics/text_window/7.gbapal");
+static const u16 sTextWindowFrame8_Pal[] = INCBIN_U16("graphics/text_window/8.gbapal");
+static const u16 sTextWindowFrame9_Pal[] = INCBIN_U16("graphics/text_window/9.gbapal");
+static const u16 sTextWindowFrame10_Pal[] = INCBIN_U16("graphics/text_window/10.gbapal");
+static const u16 sTextWindowFrame11_Pal[] = INCBIN_U16("graphics/text_window/11.gbapal");
+static const u16 sTextWindowFrame12_Pal[] = INCBIN_U16("graphics/text_window/12.gbapal");
+static const u16 sTextWindowFrame13_Pal[] = INCBIN_U16("graphics/text_window/13.gbapal");
+static const u16 sTextWindowFrame14_Pal[] = INCBIN_U16("graphics/text_window/14.gbapal");
+static const u16 sTextWindowFrame15_Pal[] = INCBIN_U16("graphics/text_window/15.gbapal");
+static const u16 sTextWindowFrame16_Pal[] = INCBIN_U16("graphics/text_window/16.gbapal");
+static const u16 sTextWindowFrame17_Pal[] = INCBIN_U16("graphics/text_window/17.gbapal");
+static const u16 sTextWindowFrame18_Pal[] = INCBIN_U16("graphics/text_window/18.gbapal");
+static const u16 sTextWindowFrame19_Pal[] = INCBIN_U16("graphics/text_window/19.gbapal");
+static const u16 sTextWindowFrame20_Pal[] = INCBIN_U16("graphics/text_window/20.gbapal");
 
-const struct TilesPal* sub_8098758(u8 id)
+static const u16 sUnknown_0851017C[][16] =
 {
-    if (id > 19)
-        return &gUnknown_0851021C[0];
+    INCBIN_U16("graphics/text_window/message_box.gbapal"),
+    INCBIN_U16("graphics/text_window/text_pal1.gbapal"),
+    INCBIN_U16("graphics/text_window/text_pal2.gbapal"),
+    INCBIN_U16("graphics/text_window/text_pal3.gbapal"),
+    INCBIN_U16("graphics/text_window/text_pal4.gbapal")
+};
+
+static const struct TilesPal sWindowFrames[WINDOW_FRAMES_COUNT] =
+{
+    {gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal},
+    {sTextWindowFrame2_Gfx, sTextWindowFrame2_Pal},
+    {sTextWindowFrame3_Gfx, sTextWindowFrame3_Pal},
+    {sTextWindowFrame4_Gfx, sTextWindowFrame4_Pal},
+    {sTextWindowFrame5_Gfx, sTextWindowFrame5_Pal},
+    {sTextWindowFrame6_Gfx, sTextWindowFrame6_Pal},
+    {sTextWindowFrame7_Gfx, sTextWindowFrame7_Pal},
+    {sTextWindowFrame8_Gfx, sTextWindowFrame8_Pal},
+    {sTextWindowFrame9_Gfx, sTextWindowFrame9_Pal},
+    {sTextWindowFrame10_Gfx, sTextWindowFrame10_Pal},
+    {sTextWindowFrame11_Gfx, sTextWindowFrame11_Pal},
+    {sTextWindowFrame12_Gfx, sTextWindowFrame12_Pal},
+    {sTextWindowFrame13_Gfx, sTextWindowFrame13_Pal},
+    {sTextWindowFrame14_Gfx, sTextWindowFrame14_Pal},
+    {sTextWindowFrame15_Gfx, sTextWindowFrame15_Pal},
+    {sTextWindowFrame16_Gfx, sTextWindowFrame16_Pal},
+    {sTextWindowFrame17_Gfx, sTextWindowFrame17_Pal},
+    {sTextWindowFrame18_Gfx, sTextWindowFrame18_Pal},
+    {sTextWindowFrame19_Gfx, sTextWindowFrame19_Pal},
+    {sTextWindowFrame20_Gfx, sTextWindowFrame20_Pal}
+};
+
+// code
+const struct TilesPal *GetWindowFrameTilesPal(u8 id)
+{
+    if (id >= WINDOW_FRAMES_COUNT)
+        return &sWindowFrames[0];
     else
-        return &gUnknown_0851021C[id];
+        return &sWindowFrames[id];
 }
 
 void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset)
@@ -33,8 +104,8 @@ void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset)
 
 void sub_80987D4(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset)
 {
-    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_0851021C[frameId].tiles, 0x120, destOffset);
-    LoadPalette(gUnknown_0851021C[frameId].pal, palOffset, 0x20);
+    LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), sWindowFrames[frameId].tiles, 0x120, destOffset);
+    LoadPalette(sWindowFrames[frameId].pal, palOffset, 0x20);
 }
 
 void sub_809882C(u8 windowId, u16 destOffset, u8 palOffset)
@@ -89,7 +160,7 @@ void rbox_fill_rectangle(u8 windowId)
     FillBgTilemapBufferRect(bgLayer, 0, tilemapLeft - 1, tilemapTop - 1, width + 2, height + 2, 0x11);
 }
 
-const u16* stdpal_get(u8 id)
+const u16 *stdpal_get(u8 id)
 {
     switch (id)
     {
@@ -110,16 +181,17 @@ const u16* stdpal_get(u8 id)
         id = 0x40;
         break;
     }
-    return &gUnknown_0851017C[id];
+
+    return (const u16 *)(sUnknown_0851017C) + id;
 }
 
-const u16* GetOverworldTextboxPalettePtr(void)
+const u16 *GetOverworldTextboxPalettePtr(void)
 {
-    return gUnknown_08DDD728;
+    return gMessageBox_Pal;
 }
 
 void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset)
 {
-    LoadBgTiles(bg, gUnknown_0851021C[gSaveBlock2Ptr->optionsWindowFrameType].tiles, 0x120, destOffset);
-    LoadPalette(sub_8098758(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, 0x20);
+    LoadBgTiles(bg, sWindowFrames[gSaveBlock2Ptr->optionsWindowFrameType].tiles, 0x120, destOffset);
+    LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, 0x20);
 }
diff --git a/src/wallclock.c b/src/wallclock.c
index ea6137c5d..dbea24b4c 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -578,7 +578,7 @@ static void LoadWallClockGraphics(void)
     DeactivateAllTextPrinters();
     sub_809882C(0, 0x250, 0xd0);
     clear_scheduled_bg_copies_to_vram();
-    remove_some_task();
+    ScanlineEffect_Stop();
     ResetTasks();
     ResetSpriteData();
     ResetPaletteFade();
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 1a1bac079..e7cbe65eb 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -682,8 +682,9 @@ gUnknown_02039B28: @ 2039B28
 gUnknown_02039B44: @ 2039B44
 	.space 0x4
 
-gUnknown_02039B48: @ 2039B48
-	.space 0x4
+    .include "src/option_menu.o"
+	
+	.align 2
 
 gUnknown_02039B4C: @ 2039B4C
 	.space 0x4
@@ -1168,8 +1169,7 @@ gUnknown_0203ABB8: @ 203ABB8
     
 .space 0x4 /*unused var?*/
 
-gUnknown_0203BBC0: @ 203BBC0
-	.space 0x74
+	.include "src/mystery_event_script.o"
 
 gUnknown_0203BC34: @ 203BC34
 	.space 0x4