Merge branch 'master' of github.com:pret/pokeemerald

11 files changed, 940 insertions, 590 deletions

diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index b657ae179..e97943840 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -6,7 +6,7 @@
 gUnknown_082C8D64:: @ 82C8D64
 	.incbin "baserom.gba", 0x2c8d64, 0x8
 
-gUnknown_082C8D6C:: @ 82C8D6C
+gBattleAnims_Moves:: @ 82C8D6C
 	.incbin "baserom.gba", 0x2c8d6c, 0x590
 
 gUnknown_082C92FC:: @ 82C92FC
diff --git a/data/battle_anims.s b/data/battle_anims.s
index 13e1bdc2f..082a86fa1 100644
--- a/data/battle_anims.s
+++ b/data/battle_anims.s
@@ -294,7 +294,7 @@ gUnknown_08524B3C:: @ 8524B3C
 	.byte 0x00, 0x87, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
 
     .align 2
-gUnknown_08524B44:: @ 8524B44
+gBattleAnimPicTable:: @ 8524B44
 	obj_tiles 0x08c02538, 0x0200, 0x2710
 	obj_tiles 0x08c1c6e0, 0x0300, 0x2711
 	obj_tiles 0x08c20784, 0x0200, 0x2712
@@ -353,9 +353,6 @@ gUnknown_08524B44:: @ 8524B44
 	obj_tiles 0x08c0a8bc, 0x0200, 0x2747
 	obj_tiles 0x08c0a3ec, 0x1000, 0x2748
 	obj_tiles 0x08c0a980, 0x0180, 0x2749
-
-    .align 2
-gUnknown_08524D14:: @ 8524D14
 	obj_tiles 0x08c0aa2c, 0x0c00, 0x274a
 	obj_tiles 0x08c0aebc, 0x0100, 0x274b
 	obj_tiles 0x08c0af38, 0x0040, 0x274c
@@ -434,9 +431,6 @@ gUnknown_08524D14:: @ 8524D14
 	obj_tiles 0x08c14b78, 0x0100, 0x2795
 	obj_tiles 0x08c14c1c, 0x0200, 0x2796
 	obj_tiles 0x08c1a3a0, 0x0200, 0x2797
-
-    .align 2
-gUnknown_08524F84:: @ 8524F84
 	obj_tiles 0x08c1a540, 0x0020, 0x2798
 	obj_tiles 0x08c1a58c, 0x0a00, 0x2799
 	obj_tiles 0x08c1ab40, 0x0800, 0x279a
@@ -534,9 +528,6 @@ gUnknown_08524F84:: @ 8524F84
 	obj_tiles 0x08c258b8, 0x0800, 0x27f6
 	obj_tiles 0x08c28394, 0x0380, 0x27f7
 	obj_tiles 0x08c27e34, 0x0800, 0x27f8
-
-    .align 2
-gUnknown_0852528C:: @ 852528C
 	obj_tiles 0x08c28564, 0x00c0, 0x27f9
 	obj_tiles 0x08c28610, 0x0800, 0x27fa
 	obj_tiles 0x08c28880, 0x0060, 0x27fb
@@ -573,9 +564,6 @@ gUnknown_0852528C:: @ 852528C
 	obj_tiles 0x08d93b9c, 0x0080, 0x281a
 	obj_tiles 0x08c2407c, 0x0800, 0x281b
 	obj_tiles 0x08d8ea54, 0x0020, 0x281c
-
-    .align 2
-gUnknown_085253AC:: @ 85253AC
 	obj_tiles 0x08d8ef2c, 0x0080, 0x281d
 	obj_tiles 0x08dba378, 0x0400, 0x281e
 	obj_tiles 0x08dba4b8, 0x0080, 0x281f
@@ -597,6 +585,8 @@ gUnknown_085253AC:: @ 85253AC
 	obj_tiles 0x08c0a3ec, 0x1000, 0x282f
 	obj_tiles 0x08c1bee4, 0x0100, 0x2830
 
+    .align 2
+gBattleAnimPaletteTable:: @ 852544C
 	obj_pal 0x08c028cc, 0x2710
 	obj_pal 0x08c1c794, 0x2711
 	obj_pal 0x08c20868, 0x2712
@@ -655,9 +645,6 @@ gUnknown_085253AC:: @ 85253AC
 	obj_pal 0x08c09fd8, 0x2747
 	obj_pal 0x08c0a894, 0x2748
 	obj_pal 0x08c0aa08, 0x2749
-
-    .align 2
-gUnknown_0852561C:: @ 852561C
 	obj_pal 0x08c0ae94, 0x274a
 	obj_pal 0x08c0af1c, 0x274b
 	obj_pal 0x08c0af60, 0x274c
@@ -736,9 +723,6 @@ gUnknown_0852561C:: @ 852561C
 	obj_pal 0x08c14bf4, 0x2795
 	obj_pal 0x08c14bf4, 0x2796
 	obj_pal 0x08c1a478, 0x2797
-
-    .align 2
-gUnknown_0852588C:: @ 852588C
 	obj_pal 0x08c1a564, 0x2798
 	obj_pal 0x08c1a478, 0x2799
 	obj_pal 0x08c1a478, 0x279a
@@ -836,9 +820,6 @@ gUnknown_0852588C:: @ 852588C
 	obj_pal 0x08c25890, 0x27f6
 	obj_pal 0x08c2836c, 0x27f7
 	obj_pal 0x08c2836c, 0x27f8
-
-    .align 2
-gUnknown_08525B94:: @ 8525B94
 	obj_pal 0x08c285e8, 0x27f9
 	obj_pal 0x08c287d0, 0x27fa
 	obj_pal 0x08c288d0, 0x27fb
@@ -875,9 +856,6 @@ gUnknown_08525B94:: @ 8525B94
 	obj_pal 0x08d93bdc, 0x281a
 	obj_pal 0x08d93bf4, 0x281b
 	obj_pal 0x08d93c0c, 0x281c
-
-    .align 2
-gUnknown_08525CB4:: @ 8525CB4
 	obj_pal 0x08d8ef80, 0x281d
 	obj_pal 0x08dba35c, 0x281e
 	obj_pal 0x08dba4a0, 0x281f
@@ -900,7 +878,7 @@ gUnknown_08525CB4:: @ 8525CB4
 	obj_pal 0x08c1bf5c, 0x2830
 
     .align 2
-gUnknown_08525D54:: @ 8525D54
+gBattleAnimBackgroundTable:: @ 8525D54
 	.4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c
 	.4byte 0x08c1c844, 0x08c1ce3c, 0x08c1ce5c
 	.4byte 0x08d90074, 0x08d90d3c, 0x08d90d58
@@ -928,105 +906,3 @@ gUnknown_08525D54:: @ 8525D54
 	.4byte 0x08c25bec, 0x08d91074, 0x08c26958
 	.4byte 0x08c25bec, 0x08d91074, 0x08c26e54
 	.4byte 0x08c25bec, 0x08d91074, 0x08c27324
-
-    .align 2
-gUnknown_08525E98:: @ 8525E98
-	.4byte ma00_load_graphics
-	.4byte ma01_080728D0
-	.4byte ma02_instanciate_template
-	.4byte sub_80A3ECC
-	.4byte ma04_wait_countdown
-	.4byte sub_80A3F88
-	.4byte nullsub_6
-	.4byte nullsub_7
-	.4byte sub_80A3FC4
-	.4byte ma09_play_sound
-	.4byte sub_80A41D8
-	.4byte ma0B_0807324C
-	.4byte ma0C_set_BLDCNT_to_x3F40_and_BLDALPHA_to_argument
-	.4byte ma0D_reset_BLDCNT_and_BLDALPHA
-	.4byte ma0E_call
-	.4byte sub_80A4D00
-	.4byte ma10_080736AC
-	.4byte ma11_if_else
-	.4byte ma12_cond_if
-	.4byte ma13_goto
-	.4byte ma14_load_background
-	.4byte ma15_load_battle_screen_elements
-	.4byte ma16_wait_for_battle_screen_elements_s2
-	.4byte sub_80A5124
-	.4byte ma18_load_background_probably
-	.4byte ma19_08073BC8
-	.4byte ma1A_8073C00
-	.4byte ma1B_8073C2C
-	.4byte ma1C_8073ED0
-	.4byte ma1D_08073FB4
-	.4byte ma1E_set_BLDCNT
-	.4byte sub_80A57F8
-	.4byte ma20_wait_for_something
-	.4byte ma21_08074164
-	.4byte sub_80A4A18
-	.4byte ma23_8073484
-	.4byte sub_80A5944
-	.4byte sub_80A4E5C
-	.4byte sub_80A5508
-	.4byte sub_80A559C
-	.4byte sub_80A5984
-	.4byte sub_80A59DC
-	.4byte sub_80A5A0C
-	.4byte ma2B_make_side_invisible
-	.4byte ma2C_make_side_visible
-	.4byte sub_80A5AFC
-	.4byte sub_80A5BAC
-	.4byte ma2F_stop_music
-
-    .align 2
-gUnknown_08525F58:: @ 8525F58
-	.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
-	.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
-	.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
-	.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
-
-    .align 2
-gCastformFrontSpriteCoords:: @ 8525F78
-	.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
-	.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
-
-    .align 2
-gUnknown_08525F88:: @ 8525F88
-	.byte 0x0d, 0x0e, 0x0d, 0x0d
-
-    .align 2
-gUnknown_08525F8C:: @ 8525F8C
-	.byte 0x00, 0x00, 0x00, 0x00
-
-    .align 2
-gUnknown_08525F90:: @ 8525F90
-	spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-	spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-    .align 2
-gUnknown_08525FC0:: @ 8525FC0
-	obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
-	obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
-
-    .align 2
-@ the mother of all baserom includes
-	.incbin "baserom.gba", 0x525fd0, 0x18f60
-
-    .align 2
-gUnknown_0853EF30:: @ 853EF30
-	.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
-
-    .align 2
-gUnknown_0853EF40:: @ 853EF40
-	.4byte 0x00000004, gUnknown_0853EF30
-
-    .align 2
-gUnknown_0853EF48:: @ 853EF48
-	spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-    .align 2
-gUnknown_0853EF60:: @ 853EF60
-	spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44
-
diff --git a/data/battle_interface.s b/data/battle_interface.s
deleted file mode 100644
index 766f34752..000000000
--- a/data/battle_interface.s
+++ /dev/null
@@ -1,180 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_0832C138:: @ 832C138
-	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
-
-	.align 2
-gUnknown_0832C140:: @ 832C140
-	spr_template 0xd6ff, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_0832C158:: @ 832C158
-	spr_template 0xd700, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_0832C170:: @ 832C170
-	spr_template 0xd701, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_0832C188:: @ 832C188
-	spr_template 0xd702, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_0832C1A0:: @ 832C1A0
-	spr_template 0xd70b, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_0832C1B8:: @ 832C1B8
-	.byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
-
-	.align 2
-gUnknown_0832C1C0:: @ 832C1C0
-	spr_template 0xd704, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
-
-	.align 2
-gUnknown_0832C1D8:: @ 832C1D8
-	spr_template 0xd705, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
-
-	.align 2
-gUnknown_0832C1F0:: @ 832C1F0
-	spr_template 0xd706, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
-
-	.align 2
-gUnknown_0832C208:: @ 832C208
-	spr_template 0xd707, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
-
-	.align 2
-gUnknown_0832C220:: @ 832C220
-	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
-	.byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43
-	.byte 0x30, 0x20, 0x85, 0x43
-
-	.align 2
-gUnknown_0832C234:: @ 832C234
-	.byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46
-	.byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47
-	.byte 0x30, 0x20, 0x85, 0x47
-
-	.align 2
-gUnknown_0832C248:: @ 832C248
-	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
-
-	.align 2
-gUnknown_0832C250:: @ 832C250
-	.byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
-
-	.align 2
-gUnknown_0832C258:: @ 832C258
-	.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
-
-	.align 2
-gUnknown_0832C260:: @ 832C260
-	.byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
-	.byte 0xe0, 0x00, 0x80, 0x40
-
-	.align 2
-gUnknown_0832C26C:: @ 832C26C
-	.4byte 0x00000005, gUnknown_0832C220
-	.4byte 0x00000002, gUnknown_0832C248
-	.4byte 0x00000005, gUnknown_0832C234
-	.4byte 0x00000002, gUnknown_0832C250
-
-	.align 2
-gUnknown_0832C28C:: @ 832C28C
-	.4byte 0x00000002, gUnknown_0832C258
-	.4byte 0x00000003, gUnknown_0832C260
-
-	.align 2
-gUnknown_0832C29C:: @ 832C29C
-	.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
-	.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40
-
-	.align 2
-gUnknown_0832C2AC:: @ 832C2AC
-	.byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
-	.byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40
-	.byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40
-
-	.align 2
-gUnknown_0832C2C4:: @ 832C2C4
-	.4byte 0x00000004, gUnknown_0832C29C
-
-	.align 2
-gUnknown_0832C2CC:: @ 832C2CC
-	.4byte 0x00000006, gUnknown_0832C2AC
-
-	.align 2
-gUnknown_0832C2D4:: @ 832C2D4
-	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
-	.2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777
-
-	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
-	.2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771
-
-	.2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
-	.2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111
-
-	.align 2
-gUnknown_0832C334:: @ 832C334
-	obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c
-
-	.align 2
-gUnknown_0832C33C:: @ 832C33C
-	obj_pal gBattleInterface_BallStatusBarPal, 0xd710
-
-	.align 2
-gUnknown_0832C344:: @ 832C344
-	obj_pal gBattleInterface_BallDisplayPal, 0xd712
-
-	.align 2
-gUnknown_0832C34C:: @ 832C34C
-	obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714
-
-	.align 2
-gUnknown_0832C354:: @ 832C354
-	.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
-
-	.align 2
-gUnknown_0832C35C:: @ 832C35C
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
-
-	.align 2
-gUnknown_0832C364:: @ 832C364
-	spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
-
-	.align 2
-gUnknown_0832C37C:: @ 832C37C
-	spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
-
-	.align 2
-gUnknown_0832C394:: @ 832C394
-	spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
-
-	.align 2
-gUnknown_0832C3AC:: @ 832C3AC
-	spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
-
-	.align 2
-gUnknown_0832C3C4:: @ 832C3C4
-	.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_0832C3D8:: @ 832C3D8
-	.byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00
-
-	.align 2
-gUnknown_0832C3EC:: @ 832C3EC
-	.byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72
-	.byte 0xdc, 0x29, 0x00, 0x00
-
-	.align 2
-gUnknown_0832C3F8:: @ 832C3F8
-	.byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00
diff --git a/data/event_script_command_function_table.inc b/data/event_script_command_function_table.inc
index f44cdb7db..7cd00c37d 100644
--- a/data/event_script_command_function_table.inc
+++ b/data/event_script_command_function_table.inc
@@ -1,229 +1,229 @@
 	.align 2
 gScriptCmdTable:: @ 81DB67C
-	.4byte s00_nop
-	.4byte s01_nop
-	.4byte s02_end
-	.4byte s03_return
-	.4byte s04_call
-	.4byte s05_goto
-	.4byte s06_if_jump
-	.4byte s07_if_call
-	.4byte s08_jumpstd
-	.4byte s09_callstd
-	.4byte s0A_jumpstd_if
-	.4byte s0B_callstd_if
-	.4byte s0C_restore_execution_after_sCF
-	.4byte s0D_endscript_killram
-	.4byte s0E_set_byte
-	.4byte s0F_u32_var_to_const
-	.4byte s10_u8_var_to_const
-	.4byte s11_u8_ptr_to_const
-	.4byte s12_u32_var_to_ptr
-	.4byte s13_u8_var_to_ptr
-	.4byte s14_u32_var_to_var
-	.4byte s15_u8_ptr_to_ptr
-	.4byte s16_u16_gvar_to_const
-	.4byte s17_u16_gvar_add_const
-	.4byte sub_809993C
-	.4byte s19_u16_gvar_gvar
-	.4byte s1A_u16_gvar_gvar
-	.4byte s1B_cmp_u8_var_var
-	.4byte s1C_cmp_u8_var_const
-	.4byte s1D_cmp_u8_var_ptr
-	.4byte s1E_cmp_u8_ptr_var
-	.4byte s1F_cmp_u8_ptr_const
-	.4byte s20_cmp_u8_ptr_ptr
-	.4byte s21_cmp_u16_gvar_const
-	.4byte s22_cmp_u16_gvar_gvar
-	.4byte s23_execute_ASM
-	.4byte s24_execute_ASM_2
-	.4byte s25_extended_cmd
-	.4byte s26_extended_cmd_setvar
-	.4byte s27_set_to_waitstate
-	.4byte s28_pause
-	.4byte s29_flag_set
-	.4byte s2A_flag_clear
-	.4byte s2B_flag_check
-	.4byte s2C_unknown
-	.4byte s2D_unknown
-	.4byte s2E_unknown
-	.4byte s2F_music_play
-	.4byte s30_music_check
-	.4byte s31_PlayFanfare
-	.4byte s32_fanfare_wait
-	.4byte s33_play_music
-	.4byte s34_unknown
-	.4byte s35_fade_to_default
-	.4byte s36_fade_to_music
-	.4byte s37_fadeout
-	.4byte s38_fadein
-	.4byte s39_warp_sfx
-	.4byte s3A_warp_new_music
-	.4byte s3B_warp_keep_music
-	.4byte sub_809A054
-	.4byte s3D_warp_v4
-	.4byte s3E_set_new_map
-	.4byte s3F_set_new_map_DMA
-	.4byte sub_809A2DC
-	.4byte sub_809A35C
-	.4byte s42_get_map_camera_pos
-	.4byte s43_get_player_party_count
-	.4byte sub_80999A0
-	.4byte sub_80999E4
-	.4byte sub_8099A28
-	.4byte sub_8099A6C
-	.4byte s48_get_item_type
-	.4byte sub_8099ADC
-	.4byte sub_8099B20
-	.4byte sub_8099B64
-	.4byte sub_8099B90
-	.4byte sub_8099BE8
-	.4byte sub_8099BBC
-	.4byte s4F_execute_movement
-	.4byte s50_execute_movement_remote
-	.4byte s51_waitmove
-	.4byte s52_waitmove_remote
-	.4byte s53_hide_sprite
-	.4byte s54_hide_sprite_set_coords
-	.4byte s55_show_sprite
-	.4byte s56_show_sprite_set_coords
-	.4byte s57_move_sprites
-	.4byte s58_npc_f1_clear_x20
-	.4byte s59_npc_f1_set_x20
-	.4byte s5A_face_player
-	.4byte s5B_npc_set_direction
-	.4byte s5C_trainer_battle_configure_and_start
-	.4byte sub_809B5E4
-	.4byte sub_809B5F0
-	.4byte sub_809B604
-	.4byte s60_check_trainer_flag
-	.4byte s61_set_trainer_flag
-	.4byte s62_unset_trainer_flag
-	.4byte s63_new_sprite_location_permanent
-	.4byte s64_set_sprite_top_left_corner
-	.4byte s65_set_sprite_behaviour
-	.4byte sub_809AC78
-	.4byte s67_execute_box
-	.4byte s68_close_box
-	.4byte sub_809AAC4
-	.4byte sub_809AAEC
-	.4byte s6B_release
-	.4byte s6C_release_2
-	.4byte sub_809ACC0
-	.4byte s6E_yes_no
-	.4byte s6F_multichoice
-	.4byte sub_809AD3C
-	.4byte sub_809AD90
-	.4byte sub_809AD8C
-	.4byte s73_nop_skip_word
-	.4byte sub_809ADEC
-	.4byte sub_809ADF8
-	.4byte s76_close_picture_box
-	.4byte sub_809AE48
-	.4byte sub_809AE6C
-	.4byte s79_give_pokemon
-	.4byte s7A_create_egg
-	.4byte s7B_change_pokedata_AP
-	.4byte sub_809B3DC
-	.4byte s7D_load_pokename
-	.4byte s7E_load_first_pokenames
-	.4byte s7F_load_pokename_team
-	.4byte s80_load_item_name
-	.4byte sub_809B114
-	.4byte s82_load_item_name
-	.4byte s83_load_textvar_var
-	.4byte s84_load_textvar_std_expression
-	.4byte s85_load_textvar_pointer
-	.4byte s86_pokemart
-	.4byte s87_pokemartdecor
-	.4byte s88_pokemartbp
-	.4byte s89_open_casino_game1
-	.4byte berry_script_cmd
-	.4byte sub_809B784
-	.4byte sub_809B794
-	.4byte sub_809B7A4
-	.4byte sub_809B7B4
-	.4byte s8F_get_random_val
-	.4byte s90_AddMoney
-	.4byte s91_SubtractMoney
-	.4byte s92_check_money
-	.4byte s93_display_money
-	.4byte s94_hide_money
-	.4byte s95_update_money
-	.4byte sub_809B758
-	.4byte s97_screen_special_effect
-	.4byte s98_refade_with_timer
-	.4byte s99_unknown
-	.4byte s9A_unknown
-	.4byte s9B_unknown
-	.4byte s9C_execute_HM
-	.4byte s9D_set_HM_animation_data
-	.4byte s9E_checkarray_HM_animation
-	.4byte s9F_changeposition_fly
-	.4byte sA0_check_gender
-	.4byte sA1_play_cry
-	.4byte sA2_setmaptile
-	.4byte sA3_set_standard_weather_data
-	.4byte sA4_set_weather_data
-	.4byte sub_8099E7C
-	.4byte sA6_activate_per_step_callback_eg_ash
-	.4byte sA7_set_new_map_footer
-	.4byte sA8_unknown
-	.4byte sA9_unknown
-	.4byte sAA_create_new_sprite
-	.4byte sAB_unknown
-	.4byte sAC_open_door
-	.4byte sub_809B9C8
-	.4byte sub_809BA24
-	.4byte sub_809BA38
-	.4byte sub_809BA7C
-	.4byte sub_809BAC0
-	.4byte sub_809BAFC
-	.4byte sB3_get_coin_amount
-	.4byte sub_809BB20
-	.4byte sub_809BB58
-	.4byte sB6_load_battle
-	.4byte sub_809B6A8
-	.4byte sB8_set_virtual_address
-	.4byte sB9_virtual_jump
-	.4byte sBA_virtual_call
-	.4byte sBB_virtual_if_jump
-	.4byte sBC_virtual_if_call
-	.4byte sBD_virtual_message
-	.4byte sBE_virtual_load_text
-	.4byte sBF_virtual_load_textbuffer
-	.4byte sub_809B578
-	.4byte sC1_hide_coins
-	.4byte sC2_update_coins
-	.4byte sC3_unknown
-	.4byte sC4_unknown
-	.4byte sub_809B8DC
-	.4byte sC6_load_textvar_box_label
-	.4byte s01_nop
-	.4byte s01_nop
-	.4byte s01_nop
-	.4byte s01_nop
-	.4byte s01_nop
-	.4byte s01_nop
-	.4byte sCD_set_obedient_bit
-	.4byte sCE_check_obedient_bit
-	.4byte sCF_execute_RAM_script_DMA
-	.4byte s01_nop
-	.4byte sD1_warp_v5
-	.4byte sub_809BD70
-	.4byte sub_809BB90
-	.4byte sub_809BBB4
-	.4byte ScrCmd_MossdeepGymSwitch
-	.4byte sub_809BBDC
-	.4byte sub_809A150
-	.4byte sub_809BBE8
-	.4byte sub_809BBFC
-	.4byte sub_809AF94
-	.4byte sub_809AC3C
-	.4byte sub_8099D20
-	.4byte sub_809BDD0
-	.4byte sub_809BE0C
-	.4byte sub_809ABF0
-	.4byte sub_809BE54
-	.4byte sub_809B214
-	.4byte sub_809B0C4
+	.4byte ScrCmd_nop
+	.4byte ScrCmd_nop1
+	.4byte ScrCmd_end
+	.4byte ScrCmd_return
+	.4byte ScrCmd_call
+	.4byte ScrCmd_goto
+	.4byte ScrCmd_goto_if
+	.4byte ScrCmd_call_if
+	.4byte ScrCmd_gotostd
+	.4byte ScrCmd_callstd
+	.4byte ScrCmd_gotostd_if
+	.4byte ScrCmd_callstd_if
+	.4byte ScrCmd_gotoram
+	.4byte ScrCmd_killscript
+	.4byte ScrCmd_setmysteryeventstatus
+	.4byte ScrCmd_loadword
+	.4byte ScrCmd_loadbyte
+	.4byte ScrCmd_writebytetoaddr
+	.4byte ScrCmd_loadbytefromaddr
+	.4byte ScrCmd_setptrbyte
+	.4byte ScrCmd_copylocal
+	.4byte ScrCmd_copybyte
+	.4byte ScrCmd_setvar
+	.4byte ScrCmd_addvar
+	.4byte ScrCmd_subvar
+	.4byte ScrCmd_copyvar
+	.4byte ScrCmd_setorcopyvar
+	.4byte ScrCmd_compare_local_to_local
+	.4byte ScrCmd_compare_local_to_value
+	.4byte ScrCmd_compare_local_to_addr
+	.4byte ScrCmd_compare_addr_to_local
+	.4byte ScrCmd_compare_addr_to_value
+	.4byte ScrCmd_compare_addr_to_addr
+	.4byte ScrCmd_compare_var_to_value
+	.4byte ScrCmd_compare_var_to_var
+	.4byte ScrCmd_callnative
+	.4byte ScrCmd_gotonative
+	.4byte ScrCmd_special
+	.4byte ScrCmd_specialvar
+	.4byte ScrCmd_waitstate
+	.4byte ScrCmd_delay
+	.4byte ScrCmd_setflag
+	.4byte ScrCmd_clearflag
+	.4byte ScrCmd_checkflag
+	.4byte ScrCmd_initclock
+	.4byte ScrCmd_dodailyevents
+	.4byte ScrCmd_gettime
+	.4byte ScrCmd_playse
+	.4byte ScrCmd_waitse
+	.4byte ScrCmd_playfanfare
+	.4byte ScrCmd_waitfanfare
+	.4byte ScrCmd_playbgm
+	.4byte ScrCmd_savebgm
+	.4byte ScrCmd_fadedefaultbgm
+	.4byte ScrCmd_fadenewbgm
+	.4byte ScrCmd_fadeoutbgm
+	.4byte ScrCmd_fadeinbgm
+	.4byte ScrCmd_warp
+	.4byte ScrCmd_warpsilent
+	.4byte ScrCmd_warpdoor
+	.4byte ScrCmd_warphole
+	.4byte ScrCmd_warpteleport
+	.4byte ScrCmd_setwarp
+	.4byte ScrCmd_setdynamicwarp
+	.4byte ScrCmd_setdivewarp
+	.4byte ScrCmd_setholewarp
+	.4byte ScrCmd_getplayerxy
+	.4byte ScrCmd_countpokemon
+	.4byte ScrCmd_additem
+	.4byte ScrCmd_removeitem
+	.4byte ScrCmd_checkitemspace
+	.4byte ScrCmd_checkitem
+	.4byte ScrCmd_checkitemtype
+	.4byte ScrCmd_addpcitem
+	.4byte ScrCmd_checkpcitem
+	.4byte ScrCmd_adddecor
+	.4byte ScrCmd_removedecor
+	.4byte ScrCmd_hasdecor
+	.4byte ScrCmd_checkdecor
+	.4byte ScrCmd_applymovement
+	.4byte ScrCmd_applymovement_at
+	.4byte ScrCmd_waitmovement
+	.4byte ScrCmd_waitmovement_at
+	.4byte ScrCmd_removeobject
+	.4byte ScrCmd_removeobject_at
+	.4byte ScrCmd_addobject
+	.4byte ScrCmd_addobject_at
+	.4byte ScrCmd_setobjectxy
+	.4byte ScrCmd_showobject
+	.4byte ScrCmd_hideobject
+	.4byte ScrCmd_faceplayer
+	.4byte ScrCmd_turnobject
+	.4byte ScrCmd_trainerbattle
+	.4byte ScrCmd_battlebegin
+	.4byte ScrCmd_ontrainerbattleend
+	.4byte ScrCmd_ontrainerbattleendgoto
+	.4byte ScrCmd_checktrainerflag
+	.4byte ScrCmd_settrainerflag
+	.4byte ScrCmd_cleartrainerflag
+	.4byte ScrCmd_setobjectxyperm
+	.4byte ScrCmd_moveobjectoffscreen
+	.4byte ScrCmd_setobjectmovementtype
+	.4byte ScrCmd_waitmessage
+	.4byte ScrCmd_message
+	.4byte ScrCmd_closemessage
+	.4byte ScrCmd_lockall
+	.4byte ScrCmd_lock
+	.4byte ScrCmd_releaseall
+	.4byte ScrCmd_release
+	.4byte ScrCmd_waitbutton
+	.4byte ScrCmd_yesnobox
+	.4byte ScrCmd_multichoice
+	.4byte ScrCmd_multichoicedefault
+	.4byte ScrCmd_multichoicegrid
+	.4byte ScrCmd_drawbox
+	.4byte ScrCmd_erasebox
+	.4byte ScrCmd_drawboxtext
+	.4byte ScrCmd_drawpokepic
+	.4byte ScrCmd_erasepokepic
+	.4byte ScrCmd_drawcontestwinner
+	.4byte ScrCmd_braillemessage
+	.4byte ScrCmd_givepoke
+	.4byte ScrCmd_giveegg
+	.4byte ScrCmd_setpokemove
+	.4byte ScrCmd_checkpokemove
+	.4byte ScrCmd_getspeciesname
+	.4byte ScrCmd_getfirstpartypokename
+	.4byte ScrCmd_getpartypokename
+	.4byte ScrCmd_getitemname
+	.4byte ScrCmd_getdecorname
+	.4byte ScrCmd_getmovename
+	.4byte ScrCmd_getnumberstring
+	.4byte ScrCmd_getstdstring
+	.4byte ScrCmd_getstring
+	.4byte ScrCmd_pokemart
+	.4byte ScrCmd_pokemartdecor
+	.4byte ScrCmd_pokemartbp
+	.4byte ScrCmd_playslotmachine
+	.4byte ScrCmd_plantberrytree
+	.4byte ScrCmd_choosecontestpkmn
+	.4byte ScrCmd_startcontest
+	.4byte ScrCmd_showcontestresults
+	.4byte ScrCmd_contestlinktransfer
+	.4byte ScrCmd_random
+	.4byte ScrCmd_givemoney
+	.4byte ScrCmd_takemoney
+	.4byte ScrCmd_checkmoney
+	.4byte ScrCmd_showmoneybox
+	.4byte ScrCmd_hidemoneybox
+	.4byte ScrCmd_updatemoneybox
+	.4byte ScrCmd_getpricereduction
+	.4byte ScrCmd_fadescreen
+	.4byte ScrCmd_fadescreendelay
+	.4byte ScrCmd_setdarklevel
+	.4byte ScrCmd_animdarklevel
+	.4byte ScrCmd_messageautoscroll
+	.4byte ScrCmd_dofieldeffect
+	.4byte ScrCmd_setfieldeffect
+	.4byte ScrCmd_waitfieldeffect
+	.4byte ScrCmd_sethealplace
+	.4byte ScrCmd_checkplayergender
+	.4byte ScrCmd_playpokecry
+	.4byte ScrCmd_setmaptile
+	.4byte ScrCmd_resetweather
+	.4byte ScrCmd_setweather
+	.4byte ScrCmd_doweather
+	.4byte ScrCmd_tileeffect
+	.4byte ScrCmd_setmaplayoutindex
+	.4byte ScrCmd_setobjectpriority
+	.4byte ScrCmd_resetobjectpriority
+	.4byte ScrCmd_createvobject
+	.4byte ScrCmd_turnvobject
+	.4byte ScrCmd_opendoor
+	.4byte ScrCmd_closedoor
+	.4byte ScrCmd_waitdooranim
+	.4byte ScrCmd_setdooropen
+	.4byte ScrCmd_setdoorclosed
+	.4byte ScrCmd_addelevmenuitem
+	.4byte ScrCmd_showelevmenu
+	.4byte ScrCmd_checkcoins
+	.4byte ScrCmd_givecoins
+	.4byte ScrCmd_takecoins
+	.4byte ScrCmd_setwildbattle
+	.4byte ScrCmd_dowildbattle
+	.4byte ScrCmd_setvaddress
+	.4byte ScrCmd_vgoto
+	.4byte ScrCmd_vcall
+	.4byte ScrCmd_vgoto_if
+	.4byte ScrCmd_vcall_if
+	.4byte ScrCmd_vmessage
+	.4byte ScrCmd_vloadword
+	.4byte ScrCmd_vgetstring
+	.4byte ScrCmd_showcoinsbox
+	.4byte ScrCmd_hidecoinsbox
+	.4byte ScrCmd_updatecoinsbox
+	.4byte ScrCmd_incrementgamestat
+	.4byte ScrCmd_setescapewarp
+	.4byte ScrCmd_waitpokecry
+	.4byte ScrCmd_getboxname
+	.4byte ScrCmd_nop1
+	.4byte ScrCmd_nop1
+	.4byte ScrCmd_nop1
+	.4byte ScrCmd_nop1
+	.4byte ScrCmd_nop1
+	.4byte ScrCmd_nop1
+	.4byte ScrCmd_setpokeobedient
+	.4byte ScrCmd_checkpokeobedience
+	.4byte ScrCmd_cmdCF
+	.4byte ScrCmd_nop1
+	.4byte ScrCmd_warpD1
+	.4byte ScrCmd_setpokemetlocation
+	.4byte ScrCmd_mossdeepgym1
+	.4byte ScrCmd_mossdeepgym2
+	.4byte ScrCmd_mossdeepgym3
+	.4byte ScrCmd_mossdeepgym4
+	.4byte ScrCmd_warpD7
+	.4byte ScrCmd_cmdD8
+	.4byte ScrCmd_cmdD9
+	.4byte ScrCmd_cmdDA
+	.4byte ScrCmd_cmdDB
+	.4byte ScrCmd_fadescreenswapbuffers
+	.4byte ScrCmd_gettrainerclass
+	.4byte ScrCmd_gettrainername
+	.4byte ScrCmd_pokenavcall
+	.4byte ScrCmd_warpE0
+	.4byte ScrCmd_getcontesttype
+	.4byte ScrCmd_getitemnameplural
diff --git a/data/event_scripts.s b/data/event_scripts.s
index e700ad181..ad1216b91 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -12,13 +12,12 @@ gScriptCmdTableEnd:: @ 81DBA08
 gSpecialVars:: @ 81DBA0C
 	.incbin "baserom.gba", 0x1dba0c, 0x58
 
-gUnknown_081DBA64:: @ 81DBA64
-	.incbin "baserom.gba", 0x1dba64, 0x83c
+	.include "data/specials.inc"
 
-gUnknown_081DC2A0:: @ 81DC2A0
+gStdScripts:: @ 81DC2A0
 	.incbin "baserom.gba", 0x1dc2a0, 0x2c
 
-gUnknown_081DC2CC:: @ 81DC2CC
+gStdScripts_End:: @ 81DC2CC
 	.incbin "baserom.gba", 0x1dc2cc, 0x34ee
 
 gUnknown_081DF7BA:: @ 81DF7BA
diff --git a/data/graphics.s b/data/graphics.s
index e1b76565a..bf0e3173b 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -39,7 +39,7 @@ gBattleInterface_BallDisplayPal:: @ 8C11BBC
 	.incbin "graphics/battle_interface/ball_display.gbapal"
 
     .align 2
-gUnknown_08C11BDC:: @ 8C11BDC
+gHealthboxElementsGfxTable:: @ 8C11BDC
 	.incbin "baserom.gba", 0xc11bdc, 0x840
 
     .align 2
@@ -910,8 +910,116 @@ gCableCarCord_Gfx:: @ 8DBC2C0
 gUnknown_08DBC2E8:: @ 8DBC2E8
 	.incbin "baserom.gba", 0xdbc2e8, 0x72c
 
-gUnknown_08DBCA14:: @ 8DBCA14
-	.incbin "baserom.gba", 0xdbca14, 0x3d00
+gUnknown_08DBCA14:: @ 0x08DBCA14
+	.incbin "baserom.gba", 0xdbca14, 0x1e04
+
+gUnknown_08DBE818:: @ 0x08DBE818
+	.incbin "baserom.gba", 0xdbe818, 0x20
+
+gUnknown_08DBE838:: @ 0x08DBE838
+	.incbin "baserom.gba", 0xdbe838, 0x20
+
+gUnknown_08DBE858:: @ 0x08DBE858
+	.incbin "baserom.gba", 0xdbe858, 0x20
+
+gUnknown_08DBE878:: @ 0x08DBE878
+	.incbin "baserom.gba", 0xdbe878, 0x20
+
+gUnknown_08DBE898:: @ 0x08DBE898
+	.incbin "baserom.gba", 0xdbe898, 0x20
+
+gUnknown_08DBE8B8:: @ 0x08DBE8B8
+	.incbin "baserom.gba", 0xdbe8b8, 0x20
+
+gUnknown_08DBE8D8:: @ 0x08DBE8D8
+	.incbin "baserom.gba", 0xdbe8d8, 0x20
+
+gUnknown_08DBE8F8:: @ 0x08DBE8F8
+	.incbin "baserom.gba", 0xdbe8f8, 0x20
+
+gUnknown_08DBE918:: @ 0x08DBE918
+	.incbin "baserom.gba", 0xdbe918, 0x20
+
+gUnknown_08DBE938:: @ 0x08DBE938
+	.incbin "baserom.gba", 0xdbe938, 0x20
+
+gUnknown_08DBE958:: @ 0x08DBE958
+	.incbin "baserom.gba", 0xdbe958, 0x20
+
+gUnknown_08DBE978:: @ 0x08DBE978
+	.incbin "baserom.gba", 0xdbe978, 0x20
+
+gUnknown_08DBE998:: @ 0x08DBE998
+	.incbin "baserom.gba", 0xdbe998, 0x1a0
+
+gUnknown_08DBEB38:: @ 0x08DBEB38
+	.incbin "baserom.gba", 0xdbeb38, 0x13c
+
+gUnknown_08DBEC74:: @ 0x08DBEC74
+	.incbin "baserom.gba", 0xdbec74, 0x210
+
+gUnknown_08DBEE84:: @ 0x08DBEE84
+	.incbin "baserom.gba", 0xdbee84, 0xd8
+
+gUnknown_08DBEF5C:: @ 0x08DBEF5C
+	.incbin "baserom.gba", 0xdbef5c, 0x1f8
+
+gUnknown_08DBF154:: @ 0x08DBF154
+	.incbin "baserom.gba", 0xdbf154, 0x180
+
+gUnknown_08DBF2D4:: @ 0x08DBF2D4
+	.incbin "baserom.gba", 0xdbf2d4, 0xa8
+
+gUnknown_08DBF37C:: @ 0x08DBF37C
+	.incbin "baserom.gba", 0xdbf37c, 0x190
+
+gUnknown_08DBF50C:: @ 0x08DBF50C
+	.incbin "baserom.gba", 0xdbf50c, 0x140
+
+gUnknown_08DBF64C:: @ 0x08DBF64C
+	.incbin "baserom.gba", 0xdbf64c, 0x168
+
+gUnknown_08DBF7B4:: @ 0x08DBF7B4
+	.incbin "baserom.gba", 0xdbf7b4, 0x150
+
+gUnknown_08DBF904:: @ 0x08DBF904
+	.incbin "baserom.gba", 0xdbf904, 0x2a0
+
+gUnknown_08DBFBA4:: @ 0x08DBFBA4
+	.incbin "baserom.gba", 0xdbfba4, 0xd8
+
+gUnknown_08DBFC7C:: @ 0x08DBFC7C
+	.incbin "baserom.gba", 0xdbfc7c, 0xe0
+
+gUnknown_08DBFD5C:: @ 0x08DBFD5C
+	.incbin "baserom.gba", 0xdbfd5c, 0x10c
+
+gUnknown_08DBFE68:: @ 0x08DBFE68
+	.incbin "baserom.gba", 0xdbfe68, 0xdc
+
+gUnknown_08DBFF44:: @ 0x08DBFF44
+	.incbin "baserom.gba", 0xdbff44, 0xf0
+
+gUnknown_08DC0034:: @ 0x08DC0034
+	.incbin "baserom.gba", 0xdc0034, 0xe0
+
+gUnknown_08DC0114:: @ 0x08DC0114
+	.incbin "baserom.gba", 0xdc0114, 0xe0
+
+gUnknown_08DC01F4:: @ 0x08DC01F4
+	.incbin "baserom.gba", 0xdc01f4, 0x10c
+
+gUnknown_08DC0300:: @ 0x08DC0300
+	.incbin "baserom.gba", 0xdc0300, 0xf0
+
+gUnknown_08DC03F0:: @ 0x08DC03F0
+	.incbin "baserom.gba", 0xdc03f0, 0xf8
+
+gUnknown_08DC04E8:: @ 0x08DC04E8
+	.incbin "baserom.gba", 0xdc04e8, 0x118
+
+gUnknown_08DC0600:: @ 0x08DC0600
+	.incbin "baserom.gba", 0xdc0600, 0x114
 
 gUnknown_08DC0714:: @ 8DC0714
 	.incbin "baserom.gba", 0xdc0714, 0x40
diff --git a/data/mail.s b/data/mail.s
deleted file mode 100644
index 5dc8270bc..000000000
--- a/data/mail.s
+++ /dev/null
@@ -1,26 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_0859F290:: @ 859F290
-	.incbin "baserom.gba", 0x59f290, 0xc
-
-gUnknown_0859F29C:: @ 859F29C
-	.incbin "baserom.gba", 0x59f29c, 0x10
-
-gUnknown_0859F2AC:: @ 859F2AC
-	.incbin "baserom.gba", 0x59f2ac, 0x4
-
-gUnknown_0859F2B0:: @ 859F2B0
-	.incbin "baserom.gba", 0x59f2b0, 0x8
-
-gUnknown_0859F2B8:: @ 859F2B8
-	.incbin "baserom.gba", 0x59f2b8, 0xfc
-
-gUnknown_0859F3B4:: @ 859F3B4
-	.incbin "baserom.gba", 0x59f3b4, 0xa4
-
-gUnknown_0859F458:: @ 859F458
-	.incbin "baserom.gba", 0x59f458, 0xbc
diff --git a/data/rom_8525F58.s b/data/rom_8525F58.s
new file mode 100644
index 000000000..1cee7112a
--- /dev/null
+++ b/data/rom_8525F58.s
@@ -0,0 +1,57 @@
+    .include "asm/macros.inc"
+    .include "constants/constants.inc"
+
+    .section .rodata
+
+    .align 2
+
+
+gUnknown_08525F58:: @ 8525F58
+	.byte 0x48, 0x50, 0x00, 0x00, 0xb0, 0x28, 0x00, 0x00
+	.byte 0x30, 0x28, 0x00, 0x00, 0x70, 0x50, 0x00, 0x00
+	.byte 0x20, 0x50, 0x00, 0x00, 0xc8, 0x28, 0x00, 0x00
+	.byte 0x5a, 0x58, 0x00, 0x00, 0x98, 0x20, 0x00, 0x00
+
+    .align 2
+gCastformFrontSpriteCoords:: @ 8525F78
+	.byte 0x44, 0x11, 0x00, 0x00, 0x66, 0x09, 0x00, 0x00
+	.byte 0x46, 0x09, 0x00, 0x00, 0x86, 0x08, 0x00, 0x00
+
+    .align 2
+gUnknown_08525F88:: @ 8525F88
+	.byte 0x0d, 0x0e, 0x0d, 0x0d
+
+    .align 2
+gUnknown_08525F8C:: @ 8525F8C
+	.byte 0x00, 0x00, 0x00, 0x00
+
+    .align 2
+gUnknown_08525F90:: @ 8525F90
+	spr_template 0xd755, 0xd755, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 0xd756, 0xd756, gUnknown_0852497C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+    .align 2
+gUnknown_08525FC0:: @ 8525FC0
+	obj_tiles gMiscBlank_Gfx, 0x0800, 0xd755
+	obj_tiles gMiscBlank_Gfx, 0x0800, 0xd756
+
+    .align 2
+@ the mother of all baserom includes
+	.incbin "baserom.gba", 0x525fd0, 0x18f60
+
+    .align 2
+gUnknown_0853EF30:: @ 853EF30
+	.byte 0xf0, 0xf0, 0x0c, 0x80, 0xf0, 0x30, 0x0d, 0x84, 0x30, 0xf0, 0x0e, 0x86, 0x30, 0x30, 0x08, 0x88
+
+    .align 2
+gUnknown_0853EF40:: @ 853EF40
+	.4byte 0x00000004, gUnknown_0853EF30
+
+    .align 2
+gUnknown_0853EF48:: @ 853EF48
+	spr_template 0x271a, 0x271a, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+    .align 2
+gUnknown_0853EF60:: @ 853EF60
+	spr_template 0x2798, 0x2798, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A9E44
+
diff --git a/data/scrcmd.s b/data/scrcmd.s
deleted file mode 100644
index dfa802684..000000000
--- a/data/scrcmd.s
+++ /dev/null
@@ -1,14 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gNullScriptPtr:: @ 85102BC
-	.incbin "baserom.gba", 0x5102bc, 0x4
-
-gUnknown_085102C0:: @ 85102C0
-	.incbin "baserom.gba", 0x5102c0, 0x14
-
-gUnknown_085102D4:: @ 85102D4
-	.incbin "baserom.gba", 0x5102d4, 0xc
diff --git a/data/specials.inc b/data/specials.inc
new file mode 100644
index 000000000..49f6b91a0
--- /dev/null
+++ b/data/specials.inc
@@ -0,0 +1,537 @@
+.macro def_special ptr
+.set SPECIAL_\ptr, __special__
+.set __special__, __special__ + 1
+    .4byte \ptr
+    .endm
+
+.set __special__, 0
+        .align 2
+gSpecials:: @ 81DBA64
+	def_special sp000_heal_pokemon
+	def_special sub_809D2BC
+	def_special sub_80AF948
+	def_special sub_80AF9F8
+	def_special sub_80B36EC
+	def_special sub_80B371C
+	def_special sub_80E8E18
+	def_special sub_80E8BC8
+	def_special sub_80E9068
+	def_special sub_80E9A90
+	def_special sub_80E9AC0
+	def_special sub_80E9744
+	def_special sub_80E9BDC
+	def_special sub_80E9C2C
+	def_special sub_80E9C74
+	def_special sub_80E9C88
+	def_special sub_80EA2E4
+	def_special sub_80EA354
+	def_special sub_80E933C
+	def_special sub_8127E18
+	def_special sub_81297AC
+	def_special sub_80E8C98
+	def_special sub_80E95D4
+	def_special sub_8129708
+	def_special sub_80E91F8
+	def_special sub_80EA30C
+	def_special sub_80FA57C
+	def_special sub_80E6BE8
+	def_special sub_80B2DA4
+	def_special sub_80B2E4C
+	def_special sub_80B2E74
+	def_special sub_80B2EA8
+	def_special sub_80097E8
+	def_special sub_80B3968
+	def_special sub_80B3924
+	def_special nullsub_37
+	def_special sub_80B3254
+	def_special sub_80B2FD8
+	def_special sub_8138240
+	def_special SpawnLinkPartnerFieldObject
+	def_special copy_player_party_to_sav1
+	def_special copy_player_party_from_sav1
+	def_special sub_80F9438
+	def_special sp02A_crash_sound
+	def_special FieldObjectInteractionGetBerryTreeData
+	def_special FieldObjectInteractionGetBerryName
+	def_special FieldObjectInteractionGetBerryCountString
+	def_special Bag_ChooseBerry
+	def_special FieldObjectInteractionPlantBerryTree
+	def_special FieldObjectInteractionPickBerryTree
+	def_special FieldObjectInteractionRemoveBerryTree
+	def_special FieldObjectInteractionWaterBerryTree
+	def_special PlayerHasBerries
+	def_special IsEnigmaBerryValid
+	def_special sub_80B170C
+	def_special sub_80B1A14
+	def_special special_trainer_unable_to_battle
+	def_special check_trainer_flag
+	def_special sub_80B45AC
+	def_special SetUpTrainerEncounterMusic
+	def_special sub_80B226C
+	def_special sub_80B22A0
+	def_special sub_80B19EC
+	def_special sub_80C7578
+	def_special sub_80F92F8
+	def_special TurnOffTVScreen
+	def_special DoTVShow
+	def_special DoPokeNews
+	def_special special_0x44
+	def_special special_0x45
+	def_special InterviewBefore
+	def_special InterviewAfter
+	def_special sub_80EF8F8
+	def_special SetContestCategoryStringVarForInterview
+	def_special special_0x4a
+	def_special TV_IsScriptShowKindAlreadyInQueue
+	def_special CheckForBigMovieOrEmergencyNewsOnTV
+	def_special GetMomOrDadStringForTVMessage
+	def_special ResetTVShowState
+	def_special sub_80F831C
+	def_special sub_80F84B0
+	def_special sub_80F8814
+	def_special sub_80F834C
+	def_special sub_80F8390
+	def_special sub_80F8850
+	def_special sub_80F82B4
+	def_special sub_80F87D8
+	def_special sub_80F7F30
+	def_special sub_80F8970
+	def_special sub_80F8AFC
+	def_special sub_80F82FC
+	def_special sub_80F7F7C
+	def_special sub_80F7FFC
+	def_special sub_80F8D24
+	def_special sub_80F8C7C
+	def_special sub_80B3000
+	def_special sub_809FF80
+	def_special sub_80FAFF8
+	def_special easy_chat_input_maybe
+	def_special sub_811EECC
+	def_special sub_81201DC
+	def_special sub_81201F4
+	def_special sub_8120210
+	def_special sub_8120358
+	def_special sub_8120374
+	def_special sub_812038C
+	def_special sub_8120340
+	def_special sub_8120B5C
+	def_special sub_81203FC
+	def_special sub_81203C4
+	def_special sub_81213B0
+	def_special sub_812139C
+	def_special sub_8121388
+	def_special sub_81213D8
+	def_special sub_8121450
+	def_special sub_8121424
+	def_special sub_8133EC0
+	def_special sub_8133CD8
+	def_special sub_8133CF4
+	def_special sub_8133D2C
+	def_special sub_8133D8C
+	def_special sub_8133E38
+	def_special GetSeedotSizeRecordInfo
+	def_special CompareSeedotSize
+	def_special GetLotadSizeRecordInfo
+	def_special CompareLotadSize
+	def_special TV_PutNameRaterShowOnTheAirIfNicnkameChanged
+	def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
+	def_special TV_CheckMonOTIDEqualsPlayerID
+	def_special sub_8122998
+	def_special sub_81229C8
+	def_special sub_811EF6C
+	def_special sub_8122A30
+	def_special sub_80D6EDC
+	def_special CalculatePlayerPartyCount
+	def_special sub_80C7008
+	def_special sub_80C70AC
+	def_special sub_80F88E8
+	def_special sub_80F88DC
+	def_special sub_80F8864
+	def_special sub_80F8940
+	def_special ShowContestWinner
+	def_special sub_8138540
+	def_special sub_81384F0
+	def_special sub_8138AC0
+	def_special DrawWholeMapView
+	def_special sub_8138AD0
+	def_special sub_8138750
+	def_special sub_81388E4
+	def_special sub_8138AA4
+	def_special sub_8138AF0
+	def_special sub_8138B10
+	def_special sub_8138B48
+	def_special sub_8138BC8
+	def_special sub_8138B8C
+	def_special sub_814FC9C
+	def_special sub_8085784
+	def_special Special_StartWallClock
+	def_special Special_ViewWallClock
+	def_special sub_80B1138
+	def_special sub_80B086C
+	def_special ChangePokemonNickname
+	def_special sub_81B94B0
+	def_special sub_8136EF4
+	def_special sub_807FA80
+	def_special sub_8142BC8
+	def_special sub_813BD60
+	def_special sub_813BCA8
+	def_special sub_813BDB4
+	def_special sub_813BA30
+	def_special sub_813BCE8
+	def_special sub_813BF60
+	def_special sub_813BA60
+	def_special sub_813BF7C
+	def_special rock_smash_wild_pokemon_encounter
+	def_special GabbyAndTyGetBattleNum
+	def_special GabbyAndTyAfterInterview
+	def_special GabbyAndTyBeforeInterview
+	def_special DoTVShowInSearchOfTrainers
+	def_special IsTVShowInSearchOfTrainersAiring
+	def_special GabbyAndTyGetLastQuote
+	def_special GabbyAndTyGetLastBattleTrivia
+	def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	def_special sub_8138B80
+	def_special sp0B5_daycare
+	def_special sp0B6_daycare
+	def_special sub_8070728
+	def_special sp0B8_daycare
+	def_special sp0B9_daycare_relationship_comment
+	def_special sub_8070C58
+	def_special daycare_send_selected_pokemon
+	def_special sub_8071330
+	def_special sub_80712C0
+	def_special sub_806FF30
+	def_special sub_806FED8
+	def_special sub_806FDC4
+	def_special ScriptHatchMon
+	def_special EggHatch
+	def_special sub_8071614
+	def_special sub_813C4BC
+	def_special IsEnoughForCostInVar0x8005
+	def_special SubtractMoneyFromVar0x8005
+	def_special sub_80F972C
+	def_special sp0C8_whiteout_maybe
+	def_special sub_80FBE90
+	def_special sub_80FBED0
+	def_special sub_8137F90
+	def_special sub_8137FB0
+	def_special EnterSafariMode
+	def_special ExitSafariMode
+	def_special GetPokeblockFeederInFront
+	def_special sub_8135908
+	def_special sub_813793C
+	def_special sub_8137988
+	def_special sub_8137A0C
+	def_special sub_8137A4C
+	def_special sub_8137C10
+	def_special sp0D9_ComputerRelated
+	def_special sub_8138E20
+	def_special sub_8139994
+	def_special sub_8138EC0
+	def_special sub_8138FAC
+	def_special sub_81B951C
+	def_special sub_81B968C
+	def_special sub_81B9770
+	def_special sub_81B9718
+	def_special sub_81B96D0
+	def_special sub_8160638
+	def_special sub_8137EFC
+	def_special sub_8137D0C
+	def_special sp0E3_walkrun_bitfield_interpretation
+	def_special sub_8137E6C
+	def_special sub_8137F44
+	def_special sub_8138C04
+	def_special sub_81A1780
+	def_special sub_8161F74
+	def_special sub_818E9AC
+	def_special sub_8195960
+	def_special sub_8165360
+	def_special sub_8163AC4
+	def_special sub_81A5238
+	def_special sub_81A5E74
+	def_special sub_81A703C
+	def_special sub_81A8E7C
+	def_special StopMapMusic
+	def_special sub_81B99B4
+	def_special sub_81B9B80
+	def_special sub_81B9D08
+	def_special sub_80F9490
+	def_special sub_81652B4
+	def_special sub_8139228
+	def_special sub_80F94E8
+	def_special sub_816AE58
+	def_special sub_816AE98
+	def_special sub_8138C94
+	def_special sub_807E73C
+	def_special sub_807EA10
+	def_special sub_807F0E4
+	def_special sub_807E9D4
+	def_special sub_8138BDC
+	def_special RetrieveLotteryNumber
+	def_special PickLotteryCornerTicket
+	def_special ShowBerryBlenderRecordWindow
+	def_special sub_8138FEC
+	def_special sub_8138FD4
+	def_special sp109_CreatePCMenu
+	def_special sub_8137C28
+	def_special sub_8137CB4
+	def_special sub_8139004
+	def_special sub_8139030
+	def_special sub_813905C
+	def_special sub_8139088
+	def_special sub_81390B4
+	def_special sub_80FB7A4
+	def_special DoSoftReset
+	def_special sub_8137734
+	def_special sub_8139A78
+	def_special nullsub_55
+	def_special SpawnScriptFieldObject
+	def_special RemoveScriptFieldObject
+	def_special sub_81391D0
+	def_special sub_8139200
+	def_special CheckRelicanthWailord
+	def_special ShouldDoBrailleStrengthEffectOld
+	def_special sub_80B0534
+	def_special sub_80B058C
+	def_special sub_81379F8
+	def_special sub_8139238
+	def_special sub_8139248
+	def_special player_get_direction_lower_nybble
+	def_special sub_81392AC
+	def_special sub_81392D4
+	def_special sub_81392F8
+	def_special sub_8139320
+	def_special sub_8139348
+	def_special sub_8139370
+	def_special sub_81393C8
+	def_special sub_8098574
+	def_special sub_809859C
+	def_special InitRoamer
+	def_special sub_81393FC
+	def_special sub_81390E0
+	def_special sub_80AFC60
+	def_special sub_813946C
+	def_special sub_81394D8
+	def_special sub_80E980C
+	def_special sub_8139530
+	def_special DoSealedChamberShakingEffect1
+	def_special sub_8139B60
+	def_special sub_80FAC78
+	def_special sub_8139540
+	def_special sub_809E1C8
+	def_special sub_8139560
+	def_special sub_80B0A18
+	def_special sub_80B0934
+	def_special sub_80B0A74
+	def_special sub_80B16D8
+	def_special DoSealedChamberShakingEffect2
+	def_special sub_8139634
+	def_special sub_80AC81C
+	def_special sp13E_warp_to_last_warp
+	def_special sp13F_fall_to_last_warp
+	def_special sub_80F8D28
+	def_special sub_80F8EB8
+	def_special sub_8162794
+	def_special sub_80B08EC
+	def_special sub_8139648
+	def_special sub_8139668
+	def_special sub_80F8FA0
+	def_special sub_81396E0
+	def_special sub_81B98DC
+	def_special nullsub_54
+	def_special sub_80E9B70
+	def_special copy_bags_and_unk_data_from_save_blocks
+	def_special sub_80B05B4
+	def_special sub_8139754
+	def_special sub_813970C
+	def_special sub_80C08E4
+	def_special sub_8139770
+	def_special sub_81397C4
+	def_special sub_81653CC
+	def_special sub_80F9370
+	def_special sub_80F8FE8
+	def_special sub_81AFDD0
+	def_special sub_80EDCE8
+	def_special sub_80EE2CC
+	def_special sub_80EE72C
+	def_special sub_80EE7C0
+	def_special nullsub_55
+	def_special PutFanClubSpecialOnTheAir
+	def_special sub_80EED10
+	def_special sub_80EED34
+	def_special sub_80EB1AC
+	def_special sub_80EBE7C
+	def_special sub_80EB300
+	def_special sub_80EB438
+	def_special sub_80EB368
+	def_special sub_80EB3D0
+	def_special sub_80EB290
+	def_special sub_80EB2C8
+	def_special sub_80EB56C
+	def_special sub_80EB9E0
+	def_special sub_80EBB28
+	def_special sub_80EB498
+	def_special sub_818D9C0
+	def_special sub_818DAEC
+	def_special sub_818DBE8
+	def_special sub_818DC2C
+	def_special sub_818DC60
+	def_special sub_818DCC8
+	def_special sub_818DD14
+	def_special sub_818DD54
+	def_special sub_818DD78
+	def_special sub_818DE44
+	def_special sub_818DE5C
+	def_special sub_818DEA0
+	def_special sub_818DEDC
+	def_special sub_818E038
+	def_special sub_818E06C
+	def_special sub_818E2D8
+	def_special sub_811A858
+	def_special sub_818E2FC
+	def_special sub_818E308
+	def_special sub_818E358
+	def_special sub_818E37C
+	def_special sub_818E298
+	def_special sub_818E39C
+	def_special sub_818E3BC
+	def_special sub_818E3E0
+	def_special sub_818E430
+	def_special sub_818E47C
+	def_special sub_818E490
+	def_special sub_813986C
+	def_special sub_818E4A4
+	def_special sub_818E510
+	def_special sub_818E538
+	def_special sub_818E274
+	def_special sub_818E3EC
+	def_special sub_818E8E0
+	def_special sub_818E8B4
+	def_special sub_818E914
+	def_special sub_818E92C
+	def_special sub_818E940
+	def_special sub_818E960
+	def_special sub_818E990
+	def_special PutLilycoveContestLadyShowOnTheAir
+	def_special sub_813B880
+	def_special sub_81A085C
+	def_special CheckIfMultipleTrainersWantBattle
+	def_special AddMapNamePopUpWindowTask
+	def_special AddMapNamePopUpWindowTask
+	def_special sub_81BE994
+	def_special sub_81BE79C
+	def_special sub_81BE7F4
+	def_special sub_81398C0
+	def_special sub_80093CC
+	def_special BerryBlenderLinkBecomeLeader
+	def_special BerryBlenderLinkJoinGroup
+	def_special UnionRoomSpecial
+	def_special sub_801A42C
+	def_special sub_8016934
+	def_special sp182_move_string
+	def_special sub_801DC20
+	def_special sub_81B8958
+	def_special sub_8018090
+	def_special sub_813990C
+	def_special sub_801B27C
+	def_special HasAtLeastOneBerry
+	def_special sub_802C920
+	def_special sub_802E3C4
+	def_special sub_8027A5C
+	def_special sub_8027AAC
+	def_special sub_8139980
+	def_special sub_81399F4
+	def_special sub_8139D98
+	def_special sub_80F905C
+	def_special sub_800B518
+	def_special sub_80F90DC
+	def_special sub_80F910C
+	def_special sub_80F9160
+	def_special sub_81A4AA0
+	def_special sub_81A4AE8
+	def_special sub_8139F20
+	def_special sub_80F9134
+	def_special sub_80F9154
+	def_special sub_80B3028
+	def_special sub_813A128
+	def_special sub_813A630
+	def_special sub_813A080
+	def_special sub_81C6A94
+	def_special sub_81C4F24
+	def_special sub_81B95E0
+	def_special sub_81B9620
+	def_special sub_813A76C
+	def_special sub_813A7B8
+	def_special sub_813A958
+	def_special sub_813A8FC
+	def_special sub_813A988
+	def_special sub_813A9D0
+	def_special sub_813A9A4
+	def_special sub_813AA04
+	def_special sub_813AA18
+	def_special sub_813AA44
+	def_special sub_80248B0
+	def_special sub_8024918
+	def_special sub_80246D4
+	def_special sub_802477C
+	def_special sub_802488C
+	def_special sub_813A820
+	def_special sub_813A854
+	def_special sub_813B7D8
+	def_special sub_81C72A4
+	def_special sp106_CreateStartMenu
+	def_special sub_80C2E40
+	def_special sub_813AC7C
+	def_special sub_813ADB8
+	def_special sub_813ADD4
+	def_special sub_81B892C
+	def_special sub_813AEB4
+	def_special sub_813AF48
+	def_special sub_813AFC8
+	def_special sub_813B1D0
+	def_special DoScriptedWildBattle
+	def_special sub_81BEB54
+	def_special sub_81BEB68
+	def_special sub_81BEB7C
+	def_special ChangeBoxPokemonNickname
+	def_special get_unknown_box_id
+	def_special sub_813B21C
+	def_special sub_81D1C20
+	def_special sub_8175280
+	def_special sub_813B2E4
+	def_special sub_813B374
+	def_special sub_813B490
+	def_special sub_80A08CC
+	def_special sub_813B484
+	def_special sub_81AFDA0
+	def_special sub_813B4E0
+	def_special ShouldDoBrailleRegicePuzzle
+	def_special EnableNationalPokedex
+	def_special sub_80E2548
+	def_special sub_80E2878
+	def_special TurnOnTVScreen
+	def_special sub_81D4A90
+	def_special sub_813B514
+	def_special sub_813B568
+	def_special sub_813B534
+	def_special sp194_trainer_tower
+	def_special sub_813B7D8
+	def_special sub_813B80C
+	def_special sub_81D4BEC
+	def_special sub_80224D0
+	def_special TryBufferWaldaPhrase
+	def_special DoWaldaNamingScreen
+	def_special TryGetWallpaperWithWaldaPhrase
+	def_special sub_8139ED0
+	def_special sub_813B968
+	def_special sub_80F8B94
+	def_special sub_813C904
+	def_special sub_80B4808
+	def_special sub_813B9A0
+	def_special sub_81B9918
+	def_special sub_80722E0
+	def_special sub_80B45D0
+	def_special sub_813C5A0
+	def_special sub_8139C10
+	def_special sub_80B3BC4
+
diff --git a/data/walda_phrase.s b/data/walda_phrase.s
deleted file mode 100644
index c168353b4..000000000
--- a/data/walda_phrase.s
+++ /dev/null
@@ -1,7 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_0862AD14:: @ 862AD14
-	.incbin "baserom.gba", 0x62ad14, 0x20